procent

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

diff --git a/src/catalogue/tasks.py b/src/catalogue/tasks.py
index 0da624d..20690c6 100644 (file)
--- a/src/catalogue/tasks.py
+++ b/src/catalogue/tasks.py
@@ -1,13 +1,14 @@
-# This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later.
-# Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
+# This file is part of Wolne Lektury, licensed under GNU Affero GPLv3 or later.
+# Copyright © Fundacja Wolne Lektury. See NOTICE for more information.

 #
 from traceback import print_exc
 #
 from traceback import print_exc

-from celery.task import task
+from celery import shared_task

 from celery.utils.log import get_task_logger
 from django.conf import settings
 from django.utils import timezone
 
 from celery.utils.log import get_task_logger
 from django.conf import settings
 from django.utils import timezone
 

-from catalogue.utils import gallery_url
+from catalogue.models import Book
+from catalogue.utils import absolute_url, gallery_url

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


@@ -22,24 +23,30 @@ 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
-def index_book(book_id, book_info=None, **kwargs):
-    from catalogue.models import Book
+@shared_task(ignore_result=True)
+def build_field(pk, field_name):
+    book = Book.objects.get(pk=pk)
+    task_logger.info("build %s.%s" % (book.slug, field_name))
+    field_file = getattr(book, field_name)
+    field_file.build()
+
+
+@shared_task
+def index_book(book_id, **kwargs):

     try:
     try:

-        return Book.objects.get(id=book_id).search_index(book_info, **kwargs)
+        return Book.objects.get(id=book_id).search_index(**kwargs)

     except Exception as e:
         print("Exception during index: %s" % e)
         print_exc()
         raise e
 
 
     except Exception as e:
         print("Exception during index: %s" % e)
         print_exc()
         raise e
 
 

-@task(ignore_result=True, rate_limit=settings.CATALOGUE_CUSTOMPDF_RATE_LIMIT)
+@shared_task(ignore_result=True, rate_limit=settings.CATALOGUE_CUSTOMPDF_RATE_LIMIT)

 def build_custom_pdf(book_id, customizations, file_name, waiter_id=None):
     """Builds a custom PDF file."""
     try:
         from django.core.files import File
         from django.core.files.storage import DefaultStorage
 def build_custom_pdf(book_id, customizations, file_name, waiter_id=None):
     """Builds a custom PDF file."""
     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):
 
         task_logger.info(DefaultStorage().path(file_name))
         if not DefaultStorage().exists(file_name):


@@ -53,22 +60,22 @@ def build_custom_pdf(book_id, customizations, file_name, waiter_id=None):
             pdf = wldoc.as_pdf(
                 customizations=customizations,
                 morefloats=settings.LIBRARIAN_PDF_MOREFLOATS,
             pdf = wldoc.as_pdf(
                 customizations=customizations,
                 morefloats=settings.LIBRARIAN_PDF_MOREFLOATS,

-                base_url=gallery_url(wldoc.book_info.url.slug),
+                base_url=absolute_url(gallery_url(wldoc.book_info.url.slug)),

                 **kwargs)
                 **kwargs)

-            DefaultStorage().save(file_name, File(open(pdf.get_filename(), 'rb')))
+            with open(pdf.get_filename(), 'rb') as f:
+                DefaultStorage().save(file_name, File(f))

     finally:
         if waiter_id is not None:
             WaitedFile.objects.filter(pk=waiter_id).delete()
 
 
     finally:
         if waiter_id is not None:
             WaitedFile.objects.filter(pk=waiter_id).delete()
 
 

-@task(ignore_result=True)
+@shared_task(ignore_result=True)

 def update_counters():
     from .helpers import update_counters
     update_counters()
 
 
 def update_counters():
     from .helpers import update_counters
     update_counters()
 
 

-@task(ignore_result=True)
+@shared_task(ignore_result=True)

 def update_references(book_id):
 def update_references(book_id):

-    from catalogue.models import Book

     Book.objects.get(id=book_id).update_references()
 
     Book.objects.get(id=book_id).update_references()