Isbns, and minor fixes.

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

diff --git a/src/documents/models/book.py b/src/documents/models/book.py
index 75e707e..a13c00b 100644 (file)
--- a/src/documents/models/book.py
+++ b/src/documents/models/book.py
@@ -2,14 +2,16 @@
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
 #
 from django.apps import apps
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
 #
 from django.apps import apps

+from django.core.files.base import ContentFile

 from django.contrib.sites.models import Site
 from django.contrib.sites.models import Site

-from django.db import models, transaction
+from django.db import connection, models, transaction

 from django.template.loader import render_to_string
 from django.urls import reverse
 from django.template.loader import render_to_string
 from django.urls import reverse

-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _

 from django.conf import settings
 from slugify import slugify
 from django.conf import settings
 from slugify import slugify

-
+from librarian.cover import make_cover
+from librarian.dcparser import BookInfo

 
 import apiclient
 from documents.helpers import cached_in_field, GalleryMerger
 
 import apiclient
 from documents.helpers import cached_in_field, GalleryMerger


@@ -17,10 +19,12 @@ from documents.models import BookPublishRecord, ChunkPublishRecord, Project
 from documents.signals import post_publish
 from documents.xml_tools import compile_text, split_xml
 from cover.models import Image
 from documents.signals import post_publish
 from documents.xml_tools import compile_text, split_xml
 from cover.models import Image

+from io import BytesIO

 import os
 import shutil
 import re
 
 import os
 import shutil
 import re
 

+

 class Book(models.Model):
     """ A document edited on the wiki """
 
 class Book(models.Model):
     """ A document edited on the wiki """
 


@@ -34,12 +38,14 @@ class Book(models.Model):
     parent_number = models.IntegerField(_('parent number'), null=True, blank=True, db_index=True, editable=False)
 
     # Cache
     parent_number = models.IntegerField(_('parent number'), null=True, blank=True, db_index=True, editable=False)
 
     # Cache

-    _single = models.NullBooleanField(editable=False, db_index=True)
-    _new_publishable = models.NullBooleanField(editable=False)
-    _published = models.NullBooleanField(editable=False)
+    _single = models.BooleanField(editable=False, null=True, db_index=True)
+    _new_publishable = models.BooleanField(editable=False, null=True)
+    _published = models.BooleanField(editable=False, null=True)

     _on_track = models.IntegerField(null=True, blank=True, db_index=True, editable=False)
     dc_cover_image = models.ForeignKey(Image, blank=True, null=True,
         db_index=True, on_delete=models.SET_NULL, editable=False)
     _on_track = models.IntegerField(null=True, blank=True, db_index=True, editable=False)
     dc_cover_image = models.ForeignKey(Image, blank=True, null=True,
         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')

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


@@ -60,7 +66,21 @@ class Book(models.Model):
         verbose_name = _('book')
         verbose_name_plural = _('books')
 
         verbose_name = _('book')
         verbose_name_plural = _('books')
 

-
+    @classmethod
+    def get_visible_for(cls, user):
+        qs = cls.objects.all()
+        if not user.is_authenticated:
+            qs = qs.filter(public=True)
+        return qs
+
+    @staticmethod
+    def q_dc(field, field_plural, value, prefix=''):
+        if connection.features.supports_json_field_contains:
+            return models.Q(**{f'{prefix}dc__{field_plural}__contains': value})
+        else:
+            return models.Q(**{f'{prefix}dc__{field}': value})
+            
+    

     # Representing
     # ============
 
     # Representing
     # ============
 


@@ -350,10 +370,8 @@ class Book(models.Model):
         }
 
         info = self.book_info()
         }
 
         info = self.book_info()

-        print(info)

         if info is not None:
             update['catalogue_book_id'] = info.url.slug
         if info is not None:
             update['catalogue_book_id'] = info.url.slug

-            print(info.url.slug)

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


@@ -362,7 +380,7 @@ class Book(models.Model):
                 else:
                     if info.cover_source == image.get_full_url():
                         update['dc_cover_image'] = image
                 else:
                     if info.cover_source == image.get_full_url():
                         update['dc_cover_image'] = image

-        print(update)
+            update['dc'] = info.to_dict()

         Book.objects.filter(pk=self.pk).update(**update)
 
     def touch(self):
         Book.objects.filter(pk=self.pk).update(**update)
 
     def touch(self):


@@ -374,6 +392,21 @@ class Book(models.Model):
         }
         Book.objects.filter(pk=self.pk).update(**update)
         self.refresh_dc_cache()
         }
         Book.objects.filter(pk=self.pk).update(**update)
         self.refresh_dc_cache()

+        self.build_cover()
+
+    def build_cover(self):
+        width, height = 212, 300
+        try:
+            xml = self.materialize(publishable=True).encode('utf-8')
+            info = BookInfo.from_bytes(xml)
+            cover = make_cover(info, width=width, height=height)
+            out = BytesIO()
+            ext = cover.ext()
+            cover.save(out)
+            self.cover.save(f'{self.slug}.{ext}', out, save=False)
+            type(self).objects.filter(pk=self.pk).update(cover=self.cover)
+        except:
+            type(self).objects.filter(pk=self.pk).update(cover='')

 
     # Materializing & publishing
     # ==========================
 
     # Materializing & publishing
     # ==========================


@@ -404,17 +437,25 @@ class Book(models.Model):
         return compile_text(change.materialize() for change in changes)
 
     def wldocument(self, publishable=True, changes=None, 
         return compile_text(change.materialize() for change in changes)
 
     def wldocument(self, publishable=True, changes=None, 

-            parse_dublincore=True, strict=False):
+                   parse_dublincore=True, strict=False, librarian2=False):

         from documents.ebook_utils import RedakcjaDocProvider
         from librarian.parser import WLDocument
         from documents.ebook_utils import RedakcjaDocProvider
         from librarian.parser import WLDocument

-
+        from librarian.document import WLDocument as WLDocument2
+
+        provider = RedakcjaDocProvider(publishable=publishable)
+        xml = self.materialize(publishable=publishable, changes=changes).encode('utf-8')
+        
+        if librarian2:
+            return WLDocument2(
+                BytesIO(xml),
+                provider=provider)

         return WLDocument.from_bytes(
         return WLDocument.from_bytes(

-                self.materialize(publishable=publishable, changes=changes).encode('utf-8'),
-                provider=RedakcjaDocProvider(publishable=publishable),
+                xml,
+                provider=provider,

                 parse_dublincore=parse_dublincore,
                 strict=strict)
 
                 parse_dublincore=parse_dublincore,
                 strict=strict)
 

-    def publish(self, user, fake=False, host=None, days=0, beta=False):
+    def publish(self, user, fake=False, host=None, days=0, beta=False, hidden=False):

         """
             Publishes a book on behalf of a (local) user.
         """
         """
             Publishes a book on behalf of a (local) user.
         """


@@ -422,7 +463,7 @@ class Book(models.Model):
         changes = self.get_current_changes(publishable=True)
         if not fake:
             book_xml = self.materialize(changes=changes)
         changes = self.get_current_changes(publishable=True)
         if not fake:
             book_xml = self.materialize(changes=changes)

-            data = {"book_xml": book_xml, "days": days}
+            data = {"book_xml": book_xml, "days": days, "hidden": hidden}

             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)