X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/6422710d756f21201737623ee51d61431cd4e0c9..1c4c468783e5f380324c29ebc3b2c452da8cc2a0:/apps/cover/forms.py?ds=sidebyside

diff --git a/apps/cover/forms.py b/apps/cover/forms.py
index fdd43048..969d13a8 100755
--- a/apps/cover/forms.py
+++ b/apps/cover/forms.py
@@ -9,10 +9,28 @@ from django import forms
 from django.utils.translation import ugettext_lazy as _
 from cover.models import Image
 
+
 class ImageAddForm(forms.ModelForm):
     class Meta:
         model = Image
 
+    def __init__(self, *args, **kwargs):
+        super(ImageAddForm, self).__init__(*args, **kwargs)
+        self.fields['file'].required = self.fields['download_url'].required = self.fields['source_url'].required = False
+
+    def clean_download_url(self):
+        return self.cleaned_data['download_url'] or None
+
+    def clean_source_url(self):
+        return self.cleaned_data['source_url'] or None
+
+    def clean(self):
+        cleaned_data = super(ImageAddForm, self).clean()
+        if not cleaned_data.get('download_url', None) and not cleaned_data.get('file', None):
+            raise forms.ValidationError('No image specified')
+        return cleaned_data
+
+
 class ImageEditForm(forms.ModelForm):
     """Form used for editing a Book."""
     class Meta:
@@ -24,28 +42,30 @@ class ReadonlyImageEditForm(ImageEditForm):
     """Form used for not editing a Book."""
 
     def __init__(self, *args, **kwargs):
-        ret = super(ReadonlyImageEditForm, self).__init__(*args, **kwargs)
+        super(ReadonlyImageEditForm, self).__init__(*args, **kwargs)
         for field in self.fields.values():
             field.widget.attrs.update({"readonly": True})
-        return ret
 
     def save(self, *args, **kwargs):
-        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'))
 
     def clean_source_url(self):
+        def normalize_html(html):
+            return re.sub('[\t\n]', '', html)
+
         url = self.cleaned_data['source_url']
-        m = re.match(r'(https?://)?(www\.|secure\.)?flickr\.com/photos/(?P<author>[^/]+)/(?P<img>\d+)', url)
+        m = re.match(r'(https?://)?(www\.|secure\.)?flickr\.com/photos/(?P<author>[^/]+)/(?P<img>\d+)/?', url)
         if not m:
             raise forms.ValidationError("It doesn't look like Flickr URL.")
         author_slug, img_id = m.group('author'), m.group('img')
         base_url = "https://www.flickr.com/photos/%s/%s/" % (author_slug, img_id)
 
         try:
-            html = urlopen(url).read().decode('utf-8')
+            html = normalize_html(urlopen(url).read().decode('utf-8'))
         except:
             raise forms.ValidationError('Error reading page.')
         match = re.search(r'<a href="([^"]*)" rel="license cc:license">Some rights reserved</a>', html)
@@ -60,7 +80,7 @@ class FlickrForm(forms.Form):
         except AssertionError:
             raise forms.ValidationError('Error reading license name.')
 
-        m = re.search(r'<strong class="username">By <a href="[^"]*">([^<]*)</a></strong>', html)
+        m = re.search(r'"ownername":"([^"]*)', html)
         if m:
             self.cleaned_data['author'] = "%s@Flickr" % m.group(1)
         else:
@@ -72,7 +92,7 @@ class FlickrForm(forms.Form):
         self.cleaned_data['title'] = m.group(1)
 
         url_size = base_url + "sizes/o/"
-        html = urlopen(url_size).read().decode('utf-8')
+        html = normalize_html(urlopen(url_size).read().decode('utf-8'))
         m = re.search(r'<div id="allsizes-photo">\s*<img src="([^"]*)"', html)
         if m:
             self.cleaned_data['download_url'] = m.group(1)