# HG changeset patch # User Marcin Kuzminski # Date 1274400469 -7200 # Node ID ea893ffb7f00458553c19bdc1fb9455847e4f9a3 # Parent 1231bbe1ab365264bb9d02b0a5bc9f55f8094998 implemented pygmentize codes into webhelpers. Together with color_dict caching into pylons globals diff -r 1231bbe1ab36 -r ea893ffb7f00 pylons_app/lib/app_globals.py --- a/pylons_app/lib/app_globals.py Wed May 19 21:33:10 2010 +0200 +++ b/pylons_app/lib/app_globals.py Fri May 21 02:07:49 2010 +0200 @@ -21,3 +21,4 @@ self.baseui = make_ui('hgwebdir.config') self.paths = self.baseui.configitems('paths') self.base_path = self.paths[0][1].replace('*', '') + self.changeset_annotation_colors = {} diff -r 1231bbe1ab36 -r ea893ffb7f00 pylons_app/lib/helpers.py --- a/pylons_app/lib/helpers.py Wed May 19 21:33:10 2010 +0200 +++ b/pylons_app/lib/helpers.py Fri May 21 02:07:49 2010 +0200 @@ -3,7 +3,7 @@ Consists of functions to typically be used within templates, but also available to Controllers. This module is available to both as 'h'. """ -from pylons import url +from pylons import url, app_globals as g from pylons.i18n.translation import _, ungettext from webhelpers.html import (literal, HTML, escape) from webhelpers.html.builder import make_tag @@ -19,7 +19,7 @@ from webhelpers.text import (chop_at, collapse, convert_accented_entities, convert_misc_entities, lchop, plural, rchop, remove_formatting, replace_whitespace, urlify) - +from webhelpers.number import (format_byte_size, format_bit_size) from webhelpers.pylonslib import Flash as _Flash from webhelpers.pylonslib.secure_form import secure_form @@ -50,25 +50,6 @@ if form_errors and form_errors.has_key(field_name): return literal(tmpl % form_errors.get(field_name)) -class _FileSizeFormat(object): - """ - Formats the value like a 'human-readable' file size (i.e. 13 KB, 4.1 MB, - 102 bytes, etc). - """ - def __call__(self, bytes): - try: - bytes = float(bytes) - except TypeError: - return u"0 bytes" - - if bytes < 1024: - return ungettext("%(size)d byte", "%(size)d bytes", bytes) % {'size': bytes} - if bytes < 1024 * 1024: - return _("%.1f KB") % (bytes / 1024) - if bytes < 1024 * 1024 * 1024: - return _("%.1f MB") % (bytes / (1024 * 1024)) - return _("%.1f GB") % (bytes / (1024 * 1024 * 1024)) - class _FilesBreadCrumbs(object): def __call__(self, repo_name, rev, paths): @@ -82,14 +63,96 @@ return literal(' / '.join(url_l)) def pygmentize(code, **kwargs): - ''' + """ Filter for chunks of html to replace code tags with pygmented code - ''' - return literal(highlight(code, guess_lexer(code), HtmlFormatter(**kwargs))) + """ + code = code.splitlines() + _html, _html2 = [], [] + _html.append("""""") + _html.append("""""") + _html.append("""""") + _html.append("""""") + _html.append("""""") + _html.append("""
""") + _html.append("""
""") + _html.append("""
""")
+    for cnt, code in enumerate(code, 1):
+        #generete lines nos
+        _html.append("""%s\n""" \
+                     % (cnt, cnt, cnt))
+        #propagate second list with code
+        _html2.append("""%s""" % (highlight(code, get_lexer_by_name('python'),
+                                       HtmlFormatter(nowrap=True))))        
+    _html.append("""
""") + _html.append("""
""") + _html.append("""
""") + _html.append("""
""") + _html.append("""
""")
+    _html.extend(_html2)
+    _html.append("""
""") + _html.append("""
""") + _html.append("""
""") + return literal(''.join(_html)) + #return literal(highlight(code, get_lexer_by_name('python'), HtmlFormatter(**kwargs))) + +def pygmentize_annotation(annotate_list, repo_name): + """ + Generate a dict of + @param annotate_lists: + """ + import random + color_dict = g.changeset_annotation_colors + def gen_color(): + return [str(random.randrange(0, 255)) for _ in xrange(3)] + def get_color_string(cs): + if color_dict.has_key(cs): + col = color_dict[cs] + else: + color_dict[cs] = gen_color() + col = color_dict[cs] + return "color: rgb(%s) ! important;" % (','.join(col)) + _html, _html2, _html3 = [], [], [] + _html.append("""""") + _html.append("""""") + _html.append("""""") + _html.append("""""") + _html.append("""""") + _html.append("""""") + _html.append("""
""") + _html.append("""
""") + _html.append("""
""")
+    for line in annotate_list:
+        #lines
+        _html.append("""%s\n""" \
+                     % (line[0], line[0], line[0]))
+        #annotation tags
+        _html2.append("""%s\n""" % link_to(line[1].raw_id,
+        url('changeset_home', repo_name=repo_name, revision=line[1].raw_id),
+        title=_('author') + ':%s rev:%s %s' % (line[1].author, line[1].revision,
+                                                line[1].message,),
+        style=get_color_string(line[1].raw_id)))
+        #code formated with pygments
+        _html3.append("""%s""" % (highlight(line[2], get_lexer_by_name('python')
+                                            , HtmlFormatter(nowrap=True))))        
+    _html.append("""
""") + _html.append("""
""") + _html.append("""
""") + _html.append("""
""") + _html.append("""
""")
+    _html.extend(_html2)
+    _html.append("""
""") + _html.append("""
""") + _html.append("""
""") + _html.append("""
""") + _html.append("""
""")
+    _html.extend(_html3)
+    _html.append("""
""") + _html.append("""
""") + _html.append("""
""") + return literal(''.join(_html)) files_breadcrumbs = _FilesBreadCrumbs() -filesizeformat = _FileSizeFormat() link = _Link() flash = _Flash() get_error = _GetError()