diff --git a/apps/catalogue/urls.py b/apps/catalogue/urls.py index a09dd120..7989d2ad 100644 --- a/apps/catalogue/urls.py +++ b/apps/catalogue/urls.py @@ -55,4 +55,5 @@ urlpatterns = patterns('catalogue.views', 'image_mass_edit', name='catalogue_image_mass_edit'), url(r'^track/(?P[^/]*)/$', PublishTrackFeed()), + url(r'^active/$', 'active_users_list', name='active_users_list'), ) diff --git a/apps/catalogue/views.py b/apps/catalogue/views.py index 84cc0972..b30297cd 100644 --- a/apps/catalogue/views.py +++ b/apps/catalogue/views.py @@ -1,3 +1,4 @@ +from collections import defaultdict from datetime import datetime, date, timedelta import logging import os @@ -599,3 +600,36 @@ class GalleryView(UploadView): def get_directory(self): return "%s%s/" % (settings.IMAGE_DIR, self.object.gallery) + + +def active_users_list(request): + since = date(date.today().year, 1, 1) + by_user = defaultdict(lambda: 0) + by_email = defaultdict(lambda: 0) + names_by_email = defaultdict(set) + for change_model in (Chunk.change_model, Image.change_model): + for c in change_model.objects.filter( + created_at__gte=since).order_by( + 'author', 'author_email', 'author_name').values( + 'author', 'author_name', 'author_email').annotate( + c=Count('author'), ce=Count('author_email')).distinct(): + if c['author']: + by_user[c['author']] += c['c'] + else: + by_email[c['author_email']] += c['ce'] + if c['author_name'].strip(): + names_by_email[c['author_email']].add(c['author_name']) + for user in User.objects.filter(pk__in=by_user): + by_email[user.email] += by_user[user.pk] + names_by_email[user.email].add("%s %s" % (user.first_name, user.last_name)) + + active_users = [] + for email, count in by_email.items(): + active_users.append((email, names_by_email[email], count)) + active_users.sort(key=lambda x: -x[2]) + return render(request, 'catalogue/active_users_list.html', { + 'users': active_users, + 'since': since, + }) + + diff --git a/apps/cover/forms.py b/apps/cover/forms.py index e6ffdff4..e4c949c8 100755 --- a/apps/cover/forms.py +++ b/apps/cover/forms.py @@ -3,6 +3,7 @@ # This file is part of FNP-Redakcja, licensed under GNU Affero GPLv3 or later. # Copyright Â© Fundacja Nowoczesna Polska. See NOTICE for more information. # +import json import re from urllib2 import urlopen from django import forms @@ -62,6 +63,7 @@ class FlickrForm(forms.Form): def clean_source_url(self): def normalize_html(html): + return html return re.sub('[\t\n]', '', html) url = self.cleaned_data['source_url'] @@ -75,7 +77,7 @@ class FlickrForm(forms.Form): html = normalize_html(urlopen(url).read().decode('utf-8')) except: raise forms.ValidationError('Error reading page.') - match = re.search(r'Some rights reserved', html) + match = re.search(r']* rel="license ', html) try: assert match license_url = match.group(1) @@ -87,22 +89,21 @@ class FlickrForm(forms.Form): except AssertionError: raise forms.ValidationError('Error reading license name.') - m = re.search(r'"ownername":"([^"]*)', html) + m = re.search(r']* class="owner-name [^>]*>([^<]*)<', 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) + m = re.search(r']*>(.*?)', html, re.S) if not m: raise forms.ValidationError('Error reading image title.') - self.cleaned_data['title'] = m.group(1) + self.cleaned_data['title'] = m.group(1).strip() - url_size = base_url + "sizes/o/" - html = normalize_html(urlopen(url_size).read().decode('utf-8')) - m = re.search(r'

\s*

--- "]]}], ["lineregexp", {"exprs": [["^\\s+|\\s+$", ""], ["\\s+", " "], ["(,,)\\s+", "$1"], ["\\s+(\")", "$1"], ["([^\\.])(\\s*)

{% block maincontent %} {% endblock %}

- + {% block extrabody %}{% endblock %}