302 for main

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

diff --git a/apps/catalogue/utils.py b/apps/catalogue/utils.py
index 07458c9..0134701 100644 (file)
--- a/apps/catalogue/utils.py
+++ b/apps/catalogue/utils.py
@@ -55,8 +55,8 @@ 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


@@ -90,6 +90,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.


@@ -110,8 +111,10 @@ def create_zip(paths, zip_slug):
         if not path.exists(path.join(zip_path, zip_filename)):
             zipf = ZipFile(path.join(zip_path, zip_filename), 'w')
             try:
         if not path.exists(path.join(zip_path, zip_filename)):
             zipf = ZipFile(path.join(zip_path, zip_filename), 'w')
             try:

-                for p in paths:
-                    zipf.write(p, path.basename(p))
+                for arcname, p in paths:
+                    if arcname is None:
+                        arcname = path.basename(p)
+                    zipf.write(p, arcname)

             finally:
                 zipf.close()
 
             finally:
                 zipf.close()
 


@@ -128,8 +131,3 @@ def remove_zip(zip_slug):
     except OSError as oe:
         if oe.errno != ENOENT:
             raise oe
     except OSError as oe:
         if oe.errno != ENOENT:
             raise oe

-
-
-@task
-def create_zip_task(*args):
-    return create_zip(*args)