X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/ae60b2a3949e96357477cc04f90fd0873cee8a92..0c502550a4f04aa016df8729af2ae2f85c0b495a:/src/catalogue/tasks.py diff --git a/src/catalogue/tasks.py b/src/catalogue/tasks.py index 4807339ba..f2ee55f38 100644 --- a/src/catalogue/tasks.py +++ b/src/catalogue/tasks.py @@ -1,13 +1,13 @@ -# -*- 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 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.utils import timezone + +from catalogue.utils import absolute_url, gallery_url from waiter.models import WaitedFile task_logger = get_task_logger(__name__) @@ -16,7 +16,7 @@ task_logger = get_task_logger(__name__) # TODO: move to model? def touch_tag(tag): update_dict = { - 'changed_at': localtime_to_utc(datetime.now()), + 'changed_at': timezone.now(), } type(tag).objects.filter(pk=tag.pk).update(**update_dict) @@ -27,8 +27,8 @@ def index_book(book_id, book_info=None, **kwargs): from catalogue.models import Book try: return Book.objects.get(id=book_id).search_index(book_info, **kwargs) - except Exception, e: - print "Exception during index: %s" % e + except Exception as e: + print("Exception during index: %s" % e) print_exc() raise e @@ -46,14 +46,16 @@ def build_custom_pdf(book_id, customizations, file_name, waiter_id=None): kwargs = { 'cover': True, } - if 'no-cover' in customizations: + if 'nocover' 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()))) + customizations.remove('nocover') + wldoc = Book.objects.get(pk=book_id).wldocument() + pdf = wldoc.as_pdf( + customizations=customizations, + morefloats=settings.LIBRARIAN_PDF_MOREFLOATS, + base_url=absolute_url(gallery_url(wldoc.book_info.url.slug)), + **kwargs) + DefaultStorage().save(file_name, File(open(pdf.get_filename(), 'rb'))) finally: if waiter_id is not None: WaitedFile.objects.filter(pk=waiter_id).delete() @@ -63,3 +65,10 @@ def build_custom_pdf(book_id, customizations, file_name, waiter_id=None): def update_counters(): from .helpers import update_counters update_counters() + + +@task(ignore_result=True) +def update_references(book_id): + from catalogue.models import Book + Book.objects.get(id=book_id).update_references() +