From 9cdc536fffc9e77903892c2b14e9462a6ec94ee5 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Wed, 12 Jan 2011 10:08:29 -0600 Subject: Add arch-specific group overview pages This is easy enough to refactor and support with our current infrastructure and group-fetching functions. Signed-off-by: Dan McGee --- packages/utils.py | 10 ++++++---- packages/views.py | 14 +++++++++++--- 2 files changed, 17 insertions(+), 7 deletions(-) (limited to 'packages') diff --git a/packages/utils.py b/packages/utils.py index 93d0de7..aaec0ec 100644 --- a/packages/utils.py +++ b/packages/utils.py @@ -8,7 +8,7 @@ from main.utils import cache_function from .models import PackageGroup @cache_function(300) -def get_group_info(): +def get_group_info(include_arches=None): raw_groups = PackageGroup.objects.values_list( 'name', 'pkg__arch__name').order_by('name').annotate( cnt=Count('pkg'), last_update=Max('pkg__last_update')) @@ -38,10 +38,12 @@ def get_group_info(): new_g['arch'] = arch arch_groups[grp['name']] = new_g - # now transform it back into a sorted list + # now transform it back into a sorted list, including only the specified + # architectures if we got a list groups = [] - for val in group_mapping.itervalues(): - groups.extend(val.itervalues()) + for key, val in group_mapping.iteritems(): + if not include_arches or key in include_arches: + groups.extend(val.itervalues()) return sorted(groups, key=itemgetter('name', 'arch')) class Difference(object): diff --git a/packages/views.py b/packages/views.py index 4e68314..e00e6f9 100644 --- a/packages/views.py +++ b/packages/views.py @@ -88,9 +88,17 @@ def details(request, name='', repo='', arch=''): return redirect("/packages/?arch=%s&repo=%s&q=%s" % ( arch.lower(), repo.title(), name)) -def groups(request): - grps = get_group_info() - return direct_to_template(request, 'packages/groups.html', {'groups': grps}) +def groups(request, arch=None): + arches = [] + if arch: + get_object_or_404(Arch, name=arch, agnostic=False) + arches.append(arch) + grps = get_group_info(arches) + context = { + 'groups': grps, + 'arch': arch, + } + return direct_to_template(request, 'packages/groups.html', context) def group_details(request, arch, name): arch = get_object_or_404(Arch, name=arch) -- cgit v1.2.3-24-g4f1b