Fix paths in pictures migrations.

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

diff --git a/apps/catalogue/tasks.py b/apps/catalogue/tasks.py
index 7d18068..a2b8be0 100644 (file)
--- a/apps/catalogue/tasks.py
+++ b/apps/catalogue/tasks.py
@@ -5,8 +5,12 @@
 from datetime import datetime
 from traceback import print_exc
 from celery.task import task
 from datetime import datetime
 from traceback import print_exc
 from celery.task import task

+from celery.utils.log import get_task_logger

 from django.conf import settings
 from wolnelektury.utils import localtime_to_utc
 from django.conf import settings
 from wolnelektury.utils import localtime_to_utc

+from waiter.models import WaitedFile
+
+task_logger = get_task_logger(__name__)

 
 
 # TODO: move to model?
 
 
 # TODO: move to model?


@@ -18,11 +22,6 @@ def touch_tag(tag):
     type(tag).objects.filter(pk=tag.pk).update(**update_dict)
 
 
     type(tag).objects.filter(pk=tag.pk).update(**update_dict)
 
 

-@task(ignore_result=True)
-def fix_tree_tags(book):
-    book.fix_tree_tags()
-
-

 @task
 def index_book(book_id, book_info=None, **kwargs):
     from catalogue.models import Book
 @task
 def index_book(book_id, book_info=None, **kwargs):
     from catalogue.models import Book


@@ -35,22 +34,26 @@ def index_book(book_id, book_info=None, **kwargs):
 
 
 @task(ignore_result=True, 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):
+def build_custom_pdf(book_id, customizations, file_name, waiter_id=None):

     """Builds a custom PDF file."""
     """Builds a custom PDF file."""

-    from django.core.files import File
-    from django.core.files.storage import DefaultStorage
-    from catalogue.models import Book
-
-    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,
-                morefloats=settings.LIBRARIAN_PDF_MOREFLOATS,
-                **kwargs)
-        DefaultStorage().save(file_name, File(open(pdf.get_filename())))
+    try:
+        from django.core.files import File
+        from django.core.files.storage import DefaultStorage
+        from catalogue.models import Book
+
+        task_logger.info(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,
+                    morefloats=settings.LIBRARIAN_PDF_MOREFLOATS,
+                    **kwargs)
+            DefaultStorage().save(file_name, File(open(pdf.get_filename())))
+    finally:
+        if waiter_id is not None:
+            WaitedFile.objects.filter(pk=waiter_id).delete()