X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/592c9401b18118e01de250d44878b9289b138f9c..a3b153ea6e30da275edf3e34b8d2f8ca1bb436cc:/src/catalogue/views.py

diff --git a/src/catalogue/views.py b/src/catalogue/views.py
index 6edbbd6a4..817b3ada5 100644
--- a/src/catalogue/views.py
+++ b/src/catalogue/views.py
@@ -4,6 +4,7 @@
 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
@@ -12,21 +13,23 @@ 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 django.views.generic import TemplateView
 
 from ajaxable.utils import AjaxableFormView
-from club.forms import ScheduleForm
+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
 from catalogue.helpers import get_top_level_related_tags
 from catalogue.models import Book, Collection, Tag, Fragment
+from catalogue.models.tag import TagRelation
 from catalogue.utils import split_tags
 from catalogue.models.tag import prefetch_relations
 
@@ -42,32 +45,14 @@ 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):
-    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)
-    return render(request, 'catalogue/collection.html', {
+    template_name = 'catalogue/2022/collection.html'
+    return render(request, template_name, {
         'collection': coll,
         'active_menu_item': 'collections',
     })
@@ -89,6 +74,243 @@ def differentiate_tags(request, tags, ambiguous_slugs):
     )
 
 
+from django.db.models import FilteredRelation, Q
+from django.views.decorators.cache import cache_control
+from django.views.decorators.vary import vary_on_headers
+from django.utils.decorators import method_decorator
+
+
+@method_decorator([
+    vary_on_headers('X-Requested-With'),
+    cache_control(max_age=1),
+], 'dispatch')
+class ObjectListView(TemplateView):
+    page_size = 100
+    themed_page_size = 10
+    item_template_name = ''
+    orderings = {}
+    default_ordering = None
+
+    def analyse(self):
+        self.is_themed = False
+        self.ctx = ctx = {}
+        ctx['tags'] = []        
+
+    def dispatch(self, *args, **kwargs):
+        try:
+            self.analyse()
+        except ResponseInstead as e:
+            return e.response
+        return super().dispatch(*args, **kwargs)
+        
+    def get_orderings(self):
+        order = self.get_order()
+        return [
+            {
+                "slug": k,
+                "name": v[1],
+                "active": k == order,
+                "default": v[0] is None,
+            }
+            for k, v in self.orderings.items()
+        ]
+
+    def get_order(self):
+        order = self.request.GET.get('order')
+        if order not in self.orderings:
+            order = self.default_ordering
+        return order
+
+    def order(self, qs):
+        order_tag = self.get_order()
+        if order_tag:
+            order = self.orderings[order_tag]
+            order_by = order[0]
+            if order_by:
+                qs = qs.order_by(order_by)
+        return qs
+
+    def search(self, qs):
+        return qs
+
+    def get_template_names(self):
+        if is_ajax(self.request) or self.request.GET.get('dyn'):
+            if self.is_themed:
+                return self.dynamic_themed_template_name
+            else:
+                return self.dynamic_template_name
+        else:
+            if self.is_themed:
+                return self.themed_template_name
+            else:
+                return self.template_name
+
+    def get_context_data(self, **kwargs):
+        ctx = super().get_context_data()
+        ctx.update(self.ctx)
+        qs = self.get_queryset()
+        qs = self.search(qs)
+        qs = self.order(qs)
+
+        ctx['object_list'] = qs
+        ctx['suggested_tags'] = self.get_suggested_tags(qs)
+        ctx['suggested_tags_by_category'] = split_tags(ctx['suggested_tags'])
+        return ctx
+
+
+class BookList(ObjectListView):
+    title = gettext_lazy('Literature')
+    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'
+
+    orderings = {
+        'pop': ('-popularity__count', 'najpopularniejsze'),
+        'alpha': (None, 'alfabetycznie'),
+    }
+    default_ordering = 'alpha'
+
+    def get_queryset(self):
+        return Book.objects.filter(parent=None, findable=True)
+
+    def search(self, qs):
+        term = self.request.GET.get('search')
+        if term:
+            meta_rels = TagRelation.objects.filter(tag__category='author')
+            # TODO: search tags in currently displaying language
+            if self.is_themed:
+                rels = meta_rels.filter(tag__name_pl__icontains=term)
+                qs = qs.filter(
+                    Q(book__title__icontains=term) |
+                    Q(tag_relations__in=rels) |
+                    Q(text__icontains=term)
+                ).distinct()
+            else:
+                qs = qs.annotate(
+                    meta=FilteredRelation('tag_relations', condition=Q(tag_relations__in=meta_rels))
+                )
+                qs = qs.filter(Q(title__icontains=term) | Q(meta__tag__name_pl__icontains=term)).distinct()
+        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([]))
+        tags.sort(key=lambda t: -t.count)
+        if self.request.user.is_authenticated:
+            tags.extend(list(Tag.objects.filter(user=self.request.user).exclude(name='')))
+        return tags
+
+
+class AudiobooksView(LiteratureView):
+    title = gettext_lazy('Audiobooks')
+    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()
+        self.ctx['tags'] = analyse_tags(self.request, self.kwargs['tags'])
+        self.ctx['fragment_tags'] = [t for t in self.ctx['tags'] if t.category in ('theme', 'object')]
+        self.ctx['work_tags'] = [t for t in self.ctx['tags'] if t not in self.ctx['fragment_tags']]
+        self.is_themed = self.ctx['has_theme'] = bool(self.ctx['fragment_tags'])
+        if self.is_themed:
+            self.ctx['main_tag'] = self.ctx['fragment_tags'][0]
+        elif self.ctx['tags']:
+            self.ctx['main_tag'] = self.ctx['tags'][0]
+        else:
+            self.ctx['main_tag'] = None
+        self.ctx['filtering_tags'] = [
+            t for t in self.ctx['tags']
+            if t is not self.ctx['main_tag']
+        ]
+
+    def get_queryset(self):
+        qs = Book.tagged.with_all(self.ctx['work_tags']).filter(findable=True)
+        qs = qs.exclude(ancestor__in=qs)
+        if self.is_themed:
+            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']]
+        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(
+                    Tag.objects.usage_for_queryset(
+                        qs
+                    ).filter(
+                        user=self.request.user
+                    ).exclude(name='').exclude(pk__in=tag_ids)
+                ))
+
+            fragments = Fragment.objects.filter(
+                Q(book__in=queryset) | Q(book__ancestor__in=queryset)
+            )
+            related_tags.extend(
+                Tag.objects.usage_for_queryset(
+                    fragments, counts=True
+                ).filter(category__in=('theme', 'object')).exclude(pk__in=tag_ids)
+            .only('name', 'sort_key', 'category', 'slug'))
+
+        return related_tags
+
+    
+    
 def object_list(request, objects, fragments=None, related_tags=None, tags=None,
                 list_type='books', extra=None):
     if not tags:
@@ -103,6 +325,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))
+        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':
@@ -117,7 +347,11 @@ def object_list(request, objects, fragments=None, related_tags=None, tags=None,
         if isinstance(objects, QuerySet):
             objects = prefetch_relations(objects, 'author')
 
+    
     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))
 
     objects = list(objects)
 
@@ -133,8 +367,10 @@ 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,
+        'main_tag': tags[0] if tags else None,
 
         'formats_form': forms.DownloadFormatsForm(),
         'best': best,
@@ -143,34 +379,18 @@ 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'
-    new_layout = request.EXPERIMENTS['layout']
-    if is_author and new_layout.value:
-        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/2022/theme_detail.html'
     else:
-        template = 'catalogue/tagged_object_list.html'
+        template = 'catalogue/2022/author_detail.html'
         
     return render(
         request, template, result,
     )
 
 
-def literature(request):
-    books = Book.objects.filter(parent=None, findable=True)
-    return object_list(request, books, related_tags=get_top_level_related_tags([]))
-
-
-def gallery(request):
-    return object_list(request, Picture.objects.all(), list_type='gallery')
-
-
-def audiobooks(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__()
@@ -194,6 +414,8 @@ def analyse_tags(request, tag_str):
         raise ResponseInstead(HttpResponsePermanentRedirect(
             reverse('tagged_object_list', args=['/'.join(tag.url_chunk for tag in e.tags)])))
 
+    if not tags:
+        raise Http404
     try:
         if len(tags) > settings.MAX_TAG_LIST:
             raise Http404
@@ -229,6 +451,9 @@ def theme_list(request, tags, list_type):
 
 
 def tagged_object_list(request, tags, list_type):
+    if list_type in ('books', 'audiobooks'):
+        return TaggedObjectList.as_view()(request, tags=tags)
+
     try:
         tags = analyse_tags(request, tags)
     except ResponseInstead as e:
@@ -276,9 +501,10 @@ def book_fragments(request, slug, theme_slug):
     fragments = Fragment.tagged.with_all([theme]).filter(
         Q(book=book) | Q(book__ancestor=book))
 
+    template_name = 'catalogue/2022/book_fragments.html'
     return render(
         request,
-        'catalogue/book_fragments.html',
+        template_name,
         {
             'book': book,
             'theme': theme,
@@ -294,41 +520,16 @@ 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/2022/book_detail.html' if new_layout.value else 'catalogue/book_detail.html',
+        'catalogue/2022/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,
-
-            '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,
+            'donation_form': DonationStep1Form(),
         })
 
 
@@ -405,21 +606,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
 
@@ -460,7 +661,8 @@ def tag_catalogue(request, category):
     else:
         best = described_tags
 
-    return render(request, 'catalogue/tag_catalogue.html', {
+    template_name = 'catalogue/2022/tag_catalogue.html'
+    return render(request, template_name, {
         'tags': tags,
         'best': best,
         'title': constants.CATEGORIES_NAME_PLURAL[category],
@@ -477,7 +679,8 @@ def collections(request):
     else:
         best = objects
 
-    return render(request, 'catalogue/collections.html', {
+    template_name = 'catalogue/2022/collections.html'
+    return render(request, template_name, {
         'objects': objects,
         'best': best,
         'active_menu_item': 'collections'