MP3 in OPDS

[wolnelektury.git] / src / picture / views.py

diff --git a/src/picture/views.py b/src/picture/views.py
index 98485af..72d1e37 100644 (file)
--- a/src/picture/views.py
+++ b/src/picture/views.py
@@ -1,24 +1,39 @@
-# This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later.
-# Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
+# This file is part of Wolne Lektury, licensed under GNU Affero GPLv3 or later.
+# Copyright © Fundacja Wolne Lektury. See NOTICE for more information.

 #
 #

+from collections import Counter

 from django.conf import settings
 from django.contrib.auth.decorators import permission_required
 from django.shortcuts import render, get_object_or_404, render
 from django.conf import settings
 from django.contrib.auth.decorators import permission_required
 from django.shortcuts import render, get_object_or_404, render

-from picture.models import Picture, PictureArea
+from picture.models import Picture
+from catalogue.models import Tag

 from catalogue.utils import split_tags
 from catalogue.utils import split_tags

-from ssify import ssi_included

 from sponsors.models import Sponsor
 from wolnelektury.utils import ajax
 from sponsors.models import Sponsor
 from wolnelektury.utils import ajax

+from catalogue.helpers import get_top_level_related_tags

 
 
 
 

-def picture_list_thumb(request, filter=None, get_filter=None, template_name='picture/picture_list_thumb.html',
-                       cache_key=None, context=None):
+def picture_list_thumb(request):

     pictures = Picture.objects.all()
     pictures = Picture.objects.all()

-    if filter:
-        pictures = pictures.filter(filter)
-    if get_filter:
-        pictures = pictures.filter(get_filter())
-    return render(request, template_name, {'book_list': list(pictures)})
+        
+    related_tags = Tag.objects.usage_for_model(Picture, counts=True)
+    related_tags = sorted(related_tags, key=lambda t: -t.count)
+    suggestion_categories = Counter()
+    suggestions = []
+    for t in related_tags:
+        if suggestion_categories[t.category] < 3:
+            suggestion_categories[t.category] += 1
+            suggestions.append(t)
+            if sum(suggestion_categories.values()) == 10:
+                break
+    template_name = 'catalogue/author_detail.html'
+    return render(request, template_name, {
+        'object_list': pictures,
+        'title': 'Galeria',
+        'tags': [],
+        'suggest': suggestions,
+        'list_type': 'gallery',
+    })

 
 
 def picture_detail(request, slug):
 
 
 def picture_detail(request, slug):


@@ -26,7 +41,9 @@ def picture_detail(request, slug):
 
     theme_things = split_tags(picture.related_themes())
 
 
     theme_things = split_tags(picture.related_themes())
 

-    return render(request, "picture/picture_detail.html", {
+    template_name = 'picture/picture_detail.html'
+    
+    return render(request, template_name, {

         'picture': picture,
         'themes': theme_things.get('theme', []),
         'things': theme_things.get('thing', []),
         'picture': picture,
         'themes': theme_things.get('theme', []),
         'things': theme_things.get('thing', []),


@@ -37,7 +54,7 @@ def picture_detail(request, slug):
 def picture_viewer(request, slug):
     picture = get_object_or_404(Picture, slug=slug)
     sponsors = []
 def picture_viewer(request, slug):
     picture = get_object_or_404(Picture, slug=slug)
     sponsors = []

-    for sponsor in picture.extra_info.get('sponsors', []):
+    for sponsor in picture.get_extra_info_json().get('sponsors', []):

         have_sponsors = Sponsor.objects.filter(name=sponsor)
         if have_sponsors.exists():
             sponsors.append(have_sponsors[0])
         have_sponsors = Sponsor.objects.filter(name=sponsor)
         if have_sponsors.exists():
             sponsors.append(have_sponsors[0])


@@ -61,7 +78,7 @@ def picture_page(request, key=None):
             'epoch': picture.tag_unicode('epoch'),
             'kind': picture.tag_unicode('kind'),
             'genre': picture.tag_unicode('genre'),
             'epoch': picture.tag_unicode('epoch'),
             'kind': picture.tag_unicode('kind'),
             'genre': picture.tag_unicode('genre'),

-            'style': picture.extra_info['style'],
+            'style': picture.get_extra_info_json()['style'],

             'image_url': picture.image_file.url,
             'width': picture.width,
             'height': picture.height,
             'image_url': picture.image_file.url,
             'width': picture.width,
             'height': picture.height,


@@ -82,7 +99,6 @@ def import_picture(request):
     """docstring for import_book"""
     from django.http import HttpResponse
     from picture.forms import PictureImportForm
     """docstring for import_book"""
     from django.http import HttpResponse
     from picture.forms import PictureImportForm

-    from django.utils.translation import ugettext as _

 
     import_form = PictureImportForm(request.POST, request.FILES)
     if import_form.is_valid():
 
     import_form = PictureImportForm(request.POST, request.FILES)
     if import_form.is_valid():


@@ -95,29 +111,8 @@ def import_picture(request):
             info = sys.exc_info()
             exception = pprint.pformat(info[1])
             tb = '\n'.join(traceback.format_tb(info[2]))
             info = sys.exc_info()
             exception = pprint.pformat(info[1])
             tb = '\n'.join(traceback.format_tb(info[2]))

-            return HttpResponse(_("An error occurred: %(exception)s\n\n%(tb)s") %
-                                {'exception': exception, 'tb': tb}, mimetype='text/plain')
-        return HttpResponse(_("Picture imported successfully"))
+            return HttpResponse("Wystąpił błąd: %(exception)s\n\n%(tb)s" %
+                                {'exception': exception, 'tb': tb}, content_type='text/plain')
+        return HttpResponse('Obraz został zimportowany')

     else:
     else:

-        return HttpResponse(_("Error importing file: %r") % import_form.errors)
-
-
-@ssi_included
-def picture_short(request, pk):
-    picture = get_object_or_404(Picture, pk=pk)
-
-    return render(request, 'picture/picture_short.html', {
-        'picture': picture,
-    })
-
-
-@ssi_included
-def picturearea_short(request, pk):
-    area = get_object_or_404(PictureArea, pk=pk)
-    themes = area.tags.filter(category='theme')
-    things = area.tags.filter(category='thing')
-    return render(request, 'picture/picturearea_short.html', {
-        'area': area,
-        'theme': themes[0] if themes else None,
-        'thing': things[0] if things else None,
-    })
+        return HttpResponse('Błąd importu pliku: %r' % import_form.errors)