X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/c3fc1fa1087b5c12e287f6a7194d7a98fc27817e..1b80c204be885588f7cbe95610e3677f2f886801:/src/catalogue/forms.py

diff --git a/src/catalogue/forms.py b/src/catalogue/forms.py
index 1b034551f..405ea7c48 100644
--- a/src/catalogue/forms.py
+++ b/src/catalogue/forms.py
@@ -1,10 +1,6 @@
-# -*- 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.
 #
-import urllib
-import os.path
-
 from django import forms
 from django.utils.translation import ugettext_lazy as _
 
@@ -13,13 +9,13 @@ from waiter.models import WaitedFile
 from django.core.exceptions import ValidationError
 from catalogue.utils import get_customized_pdf_path
 from catalogue.tasks import build_custom_pdf
-from wolnelektury.utils import makedirs
 
 
 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
@@ -32,9 +28,10 @@ class BookImportForm(forms.Form):
                 raise forms.ValidationError(_("Please supply an XML."))
         return super(BookImportForm, self).clean()
 
-    def save(self, commit=True, **kwargs):
+    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]
@@ -51,7 +48,8 @@ CUSTOMIZATION_FLAGS = (
     ('nofootnotes', _("Don't show footnotes")),
     ('nothemes', _("Don't disply themes")),
     ('nowlfont', _("Don't use our custom font")),
-    ('no-cover', _("Without cover")),
+    ('nocover', _("Without cover")),
+    ('notoc', _("Without table of contents")),
     )
 CUSTOMIZATION_OPTIONS = (
     ('leading', _("Leading"), (
@@ -61,7 +59,8 @@ CUSTOMIZATION_OPTIONS = (
     )),
     ('fontsize', _("Font size"), (
         ('', _('Default')),
-        ('13pt', _('Big'))
+        ('13pt', _('Big')),
+        ('16pt', _('Bigger')),
     )),
     # ('pagesize', _("Paper size"), (
     #     ('a4paper', _('A4')),
@@ -77,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
@@ -102,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),