From 89e8405b168762835c1531841384ae849dd93f97 Mon Sep 17 00:00:00 2001 From: Radek Czajka Date: Fri, 20 Aug 2010 15:10:10 +0200 Subject: [PATCH] Support for joined EPUB files. --- apps/catalogue/models.py | 71 +++++++++++++------ apps/catalogue/views.py | 10 +-- lib/librarian | 2 +- .../templates/catalogue/book_detail.html | 4 +- 4 files changed, 60 insertions(+), 27 deletions(-) diff --git a/apps/catalogue/models.py b/apps/catalogue/models.py index 4ef0a14e6..624211e29 100644 --- a/apps/catalogue/models.py +++ b/apps/catalogue/models.py @@ -263,8 +263,8 @@ class Book(models.Model): formats.append(u'%s' % (reverse('book_text', kwargs={'slug': self.slug}), _('Read online'))) if self.pdf_file: formats.append(u'PDF' % self.pdf_file.url) - if self.epub_file: - formats.append(u'EPUB' % self.epub_file.url) + if self.root_ancestor.epub_file: + formats.append(u'EPUB' % self.root_ancestor.epub_file.url) if self.odt_file: formats.append(u'ODT' % self.odt_file.url) if self.txt_file: @@ -282,6 +282,18 @@ class Book(models.Model): return mark_safe(getattr(self, key)) + @property + def root_ancestor(self): + """ returns the oldest ancestor """ + + if not hasattr(self, '_root_ancestor'): + book = self + while book.parent: + book = book.parent + self._root_ancestor = book + return self._root_ancestor + + def get_mp3_info(self): """Retrieves artist and director names from audio ID3 tags.""" audio = id3.ID3(self.mp3_file.path) @@ -337,6 +349,20 @@ class Book(models.Model): from django.core.files.storage import default_storage from StringIO import StringIO + 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 + # Read book metadata book_base, book_slug = book_info.url.rsplit('/', 1) book, created = Book.objects.get_or_create(slug=book_slug) @@ -388,15 +414,6 @@ class Book(models.Model): except Book.DoesNotExist, e: raise Book.DoesNotExist(_('Book with slug = "%s" does not exist.') % slug) - book_descendants = list(book.children.all()) - while len(book_descendants) > 0: - child_book = book_descendants.pop(0) - child_book.tags = list(child_book.tags) + [book_tag] - 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()) - # Save XML and HTML files book.xml_file.save('%s.xml' % book.slug, raw_file, save=False) @@ -404,15 +421,6 @@ class Book(models.Model): 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) - # Create EPUB - epub_file = StringIO() - try: - epub.transform(book.xml_file, epub_file) - book.epub_file.save('%s.epub' % book.slug, ContentFile(epub_file.getvalue()), save=False) - FileRecord(slug=book.slug, type='epub', sha1=sha1(epub_file.getvalue()).hexdigest()).save() - except NoDublinCore: - pass - # Extract fragments closed_fragments, open_fragments = html.extract_fragments(book.html_file.path) for fragment in closed_fragments.values(): @@ -443,6 +451,29 @@ class Book(models.Model): new_fragment.save() new_fragment.tags = set(book_tags + themes + [book_tag]) + # Create EPUB + epub_file = StringIO() + try: + epub.transform(BookImportDocProvider(book), book.slug, epub_file) + book.epub_file.save('%s.epub' % book.slug, ContentFile(epub_file.getvalue()), save=False) + FileRecord(slug=book.slug, type='epub', sha1=sha1(epub_file.getvalue()).hexdigest()).save() + except NoDublinCore: + pass + + delete_epubs = book.has_epub_file() + book_descendants = list(book.children.all()) + # add l-tag to descendants and their fragments + # delete unnecessary EPUB files + while len(book_descendants) > 0: + child_book = book_descendants.pop(0) + child_book.tags = list(child_book.tags) + [book_tag] + if delete_epubs: + 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 diff --git a/apps/catalogue/views.py b/apps/catalogue/views.py index 0055f522d..556bae1fe 100644 --- a/apps/catalogue/views.py +++ b/apps/catalogue/views.py @@ -529,13 +529,15 @@ def download_shelf(request, slug): temp = tempfile.TemporaryFile() archive = zipfile.ZipFile(temp, 'w') + already = set() for book in collect_books(models.Book.tagged.with_all(shelf)): if 'pdf' in formats and book.pdf_file: filename = book.pdf_file.path archive.write(filename, str('%s.pdf' % book.slug)) - if 'epub' in formats and book.epub_file: - filename = book.epub_file.path - archive.write(filename, str('%s.epub' % book.slug)) + if book.root_ancestor not in already and 'epub' in formats and book.root_ancestor.epub_file: + filename = book.root_ancestor.epub_file.path + archive.write(filename, str('%s.epub' % book.root_ancestor.slug)) + already.add(book.root_ancestor) if 'odt' in formats and book.odt_file: filename = book.odt_file.path archive.write(filename, str('%s.odt' % book.slug)) @@ -571,7 +573,7 @@ def shelf_book_formats(request, shelf): for book in collect_books(models.Book.tagged.with_all(shelf)): if book.pdf_file: formats['pdf'] = True - if book.epub_file: + if book.root_ancestor.epub_file: formats['epub'] = True if book.odt_file: formats['odt'] = True diff --git a/lib/librarian b/lib/librarian index 5b174651e..ae0e673a1 160000 --- a/lib/librarian +++ b/lib/librarian @@ -1 +1 @@ -Subproject commit 5b174651e7cadaa9c353cd247fbfcde41b012f3a +Subproject commit ae0e673a17c3edcdca910fafb84eeff9dfe7b588 diff --git a/wolnelektury/templates/catalogue/book_detail.html b/wolnelektury/templates/catalogue/book_detail.html index c03614cea..fed2d5b26 100644 --- a/wolnelektury/templates/catalogue/book_detail.html +++ b/wolnelektury/templates/catalogue/book_detail.html @@ -46,8 +46,8 @@ {% if book.pdf_file %} {% trans "Download PDF" %} {% endif %} - {% if book.epub_file %} - {% trans "Download EPUB" %} + {% if book.root_ancestor.epub_file %} + {% trans "Download EPUB" %} {% endif %} {% if book.odt_file %} {% trans "Download ODT" %} -- 2.20.1