From a10798b756bbfc5d8dbad76546ca670efca75e56 Mon Sep 17 00:00:00 2001
From: Dan McGee <dan@archlinux.org>
Date: Wed, 23 Jan 2013 09:18:59 -0700
Subject: Use querysets for calls to get_object_or_404(Package)

This works better in most cases since we need the architecture and
repository objects at some point during the view process.

Signed-off-by: Dan McGee <dan@archlinux.org>
---
 packages/views/display.py | 8 ++++----
 packages/views/flag.py    | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'packages/views')

diff --git a/packages/views/display.py b/packages/views/display.py
index 445c1abe..c2369aba 100644
--- a/packages/views/display.py
+++ b/packages/views/display.py
@@ -168,7 +168,7 @@ def group_details(request, arch, name):
 
 
 def files(request, name, repo, arch):
-    pkg = get_object_or_404(Package,
+    pkg = get_object_or_404(Package.objects.normal(),
             pkgname=name, repo__name__iexact=repo, arch__name=arch)
     # files are inserted in sorted order, so preserve that
     fileslist = PackageFile.objects.filter(pkg=pkg).order_by('id')
@@ -185,14 +185,14 @@ def files(request, name, repo, arch):
 
 
 def details_json(request, name, repo, arch):
-    pkg = get_object_or_404(Package,
+    pkg = get_object_or_404(Package.objects.normal(),
             pkgname=name, repo__name__iexact=repo, arch__name=arch)
     to_json = json.dumps(pkg, ensure_ascii=False, cls=PackageJSONEncoder)
     return HttpResponse(to_json, content_type='application/json')
 
 
 def files_json(request, name, repo, arch):
-    pkg = get_object_or_404(Package,
+    pkg = get_object_or_404(Package.objects.normal(),
             pkgname=name, repo__name__iexact=repo, arch__name=arch)
     # files are inserted in sorted order, so preserve that
     fileslist = PackageFile.objects.filter(pkg=pkg).order_by('id')
@@ -213,7 +213,7 @@ def files_json(request, name, repo, arch):
 
 
 def download(request, name, repo, arch):
-    pkg = get_object_or_404(Package,
+    pkg = get_object_or_404(Package.objects.normal(),
             pkgname=name, repo__name__iexact=repo, arch__name=arch)
     url = get_mirror_url_for_download()
     if not url:
diff --git a/packages/views/flag.py b/packages/views/flag.py
index dadadd19..edb3f092 100644
--- a/packages/views/flag.py
+++ b/packages/views/flag.py
@@ -49,7 +49,7 @@ def flaghelp(request):
 
 @never_cache
 def flag(request, name, repo, arch):
-    pkg = get_object_or_404(Package,
+    pkg = get_object_or_404(Package.objects.normal(),
             pkgname=name, repo__name__iexact=repo, arch__name=arch)
     if pkg.flag_date is not None:
         # already flagged. do nothing.
@@ -158,7 +158,7 @@ def flag_confirmed(request, name, repo, arch):
 
 @permission_required('main.change_package')
 def unflag(request, name, repo, arch):
-    pkg = get_object_or_404(Package,
+    pkg = get_object_or_404(Package.objects.normal(),
             pkgname=name, repo__name__iexact=repo, arch__name=arch)
     pkg.flag_date = None
     pkg.save()
@@ -166,7 +166,7 @@ def unflag(request, name, repo, arch):
 
 @permission_required('main.change_package')
 def unflag_all(request, name, repo, arch):
-    pkg = get_object_or_404(Package,
+    pkg = get_object_or_404(Package.objects.normal(),
             pkgname=name, repo__name__iexact=repo, arch__name=arch)
     # find all packages from (hopefully) the same PKGBUILD
     pkgs = Package.objects.filter(pkgbase=pkg.pkgbase,
-- 
cgit v1.2.3-2-g168b


From dc6cc49f6f876983f76f5f8c05a2285801f27ea0 Mon Sep 17 00:00:00 2001
From: Dan McGee <dan@archlinux.org>
Date: Wed, 23 Jan 2013 09:20:19 -0700
Subject: Use more modern verison of string template formatting

Signed-off-by: Dan McGee <dan@archlinux.org>
---
 packages/views/display.py | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

(limited to 'packages/views')

diff --git a/packages/views/display.py b/packages/views/display.py
index c2369aba..497c8d48 100644
--- a/packages/views/display.py
+++ b/packages/views/display.py
@@ -1,6 +1,5 @@
 import datetime
 import json
-from string import Template
 from urllib import urlencode
 
 from django.http import HttpResponse, Http404
@@ -223,12 +222,9 @@ def download(request, name, repo, arch):
         # grab the first non-any arch to fake the download path
         arch = Arch.objects.exclude(agnostic=True)[0].name
     values = {
-        'host': url.url,
-        'arch': arch,
-        'repo': pkg.repo.name.lower(),
-        'file': pkg.filename,
     }
-    url = Template('${host}${repo}/os/${arch}/${file}').substitute(values)
+    url = '{host}{repo}/os/{arch}/{filename}'.format(host=url.url,
+            repo=pkg.repo.name.lower(), arch=arch, filename=pkg.filename)
     return redirect(url)
 
 # vim: set ts=4 sw=4 et:
-- 
cgit v1.2.3-2-g168b