fix

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

diff --git a/src/documents/models/book.py b/src/documents/models/book.py
index 42ea33a..41e0bcd 100644 (file)
--- a/src/documents/models/book.py
+++ b/src/documents/models/book.py
@@ -3,7 +3,7 @@
 #
 from django.apps import apps
 from django.contrib.sites.models import Site
 #
 from django.apps import apps
 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.utils.translation import ugettext_lazy as _
 from django.template.loader import render_to_string
 from django.urls import reverse
 from django.utils.translation import ugettext_lazy as _


@@ -17,6 +17,7 @@ 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


@@ -40,6 +41,7 @@ class Book(models.Model):
     _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)

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


@@ -50,6 +52,7 @@ class Book(models.Model):
         related_name='document_books',
         related_query_name='document_book',
     )
         related_name='document_books',
         related_query_name='document_book',
     )

+    legimi_id = models.CharField(max_length=255, blank=True)

 
     class NoTextError(BaseException):
         pass
 
     class NoTextError(BaseException):
         pass


@@ -60,7 +63,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
     # ============
 


@@ -360,6 +377,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

+            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):


@@ -401,17 +419,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.
         """


@@ -419,7 +445,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)