Cover info in audiobooks zip.

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

diff --git a/src/catalogue/views.py b/src/catalogue/views.py
index 5a32932..2955a5c 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,7 +13,6 @@ 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.translation import gettext as _, gettext_lazy
 from django.views.decorators.cache import never_cache
 from django.utils import translation
 from django.utils.translation import gettext as _, gettext_lazy
 from django.views.decorators.cache import never_cache


@@ -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',
     })


@@ -144,10 +148,13 @@ def object_list(request, objects, fragments=None, related_tags=None, tags=None,
         result.update(extra)
 
     is_author = len(tags) == 1 and tags[0].category == 'author'
         result.update(extra)
 
     is_author = len(tags) == 1 and tags[0].category == 'author'

+    is_set = len(tags) == 1 and tags[0].category == 'set'

     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'
     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_set and new_layout.value:
+        template = 'catalogue/2022/set_detail.html'

     elif is_theme and new_layout.value:
         template = 'catalogue/2022/theme_detail.html'
     else:
     elif is_theme and new_layout.value:
         template = 'catalogue/2022/theme_detail.html'
     else:


@@ -416,7 +423,7 @@ def download_zip(request, file_format=None, media_format=None, slug=None):
         url = book.zip_audiobooks(media_format)
     else:
         raise Http404('No format specified for zip package')
         url = book.zip_audiobooks(media_format)
     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):
 
 
 class CustomPDFFormView(AjaxableFormView):


@@ -480,7 +487,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'