Update banner.

[wolnelektury.git] / src / catalogue / fields.py

diff --git a/src/catalogue/fields.py b/src/catalogue/fields.py
index 911f857..2b2d6a6 100644 (file)
--- a/src/catalogue/fields.py
+++ b/src/catalogue/fields.py
@@ -28,6 +28,14 @@ class EbookFieldFile(FieldFile):
         """Builds the ebook in a delayed task."""
         return self.field.builder.delay(self.instance, self.field.attname)
 
         """Builds the ebook in a delayed task."""
         return self.field.builder.delay(self.instance, self.field.attname)
 

+    def get_url(self):
+        return self.instance.media_url(self.field.attname.split('_')[0])
+
+    def set_readable(self, readable):
+        import os
+        permissions = 0o644 if readable else 0o600
+        os.chmod(self.path, permissions)
+

 
 class EbookField(models.FileField):
     """Represents an ebook file field, attachable to a model."""
 
 class EbookField(models.FileField):
     """Represents an ebook file field, attachable to a model."""


@@ -91,14 +99,22 @@ class BuildEbook(Task):
         obj.flush_includes()
         return ret
 
         obj.flush_includes()
         return ret
 

+    def set_file_permissions(self, fieldfile):
+        if fieldfile.instance.preview:
+            fieldfile.set_readable(False)
+

     def build(self, fieldfile):
         book = fieldfile.instance
         out = self.transform(book.wldocument(), fieldfile)
     def build(self, fieldfile):
         book = fieldfile.instance
         out = self.transform(book.wldocument(), fieldfile)

-        fieldfile.save(None, File(open(out.get_filename())), save=False)
+        fieldfile.save(None, File(open(out.get_filename(), 'rb')), save=False)
+        self.set_file_permissions(fieldfile)

         if book.pk is not None:
         if book.pk is not None:

-            type(book).objects.filter(pk=book.pk).update(**{
+            books = type(book).objects.filter(pk=book.pk)
+            books.update(**{

                 fieldfile.field.attname: fieldfile
             })
                 fieldfile.field.attname: fieldfile
             })

+            for book in books:
+                book.save()  # just to trigger post-save

         if fieldfile.field.format_name in app_settings.FORMAT_ZIPS:
             remove_zip(app_settings.FORMAT_ZIPS[fieldfile.field.format_name])
 # Don't decorate BuildEbook, because we want to subclass it.
         if fieldfile.field.format_name in app_settings.FORMAT_ZIPS:
             remove_zip(app_settings.FORMAT_ZIPS[fieldfile.field.format_name])
 # Don't decorate BuildEbook, because we want to subclass it.


@@ -119,7 +135,7 @@ class BuildPdf(BuildEbook):
     @staticmethod
     def transform(wldoc, fieldfile):
         return wldoc.as_pdf(morefloats=settings.LIBRARIAN_PDF_MOREFLOATS, cover=True,
     @staticmethod
     def transform(wldoc, fieldfile):
         return wldoc.as_pdf(morefloats=settings.LIBRARIAN_PDF_MOREFLOATS, cover=True,

-                            ilustr_path=gallery_path(wldoc.book_info.url.slug))
+                            ilustr_path=gallery_path(wldoc.book_info.url.slug), customizations=['notoc'])

 
     def build(self, fieldfile):
         BuildEbook.build(self, fieldfile)
 
     def build(self, fieldfile):
         BuildEbook.build(self, fieldfile)


@@ -147,7 +163,7 @@ class BuildMobi(BuildEbook):
 class BuildHtml(BuildEbook):
     def build(self, fieldfile):
         from django.core.files.base import ContentFile
 class BuildHtml(BuildEbook):
     def build(self, fieldfile):
         from django.core.files.base import ContentFile

-        from fnpdjango.utils.text.slughifi import slughifi
+        from slugify import slugify

         from sortify import sortify
         from librarian import html
         from catalogue.models import Fragment, Tag
         from sortify import sortify
         from librarian import html
         from catalogue.models import Fragment, Tag


@@ -168,7 +184,8 @@ class BuildHtml(BuildEbook):
             if lang not in [ln[0] for ln in settings.LANGUAGES]:
                 lang = None
 
             if lang not in [ln[0] for ln in settings.LANGUAGES]:
                 lang = None
 

-            fieldfile.save(None, ContentFile(html_output.get_string()), save=False)
+            fieldfile.save(None, ContentFile(html_output.get_bytes()), save=False)
+            self.set_file_permissions(fieldfile)

             type(book).objects.filter(pk=book.pk).update(**{
                 fieldfile.field.attname: fieldfile
             })
             type(book).objects.filter(pk=book.pk).update(**{
                 fieldfile.field.attname: fieldfile
             })


@@ -187,7 +204,7 @@ class BuildHtml(BuildEbook):
                     if lang == settings.LANGUAGE_CODE:
                         # Allow creating themes if book in default language.
                         tag, created = Tag.objects.get_or_create(
                     if lang == settings.LANGUAGE_CODE:
                         # Allow creating themes if book in default language.
                         tag, created = Tag.objects.get_or_create(

-                                            slug=slughifi(theme_name),
+                                            slug=slugify(theme_name),

                                             category='theme')
                         if created:
                             tag.name = theme_name
                                             category='theme')
                         if created:
                             tag.name = theme_name


@@ -235,9 +252,14 @@ class BuildHtml(BuildEbook):
         return wldoc.as_html(options={'gallery': "'%s'" % gallery})
 
 
         return wldoc.as_html(options={'gallery': "'%s'" % gallery})
 
 

+class BuildCover(BuildEbook):
+    def set_file_permissions(self, fieldfile):
+        pass
+
+

 @BuildEbook.register('cover_thumb')
 @task(ignore_result=True)
 @BuildEbook.register('cover_thumb')
 @task(ignore_result=True)

-class BuildCoverThumb(BuildEbook):
+class BuildCoverThumb(BuildCover):

     @classmethod
     def transform(cls, wldoc, fieldfile):
         from librarian.cover import WLCover
     @classmethod
     def transform(cls, wldoc, fieldfile):
         from librarian.cover import WLCover


@@ -246,7 +268,7 @@ class BuildCoverThumb(BuildEbook):
 
 @BuildEbook.register('cover_api_thumb')
 @task(ignore_result=True)
 
 @BuildEbook.register('cover_api_thumb')
 @task(ignore_result=True)

-class BuildCoverApiThumb(BuildEbook):
+class BuildCoverApiThumb(BuildCover):

     @classmethod
     def transform(cls, wldoc, fieldfile):
         from librarian.cover import WLNoBoxCover
     @classmethod
     def transform(cls, wldoc, fieldfile):
         from librarian.cover import WLNoBoxCover


@@ -255,7 +277,7 @@ class BuildCoverApiThumb(BuildEbook):
 
 @BuildEbook.register('simple_cover')
 @task(ignore_result=True)
 
 @BuildEbook.register('simple_cover')
 @task(ignore_result=True)

-class BuildSimpleCover(BuildEbook):
+class BuildSimpleCover(BuildCover):

     @classmethod
     def transform(cls, wldoc, fieldfile):
         from librarian.cover import WLNoBoxCover
     @classmethod
     def transform(cls, wldoc, fieldfile):
         from librarian.cover import WLNoBoxCover