X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/32e27db91137094ff6b8ebb4154cb44addb837e2..b1a76c6c9fe9f4fd4b9a47d3c4405b6484130977:/apps/catalogue/models.py?ds=sidebyside diff --git a/apps/catalogue/models.py b/apps/catalogue/models.py index 272228627..d0a620a96 100644 --- a/apps/catalogue/models.py +++ b/apps/catalogue/models.py @@ -6,6 +6,7 @@ from datetime import datetime from django.db import models from django.db.models import permalink, Q +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 @@ -46,6 +47,9 @@ 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__() @@ -282,7 +286,6 @@ class Book(models.Model): 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) @@ -299,9 +302,6 @@ class Book(models.Model): tagged = managers.ModelTaggedItemManager(Tag) tags = managers.TagDescriptor(Tag) - _tag_counter = JSONField(null=True, editable=False) - _theme_counter = JSONField(null=True, editable=False) - class AlreadyExists(Exception): pass @@ -316,16 +316,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): @@ -405,11 +401,25 @@ 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'))) @@ -431,11 +441,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): @@ -547,7 +558,61 @@ class Book(models.Model): out = StringIO() text.transform(open(self.xml_file.path), out) self.txt_file.save('%s.txt' % self.slug, ContentFile(out.getvalue())) - self.save() + + + def build_html(self): + from tempfile import NamedTemporaryFile + from markupstring import MarkupString + + meta_tags = list(self.tags.filter( + category__in=('author', 'epoch', 'genre', 'kind'))) + book_tag = self.book_tag() + + html_file = NamedTemporaryFile() + if html.transform(self.xml_file.path, html_file, parse_dublincore=False): + self.html_file.save('%s.html' % self.slug, File(html_file)) + + # get ancestor l-tags for adding to new fragments + ancestor_tags = [] + p = self.parent + while p: + ancestor_tags.append(p.book_tag()) + p = p.parent + + # Delete old fragments and create them from scratch + self.fragments.all().delete() + # Extract fragments + closed_fragments, open_fragments = html.extract_fragments(self.html_file.path) + for fragment in closed_fragments.values(): + try: + theme_names = [s.strip() for s in fragment.themes.split(',')] + except AttributeError: + continue + themes = [] + for theme_name in theme_names: + if not theme_name: + continue + tag, created = Tag.objects.get_or_create(slug=slughifi(theme_name), category='theme') + if created: + tag.name = theme_name + tag.sort_key = theme_name.lower() + tag.save() + themes.append(tag) + if not themes: + continue + + text = fragment.to_string() + short_text = '' + if (len(MarkupString(text)) > 240): + short_text = unicode(MarkupString(text)[:160]) + new_fragment = Fragment.objects.create(anchor=fragment.id, book=self, + text=text, short_text=short_text) + + new_fragment.save() + new_fragment.tags = set(meta_tags + themes + [book_tag] + ancestor_tags) + self.save() + return True + return False @classmethod @@ -566,9 +631,6 @@ class Book(models.Model): @classmethod def from_text_and_meta(cls, raw_file, book_info, overwrite=False, build_epub=True, build_txt=True): import re - from tempfile import NamedTemporaryFile - from markupstring import MarkupString - from django.core.files.storage import default_storage # check for parts before we do anything children = [] @@ -597,10 +659,9 @@ class Book(models.Model): book.title = book_info.title book.set_extra_info_value(book_info.to_dict()) - book._short_html = '' book.save() - book_tags = [] + meta_tags = [] categories = (('kinds', 'kind'), ('genres', 'genre'), ('authors', 'author'), ('epochs', 'epoch')) for field_name, category in categories: try: @@ -617,9 +678,9 @@ class Book(models.Model): tag.name = tag_name tag.sort_key = sortify(tag_sort_key.lower()) tag.save() - book_tags.append(tag) + meta_tags.append(tag) - book.tags = set(book_tags + book_shelves) + book.tags = set(meta_tags + book_shelves) book_tag = book.book_tag() @@ -634,47 +695,7 @@ class Book(models.Model): # delete old fragments when overwriting book.fragments.all().delete() - html_file = NamedTemporaryFile() - if html.transform(book.xml_file.path, html_file, parse_dublincore=False): - book.html_file.save('%s.html' % book.slug, File(html_file), save=False) - - # get ancestor l-tags for adding to new fragments - ancestor_tags = [] - p = book.parent - while p: - ancestor_tags.append(p.book_tag()) - p = p.parent - - # Extract fragments - closed_fragments, open_fragments = html.extract_fragments(book.html_file.path) - for fragment in closed_fragments.values(): - try: - theme_names = [s.strip() for s in fragment.themes.split(',')] - except AttributeError: - continue - themes = [] - for theme_name in theme_names: - if not theme_name: - continue - tag, created = Tag.objects.get_or_create(slug=slughifi(theme_name), category='theme') - if created: - tag.name = theme_name - tag.sort_key = theme_name.lower() - tag.save() - themes.append(tag) - if not themes: - continue - - text = fragment.to_string() - short_text = '' - if (len(MarkupString(text)) > 240): - short_text = unicode(MarkupString(text)[:160]) - new_fragment, created = Fragment.objects.get_or_create(anchor=fragment.id, book=book, - defaults={'text': text, 'short_text': short_text}) - - new_fragment.save() - new_fragment.tags = set(book_tags + themes + [book_tag] + ancestor_tags) - + if book.build_html(): if not settings.NO_BUILD_TXT and build_txt: book.build_txt() @@ -692,57 +713,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 @@ -783,7 +816,6 @@ class Book(models.Model): 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') @@ -799,16 +831,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):