X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/357027375ff8867f42ca34bcbfb5a78b5b185fc3..45b3f39b2548169718f640227d3c09064cdfa9cb:/src/reporting/views.py?ds=sidebyside

diff --git a/src/reporting/views.py b/src/reporting/views.py
index 8cb2715d5..cc1bf7ee5 100644
--- a/src/reporting/views.py
+++ b/src/reporting/views.py
@@ -7,8 +7,7 @@ from datetime import date
 from django.conf import settings
 from django.contrib.admin.views.decorators import staff_member_required
 from django.db.models import Count
-from django.shortcuts import render_to_response
-from django.template import RequestContext
+from django.shortcuts import render
 
 from catalogue.models import Book, BookMedia
 from reporting.utils import render_to_pdf, render_to_csv, generated_file_view
@@ -16,40 +15,45 @@ from reporting.utils import render_to_pdf, render_to_csv, generated_file_view
 
 @staff_member_required
 def stats_page(request):
-    media = BookMedia.objects.count()
-    media_types = BookMedia.objects.values('type').\
-            annotate(count=Count('type')).\
-            order_by('type')
+    media_types = BookMedia.objects.values('type').annotate(count=Count('type')).order_by('type')
     for mt in media_types:
         mt['size'] = sum(b.file.size for b in BookMedia.objects.filter(type=mt['type']).iterator())
         if mt['type'] in ('mp3', 'ogg'):
-            deprecated = BookMedia.objects.filter(
-                    type=mt['type'], source_sha1=None)
+            deprecated = BookMedia.objects.filter(type=mt['type'], source_sha1=None)
             mt['deprecated'] = deprecated.count()
             mt['deprecated_files'] = deprecated.order_by('book', 'name')
         else:
             mt['deprecated'] = '-'
 
-    licenses = set(((b.extra_info.get('license'), b.extra_info.get('license_description'))
-        for b in Book.objects.all().iterator() if b.extra_info.get('license')))
+    licenses = set(
+        (b.extra_info.get('license'), b.extra_info.get('license_description'))
+        for b in Book.objects.all().iterator() if b.extra_info.get('license'))
 
-    return render_to_response('reporting/main.html',
-                locals(), context_instance=RequestContext(request))
+    return render(request, 'reporting/main.html', {
+        'media_types': media_types,
+        'licenses': licenses,
+    })
 
 
 @generated_file_view('reports/katalog.pdf', 'application/pdf',
-        send_name=lambda: 'wolnelektury_%s.pdf' % date.today(),
-        signals=[Book.published])
+                     send_name=lambda: 'wolnelektury_%s.pdf' % date.today(), signals=[Book.published])
 def catalogue_pdf(path):
     books_by_author, orphans, books_by_parent = Book.book_list()
-    render_to_pdf(path, 'reporting/catalogue.texml', locals(), {
-            "wl-logo.png": os.path.join(settings.STATIC_ROOT, "img/logo-big.png"),
-        })
+    render_to_pdf(path, 'reporting/catalogue.texml', {
+        'books_by_author': books_by_author,
+        'orphans': orphans,
+        'books_by_parent': books_by_parent,
+    }, {
+        "wl-logo.png": os.path.join(settings.STATIC_ROOT, "img/logo-big.png"),
+    })
 
 
 @generated_file_view('reports/katalog.csv', 'application/csv',
-        send_name=lambda: 'wolnelektury_%s.csv' % date.today(),
-        signals=[Book.published])
+                     send_name=lambda: 'wolnelektury_%s.csv' % date.today(), signals=[Book.published])
 def catalogue_csv(path):
     books_by_author, orphans, books_by_parent = Book.book_list()
-    render_to_csv(path, 'reporting/catalogue.csv', locals())
+    render_to_csv(path, 'reporting/catalogue.csv', {
+        'books_by_author': books_by_author,
+        'orphans': orphans,
+        'books_by_parent': books_by_parent,
+    })