fix

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

diff --git a/src/catalogue/views.py b/src/catalogue/views.py
index bca75e7..e027200 100644 (file)
--- a/src/catalogue/views.py
+++ b/src/catalogue/views.py
@@ -3,6 +3,8 @@
 #
 from collections import OrderedDict
 import random
 #
 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


@@ -11,13 +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 django.views.decorators.cache import never_cache
 
 from ajaxable.utils import AjaxableFormView

-from club.models import Membership
+from club.forms import ScheduleForm, DonationStep1Form
+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


@@ -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(),
     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',
     })
 
         'active_menu_item': 'all_works',
     })
 


@@ -60,12 +62,21 @@ def book_list(request, filters=None, template_name='catalogue/book_list.html',
 
 
 def daisy_list(request):
 
 
 def daisy_list(request):

+    if request.EXPERIMENTS['layout'].value:
+        return object_list(request, Book.objects.filter(media__type='daisy'))

     return book_list(request, Q(media__type='daisy'), template_name='catalogue/daisy_list.html')
 
 
 def collection(request, slug):
     coll = get_object_or_404(Collection, slug=slug)
     return book_list(request, Q(media__type='daisy'), template_name='catalogue/daisy_list.html')
 
 
 def collection(request, slug):
     coll = get_object_or_404(Collection, slug=slug)

-    return render(request, 'catalogue/collection.html', {'collection': coll})
+    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',
+    })

 
 
 def differentiate_tags(request, tags, ambiguous_slugs):
 
 
 def differentiate_tags(request, tags, ambiguous_slugs):


@@ -98,6 +109,14 @@ def object_list(request, objects, fragments=None, related_tags=None, tags=None,
             Tag.objects.usage_for_queryset(
                 objects, counts=True
             ).exclude(category='set').exclude(pk__in=tag_ids))
             Tag.objects.usage_for_queryset(
                 objects, counts=True
             ).exclude(category='set').exclude(pk__in=tag_ids))

+        if request.user.is_authenticated:
+            related_tag_lists.append(
+                Tag.objects.usage_for_queryset(
+                    objects, counts=True
+                ).filter(
+                    user=request.user
+                ).exclude(name='').exclude(pk__in=tag_ids)
+            )

     if not (extra and extra.get('theme_is_set')):
         if fragments is None:
             if list_type == 'gallery':
     if not (extra and extra.get('theme_is_set')):
         if fragments is None:
             if list_type == 'gallery':


@@ -112,7 +131,11 @@ def object_list(request, objects, fragments=None, related_tags=None, tags=None,
         if isinstance(objects, QuerySet):
             objects = prefetch_relations(objects, 'author')
 
         if isinstance(objects, QuerySet):
             objects = prefetch_relations(objects, 'author')
 

+    

     categories = split_tags(*related_tag_lists)
     categories = split_tags(*related_tag_lists)

+    suggest = []
+    for c in ['set', 'author', 'epoch', 'kind', 'genre']:
+        suggest.extend(sorted(categories[c], key=lambda t: -t.count)[:3])

 
     objects = list(objects)
 
 
     objects = list(objects)
 


@@ -128,8 +151,10 @@ def object_list(request, objects, fragments=None, related_tags=None, tags=None,
     result = {
         'object_list': objects,
         'categories': categories,
     result = {
         'object_list': objects,
         'categories': categories,

+        'suggest': suggest,

         'list_type': list_type,
         'tags': tags,
         'list_type': list_type,
         'tags': tags,

+        'main_tag': tags[0] if tags else None,

 
         'formats_form': forms.DownloadFormatsForm(),
         'best': best,
 
         'formats_form': forms.DownloadFormatsForm(),
         'best': best,


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

+
+    if request.EXPERIMENTS['layout'].value:
+        has_theme = any(((theme := x).category == 'theme' for x in tags))
+        if has_theme:
+            result['main_tag'] = theme
+            template = 'catalogue/2022/theme_detail.html'
+        else:
+            template = 'catalogue/2022/author_detail.html'
+    else:
+        template = 'catalogue/tagged_object_list.html'
+        

     return render(
     return render(

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

     )
 
 
     )
 
 


@@ -264,9 +299,14 @@ def book_fragments(request, slug, theme_slug):
     fragments = Fragment.tagged.with_all([theme]).filter(
         Q(book=book) | Q(book__ancestor=book))
 
     fragments = Fragment.tagged.with_all([theme]).filter(
         Q(book=book) | Q(book__ancestor=book))
 

+    if request.EXPERIMENTS['layout'].value:
+        template_name = 'catalogue/2022/book_fragments.html'
+    else:
+        template_name = 'catalogue/book_fragments.html'
+    

     return render(
         request,
     return render(
         request,

-        'catalogue/book_fragments.html',
+        template_name,

         {
             'book': book,
             'theme': theme,
         {
             'book': book,
             'theme': theme,


@@ -282,13 +322,21 @@ def book_detail(request, slug):
     except Book.DoesNotExist:
         return pdcounter_views.book_stub_detail(request, slug)
 
     except Book.DoesNotExist:
         return pdcounter_views.book_stub_detail(request, slug)
 

+    new_layout = request.EXPERIMENTS['layout']
+    

     return render(
         request,
     return render(
         request,

-        'catalogue/book_detail.html',
+        'catalogue/2022/book_detail.html' if new_layout.value else 'catalogue/book_detail.html',

         {
             'book': book,
         {
             'book': book,

+            'accessible': book.is_accessible_to(request.user),

             'book_children': book.children.all().order_by('parent_number', 'sort_key'),
             'active_menu_item': 'books',
             '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,
+            'donation_form': DonationStep1Form(),
+
+            'EXPERIMENTS_SWITCHABLE_layout': True,

         })
 
 
         })
 
 


@@ -298,7 +346,7 @@ def player(request, slug):
     if not book.has_media('mp3'):
         raise Http404
 
     if not book.has_media('mp3'):
         raise Http404
 

-    audiobooks, projects = book.get_audiobooks()
+    audiobooks, projects, total_duration = book.get_audiobooks()

 
     return render(
         request,
 
     return render(
         request,


@@ -314,7 +362,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():


@@ -384,21 +432,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
 


@@ -413,7 +461,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)
 


@@ -439,7 +487,12 @@ def tag_catalogue(request, category):
     else:
         best = described_tags
 
     else:
         best = described_tags
 

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

         'tags': tags,
         'best': best,
         'title': constants.CATEGORIES_NAME_PLURAL[category],
         'tags': tags,
         'best': best,
         'title': constants.CATEGORIES_NAME_PLURAL[category],


@@ -449,16 +502,22 @@ def tag_catalogue(request, category):
 
 
 def collections(request):
 
 
 def collections(request):

-    objects = Collection.objects.all()
+    objects = Collection.objects.filter(listed=True)

 
     if len(objects) > 3:
 
     if len(objects) > 3:

-        best = random.sample(list(objects), 3)
+        best = random.sample(list(objects), 4)

     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,
         'objects': objects,
         'best': best,

+        'active_menu_item': 'collections'

     })
 
 
     })