Fix for a bug introduced in refactoring: customized pdfs were instantly deleted,...

[wolnelektury.git] / apps / catalogue / views.py

diff --git a/apps/catalogue/views.py b/apps/catalogue/views.py
index 9168099..2bc1f10 100644 (file)
--- a/apps/catalogue/views.py
+++ b/apps/catalogue/views.py
@@ -2,12 +2,6 @@
 # This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later.
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
 #
-import tempfile
-import zipfile
-import tarfile
-import sys
-import pprint
-import traceback
 import re
 import itertools
 from datetime import datetime
@@ -34,13 +28,12 @@ from django.views.generic.list_detail import object_list
 
 from catalogue import models
 from catalogue import forms
-from catalogue.utils import split_tags
-from newtagging import views as newtagging_views
+from catalogue.utils import split_tags, AttachmentHttpResponse, async_build_pdf
 from pdcounter import models as pdcounter_models
 from pdcounter import views as pdcounter_views
 from suggest.forms import PublishingSuggestForm
-from slughifi import slughifi
 
+from os import path
 
 staff_required = user_passes_test(lambda user: user.is_staff)
 
@@ -83,34 +76,8 @@ def book_list(request, filter=None, template_name='catalogue/book_list.html'):
 
     form = forms.SearchForm()
 
-    books_by_parent = {}
-    books = models.Book.objects.all().order_by('parent_number', 'sort_key').only('title', 'parent', 'slug')
-    if filter:
-        books = books.filter(filter).distinct()
-        book_ids = set((book.pk for book in books))
-        for book in books:
-            parent = book.parent_id
-            if parent not in book_ids:
-                parent = None
-            books_by_parent.setdefault(parent, []).append(book)
-    else:
-        for book in books:
-            books_by_parent.setdefault(book.parent_id, []).append(book)
-
-    orphans = []
-    books_by_author = SortedDict()
+    books_by_author, orphans, books_by_parent = models.Book.book_list(filter)
     books_nav = SortedDict()
-    for tag in models.Tag.objects.filter(category='author'):
-        books_by_author[tag] = []
-
-    for book in books_by_parent.get(None,()):
-        authors = list(book.tags.filter(category='author'))
-        if authors:
-            for author in authors:
-                books_by_author[author].append(book)
-        else:
-            orphans.append(book)
-
     for tag in books_by_author:
         if books_by_author[tag]:
             books_nav.setdefault(tag.sort_key[0], []).append(tag)
@@ -287,6 +254,7 @@ def book_detail(request, slug):
     projects = sorted(projects)
 
     form = forms.SearchForm()
+    custom_pdf_form = forms.CustomPDFForm()
     return render_to_response('catalogue/book_detail.html', locals(),
         context_instance=RequestContext(request))
 
@@ -599,6 +567,10 @@ def download_shelf(request, slug):
     without loading the whole file into memory. A similar approach can
     be used for large dynamic PDF files.
     """
+    from slughifi import slughifi
+    import tempfile
+    import zipfile
+
     shelf = get_object_or_404(models.Tag, slug=slug, category='set')
 
     formats = []
@@ -747,6 +719,9 @@ def import_book(request):
         try:
             book_import_form.save()
         except:
+            import sys
+            import pprint
+            import traceback
             info = sys.exc_info()
             exception = pprint.pformat(info[1])
             tb = '\n'.join(traceback.format_tb(info[2]))
@@ -781,15 +756,29 @@ def tag_info(request, id):
 
 def download_zip(request, format, slug):
     url = None
-    if format == 'pdf':
-        url = models.Book.zip_pdf()
-    elif format == 'epub':
-        url = models.Book.zip_epub()
-    elif format == 'mobi':
-        url = models.Book.zip_mobi()
+    if format in ('pdf', 'epub', 'mobi'):
+        url = models.Book.zip_format(format)
     elif format == 'audiobook' and slug is not None:
         book = models.Book.objects.get(slug=slug)
         url = book.zip_audiobooks()
     else:
         raise Http404('No format specified for zip package')
     return HttpResponseRedirect(urlquote_plus(settings.MEDIA_URL + url, safe='/?='))
+
+
+def download_custom_pdf(request, slug):
+    book = models.Book.objects.get(slug=slug)
+    if request.method == 'GET':
+        form = forms.CustomPDFForm(request.GET)
+        if form.is_valid():
+            cust = form.customizations
+            pdf_file = models.get_customized_pdf_path(book, cust)
+                
+            if not path.exists(pdf_file):
+                result = async_build_pdf.delay(book.id, cust, pdf_file)
+                result.wait()
+            return AttachmentHttpResponse(file_name=("%s.pdf" % book.slug), file_path=pdf_file, mimetype="application/pdf")
+        else:
+            raise Http404(_('Incorrect customization options for PDF'))
+    else:
+        raise Http404(_('Bad method'))