X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/73b6a1639ba8f9f5fc7615c136364fdba73e5bb2..25be50678152cb1787f6d9d0f15c0cc4345c3216:/src/catalogue/fields.py?ds=sidebyside

diff --git a/src/catalogue/fields.py b/src/catalogue/fields.py
index 1ed34e2c5..2b2d6a6da 100644
--- a/src/catalogue/fields.py
+++ b/src/catalogue/fields.py
@@ -106,12 +106,15 @@ class BuildEbook(Task):
     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:
-            type(book).objects.filter(pk=book.pk).update(**{
+            books = type(book).objects.filter(pk=book.pk)
+            books.update(**{
                 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.
@@ -132,7 +135,7 @@ class BuildPdf(BuildEbook):
     @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)
@@ -160,7 +163,7 @@ class BuildMobi(BuildEbook):
 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
@@ -181,7 +184,7 @@ class BuildHtml(BuildEbook):
             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
@@ -201,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(
-                                            slug=slughifi(theme_name),
+                                            slug=slugify(theme_name),
                                             category='theme')
                         if created:
                             tag.name = theme_name