X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/e78ad9088340bcceb6634334ce0941f571a67440..dd549d9f4b46da1b7a42145f571c746f3831953e:/apps/catalogue/models.py
diff --git a/apps/catalogue/models.py b/apps/catalogue/models.py
index 568679b10..a0f737f58 100644
--- a/apps/catalogue/models.py
+++ b/apps/catalogue/models.py
@@ -6,6 +6,8 @@ from datetime import datetime
from django.db import models
from django.db.models import permalink, Q
+import django.dispatch
+from django.core.cache import cache
from django.utils.translation import ugettext_lazy as _
from django.contrib.auth.models import User
from django.core.files import File
@@ -20,14 +22,14 @@ from django.conf import settings
from newtagging.models import TagBase, tags_updated
from newtagging import managers
from catalogue.fields import JSONField, OverwritingFileField
-from catalogue.utils import ExistingFile
+from catalogue.utils import ExistingFile, ORMDocProvider, create_zip, remove_zip
from librarian import dcparser, html, epub, NoDublinCore
import mutagen
from mutagen import id3
from slughifi import slughifi
from sortify import sortify
-
+from os import unlink
TAG_CATEGORIES = (
('author', _('author')),
@@ -46,6 +48,10 @@ MEDIA_FORMATS = (
('daisy', _('DAISY file')),
)
+# not quite, but Django wants you to set a timeout
+CACHE_FOREVER = 2419200 # 28 days
+
+
class TagSubcategoryManager(models.Manager):
def __init__(self, subcategory):
super(TagSubcategoryManager, self).__init__()
@@ -215,6 +221,10 @@ class BookMedia(models.Model):
self.file.save(None, ExistingFile(self.file.path), save=False, leave=True)
super(BookMedia, self).save(*args, **kwargs)
+
+ # remove the zip package for book with modified media
+ remove_zip(self.book.slug)
+
extra_info = self.get_extra_info_value()
extra_info.update(self.read_meta())
self.set_extra_info_value(extra_info)
@@ -277,30 +287,25 @@ class BookMedia(models.Model):
class Book(models.Model):
title = models.CharField(_('title'), max_length=120)
- sort_key = models.CharField(_('sort_key'), max_length=120, db_index=True, editable=False)
+ sort_key = models.CharField(_('sort key'), max_length=120, db_index=True, editable=False)
slug = models.SlugField(_('slug'), max_length=120, unique=True, db_index=True)
description = models.TextField(_('description'), blank=True)
created_at = models.DateTimeField(_('creation date'), auto_now_add=True, db_index=True)
changed_at = models.DateTimeField(_('creation date'), auto_now=True, db_index=True)
- _short_html = models.TextField(_('short HTML'), editable=False)
parent_number = models.IntegerField(_('parent number'), default=0)
extra_info = JSONField(_('extra information'), default='{}')
gazeta_link = models.CharField(blank=True, max_length=240)
wiki_link = models.CharField(blank=True, max_length=240)
# files generated during publication
- xml_file = models.FileField(_('XML file'), upload_to=book_upload_path('xml'), blank=True)
- html_file = models.FileField(_('HTML file'), upload_to=book_upload_path('html'), blank=True)
- pdf_file = models.FileField(_('PDF file'), upload_to=book_upload_path('pdf'), blank=True)
- epub_file = models.FileField(_('EPUB file'), upload_to=book_upload_path('epub'), blank=True)
- txt_file = models.FileField(_('TXT file'), upload_to=book_upload_path('txt'), blank=True)
+ file_types = ['epub', 'html', 'mobi', 'pdf', 'txt', 'xml']
+
parent = models.ForeignKey('self', blank=True, null=True, related_name='children')
objects = models.Manager()
tagged = managers.ModelTaggedItemManager(Tag)
tags = managers.TagDescriptor(Tag)
- _tag_counter = JSONField(null=True, editable=False)
- _theme_counter = JSONField(null=True, editable=False)
+ html_built = django.dispatch.Signal()
class AlreadyExists(Exception):
pass
@@ -316,16 +321,12 @@ class Book(models.Model):
def save(self, force_insert=False, force_update=False, reset_short_html=True, **kwargs):
self.sort_key = sortify(self.title)
+ ret = super(Book, self).save(force_insert, force_update)
+
if reset_short_html:
- # Reset _short_html during save
- update = {}
- for key in filter(lambda x: x.startswith('_short_html'), self.__dict__):
- update[key] = ''
- self.__setattr__(key, '')
- # Fragment.short_html relies on book's tags, so reset it here too
- self.fragments.all().update(**update)
+ self.reset_short_html()
- return super(Book, self).save(force_insert, force_update)
+ return ret
@permalink
def get_absolute_url(self):
@@ -348,49 +349,15 @@ class Book(models.Model):
return book_tag
def has_media(self, type):
- if type == 'xml':
- if self.xml_file:
- return True
- else:
- return False
- elif type == 'html':
- if self.html_file:
- return True
- else:
- return False
- elif type == 'txt':
- if self.txt_file:
- return True
- else:
- return False
- elif type == 'pdf':
- if self.pdf_file:
- return True
- else:
- return False
- elif type == 'epub':
- if self.epub_file:
- return True
- else:
- return False
+ if type in Book.file_types:
+ return bool(getattr(self, "%s_file" % type))
else:
- if self.media.filter(type=type).exists():
- return True
- else:
- return False
+ return self.media.filter(type=type).exists()
def get_media(self, type):
if self.has_media(type):
- if type == "xml":
- return self.xml_file
- elif type == "html":
- return self.html_file
- elif type == "epub":
- return self.epub_file
- elif type == "txt":
- return self.txt_file
- elif type == "pdf":
- return self.pdf_file
+ if type in Book.file_types:
+ return getattr(self, "%s_file" % type)
else:
return self.media.filter(type=type)
else:
@@ -405,22 +372,38 @@ class Book(models.Model):
def get_daisy(self):
return self.get_media("daisy")
+ def reset_short_html(self):
+ if self.id is None:
+ return
+
+ cache_key = "Book.short_html/%d/%s"
+ for lang, langname in settings.LANGUAGES:
+ cache.delete(cache_key % (self.id, lang))
+ # Fragment.short_html relies on book's tags, so reset it here too
+ for fragm in self.fragments.all():
+ fragm.reset_short_html()
+
def short_html(self):
- key = '_short_html_%s' % get_language()
- short_html = getattr(self, key)
+ if self.id:
+ cache_key = "Book.short_html/%d/%s" % (self.id, get_language())
+ short_html = cache.get(cache_key)
+ else:
+ short_html = None
- if short_html and len(short_html):
+ if short_html is not None:
return mark_safe(short_html)
else:
tags = self.tags.filter(~Q(category__in=('set', 'theme', 'book')))
tags = [mark_safe(u'%s' % (tag.get_absolute_url(), tag.name)) for tag in tags]
formats = []
- # files generated during publication
+ # files generated during publication
if self.has_media("html"):
formats.append(u'%s' % (reverse('book_text', kwargs={'slug': self.slug}), _('Read online')))
if self.has_media("pdf"):
formats.append(u'PDF' % self.get_media('pdf').url)
+ if self.has_media("mobi"):
+ formats.append(u'MOBI' % self.get_media('mobi').url)
if self.root_ancestor.has_media("epub"):
formats.append(u'EPUB' % self.root_ancestor.get_media('epub').url)
if self.has_media("txt"):
@@ -431,11 +414,12 @@ class Book(models.Model):
formats = [mark_safe(format) for format in formats]
- setattr(self, key, unicode(render_to_string('catalogue/book_short.html',
- {'book': self, 'tags': tags, 'formats': formats})))
- self.save(reset_short_html=False)
- return mark_safe(getattr(self, key))
+ short_html = unicode(render_to_string('catalogue/book_short.html',
+ {'book': self, 'tags': tags, 'formats': formats}))
+ if self.id:
+ cache.set(cache_key, short_html, CACHE_FOREVER)
+ return mark_safe(short_html)
@property
def root_ancestor(self):
@@ -455,26 +439,6 @@ class Book(models.Model):
has_description.boolean = True
# ugly ugly ugly
- def has_pdf_file(self):
- return bool(self.pdf_file)
- has_pdf_file.short_description = 'PDF'
- has_pdf_file.boolean = True
-
- def has_epub_file(self):
- return bool(self.epub_file)
- has_epub_file.short_description = 'EPUB'
- has_epub_file.boolean = True
-
- def has_txt_file(self):
- return bool(self.txt_file)
- has_txt_file.short_description = 'HTML'
- has_txt_file.boolean = True
-
- def has_html_file(self):
- return bool(self.html_file)
- has_html_file.short_description = 'HTML'
- has_html_file.boolean = True
-
def has_odt_file(self):
return bool(self.has_media("odt"))
has_odt_file.short_description = 'ODT'
@@ -489,34 +453,64 @@ class Book(models.Model):
return bool(self.has_media("ogg"))
has_ogg_file.short_description = 'OGG'
has_ogg_file.boolean = True
-
+
def has_daisy_file(self):
return bool(self.has_media("daisy"))
has_daisy_file.short_description = 'DAISY'
- has_daisy_file.boolean = True
-
+ has_daisy_file.boolean = True
+
+ def build_pdf(self):
+ """ (Re)builds the pdf file.
+
+ """
+ from librarian import pdf
+ from tempfile import NamedTemporaryFile
+ import os
+
+ try:
+ pdf_file = NamedTemporaryFile(delete=False)
+ pdf.transform(ORMDocProvider(self),
+ file_path=str(self.xml_file.path),
+ output_file=pdf_file,
+ )
+
+ self.pdf_file.save('%s.pdf' % self.slug, File(open(pdf_file.name)))
+ finally:
+ unlink(pdf_file.name)
+
+ # remove zip with all pdf files
+ remove_zip(settings.ALL_PDF_ZIP)
+
+ def build_mobi(self):
+ """ (Re)builds the MOBI file.
+
+ """
+ from librarian import mobi
+ from tempfile import NamedTemporaryFile
+ import os
+
+ try:
+ mobi_file = NamedTemporaryFile(suffix='.mobi', delete=False)
+ mobi.transform(ORMDocProvider(self), verbose=1,
+ file_path=str(self.xml_file.path),
+ output_file=mobi_file.name,
+ )
+
+ self.mobi_file.save('%s.mobi' % self.slug, File(open(mobi_file.name)))
+ finally:
+ unlink(mobi_file.name)
+
+ # remove zip with all mobi files
+ remove_zip(settings.ALL_MOBI_ZIP)
+
def build_epub(self, remove_descendants=True):
""" (Re)builds the epub file.
If book has a parent, does nothing.
Unless remove_descendants is False, descendants' epubs are removed.
"""
-
from StringIO import StringIO
from hashlib import sha1
from django.core.files.base import ContentFile
- from librarian import DocProvider
-
- class BookImportDocProvider(DocProvider):
- """ used for joined EPUBs """
-
- def __init__(self, book):
- self.book = book
-
- def by_slug(self, slug):
- if slug == self.book.slug:
- return self.book.xml_file
- else:
- return Book.objects.get(slug=slug).xml_file
if self.parent:
# don't need an epub
@@ -524,7 +518,7 @@ class Book(models.Model):
epub_file = StringIO()
try:
- epub.transform(BookImportDocProvider(self), self.slug, output_file=epub_file)
+ epub.transform(ORMDocProvider(self), self.slug, output_file=epub_file)
self.epub_file.save('%s.epub' % self.slug, ContentFile(epub_file.getvalue()))
FileRecord(slug=self.slug, type='epub', sha1=sha1(epub_file.getvalue()).hexdigest()).save()
except NoDublinCore:
@@ -539,6 +533,9 @@ class Book(models.Model):
child_book.save()
book_descendants += list(child_book.children.all())
+ # remove zip package with all epub files
+ remove_zip(settings.ALL_EPUB_ZIP)
+
def build_txt(self):
from StringIO import StringIO
from django.core.files.base import ContentFile
@@ -600,9 +597,30 @@ class Book(models.Model):
new_fragment.save()
new_fragment.tags = set(meta_tags + themes + [book_tag] + ancestor_tags)
self.save()
+ self.html_built.send(sender=self)
return True
return False
+ @staticmethod
+ def zip_format(format_):
+ def pretty_file_name(book):
+ return "%s/%s.%s" % (
+ b.get_extra_info_value()['author'],
+ b.slug,
+ format_)
+
+ field_name = "%s_file" % format_
+ books = Book.objects.filter(parent=None).exclude(**{field_name: ""})
+ paths = [(pretty_file_name(b), getattr(b, field_name).path)
+ for b in books]
+ result = create_zip.delay(paths,
+ getattr(settings, "ALL_%s_ZIP" % format_.upper()))
+
+ def zip_audiobooks(self):
+ bm = BookMedia.objects.filter(book=self, type='mp3')
+ paths = map(lambda bm: (None, bm.file.path), bm)
+ result = create_zip.delay(paths, self.slug)
+ return result.wait()
@classmethod
def from_xml_file(cls, xml_file, **kwargs):
@@ -618,7 +636,8 @@ class Book(models.Model):
xml_file.close()
@classmethod
- def from_text_and_meta(cls, raw_file, book_info, overwrite=False, build_epub=True, build_txt=True):
+ def from_text_and_meta(cls, raw_file, book_info, overwrite=False,
+ build_epub=True, build_txt=True, build_pdf=True, build_mobi=True):
import re
# check for parts before we do anything
@@ -648,7 +667,6 @@ class Book(models.Model):
book.title = book_info.title
book.set_extra_info_value(book_info.to_dict())
- book._short_html = ''
book.save()
meta_tags = []
@@ -692,6 +710,12 @@ class Book(models.Model):
if not settings.NO_BUILD_EPUB and build_epub:
book.root_ancestor.build_epub()
+ if not settings.NO_BUILD_PDF and build_pdf:
+ book.root_ancestor.build_pdf()
+
+ if not settings.NO_BUILD_MOBI and build_mobi:
+ book.build_mobi()
+
book_descendants = list(book.children.all())
# add l-tag to descendants and their fragments
# delete unnecessary EPUB files
@@ -703,57 +727,69 @@ class Book(models.Model):
fragment.tags = set(list(fragment.tags) + [book_tag])
book_descendants += list(child_book.children.all())
+ book.save()
+
# refresh cache
book.reset_tag_counter()
book.reset_theme_counter()
- book.save()
return book
-
- def refresh_tag_counter(self):
- tags = {}
- for child in self.children.all().order_by():
- for tag_pk, value in child.tag_counter.iteritems():
- tags[tag_pk] = tags.get(tag_pk, 0) + value
- for tag in self.tags.exclude(category__in=('book', 'theme', 'set')).order_by():
- tags[tag.pk] = 1
- self.set__tag_counter_value(tags)
- self.save(reset_short_html=False)
- return tags
-
def reset_tag_counter(self):
- self._tag_counter = None
- self.save(reset_short_html=False)
+ if self.id is None:
+ return
+
+ cache_key = "Book.tag_counter/%d" % self.id
+ cache.delete(cache_key)
if self.parent:
self.parent.reset_tag_counter()
@property
def tag_counter(self):
- if self._tag_counter is None:
- return self.refresh_tag_counter()
- return dict((int(k), v) for k, v in self.get__tag_counter_value().iteritems())
-
- def refresh_theme_counter(self):
- tags = {}
- for fragment in Fragment.tagged.with_any([self.book_tag()]).order_by():
- for tag in fragment.tags.filter(category='theme').order_by():
- tags[tag.pk] = tags.get(tag.pk, 0) + 1
- self.set__theme_counter_value(tags)
- self.save(reset_short_html=False)
+ if self.id:
+ cache_key = "Book.tag_counter/%d" % self.id
+ tags = cache.get(cache_key)
+ else:
+ tags = None
+
+ if tags is None:
+ tags = {}
+ for child in self.children.all().order_by():
+ for tag_pk, value in child.tag_counter.iteritems():
+ tags[tag_pk] = tags.get(tag_pk, 0) + value
+ for tag in self.tags.exclude(category__in=('book', 'theme', 'set')).order_by():
+ tags[tag.pk] = 1
+
+ if self.id:
+ cache.set(cache_key, tags, CACHE_FOREVER)
return tags
def reset_theme_counter(self):
- self._theme_counter = None
- self.save(reset_short_html=False)
+ if self.id is None:
+ return
+
+ cache_key = "Book.theme_counter/%d" % self.id
+ cache.delete(cache_key)
if self.parent:
self.parent.reset_theme_counter()
@property
def theme_counter(self):
- if self._theme_counter is None:
- return self.refresh_theme_counter()
- return dict((int(k), v) for k, v in self.get__theme_counter_value().iteritems())
+ if self.id:
+ cache_key = "Book.theme_counter/%d" % self.id
+ tags = cache.get(cache_key)
+ else:
+ tags = None
+
+ if tags is None:
+ tags = {}
+ for fragment in Fragment.tagged.with_any([self.book_tag()]).order_by():
+ for tag in fragment.tags.filter(category='theme').order_by():
+ tags[tag.pk] = tags.get(tag.pk, 0) + 1
+
+ if self.id:
+ cache.set(cache_key, tags, CACHE_FOREVER)
+ return tags
def pretty_title(self, html_links=False):
book = self
@@ -791,10 +827,27 @@ class Book(models.Model):
return objects
+def _has_factory(ftype):
+ has = lambda self: bool(getattr(self, "%s_file" % ftype))
+ has.short_description = t.upper()
+ has.boolean = True
+ has.__name__ = "has_%s_file" % ftype
+ return has
+
+
+# add the file fields
+for t in Book.file_types:
+ field_name = "%s_file" % t
+ models.FileField(_("%s file" % t.upper()),
+ upload_to=book_upload_path(t),
+ blank=True).contribute_to_class(Book, field_name)
+
+ setattr(Book, "has_%s_file" % t, _has_factory(t))
+
+
class Fragment(models.Model):
text = models.TextField()
short_text = models.TextField(editable=False)
- _short_html = models.TextField(editable=False)
anchor = models.CharField(max_length=120)
book = models.ForeignKey(Book, related_name='fragments')
@@ -810,16 +863,29 @@ class Fragment(models.Model):
def get_absolute_url(self):
return '%s#m%s' % (reverse('book_text', kwargs={'slug': self.book.slug}), self.anchor)
+ def reset_short_html(self):
+ if self.id is None:
+ return
+
+ cache_key = "Fragment.short_html/%d/%s"
+ for lang, langname in settings.LANGUAGES:
+ cache.delete(cache_key % (self.id, lang))
+
def short_html(self):
- key = '_short_html_%s' % get_language()
- short_html = getattr(self, key)
- if short_html and len(short_html):
+ if self.id:
+ cache_key = "Fragment.short_html/%d/%s" % (self.id, get_language())
+ short_html = cache.get(cache_key)
+ else:
+ short_html = None
+
+ if short_html is not None:
return mark_safe(short_html)
else:
- setattr(self, key, unicode(render_to_string('catalogue/fragment_short.html',
- {'fragment': self})))
- self.save()
- return mark_safe(getattr(self, key))
+ short_html = unicode(render_to_string('catalogue/fragment_short.html',
+ {'fragment': self}))
+ if self.id:
+ cache.set(cache_key, short_html, CACHE_FOREVER)
+ return mark_safe(short_html)
class FileRecord(models.Model):