X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/eaba19e725b49fdf4efc858604a7b9d70d27f59f..1959361810afbb5f1de88b7d717da32979c7235d:/src/catalogue/views.py?ds=sidebyside

diff --git a/src/catalogue/views.py b/src/catalogue/views.py
index d563b68a6..af4d1e3b5 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,12 +14,12 @@ 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
@@ -45,37 +45,13 @@ def catalogue(request):
     })
 
 
-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 +159,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'
 
@@ -202,15 +178,13 @@ class BookList(ObjectListView):
     def search(self, qs):
         term = self.request.GET.get('search')
         if term:
-            meta_rels = TagRelation.objects.exclude(tag__category='set')
+            meta_rels = TagRelation.objects.filter(tag__category='author')
             # TODO: search tags in currently displaying language
             if self.is_themed:
-                #qs = qs.annotate(
-                #    meta=FilteredRelation('book__tag_relations', condition=Q(tag_relations__in=meta_rels))
-                #)
+                rels = meta_rels.filter(tag__name_pl__icontains=term)
                 qs = qs.filter(
                     Q(book__title__icontains=term) |
-                    #Q(meta__tag_relations__tag__name_pl__icontains=term) |
+                    Q(tag_relations__in=rels) |
                     Q(text__icontains=term)
                 ).distinct()
             else:
@@ -222,9 +196,9 @@ class BookList(ObjectListView):
 
 
 class ArtList(ObjectListView):
-    template_name = 'catalogue/2022/book_list.html'
-    dynamic_template_name = 'catalogue/2022/dynamic_book_list.html'
-    title = gettext_lazy('Art')
+    template_name = 'catalogue/book_list.html'
+    dynamic_template_name = 'catalogue/dynamic_book_list.html'
+    title = gettext_lazy('Sztuka')
     list_type = 'gallery'
 
     def get_queryset(self):
@@ -247,7 +221,7 @@ class LiteratureView(BookList):
 
 
 class AudiobooksView(LiteratureView):
-    title = gettext_lazy('Audiobooks')
+    title = gettext_lazy('Audiobooki')
     list_type = 'audiobooks'
 
     def get_queryset(self):
@@ -284,15 +258,36 @@ class TaggedObjectList(BookList):
         qs = Book.tagged.with_all(self.ctx['work_tags']).filter(findable=True)
         qs = qs.exclude(ancestor__in=qs)
         if self.is_themed:
-            qs = Fragment.tagged.with_all(self.ctx['fragment_tags']).filter(
-                Q(book__in=qs) | Q(book__ancestor__in=qs)
-            )
+            fqs = Fragment.tagged.with_all(self.ctx['fragment_tags'])
+            if self.ctx['work_tags']:
+                fqs = fqs.filter(
+                    Q(book__in=qs) | Q(book__ancestor__in=qs)
+                )
+            qs = fqs
         return qs
 
     def get_suggested_tags(self, queryset):
         tag_ids = [t.id for t in self.ctx['tags']]
-        related_tags = list(get_top_level_related_tags(self.ctx['tags']))
-        if not self.is_themed:
+        if self.is_themed:
+            related_tags = []
+            current_books = self.get_queryset().values_list('book', flat=True).distinct()
+            containing_books = Book.objects.filter(Q(id__in=current_books) | Q(children__in=current_books))
+
+            related_tags.extend(list(
+                Tag.objects.usage_for_queryset(
+                    containing_books,
+                ).exclude(category='set').exclude(pk__in=tag_ids)
+            ))
+            if self.request.user.is_authenticated:
+                related_tags.extend(list(
+                    Tag.objects.usage_for_queryset(
+                        containing_books
+                    ).filter(
+                        user=self.request.user
+                    ).exclude(name='').exclude(pk__in=tag_ids)
+                ))
+        else:
+            related_tags = list(get_top_level_related_tags(self.ctx['tags']))
             if self.request.user.is_authenticated:
                 qs = Book.tagged.with_all(self.ctx['tags']).filter(findable=True)
                 related_tags.extend(list(
@@ -384,43 +379,18 @@ def object_list(request, objects, fragments=None, related_tags=None, tags=None,
     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'
+    has_theme = any(((theme := x).category == 'theme' for x in tags))
+    if has_theme:
+        result['main_tag'] = theme
+        template = 'catalogue/theme_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__()
@@ -481,7 +451,7 @@ def theme_list(request, tags, list_type):
 
 
 def tagged_object_list(request, tags, list_type):
-    if request.EXPERIMENTS['layout'].value and list_type in ('books', 'audiobooks'):
+    if list_type in ('books', 'audiobooks'):
         return TaggedObjectList.as_view()(request, tags=tags)
 
     try:
@@ -531,11 +501,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,
@@ -554,40 +520,16 @@ 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(),
-
-            'EXPERIMENTS_SWITCHABLE_layout': True,
-        })
-
-
-# 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,
         })
 
 
@@ -604,6 +546,7 @@ 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)
     })
@@ -628,13 +571,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
@@ -677,8 +620,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
 
@@ -719,11 +662,7 @@ 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,
@@ -741,11 +680,7 @@ 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,