Upgrades

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

diff --git a/src/catalogue/fields.py b/src/catalogue/fields.py
index c3e2b35..e177cd5 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.
 #
+import os
 from django.conf import settings
 from django.core.files import File
 from django.core.files.storage import FileSystemStorage
@@ -8,8 +9,8 @@ from django.db import models
 from django.db.models.fields.files import FieldFile
 from catalogue import app_settings
 from catalogue.constants import LANGUAGES_3TO2, EBOOK_FORMATS_WITH_CHILDREN, EBOOK_FORMATS_WITHOUT_CHILDREN
-from catalogue.utils import remove_zip, truncate_html_words, gallery_path, gallery_url
-from celery.task import Task, task
+from catalogue.utils import absolute_url, remove_zip, truncate_html_words, gallery_path, gallery_url
+from celery import Task, shared_task
 from celery.utils.log import get_task_logger
 from waiter.utils import clear_cache
 
@@ -123,6 +124,8 @@ class EbookField(models.FileField):
 
 
 class BuildEbook(Task):
+    librarian2_api = False
+
     formats = {}
 
     @classmethod
@@ -165,7 +168,9 @@ class BuildEbook(Task):
 
     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:
@@ -173,11 +178,11 @@ class BuildEbook(Task):
         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.
-BuildEbookTask = task(BuildEbook, ignore_result=True)
+BuildEbookTask = shared_task(BuildEbook, ignore_result=True)
 
 
 @BuildEbook.register('txt')
-@task(ignore_result=True)
+@shared_task(ignore_result=True)
 class BuildTxt(BuildEbook):
     @staticmethod
     def transform(wldoc, fieldfile):
@@ -185,13 +190,13 @@ class BuildTxt(BuildEbook):
 
 
 @BuildEbook.register('pdf')
-@task(ignore_result=True)
+@shared_task(ignore_result=True)
 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), customizations=['notoc'])
+            base_url=absolute_url(gallery_url(wldoc.book_info.url.slug)), customizations=['notoc'])
 
     def build(self, fieldfile):
         BuildEbook.build(self, fieldfile)
@@ -199,23 +204,35 @@ class BuildPdf(BuildEbook):
 
 
 @BuildEbook.register('epub')
-@task(ignore_result=True)
+@shared_task(ignore_result=True)
 class BuildEpub(BuildEbook):
+    librarian2_api = True
+
     @staticmethod
     def transform(wldoc, fieldfile):
-        return wldoc.as_epub(cover=True, ilustr_path=gallery_path(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')
-@task(ignore_result=True)
+@shared_task(ignore_result=True)
 class BuildMobi(BuildEbook):
+    librarian2_api = True
+
     @staticmethod
     def transform(wldoc, fieldfile):
-        return wldoc.as_mobi(cover=True, ilustr_path=gallery_path(wldoc.book_info.url.slug))
+        from librarian.builders import MobiBuilder
+        return MobiBuilder(
+                base_url='file://' + os.path.abspath(gallery_path(wldoc.meta.url.slug)) + '/',
+                fundraising=settings.EPUB_FUNDRAISING
+            ).build(wldoc)
 
 
 @BuildEbook.register('html')
-@task(ignore_result=True)
+@shared_task(ignore_result=True)
 class BuildHtml(BuildEbook):
     def build(self, fieldfile):
         from django.core.files.base import ContentFile
@@ -317,7 +334,7 @@ class BuildHtml(BuildEbook):
             slug = url_elem.text.rstrip('/').rsplit('/', 1)[1]
             gal_url = gallery_url(slug=slug)
             gal_path = gallery_path(slug=slug)
-        return wldoc.as_html(gallery_path=gal_path, gallery_url=gal_url)
+        return wldoc.as_html(gallery_path=gal_path, gallery_url=gal_url, base_url=absolute_url(gal_url))
 
 
 class BuildCover(BuildEbook):
@@ -325,8 +342,20 @@ class BuildCover(BuildEbook):
         pass
 
 
+@BuildEbook.register('cover_clean')
+@shared_task(ignore_result=True)
+class BuildCoverClean(BuildCover):
+    @classmethod
+    def transform(cls, wldoc, fieldfile):
+        if wldoc.book_info.cover_box_position == 'none':
+            from librarian.cover import WLCover
+            return WLCover(wldoc.book_info, width=240).output_file()
+        from librarian.covers.marquise import MarquiseCover
+        return MarquiseCover(wldoc.book_info, width=240).output_file()
+
+
 @BuildEbook.register('cover_thumb')
-@task(ignore_result=True)
+@shared_task(ignore_result=True)
 class BuildCoverThumb(BuildCover):
     @classmethod
     def transform(cls, wldoc, fieldfile):
@@ -335,7 +364,7 @@ class BuildCoverThumb(BuildCover):
 
 
 @BuildEbook.register('cover_api_thumb')
-@task(ignore_result=True)
+@shared_task(ignore_result=True)
 class BuildCoverApiThumb(BuildCover):
     @classmethod
     def transform(cls, wldoc, fieldfile):
@@ -344,7 +373,7 @@ class BuildCoverApiThumb(BuildCover):
 
 
 @BuildEbook.register('simple_cover')
-@task(ignore_result=True)
+@shared_task(ignore_result=True)
 class BuildSimpleCover(BuildCover):
     @classmethod
     def transform(cls, wldoc, fieldfile):
@@ -353,7 +382,7 @@ class BuildSimpleCover(BuildCover):
 
 
 @BuildEbook.register('cover_ebookpoint')
-@task(ignore_result=True)
+@shared_task(ignore_result=True)
 class BuildCoverEbookpoint(BuildCover):
     @classmethod
     def transform(cls, wldoc, fieldfile):