X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/0c613164e94ea79fce559b2b1632691986a84f25..8658102277980ea8e8e53a953e7c2f5fedf8de16:/apps/catalogue/models.py
diff --git a/apps/catalogue/models.py b/apps/catalogue/models.py
index a9445a24f..1a2e8f86f 100644
--- a/apps/catalogue/models.py
+++ b/apps/catalogue/models.py
@@ -22,7 +22,7 @@ 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, BookImportDocProvider, create_zip_task, remove_zip
+from catalogue.utils import ExistingFile, ORMDocProvider, create_zip, remove_zip
from librarian import dcparser, html, epub, NoDublinCore
import mutagen
@@ -31,6 +31,8 @@ from slughifi import slughifi
from sortify import sortify
from os import unlink
+import search
+
TAG_CATEGORIES = (
('author', _('author')),
('epoch', _('epoch')),
@@ -221,6 +223,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)
@@ -293,11 +299,8 @@ class Book(models.Model):
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()
@@ -348,49 +351,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:
@@ -430,11 +399,13 @@ class Book(models.Model):
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"):
@@ -470,26 +441,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'
@@ -518,10 +469,9 @@ class Book(models.Model):
from tempfile import NamedTemporaryFile
import os
- path, fname = os.path.realpath(self.xml_file.path).rsplit('/', 1)
try:
pdf_file = NamedTemporaryFile(delete=False)
- pdf.transform(BookImportDocProvider(self),
+ pdf.transform(ORMDocProvider(self),
file_path=str(self.xml_file.path),
output_file=pdf_file,
)
@@ -530,6 +480,31 @@ class Book(models.Model):
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.
@@ -545,7 +520,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:
@@ -560,6 +535,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
@@ -626,34 +604,41 @@ class Book(models.Model):
return False
@staticmethod
- def zip_epub():
- books = Book.objects.all()
-
- paths = filter(lambda x: x is not None,
- map(lambda b: b.epub_file and b.epub_file.path or None, books))
- result = create_zip_task.delay(paths, settings.ALL_EPUB_ZIP)
- return settings.MEDIA_URL + result.wait()
-
- @staticmethod
- def zip_pdf():
- books = Book.objects.all()
-
- paths = filter(lambda x: x is not None,
- map(lambda b: b.pdf_file and b.pdf_file.path or None, books))
- result = create_zip_task.delay(paths, settings.ALL_PDF_ZIP)
- return settings.MEDIA_URL + result.wait()
+ 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()))
+ return result.wait()
def zip_audiobooks(self):
- bm = BookMedia.objects.filter(book=self)
- paths = map(lambda bm: bm.file.path, bm)
- result = create_zip_task.delay(paths, self.slug)
-
- return settings.MEDIA_URL + result.wait()
-
- def clean_zip_files(self):
- remove_zip(self.slug)
- remove_zip(settings.ALL_EPUB_ZIP)
- remove_zip(settings.ALL_PDF_ZIP)
+ 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()
+
+ def search_index(self):
+ if settings.SEARCH_INDEX_PARALLEL:
+ if instance(settings.SEARCH_INDEX_PARALLEL, int):
+ idx = search.ReusableIndex(threads=4)
+ else:
+ idx = search.ReusableIndex()
+ else:
+ idx = search.Index()
+
+ idx.open()
+ try:
+ idx.index_book(self)
+ finally:
+ idx.close()
@classmethod
def from_xml_file(cls, xml_file, **kwargs):
@@ -669,7 +654,9 @@ 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, build_pdf=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,
+ search_index=True):
import re
# check for parts before we do anything
@@ -745,6 +732,12 @@ class Book(models.Model):
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()
+
+ if not settings.NO_SEARCH_INDEX and search_index:
+ book.search_index()
+
book_descendants = list(book.children.all())
# add l-tag to descendants and their fragments
# delete unnecessary EPUB files
@@ -856,6 +849,24 @@ 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)