fix variable name

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

diff --git a/apps/catalogue/utils.py b/apps/catalogue/utils.py
index 369656e..acbd778 100644 (file)
--- a/apps/catalogue/utils.py
+++ b/apps/catalogue/utils.py
@@ -8,7 +8,10 @@ import random
 import time
 from base64 import urlsafe_b64encode
 
 import time
 from base64 import urlsafe_b64encode
 

+from django.http import HttpResponse, HttpResponseRedirect, Http404, HttpResponsePermanentRedirect

 from django.core.files.uploadedfile import UploadedFile
 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
 from django.utils.hashcompat import sha_constructor
 from django.conf import settings
 from celery.task import task


@@ -18,7 +21,9 @@ from fcntl import flock, LOCK_EX
 from zipfile import ZipFile
 
 from librarian import DocProvider
 from zipfile import ZipFile
 
 from librarian import DocProvider

-
+from reporting.utils import read_chunks
+from celery.task import task
+import catalogue.models

 
 # Use the system (hardware-based) random number generator if it exists.
 if hasattr(random, 'SystemRandom'):
 
 # Use the system (hardware-based) random number generator if it exists.
 if hasattr(random, 'SystemRandom'):


@@ -55,17 +60,18 @@ class ExistingFile(UploadedFile):
         pass
 
 
         pass
 
 

-class BookImportDocProvider(DocProvider):
-    """Used for joined EPUB and PDF files."""
+class ORMDocProvider(DocProvider):
+    """Used for getting books' children."""

 
     def __init__(self, book):
         self.book = book
 
 
     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:
         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):
 
 
 class LockFile(object):


@@ -90,6 +96,7 @@ class LockFile(object):
         self.lock.close()
 
 
         self.lock.close()
 
 

+@task

 def create_zip(paths, zip_slug):
     """
     Creates a zip in MEDIA_ROOT/zip directory containing files from path.
 def create_zip(paths, zip_slug):
     """
     Creates a zip in MEDIA_ROOT/zip directory containing files from path.


@@ -108,9 +115,14 @@ def create_zip(paths, zip_slug):
 
     with LockFile(zip_path, zip_slug):
         if not path.exists(path.join(zip_path, zip_filename)):
 
     with LockFile(zip_path, zip_slug):
         if not path.exists(path.join(zip_path, zip_filename)):

-            with ZipFile(path.join(zip_path, zip_filename), 'w') as zipf:
-                for p in paths:
-                    zipf.write(p, path.basename(p))
+            zipf = ZipFile(path.join(zip_path, zip_filename), 'w')
+            try:
+                for arcname, p in paths:
+                    if arcname is None:
+                        arcname = path.basename(p)
+                    zipf.write(p, arcname)
+            finally:
+                zipf.close()

 
         return 'zip/' + zip_filename
 
 
         return 'zip/' + zip_filename
 


@@ -127,6 +139,28 @@ def remove_zip(zip_slug):
             raise oe
 
 
             raise oe
 
 

+class AttachmentHttpResponse(HttpResponse):
+    """Response serving a file to be downloaded.
+    """
+    def __init__ (self, file_path, file_name, mimetype):
+        super(AttachmentHttpResponse, self).__init__(mimetype=mimetype)
+        self['Content-Disposition'] = 'attachment; filename=%s' % file_name
+        self.file_path = file_path
+        self.file_name = file_name
+
+        with open(DefaultStorage().path(self.file_path)) as f:
+            for chunk in read_chunks(f):
+                self.write(chunk)
+

 @task
 @task

-def create_zip_task(*args):
-    return create_zip(*args)
+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)
+    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."