1 files changed, 61 insertions, 5 deletions

diff --git a/packages/templatetags/package_extras.py b/packages/templatetags/package_extras.py
index d4d0ca1a..011e9cea 100644
--- a/packages/templatetags/package_extras.py
+++ b/packages/templatetags/package_extras.py
@@ -1,4 +1,4 @@
-from urllib import urlencode, quote as urlquote
+from urllib import urlencode, quote as urlquote, unquote
 try:
     from urlparse import parse_qs
 except ImportError:
@@ -9,6 +9,21 @@ from django.utils.html import escape
 
 register = template.Library()
 
+def link_encode(url, query, doseq=False):
+    data = urlencode(query, doseq).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
+
 class BuildQueryStringNode(template.Node):
     def __init__(self, sortfield):
         self.sortfield = sortfield
@@ -22,7 +37,7 @@ class BuildQueryStringNode(template.Node):
                 qs['sort'] = ['-' + self.sortfield]
         else:
             qs['sort'] = [self.sortfield]
-        return urlencode(qs, True)
+        return urlencode(qs, True).replace('&', '&')
 
 @register.tag(name='buildsortqs')
 def do_buildsortqs(parser, token):
@@ -37,6 +52,15 @@ def do_buildsortqs(parser, token):
     return BuildQueryStringNode(sortfield[1:-1])
 
 @register.simple_tag
+def pkg_details_link(pkg):
+    template = '<a href="%s" title="View package details for %s">%s</a>'
+    return template % (pkg.get_absolute_url(), pkg.pkgname, pkg.pkgname)
+
+@register.simple_tag
+def multi_pkg_details(pkgs):
+    return ', '.join([pkg_details_link(pkg) for pkg in pkgs])
+
+@register.simple_tag
 def userpkgs(user):
     if user:
         # TODO don't hardcode
@@ -49,21 +73,53 @@ def userpkgs(user):
     return ''
 
 @register.simple_tag
+def get_download_link(package):
+    parts = {
+        "repo": package.repo.name.lower(),
+        "arch": package.arch.name,
+        "pkgfile": package.filename
+    }
+    if parts["arch"] == "any":
+        parts["arch"] = "i686"
+    linkbase = "//repo.parabolagnulinux.org/%(repo)s/os/%(arch)s/%(pkgfile)s"
+    return linkbase % parts
+
+@register.simple_tag
+def get_wiki_link(package):
+    url = "//wiki.parabolagnulinux.org/index.php"
+    data = {
+        'title': "Special:Search",
+        'search': package.pkgname,
+    }
+    return link_encode(url, data)
+
+@register.simple_tag
+def svn_arch(package):
+    repo = package.repo.name.lower()
+    return svn_link(package, "repos/%s-%s" % (repo, package.arch.name))
+
+@register.simple_tag
+def svn_trunk(package):
+    return svn_link(package, "trunk")
+
+@register.simple_tag
 def bugs_list(package):
+    url = "//bugs.parabolagnulinux.org/bugs/issue"
     data = {
         '@action': 'search',
         'title': package.pkgname,
     }
-    return "https://bugs.parabolagnulinux.org/bugs/issue?%s" % urlencode(data)
+    return link_encode(url, data)
 
 @register.simple_tag
 def bug_report(package):
+    url = "//bugs.parabolagnulinux.org/bugs/issue"
     data = {
         '@template': 'item',
         'keyword': 'packages',
         'title': '[%s]' % package.pkgname,
     }
-    return "https://bugs.parabolagnulinux.org/bugs/issue?%s" % urlencode(data) 
+    return link_encode(url, data)
 
 @register.simple_tag
 def flag_unfree(package):
@@ -74,5 +130,5 @@ def flag_unfree(package):
         'priority': 'critical',
         'title': '[%s] Please put your reasons here (register first if you haven\'t)' % package.pkgname,
     }
-    return "https://bugs.parabolagnulinux.org/bugs/issue?%s" % urlencode(data) 
+    return "//bugs.parabolagnulinux.org/bugs/issue?%s" % urlencode(data) 
 # vim: set ts=4 sw=4 et: