X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/e7d557155e2cd195f975e4559c353be5f28d7d66..e4d004cbf9d467a20a2a0d04aecaac36efd0af2c:/src/catalogue/forms.py diff --git a/src/catalogue/forms.py b/src/catalogue/forms.py index c1348a1e4..405ea7c48 100644 --- a/src/catalogue/forms.py +++ b/src/catalogue/forms.py @@ -1,4 +1,3 @@ -# -*- 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. # @@ -16,6 +15,7 @@ class BookImportForm(forms.Form): book_xml_file = forms.FileField(required=False) book_xml = forms.CharField(required=False) gallery_url = forms.CharField(required=False) + days = forms.IntegerField(required=False) def clean(self): from django.core.files.base import ContentFile @@ -30,7 +30,8 @@ class BookImportForm(forms.Form): def save(self, **kwargs): return Book.from_xml_file(self.cleaned_data['book_xml_file'], overwrite=True, - remote_gallery_url=self.cleaned_data['gallery_url'], **kwargs) + remote_gallery_url=self.cleaned_data['gallery_url'], + days=self.cleaned_data['days'], **kwargs) FORMATS = [(f, f.upper()) for f in Book.ebook_formats] @@ -48,6 +49,7 @@ CUSTOMIZATION_FLAGS = ( ('nothemes', _("Don't disply themes")), ('nowlfont', _("Don't use our custom font")), ('nocover', _("Without cover")), + ('notoc', _("Without table of contents")), ) CUSTOMIZATION_OPTIONS = ( ('leading', _("Leading"), ( @@ -57,7 +59,8 @@ CUSTOMIZATION_OPTIONS = ( )), ('fontsize', _("Font size"), ( ('', _('Default')), - ('13pt', _('Big')) + ('13pt', _('Big')), + ('16pt', _('Bigger')), )), # ('pagesize', _("Paper size"), ( # ('a4paper', _('A4')), @@ -73,7 +76,7 @@ class CustomPDFForm(forms.Form): for name, label in CUSTOMIZATION_FLAGS: self.fields[name] = forms.BooleanField(required=False, label=label) for name, label, choices in CUSTOMIZATION_OPTIONS: - self.fields[name] = forms.ChoiceField(choices, required=False, label=label) + self.fields[name] = forms.ChoiceField(choices=choices, required=False, label=label) def clean(self): self.cleaned_data['cust'] = self.customizations @@ -98,7 +101,7 @@ class CustomPDFForm(forms.Form): def save(self, *args, **kwargs): if not self.cleaned_data['cust'] and self.book.pdf_file: # Don't build with default options, just redirect to the standard file. - return {"redirect": self.book.pdf_file.url} + return {"redirect": self.book.pdf_url()} url = WaitedFile.order( self.cleaned_data['path'], lambda p, waiter_id: build_custom_pdf.delay(self.book.id, self.cleaned_data['cust'], p, waiter_id),