X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/0f84fb864cfe3f6c642706f40933ede6a74fe0c4..feee71de06ace01f793c2c8adf9cce65b9df2cec:/apps/cover/forms.py?ds=inline diff --git a/apps/cover/forms.py b/apps/cover/forms.py index e6ffdff4..5cc316b2 100755 --- a/apps/cover/forms.py +++ b/apps/cover/forms.py @@ -3,13 +3,14 @@ # This file is part of FNP-Redakcja, licensed under GNU Affero GPLv3 or later. # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information. # -import re -from urllib2 import urlopen from django import forms from django.utils.translation import ugettext_lazy as _, ugettext from cover.models import Image from django.utils.text import mark_safe +from cover.utils import get_flickr_data, FlickrError + + class ImageAddForm(forms.ModelForm): class Meta: model = Image @@ -27,8 +28,8 @@ class ImageAddForm(forms.ModelForm): pass else: raise forms.ValidationError(mark_safe( - ugettext('Image already in repository.' - ) % {'url': img.get_absolute_url()})) + ugettext('Image already in repository.') + % {'url': img.get_absolute_url()})) return cl def clean(self): @@ -37,6 +38,7 @@ class ImageAddForm(forms.ModelForm): raise forms.ValidationError('No image specified') return cleaned_data + class ImageEditForm(forms.ModelForm): """Form used for editing a Book.""" class Meta: @@ -48,61 +50,23 @@ class ReadonlyImageEditForm(ImageEditForm): """Form used for not editing an Image.""" 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[^/]+)/(?P\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 = normalize_html(urlopen(url).read().decode('utf-8')) - except: - raise forms.ValidationError('Error reading page.') - match = re.search(r'Some rights reserved', html) - try: - assert match - license_url = match.group(1) - self.cleaned_data['license_url'] = license_url - re_license = re.compile(r'https?://creativecommons.org/licenses/([^/]*)/([^/]*)/.*') - m = re_license.match(license_url) - assert m - self.cleaned_data['license_name'] = 'CC %s %s' % (m.group(1).upper(), m.group(2)) - except AssertionError: - raise forms.ValidationError('Error reading license name.') - - m = re.search(r'"ownername":"([^"]*)', html) - if m: - self.cleaned_data['author'] = "%s@Flickr" % m.group(1) - else: - raise forms.ValidationError('Error reading author name.') - - m = re.search(r']*>(.*?)', html) - if not m: - raise forms.ValidationError('Error reading image title.') - self.cleaned_data['title'] = m.group(1) - - url_size = base_url + "sizes/o/" - html = normalize_html(urlopen(url_size).read().decode('utf-8')) - m = re.search(r'
\s*