fixes

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

diff --git a/src/catalogue/views.py b/src/catalogue/views.py
index fe4b2bf..b57ba11 100644 (file)
--- a/src/catalogue/views.py
+++ b/src/catalogue/views.py
@@ -4,6 +4,7 @@
 from collections import OrderedDict
 import random
 import re
 from collections import OrderedDict
 import random
 import re

+from urllib.parse import quote_plus

 
 from django.conf import settings
 from django.template.loader import render_to_string
 
 from django.conf import settings
 from django.template.loader import render_to_string


@@ -12,14 +13,13 @@ from django.http import HttpResponse, HttpResponseRedirect, Http404, HttpRespons
 from django.urls import reverse
 from django.db.models import Q, QuerySet
 from django.contrib.auth.decorators import login_required, user_passes_test
 from django.urls import reverse
 from django.db.models import Q, QuerySet
 from django.contrib.auth.decorators import login_required, user_passes_test

-from django.utils.http import urlquote_plus

 from django.utils import translation
 from django.utils import translation

-from django.utils.translation import ugettext as _, ugettext_lazy
+from django.utils.translation import gettext as _, gettext_lazy

 from django.views.decorators.cache import never_cache
 
 from ajaxable.utils import AjaxableFormView
 from club.forms import ScheduleForm
 from django.views.decorators.cache import never_cache
 
 from ajaxable.utils import AjaxableFormView
 from club.forms import ScheduleForm

-from club.models import Club, Membership
+from club.models import Club

 from annoy.models import DynamicTextInsert
 from pdcounter import views as pdcounter_views
 from picture.models import Picture, PictureArea
 from annoy.models import DynamicTextInsert
 from pdcounter import views as pdcounter_views
 from picture.models import Picture, PictureArea


@@ -67,7 +67,11 @@ def daisy_list(request):
 
 def collection(request, slug):
     coll = get_object_or_404(Collection, slug=slug)
 
 def collection(request, slug):
     coll = get_object_or_404(Collection, slug=slug)

-    return render(request, 'catalogue/collection.html', {
+    if request.EXPERIMENTS['layout'].value:
+        template_name = 'catalogue/2022/collection.html'
+    else:
+        template_name = 'catalogue/collection.html'
+    return render(request, template_name, {

         'collection': coll,
         'active_menu_item': 'collections',
     })
         'collection': coll,
         'active_menu_item': 'collections',
     })


@@ -142,9 +146,19 @@ def object_list(request, objects, fragments=None, related_tags=None, tags=None,
     }
     if extra:
         result.update(extra)
     }
     if extra:
         result.update(extra)

+
+    is_author = len(tags) == 1 and tags[0].category == 'author'
+    is_theme = len(tags) == 1 and tags[0].category == 'theme'
+    new_layout = request.EXPERIMENTS['layout']
+    if is_author and new_layout.value:
+        template = 'catalogue/2022/author_detail.html'
+    elif is_theme and new_layout.value:
+        template = 'catalogue/2022/theme_detail.html'
+    else:
+        template = 'catalogue/tagged_object_list.html'
+        

     return render(
     return render(

-        request,
-        'catalogue/tagged_object_list.html', result,
+        request, template, result,

     )
 
 
     )
 
 


@@ -328,7 +342,7 @@ def player(request, slug):
 def book_text(request, slug):
     book = get_object_or_404(Book, slug=slug)
 
 def book_text(request, slug):
     book = get_object_or_404(Book, slug=slug)
 

-    if book.preview and not Membership.is_active_for(request.user):
+    if not book.is_accessible_to(request.user):

         return HttpResponseRedirect(book.get_absolute_url())
 
     if not book.has_html_file():
         return HttpResponseRedirect(book.get_absolute_url())
 
     if not book.has_html_file():


@@ -398,21 +412,21 @@ def embargo_link(request, key, format_, slug):
     return HttpResponse(media_file, content_type=constants.EBOOK_CONTENT_TYPES[format_])
 
 
     return HttpResponse(media_file, content_type=constants.EBOOK_CONTENT_TYPES[format_])
 
 

-def download_zip(request, format, slug=None):
-    if format in Book.ebook_formats:
-        url = Book.zip_format(format)
-    elif format in ('mp3', 'ogg') and slug is not None:
+def download_zip(request, file_format=None, media_format=None, slug=None):
+    if file_format:
+        url = Book.zip_format(file_format)
+    elif media_format and slug is not None:

         book = get_object_or_404(Book, slug=slug)
         book = get_object_or_404(Book, slug=slug)

-        url = book.zip_audiobooks(format)
+        url = book.zip_audiobooks(media_format)

     else:
         raise Http404('No format specified for zip package')
     else:
         raise Http404('No format specified for zip package')

-    return HttpResponseRedirect(urlquote_plus(settings.MEDIA_URL + url, safe='/?='))
+    return HttpResponseRedirect(quote_plus(settings.MEDIA_URL + url, safe='/?='))

 
 
 class CustomPDFFormView(AjaxableFormView):
     form_class = forms.CustomPDFForm
 
 
 class CustomPDFFormView(AjaxableFormView):
     form_class = forms.CustomPDFForm

-    title = ugettext_lazy('Download custom PDF')
-    submit = ugettext_lazy('Download')
+    title = gettext_lazy('Download custom PDF')
+    submit = gettext_lazy('Download')

     template = 'catalogue/custom_pdf_form.html'
     honeypot = True
 
     template = 'catalogue/custom_pdf_form.html'
     honeypot = True
 


@@ -427,7 +441,7 @@ class CustomPDFFormView(AjaxableFormView):
 
     def validate_object(self, obj, request):
         book = obj
 
     def validate_object(self, obj, request):
         book = obj

-        if book.preview and not Membership.is_active_for(request.user):
+        if not book.is_accessible_to(request.user):

             return HttpResponseRedirect(book.get_absolute_url())
         return super(CustomPDFFormView, self).validate_object(obj, request)
 
             return HttpResponseRedirect(book.get_absolute_url())
         return super(CustomPDFFormView, self).validate_object(obj, request)
 


@@ -470,7 +484,12 @@ def collections(request):
     else:
         best = objects
 
     else:
         best = objects
 

-    return render(request, 'catalogue/collections.html', {
+    if request.EXPERIMENTS['layout'].value:
+        template_name = 'catalogue/2022/collections.html'
+    else:
+        template_name = 'catalogue/collections.html'
+
+    return render(request, template_name, {

         'objects': objects,
         'best': best,
         'active_menu_item': 'collections'
         'objects': objects,
         'best': best,
         'active_menu_item': 'collections'