X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/a9226097c8eea0591fd3249f62a71becc6d2be93..ca8f4e8fef80cb603117ed579da8554f503698e5:/src/catalogue/views.py?ds=inline diff --git a/src/catalogue/views.py b/src/catalogue/views.py index d93ae3553..3c4a55fe9 100644 --- a/src/catalogue/views.py +++ b/src/catalogue/views.py @@ -1,5 +1,5 @@ -# This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later. -# Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information. +# This file is part of Wolne Lektury, licensed under GNU Affero GPLv3 or later. +# Copyright © Fundacja Wolne Lektury. See NOTICE for more information. # from collections import OrderedDict import random @@ -14,16 +14,15 @@ 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 import translation -from django.utils.translation import gettext as _, gettext_lazy +from django.utils.translation import gettext_lazy from django.views.decorators.cache import never_cache from django.views.generic import TemplateView from ajaxable.utils import AjaxableFormView -from club.forms import ScheduleForm, DonationStep1Form +from club.forms import 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 wolnelektury.utils import is_ajax from catalogue import constants from catalogue import forms @@ -39,46 +38,19 @@ staff_required = user_passes_test(lambda user: user.is_staff) def catalogue(request): return render(request, 'catalogue/catalogue.html', { 'books': Book.objects.filter(findable=True, parent=None), - 'pictures': Picture.objects.all(), 'collections': Collection.objects.filter(listed=True), - 'active_menu_item': 'all_works', - }) - - -def book_list(request, filters=None, template_name='catalogue/book_list.html', - nav_template_name='catalogue/snippets/book_list_nav.html', - list_template_name='catalogue/snippets/book_list.html'): - """ generates a listing of all books, optionally filtered """ - books_by_author, orphans, books_by_parent = Book.book_list(filters) - books_nav = OrderedDict() - for tag in books_by_author: - if books_by_author[tag]: - books_nav.setdefault(tag.sort_key[0], []).append(tag) - return render(request, template_name, { - 'rendered_nav': render_to_string(nav_template_name, {'books_nav': books_nav}), - 'rendered_book_list': render_to_string(list_template_name, { - 'books_by_author': books_by_author, - 'orphans': orphans, - 'books_by_parent': books_by_parent, - }) }) 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') + return object_list(request, Book.objects.filter(media__type='daisy')) def collection(request, slug): coll = get_object_or_404(Collection, slug=slug) - if request.EXPERIMENTS['layout'].value: - template_name = 'catalogue/2022/collection.html' - else: - template_name = 'catalogue/collection.html' + template_name = 'catalogue/collection.html' return render(request, template_name, { 'collection': coll, - 'active_menu_item': 'collections', }) @@ -183,16 +155,16 @@ class ObjectListView(TemplateView): class BookList(ObjectListView): - title = gettext_lazy('Literature') + title = gettext_lazy('Literatura') list_type = 'books' - template_name = 'catalogue/2022/book_list.html' - dynamic_template_name = 'catalogue/2022/dynamic_book_list.html' - themed_template_name = 'catalogue/2022/themed_book_list.html' - dynamic_themed_template_name = 'catalogue/2022/dynamic_themed_book_list.html' + template_name = 'catalogue/book_list.html' + dynamic_template_name = 'catalogue/dynamic_book_list.html' + themed_template_name = 'catalogue/themed_book_list.html' + dynamic_themed_template_name = 'catalogue/dynamic_themed_book_list.html' orderings = { - 'pop': ('-popularity__count', 'najpopularniejsze'), - 'alpha': (None, 'alfabetycznie'), + 'pop': ('-popularity__count', gettext_lazy('najpopularniejsze')), + 'alpha': (None, gettext_lazy('alfabetycznie')), } default_ordering = 'alpha' @@ -219,22 +191,6 @@ class BookList(ObjectListView): return qs -class ArtList(ObjectListView): - template_name = 'catalogue/2022/book_list.html' - dynamic_template_name = 'catalogue/2022/dynamic_book_list.html' - title = gettext_lazy('Art') - list_type = 'gallery' - - def get_queryset(self): - return Picture.objects.all() - - def search(self, qs): - term = self.request.GET.get('search') - if term: - qs = qs.filter(Q(title__icontains=term) | Q(tag_relations__tag__name_pl__icontains=term)).distinct() - return qs - - class LiteratureView(BookList): def get_suggested_tags(self, queryset): tags = list(get_top_level_related_tags([])) @@ -245,21 +201,13 @@ class LiteratureView(BookList): class AudiobooksView(LiteratureView): - title = gettext_lazy('Audiobooks') + title = gettext_lazy('Audiobooki') list_type = 'audiobooks' def get_queryset(self): return Book.objects.filter(findable=True, media__type='mp3').distinct() -class GalleryView(ArtList): - def get_suggested_tags(self, queryset): - return Tag.objects.usage_for_queryset( - queryset, - counts=True - ).exclude(pk__in=[t.id for t in self.ctx['tags']]).order_by('-count') - - class TaggedObjectList(BookList): def analyse(self): super().analyse() @@ -277,6 +225,8 @@ class TaggedObjectList(BookList): t for t in self.ctx['tags'] if t is not self.ctx['main_tag'] ] + if len(self.ctx['tags']) == 1 and self.ctx['main_tag'].category == 'author': + self.ctx['translation_list'] = self.ctx['main_tag'].book_set.all() def get_queryset(self): qs = Book.tagged.with_all(self.ctx['work_tags']).filter(findable=True) @@ -335,42 +285,30 @@ class TaggedObjectList(BookList): -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] - +def object_list(request, objects, list_type='books'): related_tag_lists = [] - if related_tags: - related_tag_lists.append(related_tags) - else: + if True: related_tag_lists.append( Tag.objects.usage_for_queryset( objects, counts=True - ).exclude(category='set').exclude(pk__in=tag_ids)) + ).exclude(category='set')) 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) + ).exclude(name='') ) - if not (extra and extra.get('theme_is_set')): - if fragments is None: - if list_type == 'gallery': - fragments = PictureArea.objects.filter(picture__in=objects) - else: - fragments = Fragment.objects.filter(book__in=objects) + if True: + 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) + ).filter(category='theme') .only('name', 'sort_key', 'category', 'slug')) if isinstance(objects, QuerySet): objects = prefetch_relations(objects, 'author') - categories = split_tags(*related_tag_lists) suggest = [] @@ -379,67 +317,19 @@ def object_list(request, objects, fragments=None, related_tags=None, tags=None, objects = list(objects) - if not objects and len(tags) == 1 and list_type == 'books': - if PictureArea.tagged.with_any(tags).exists() or Picture.tagged.with_any(tags).exists(): - return redirect('tagged_object_list_gallery', '/'.join(tag.url_chunk for tag in tags)) - - if len(objects) > 3: - best = random.sample(objects, 3) - else: - best = objects - result = { 'object_list': objects, - 'categories': categories, 'suggest': suggest, 'list_type': list_type, - 'tags': tags, - 'main_tag': tags[0] if tags else None, - - 'formats_form': forms.DownloadFormatsForm(), - 'best': best, - 'active_menu_item': list_type, } - 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' + + template = 'catalogue/author_detail.html' return render( request, template, result, ) -def literature(request): - if request.EXPERIMENTS['layout'].value: - return LiteratureView.as_view()(request) - books = Book.objects.filter(parent=None, findable=True) - return object_list(request, books, related_tags=get_top_level_related_tags([])) - - -def gallery(request): - if request.EXPERIMENTS['layout'].value: - return GalleryView.as_view()(request) - return object_list(request, Picture.objects.all(), list_type='gallery') - - -def audiobooks(request): - if request.EXPERIMENTS['layout'].value: - return AudiobooksView.as_view()(request) - 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(findable=True, media__type='daisy').distinct(), - }) - - class ResponseInstead(Exception): def __init__(self, response): super(ResponseInstead, self).__init__() @@ -474,74 +364,8 @@ def analyse_tags(request, tag_str): return tags -def theme_list(request, tags, list_type): - shelf_tags = [tag for tag in tags if tag.category == 'set'] - fragment_tags = [tag for tag in tags if tag.category != 'set'] - if list_type == 'gallery': - fragments = PictureArea.tagged.with_all(fragment_tags) - else: - fragments = Fragment.tagged.with_all(fragment_tags) - - if shelf_tags: - # 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(): - return redirect('tagged_object_list_gallery', '/'.join(tag.url_chunk for tag in tags)) - - return object_list(request, fragments, tags=tags, list_type=list_type, extra={ - 'theme_is_set': True, - 'active_menu_item': 'theme', - }) - - def tagged_object_list(request, tags, list_type): - if request.EXPERIMENTS['layout'].value and list_type in ('books', 'audiobooks'): - return TaggedObjectList.as_view()(request, tags=tags) - - try: - tags = analyse_tags(request, tags) - except ResponseInstead as e: - return e.response - - if list_type == 'gallery' and any(tag.category == 'set' for tag in tags): - raise Http404 - - if any(tag.category in ('theme', 'thing') for tag in tags): - return theme_list(request, tags, list_type=list_type) - - if list_type == 'books': - books = Book.tagged.with_all(tags) - - 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).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(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() - ), - } - } - else: - raise Http404 - - return object_list(request, tags=tags, list_type=list_type, **params) + return TaggedObjectList.as_view()(request, tags=tags) def book_fragments(request, slug, theme_slug): @@ -550,11 +374,7 @@ def book_fragments(request, slug, theme_slug): 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' - + template_name = 'catalogue/book_fragments.html' return render( request, template_name, @@ -562,7 +382,6 @@ def book_fragments(request, slug, theme_slug): 'book': book, 'theme': theme, 'fragments': fragments, - 'active_menu_item': 'books', }) @@ -573,41 +392,18 @@ 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/2022/book_detail.html' if new_layout.value else 'catalogue/book_detail.html', + '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(), }) -# używane w publicznym interfejsie -def player(request, slug): - book = get_object_or_404(Book, slug=slug) - if not book.has_media('mp3'): - raise Http404 - - audiobooks, projects, total_duration = book.get_audiobooks() - - return render( - request, - 'catalogue/player.html', - { - 'book': book, - 'audiobook': '', - 'audiobooks': audiobooks, - 'projects': projects, - }) - - def book_text(request, slug): book = get_object_or_404(Book, slug=slug) @@ -621,8 +417,12 @@ def book_text(request, slug): return render(request, 'catalogue/book_text.html', { 'book': book, + 'extra_info': book.get_extra_info_json(), 'book_text': book_text, - 'inserts': DynamicTextInsert.get_all(request) + 'inserts': DynamicTextInsert.get_all(request), + + 'club': Club.objects.first(), + 'donation_form': DonationStep1Form(), }) @@ -645,13 +445,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") % { + "Błąd: %(exception)s\n\n%(tb)s" % { 'exception': exception, 'tb': tb }, content_type='text/plain' ) - return HttpResponse(_("Book imported successfully")) - return HttpResponse(_("Error importing file: %r") % book_import_form.errors) + return HttpResponse("Książka zaimportowana") + return HttpResponse("Błąd podczas importowania pliku: %r" % book_import_form.errors) # info views for API @@ -694,8 +494,8 @@ def download_zip(request, file_format=None, media_format=None, slug=None): class CustomPDFFormView(AjaxableFormView): form_class = forms.CustomPDFForm - title = gettext_lazy('Download custom PDF') - submit = gettext_lazy('Download') + title = gettext_lazy('Stwórz własny PDF') + submit = gettext_lazy('Pobierz') template = 'catalogue/custom_pdf_form.html' honeypot = True @@ -736,17 +536,12 @@ def tag_catalogue(request, category): else: best = described_tags - if request.EXPERIMENTS['layout'].value: - template_name = 'catalogue/2022/tag_catalogue.html' - else: - template_name = 'catalogue/tag_catalogue.html' - + template_name = 'catalogue/tag_catalogue.html' return render(request, template_name, { 'tags': tags, 'best': best, 'title': constants.CATEGORIES_NAME_PLURAL[category], 'whole_category': constants.WHOLE_CATEGORY[category], - 'active_menu_item': 'theme' if category == 'theme' else None, }) @@ -758,15 +553,10 @@ def collections(request): else: best = objects - if request.EXPERIMENTS['layout'].value: - template_name = 'catalogue/2022/collections.html' - else: - template_name = 'catalogue/collections.html' - + template_name = 'catalogue/collections.html' return render(request, template_name, { 'objects': objects, 'best': best, - 'active_menu_item': 'collections' })