From 5709ad98f0e529a37e858931e1ec2f37c3875dcf Mon Sep 17 00:00:00 2001 From: Jan Szejko Date: Fri, 19 May 2017 16:34:48 +0200 Subject: [PATCH 1/1] prevent adding new images with existing sources --- apps/cover/forms.py | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/apps/cover/forms.py b/apps/cover/forms.py index 36010c75..7306b33a 100755 --- a/apps/cover/forms.py +++ b/apps/cover/forms.py @@ -36,12 +36,21 @@ class ImageAddForm(forms.ModelForm): % {'url': img.get_absolute_url()})) return cl + def clean_source_url(self): + source_url = self.cleaned_data['source_url'] or None + if source_url is not None: + 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()))) + 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('No image specified') + raise forms.ValidationError(ugettext('No image specified')) if download_url: image_data = URLOpener().open(download_url).read() width, height = PILImage.open(StringIO(image_data)).size @@ -49,7 +58,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: - raise forms.ValidationError('Image too small: %sx%s, minimal dimensions %sx%s' % + raise forms.ValidationError(ugettext('Image too small: %sx%s, minimal dimensions %sx%s') % (width, height, min_width, min_height)) return cleaned_data @@ -66,7 +75,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('Image too small: %sx%s, minimal dimensions %sx%s' % + raise forms.ValidationError(ugettext('Image too small: %sx%s, minimal dimensions %sx%s') % (width, height, min_width, min_height)) -- 2.20.1