X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/c2e8051452fa55db096553cbe5ae622fc363d481..c65314d0db1d45ec00001b207e633072cb17c156:/src/catalogue/views.py diff --git a/src/catalogue/views.py b/src/catalogue/views.py index b4ac30f86..5a32932a3 100644 --- a/src/catalogue/views.py +++ b/src/catalogue/views.py @@ -3,9 +3,9 @@ # from collections import OrderedDict import random +import re from django.conf import settings -from django.http.response import HttpResponseForbidden from django.template.loader import render_to_string from django.shortcuts import get_object_or_404, render, redirect from django.http import HttpResponse, HttpResponseRedirect, Http404, HttpResponsePermanentRedirect @@ -14,11 +14,13 @@ 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.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 from catalogue import constants @@ -27,16 +29,15 @@ from catalogue.helpers import get_top_level_related_tags from catalogue.models import Book, Collection, Tag, Fragment from catalogue.utils import split_tags from catalogue.models.tag import prefetch_relations -from wolnelektury.utils import is_crawler staff_required = user_passes_test(lambda user: user.is_staff) def catalogue(request): return render(request, 'catalogue/catalogue.html', { - 'books': Book.objects.filter(parent=None), + '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,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): @@ -80,10 +84,13 @@ def differentiate_tags(request, tags, ambiguous_slugs): }) return render( request, - 'catalogue/differentiate_tags.html', {'tags': tags, 'options': options, 'unparsed': ambiguous_slugs[1:]}) + 'catalogue/differentiate_tags.html', + {'tags': tags, 'options': options, 'unparsed': ambiguous_slugs[1:]} + ) -def object_list(request, objects, fragments=None, related_tags=None, tags=None, list_type='books', extra=None): +def object_list(request, objects, fragments=None, related_tags=None, tags=None, + list_type='books', extra=None): if not tags: tags = [] tag_ids = [tag.pk for tag in tags] @@ -93,7 +100,9 @@ def object_list(request, objects, fragments=None, related_tags=None, tags=None, related_tag_lists.append(related_tags) else: related_tag_lists.append( - 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 not (extra and extra.get('theme_is_set')): if fragments is None: if list_type == 'gallery': @@ -101,7 +110,9 @@ def object_list(request, objects, fragments=None, related_tags=None, tags=None, else: fragments = Fragment.objects.filter(book__in=objects) related_tag_lists.append( - Tag.objects.usage_for_queryset(fragments, counts=True).filter(category='theme').exclude(pk__in=tag_ids) + Tag.objects.usage_for_queryset( + fragments, counts=True + ).filter(category='theme').exclude(pk__in=tag_ids) .only('name', 'sort_key', 'category', 'slug')) if isinstance(objects, QuerySet): objects = prefetch_relations(objects, 'author') @@ -131,14 +142,24 @@ 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, ) def literature(request): - books = Book.objects.filter(parent=None) + books = Book.objects.filter(parent=None, findable=True) return object_list(request, books, related_tags=get_top_level_related_tags([])) @@ -147,9 +168,9 @@ def gallery(request): def audiobooks(request): - audiobooks = Book.objects.filter(media__type__in=('mp3', 'ogg')).distinct() + audiobooks = Book.objects.filter(findable=True, media__type__in=('mp3', 'ogg')).distinct() return object_list(request, audiobooks, list_type='audiobooks', extra={ - 'daisy': Book.objects.filter(media__type='daisy').distinct(), + 'daisy': Book.objects.filter(findable=True, media__type='daisy').distinct(), }) @@ -168,8 +189,7 @@ def analyse_tags(request, tag_str): chunks = tag_str.split('/') if len(chunks) == 2 and chunks[0] == 'autor': raise ResponseInstead(pdcounter_views.author_detail(request, chunks[1])) - else: - raise Http404 + raise Http404 except Tag.MultipleObjectsReturned as e: # Ask the user to disambiguate raise ResponseInstead(differentiate_tags(request, e.tags, e.ambiguous_slugs)) @@ -198,6 +218,8 @@ def theme_list(request, tags, list_type): # TODO: Pictures on shelves not supported yet. books = Book.tagged.with_all(shelf_tags).order_by() fragments = fragments.filter(Q(book__in=books) | Q(book__ancestor__in=books)) + elif list_type == 'books': + fragments = fragments.filter(book__findable=True) if not fragments and len(tags) == 1 and list_type == 'books': if PictureArea.tagged.with_any(tags).exists() or Picture.tagged.with_any(tags).exists(): @@ -215,9 +237,6 @@ def tagged_object_list(request, tags, list_type): except ResponseInstead as e: return e.response - if is_crawler(request) and len(tags) > 1: - return HttpResponseForbidden('address removed from crawling. check robots.txt') - if list_type == 'gallery' and any(tag.category == 'set' for tag in tags): raise Http404 @@ -230,19 +249,22 @@ def tagged_object_list(request, tags, list_type): if any(tag.category == 'set' for tag in tags): params = {'objects': books} else: + books = books.filter(findable=True) params = { - 'objects': Book.tagged_top_level(tags), + 'objects': Book.tagged_top_level(tags).filter(findable=True), 'fragments': Fragment.objects.filter(book__in=books), 'related_tags': get_top_level_related_tags(tags), } elif list_type == 'gallery': params = {'objects': Picture.tagged.with_all(tags)} elif list_type == 'audiobooks': - audiobooks = Book.objects.filter(media__type__in=('mp3', 'ogg')).distinct() + audiobooks = Book.objects.filter(findable=True, media__type__in=('mp3', 'ogg')).distinct() params = { 'objects': Book.tagged.with_all(tags, audiobooks), 'extra': { - 'daisy': Book.tagged.with_all(tags, audiobooks.filter(media__type='daisy').distinct()), + 'daisy': Book.tagged.with_all( + tags, audiobooks.filter(media__type='daisy').distinct() + ), } } else: @@ -275,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, }) @@ -291,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, @@ -307,12 +338,19 @@ 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(): raise Http404 - return render(request, 'catalogue/book_text.html', {'book': book}) + with book.html_file.open('r') as f: + book_text = f.read() + + return render(request, 'catalogue/book_text.html', { + 'book': book, + 'book_text': book_text, + 'inserts': DynamicTextInsert.get_all(request) + }) # ========= @@ -334,11 +372,13 @@ def import_book(request): exception = pprint.pformat(info[1]) tb = '\n'.join(traceback.format_tb(info[2])) return HttpResponse( - _("An error occurred: %(exception)s\n\n%(tb)s") % {'exception': exception, 'tb': tb}, - mimetype='text/plain') + _("An error occurred: %(exception)s\n\n%(tb)s") % { + 'exception': exception, 'tb': tb + }, + content_type='text/plain' + ) return HttpResponse(_("Book imported successfully")) - else: - return HttpResponse(_("Error importing file: %r") % book_import_form.errors) + return HttpResponse(_("Error importing file: %r") % book_import_form.errors) # info views for API @@ -368,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='/?=')) @@ -381,8 +421,8 @@ def download_zip(request, format, slug=None): 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 @@ -397,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) @@ -433,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' })