X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/212c71fa46809d1d2b98f529c97bf785551e0945..a169ba7caa0d9d83fddcbad5ed05f536e0ca1b9e:/src/catalogue/tasks.py?ds=inline

diff --git a/src/catalogue/tasks.py b/src/catalogue/tasks.py
index aff0e6bca..a7b67aec9 100644
--- a/src/catalogue/tasks.py
+++ b/src/catalogue/tasks.py
@@ -2,14 +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 django.utils import timezone
 
 from catalogue.utils import gallery_path
-from wolnelektury.utils import localtime_to_utc
 from waiter.models import WaitedFile
 
 task_logger = get_task_logger(__name__)
@@ -18,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)
@@ -29,8 +28,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
 
@@ -48,16 +47,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')
+                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())))
+            DefaultStorage().save(file_name, File(open(pdf.get_filename(), 'rb')))
     finally:
         if waiter_id is not None:
             WaitedFile.objects.filter(pk=waiter_id).delete()