提交: c17d1c023cb153d498e9dd84acd6163150fba58c - allura (git)

allura

Commit MetaInfo

• 修訂: c17d1c023cb153d498e9dd84acd6163150fba58c (tree)
• 時間: 2012-06-13 01:25:09
• 作者: Dave Brondsema <dbrondsema@geek...>
• Commiter: Dave Brondsema

Log Message

Merge branch '42cc_4126' into dev

Change Summary

• modified: Allura/allura/config/app_cfg.py
• modified: Allura/allura/controllers/repository.py
• modified: Allura/allura/lib/utils.py
• modified: Allura/allura/model/repository.py
• modified: Allura/allura/templates/repo/file.html
• add: Allura/allura/tests/unit/test_utils.py
• modified: ForgeGit/forgegit/model/git_repo.py
• modified: ForgeHg/forgehg/model/hg.py
• modified: ForgeSVN/forgesvn/model/svn.py

差異

--- a/Allura/allura/config/app_cfg.py
+++ b/Allura/allura/config/app_cfg.py
@@ -26,7 +26,7 @@ import ew
 
 import allura
 # needed for tg.configuration to work
-from allura.lib import app_globals
+from allura.lib import app_globals, helpers
 
 log = logging.getLogger(__name__)
 
@@ -62,6 +62,7 @@ class ForgeConfig(AppConfig):
             autoescape=True,
             extensions=['jinja2.ext.do', 'jinja2.ext.i18n'])
         jinja2_env.install_gettext_translations(pylons.i18n)
+        jinja2_env.filters['filesizeformat'] = helpers.do_filesizeformat
         config['pylons.app_globals'].jinja2_env = jinja2_env
         # Jinja's unable to request c's attributes without strict_c
         config['pylons.strict_c'] = True

--- a/Allura/allura/controllers/repository.py
+++ b/Allura/allura/controllers/repository.py
@@ -18,6 +18,7 @@ from ming.orm import ThreadLocalORMSession, session
 
 import allura.tasks
 from allura.lib import security
+from allura.lib import utils
 from allura.lib import helpers as h
 from allura.lib import widgets as w
 from allura.lib.decorators import require_post
@@ -487,8 +488,10 @@ class FileBrowser(BaseController):
         else:
             force_display = 'force' in kw
             context = self._blob.context()
+            stats = utils.generate_code_stats(self._blob)
             return dict(
                 blob=self._blob,
+                stats=stats,
                 prev=context.get('prev', None),
                 next=context.get('next', None),
                 force_display=force_display

--- a/Allura/allura/lib/utils.py
+++ b/Allura/allura/lib/utils.py
@@ -8,6 +8,7 @@ import os.path
 import datetime
 import random
 import mimetypes
+import re
 from itertools import groupby
 
 import tg
@@ -410,3 +411,15 @@ class LineAnchorCodeHtmlFormatter(HtmlFormatter):
             yield (tup[0], '<div id="l%s" class="code_block">%s</div>' % (num, tup[1]))
             num += 1
         yield 0, '</pre>'
+
+def generate_code_stats(blob):
+    stats = {'line_count': 0,
+             'code_size': 0,
+             'data_line_count': 0}
+    code = blob.text
+    lines = code.split('\n')
+    stats['code_size'] = blob.size
+    stats['line_count'] = len(lines)
+    spaces = re.compile(r'^\s*$')
+    stats['data_line_count'] = sum([1 for l in lines if not spaces.match(l)])
+    return stats

--- a/Allura/allura/model/repository.py
+++ b/Allura/allura/model/repository.py
@@ -108,6 +108,10 @@ class RepositoryImplementation(object):
         '''Return a file-like object that contains the contents of the blob'''
         raise NotImplementedError, 'open_blob'
 
+    def blob_size(self, blob):
+        '''Return a blob size in bytes'''
+        raise NotImplementedError, 'blob_size'
+
     @classmethod
     def shorthand_for_commit(cls, oid):
         return '[%s]' % oid[:6]
@@ -204,6 +208,8 @@ class Repository(Artifact):
         return self._impl.commit_context(commit)
     def open_blob(self, blob):
         return self._impl.open_blob(blob)
+    def blob_size(self, blob):
+        return self._impl.blob_size(blob)
     def shorthand_for_commit(self, oid):
         return self._impl.shorthand_for_commit(oid)
     def symbolics_for_commit(self, commit):
@@ -1108,6 +1114,10 @@ class Blob(RepoObject):
         return iter(self.open())
 
     @LazyProperty
+    def size(self):
+        return self.repo.blob_size(self)
+
+    @LazyProperty
     def text(self):
         return self.open().read()
 

--- a/Allura/allura/templates/repo/file.html
+++ b/Allura/allura/templates/repo/file.html
@@ -68,9 +68,13 @@
   {% elif blob.has_html_view or blob.has_pypeline_view or force_display %}
     <p><a href="?format=raw">Download this file</a></p>
     <div class="clip grid-19">
-      <h3><span class="ico-l"><b data-icon="{{g.icons['table'].char}}" class="ico {{g.icons['table'].css}}"></b> {{h.really_unicode(blob.name)}}</span></h3>
+      <h3>
+        <span class="ico-l"><b data-icon="{{g.icons['table'].char}}" class="ico {{g.icons['table'].css}}"></b> {{h.really_unicode(blob.name)}}</span>
+        &nbsp;&nbsp;
+        {{ stats.line_count }} lines ({{ stats.data_line_count }} with data), {{ stats.code_size|filesizeformat }}
+      </h3>
       {% if blob.has_pypeline_view %}
-        {{h.render_any_markup(blob.name, blob.text, code_mode=True, linenumbers_style=h.TABLE)}}
+        {{h.render_any_markup(blob.name, blob.text, code_mode=True)}}
       {% else %}
         {{g.highlight(blob.text, filename=blob.name)}}
       {% endif %}

--- /dev/null
+++ b/Allura/allura/tests/unit/test_utils.py
@@ -0,0 +1,28 @@
+import unittest
+from mock import Mock
+
+from alluratest.controller import setup_unit_test
+from allura.lib.utils import generate_code_stats
+
+class TestCodeStats(unittest.TestCase):
+
+    def setUp(self):
+        setup_unit_test()
+
+    def test_generate_code_stats(self):
+        blob = Mock()
+        blob.text = \
+"""class Person(object):
+    
+    def __init__(self, name='Alice'):
+        self.name = name
+
+    def greetings(self):
+        print "Hello, %s" % self.name
+\t\t"""
+        blob.size = len(blob.text)
+
+        stats = generate_code_stats(blob)
+        assert stats['line_count'] == 8
+        assert stats['data_line_count'] == 5
+        assert stats['code_size'] == len(blob.text)

--- a/ForgeGit/forgegit/model/git_repo.py
+++ b/ForgeGit/forgegit/model/git_repo.py
@@ -272,6 +272,9 @@ class GitImplementation(M.RepositoryImplementation):
         return _OpenedGitBlob(
             self._object(blob.object_id).data_stream)
 
+    def blob_size(self, blob):
+        return self._object(blob.object_id).data_stream.size
+
     def _setup_hooks(self):
         'Set up the git post-commit hook'
         text = self.post_receive_template.substitute(

--- a/ForgeHg/forgehg/model/hg.py
+++ b/ForgeHg/forgehg/model/hg.py
@@ -257,6 +257,10 @@ class HgImplementation(M.RepositoryImplementation):
         fctx = self._hg[blob.commit.object_id][h.really_unicode(blob.path()).encode('utf-8')[1:]]
         return StringIO(fctx.data())
 
+    def blob_size(self, blob):
+        fctx = self._hg[blob.commit.object_id][h.really_unicode(blob.path()).encode('utf-8')[1:]]
+        return fctx.size()
+
     def _setup_hooks(self):
         'Set up the hg changegroup hook'
         cp = ConfigParser()

--- a/ForgeSVN/forgesvn/model/svn.py
+++ b/ForgeSVN/forgesvn/model/svn.py
@@ -431,6 +431,24 @@ class SVNImplementation(M.RepositoryImplementation):
             revision=self._revision(blob.commit.object_id))
         return StringIO(data)
 
+    def blob_size(self, blob):
+        try:
+            data = self._svn.list(
+                   self._url + blob.path(),
+                   revision=self._revision(blob.commit.object_id),
+                   dirent_fields=pysvn.SVN_DIRENT_SIZE)
+        except pysvn.ClientError:
+            log.info('ClientError getting filesize %r %r, returning 0', blob.path(), self._repo, exc_info=True)
+            return 0
+
+        try:
+            size = data[0][0]['size']
+        except (IndexError, KeyError):
+            log.info('Error getting filesize: bad data from svn client %r %r, returning 0', blob.path(), self._repo, exc_info=True)
+            size = 0
+        
+        return size
+
     def _setup_hooks(self):
         'Set up the post-commit and pre-revprop-change hooks'
         text = self.post_receive_template.substitute(