Add audience and thema data to catalogue. Also: nicer cover view.

[redakcja.git] / src / cover / forms.py

diff --git a/src/cover/forms.py b/src/cover/forms.py
index ea51e46..aad80c4 100644 (file)
--- a/src/cover/forms.py
+++ b/src/cover/forms.py
@@ -5,12 +5,12 @@ from io import BytesIO
 
 from django import forms
 from django.conf import settings
 
 from django import forms
 from django.conf import settings

-from django.utils.translation import ugettext_lazy as _, ugettext
+from django.utils.translation import gettext_lazy as _, gettext

 from cover.models import Image
 from django.utils.safestring import mark_safe
 from PIL import Image as PILImage
 
 from cover.models import Image
 from django.utils.safestring import mark_safe
 from PIL import Image as PILImage
 

-from cover.utils import get_flickr_data, FlickrError, URLOpener
+from cover.utils import get_import_data, FlickrError, URLOpener

 
 
 class ImageAddForm(forms.ModelForm):
 
 
 class ImageAddForm(forms.ModelForm):


@@ -21,6 +21,11 @@ class ImageAddForm(forms.ModelForm):
     def __init__(self, *args, **kwargs):
         super(ImageAddForm, self).__init__(*args, **kwargs)
         self.fields['file'].required = False
     def __init__(self, *args, **kwargs):
         super(ImageAddForm, self).__init__(*args, **kwargs)
         self.fields['file'].required = False

+        self.fields['use_file'].required = False
+        self.fields['cut_top'].required = False
+        self.fields['cut_left'].required = False
+        self.fields['cut_bottom'].required = False
+        self.fields['cut_right'].required = False

 
     def clean_download_url(self):
         cl = self.cleaned_data['download_url'] or None
 
     def clean_download_url(self):
         cl = self.cleaned_data['download_url'] or None


@@ -31,7 +36,7 @@ class ImageAddForm(forms.ModelForm):
                 pass
             else:
                 raise forms.ValidationError(mark_safe(
                 pass
             else:
                 raise forms.ValidationError(mark_safe(

-                    ugettext('Image <a href="%(url)s">already in repository</a>.')
+                    gettext('Image <a href="%(url)s">already in repository</a>.')

                     % {'url': img.get_absolute_url()}))
         return cl
 
                     % {'url': img.get_absolute_url()}))
         return cl
 


@@ -41,16 +46,21 @@ class ImageAddForm(forms.ModelForm):
             same_source = Image.objects.filter(source_url=source_url)
             if same_source:
                 raise forms.ValidationError(mark_safe(
             same_source = Image.objects.filter(source_url=source_url)
             if same_source:
                 raise forms.ValidationError(mark_safe(

-                    ugettext('Image <a href="%s">already in repository</a>'
-                             % same_source.first().get_absolute_url())))
+                    gettext('Image <a href="%(url)s">already in repository</a>.')
+                    % {'url': same_source.first().get_absolute_url()}))

         return source_url
 
         return source_url
 

+    clean_cut_top = lambda self: self.cleaned_data.get('cut_top') or 0
+    clean_cut_bottom = lambda self: self.cleaned_data.get('cut_bottom') or 0
+    clean_cut_left = lambda self: self.cleaned_data.get('cut_left') or 0
+    clean_cut_right = lambda self: self.cleaned_data.get('cut_right') or 0
+    

     def clean(self):
         cleaned_data = super(ImageAddForm, self).clean()
         download_url = cleaned_data.get('download_url', None)
         uploaded_file = cleaned_data.get('file', None)
         if not download_url and not uploaded_file:
     def clean(self):
         cleaned_data = super(ImageAddForm, self).clean()
         download_url = cleaned_data.get('download_url', None)
         uploaded_file = cleaned_data.get('file', None)
         if not download_url and not uploaded_file:

-            raise forms.ValidationError(ugettext('No image specified'))
+            raise forms.ValidationError(gettext('No image specified'))

         if download_url:
             image_data = URLOpener().open(download_url).read()
             width, height = PILImage.open(BytesIO(image_data)).size
         if download_url:
             image_data = URLOpener().open(download_url).read()
             width, height = PILImage.open(BytesIO(image_data)).size


@@ -58,7 +68,7 @@ class ImageAddForm(forms.ModelForm):
             width, height = PILImage.open(uploaded_file.file).size
         min_width, min_height = settings.MIN_COVER_SIZE
         if width < min_width or height < min_height:
             width, height = PILImage.open(uploaded_file.file).size
         min_width, min_height = settings.MIN_COVER_SIZE
         if width < min_width or height < min_height:

-            raise forms.ValidationError(ugettext('Image too small: %sx%s, minimal dimensions %sx%s') %
+            raise forms.ValidationError(gettext('Image too small: %sx%s, minimal dimensions %sx%s') %

                                         (width, height, min_width, min_height))
         return cleaned_data
 
                                         (width, height, min_width, min_height))
         return cleaned_data
 


@@ -67,7 +77,7 @@ class ImageEditForm(forms.ModelForm):
     """Form used for editing a Book."""
     class Meta:
         model = Image
     """Form used for editing a Book."""
     class Meta:
         model = Image

-        exclude = ['download_url']
+        exclude = ['download_url', 'use_file', 'example',]

 
     def clean(self):
         cleaned_data = super(ImageEditForm, self).clean()
 
     def clean(self):
         cleaned_data = super(ImageEditForm, self).clean()


@@ -75,7 +85,7 @@ class ImageEditForm(forms.ModelForm):
         width, height = PILImage.open(uploaded_file.file).size
         min_width, min_height = settings.MIN_COVER_SIZE
         if width < min_width or height < min_height:
         width, height = PILImage.open(uploaded_file.file).size
         min_width, min_height = settings.MIN_COVER_SIZE
         if width < min_width or height < min_height:

-            raise forms.ValidationError(ugettext('Image too small: %sx%s, minimal dimensions %sx%s') %
+            raise forms.ValidationError(gettext('Image too small: %sx%s, minimal dimensions %sx%s') %

                                         (width, height, min_width, min_height))
 
 
                                         (width, height, min_width, min_height))
 
 


@@ -91,15 +101,16 @@ class ReadonlyImageEditForm(ImageEditForm):
         raise AssertionError("ReadonlyImageEditForm should not be saved.")
 
 
         raise AssertionError("ReadonlyImageEditForm should not be saved.")
 
 

-class FlickrForm(forms.Form):
-    source_url = forms.URLField(label=_('Flickr URL'))
+class ImportForm(forms.Form):
+    source_url = forms.URLField(label=_('WikiCommons, MNW, Flickr, RawPixel URL'))

 
     def clean_source_url(self):
         url = self.cleaned_data['source_url']
         try:
 
     def clean_source_url(self):
         url = self.cleaned_data['source_url']
         try:

-            flickr_data = get_flickr_data(url)
+            import_data = get_import_data(url)

         except FlickrError as e:
             raise forms.ValidationError(e)
         for field_name in ('license_url', 'license_name', 'author', 'title', 'download_url'):
         except FlickrError as e:
             raise forms.ValidationError(e)
         for field_name in ('license_url', 'license_name', 'author', 'title', 'download_url'):

-            self.cleaned_data[field_name] = flickr_data[field_name]
-        return flickr_data['source_url']
+            self.cleaned_data[field_name] = import_data[field_name]
+        return import_data['source_url']
+