X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/dbdd1449a656f4c62055926d1531be95c2e6e66b..b010b4d7eb20dc89546ced818a75b3bc3019c8b9:/src/catalogue/models/book.py?ds=sidebyside diff --git a/src/catalogue/models/book.py b/src/catalogue/models/book.py index 02278de67..e5ab5e480 100644 --- a/src/catalogue/models/book.py +++ b/src/catalogue/models/book.py @@ -14,6 +14,7 @@ import django.dispatch from django.contrib.contenttypes.fields import GenericRelation from django.core.urlresolvers 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 @@ -30,18 +31,23 @@ from wolnelektury.utils import makedirs bofh_storage = BofhFileSystemStorage() -def _make_upload_to(path): - def _upload_to(i, n): - return path % i.slug - return _upload_to +@deconstructible +class UploadToPath(object): + def __init__(self, path): + self.path = path + def __call__(self, instance, filename): + return self.path % instance.slug -_cover_upload_to = _make_upload_to('book/cover/%s.jpg') -_cover_thumb_upload_to = _make_upload_to('book/cover_thumb/%s.jpg') + +_cover_upload_to = UploadToPath('book/cover/%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') def _ebook_upload_to(upload_path): - return _make_upload_to(upload_path) + return UploadToPath(upload_path) class Book(models.Model): @@ -75,12 +81,25 @@ class Book(models.Model): null=True, blank=True, upload_to=_cover_thumb_upload_to, max_length=255) + 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) + simple_cover = EbookField( + 'simple_cover', _('cover for mobile app'), + null=True, blank=True, + upload_to=_simple_cover_upload_to, + max_length=255) ebook_formats = constants.EBOOK_FORMATS formats = ebook_formats + ['html', 'xml'] parent = models.ForeignKey('self', 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) + has_audience = models.BooleanField(default=False) + objects = models.Manager() tagged = managers.ModelTaggedItemManager(Tag) tags = managers.TagDescriptor(Tag) @@ -123,7 +142,7 @@ class Book(models.Model): return split_tags(self.tags.exclude(category__in=('set', 'theme'))) def author_unicode(self): - return self.tag_unicode('author') + return self.cached_author def translator(self): translators = self.extra_info.get('translators') @@ -136,6 +155,9 @@ class Book(models.Model): others = '' return ', '.join(u'\xa0'.join(reversed(translator.split(', ', 1))) for translator in translators) + others + def cover_source(self): + return self.extra_info.get('cover_source', self.parent.cover_source() if self.parent else '') + def save(self, force_insert=False, force_update=False, **kwargs): from sortify import sortify @@ -148,6 +170,9 @@ class Book(models.Model): author = u'' self.sort_key_author = author + self.cached_author = self.tag_unicode('author') + self.has_audience = 'audience' in self.extra_info + ret = super(Book, self).save(force_insert, force_update, **kwargs) return ret @@ -186,6 +211,9 @@ class Book(models.Model): else: return self.media.filter(type=type_).exists() + def has_audio(self): + return self.has_media('mp3') + def get_media(self, type_): if self.has_media(type_): if type_ in Book.formats: @@ -379,6 +407,11 @@ class Book(models.Model): 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) cover_changed = old_cover != book.cover_info() @@ -412,6 +445,8 @@ class Book(models.Model): if 'cover' not in dont_build: book.cover.build_delay() book.cover_thumb.build_delay() + book.cover_api_thumb.build_delay() + book.simple_cover.build_delay() # Build HTML and ebooks. book.html_file.build_delay() @@ -430,6 +465,7 @@ class Book(models.Model): child.parent_cover_changed() book.save() # update sort_key_author + book.update_popularity() cls.published.send(sender=cls, instance=book) return book @@ -514,6 +550,8 @@ class Book(models.Model): if 'cover' not in app_settings.DONT_BUILD: self.cover.build_delay() self.cover_thumb.build_delay() + self.cover_api_thumb.build_delay() + self.simple_cover.build_delay() for format_ in constants.EBOOK_FORMATS_WITH_COVERS: if format_ not in app_settings.DONT_BUILD: getattr(self, '%s_file' % format_).build_delay() @@ -636,6 +674,13 @@ class Book(models.Model): else: return None + def fragment_data(self): + fragment = self.choose_fragment() + if fragment: + return {'title': fragment.book.pretty_title(), 'html': fragment.get_short_text()} + else: + return None + def update_popularity(self): count = self.tags.filter(category='set').values('user').order_by('user').distinct().count() try: @@ -671,4 +716,4 @@ add_file_fields() class BookPopularity(models.Model): book = models.OneToOneField(Book, related_name='popularity') - count = models.IntegerField(default=0) + count = models.IntegerField(default=0, db_index=True)