X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/37e0abac697f5dee3c1301eb3b6f94de7a3104fb..ead1b800ae5c0635778e23a7b0107818b505fa88:/src/catalogue/fields.py?ds=sidebyside

diff --git a/src/catalogue/fields.py b/src/catalogue/fields.py
index 5b49307a3..21d2bcf72 100644
--- a/src/catalogue/fields.py
+++ b/src/catalogue/fields.py
@@ -4,6 +4,7 @@
 #
 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
@@ -153,7 +154,7 @@ class BuildHtml(BuildEbook):
 
         book = fieldfile.instance
 
-        html_output = self.transform(book.wldocument(), fieldfile)
+        html_output = self.transform(book.wldocument(parse_dublincore=False), fieldfile)
 
         # Delete old fragments, create from scratch if necessary.
         book.fragments.all().delete()
@@ -219,7 +220,14 @@ class BuildHtml(BuildEbook):
 
     @staticmethod
     def transform(wldoc, fieldfile):
-        return wldoc.as_html(options={'gallery': "'%s'" % gallery_url(wldoc.book_info.url.slug)})
+        # 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')
@@ -231,6 +239,7 @@ class BuildCoverThumb(BuildEbook):
         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.
@@ -246,3 +255,10 @@ class OverwritingFieldFile(FieldFile):
 
 class OverwritingFileField(models.FileField):
     attr_class = OverwritingFieldFile
+
+
+class OverwriteStorage(FileSystemStorage):
+
+    def get_available_name(self, name, max_length=None):
+        self.delete(name)
+        return name