Merge branch 'jinja'

3 files changed, 81 insertions, 92 deletions

diff --git a/packages/models.py b/packages/models.py
index dd69e7d3..03f03422 100644
--- a/packages/models.py
+++ b/packages/models.py
@@ -379,6 +379,13 @@ class RelatedToBase(models.Model):
         given criteria. It will not search provisions, but will find packages
         named and matching repo characteristics if possible.'''
         pkgs = Package.objects.normal().filter(pkgname=self.name)
+        # TODO: this may in fact be faster- select only the fields we know will
+        # actually get used, saving us some bandwidth and hopefully query
+        # construction time. However, reality hasn't quite proved it out yet.
+        #pkgs = Package.objects.select_related('repo', 'arch').only(
+        #        'id', 'pkgname', 'epoch', 'pkgver', 'pkgrel',
+        #        'repo__id', 'repo__name', 'repo__testing', 'repo__staging',
+        #        'arch__id', 'arch__name').filter(pkgname=self.name)
         if not self.pkg.arch.agnostic:
             # make sure we match architectures if possible
             arches = self.pkg.applicable_arches()
diff --git a/packages/templatetags/jinja2.py b/packages/templatetags/jinja2.py
new file mode 100644
index 00000000..22f9914b
--- /dev/null
+++ b/packages/templatetags/jinja2.py
@@ -0,0 +1,72 @@
+from urllib import urlencode, quote as urlquote, unquote
+from django.utils.html import escape
+from django_jinja import library
+from main.templatetags import pgp
+
+
+@library.filter
+def url_unquote(original_url):
+    try:
+        url = original_url
+        if isinstance(url, unicode):
+            url = url.encode('ascii')
+        url = unquote(url).decode('utf-8')
+        return url
+    except UnicodeError:
+        return original_url
+
+
+def link_encode(url, query):
+    # massage the data into all utf-8 encoded strings first, so urlencode
+    # doesn't barf at the data we pass it
+    query = {k: unicode(v).encode('utf-8') for k, v in query.items()}
+    data = urlencode(query)
+    return "%s?%s" % (url, data)
+
+
+@library.global_function
+def pgp_key_link(key_id, link_text=None):
+    return pgp.pgp_key_link(key_id, link_text)
+
+
+@library.global_function
+def scm_link(package, operation):
+    parts = (package.repo.svn_root, operation, package.pkgbase)
+    linkbase = (
+        "https://projects.archlinux.org/svntogit/%s.git/%s/trunk?"
+        "h=packages/%s")
+    return linkbase % tuple(urlquote(part.encode('utf-8')) for part in parts)
+
+
+@library.global_function
+def wiki_link(package):
+    url = "https://wiki.archlinux.org/index.php/Special:Search"
+    data = {
+        'search': package.pkgname,
+    }
+    return link_encode(url, data)
+
+
+@library.global_function
+def bugs_list(package):
+    url = "https://bugs.archlinux.org/"
+    data = {
+        'project': package.repo.bugs_project,
+        'cat[]': package.repo.bugs_category,
+        'string': package.pkgname,
+    }
+    return link_encode(url, data)
+
+
+@library.global_function
+def bug_report(package):
+    url = "https://bugs.archlinux.org/newtask"
+    data = {
+        'project': package.repo.bugs_project,
+        'product_category': package.repo.bugs_category,
+        'item_summary': '[%s] PLEASE ENTER SUMMARY' % package.pkgname,
+    }
+    return link_encode(url, data)
+
+
+# vim: set ts=4 sw=4 et:
diff --git a/packages/templatetags/package_extras.py b/packages/templatetags/package_extras.py
index 3ce64748..73a39092 100644
--- a/packages/templatetags/package_extras.py
+++ b/packages/templatetags/package_extras.py
@@ -1,33 +1,13 @@
-from urllib import urlencode, quote as urlquote, unquote
+from urllib import urlencode
 try:
     from urlparse import parse_qs
 except ImportError:
     from cgi import parse_qs
 
 from django import template
-from django.utils.html import escape
-
-register = template.Library()
-
-
-def link_encode(url, query):
-    # massage the data into all utf-8 encoded strings first, so urlencode
-    # doesn't barf at the data we pass it
-    query = {k: unicode(v).encode('utf-8') for k, v in query.items()}
-    data = urlencode(query).replace('&', '&')
-    return "%s?%s" % (url, data)
 
 
-@register.filter
-def url_unquote(original_url):
-    try:
-        url = original_url
-        if isinstance(url, unicode):
-            url = url.encode('ascii')
-        url = unquote(url).decode('utf-8')
-        return url
-    except UnicodeError:
-        return original_url
+register = template.Library()
 
 
 class BuildQueryStringNode(template.Node):
@@ -79,74 +59,4 @@ def pkg_details_link(pkg, link_title=None, honor_flagged=False):
     return link % (pkg.get_absolute_url(), pkg.pkgname, link_content)
 
 
-@register.simple_tag
-def multi_pkg_details(pkgs):
-    return ', '.join([pkg_details_link(pkg) for pkg in pkgs])
-
-
-@register.simple_tag
-def maintainer_link(user):
-    if user:
-        # TODO don't hardcode
-        title = escape('View packages maintained by ' + user.get_full_name())
-        return '<a href="/packages/?maintainer=%s" title="%s">%s</a>' % (
-                user.username,
-                title,
-                user.get_full_name(),
-        )
-    return ''
-
-
-@register.simple_tag
-def packager_link(user):
-    if user:
-        # TODO don't hardcode
-        title = escape('View packages packaged by ' + user.get_full_name())
-        return '<a href="/packages/?packager=%s" title="%s">%s</a>' % (
-                user.username,
-                title,
-                user.get_full_name(),
-        )
-    return ''
-
-
-@register.simple_tag
-def scm_link(package, operation):
-    parts = (package.repo.svn_root, operation, package.pkgbase)
-    linkbase = (
-        "https://projects.archlinux.org/svntogit/%s.git/%s/trunk?"
-        "h=packages/%s")
-    return linkbase % tuple(urlquote(part.encode('utf-8')) for part in parts)
-
-
-@register.simple_tag
-def get_wiki_link(package):
-    url = "https://wiki.archlinux.org/index.php/Special:Search"
-    data = {
-        'search': package.pkgname,
-    }
-    return link_encode(url, data)
-
-
-@register.simple_tag
-def bugs_list(package):
-    url = "https://bugs.archlinux.org/"
-    data = {
-        'project': package.repo.bugs_project,
-        'cat[]': package.repo.bugs_category,
-        'string': package.pkgname,
-    }
-    return link_encode(url, data)
-
-
-@register.simple_tag
-def bug_report(package):
-    url = "https://bugs.archlinux.org/newtask"
-    data = {
-        'project': package.repo.bugs_project,
-        'product_category': package.repo.bugs_category,
-        'item_summary': '[%s] PLEASE ENTER SUMMARY' % package.pkgname,
-    }
-    return link_encode(url, data)
-
 # vim: set ts=4 sw=4 et: