X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/e1688333f557a60400fed09b4b087f4c8dddb432..ca8f4e8fef80cb603117ed579da8554f503698e5:/src/catalogue/models/book.py?ds=inline diff --git a/src/catalogue/models/book.py b/src/catalogue/models/book.py index 7d923ea3c..29e375464 100644 --- a/src/catalogue/models/book.py +++ b/src/catalogue/models/book.py @@ -1,5 +1,5 @@ -# This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later. -# Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information. +# This file is part of Wolne Lektury, licensed under GNU Affero GPLv3 or later. +# Copyright © Fundacja Wolne Lektury. See NOTICE for more information. # from collections import OrderedDict import json @@ -15,111 +15,69 @@ import django.dispatch from django.contrib.contenttypes.fields import GenericRelation from django.template.loader import render_to_string from django.urls import reverse -from django.utils.translation import ugettext_lazy as _, get_language -from django.utils.deconstruct import deconstructible +from django.utils.translation import gettext_lazy as _, get_language from fnpdjango.storage import BofhFileSystemStorage from lxml import html from librarian.cover import WLCover from librarian.html import transform_abstrakt +from librarian.builders import builders from newtagging import managers from catalogue import constants -from catalogue.fields import EbookField +from catalogue import fields from catalogue.models import Tag, Fragment, BookMedia from catalogue.utils import create_zip, gallery_url, gallery_path, split_tags, get_random_hash from catalogue.models.tag import prefetched_relations from catalogue import app_settings -from catalogue import tasks from wolnelektury.utils import makedirs, cached_render, clear_cached_renders bofh_storage = BofhFileSystemStorage() -@deconstructible -class UploadToPath(object): - def __init__(self, path): - self.path = path - - def __call__(self, instance, filename): - return self.path % instance.slug - - -_cover_upload_to = UploadToPath('book/cover/%s.jpg') -_cover_clean_upload_to = UploadToPath('book/cover_clean/%s.jpg') -_cover_thumb_upload_to = UploadToPath('book/cover_thumb/%s.jpg') -_cover_api_thumb_upload_to = UploadToPath('book/cover_api_thumb/%s.jpg') -_simple_cover_upload_to = UploadToPath('book/cover_simple/%s.jpg') -_cover_ebookpoint_upload_to = UploadToPath('book/cover_ebookpoint/%s.jpg') - - -def _ebook_upload_to(upload_path): - return UploadToPath(upload_path) - - class Book(models.Model): """Represents a book imported from WL-XML.""" - title = models.CharField(_('title'), max_length=32767) - sort_key = models.CharField(_('sort key'), max_length=120, db_index=True, editable=False) + title = models.CharField('tytuł', max_length=32767) + sort_key = models.CharField('klucz sortowania', max_length=120, db_index=True, editable=False) sort_key_author = models.CharField( - _('sort key by author'), max_length=120, db_index=True, editable=False, default='') - slug = models.SlugField(_('slug'), max_length=120, db_index=True, unique=True) - common_slug = models.SlugField(_('slug'), max_length=120, db_index=True) - language = models.CharField(_('language code'), max_length=3, db_index=True, default=app_settings.DEFAULT_LANGUAGE) - description = models.TextField(_('description'), blank=True) - abstract = models.TextField(_('abstract'), blank=True) - toc = models.TextField(_('toc'), blank=True) - created_at = models.DateTimeField(_('creation date'), auto_now_add=True, db_index=True) - changed_at = models.DateTimeField(_('change date'), auto_now=True, db_index=True) - parent_number = models.IntegerField(_('parent number'), default=0) - extra_info = models.TextField(_('extra information'), default='{}') + 'klucz sortowania wg autora', max_length=120, db_index=True, editable=False, default='') + slug = models.SlugField('slug', max_length=120, db_index=True, unique=True) + common_slug = models.SlugField('wspólny slug', max_length=120, db_index=True) + language = models.CharField('kod języka', max_length=3, db_index=True, default=app_settings.DEFAULT_LANGUAGE) + description = models.TextField('opis', blank=True) + abstract = models.TextField('abstrakt', blank=True) + toc = models.TextField('spis treści', blank=True) + created_at = models.DateTimeField('data utworzenia', auto_now_add=True, db_index=True) + changed_at = models.DateTimeField('data motyfikacji', auto_now=True, db_index=True) + parent_number = models.IntegerField('numer w ramach rodzica', default=0) + extra_info = models.TextField('dodatkowe informacje', default='{}') gazeta_link = models.CharField(blank=True, max_length=240) wiki_link = models.CharField(blank=True, max_length=240) - print_on_demand = models.BooleanField(_('print on demand'), default=False) - recommended = models.BooleanField(_('recommended'), default=False) - audio_length = models.CharField(_('audio length'), blank=True, max_length=8) - preview = models.BooleanField(_('preview'), default=False) - preview_until = models.DateField(_('preview until'), blank=True, null=True) + print_on_demand = models.BooleanField('druk na żądanie', default=False) + recommended = models.BooleanField('polecane', default=False) + audio_length = models.CharField('długość audio', blank=True, max_length=8) + preview = models.BooleanField('prapremiera', default=False) + preview_until = models.DateField('prapremiera do', blank=True, null=True) preview_key = models.CharField(max_length=32, blank=True, null=True) - findable = models.BooleanField(_('findable'), default=True, db_index=True) + findable = models.BooleanField('wyszukiwalna', default=True, db_index=True) # files generated during publication - cover = EbookField( - 'cover', _('cover'), - null=True, blank=True, - upload_to=_cover_upload_to, - storage=bofh_storage, max_length=255) - cover_etag = models.CharField(max_length=255, editable=False, default='', db_index=True) + xml_file = fields.XmlField(storage=bofh_storage, with_etag=False) + html_file = fields.HtmlField(storage=bofh_storage) + fb2_file = fields.Fb2Field(storage=bofh_storage) + txt_file = fields.TxtField(storage=bofh_storage) + epub_file = fields.EpubField(storage=bofh_storage) + mobi_file = fields.MobiField(storage=bofh_storage) + pdf_file = fields.PdfField(storage=bofh_storage) + + cover = fields.CoverField('okładka', storage=bofh_storage) # Cleaner version of cover for thumbs - cover_clean = EbookField( - 'cover_clean', _('clean cover'), - null=True, blank=True, - upload_to=_cover_clean_upload_to, - max_length=255 - ) - cover_clean_etag = models.CharField(max_length=255, editable=False, default='', db_index=True) - cover_thumb = EbookField( - 'cover_thumb', _('cover thumbnail'), - null=True, blank=True, - upload_to=_cover_thumb_upload_to, - max_length=255) - cover_thumb_etag = models.CharField(max_length=255, editable=False, default='', db_index=True) - cover_api_thumb = EbookField( - 'cover_api_thumb', _('cover thumbnail for mobile app'), - null=True, blank=True, - upload_to=_cover_api_thumb_upload_to, - max_length=255) - cover_api_thumb_etag = models.CharField(max_length=255, editable=False, default='', db_index=True) - simple_cover = EbookField( - 'simple_cover', _('cover for mobile app'), - null=True, blank=True, - upload_to=_simple_cover_upload_to, - max_length=255) - simple_cover_etag = models.CharField(max_length=255, editable=False, default='', db_index=True) - cover_ebookpoint = EbookField( - 'cover_ebookpoint', _('cover for Ebookpoint'), - null=True, blank=True, - upload_to=_cover_ebookpoint_upload_to, - max_length=255) - cover_ebookpoint_etag = models.CharField(max_length=255, editable=False, default='', db_index=True) + cover_clean = fields.CoverCleanField('czysta okładka') + cover_thumb = fields.CoverThumbField('miniatura okładki') + cover_api_thumb = fields.CoverApiThumbField( + 'mniaturka okładki dla aplikacji') + simple_cover = fields.SimpleCoverField('okładka dla aplikacji') + cover_ebookpoint = fields.CoverEbookpointField( + 'okładka dla Ebookpoint') + ebook_formats = constants.EBOOK_FORMATS formats = ebook_formats + ['html', 'xml'] @@ -133,6 +91,7 @@ class Book(models.Model): tagged = managers.ModelTaggedItemManager(Tag) tags = managers.TagDescriptor(Tag) tag_relations = GenericRelation(Tag.intermediary_table_model) + translators = models.ManyToManyField(Tag, blank=True) html_built = django.dispatch.Signal() published = django.dispatch.Signal() @@ -146,8 +105,8 @@ class Book(models.Model): class Meta: ordering = ('sort_key_author', 'sort_key') - verbose_name = _('book') - verbose_name_plural = _('books') + verbose_name = 'książka' + verbose_name_plural = 'książki' app_label = 'catalogue' def __str__(self): @@ -196,12 +155,6 @@ class Book(models.Model): def genre_unicode(self): return self.tag_unicode('genre') - def translators(self): - translators = self.get_extra_info_json().get('translators') or [] - return [ - '\xa0'.join(reversed(translator.split(', ', 1))) for translator in translators - ] - def translator(self): translators = self.get_extra_info_json().get('translators') if not translators: @@ -295,7 +248,7 @@ class Book(models.Model): if self.parent.html_file: return self.parent - + return self.parent.get_prev_text() def get_next_text(self, inside=True): @@ -329,7 +282,7 @@ class Book(models.Model): def get_children(self): return self.children.all().order_by('parent_number') - + @property def name(self): return self.title @@ -373,6 +326,9 @@ class Book(models.Model): total += app_settings.GET_MP3_LENGTH(media.file.path) return int(total) + def get_time(self): + return round(self.xml_file.size / 1000 * 40) + def has_media(self, type_): if type_ in Book.formats: return bool(getattr(self, "%s_file" % type_)) @@ -439,7 +395,7 @@ class Book(models.Model): def has_description(self): return len(self.description) > 0 - has_description.short_description = _('description') + has_description.short_description = 'opis' has_description.boolean = True def has_mp3_file(self): @@ -457,13 +413,28 @@ class Book(models.Model): has_daisy_file.short_description = 'DAISY' has_daisy_file.boolean = True + def has_sync_file(self): + return settings.FEATURE_SYNCHRO and self.has_media("sync") + + def get_sync(self): + with self.get_media('sync').first().file.open('r') as f: + sync = f.read().split('\n') + offset = float(sync[0]) + items = [] + for line in sync[1:]: + if not line: + continue + start, end, elid = line.split() + items.append([elid, float(start) + offset]) + return json.dumps(items) + def has_audio_epub_file(self): return self.has_media("audio.epub") @property def media_daisy(self): return self.get_media('daisy') - + @property def media_audio_epub(self): return self.get_media('audio.epub') @@ -536,9 +507,10 @@ class Book(models.Model): format_) field_name = "%s_file" % format_ + field = getattr(Book, field_name) books = Book.objects.filter(parent=None).exclude(**{field_name: ""}).exclude(preview=True).exclude(findable=False) paths = [(pretty_file_name(b), getattr(b, field_name).path) for b in books.iterator()] - return create_zip(paths, app_settings.FORMAT_ZIPS[format_]) + return create_zip(paths, field.ZIP) def zip_audiobooks(self, format_): bm = BookMedia.objects.filter(book=self, type=format_) @@ -552,24 +524,15 @@ class Book(models.Model): licenses.add(license) readme = render_to_string('catalogue/audiobook_zip_readme.txt', { 'licenses': licenses, + 'meta': self.wldocument2().meta, }) return create_zip(paths, "%s_%s" % (self.slug, format_), {'informacje.txt': readme}) - def search_index(self, book_info=None, index=None, index_tags=True, commit=True): + def search_index(self, index=None): if not self.findable: return - if index is None: - from search.index import Index - index = Index() - try: - index.index_book(self, book_info) - if index_tags: - index.index_tags() - if commit: - index.index.commit() - except Exception as e: - index.index.rollback() - raise e + from search.index import Index + Index.index_book(self) # will make problems in conjunction with paid previews def download_pictures(self, remote_gallery_url): @@ -610,7 +573,7 @@ class Book(models.Model): a.attrib['href'] = html_link + a.attrib['href'] self.toc = html.tostring(toc, encoding='unicode') # div#toc - + @classmethod def from_xml_file(cls, xml_file, **kwargs): from django.core.files import File @@ -629,7 +592,9 @@ class Book(models.Model): @classmethod def from_text_and_meta(cls, raw_file, book_info, overwrite=False, dont_build=None, search_index=True, - search_index_tags=True, remote_gallery_url=None, days=0, findable=True): + remote_gallery_url=None, days=0, findable=True, logo=None, logo_mono=None, logo_alt=None): + from catalogue import tasks + if dont_build is None: dont_build = set() dont_build = set.union(set(dont_build), set(app_settings.DONT_BUILD)) @@ -641,7 +606,7 @@ class Book(models.Model): try: children.append(Book.objects.get(slug=part_url.slug)) except Book.DoesNotExist: - raise Book.DoesNotExist(_('Book "%s" does not exist.') % part_url.slug) + raise Book.DoesNotExist('Książka "%s" nie istnieje.' % part_url.slug) # Read book metadata book_slug = book_info.url.slug @@ -657,7 +622,7 @@ class Book(models.Model): book.preview_until = date.today() + timedelta(days) else: if not overwrite: - raise Book.AlreadyExists(_('Book %s already exists') % book_slug) + raise Book.AlreadyExists('Książka %s już istnieje' % book_slug) # Save shelves for this book book_shelves = list(book.tags.filter(category='set')) old_cover = book.cover_info() @@ -674,21 +639,26 @@ class Book(models.Model): book.common_slug = book_info.variant_of.slug else: book.common_slug = book.slug - book.extra_info = json.dumps(book_info.to_dict()) + extra = book_info.to_dict() + if logo: + extra['logo'] = logo + if logo_mono: + extra['logo_mono'] = logo_mono + if logo_alt: + extra['logo_alt'] = logo_alt + book.extra_info = json.dumps(extra) book.load_abstract() book.load_toc() book.save() meta_tags = Tag.tags_from_info(book_info) - for tag in meta_tags: - if not tag.for_books: - tag.for_books = True - tag.save() - - book.tags = set(meta_tags + book_shelves) + just_tags = [t for (t, rel) in meta_tags if not rel] + book.tags = set(just_tags + book_shelves) book.save() # update sort_key_author + book.translators.set([t for (t, rel) in meta_tags if rel == 'translator']) + cover_changed = old_cover != book.cover_info() obsolete_children = set(b for b in book.children.all() if b not in children) @@ -736,7 +706,7 @@ class Book(models.Model): getattr(book, '%s_file' % format_).build_delay() if not settings.NO_SEARCH_INDEX and search_index and findable: - tasks.index_book.delay(book.id, book_info=book_info, index_tags=search_index_tags) + tasks.index_book.delay(book.id) for child in notify_cover_changed: child.parent_cover_changed() @@ -747,46 +717,47 @@ class Book(models.Model): cls.published.send(sender=cls, instance=book) return book - def get_master(self): - master_tags = [ - 'opowiadanie', - 'powiesc', - 'dramat_wierszowany_l', - 'dramat_wierszowany_lp', - 'dramat_wspolczesny', 'liryka_l', 'liryka_lp', - 'wywiad', - ] - from librarian.parser import WLDocument - wld = WLDocument.from_file(self.xml_file.path, parse_dublincore=False) - root = wld.edoc.getroot() - for master in root.iter(): - if master.tag in master_tags: - return master - def update_references(self): - from references.models import Entity, Reference - master = self.get_master() - if master is None: - master = [] - found = set() - for i, sec in enumerate(master): - for ref in sec.findall('.//ref'): - href = ref.attrib.get('href', '') - if not href or href in found: - continue - found.add(href) - entity, created = Entity.objects.get_or_create( - uri=href - ) - ref, created = Reference.objects.get_or_create( - book=self, - entity=entity - ) - ref.first_section = 'sec%d' % (i + 1) - entity.populate() - entity.save() - Reference.objects.filter(book=self).exclude(entity__uri__in=found).delete() - + Entity = apps.get_model('references', 'Entity') + doc = self.wldocument2() + doc._compat_assign_section_ids() + doc._compat_assign_ordered_ids() + refs = {} + for ref_elem in doc.references(): + uri = ref_elem.attrib.get('href', '') + if not uri: + continue + if uri in refs: + ref = refs[uri] + else: + entity, entity_created = Entity.objects.get_or_create(uri=uri) + if entity_created: + try: + entity.populate() + except: + pass + else: + entity.save() + ref, ref_created = entity.reference_set.get_or_create(book=self) + refs[uri] = ref + if not ref_created: + ref.occurence_set.all().delete() + sec = ref_elem.get_link() + m = re.match(r'sec(\d+)', sec) + assert m is not None + sec = int(m.group(1)) + snippet = ref_elem.get_snippet() + b = builders['html-snippet']() + for s in snippet: + s.html_build(b) + html = b.output().get_bytes().decode('utf-8') + + ref.occurence_set.create( + section=sec, + html=html + ) + self.reference_set.exclude(entity__uri__in=refs).delete() + @property def references(self): return self.reference_set.all().select_related('entity') @@ -832,7 +803,7 @@ class Book(models.Model): yield self.parent else: return [] - + def clear_cache(self): clear_cached_renders(self.mini_box) clear_cached_renders(self.mini_box_nolink) @@ -975,7 +946,7 @@ class Book(models.Model): def stage_note(self): stage = self.get_extra_info_json().get('stage') if stage and stage < '0.4': - return (_('This work needs modernisation'), + return (_('Ten utwór wymaga uwspółcześnienia'), reverse('infopage', args=['wymagajace-uwspolczesnienia'])) else: return None, None @@ -1003,7 +974,7 @@ class Book(models.Model): return fragments[0] else: return None - + def fragment_data(self): fragment = self.choose_fragment() if fragment: @@ -1056,28 +1027,6 @@ class Book(models.Model): 'no_link': True, } -def add_file_fields(): - for format_ in Book.formats: - field_name = "%s_file" % format_ - # This weird globals() assignment makes Django migrations comfortable. - _upload_to = _ebook_upload_to('book/%s/%%s.%s' % (format_, format_)) - _upload_to.__name__ = '_%s_upload_to' % format_ - globals()[_upload_to.__name__] = _upload_to - - EbookField( - format_, _("%s file" % format_.upper()), - upload_to=_upload_to, - storage=bofh_storage, - max_length=255, - blank=True, - default='' - ).contribute_to_class(Book, field_name) - if format_ != 'xml': - models.CharField(max_length=255, editable=False, default='', db_index=True).contribute_to_class(Book, f'{field_name}_etag') - - -add_file_fields() - class BookPopularity(models.Model): book = models.OneToOneField(Book, models.CASCADE, related_name='popularity')