fixes

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

diff --git a/src/documents/models/book.py b/src/documents/models/book.py
index e7c3481..d5724a2 100644 (file)
--- a/src/documents/models/book.py
+++ b/src/documents/models/book.py
@@ -1,6 +1,7 @@
 # This file is part of FNP-Redakcja, licensed under GNU Affero GPLv3 or later.
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
 #
 # This file is part of FNP-Redakcja, licensed under GNU Affero GPLv3 or later.
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
 #

+from django.apps import apps

 from django.contrib.sites.models import Site
 from django.db import models, transaction
 from django.template.loader import render_to_string
 from django.contrib.sites.models import Site
 from django.db import models, transaction
 from django.template.loader import render_to_string


@@ -16,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


@@ -29,19 +31,26 @@ class Book(models.Model):
     gallery = models.CharField(_('scan gallery name'), max_length=255, blank=True)
     project = models.ForeignKey(Project, models.SET_NULL, null=True, blank=True)
 
     gallery = models.CharField(_('scan gallery name'), max_length=255, blank=True)
     project = models.ForeignKey(Project, models.SET_NULL, null=True, blank=True)
 

-    #wl_slug = models.CharField(_('title'), max_length=255, null=True, db_index=True, editable=False)

     parent = models.ForeignKey('self', models.SET_NULL, null=True, blank=True, verbose_name=_('parent'), related_name="children", editable=False)
     parent_number = models.IntegerField(_('parent number'), null=True, blank=True, db_index=True, editable=False)
 
     # Cache
     parent = models.ForeignKey('self', models.SET_NULL, null=True, blank=True, verbose_name=_('parent'), related_name="children", editable=False)
     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_slug = models.CharField(max_length=128, null=True, blank=True,
-            editable=False, db_index=True)
+    catalogue_book = models.ForeignKey(
+        'catalogue.Book',
+        models.DO_NOTHING,
+        to_field='slug',
+        null=True, blank=True,
+        db_constraint=False,
+        editable=False, db_index=True,
+        related_name='document_books',
+        related_query_name='document_book',
+    )

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


@@ -52,6 +61,12 @@ 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

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


@@ -337,13 +352,13 @@ class Book(models.Model):
 
     def refresh_dc_cache(self):
         update = {
 
     def refresh_dc_cache(self):
         update = {

-            'dc_slug': None,
+            'catalogue_book_id': 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['dc_slug'] = info.url.slug
+            update['catalogue_book_id'] = 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]))


@@ -393,17 +408,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.
         """


@@ -411,7 +434,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)