some zip path changes

diff --git a/apps/catalogue/models.py b/apps/catalogue/models.py
index 128fe81..a0f737f 100644 (file)
--- a/apps/catalogue/models.py
+++ b/apps/catalogue/models.py
@@ -220,10 +220,11 @@ class BookMedia(models.Model):
             if slughifi(self.name) != slughifi(old.name):
                 self.file.save(None, ExistingFile(self.file.path), save=False, leave=True)
 
             if slughifi(self.name) != slughifi(old.name):
                 self.file.save(None, ExistingFile(self.file.path), save=False, leave=True)
 

+        super(BookMedia, self).save(*args, **kwargs)
+

         # remove the zip package for book with modified media
         remove_zip(self.book.slug)
 
         # remove the zip package for book with modified media
         remove_zip(self.book.slug)
 

-        super(BookMedia, self).save(*args, **kwargs)

         extra_info = self.get_extra_info_value()
         extra_info.update(self.read_meta())
         self.set_extra_info_value(extra_info)
         extra_info = self.get_extra_info_value()
         extra_info.update(self.read_meta())
         self.set_extra_info_value(extra_info)


@@ -466,9 +467,6 @@ class Book(models.Model):
         from tempfile import NamedTemporaryFile
         import os
 
         from tempfile import NamedTemporaryFile
         import os
 

-        # remove zip with all pdf files
-        remove_zip(settings.ALL_PDF_ZIP)
-

         try:
             pdf_file = NamedTemporaryFile(delete=False)
             pdf.transform(ORMDocProvider(self),
         try:
             pdf_file = NamedTemporaryFile(delete=False)
             pdf.transform(ORMDocProvider(self),


@@ -480,6 +478,9 @@ class Book(models.Model):
         finally:
             unlink(pdf_file.name)
 
         finally:
             unlink(pdf_file.name)
 

+        # remove zip with all pdf files
+        remove_zip(settings.ALL_PDF_ZIP)
+

     def build_mobi(self):
         """ (Re)builds the MOBI file.
 
     def build_mobi(self):
         """ (Re)builds the MOBI file.
 


@@ -488,9 +489,6 @@ class Book(models.Model):
         from tempfile import NamedTemporaryFile
         import os
 
         from tempfile import NamedTemporaryFile
         import os
 

-        # remove zip with all pdf files
-        remove_zip(settings.ALL_MOBI_ZIP)
-

         try:
             mobi_file = NamedTemporaryFile(suffix='.mobi', delete=False)
             mobi.transform(ORMDocProvider(self), verbose=1,
         try:
             mobi_file = NamedTemporaryFile(suffix='.mobi', delete=False)
             mobi.transform(ORMDocProvider(self), verbose=1,


@@ -502,6 +500,9 @@ class Book(models.Model):
         finally:
             unlink(mobi_file.name)
 
         finally:
             unlink(mobi_file.name)
 

+        # remove zip with all mobi files
+        remove_zip(settings.ALL_MOBI_ZIP)
+

     def build_epub(self, remove_descendants=True):
         """ (Re)builds the epub file.
             If book has a parent, does nothing.
     def build_epub(self, remove_descendants=True):
         """ (Re)builds the epub file.
             If book has a parent, does nothing.


@@ -515,9 +516,6 @@ class Book(models.Model):
             # don't need an epub
             return
 
             # don't need an epub
             return
 

-        # remove zip package with all epub files
-        remove_zip(settings.ALL_EPUB_ZIP)
-

         epub_file = StringIO()
         try:
             epub.transform(ORMDocProvider(self), self.slug, output_file=epub_file)
         epub_file = StringIO()
         try:
             epub.transform(ORMDocProvider(self), self.slug, output_file=epub_file)


@@ -535,6 +533,9 @@ class Book(models.Model):
             child_book.save()
             book_descendants += list(child_book.children.all())
 
             child_book.save()
             book_descendants += list(child_book.children.all())
 

+        # remove zip package with all epub files
+        remove_zip(settings.ALL_EPUB_ZIP)
+

     def build_txt(self):
         from StringIO import StringIO
         from django.core.files.base import ContentFile
     def build_txt(self):
         from StringIO import StringIO
         from django.core.files.base import ContentFile


@@ -601,35 +602,23 @@ class Book(models.Model):
         return False
 
     @staticmethod
         return False
 
     @staticmethod

-    def zip_epub():
-        books = Book.objects.all()
-
-        paths = filter(lambda x: x is not None,
-                       map(lambda b: b.epub_file and b.epub_file.path or None, books))
-        result = create_zip.delay(paths, settings.ALL_EPUB_ZIP)
-        return result.wait()
-
-    @staticmethod
-    def zip_pdf():
-        books = Book.objects.all()
-
-        paths = filter(lambda x: x is not None,
-                       map(lambda b: b.pdf_file and b.pdf_file.path or None, books))
-        result = create_zip.delay(paths, settings.ALL_PDF_ZIP)
-        return result.wait()
-
-    @staticmethod
-    def zip_mobi():
-        books = Book.objects.all()
-
-        paths = filter(lambda x: x is not None,
-                       map(lambda b: b.mobi_file and b.mobi_file.path or None, books))
-        result = create_zip.delay(paths, settings.ALL_MOBI_ZIP)
-        return settings.MEDIA_URL + result.wait()
+    def zip_format(format_):
+        def pretty_file_name(book):
+            return "%s/%s.%s" % (
+                b.get_extra_info_value()['author'],
+                b.slug,
+                format_)
+
+        field_name = "%s_file" % format_
+        books = Book.objects.filter(parent=None).exclude(**{field_name: ""})
+        paths = [(pretty_file_name(b), getattr(b, field_name).path)
+                    for b in books]
+        result = create_zip.delay(paths,
+                    getattr(settings, "ALL_%s_ZIP" % format_.upper()))

 
     def zip_audiobooks(self):
 
     def zip_audiobooks(self):

-        bm = BookMedia.objects.filter(book=self)
-        paths = map(lambda bm: bm.file.path, bm)
+        bm = BookMedia.objects.filter(book=self, type='mp3')
+        paths = map(lambda bm: (None, bm.file.path), bm)

         result = create_zip.delay(paths, self.slug)
         return result.wait()
 
         result = create_zip.delay(paths, self.slug)
         return result.wait()
 

diff --git a/apps/catalogue/tests/bookmedia.py b/apps/catalogue/tests/bookmedia.py
index 7e75ac3..b6598b3 100644 (file)
--- a/apps/catalogue/tests/bookmedia.py
+++ b/apps/catalogue/tests/bookmedia.py
@@ -87,8 +87,8 @@ class BookMediaTests(WLTestCase):
 
     def test_zip_audiobooks(self):
         paths = [
 
     def test_zip_audiobooks(self):
         paths = [

-            join(dirname(__file__), "files/fraszka-do-anusie.xml"),
-            join(dirname(__file__), "files/fraszki.xml")
+            (None, join(dirname(__file__), "files/fraszka-do-anusie.xml")),
+            (None, join(dirname(__file__), "files/fraszki.xml")),

             ]
 
         url = utils.create_zip(paths, 'test-zip-slug')
             ]
 
         url = utils.create_zip(paths, 'test-zip-slug')

diff --git a/apps/catalogue/utils.py b/apps/catalogue/utils.py
index 29a1857..0134701 100644 (file)
--- a/apps/catalogue/utils.py
+++ b/apps/catalogue/utils.py
@@ -111,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()