check cover image dimensions in forms

diff --git a/apps/cover/forms.py b/apps/cover/forms.py
index 5cc316b..36010c7 100755 (executable)
--- a/apps/cover/forms.py
+++ b/apps/cover/forms.py
@@ -3,12 +3,16 @@
 # This file is part of FNP-Redakcja, licensed under GNU Affero GPLv3 or later.
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
 #
 # 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 django import forms
 from django import forms

+from django.conf import settings

 from django.utils.translation import ugettext_lazy as _, ugettext
 from cover.models import Image
 from django.utils.text import mark_safe
 from django.utils.translation import ugettext_lazy as _, ugettext
 from cover.models import Image
 from django.utils.text import mark_safe

+from PIL import Image as PILImage

 
 

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

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


@@ -34,8 +38,19 @@ class ImageAddForm(forms.ModelForm):
 
     def clean(self):
         cleaned_data = super(ImageAddForm, self).clean()
 
     def clean(self):
         cleaned_data = super(ImageAddForm, self).clean()

-        if not cleaned_data.get('download_url', None) and not cleaned_data.get('file', None):
+        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('No image specified')

+        if download_url:
+            image_data = URLOpener().open(download_url).read()
+            width, height = PILImage.open(StringIO(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('Image too small: %sx%s, minimal dimensions %sx%s' %
+                                        (width, height, min_width, min_height))

         return cleaned_data
 
 
         return cleaned_data
 
 


@@ -45,6 +60,15 @@ class ImageEditForm(forms.ModelForm):
         model = Image
         exclude = ['download_url']
 
         model = Image
         exclude = ['download_url']
 

+    def clean(self):
+        cleaned_data = super(ImageEditForm, self).clean()
+        uploaded_file = cleaned_data.get('file', None)
+        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' %
+                                        (width, height, min_width, min_height))
+

 
 class ReadonlyImageEditForm(ImageEditForm):
     """Form used for not editing an Image."""
 
 class ReadonlyImageEditForm(ImageEditForm):
     """Form used for not editing an Image."""

diff --git a/apps/cover/templates/cover/image_detail.html b/apps/cover/templates/cover/image_detail.html
index d09a658..cf8f921 100755 (executable)
--- a/apps/cover/templates/cover/image_detail.html
+++ b/apps/cover/templates/cover/image_detail.html
@@ -27,7 +27,6 @@
 {% if editable %}
     <form method="post" enctype="multipart/form-data">
     {% csrf_token %}
 {% if editable %}
     <form method="post" enctype="multipart/form-data">
     {% csrf_token %}

-    {{ form.non_field_errors }}

 {% endif %}
 <table class='editable'><tbody>
     {{ form.as_table }}
 {% endif %}
 <table class='editable'><tbody>
     {{ form.as_table }}

diff --git a/apps/cover/views.py b/apps/cover/views.py
index 607d808..25033c1 100644 (file)
--- a/apps/cover/views.py
+++ b/apps/cover/views.py
@@ -98,7 +98,7 @@ def image(request, pk):
         editable = False
 
     return render(request, "cover/image_detail.html", {
         editable = False
 
     return render(request, "cover/image_detail.html", {

-        "object": image,
+        "object": Image.objects.get(id=image.id),

         "form": form,
         "editable": editable,
     })
         "form": form,
         "editable": editable,
     })

diff --git a/redakcja/settings/common.py b/redakcja/settings/common.py
index 5146dcd..ccb021e 100644 (file)
--- a/redakcja/settings/common.py
+++ b/redakcja/settings/common.py
@@ -144,6 +144,8 @@ CELERY_ACCEPT_CONTENT = ['pickle']  # Remove when all tasks jsonable.
 
 SHOW_APP_VERSION = False
 
 
 SHOW_APP_VERSION = False
 

+MIN_COVER_SIZE = (915, 1270)
+

 try:
     from redakcja.settings.compress import *
 except ImportError:
 try:
     from redakcja.settings.compress import *
 except ImportError: