more informative erro message [error connecting to Solr]

[wolnelektury.git] / apps / catalogue / tasks.py

diff --git a/apps/catalogue/tasks.py b/apps/catalogue/tasks.py
index 8906a14..e7f7b29 100644 (file)
--- a/apps/catalogue/tasks.py
+++ b/apps/catalogue/tasks.py
@@ -34,76 +34,7 @@ def index_book(book_id, book_info=None, **kwargs):
         raise e
 
 
         raise e
 
 

-def _build_ebook(book_id, ext, transform):
-    """Generic ebook builder."""
-    from django.core.files import File
-    from catalogue.models import Book
-
-    book = Book.objects.get(pk=book_id)
-    out = transform(book.wldocument())
-    field_name = '%s_file' % ext
-    # Update instead of saving the model to avoid race condition.
-    getattr(book, field_name).save('%s.%s' % (book.slug, ext),
-            File(open(out.get_filename())),
-            save=False
-        )
-    Book.objects.filter(pk=book_id).update(**{
-            field_name: getattr(book, field_name)
-        })
-
-
-@task(ignore_result=True)
-def build_txt(book_id):
-    """(Re)builds the TXT file for a book."""
-    _build_ebook(book_id, 'txt', lambda doc: doc.as_text())
-
-
-@task(ignore_result=True, rate_limit=settings.CATALOGUE_PDF_RATE_LIMIT)
-def build_pdf(book_id):
-    """(Re)builds the pdf file for a book."""
-    from catalogue.models import Book
-    from catalogue.utils import remove_zip
-    from waiter.utils import clear_cache
-
-    _build_ebook(book_id, 'pdf',
-        lambda doc: doc.as_pdf(morefloats=settings.LIBRARIAN_PDF_MOREFLOATS))
-    # Remove cached downloadables
-    remove_zip(settings.ALL_PDF_ZIP)
-    book = Book.objects.get(pk=book_id)
-    clear_cache(book.slug)
-
-
-@task(ignore_result=True, rate_limit=settings.CATALOGUE_EPUB_RATE_LIMIT)
-def build_epub(book_id):
-    """(Re)builds the EPUB file for a book."""
-    from catalogue.utils import remove_zip
-
-    _build_ebook(book_id, 'epub', lambda doc: doc.as_epub())
-    # remove zip with all epub files
-    remove_zip(settings.ALL_EPUB_ZIP)
-
-
-@task(ignore_result=True, rate_limit=settings.CATALOGUE_MOBI_RATE_LIMIT)
-def build_mobi(book_id):
-    """(Re)builds the MOBI file for a book."""
-    from catalogue.utils import remove_zip
-
-    _build_ebook(book_id, 'mobi', lambda doc: doc.as_mobi())
-    # remove zip with all mobi files
-    remove_zip(settings.ALL_MOBI_ZIP)
-
-
-@task(ignore_result=True, rate_limit=settings.CATALOGUE_FB2_RATE_LIMIT)
-def build_fb2(book_id, *args, **kwargs):
-    """(Re)builds the FB2 file for a book."""
-    from catalogue.utils import remove_zip
-
-    _build_ebook(book_id, 'fb2', lambda doc: doc.as_fb2())
-    # remove zip with all fb2 files
-    remove_zip(settings.ALL_FB2_ZIP)
-
-
-@task(rate_limit=settings.CATALOGUE_CUSTOMPDF_RATE_LIMIT)
+@task(ignore_result=True, rate_limit=settings.CATALOGUE_CUSTOMPDF_RATE_LIMIT)

 def build_custom_pdf(book_id, customizations, file_name):
     """Builds a custom PDF file."""
     from django.core.files import File
 def build_custom_pdf(book_id, customizations, file_name):
     """Builds a custom PDF file."""
     from django.core.files import File


@@ -112,7 +43,14 @@ def build_custom_pdf(book_id, customizations, file_name):
 
     print "will gen %s" % DefaultStorage().path(file_name)
     if not DefaultStorage().exists(file_name):
 
     print "will gen %s" % DefaultStorage().path(file_name)
     if not DefaultStorage().exists(file_name):

+        kwargs = {
+            'cover': True,
+        }
+        if 'no-cover' in customizations:
+            kwargs['cover'] = False
+            customizations.remove('no-cover')

         pdf = Book.objects.get(pk=book_id).wldocument().as_pdf(
                 customizations=customizations,
         pdf = Book.objects.get(pk=book_id).wldocument().as_pdf(
                 customizations=customizations,

-                morefloats=settings.LIBRARIAN_PDF_MOREFLOATS)
+                morefloats=settings.LIBRARIAN_PDF_MOREFLOATS,
+                **kwargs)

         DefaultStorage().save(file_name, File(open(pdf.get_filename())))
         DefaultStorage().save(file_name, File(open(pdf.get_filename())))