Update librarian API.

diff --git a/src/catalogue/fields.py b/src/catalogue/fields.py
index c3e2b35..79fe67e 100644 (file)
--- a/src/catalogue/fields.py
+++ b/src/catalogue/fields.py
@@ -191,7 +191,7 @@ class BuildPdf(BuildEbook):
     def transform(wldoc, fieldfile):
         return wldoc.as_pdf(
             morefloats=settings.LIBRARIAN_PDF_MOREFLOATS, cover=True,
     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=gallery_url(wldoc.book_info.url.slug), customizations=['notoc'])

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


@@ -203,7 +203,7 @@ class BuildPdf(BuildEbook):
 class BuildEpub(BuildEbook):
     @staticmethod
     def transform(wldoc, fieldfile):
 class BuildEpub(BuildEbook):
     @staticmethod
     def transform(wldoc, fieldfile):

-        return wldoc.as_epub(cover=True, ilustr_path=gallery_path(wldoc.book_info.url.slug))
+        return wldoc.as_epub(cover=True, base_url=gallery_url(wldoc.book_info.url.slug))

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


@@ -211,7 +211,7 @@ class BuildEpub(BuildEbook):
 class BuildMobi(BuildEbook):
     @staticmethod
     def transform(wldoc, fieldfile):
 class BuildMobi(BuildEbook):
     @staticmethod
     def transform(wldoc, fieldfile):

-        return wldoc.as_mobi(cover=True, ilustr_path=gallery_path(wldoc.book_info.url.slug))
+        return wldoc.as_mobi(cover=True, base_url=gallery_url(wldoc.book_info.url.slug))

 
 
 @BuildEbook.register('html')
 
 
 @BuildEbook.register('html')


@@ -317,7 +317,7 @@ class BuildHtml(BuildEbook):
             slug = url_elem.text.rstrip('/').rsplit('/', 1)[1]
             gal_url = gallery_url(slug=slug)
             gal_path = gallery_path(slug=slug)
             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=gal_url)

 
 
 class BuildCover(BuildEbook):
 
 
 class BuildCover(BuildEbook):

diff --git a/src/catalogue/tasks.py b/src/catalogue/tasks.py
index 499e8e6..0da624d 100644 (file)
--- a/src/catalogue/tasks.py
+++ b/src/catalogue/tasks.py
@@ -7,7 +7,7 @@ from celery.utils.log import get_task_logger
 from django.conf import settings
 from django.utils import timezone
 
 from django.conf import settings
 from django.utils import timezone
 

-from catalogue.utils import gallery_path
+from catalogue.utils import gallery_url

 from waiter.models import WaitedFile
 
 task_logger = get_task_logger(__name__)
 from waiter.models import WaitedFile
 
 task_logger = get_task_logger(__name__)


@@ -53,7 +53,7 @@ def build_custom_pdf(book_id, customizations, file_name, waiter_id=None):
             pdf = wldoc.as_pdf(
                 customizations=customizations,
                 morefloats=settings.LIBRARIAN_PDF_MOREFLOATS,
             pdf = wldoc.as_pdf(
                 customizations=customizations,
                 morefloats=settings.LIBRARIAN_PDF_MOREFLOATS,

-                ilustr_path=gallery_path(wldoc.book_info.url.slug),
+                base_url=gallery_url(wldoc.book_info.url.slug),

                 **kwargs)
             DefaultStorage().save(file_name, File(open(pdf.get_filename(), 'rb')))
     finally:
                 **kwargs)
             DefaultStorage().save(file_name, File(open(pdf.get_filename(), 'rb')))
     finally: