X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/46705d393ae76a1d8e0eb2dc8bf121269f6adb67..7c22547b97790b80fff2b0ddfe760925f98bc199:/apps/catalogue/models.py?ds=sidebyside diff --git a/apps/catalogue/models.py b/apps/catalogue/models.py index 930f98d14..c5ca5df7f 100644 --- a/apps/catalogue/models.py +++ b/apps/catalogue/models.py @@ -283,7 +283,7 @@ 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) @@ -514,30 +514,23 @@ class Book(models.Model): """ (Re)builds the pdf file. """ - from librarian import pdf, ParseError + from librarian import pdf from tempfile import NamedTemporaryFile import os + path, fname = os.path.realpath(self.xml_file.path).rsplit('/', 1) try: - path, fname = os.path.realpath(self.xml_file.path).rsplit('/', 1) - try: - pdf_file = NamedTemporaryFile(delete=False) - - pdf.transform(BookImportDocProvider(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) - - except ParseError, e: - print '%(file)s:%(name)s:%(message)s; use -v to see more output' % { - 'file': self.xml_file.path, - 'name': e.__class__.__name__, - 'message': e - } + pdf_file = NamedTemporaryFile(delete=False) + + pdf.transform(BookImportDocProvider(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) + def build_epub(self, remove_descendants=True): """ (Re)builds the epub file.