X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/39b99a8a8920dca527eb823b860303103389fd91..eaf0711613bea8181528d8911b30ef7976b7bb42:/src/catalogue/models/book.py diff --git a/src/catalogue/models/book.py b/src/catalogue/models/book.py index 6e6c50f8f..af4c9410a 100644 --- a/src/catalogue/models/book.py +++ b/src/catalogue/models/book.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later. # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information. # @@ -7,29 +6,28 @@ from datetime import date, timedelta from random import randint import os.path import re -import urllib +from urllib.request import urlretrieve from django.conf import settings from django.db import connection, models, transaction -from django.db.models import permalink import django.dispatch from django.contrib.contenttypes.fields import GenericRelation -from django.core.urlresolvers import reverse +from django.urls import reverse from django.utils.translation import ugettext_lazy as _, get_language from django.utils.deconstruct import deconstructible import jsonfield from fnpdjango.storage import BofhFileSystemStorage -from ssify import flush_ssi_includes +from librarian.cover import WLCover from librarian.html import transform_abstrakt from newtagging import managers from catalogue import constants from catalogue.fields import EbookField from catalogue.models import Tag, Fragment, BookMedia -from catalogue.utils import create_zip, gallery_url, gallery_path, split_tags +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 +from wolnelektury.utils import makedirs, cached_render, clear_cached_renders bofh_storage = BofhFileSystemStorage() @@ -75,6 +73,7 @@ class Book(models.Model): 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) + preview_key = models.CharField(max_length=32, blank=True, null=True) # files generated during publication cover = EbookField( @@ -101,7 +100,7 @@ class Book(models.Model): ebook_formats = constants.EBOOK_FORMATS formats = ebook_formats + ['html', 'xml'] - parent = models.ForeignKey('self', blank=True, null=True, related_name='children') + parent = models.ForeignKey('self', models.CASCADE, blank=True, null=True, related_name='children') ancestor = models.ManyToManyField('self', blank=True, editable=False, related_name='descendant', symmetrical=False) cached_author = models.CharField(blank=True, max_length=240, db_index=True) @@ -115,6 +114,8 @@ class Book(models.Model): html_built = django.dispatch.Signal() published = django.dispatch.Signal() + SORT_KEY_SEP = '$' + class AlreadyExists(Exception): pass @@ -124,7 +125,7 @@ class Book(models.Model): verbose_name_plural = _('books') app_label = 'catalogue' - def __unicode__(self): + def __str__(self): return self.title def get_initial(self): @@ -136,6 +137,15 @@ class Book(models.Model): def authors(self): return self.tags.filter(category='author') + def epochs(self): + return self.tags.filter(category='epoch') + + def genres(self): + return self.tags.filter(category='genre') + + def kinds(self): + return self.tags.filter(category='kind') + def tag_unicode(self, category): relations = prefetched_relations(self, category) if relations: @@ -149,6 +159,15 @@ class Book(models.Model): def author_unicode(self): return self.cached_author + def kind_unicode(self): + return self.tag_unicode('kind') + + def epoch_unicode(self): + return self.tag_unicode('epoch') + + def genre_unicode(self): + return self.tag_unicode('genre') + def translator(self): translators = self.extra_info.get('translators') if not translators: @@ -167,7 +186,7 @@ class Book(models.Model): from sortify import sortify self.sort_key = sortify(self.title)[:120] - self.title = unicode(self.title) # ??? + self.title = str(self.title) # ??? try: author = self.authors().first().sort_key @@ -178,18 +197,15 @@ class Book(models.Model): self.cached_author = self.tag_unicode('author') self.has_audience = 'audience' in self.extra_info + if self.preview and not self.preview_key: + self.preview_key = get_random_hash(self.slug)[:32] + ret = super(Book, self).save(force_insert, force_update, **kwargs) return ret - @permalink def get_absolute_url(self): - return 'catalogue.views.book_detail', [self.slug] - - @staticmethod - @permalink - def create_url(slug): - return 'catalogue.views.book_detail', [slug] + return reverse('book_detail', args=[self.slug]) def gallery_path(self): return gallery_path(self.slug) @@ -268,7 +284,7 @@ class Book(models.Model): media = self.get_media(format_) if media: if self.preview: - return reverse('embargo_link', kwargs={'slug': self.slug, 'format_': format_}) + return reverse('embargo_link', kwargs={'key': self.preview_key, 'slug': self.slug, 'format_': format_}) else: return media.url else: @@ -385,7 +401,7 @@ class Book(models.Model): index.index_tags() if commit: index.index.commit() - except Exception, e: + except Exception as e: index.index.rollback() raise e @@ -403,7 +419,7 @@ class Book(models.Model): for ilustr in ilustr_elements: ilustr_src = ilustr.get('src') ilustr_path = os.path.join(gallery_path, ilustr_src) - urllib.urlretrieve('%s/%s' % (remote_gallery_url, ilustr_src), ilustr_path) + urlretrieve('%s/%s' % (remote_gallery_url, ilustr_src), ilustr_path) def load_abstract(self): abstract = self.wldocument(parse_dublincore=False).edoc.getroot().find('.//abstrakt') @@ -486,6 +502,7 @@ class Book(models.Model): tag.save() book.tags = set(meta_tags + book_shelves) + book.save() # update sort_key_author cover_changed = old_cover != book.cover_info() obsolete_children = set(b for b in book.children.all() @@ -537,7 +554,6 @@ class Book(models.Model): for child in notify_cover_changed: child.parent_cover_changed() - book.save() # update sort_key_author book.update_popularity() cls.published.send(sender=cls, instance=book) return book @@ -575,23 +591,9 @@ class Book(models.Model): b.ancestor.add(parent) parent = parent.parent - def flush_includes(self, languages=True): - if not languages: - return - if languages is True: - languages = [lc for (lc, _ln) in settings.LANGUAGES] - flush_ssi_includes([ - template % (self.pk, lang) - for template in [ - '/katalog/b/%d/mini.%s.html', - '/katalog/b/%d/mini_nolink.%s.html', - '/katalog/b/%d/short.%s.html', - '/katalog/b/%d/wide.%s.html', - '/api/include/book/%d.%s.json', - '/api/include/book/%d.%s.xml', - ] - for lang in languages - ]) + def clear_cache(self): + clear_cached_renders(self.mini_box) + clear_cached_renders(self.mini_box_nolink) def cover_info(self, inherit=True): """Returns a dictionary to serve as fallback for BookInfo. @@ -656,7 +658,7 @@ class Book(models.Model): def publisher(self): publisher = self.extra_info['publisher'] - if isinstance(publisher, basestring): + if isinstance(publisher, str): return publisher elif isinstance(publisher, list): return ', '.join(publisher) @@ -681,7 +683,7 @@ class Book(models.Model): """ books_by_parent = {} - books = cls.objects.order_by('parent_number', 'sort_key').only('title', 'parent', 'slug') + books = cls.objects.order_by('parent_number', 'sort_key').only('title', 'parent', 'slug', 'extra_info') if book_filter: books = books.filter(book_filter).distinct() @@ -780,6 +782,24 @@ class Book(models.Model): if likes(user, self): set_sets(user, self, []) + def full_sort_key(self): + return self.SORT_KEY_SEP.join((self.sort_key_author, self.sort_key, str(self.id))) + + def cover_color(self): + return WLCover.epoch_colors.get(self.extra_info.get('epoch'), '#000000') + + @cached_render('catalogue/book_mini_box.html') + def mini_box(self): + return { + 'book': self + } + + @cached_render('catalogue/book_mini_box.html') + def mini_box_nolink(self): + return { + 'book': self, + 'no_link': True, + } def add_file_fields(): for format_ in Book.formats: @@ -803,5 +823,5 @@ add_file_fields() class BookPopularity(models.Model): - book = models.OneToOneField(Book, related_name='popularity') + book = models.OneToOneField(Book, models.CASCADE, related_name='popularity') count = models.IntegerField(default=0, db_index=True)