X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/7255df395ced6145a654fb6cfc1e673000008a25..a2f5e89d46881be85c38c664ffd30dcfe39ad512:/src/catalogue/models/book.py diff --git a/src/catalogue/models/book.py b/src/catalogue/models/book.py index cdb110045..dc6ba5099 100644 --- a/src/catalogue/models/book.py +++ b/src/catalogue/models/book.py @@ -18,6 +18,8 @@ from django.utils.deconstruct import deconstructible import jsonfield from fnpdjango.storage import BofhFileSystemStorage from ssify import flush_ssi_includes + +from librarian.html import transform_abstrakt from newtagging import managers from catalogue import constants from catalogue.fields import EbookField @@ -42,7 +44,8 @@ class UploadToPath(object): _cover_upload_to = UploadToPath('book/cover/%s.jpg') _cover_thumb_upload_to = UploadToPath('book/cover_thumb/%s.jpg') -_cover_api_thumb_opload_to = UploadToPath('book/cover_api_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): @@ -59,6 +62,7 @@ class Book(models.Model): 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) 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) @@ -81,9 +85,14 @@ class Book(models.Model): upload_to=_cover_thumb_upload_to, max_length=255) cover_api_thumb = EbookField( - 'cover_api_thumb', _('cover thumbnail for API'), + '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=_cover_api_thumb_opload_to, + upload_to=_simple_cover_upload_to, max_length=255) ebook_formats = constants.EBOOK_FORMATS formats = ebook_formats + ['html', 'xml'] @@ -339,6 +348,13 @@ class Book(models.Model): ilustr_path = os.path.join(gallery_path, ilustr_src) urllib.urlretrieve('%s/%s' % (remote_gallery_url, ilustr_src), ilustr_path) + def load_abstract(self): + abstract = self.wldocument().edoc.getroot().find('.//abstrakt') + if abstract is not None: + self.abstract = transform_abstrakt(abstract) + else: + self.abstract = '' + @classmethod def from_xml_file(cls, xml_file, **kwargs): from django.core.files import File @@ -397,6 +413,7 @@ class Book(models.Model): else: book.common_slug = book.slug book.extra_info = book_info.to_dict() + book.load_abstract() book.save() meta_tags = Tag.tags_from_info(book_info) @@ -440,6 +457,7 @@ class Book(models.Model): 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() @@ -458,6 +476,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 @@ -543,6 +562,7 @@ class Book(models.Model): 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() @@ -707,4 +727,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)