X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/357027375ff8867f42ca34bcbfb5a78b5b185fc3..e2badc536757faa13a954f9422d7317b7412adad:/src/catalogue/forms.py?ds=sidebyside

diff --git a/src/catalogue/forms.py b/src/catalogue/forms.py
index d52310bd3..bcbfe5e83 100644
--- a/src/catalogue/forms.py
+++ b/src/catalogue/forms.py
@@ -15,6 +15,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)
+    gallery_url = forms.CharField(required=False)
+    days = forms.IntegerField(required=False)
 
     def clean(self):
         from django.core.files.base import ContentFile
@@ -22,21 +24,22 @@ class BookImportForm(forms.Form):
         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()
 
-    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]
 
 
 class DownloadFormatsForm(forms.Form):
-    formats = forms.MultipleChoiceField(required=False, choices=FORMATS,
-            widget=forms.CheckboxSelectMultiple)
+    formats = forms.MultipleChoiceField(required=False, choices=FORMATS, widget=forms.CheckboxSelectMultiple)
 
     def __init__(self, *args, **kwargs):
         super(DownloadFormatsForm, self).__init__(*args, **kwargs)
@@ -46,23 +49,23 @@ 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")),
     )
 CUSTOMIZATION_OPTIONS = (
     ('leading', _("Leading"), (
         ('', _('Normal leading')),
         ('onehalfleading', _('One and a half leading')),
         ('doubleleading', _('Double leading')),
-        )),
+    )),
     ('fontsize', _("Font size"), (
         ('', _('Default')),
         ('13pt', _('Big'))
-        )),
-#    ('pagesize', _("Paper size"), (
-#        ('a4paper', _('A4')),
-#        ('a5paper', _('A5')),
-#        )),
-    )
+    )),
+    # ('pagesize', _("Paper size"), (
+    #     ('a4paper', _('A4')),
+    #     ('a5paper', _('A5')),
+    # )),
+)
 
 
 class CustomPDFForm(forms.Form):
@@ -76,8 +79,7 @@ class CustomPDFForm(forms.Form):
 
     def clean(self):
         self.cleaned_data['cust'] = self.customizations
-        self.cleaned_data['path'] = get_customized_pdf_path(self.book,
-            self.cleaned_data['cust'])
+        self.cleaned_data['path'] = get_customized_pdf_path(self.book, self.cleaned_data['cust'])
         if not WaitedFile.can_order(self.cleaned_data['path']):
             raise ValidationError(_('Queue is full. Please try again later.'))
         return self.cleaned_data
@@ -98,11 +100,10 @@ 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}
-        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),
+            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),
             self.book.pretty_title()
-            )
-        #return redirect(url)
+        )
         return {"redirect": url}