Merge branch 'master' of /srv/git/projects/parabolaweb

1 files changed, 109 insertions, 45 deletions

diff --git a/packages/views.py b/packages/views.py
index 59779fe4..adf6c0af 100644
--- a/packages/views.py
+++ b/packages/views.py
@@ -18,6 +18,7 @@ from django.views.generic.simple import direct_to_template
 
 from datetime import datetime
 import string
+from urllib import urlencode
 
 from main.models import Package, PackageFile
 from main.models import Arch, Repo, Signoff
@@ -83,12 +84,39 @@ def update(request):
 
 def details(request, name='', repo='', arch=''):
     if all([name, repo, arch]):
-        pkg = get_object_or_404(Package,
-                pkgname=name, repo__name__iexact=repo, arch__name=arch)
-        return direct_to_template(request, 'packages/details.html', {'pkg': pkg, })
+        try:
+            pkg = Package.objects.select_related(
+                    'arch', 'repo', 'packager').get(pkgname=name,
+                    repo__name__iexact=repo, arch__name=arch)
+            return direct_to_template(request, 'packages/details.html',
+                    {'pkg': pkg, })
+        except Package.DoesNotExist:
+            arch = get_object_or_404(Arch, name=arch)
+            arches = [ arch ]
+            arches.extend(Arch.objects.filter(agnostic=True))
+            repo = get_object_or_404(Repo, name__iexact=repo)
+            pkgs = Package.objects.filter(pkgbase=name,
+                    repo__testing=repo.testing, arch__in=arches)
+            pkgs = pkgs.select_related('arch', 'repo').order_by('pkgname')
+            if len(pkgs) == 0:
+                raise Http404
+            context = {
+                'list_title': 'Split Package Details',
+                'name': name,
+                'arch': arch,
+                'packages': pkgs,
+            }
+            return direct_to_template(request, 'packages/packages_list.html',
+                    context)
     else:
-        return redirect("/packages/?arch=%s&repo=%s&q=%s" % (
-            arch.lower(), repo.title(), name))
+        pkg_data = [
+            ('arch', arch.lower()),
+            ('repo', repo.lower()),
+            ('q',    name),
+        ]
+        # only include non-blank values in the query we generate
+        pkg_data = [(x, y) for x, y in pkg_data if y]
+        return redirect("/packages/?%s" % urlencode(pkg_data))
 
 def groups(request, arch=None):
     arches = []
@@ -107,15 +135,16 @@ def group_details(request, arch, name):
     arches = [ arch ]
     arches.extend(Arch.objects.filter(agnostic=True))
     pkgs = Package.objects.filter(groups__name=name, arch__in=arches)
-    pkgs = pkgs.order_by('pkgname')
+    pkgs = pkgs.select_related('arch', 'repo').order_by('pkgname')
     if len(pkgs) == 0:
         raise Http404
     context = {
-        'groupname': name,
+        'list_title': 'Group Details',
+        'name': name,
         'arch': arch,
         'packages': pkgs,
     }
-    return direct_to_template(request, 'packages/group_details.html', context)
+    return direct_to_template(request, 'packages/packages_list.html', context)
 
 def getmaintainer(request, name, repo, arch):
     "Returns the maintainers as plaintext."
@@ -126,6 +155,25 @@ def getmaintainer(request, name, repo, arch):
 
     return HttpResponse(str('\n'.join(names)), mimetype='text/plain')
 
+def coerce_limit_value(value):
+    if not value:
+        return None
+    if value == 'all':
+        # negative value indicates show all results
+        return -1
+    value = int(value)
+    if value < 0:
+        raise ValueError
+    return value
+
+class LimitTypedChoiceField(forms.TypedChoiceField):
+    def valid_value(self, value):
+        try:
+            coerce_limit_value(value)
+            return True
+        except (ValueError, TypeError):
+            return False
+
 class PackageSearchForm(forms.Form):
     repo = forms.MultipleChoiceField(required=False)
     arch = forms.MultipleChoiceField(required=False)
@@ -136,25 +184,12 @@ class PackageSearchForm(forms.Form):
     flagged = forms.ChoiceField(
             choices=[('', 'All')] + make_choice(['Flagged', 'Not Flagged']),
             required=False)
-    limit = forms.ChoiceField(
+    limit = LimitTypedChoiceField(
             choices=make_choice([50, 100, 250]) + [('all', 'All')],
+            coerce=coerce_limit_value,
             required=False,
             initial=50)
 
-    def clean_limit(self):
-        limit = self.cleaned_data['limit']
-        if limit == 'all':
-            limit = None
-        elif limit:
-            try:
-                limit = int(limit)
-            except:
-                raise forms.ValidationError("Should be an integer")
-        else:
-            limit = 50
-        return limit
-
-
     def __init__(self, *args, **kwargs):
         super(PackageSearchForm, self).__init__(*args, **kwargs)
         self.fields['repo'].choices = make_choice(
@@ -168,12 +203,10 @@ class PackageSearchForm(forms.Form):
                 [(m.username, m.get_full_name()) for m in maints]
 
 def search(request, page=None):
-    current_query = '?'
     limit = 50
     packages = Package.objects.select_related('arch', 'repo')
 
     if request.GET:
-        current_query += request.GET.urlencode()
         form = PackageSearchForm(data=request.GET)
         if form.is_valid():
             if form.cleaned_data['repo']:
@@ -188,11 +221,12 @@ def search(request, page=None):
                 inner_q = PackageRelation.objects.all().values('pkgbase')
                 packages = packages.exclude(pkgbase__in=inner_q)
             elif form.cleaned_data['maintainer']:
-                inner_q = PackageRelation.objects.filter(user__username=form.cleaned_data['maintainer']).values('pkgbase')
+                inner_q = PackageRelation.objects.filter(
+                        user__username=form.cleaned_data['maintainer']).values('pkgbase')
                 packages = packages.filter(pkgbase__in=inner_q)
 
             if form.cleaned_data['flagged'] == 'Flagged':
-                packages=packages.filter(flag_date__isnull=False)
+                packages = packages.filter(flag_date__isnull=False)
             elif form.cleaned_data['flagged'] == 'Not Flagged':
                 packages = packages.filter(flag_date__isnull=True)
 
@@ -204,16 +238,26 @@ def search(request, page=None):
                 lu = form.cleaned_data['last_update']
                 packages = packages.filter(last_update__gte=
                         datetime(lu.year, lu.month, lu.day, 0, 0))
-            limit = form.cleaned_data['limit']
+
+            asked_limit = form.cleaned_data['limit']
+            if asked_limit and asked_limit < 0:
+                limit = None
+            elif asked_limit:
+                limit = asked_limit
+        else:
+            # Form had errors, don't return any results, just the busted form
+            packages = Package.objects.none()
     else:
         form = PackageSearchForm()
 
-    page_dict = {'search_form': form,
-            'current_query': current_query
-            }
     if packages.count() == 1:
         return redirect(packages[0])
 
+    current_query = request.GET.urlencode()
+    page_dict = {
+            'search_form': form,
+            'current_query': current_query
+    }
     allowed_sort = ["arch", "repo", "pkgname", "last_update", "flag_date"]
     allowed_sort += ["-" + s for s in allowed_sort]
     sort = request.GET.get('sort', None)
@@ -323,18 +367,21 @@ class FlagForm(forms.Form):
 def flag(request, name, repo, arch):
     pkg = get_object_or_404(Package,
             pkgname=name, repo__name__iexact=repo, arch__name=arch)
-    context = {'pkg': pkg}
     if pkg.flag_date is not None:
         # already flagged. do nothing.
-        return direct_to_template(request, 'packages/flagged.html', context)
+        return direct_to_template(request, 'packages/flagged.html', {'pkg': pkg})
+    # find all packages from (hopefully) the same PKGBUILD
+    pkgs = Package.objects.select_related('arch', 'repo').filter(
+            pkgbase=pkg.pkgbase, flag_date__isnull=True,
+            repo__testing=pkg.repo.testing).order_by(
+            'pkgname', 'repo__name', 'arch__name')
 
     if request.POST:
         form = FlagForm(request.POST)
         if form.is_valid() and form.cleaned_data['website'] == '':
-            # find all packages from (hopefully) the same PKGBUILD
-            pkgs = Package.objects.filter(
-                    pkgbase=pkg.pkgbase, repo__testing=pkg.repo.testing)
-            pkgs.update(flag_date=datetime.now())
+            # save the package list for later use
+            flagged_pkgs = list(pkgs)
+            pkgs.update(flag_date=datetime.utcnow())
 
             maints = pkg.maintainers
             if not maints:
@@ -350,28 +397,44 @@ def flag(request, name, repo, arch):
                         toemail.append(maint.email)
 
             if toemail:
-                # send notification email to the maintainer
+                # send notification email to the maintainers
                 t = loader.get_template('packages/outofdate.txt')
                 c = Context({
                     'email': form.cleaned_data['email'],
                     'message': form.cleaned_data['usermessage'],
                     'pkg': pkg,
-                    'weburl': pkg.get_full_url(),
+                    'packages': flagged_pkgs,
                 })
                 send_mail(subject,
                         t.render(c),
-                        'Arch Website Notification <nobody@archlinux.org>',
+                        'Parabola Packages <packages@list.parabolagnulinux.org>',
                         toemail,
                         fail_silently=True)
 
-            context['confirmed'] = True
+            return redirect('package-flag-confirmed', name=name, repo=repo,
+                    arch=arch)
     else:
         form = FlagForm()
 
-    context['form'] = form
-
+    context = {
+        'package': pkg,
+        'packages': pkgs,
+        'form': form
+    }
     return direct_to_template(request, 'packages/flag.html', context)
 
+def flag_confirmed(request, name, repo, arch):
+    pkg = get_object_or_404(Package,
+            pkgname=name, repo__name__iexact=repo, arch__name=arch)
+    pkgs = Package.objects.select_related('arch', 'repo').filter(
+            pkgbase=pkg.pkgbase, flag_date=pkg.flag_date,
+            repo__testing=pkg.repo.testing).order_by(
+            'pkgname', 'repo__name', 'arch__name')
+
+    context = {'package': pkg, 'packages': pkgs}
+
+    return direct_to_template(request, 'packages/flag_confirmed.html', context)
+
 def download(request, name, repo, arch):
     pkg = get_object_or_404(Package,
             pkgname=name, repo__name__iexact=repo, arch__name=arch)
@@ -382,13 +445,13 @@ def download(request, name, repo, arch):
     if pkg.arch.agnostic:
         # grab the first non-any arch to fake the download path
         arch = Arch.objects.exclude(agnostic=True)[0].name
-    details = {
+    values = {
         'host': mirrorurl.url,
         'arch': arch,
         'repo': pkg.repo.name.lower(),
         'file': pkg.filename,
     }
-    url = string.Template('${host}${repo}/os/${arch}/${file}').substitute(details)
+    url = string.Template('${host}${repo}/os/${arch}/${file}').substitute(values)
     return redirect(url)
 
 def arch_differences(request):
@@ -404,6 +467,7 @@ def arch_differences(request):
     return direct_to_template(request, 'packages/differences.html', context)
 
 @permission_required('main.change_package')
+@never_cache
 def stale_relations(request):
     relations = PackageRelation.objects.select_related('user')
     pkgbases = Package.objects.all().values('pkgbase')