X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/916aa587c9cc241044c57493f5f4aea5d0b7a2de..22af332597f857ee4fe60ea2ebfd8723fd9d5da9:/apps/catalogue/forms.py?ds=sidebyside

diff --git a/apps/catalogue/forms.py b/apps/catalogue/forms.py
index 935983734..391e3e429 100644
--- a/apps/catalogue/forms.py
+++ b/apps/catalogue/forms.py
@@ -12,10 +12,22 @@ from catalogue import utils
 
 
 class BookImportForm(forms.Form):
-    book_xml_file = forms.FileField()
+    book_xml_file = forms.FileField(required=False)
+    book_xml = forms.CharField(required=False)
 
-    def save(self, commit=True):
-        return Book.from_xml_file(self.cleaned_data['book_xml_file'], overwrite=True)
+    def clean(self):
+        from django.core.files.base import ContentFile
+
+        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'))
+            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)
 
 
 class SearchForm(forms.Form):
@@ -27,7 +39,7 @@ class SearchForm(forms.Form):
         super(SearchForm, self).__init__(*args, **kwargs)
         self.fields['q'].widget.attrs['title'] = _('title, author, theme/topic, epoch, kind, genre')
 	    #self.fields['q'].widget.attrs['style'] = ''
-        self.fields['tags'].initial = '/'.join(tag.slug for tag in Tag.get_tag_list(tags))
+        self.fields['tags'].initial = '/'.join(tag.url_chunk for tag in Tag.get_tag_list(tags))
 
 
 class UserSetsForm(forms.Form):
@@ -59,7 +71,7 @@ class NewSetForm(forms.Form):
 
     def save(self, user, commit=True):
         name = self.cleaned_data['name']
-        new_set = Tag(name=name, slug=utils.get_random_hash(name), sort_key=slughifi(name),
+        new_set = Tag(name=name, slug=utils.get_random_hash(name), sort_key=name.lower(),
             category='set', user=user)
 
         new_set.save()
@@ -73,6 +85,8 @@ FORMATS = (
     ('odt', 'ODT'),
     ('txt', 'TXT'),
     ('epub', 'EPUB'),
+    ('daisy', 'DAISY'),
+    ('mobi', 'MOBI'),
 )