ptrad

[redakcja.git] / src / documents / models / book.py

diff --git a/src/documents/models/book.py b/src/documents/models/book.py
index fa93eeb..293d2c4 100644 (file)
--- a/src/documents/models/book.py
+++ b/src/documents/models/book.py
@@ -47,13 +47,17 @@ class Book(models.Model):
         db_index=True, on_delete=models.SET_NULL, editable=False)
     dc = models.JSONField(null=True, editable=False)
     cover = models.FileField(blank=True, upload_to='documents/cover')
         db_index=True, on_delete=models.SET_NULL, editable=False)
     dc = models.JSONField(null=True, editable=False)
     cover = models.FileField(blank=True, upload_to='documents/cover')

+
+    dc_slug = models.CharField(
+        max_length=2048,
+        null=True, blank=True,
+        editable=False,
+    )

     catalogue_book = models.ForeignKey(
         'catalogue.Book',
     catalogue_book = models.ForeignKey(
         'catalogue.Book',

-        models.DO_NOTHING,
-        to_field='slug',
+        models.PROTECT,

         null=True, blank=True,
         null=True, blank=True,

-        db_constraint=False,
-        editable=False, db_index=True,
+        editable=False,

         related_name='document_books',
         related_query_name='document_book',
     )
         related_name='document_books',
         related_query_name='document_book',
     )


@@ -366,20 +370,20 @@ class Book(models.Model):
 
     def refresh_dc_cache(self):
         update = {
 
     def refresh_dc_cache(self):
         update = {

-            'catalogue_book_id': None,
+            'dc_slug': None,

             'dc_cover_image': None,
         }
 
         info = self.book_info()
         if info is not None:
             'dc_cover_image': None,
         }
 
         info = self.book_info()
         if info is not None:

-            update['catalogue_book_id'] = info.url.slug
+            update['dc_slug'] = info.url.slug

             if info.cover_source:
                 try:
                     image = Image.objects.get(pk=int(info.cover_source.rstrip('/').rsplit('/', 1)[-1]))
                 except:
                     pass
                 else:
             if info.cover_source:
                 try:
                     image = Image.objects.get(pk=int(info.cover_source.rstrip('/').rsplit('/', 1)[-1]))
                 except:
                     pass
                 else:

-                    if info.cover_source == image.get_full_url():
+                    if info.cover_source.rstrip('/') == image.get_full_url().rstrip('/'):

                         update['dc_cover_image'] = image
             update['dc'] = info.to_dict()
         Book.objects.filter(pk=self.pk).update(**update)
                         update['dc_cover_image'] = image
             update['dc'] = info.to_dict()
         Book.objects.filter(pk=self.pk).update(**update)


@@ -401,9 +405,9 @@ class Book(models.Model):
             xml = self.materialize(publishable=True).encode('utf-8')
             info = BookInfo.from_bytes(xml)
             kwargs = {}
             xml = self.materialize(publishable=True).encode('utf-8')
             info = BookInfo.from_bytes(xml)
             kwargs = {}

-            if chunk.book.project is not None:
-                if chunk.book.project.logo_mono or chunk.book.project.logo:
-                    kwargs['cover_logo'] = (chunk.book.project.logo_mono or chunk.book.project.logo).path
+            if self.project is not None:
+                if self.project.logo_mono or self.project.logo:
+                    kwargs['cover_logo'] = (self.project.logo_mono or self.project.logo).path

             cover = make_cover(info, width=width, height=height, **kwargs)
             out = BytesIO()
             ext = cover.ext()
             cover = make_cover(info, width=width, height=height, **kwargs)
             out = BytesIO()
             ext = cover.ext()


@@ -478,8 +482,10 @@ class Book(models.Model):
                 if self.project.logo_mono:
                     data['logo_mono'] = urljoin(
                         'https://' + Site.objects.get_current().domain,
                 if self.project.logo_mono:
                     data['logo_mono'] = urljoin(
                         'https://' + Site.objects.get_current().domain,

-                        self.project.logo.url,
+                        self.project.logo_mono.url,

                     )
                     )

+                if self.project.logo_alt:
+                    data['logo_alt'] = self.project.logo_alt

             if host:
                 data['gallery_url'] = host + self.gallery_url()
             apiclient.api_call(user, "books/", data, beta=beta)
             if host:
                 data['gallery_url'] = host + self.gallery_url()
             apiclient.api_call(user, "books/", data, beta=beta)