Fix

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

diff --git a/src/catalogue/fields.py b/src/catalogue/fields.py
index 4c832fd..4c8a780 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


@@ -123,6 +124,8 @@ class EbookField(models.FileField):
 
 
 class BuildEbook(Task):
 
 
 class BuildEbook(Task):

+    librarian2_api = False
+

     formats = {}
 
     @classmethod
     formats = {}
 
     @classmethod


@@ -165,7 +168,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 +206,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')