X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/4e7302190468a80e5cd558cc4c73985b16153e0a..9e12c8b854e72bf9a661c2a1af033f1b7f3a84d1:/apps/catalogue/models.py?ds=inline diff --git a/apps/catalogue/models.py b/apps/catalogue/models.py index 6863b2a40..28db00d03 100644 --- a/apps/catalogue/models.py +++ b/apps/catalogue/models.py @@ -13,6 +13,8 @@ from django.utils.translation import get_language from django.core.urlresolvers import reverse from datetime import datetime +from django.conf import settings + from newtagging.models import TagBase, tags_updated from newtagging import managers from catalogue.fields import JSONField @@ -44,7 +46,7 @@ class TagSubcategoryManager(models.Manager): class Tag(TagBase): name = models.CharField(_('name'), max_length=50, db_index=True) slug = models.SlugField(_('slug'), max_length=120, db_index=True) - sort_key = models.SlugField(_('sort key'), max_length=120, db_index=True) + sort_key = models.CharField(_('sort key'), max_length=120, db_index=True) category = models.CharField(_('category'), max_length=50, blank=False, null=False, db_index=True, choices=TAG_CATEGORIES) description = models.TextField(_('description'), blank=True) @@ -169,7 +171,7 @@ class Book(models.Model): title = models.CharField(_('title'), max_length=120) 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=True) + created_at = models.DateTimeField(_('creation date'), auto_now_add=True) _short_html = models.TextField(_('short HTML'), editable=False) parent_number = models.IntegerField(_('parent number'), default=0) extra_info = JSONField(_('extra information')) @@ -245,7 +247,7 @@ class Book(models.Model): book_tag, created = Tag.objects.get_or_create(slug=slug, category='book') if created: book_tag.name = self.title[:50] - book_tag.sort_key = slug + book_tag.sort_key = self.title.lower() book_tag.save() return book_tag @@ -360,7 +362,7 @@ class Book(models.Model): try: epub.transform(BookImportDocProvider(self), self.slug, epub_file) self.epub_file.save('%s.epub' % self.slug, ContentFile(epub_file.getvalue()), save=False) - self.save() + self.save(refresh_mp3=False) FileRecord(slug=self.slug, type='epub', sha1=sha1(epub_file.getvalue()).hexdigest()).save() except NoDublinCore: pass @@ -371,7 +373,7 @@ class Book(models.Model): if remove_descendants and child_book.has_epub_file(): child_book.epub_file.delete() # save anyway, to refresh short_html - child_book.save() + child_book.save(refresh_mp3=False) book_descendants += list(child_book.children.all()) @@ -395,6 +397,17 @@ class Book(models.Model): from markupstring import MarkupString from django.core.files.storage import default_storage + # check for parts before we do anything + children = [] + if hasattr(book_info, 'parts'): + for part_url in book_info.parts: + base, slug = part_url.rsplit('/', 1) + try: + children.append(Book.objects.get(slug=slug)) + except Book.DoesNotExist, e: + raise Book.DoesNotExist(_('Book with slug = "%s" does not exist.') % slug) + + # Read book metadata book_base, book_slug = book_info.url.rsplit('/', 1) book, created = Book.objects.get_or_create(slug=book_slug) @@ -427,7 +440,7 @@ class Book(models.Model): tag, created = Tag.objects.get_or_create(slug=slughifi(tag_name), category=category) if created: tag.name = tag_name - tag.sort_key = slughifi(tag_sort_key) + tag.sort_key = tag_sort_key.lower() tag.save() book_tags.append(tag) @@ -435,24 +448,28 @@ class Book(models.Model): book_tag = book.book_tag() - if hasattr(book_info, 'parts'): - for n, part_url in enumerate(book_info.parts): - base, slug = part_url.rsplit('/', 1) - try: - child_book = Book.objects.get(slug=slug) - child_book.parent = book - child_book.parent_number = n - child_book.save() - except Book.DoesNotExist, e: - raise Book.DoesNotExist(_('Book with slug = "%s" does not exist.') % slug) + for n, child_book in enumerate(children): + child_book.parent = book + child_book.parent_number = n + child_book.save() # Save XML and HTML files book.xml_file.save('%s.xml' % book.slug, raw_file, save=False) + # 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(): @@ -467,7 +484,7 @@ class Book(models.Model): tag, created = Tag.objects.get_or_create(slug=slughifi(theme_name), category='theme') if created: tag.name = theme_name - tag.sort_key = slughifi(theme_name) + tag.sort_key = theme_name.lower() tag.save() themes.append(tag) if not themes: @@ -481,9 +498,10 @@ class Book(models.Model): defaults={'text': text, 'short_text': short_text}) new_fragment.save() - new_fragment.tags = set(book_tags + themes + [book_tag]) + new_fragment.tags = set(book_tags + themes + [book_tag] + ancestor_tags) - book.build_epub(remove_descendants=False) + if not settings.NO_BUILD_EPUB: + book.root_ancestor().build_epub() book_descendants = list(book.children.all()) # add l-tag to descendants and their fragments @@ -491,16 +509,14 @@ class Book(models.Model): while len(book_descendants) > 0: child_book = book_descendants.pop(0) child_book.tags = list(child_book.tags) + [book_tag] - if child_book.has_epub_file(): - child_book.epub_file.delete() child_book.save() for fragment in child_book.fragments.all(): fragment.tags = set(list(fragment.tags) + [book_tag]) book_descendants += list(child_book.children.all()) # refresh cache - book.tag_counter - book.theme_counter + book.reset_tag_counter() + book.reset_theme_counter() book.save() return book