update librarian

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

diff --git a/src/catalogue/fields.py b/src/catalogue/fields.py
index 0ff2ca9..21d2bcf 100644 (file)
--- a/src/catalogue/fields.py
+++ b/src/catalogue/fields.py
@@ -4,11 +4,12 @@
 #
 from django.conf import settings
 from django.core.files import File
 #
 from django.conf import settings
 from django.core.files import File

+from django.core.files.storage import FileSystemStorage

 from django.db import models
 from django.db.models.fields.files import FieldFile
 from catalogue import app_settings
 from catalogue.constants import LANGUAGES_3TO2
 from django.db import models
 from django.db.models.fields.files import FieldFile
 from catalogue import app_settings
 from catalogue.constants import LANGUAGES_3TO2

-from catalogue.utils import remove_zip, truncate_html_words
+from catalogue.utils import remove_zip, truncate_html_words, gallery_path, gallery_url

 from celery.task import Task, task
 from celery.utils.log import get_task_logger
 from waiter.utils import clear_cache
 from celery.task import Task, task
 from celery.utils.log import get_task_logger
 from waiter.utils import clear_cache


@@ -117,8 +118,8 @@ class BuildTxt(BuildEbook):
 class BuildPdf(BuildEbook):
     @staticmethod
     def transform(wldoc, fieldfile):
 class BuildPdf(BuildEbook):
     @staticmethod
     def transform(wldoc, fieldfile):

-        return wldoc.as_pdf(morefloats=settings.LIBRARIAN_PDF_MOREFLOATS,
-            cover=True)
+        return wldoc.as_pdf(morefloats=settings.LIBRARIAN_PDF_MOREFLOATS, cover=True,
+                            ilustr_path=gallery_path(wldoc.book_info.url.slug))

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


@@ -130,7 +131,15 @@ 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)
+        return wldoc.as_epub(cover=True, ilustr_path=gallery_path(wldoc.book_info.url.slug))
+
+
+@BuildEbook.register('mobi')
+@task(ignore_result=True)
+class BuildMobi(BuildEbook):
+    @staticmethod
+    def transform(wldoc, fieldfile):
+        return wldoc.as_mobi(cover=True, ilustr_path=gallery_path(wldoc.book_info.url.slug))

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


@@ -145,9 +154,7 @@ class BuildHtml(BuildEbook):
 
         book = fieldfile.instance
 
 
         book = fieldfile.instance
 

-        html_output = self.transform(
-                        book.wldocument(parse_dublincore=False),
-                        fieldfile)
+        html_output = self.transform(book.wldocument(parse_dublincore=False), fieldfile)

 
         # Delete old fragments, create from scratch if necessary.
         book.fragments.all().delete()
 
         # Delete old fragments, create from scratch if necessary.
         book.fragments.all().delete()


@@ -161,8 +168,7 @@ class BuildHtml(BuildEbook):
             if lang not in [ln[0] for ln in settings.LANGUAGES]:
                 lang = None
 
             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_string()), save=False)

             type(book).objects.filter(pk=book.pk).update(**{
                 fieldfile.field.attname: fieldfile
             })
             type(book).objects.filter(pk=book.pk).update(**{
                 fieldfile.field.attname: fieldfile
             })


@@ -192,8 +198,7 @@ class BuildHtml(BuildEbook):
                     elif lang is not None:
                         # Don't create unknown themes in non-default languages.
                         try:
                     elif lang is not None:
                         # Don't create unknown themes in non-default languages.
                         try:

-                            tag = Tag.objects.get(category='theme',
-                                    **{"name_%s" % lang: theme_name})
+                            tag = Tag.objects.get(category='theme', **{"name_%s" % lang: theme_name})

                         except Tag.DoesNotExist:
                             pass
                         else:
                         except Tag.DoesNotExist:
                             pass
                         else:


@@ -205,8 +210,7 @@ class BuildHtml(BuildEbook):
                 short_text = truncate_html_words(text, 15)
                 if text == short_text:
                     short_text = ''
                 short_text = truncate_html_words(text, 15)
                 if text == short_text:
                     short_text = ''

-                new_fragment = Fragment.objects.create(anchor=fragment.id,
-                        book=book, text=text, short_text=short_text)
+                new_fragment = Fragment.objects.create(anchor=fragment.id, book=book, text=text, short_text=short_text)

 
                 new_fragment.save()
                 new_fragment.tags = set(meta_tags + themes)
 
                 new_fragment.save()
                 new_fragment.tags = set(meta_tags + themes)


@@ -214,6 +218,18 @@ class BuildHtml(BuildEbook):
             return True
         return False
 
             return True
         return False
 

+    @staticmethod
+    def transform(wldoc, fieldfile):
+        # ugly, but we can't use wldoc.book_info here
+        from librarian import DCNS
+        url_elem = wldoc.edoc.getroot().find('.//' + DCNS('identifier.url'))
+        if url_elem is None:
+            gallery = ''
+        else:
+            gallery = gallery_url(slug=url_elem.text.rsplit('/', 1)[1])
+        return wldoc.as_html(options={'gallery': "'%s'" % gallery})
+
+

 @BuildEbook.register('cover_thumb')
 @task(ignore_result=True)
 class BuildCoverThumb(BuildEbook):
 @BuildEbook.register('cover_thumb')
 @task(ignore_result=True)
 class BuildCoverThumb(BuildEbook):


@@ -223,7 +239,7 @@ class BuildCoverThumb(BuildEbook):
         return WLCover(wldoc.book_info, height=193).output_file()
 
 
         return WLCover(wldoc.book_info, height=193).output_file()
 
 

-
+# not used, but needed for migrations

 class OverwritingFieldFile(FieldFile):
     """
         Deletes the old file before saving the new one.
 class OverwritingFieldFile(FieldFile):
     """
         Deletes the old file before saving the new one.


@@ -232,12 +248,17 @@ class OverwritingFieldFile(FieldFile):
     def save(self, name, content, *args, **kwargs):
         leave = kwargs.pop('leave', None)
         # delete if there's a file already and there's a new one coming
     def save(self, name, content, *args, **kwargs):
         leave = kwargs.pop('leave', None)
         # delete if there's a file already and there's a new one coming

-        if not leave and self and (not hasattr(content, 'path') or
-                                   content.path != self.path):
+        if not leave and self and (not hasattr(content, 'path') or content.path != self.path):

             self.delete(save=False)
             self.delete(save=False)

-        return super(OverwritingFieldFile, self).save(
-                name, content, *args, **kwargs)
+        return super(OverwritingFieldFile, self).save(name, content, *args, **kwargs)

 
 
 class OverwritingFileField(models.FileField):
     attr_class = OverwritingFieldFile
 
 
 class OverwritingFileField(models.FileField):
     attr_class = OverwritingFieldFile

+
+
+class OverwriteStorage(FileSystemStorage):
+
+    def get_available_name(self, name, max_length=None):
+        self.delete(name)
+        return name