X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/0e5d704f09ed528815a097b6066acf4ebaea0f08..0c502550a4f04aa016df8729af2ae2f85c0b495a:/src/catalogue/views.py?ds=inline

diff --git a/src/catalogue/views.py b/src/catalogue/views.py
index aeed403ab..c63aa7a9e 100644
--- a/src/catalogue/views.py
+++ b/src/catalogue/views.py
@@ -3,6 +3,7 @@
 #
 from collections import OrderedDict
 import random
+import re
 
 from django.conf import settings
 from django.template.loader import render_to_string
@@ -17,7 +18,8 @@ from django.utils.translation import ugettext as _, ugettext_lazy
 from django.views.decorators.cache import never_cache
 
 from ajaxable.utils import AjaxableFormView
-from club.models import Membership
+from club.forms import ScheduleForm
+from club.models import Club
 from annoy.models import DynamicTextInsert
 from pdcounter import views as pdcounter_views
 from picture.models import Picture, PictureArea
@@ -35,7 +37,7 @@ def catalogue(request):
     return render(request, 'catalogue/catalogue.html', {
         'books': Book.objects.filter(findable=True, parent=None),
         'pictures': Picture.objects.all(),
-        'collections': Collection.objects.all(),
+        'collections': Collection.objects.filter(listed=True),
         'active_menu_item': 'all_works',
     })
 
@@ -65,7 +67,10 @@ def daisy_list(request):
 
 def collection(request, slug):
     coll = get_object_or_404(Collection, slug=slug)
-    return render(request, 'catalogue/collection.html', {'collection': coll})
+    return render(request, 'catalogue/collection.html', {
+        'collection': coll,
+        'active_menu_item': 'collections',
+    })
 
 
 def differentiate_tags(request, tags, ambiguous_slugs):
@@ -137,9 +142,19 @@ def object_list(request, objects, fragments=None, related_tags=None, tags=None,
     }
     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(
-        request,
-        'catalogue/tagged_object_list.html', result,
+        request, template, result,
     )
 
 
@@ -282,13 +297,22 @@ def book_detail(request, slug):
     except Book.DoesNotExist:
         return pdcounter_views.book_stub_detail(request, slug)
 
+    new_layout = request.EXPERIMENTS['layout']
+    # Not for preview books.
+    if new_layout.value and not book.is_accessible_to(request.user):
+        new_layout.override(None)
+    
     return render(
         request,
-        'catalogue/book_detail.html',
+        'catalogue/2022/book_detail.html' if new_layout.value else 'catalogue/book_detail.html',
         {
             'book': book,
             'book_children': book.children.all().order_by('parent_number', 'sort_key'),
             'active_menu_item': 'books',
+            'club_form': ScheduleForm() if book.preview else None,
+            'club': Club.objects.first() if book.preview else None,
+
+            'EXPERIMENTS_SWITCHABLE_layout': True,
         })
 
 
@@ -298,7 +322,7 @@ def player(request, slug):
     if not book.has_media('mp3'):
         raise Http404
 
-    audiobooks, projects = book.get_audiobooks()
+    audiobooks, projects, total_duration = book.get_audiobooks()
 
     return render(
         request,
@@ -314,7 +338,7 @@ def player(request, 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():
@@ -351,7 +375,7 @@ def import_book(request):
                 _("An error occurred: %(exception)s\n\n%(tb)s") % {
                     'exception': exception, 'tb': tb
                 },
-                mimetype='text/plain'
+                content_type='text/plain'
             )
         return HttpResponse(_("Book imported successfully"))
     return HttpResponse(_("Error importing file: %r") % book_import_form.errors)
@@ -413,7 +437,7 @@ class CustomPDFFormView(AjaxableFormView):
 
     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)
 
@@ -449,16 +473,17 @@ def tag_catalogue(request, category):
 
 
 def collections(request):
-    objects = Collection.objects.all()
+    objects = Collection.objects.filter(listed=True)
 
     if len(objects) > 3:
-        best = random.sample(list(objects), 3)
+        best = random.sample(list(objects), 4)
     else:
         best = objects
 
     return render(request, 'catalogue/collections.html', {
         'objects': objects,
         'best': best,
+        'active_menu_item': 'collections'
     })