X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/5913c54d19b8f6775633176032161d49f9b2f1aa..fdb9aaea02d3e78cb8e97b967435239672f23217:/src/cover/forms.py?ds=inline
diff --git a/src/cover/forms.py b/src/cover/forms.py
old mode 100755
new mode 100644
index 513bdefb..7a855940
--- a/src/cover/forms.py
+++ b/src/cover/forms.py
@@ -1,27 +1,31 @@
-# -*- coding: utf-8 -*-
-#
# This file is part of FNP-Redakcja, licensed under GNU Affero GPLv3 or later.
# Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
#
-from StringIO import StringIO
+from io import BytesIO
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.text import mark_safe
+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 Meta:
model = Image
+ exclude = []
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
@@ -32,7 +36,7 @@ class ImageAddForm(forms.ModelForm):
pass
else:
raise forms.ValidationError(mark_safe(
- ugettext('Image already in repository.')
+ gettext('Image already in repository.')
% {'url': img.get_absolute_url()}))
return cl
@@ -42,24 +46,29 @@ class ImageAddForm(forms.ModelForm):
same_source = Image.objects.filter(source_url=source_url)
if same_source:
raise forms.ValidationError(mark_safe(
- ugettext('Image already in repository'
- % same_source.first().get_absolute_url())))
+ gettext('Image already in repository.')
+ % {'url': same_source.first().get_absolute_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:
- 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(StringIO(image_data)).size
+ width, height = PILImage.open(BytesIO(image_data)).size
else:
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
@@ -76,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:
- 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))
@@ -92,15 +101,16 @@ class ReadonlyImageEditForm(ImageEditForm):
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:
- 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'):
- 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']
+