X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/acf3c41fb0ffe8e451b1e465b00e9998f2b027ac..beac9fec3de5fa66dfc80ed119c4bdd812e9e2c2:/src/documents/models/book.py?ds=sidebyside diff --git a/src/documents/models/book.py b/src/documents/models/book.py index 24d0cea0..41e0bcd6 100644 --- 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.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 _ @@ -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 io import BytesIO import os import shutil import re @@ -30,19 +31,28 @@ 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) - #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 - _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) - dc_slug = models.CharField(max_length=128, null=True, blank=True, - editable=False, db_index=True) + dc = models.JSONField(null=True, editable=False) + 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', + ) + legimi_id = models.CharField(max_length=255, blank=True) class NoTextError(BaseException): pass @@ -53,7 +63,21 @@ class Book(models.Model): 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 # ============ @@ -90,11 +114,6 @@ class Book(models.Model): def gallery_url(self): return '%s%s%s/' % (settings.MEDIA_URL, settings.IMAGE_DIR, self.gallery) - @property - def catalogue_book(self): - CBook = apps.get_model('catalogue', 'Book') - return CBook.objects.filter(slug=self.dc_slug).first() - # Creating & manipulating # ======================= @@ -343,13 +362,13 @@ class Book(models.Model): 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: - 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])) @@ -358,6 +377,7 @@ class Book(models.Model): 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): @@ -399,17 +419,25 @@ class Book(models.Model): 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 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( - self.materialize(publishable=publishable, changes=changes).encode('utf-8'), - provider=RedakcjaDocProvider(publishable=publishable), + xml, + provider=provider, 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. """ @@ -417,7 +445,7 @@ class Book(models.Model): 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)