Search.

[wolnelektury.git] / src / catalogue / views.py

diff --git a/src/catalogue/views.py b/src/catalogue/views.py
index d1fc0c9..b4e5920 100644 (file)
--- a/src/catalogue/views.py
+++ b/src/catalogue/views.py
@@ -62,6 +62,8 @@ def book_list(request, filters=None, template_name='catalogue/book_list.html',
 
 
 def daisy_list(request):
 
 
 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 book_list(request, Q(media__type='daisy'), template_name='catalogue/daisy_list.html')
 
 


@@ -107,6 +109,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))
             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':
     if not (extra and extra.get('theme_is_set')):
         if fragments is None:
             if list_type == 'gallery':


@@ -121,7 +131,11 @@ def object_list(request, objects, fragments=None, related_tags=None, tags=None,
         if isinstance(objects, QuerySet):
             objects = prefetch_relations(objects, 'author')
 
         if isinstance(objects, QuerySet):
             objects = prefetch_relations(objects, 'author')
 

+    

     categories = split_tags(*related_tag_lists)
     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)[:3])

 
     objects = list(objects)
 
 
     objects = list(objects)
 


@@ -137,6 +151,7 @@ def object_list(request, objects, fragments=None, related_tags=None, tags=None,
     result = {
         'object_list': objects,
         'categories': categories,
     result = {
         'object_list': objects,
         'categories': categories,

+        'suggest': suggest,

         'list_type': list_type,
         'tags': tags,
 
         'list_type': list_type,
         'tags': tags,
 


@@ -147,16 +162,14 @@ def object_list(request, objects, fragments=None, related_tags=None, tags=None,
     if extra:
         result.update(extra)
 
     if extra:
         result.update(extra)
 

-    is_author = len(tags) == 1 and tags[0].category == 'author'
-    is_set = len(tags) == 1 and tags[0].category == 'set'

     is_theme = len(tags) == 1 and tags[0].category == 'theme'
     is_theme = len(tags) == 1 and tags[0].category == 'theme'

+    has_theme = any((x.category == 'theme' for x in tags))

     new_layout = request.EXPERIMENTS['layout']
     new_layout = request.EXPERIMENTS['layout']

-    if is_author and new_layout.value:
-        template = 'catalogue/2022/author_detail.html'
-    elif is_set and new_layout.value:
-        template = 'catalogue/2022/set_detail.html'
-    elif is_theme and new_layout.value:
+
+    if is_theme and new_layout.value:

         template = 'catalogue/2022/theme_detail.html'
         template = 'catalogue/2022/theme_detail.html'

+    elif new_layout.value and not has_theme:
+        template = 'catalogue/2022/author_detail.html'

     else:
         template = 'catalogue/tagged_object_list.html'
         
     else:
         template = 'catalogue/tagged_object_list.html'
         


@@ -286,9 +299,14 @@ def book_fragments(request, slug, theme_slug):
     fragments = Fragment.tagged.with_all([theme]).filter(
         Q(book=book) | Q(book__ancestor=book))
 
     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'
+    

     return render(
         request,
     return render(
         request,

-        'catalogue/book_fragments.html',
+        template_name,

         {
             'book': book,
             'theme': theme,
         {
             'book': book,
             'theme': theme,


@@ -469,7 +487,12 @@ def tag_catalogue(request, category):
     else:
         best = described_tags
 
     else:
         best = described_tags
 

-    return render(request, 'catalogue/tag_catalogue.html', {
+    if request.EXPERIMENTS['layout'].value:
+        template_name = 'catalogue/2022/tag_catalogue.html'
+    else:
+        template_name = 'catalogue/tag_catalogue.html'
+
+    return render(request, template_name, {

         'tags': tags,
         'best': best,
         'title': constants.CATEGORIES_NAME_PLURAL[category],
         'tags': tags,
         'best': best,
         'title': constants.CATEGORIES_NAME_PLURAL[category],