custom pdf in dirs

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

diff --git a/apps/catalogue/views.py b/apps/catalogue/views.py
index 6405a49..0c05d17 100644 (file)
--- a/apps/catalogue/views.py
+++ b/apps/catalogue/views.py
@@ -7,7 +7,7 @@ import itertools
 
 from django.conf import settings
 from django.template import RequestContext
 
 from django.conf import settings
 from django.template import RequestContext

-from django.shortcuts import render_to_response, get_object_or_404
+from django.shortcuts import render_to_response, get_object_or_404, redirect

 from django.http import HttpResponse, HttpResponseRedirect, Http404, HttpResponsePermanentRedirect
 from django.core.urlresolvers import reverse
 from django.db.models import Q
 from django.http import HttpResponse, HttpResponseRedirect, Http404, HttpResponsePermanentRedirect
 from django.core.urlresolvers import reverse
 from django.db.models import Q


@@ -15,14 +15,14 @@ from django.contrib.auth.decorators import login_required, user_passes_test
 from django.utils.datastructures import SortedDict
 from django.utils.http import urlquote_plus
 from django.utils import translation
 from django.utils.datastructures import SortedDict
 from django.utils.http import urlquote_plus
 from django.utils import translation

-from django.utils.translation import ugettext as _
+from django.utils.translation import ugettext as _, ugettext_lazy

 from django.views.decorators.cache import never_cache
 
 from ajaxable.utils import JSONResponse, AjaxableFormView
 
 from catalogue import models
 from catalogue import forms
 from django.views.decorators.cache import never_cache
 
 from ajaxable.utils import JSONResponse, AjaxableFormView
 
 from catalogue import models
 from catalogue import forms

-from catalogue.utils import (split_tags, AttachmentHttpResponse,
+from catalogue.utils import (split_tags,

     async_build_pdf, MultiQuerySet)
 from pdcounter import models as pdcounter_models
 from pdcounter import views as pdcounter_views
     async_build_pdf, MultiQuerySet)
 from pdcounter import models as pdcounter_models
 from pdcounter import views as pdcounter_views


@@ -30,6 +30,7 @@ from suggest.forms import PublishingSuggestForm
 from picture.models import Picture
 
 from os import path
 from picture.models import Picture
 
 from os import path

+from waiter.models import WaitedFile

 
 staff_required = user_passes_test(lambda user: user.is_staff)
 
 
 staff_required = user_passes_test(lambda user: user.is_staff)
 


@@ -246,10 +247,11 @@ def player(request, slug):
         else:
             have_oggs = False
         audiobooks.append(media)
         else:
             have_oggs = False
         audiobooks.append(media)

-    print audiobooks

 
     projects = sorted(projects)
 
 
     projects = sorted(projects)
 

+    extra_info = book.get_extra_info_value()
+

     return render_to_response('catalogue/player.html', locals(),
         context_instance=RequestContext(request))
 
     return render_to_response('catalogue/player.html', locals(),
         context_instance=RequestContext(request))
 


@@ -539,10 +541,11 @@ def download_custom_pdf(request, slug, method='GET'):
             cust = form.customizations
             pdf_file = models.get_customized_pdf_path(book, cust)
 
             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")
+            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:
         else:
             raise Http404(_('Incorrect customization options for PDF'))
     else:


@@ -551,8 +554,8 @@ def download_custom_pdf(request, slug, method='GET'):
 
 class CustomPDFFormView(AjaxableFormView):
     form_class = forms.CustomPDFForm
 
 class CustomPDFFormView(AjaxableFormView):
     form_class = forms.CustomPDFForm

-    title = _('Download custom PDF')
-    submit = _('Download')
+    title = ugettext_lazy('Download custom PDF')
+    submit = ugettext_lazy('Download')

 
     def __call__(self, request):
         from copy import copy
 
     def __call__(self, request):
         from copy import copy