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

[Slava Bacherikov]

commit:     61701beabd3f081ab54d04c4e61aa538fcc76441
Author:     Slava Bacherikov <slava <AT> bacher09 <DOT> org>
AuthorDate: Tue Jul 31 13:56:05 2012 +0000
Commit:     Slava Bacherikov <slava <AT> bacherikov <DOT> org <DOT> ua>
CommitDate: Tue Jul 31 13:56:05 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gentoo-packages.git;a=commit;h=61701bea

Add urlize license text

---
 gpackages/apps/packages/templatetags/packages.py |    2 +
 gpackages/apps/packages/utils.py                 |   40 ++++++++++++++++++++++
 gpackages/templates/package.html                 |    2 +-
 3 files changed, 43 insertions(+), 1 deletions(-)

diff --git a/gpackages/apps/packages/templatetags/packages.py b/gpackages/apps/packages/templatetags/packages.py
index 820daaf..4839dfa 100644
--- a/gpackages/apps/packages/templatetags/packages.py
+++ b/gpackages/apps/packages/templatetags/packages.py
@@ -8,6 +8,7 @@ register = template.Library()
 from ..models import RepositoryModel, EbuildModel, UseFlagDescriptionModel
 from ..views import arches
 from ..forms import ArchChoiceForm, FilteringForm
+from ..utils import license_urlize
 from generic.utils import inclusion_cached_tag
 
 def last_updated_key():
@@ -45,6 +46,7 @@ def changelog_highlight_filter(text):
     return mark_safe(changelog_highlight(text))
 
 register.filter('obfuscate', text_sincode)
+register.filter('license_urlize', license_urlize)
 
 def recent_ebuilds_cache_key(num = 10):
     return 'recent_ebuilds_th_' + str(num)

diff --git a/gpackages/apps/packages/utils.py b/gpackages/apps/packages/utils.py
index 25150c2..c0ffbee 100644
--- a/gpackages/apps/packages/utils.py
+++ b/gpackages/apps/packages/utils.py
@@ -1,4 +1,13 @@
 from package_info.generic import ToStrMixin
+from django.utils.html import escape
+from django.utils.safestring import mark_safe
+from django.core.urlresolvers import reverse
+from django.core.urlresolvers import NoReverseMatch
+import re
+LICENSE_STR_RE = r'[a-zA-Z0-9_\-\+\.]+'
+USE_FLAG_RE = r'[a-zA-Z0-9]+\?'
+license_re = re.compile(LICENSE_STR_RE)
+use_re = re.compile(USE_FLAG_RE)
 
 def gen_args(args):
     t = '%s=%s'
@@ -10,3 +19,34 @@ def get_link(host, script, args):
                                                    'script': script,
                                                    'args': get_args(args)}
 
+def license_tokenize(license_str):
+    s, l = 0, len(license_str)
+    while s<l:
+        m = use_re.match(license_str, s)
+        if m is not None:
+            yield ('use', m.group())
+            s = m.end()
+            continue
+        m = license_re.match(license_str, s)
+        if m is not None:
+            yield ('license', m.group())
+            s = m.end()
+            continue
+        
+        yield (None, license_str[s])
+        s += 1
+
+def license_urlize(license_str):
+    res_str = u''
+    for token, value in license_tokenize(license_str):
+        value = escape(value)
+        if token == 'license':
+            try:
+                link = reverse('license', kwargs = {'slug': value})
+            except NoReverseMatch:
+                pass
+            else:
+                value = mark_safe('<a href="{1}">{0}</a>'.format(value, link))
+
+        res_str += value
+    return mark_safe(res_str)

diff --git a/gpackages/templates/package.html b/gpackages/templates/package.html
index 00f1191..d1d4640 100644
--- a/gpackages/templates/package.html
+++ b/gpackages/templates/package.html
@@ -17,7 +17,7 @@
             {% use_flag_table package %}
         </div>
         <div class="tab-pane" id="tab3">
-            {{ package.latest_ebuild.license }}
+            {{ package.latest_ebuild.license|license_urlize }}
         </div>
     </div>
     </div>