X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/967eed676fc83d15b26149047f353ac61faa8217..5abc88f0d2ad3036dd526fbff5f0241f1d6480e1:/src/catalogue/tasks.py?ds=inline diff --git a/src/catalogue/tasks.py b/src/catalogue/tasks.py index a7b67aec9..0694b0174 100644 --- a/src/catalogue/tasks.py +++ b/src/catalogue/tasks.py @@ -1,14 +1,14 @@ -# -*- coding: utf-8 -*- # This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later. # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information. # 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 catalogue.utils import gallery_path +from catalogue.models import Book +from catalogue.utils import absolute_url, gallery_url from waiter.models import WaitedFile task_logger = get_task_logger(__name__) @@ -23,24 +23,30 @@ def touch_tag(tag): 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: - 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 -@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 - from catalogue.models import Book task_logger.info(DefaultStorage().path(file_name)) if not DefaultStorage().exists(file_name): @@ -54,15 +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, - ilustr_path=gallery_path(wldoc.book_info.url.slug), + base_url=absolute_url(gallery_url(wldoc.book_info.url.slug)), **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() -@task(ignore_result=True) +@shared_task(ignore_result=True) def update_counters(): from .helpers import update_counters update_counters() + + +@shared_task(ignore_result=True) +def update_references(book_id): + Book.objects.get(id=book_id).update_references() +