Pygments code coloring rewrite, annotation was moved to vcs whitch had much better lib for that. Fixed code recognition based on mimetypes of filenodes, for better coloring.

pylons_app/lib/helpers.py

@@ -1,158 +1,98 b''
 """Helper functions
 
 Consists of functions to typically be used within templates, but also
 available to Controllers. This module is available to both as 'h'.
 """
+from pygments.formatters import HtmlFormatter
+from pygments import highlight as code_highlight
 from pylons import url, app_globals as g
 from pylons.i18n.translation import _, ungettext
-from webhelpers.html import (literal, HTML, escape)
+from vcs.utils.annotate import annotate_highlight
+from webhelpers.html import literal, HTML, escape
 from webhelpers.html.builder import make_tag
-from webhelpers.html.tools import (auto_link, button_to, highlight, js_obfuscate
-                                   , mail_to, strip_links, strip_tags, tag_re)
-from webhelpers.html.tags import (auto_discovery_link, checkbox, css_classes,
-                                  end_form, file, form, hidden, image,
-                                  javascript_link, link_to, link_to_if,
-                                  link_to_unless, ol, required_legend,
-                                  select, stylesheet_link,
-                                  submit, text, password, textarea, title,
-                                  ul, xml_declaration)
-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.html.tags import auto_discovery_link, checkbox, css_classes, \
+    end_form, file, form, hidden, image, javascript_link, link_to, link_to_if, \
+    link_to_unless, ol, required_legend, select, stylesheet_link, submit, text, \
+    password, textarea, title, ul, xml_declaration
+from webhelpers.html.tools import auto_link, button_to, highlight, js_obfuscate, \
+    mail_to, strip_links, strip_tags, tag_re
+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
+from webhelpers.text import chop_at, collapse, convert_accented_entities, \
+    convert_misc_entities, lchop, plural, rchop, remove_formatting, \
+    replace_whitespace, urlify
 
-from pygments import highlight
-from pygments.formatters import HtmlFormatter
-from pygments.lexers import guess_lexer
-from pygments.lexers import get_lexer_by_name
 
 #Custom helper here :)
 class _Link(object):
     '''
     Make a url based on label and url with help of url_for
     @param label:name of link    if not defined url is used
     @param url: the url for link
     '''
 
     def __call__(self, label='', *url_, **urlargs):
         if label is None or '':
             label = url
         link_fn = link_to(label, url(*url_, **urlargs))
         return link_fn
 
 
 class _GetError(object):
 
     def __call__(self, field_name, form_errors):
         tmpl = """<span class="error_msg">%s</span>"""
         if form_errors and form_errors.has_key(field_name):
             return literal(tmpl % form_errors.get(field_name))
 
 class _FilesBreadCrumbs(object):
     
     def __call__(self, repo_name, rev, paths):
         url_l = [link_to(repo_name, url('files_home', repo_name=repo_name, revision=rev, f_path=''))]
         paths_l = paths.split('/')
         
         for cnt, p in enumerate(paths_l, 1):
             if p != '':
                 url_l.append(link_to(p, url('files_home', repo_name=repo_name, revision=rev, f_path='/'.join(paths_l[:cnt]))))
 
         return literal(' / '.join(url_l))
 
-def pygmentize(code, **kwargs):
+def pygmentize(filenode, **kwargs):
     """
-    Filter for chunks of html to replace code tags with pygmented code
+    pygmentize function using pygments
+    @param filenode:
     """
-    code = code.splitlines()
-    _html, _html2 = [], []   
-    _html.append("""<table class="code-highlighttable">""")
-    _html.append("""<tr>""")
-    _html.append("""<td class="linenos">""")
-    _html.append("""<div class="linenodiv">""")
-    _html.append("""<pre>""")
-    for cnt, code in enumerate(code, 1):
-        #generete lines nos
-        _html.append("""<a id="A%s" href="#A%s">%s</a>\n""" \
-                     % (cnt, cnt, cnt))
-        #propagate second list with code
-        _html2.append("""%s""" % (highlight(code, get_lexer_by_name('python'),
-                                       HtmlFormatter(nowrap=True))))        
-    _html.append("""</pre>""")
-    _html.append("""</div>""")
-    _html.append("""</td>""")
-    _html.append("""<td class="code">""")
-    _html.append("""<div class="code-highlight">""")
-    _html.append("""<pre>""")
-    _html.extend(_html2)
-    _html.append("""</pre>""")
-    _html.append("""</div>""")
-    _html.append("""</td>""")
-    _html.append("""</tr>""")
-    _html.append("""</table>""")
-    return literal(''.join(_html))    
-    #return literal(highlight(code, get_lexer_by_name('python'), HtmlFormatter(**kwargs)))
+    return literal(code_highlight(filenode.content, filenode.lexer, HtmlFormatter(**kwargs)))
 
-def pygmentize_annotation(annotate_list, repo_name):
+def pygmentize_annotation(filenode, **kwargs):
     """
-    Generate a dict of
-    @param annotate_lists:
+    pygmentize function for annotation
+    @param filenode:
     """
-    import random
+    
     color_dict = g.changeset_annotation_colors
     def gen_color():
-            return [str(random.randrange(0, 255)) for _ in xrange(3)]
+        import random
+        return [str(random.randrange(10, 235)) 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("""<table class="code-highlighttable">""")
-    _html.append("""<tr>""")
-    _html.append("""<td class="linenos">""")
-    _html.append("""<div class="linenodiv">""")
-    _html.append("""<pre>""")
-    for line in annotate_list:
-        #lines
-        _html.append("""<a id="A%s" href="#S%s">%s</a>\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("""</pre>""")
-    _html.append("""</div>""")
-    _html.append("""</td>""")
-    _html.append("""<td class="linenos">""")
-    _html.append("""<div class="linenodiv">""")                            
-    _html.append("""<pre>""")
-    _html.extend(_html2)
-    _html.append("""</pre>""")
-    _html.append("""</div>""")
-    _html.append("""</td>""")
-    _html.append("""<td class="code">""")
-    _html.append("""<div class="code-highlight">""")
-    _html.append("""<pre>""")
-    _html.extend(_html3)
-    _html.append("""</pre>""")
-    _html.append("""</div>""")
-    _html.append("""</td>""")
-    _html.append("""</tr>""")
-    _html.append("""</table>""")
-    return literal(''.join(_html))
 
+    def url_func(changeset):
+        return '%s\n' % (link_to(changeset.raw_id,
+        url('changeset_home', repo_name='test', revision=changeset.raw_id),
+        title=_('author') + ':%s rev:%s %s' % (changeset.author, changeset.revision,
+                                                changeset.message,),
+        style=get_color_string(changeset.raw_id)))
+           
+    return literal(annotate_highlight(filenode, url_func, **kwargs))
 
 files_breadcrumbs = _FilesBreadCrumbs()
 link = _Link()
 flash = _Flash()
 get_error = _GetError()

pylons_app/templates/files/files_annotate.html

@@ -1,44 +1,44 b''
 <%inherit file="/base/base.html"/>
 
 <%def name="title()">
     ${_('File annotate')}
 </%def>
 <%def name="breadcrumbs()">
     ${h.link_to(u'Home',h.url('/'))}
     / 
     ${h.link_to(c.repo_name,h.url('files_home',repo_name=c.repo_name))}
     /
     ${_('files')}
 </%def>
 <%def name="page_nav()">
 		${self.menu('files')}     
 </%def>
 <%def name="css()">
 	<link rel="stylesheet" href="/css/monoblue_custom.css" type="text/css" />
 	<link rel="stylesheet" href="/css/pygments.css" type="text/css" />
 </%def>
 <%def name="main()">
     <h2 class="no-link no-border">${_('Annotate')}</h2>
 	<div id="files_data">
 		<h2>${_('Location')}: ${h.files_breadcrumbs(c.repo_name,c.cur_rev,c.file.path)}</h2>
 		<dl class="overview">
 			<dt>${_('Revision')}</dt>
 			<dd>r${c.file.last_changeset.revision}:${c.file.last_changeset._short}</dd>
 			<dt>${_('Size')}</dt>
 			<dd>${h.format_byte_size(c.file.size,binary=True)}</dd>
 			<dt>${_('Options')}</dt>
 			<dd>${h.link_to(_('source'),
 			h.url('files_home',repo_name=c.repo_name,revision=c.cur_rev,f_path=c.f_path))}  / ${h.link_to(_('raw'),
 			h.url('files_raw_home',repo_name=c.repo_name,revision=c.cur_rev,f_path=c.f_path))}</dd>				
 		</dl>
 		<div id="body" class="codeblock">
 			<div class="code-header">
 				<div class="revision">${c.file.name}@r${c.file.last_changeset.revision}:${c.file.last_changeset._short}</div>
 				<div class="commit" style="font-size:70%">"${c.file_msg}"</div>
 			</div>
 			<div class="code-body">
-				${h.pygmentize_annotation(c.annotate,c.repo_name)}
+				${h.pygmentize_annotation(c.file,linenos=True,anchorlinenos=True,lineanchors='S',cssclass="code-highlight")}
 			</div>
 		</div>
 	</div>
 </%def> 
  No newline at end of file

pylons_app/templates/files/files_source.html

@@ -1,28 +1,28 b''
 <dl class="overview">
 	<dt>${_('Revision')}</dt>
 	<dd>r${c.files_list.last_changeset.revision}:${c.files_list.last_changeset._short}</dd>
 	<dt>${_('Size')}</dt>
 	<dd>${h.format_byte_size(c.files_list.size,binary=True)}</dd>
 	<dt>${_('Options')}</dt>
 	<dd>${h.link_to(_('annotate'),
 	h.url('files_annotate_home',repo_name=c.repo_name,revision=c.cur_rev,f_path=c.f_path))}  / ${h.link_to(_('raw'),
 	h.url('files_raw_home',repo_name=c.repo_name,revision=c.cur_rev,f_path=c.f_path))}</dd>
 	<dt>${_('History')}</dt>
 	<dd>
 		${h.form(h.url('files_diff_home',repo_name=c.repo_name,f_path=c.f_path),method='GET')}
 		${h.hidden('diff2',c.files_list.last_changeset._short)}
 		${h.select('diff1','',c.file_history)}
 		${h.submit('diff','diff')}
 		${h.end_form()}
 	</dd>
 					
 </dl>		
 <div id="body" class="codeblock">
 	<div class="code-header">
 		<div class="revision">${c.files_list.name}@r${c.files_list.last_changeset.revision}:${c.files_list.last_changeset._short}</div>
 		<div class="commit" style="font-size:70%">"${c.file_msg}"</div>
 	</div>
 	<div class="code-body">
-		${h.pygmentize(c.files_list.content,linenos=True,anchorlinenos=True,cssclass="code-highlight")}
+		${h.pygmentize(c.files_list,linenos=True,anchorlinenos=True,lineanchors='S',cssclass="code-highlight")}
 	</div>
 </div>
  No newline at end of file