X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/ecf6c60ce9eb3a07f3b0dd1403f7c69db135fcc9..5bd864493e531e5600c5ca989825d89cc3ee1487:/src/catalogue/views.py?ds=inline diff --git a/src/catalogue/views.py b/src/catalogue/views.py index 398c61cc4..8c66af717 100644 --- a/src/catalogue/views.py +++ b/src/catalogue/views.py @@ -3,6 +3,8 @@ # 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 @@ -11,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.utils.http import urlquote_plus 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 club.models import Club, 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 @@ -36,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', }) @@ -66,7 +67,14 @@ def daisy_list(request): 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): @@ -114,6 +122,10 @@ def object_list(request, objects, fragments=None, related_tags=None, tags=None, objects = prefetch_relations(objects, 'author') categories = split_tags(*related_tag_lists) + suggest = [] + for c in ['author', 'epoch', 'kind', 'genre']: + if len(categories.get(c, [])) > 1: + suggest.extend(categories[c][:4]) objects = list(objects) @@ -129,6 +141,7 @@ def object_list(request, objects, fragments=None, related_tags=None, tags=None, result = { 'object_list': objects, 'categories': categories, + 'suggest': suggest, 'list_type': list_type, 'tags': tags, @@ -138,9 +151,22 @@ def object_list(request, objects, fragments=None, related_tags=None, tags=None, } if extra: result.update(extra) + + 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_set and new_layout.value: + template = 'catalogue/2022/set_detail.html' + elif is_theme and new_layout.value: + template = 'catalogue/2022/theme_detail.html' + elif new_layout.value: + template = 'catalogue/2022/author_detail.html' + else: + template = 'catalogue/tagged_object_list.html' + return render( - request, - 'catalogue/tagged_object_list.html', result, + request, template, result, ) @@ -283,15 +309,21 @@ def book_detail(request, slug): except Book.DoesNotExist: return pdcounter_views.book_stub_detail(request, slug) + new_layout = request.EXPERIMENTS['layout'] + return render( request, - 'catalogue/book_detail.html', + 'catalogue/2022/book_detail.html' if new_layout.value else 'catalogue/book_detail.html', { 'book': book, + 'accessible': book.is_accessible_to(request.user), '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, }) @@ -301,7 +333,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, @@ -317,7 +349,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(): @@ -387,21 +419,21 @@ 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='/?=')) + return HttpResponseRedirect(quote_plus(settings.MEDIA_URL + url, safe='/?=')) 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 @@ -416,7 +448,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) @@ -452,16 +484,22 @@ 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', { + 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' })