X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/e0164e6ca0588a270b77d892702e54ef62c31de2..f293bf6e6217d2277d11b65fdb63bc35badc8e68:/apps/catalogue/utils.py diff --git a/apps/catalogue/utils.py b/apps/catalogue/utils.py index 85a9dc274..acbd778cd 100644 --- a/apps/catalogue/utils.py +++ b/apps/catalogue/utils.py @@ -10,6 +10,8 @@ from base64 import urlsafe_b64encode from django.http import HttpResponse, HttpResponseRedirect, Http404, HttpResponsePermanentRedirect from django.core.files.uploadedfile import UploadedFile +from django.core.files.base import File +from django.core.files.storage import DefaultStorage from django.utils.hashcompat import sha_constructor from django.conf import settings from celery.task import task @@ -64,11 +66,12 @@ class ORMDocProvider(DocProvider): def __init__(self, book): self.book = book - def by_slug(self, slug): - if slug == self.book.slug: - return self.book.xml_file + def by_slug_and_lang(self, slug, language): + if slug == self.book.slug and language == self.language: + return open(self.book.xml_file.path) else: - return type(self.book).objects.get(slug=slug).xml_file + return type(self.book).objects.get( + slug=slug, language=language).xml_file class LockFile(object): @@ -145,12 +148,19 @@ class AttachmentHttpResponse(HttpResponse): self.file_path = file_path self.file_name = file_name - with open(self.file_path) as f: + with open(DefaultStorage().path(self.file_path)) as f: for chunk in read_chunks(f): self.write(chunk) @task -def create_custom_pdf(book_id, customizations, file_name): +def async_build_pdf(book_id, customizations, file_name): + """ + A celery task to generate pdf files. + Accepts the same args as Book.build_pdf, but with book id as first parameter + instead of Book instance + """ book = catalogue.models.Book.objects.get(id=book_id) - if not path.exists(file_name): + print "will gen %s" % DefaultStorage().path(file_name) + if not DefaultStorage().exists(file_name): book.build_pdf(customizations=customizations, file_name=file_name) + print "done."