Use new epub builder.

diff --git a/requirements/requirements.txt b/requirements/requirements.txt
index 4add2a9..1e0c944 100644 (file)
--- a/requirements/requirements.txt
+++ b/requirements/requirements.txt
@@ -44,7 +44,7 @@ mutagen==1.45.1
 sorl-thumbnail==12.7.0
 
 # home-brewed & dependencies
 sorl-thumbnail==12.7.0
 
 # home-brewed & dependencies

-librarian==1.15
+librarian==2.0

 
 # celery tasks
 celery[redis]==4.4.7
 
 # celery tasks
 celery[redis]==4.4.7

diff --git a/src/catalogue/fields.py b/src/catalogue/fields.py
index 4c832fd..4487549 100644 (file)
--- a/src/catalogue/fields.py
+++ b/src/catalogue/fields.py
@@ -1,6 +1,7 @@
 # This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later.
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
 #
 # This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later.
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
 #

+import os

 from django.conf import settings
 from django.core.files import File
 from django.core.files.storage import FileSystemStorage
 from django.conf import settings
 from django.core.files import File
 from django.core.files.storage import FileSystemStorage


@@ -55,6 +56,7 @@ class EbookField(models.FileField):
     """Represents an ebook file field, attachable to a model."""
     attr_class = EbookFieldFile
     registry = []
     """Represents an ebook file field, attachable to a model."""
     attr_class = EbookFieldFile
     registry = []

+    librarian2_api = False

 
     def __init__(self, format_name, *args, **kwargs):
         super(EbookField, self).__init__(*args, **kwargs)
 
     def __init__(self, format_name, *args, **kwargs):
         super(EbookField, self).__init__(*args, **kwargs)


@@ -165,7 +167,9 @@ class BuildEbook(Task):
 
     def build(self, fieldfile):
         book = fieldfile.instance
 
     def build(self, fieldfile):
         book = fieldfile.instance

-        out = self.transform(book.wldocument(), fieldfile)
+        out = self.transform(
+            book.wldocument2() if self.librarian2_api else book.wldocument(),
+            fieldfile)

         fieldfile.save(None, File(open(out.get_filename(), 'rb')), save=False)
         self.set_file_permissions(fieldfile)
         if book.pk is not None:
         fieldfile.save(None, File(open(out.get_filename(), 'rb')), save=False)
         self.set_file_permissions(fieldfile)
         if book.pk is not None:


@@ -201,9 +205,15 @@ class BuildPdf(BuildEbook):
 @BuildEbook.register('epub')
 @task(ignore_result=True)
 class BuildEpub(BuildEbook):
 @BuildEbook.register('epub')
 @task(ignore_result=True)
 class BuildEpub(BuildEbook):

+    librarian2_api = True
+

     @staticmethod
     def transform(wldoc, fieldfile):
     @staticmethod
     def transform(wldoc, fieldfile):

-        return wldoc.as_epub(cover=True, base_url=absolute_url(gallery_url(wldoc.book_info.url.slug)))
+        from librarian.builders import EpubBuilder
+        return EpubBuilder(
+                base_url='file://' + os.path.abspath(gallery_path(wldoc.meta.url.slug)) + '/',
+                fundraising=settings.EPUB_FUNDRAISING
+            ).build(wldoc)

 
 
 @BuildEbook.register('mobi')
 
 
 @BuildEbook.register('mobi')

diff --git a/src/catalogue/models/book.py b/src/catalogue/models/book.py
index ddea117..eb87f10 100644 (file)
--- a/src/catalogue/models/book.py
+++ b/src/catalogue/models/book.py
@@ -449,6 +449,17 @@ class Book(models.Model):
             parse_dublincore=parse_dublincore,
             meta_fallbacks=meta_fallbacks)
 
             parse_dublincore=parse_dublincore,
             meta_fallbacks=meta_fallbacks)
 

+    def wldocument2(self):
+        from catalogue.import_utils import ORMDocProvider
+        from librarian.document import WLDocument
+        doc = WLDocument(
+            self.xml_file.path,
+            provider=ORMDocProvider(self)
+        )
+        doc.meta.update(self.cover_info())
+        return doc
+
+

     @staticmethod
     def zip_format(format_):
         def pretty_file_name(book):
     @staticmethod
     def zip_format(format_):
         def pretty_file_name(book):

diff --git a/src/wolnelektury/settings/custom.py b/src/wolnelektury/settings/custom.py
index 04cdd89..38d2936 100644 (file)
--- a/src/wolnelektury/settings/custom.py
+++ b/src/wolnelektury/settings/custom.py
@@ -50,3 +50,4 @@ NEWSLETTER_PHPLIST_SUBSCRIBE_URL = None
 VARIANTS = {
 }
 
 VARIANTS = {
 }
 

+EPUB_FUNDRAISING = []