[gentoo-commits] proj/gentoo-packages:master commit in: gpackages/apps/packages/templatetags/, ...

[Slava Bacherikov]

commit:     1563cf9940f432bf754b61cdd279991919d7f6d8
Author:     Slava Bacherikov <slava <AT> bacher09 <DOT> org>
AuthorDate: Mon Jul 30 12:58:57 2012 +0000
Commit:     Slava Bacherikov <slava <AT> bacherikov <DOT> org <DOT> ua>
CommitDate: Mon Jul 30 12:58:57 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gentoo-packages.git;a=commit;h=1563cf99

Add changelog to package view

---
 gpackages/apps/packages/templatetags/packages.py   |    5 +++++
 .../generic_metadata/changelog_highlight.py        |    9 +++++++++
 gpackages/templates/package.html                   |    5 +++++
 3 files changed, 19 insertions(+), 0 deletions(-)

diff --git a/gpackages/apps/packages/templatetags/packages.py b/gpackages/apps/packages/templatetags/packages.py
index da277d9..764f5ab 100644
--- a/gpackages/apps/packages/templatetags/packages.py
+++ b/gpackages/apps/packages/templatetags/packages.py
@@ -1,6 +1,7 @@
 from django.utils.safestring import mark_safe
 from django import template
 from django.core.cache import cache
+from package_info.generic_metadata.changelog_highlight import changelog_highlight
 
 register = template.Library()
 
@@ -39,6 +40,10 @@ def text_sincode(text):
     text_l = map(lambda x: '&#%s;' % ord(x), text)
     return mark_safe(''.join(text_l))
 
+@××××××××.filter('changelog_highlight')
+def changelog_highlight_filter(text):
+    return mark_safe(changelog_highlight(text))
+
 register.filter('obfuscate', text_sincode)
 
 def recent_ebuilds_cache_key(num = 10):

diff --git a/gpackages/libs/package_info/generic_metadata/changelog_highlight.py b/gpackages/libs/package_info/generic_metadata/changelog_highlight.py
index 61ea5e1..b3d996e 100644
--- a/gpackages/libs/package_info/generic_metadata/changelog_highlight.py
+++ b/gpackages/libs/package_info/generic_metadata/changelog_highlight.py
@@ -9,6 +9,8 @@ import re
 DATE_RE = r'\d\d? [A-Z][a-z]{2} \d{4}'
 EMAIL_RE = r'[\w\.\-\+]+@(?:[\w\-]+\.)+\w+'
 LINK_RE = r'https?:\/\/(?:[\w\-]+\.)+\w+(:?\/[\w\/\.\-\_\+\&\%]+)?'
+BUG_NUM_RE =  r'(\d+)'
+bugnum_re = re.compile(BUG_NUM_RE)
 
 ARCHES = [ u'alpha', u'amd64', u'amd64-fbsd', u'amd64-linux', u'arm',
            u'arm-linux', u'hppa', u'hppa-hpux', u'ia64', u'ia64-hpux',
@@ -153,6 +155,13 @@ class ChangelogHtmlFormater(HtmlFormatter):
     def token_decorate(self, token, value):
         if token == Link:
             value = '<a href="{0}" rel="nofollow">{0}</a>'.format(value)
+        elif token == Bug:
+            num_m = bugnum_re.search(value)
+            bugs_url_template = "https://bugs.gentoo.org/{0}"
+            if num_m is not None:
+                num = num_m.group()
+                link = bugs_url_template.format(num)
+                value = '<a href="{1}" class="defcolor">{0}</a>'.format(value, link)
         return value
 
 class ChangelogStyle(Style):

diff --git a/gpackages/templates/package.html b/gpackages/templates/package.html
index 9023001..fcc03e3 100644
--- a/gpackages/templates/package.html
+++ b/gpackages/templates/package.html
@@ -1,5 +1,10 @@
 {% extends "base.html" %}
+{% load packages %}
 
 {% block content %}
     {% include 'package_object.html' %}
+    <div class="changelog">
+    <h4>Changelog</h4>
+    {{ package.changelog|changelog_highlight }}
+    </div>
 {% endblock content %}