Upgrades and removals.

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

diff --git a/src/catalogue/views.py b/src/catalogue/views.py
index 38c6165..816836d 100644 (file)
--- 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
@@ -18,7 +19,7 @@ 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
@@ -141,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,
     )
 
 
@@ -286,15 +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,
         })
 
 
@@ -304,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,
@@ -320,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():
@@ -390,12 +408,12 @@ def embargo_link(request, key, format_, slug):
     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)
-        url = book.zip_audiobooks(format)
+        url = book.zip_audiobooks(media_format)
     else:
         raise Http404('No format specified for zip package')
     return HttpResponseRedirect(urlquote_plus(settings.MEDIA_URL + url, safe='/?='))
@@ -419,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)