提交: 19787336c579de23075c794be1ed4fa409d7407e - allura (git)

allura

Commit MetaInfo

• 修訂: 19787336c579de23075c794be1ed4fa409d7407e (tree)
• 時間: 2012-04-27 23:51:35
• 作者: Jenny Steele <jsteele@geek...>
• Commiter: Cory Johns

Log Message

[#2151] More file types are now "viewable" in repos

Change Summary

• modified: Allura/allura/model/repository.py
• modified: Allura/allura/templates/repo/file.html

差異

--- a/Allura/allura/model/repository.py
+++ b/Allura/allura/model/repository.py
@@ -36,6 +36,9 @@ config = utils.ConfigProxy(
     common_prefix='forgemail.url')
 
 README_RE = re.compile('^README(\.[^.]*)?$', re.IGNORECASE)
+VIEWABLE_EXTENSIONS = ['.php','.py','.js','.java','.html','.htm','.yaml','.sh',
+    '.rb','.phtml','.txt','.bat','.ps1','.xhtml','.css','.cfm','.jsp','.jspx',
+    '.pl','.php4','.php3','.rhtml','.svg','.markdown','.json','.ini','.tcl','.vbs','.xsl']
 
 class RepositoryImplementation(object):
 
@@ -1005,6 +1008,8 @@ class Blob(RepoObject):
         self.commit = tree.commit
         self.tree = tree
         self.name = name
+        fn, ext = os.path.splitext(self.name)
+        self.extension = ext or fn
 
     @LazyProperty
     def _content_type_encoding(self):
@@ -1050,8 +1055,17 @@ class Blob(RepoObject):
         return self.tree.path() + h.really_unicode(self.name)
 
     @property
+    def has_pypeline_view(self):
+        if README_RE.match(self.name) or self.extension in ['.md', '.rst']:
+            return True
+        return False
+
+    @property
     def has_html_view(self):
-        return self.content_type.startswith('text/')
+        if self.content_type.startswith('text/') or self.extension in VIEWABLE_EXTENSIONS or \
+            self.extension in self._additional_viewable_extensions:
+            return True
+        return False
 
     @property
     def has_image_view(self):

--- a/Allura/allura/templates/repo/file.html
+++ b/Allura/allura/templates/repo/file.html
@@ -42,11 +42,15 @@
     Try to <a href="?force=True">display it</a> anyway or
     <a href="?format=raw">download it</a> instead.</p>
   {% endif %}
-  {% if blob.has_html_view and not blob.has_image_view or force_display %}
+  {% if (blob.has_html_view or blob.has_pypeline_view) and not blob.has_image_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>
-      {{g.highlight(blob.text, filename=blob.name)}}
+      {% if blob.has_pypeline_view %}
+        {{h.render_any_markup(blob.name, blob.text)}}
+      {% else %}
+        {{g.highlight(blob.text, filename=blob.name)}}
+      {% endif %}
     </div>
   {% endif %}
 {% endblock %}