author/title match ordering in api filter-books + fix lektura/audiobook filters

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

diff --git a/src/catalogue/forms.py b/src/catalogue/forms.py
index 1b03455..c1348a1 100644 (file)
--- a/src/catalogue/forms.py
+++ b/src/catalogue/forms.py
@@ -2,9 +2,6 @@
 # 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.
 #

-import urllib
-import os.path
-

 from django import forms
 from django.utils.translation import ugettext_lazy as _
 
 from django import forms
 from django.utils.translation import ugettext_lazy as _
 


@@ -13,7 +10,6 @@ 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 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):
 
 
 class BookImportForm(forms.Form):


@@ -32,7 +28,7 @@ class BookImportForm(forms.Form):
                 raise forms.ValidationError(_("Please supply an XML."))
         return super(BookImportForm, self).clean()
 
                 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)
 
         return Book.from_xml_file(self.cleaned_data['book_xml_file'], overwrite=True,
                                   remote_gallery_url=self.cleaned_data['gallery_url'], **kwargs)
 


@@ -51,7 +47,7 @@ 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")),

     )
 CUSTOMIZATION_OPTIONS = (
     ('leading', _("Leading"), (
     )
 CUSTOMIZATION_OPTIONS = (
     ('leading', _("Leading"), (