From a0cd93c1d528fbb1c5919fed0a52b09bbe84933d Mon Sep 17 00:00:00 2001
From: Dan McGee <dan@archlinux.org>
Date: Thu, 11 Feb 2010 22:15:13 -0600
Subject: Bring package files view up to speed

Move it away from the numeric pkgid-based view of old to the new pretty URL
format. This does nothing to actually make the view show files (or even
provide a link to it), but that will come in future commits.

Signed-off-by: Dan McGee <dan@archlinux.org>
---
 packages/views.py | 9 +++++----
 urls.py           | 3 ++-
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/packages/views.py b/packages/views.py
index 97929ed3..acd71b2d 100644
--- a/packages/views.py
+++ b/packages/views.py
@@ -60,7 +60,7 @@ def update(request):
 
 def details(request, name='', repo='', arch=''):
     if all([name, repo, arch]):
-        pkg= get_object_or_404(Package,
+        pkg = get_object_or_404(Package,
                 pkgname=name, repo__name__iexact=repo, arch__name=arch)
         return render_to_response('packages/details.html', RequestContext(
             request, {'pkg': pkg, }))
@@ -178,9 +178,10 @@ def search(request, page=None):
             template_object_name="package",
             extra_context=page_dict)
 
-def files(request, pkgid):
-    pkg = get_object_or_404(Package, id=pkgid)
-    files = PackageFile.objects.filter(pkg=pkgid)
+def files(request, name='', repo='', arch=''):
+    pkg = get_object_or_404(Package,
+            pkgname=name, repo__name__iexact=repo, arch__name=arch)
+    files = PackageFile.objects.filter(pkg=pkg)
     return render_to_response('packages/files.html', RequestContext(request, {'pkg':pkg,'files':files}))
 
 @permission_required('main.change_package')
diff --git a/urls.py b/urls.py
index ec04edce..e53d918a 100644
--- a/urls.py
+++ b/urls.py
@@ -27,7 +27,6 @@ urlpatterns = patterns('',
     (r'^packages/flag/(\d+)/$', 'packages.views.flag'),
     (r'^packages/flaghelp/$', 'packages.views.flaghelp'),
     (r'^packages/unflag/(\d+)/$',        'packages.views.unflag'),
-    (r'^packages/files/(\d+)/$',         'packages.views.files'),
     (r'^packages/signoffs/$',              'packages.views.signoffs'),
     (r'^packages/signoff_package/(?P<arch>[A-z0-9]+)/(?P<pkgname>[A-z0-9\-+.]+)/$',
         'packages.views.signoff_package'),
@@ -46,6 +45,8 @@ urlpatterns = patterns('',
         'packages.views.details'),
     (r'^packages/(?P<repo>[A-z0-9\-]+)/(?P<arch>[A-z0-9]+)/(?P<name>[A-z0-9\-+.]+)/$',
         'packages.views.details'),
+    (r'^packages/(?P<repo>[A-z0-9\-]+)/(?P<arch>[A-z0-9]+)/(?P<name>[A-z0-9\-+.]+)/files/$',
+        'packages.views.files'),
     (r'^packages/(?P<repo>[A-z0-9\-]+)/(?P<arch>[A-z0-9]+)/(?P<name>[A-z0-9\-+.]+)/maintainer/$',
         'packages.views.getmaintainer'),
 
-- 
cgit v1.2.3-55-g3dc8