X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/ae60b2a3949e96357477cc04f90fd0873cee8a92..2e45f239552a9e378a9e1f65274dfb7c13df220d:/src/catalogue/tasks.py?ds=sidebyside diff --git a/src/catalogue/tasks.py b/src/catalogue/tasks.py index 4807339ba..265897f52 100644 --- a/src/catalogue/tasks.py +++ b/src/catalogue/tasks.py @@ -2,12 +2,13 @@ # 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 gallery_path from waiter.models import WaitedFile task_logger = get_task_logger(__name__) @@ -16,7 +17,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) @@ -46,13 +47,15 @@ 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) + customizations.remove('nocover') + wldoc = Book.objects.get(pk=book_id).wldocument() + pdf = wldoc.as_pdf( + customizations=customizations, + morefloats=settings.LIBRARIAN_PDF_MOREFLOATS, + ilustr_path=gallery_path(wldoc.book_info.url.slug), + **kwargs) DefaultStorage().save(file_name, File(open(pdf.get_filename()))) finally: if waiter_id is not None: