fixes

[wolnelektury.git] / src / catalogue / forms.py

diff --git a/src/catalogue/forms.py b/src/catalogue/forms.py
index 82a5d1f..405ea7c 100644 (file)
--- 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.
 #
 # This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later.
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
 #


@@ -15,6 +14,8 @@ from catalogue.tasks import build_custom_pdf
 class BookImportForm(forms.Form):
     book_xml_file = forms.FileField(required=False)
     book_xml = forms.CharField(required=False)
 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
 
     def clean(self):
         from django.core.files.base import ContentFile


@@ -22,13 +23,15 @@ class BookImportForm(forms.Form):
         if not self.cleaned_data['book_xml_file']:
             if self.cleaned_data['book_xml']:
                 self.cleaned_data['book_xml_file'] = \
         if not self.cleaned_data['book_xml_file']:
             if self.cleaned_data['book_xml']:
                 self.cleaned_data['book_xml_file'] = \

-                        ContentFile(self.cleaned_data['book_xml'].encode('utf-8'))
+                    ContentFile(self.cleaned_data['book_xml'].encode('utf-8'))

             else:
                 raise forms.ValidationError(_("Please supply an XML."))
         return super(BookImportForm, self).clean()
 
             else:
                 raise forms.ValidationError(_("Please supply an XML."))
         return super(BookImportForm, self).clean()
 

-    def save(self, commit=True, **kwargs):
-        return Book.from_xml_file(self.cleaned_data['book_xml_file'], overwrite=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'],
+                                  days=self.cleaned_data['days'], **kwargs)

 
 
 FORMATS = [(f, f.upper()) for f in Book.ebook_formats]
 
 
 FORMATS = [(f, f.upper()) for f in Book.ebook_formats]


@@ -45,7 +48,8 @@ CUSTOMIZATION_FLAGS = (
     ('nofootnotes', _("Don't show footnotes")),
     ('nothemes', _("Don't disply themes")),
     ('nowlfont', _("Don't use our custom font")),
     ('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"), (
     )
 CUSTOMIZATION_OPTIONS = (
     ('leading', _("Leading"), (


@@ -55,7 +59,8 @@ CUSTOMIZATION_OPTIONS = (
     )),
     ('fontsize', _("Font size"), (
         ('', _('Default')),
     )),
     ('fontsize', _("Font size"), (
         ('', _('Default')),

-        ('13pt', _('Big'))
+        ('13pt', _('Big')),
+        ('16pt', _('Bigger')),

     )),
     # ('pagesize', _("Paper size"), (
     #     ('a4paper', _('A4')),
     )),
     # ('pagesize', _("Paper size"), (
     #     ('a4paper', _('A4')),


@@ -71,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:
         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
 
     def clean(self):
         self.cleaned_data['cust'] = self.customizations


@@ -96,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.
     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),
         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),