From 546012c8e0d9e757e4670dd14e41acb83eb4e997 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Sat, 3 Dec 2011 13:27:12 -0600 Subject: Show files and directory count in standalone package files view Signed-off-by: Dan McGee --- packages/views/__init__.py | 4 ++++ templates/packages/files.html | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/packages/views/__init__.py b/packages/views/__init__.py index e3264161..b420ce60 100644 --- a/packages/views/__init__.py +++ b/packages/views/__init__.py @@ -169,9 +169,13 @@ def files(request, name, repo, arch): pkg = get_object_or_404(Package, pkgname=name, repo__name__iexact=repo, arch__name=arch) fileslist = PackageFile.objects.filter(pkg=pkg).order_by('directory', 'filename') + dir_count = sum(1 for f in fileslist if f.is_directory) + files_count = len(fileslist) - dir_count context = { 'pkg': pkg, 'files': fileslist, + 'files_count': files_count, + 'dir_count': dir_count, } template = 'packages/files.html' if request.is_ajax(): diff --git a/templates/packages/files.html b/templates/packages/files.html index 50ab6e83..a564f726 100644 --- a/templates/packages/files.html +++ b/templates/packages/files.html @@ -8,9 +8,9 @@

Package File List: {{ pkg.pkgname }} {{ pkg.full_version }}

Back to Package

+

Package has {{ files_count }} file{{ files_count|pluralize }} and {{ dir_count }} director{{ dir_count|pluralize:"y,ies" }}.

{% include "packages/files-list.html" %}
{% endblock %} - -- cgit v1.1-4-g5e80