X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/aae5369e6dab510705fdfa1265cf9e095d24a97d..480da6ff4ed8c04b205710c318b2fcfcb961bbc7:/apps/catalogue/views.py?ds=sidebyside

diff --git a/apps/catalogue/views.py b/apps/catalogue/views.py
index 0c05d17a8..fc27e02f3 100644
--- a/apps/catalogue/views.py
+++ b/apps/catalogue/views.py
@@ -22,16 +22,12 @@ from ajaxable.utils import JSONResponse, AjaxableFormView
 
 from catalogue import models
 from catalogue import forms
-from catalogue.utils import (split_tags,
-    async_build_pdf, MultiQuerySet)
+from catalogue.utils import split_tags, MultiQuerySet
 from pdcounter import models as pdcounter_models
 from pdcounter import views as pdcounter_views
 from suggest.forms import PublishingSuggestForm
 from picture.models import Picture
 
-from os import path
-from waiter.models import WaitedFile
-
 staff_required = user_passes_test(lambda user: user.is_staff)
 
 
@@ -136,13 +132,14 @@ def tagged_object_list(request, tags=''):
 
         if shelf_tags:
             books = models.Book.tagged.with_all(shelf_tags).order_by()
-            l_tags = models.Tag.objects.filter(category='book', slug__in=[book.book_tag_slug() for book in books])
+            l_tags = models.Tag.objects.filter(category='book',
+                slug__in=[book.book_tag_slug() for book in books.iterator()])
             fragments = models.Fragment.tagged.with_any(l_tags, fragments)
 
         # newtagging goes crazy if we just try:
         #related_tags = models.Tag.objects.usage_for_queryset(fragments, counts=True,
         #                    extra={'where': ["catalogue_tag.category != 'book'"]})
-        fragment_keys = [fragment.pk for fragment in fragments]
+        fragment_keys = [fragment.pk for fragment in fragments.iterator()]
         if fragment_keys:
             related_tags = models.Fragment.tags.usage(counts=True,
                                 filters={'pk__in': fragment_keys},
@@ -160,7 +157,7 @@ def tagged_object_list(request, tags=''):
         # get related tags from `tag_counter` and `theme_counter`
         related_counts = {}
         tags_pks = [tag.pk for tag in tags]
-        for book in objects:
+        for book in objects.iterator():
             for tag_pk, value in itertools.chain(book.tag_counter.iteritems(), book.theme_counter.iteritems()):
                 if tag_pk in tags_pks:
                     continue
@@ -223,15 +220,15 @@ def player(request, slug):
         raise Http404
 
     ogg_files = {}
-    for m in book.media.filter(type='ogg').order_by():
+    for m in book.media.filter(type='ogg').order_by().iterator():
         ogg_files[m.name] = m
 
     audiobooks = []
     have_oggs = True
     projects = set()
-    for mp3 in book.media.filter(type='mp3'):
+    for mp3 in book.media.filter(type='mp3').iterator():
         # ogg files are always from the same project
-        meta = mp3.get_extra_info_value()
+        meta = mp3.extra_info
         project = meta.get('project')
         if not project:
             # temporary fallback
@@ -250,7 +247,7 @@ def player(request, slug):
 
     projects = sorted(projects)
 
-    extra_info = book.get_extra_info_value()
+    extra_info = book.extra_info
 
     return render_to_response('catalogue/player.html', locals(),
         context_instance=RequestContext(request))
@@ -262,12 +259,13 @@ def book_text(request, slug):
     if not book.has_html_file():
         raise Http404
     book_themes = {}
-    for fragment in book.fragments.all():
-        for theme in fragment.tags.filter(category='theme'):
+    for fragment in book.fragments.all().iterator():
+        for theme in fragment.tags.filter(category='theme').iterator():
             book_themes.setdefault(theme, []).append(fragment)
 
     book_themes = book_themes.items()
     book_themes.sort(key=lambda s: s[0].sort_key)
+    related = book.related_info()
     return render_to_response('catalogue/book_text.html', locals(),
         context_instance=RequestContext(request))
 
@@ -532,44 +530,23 @@ def download_zip(request, format, slug=None):
     return HttpResponseRedirect(urlquote_plus(settings.MEDIA_URL + url, safe='/?='))
 
 
-def download_custom_pdf(request, slug, method='GET'):
-    book = get_object_or_404(models.Book, slug=slug)
-
-    if request.method == method:
-        form = forms.CustomPDFForm(method == 'GET' and request.GET or request.POST)
-        if form.is_valid():
-            cust = form.customizations
-            pdf_file = models.get_customized_pdf_path(book, cust)
-
-            url = WaitedFile.order(pdf_file,
-                    lambda p: async_build_pdf.delay(book.id, cust, p),
-                    book.pretty_title()
-                )
-            return redirect(url)
-        else:
-            raise Http404(_('Incorrect customization options for PDF'))
-    else:
-        raise Http404(_('Bad method'))
-
-
 class CustomPDFFormView(AjaxableFormView):
     form_class = forms.CustomPDFForm
     title = ugettext_lazy('Download custom PDF')
     submit = ugettext_lazy('Download')
+    honeypot = True
+
+    def __call__(self, *args, **kwargs):
+        if settings.NO_CUSTOM_PDF:
+            raise Http404('Custom PDF is disabled')
+        return super(CustomPDFFormView, self).__call__(*args, **kwargs)
 
-    def __call__(self, request):
-        from copy import copy
-        if request.method == 'POST':
-            request.GET = copy(request.GET)
-            request.GET['next'] = "%s?%s" % (reverse('catalogue.views.download_custom_pdf', args=[request.GET.get('slug')]),
-                                             request.POST.urlencode())
-        return super(CustomPDFFormView, self).__call__(request)
+    def form_args(self, request, obj):
+        """Override to parse view args and give additional args to the form."""
+        return (obj,), {}
 
-    def get_object(self, request):
-        return get_object_or_404(models.Book, slug=request.GET.get('slug'))
+    def get_object(self, request, slug, *args, **kwargs):
+        return get_object_or_404(models.Book, slug=slug)
 
     def context_description(self, request, obj):
         return obj.pretty_title()
-
-    def success(self, *args):
-        pass