X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/1076830cbd3a839d1f332100bf3ac6b1fb24c86a..HEAD:/src/catalogue/templatetags/catalogue_tags.py diff --git a/src/catalogue/templatetags/catalogue_tags.py b/src/catalogue/templatetags/catalogue_tags.py index 93950d73c..d2298d9f5 100644 --- a/src/catalogue/templatetags/catalogue_tags.py +++ b/src/catalogue/templatetags/catalogue_tags.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 random import randint, random from urllib.parse import urlparse @@ -11,13 +11,12 @@ from django.template import Node, Variable, Template, Context from django.urls import reverse from django.utils.cache import add_never_cache_headers from django.utils.safestring import mark_safe -from django.utils.translation import ugettext as _ +from django.utils.translation import gettext as _ from catalogue.helpers import get_audiobook_tags from catalogue.models import Book, BookMedia, Fragment, Tag, Source from catalogue.constants import LICENSES from club.models import Membership -from picture.models import Picture register = template.Library() @@ -43,13 +42,13 @@ def html_title_from_tags(tags): return title_from_tags(tags) template = Template("{{ category }}: {{ tag.name }}") return mark_safe(capfirst(",
".join( - template.render(Context({'tag': tag, 'category': _(tag.category)})) for tag in tags))) + template.render(Context({'tag': tag, 'category': tag.get_category_display()})) for tag in tags))) def simple_title(tags): title = [] for tag in tags: - title.append("%s: %s" % (_(tag.category), tag.name)) + title.append("%s: %s" % (tag.get_category_display(), tag.name)) return capfirst(', '.join(title)) @@ -65,66 +64,78 @@ def book_title_html(book): @register.simple_tag def title_from_tags(tags): + # TODO: Remove this after adding flection mechanism + return simple_title(tags) + + +@register.simple_tag +def nice_title_from_tags(tags, related_tags): def split_tags(tags): result = {} for tag in tags: - result[tag.category] = tag + result.setdefault(tag.category, []).append(tag) return result - # TODO: Remove this after adding flection mechanism - return simple_title(tags) - - class Flection(object): - def get_case(self, name, flection): - return name - flection = Flection() - self = split_tags(tags) - title = '' - - # Specjalny przypadek oglądania wszystkich lektur na danej półce - if len(self) == 1 and 'set' in self: - return 'Półka %s' % self['set'] - - # Specjalny przypadek "Twórczość w pozytywizmie", wtedy gdy tylko epoka - # jest wybrana przez użytkownika - if 'epoch' in self and len(self) == 1: - text = 'Twórczość w %s' % flection.get_case(str(self['epoch']), 'miejscownik') - return capfirst(text) - - # Specjalny przypadek "Dramat w twórczości Sofoklesa", wtedy gdy podane - # są tylko rodzaj literacki i autor - if 'kind' in self and 'author' in self and len(self) == 2: - text = '%s w twórczości %s' % ( - str(self['kind']), flection.get_case(str(self['author']), 'dopełniacz')) - return capfirst(text) - - # Przypadki ogólniejsze - if 'theme' in self: - title += 'Motyw %s' % str(self['theme']) + pieces = [] + plural = True + epoch_reduntant = False if 'genre' in self: - if 'theme' in self: - title += ' w %s' % flection.get_case(str(self['genre']), 'miejscownik') + pieces.append([ + t.plural or t.name for t in self['genre'] + ]) + epoch_reduntant = self['genre'][-1].genre_epoch_specific + else: + # If we don't have genre, + # look if maybe we only have one genre in this context? + if 'genre' in related_tags and len(related_tags['genre']) == 1: + pieces.append([ + t.plural or t.name for t in related_tags['genre'] + ]) + epoch_reduntant = related_tags['genre'][-1].genre_epoch_specific + elif 'kind' in self: + # Only use kind if not talking about genre. + pieces.append([ + t.collective_noun or t.name for t in self['kind'] + ]) + plural = False + elif 'kind' in related_tags and len(related_tags['kind']) == 1: + # No info on genre, but there's only one kind related. + subpieces = [] + pieces.append([ + t.collective_noun or t.name for t in related_tags['kind'] + ]) + plural = False else: - title += str(self['genre']) + # We can't say anything about genre or kind. + pieces.append(['Twórczość']) + plural = False - if 'kind' in self or 'author' in self or 'epoch' in self: - if 'genre' in self or 'theme' in self: - if 'kind' in self: - title += ' w %s ' % flection.get_case(str(self['kind']), 'miejscownik') - else: - title += ' w twórczości ' + if not epoch_reduntant and 'epoch' in self: + if plural: + form = lambda t: t.adjective_nonmasculine_plural or t.name else: - title += '%s ' % str(self.get('kind', 'twórczość')) + form = lambda t: t.adjective_feminine_singular or t.name + pieces.append([ + form(t) for t in self['epoch'] + ]) if 'author' in self: - title += flection.get_case(str(self['author']), 'dopełniacz') - elif 'epoch' in self: - title += flection.get_case(str(self['epoch']), 'dopełniacz') + pieces.append([ + t.genitive or t.name for t in self['author'] + ]) + + p = [] + for sublist in pieces: + for item in sublist[:-2]: + p.append(item + ',') + for item in sublist[-2:-1]: + p.append(item + ' i') + p.append(sublist[-1]) - return capfirst(title) + return ' '.join(p) @register.simple_tag @@ -139,19 +150,6 @@ def book_tree(book_list, books_by_parent): return '' -@register.simple_tag -def audiobook_tree(book_list, books_by_parent): - text = "".join("
  • %s%s
    • " % ( - reverse("book_player", args=[book.slug]), book.title, - audiobook_tree(books_by_parent.get(book, ()), books_by_parent) - ) for book in book_list) - - if text: - return mark_safe("
      %s
    " % text) - else: - return '' - - @register.simple_tag def book_tree_texml(book_list, books_by_parent, depth=1): return mark_safe("".join(""" @@ -258,82 +256,24 @@ class CatalogueURLNode(Node): pass if len(tag_slugs) > 0: - if list_type == 'gallery': - return reverse('tagged_object_list_gallery', kwargs={'tags': '/'.join(tag_slugs)}) - elif list_type == 'audiobooks': + if list_type == 'audiobooks': return reverse('tagged_object_list_audiobooks', kwargs={'tags': '/'.join(tag_slugs)}) else: return reverse('tagged_object_list', kwargs={'tags': '/'.join(tag_slugs)}) else: - if list_type == 'gallery': - return reverse('gallery') - elif list_type == 'audiobooks': + if list_type == 'audiobooks': return reverse('audiobook_list') else: return reverse('book_list') -# @register.inclusion_tag('catalogue/tag_list.html') -def tag_list(tags, choices=None, category=None, list_type='books'): - if choices is None: - choices = [] - - if category is None and tags: - category = tags[0].category - - category_choices = [tag for tag in choices if tag.category == category] - - if len(tags) == 1 and category not in [t.category for t in choices]: - one_tag = tags[0] - else: - one_tag = None - - if category is not None: - other = Tag.objects.filter(category=category).exclude(pk__in=[t.pk for t in tags])\ - .exclude(pk__in=[t.pk for t in category_choices]) - # Filter out empty tags. - ct = ContentType.objects.get_for_model(Picture if list_type == 'gallery' else Book) - other = other.filter(items__content_type=ct).distinct() - if list_type == 'audiobooks': - other = other.filter(id__in=get_audiobook_tags()) - other = other.only('name', 'slug', 'category') - else: - other = [] - - return { - 'one_tag': one_tag, - 'choices': choices, - 'category_choices': category_choices, - 'tags': tags, - 'other': other, - 'list_type': list_type, - } - - -@register.inclusion_tag('catalogue/inline_tag_list.html') -def inline_tag_list(tags, choices=None, category=None, list_type='books'): - return tag_list(tags, choices, category, list_type) - - -@register.inclusion_tag('catalogue/collection_list.html') -def collection_list(collections): - return {'collections': collections} - - @register.inclusion_tag('catalogue/book_info.html') def book_info(book): return { - 'is_picture': isinstance(book, Picture), 'book': book, } -@register.inclusion_tag('catalogue/work-list.html', takes_context=True) -def work_list(context, object_list): - request = context.get('request') - return {'object_list': object_list, 'request': request} - - @register.inclusion_tag('catalogue/plain_list.html', takes_context=True) def plain_list(context, object_list, with_initials=True, by_author=False, choice=None, book=None, list_type='books', paged=True, initial_blocks=False): @@ -364,53 +304,18 @@ def plain_list(context, object_list, with_initials=True, by_author=False, choice } -# TODO: These are no longer just books. -@register.inclusion_tag('catalogue/related_books.html', takes_context=True) -def related_books(context, instance, limit=6, random=1, taken=0): - limit -= taken - max_books = limit - random - is_picture = isinstance(instance, Picture) - - pics_qs = Picture.objects.all() - if is_picture: - pics_qs = pics_qs.exclude(pk=instance.pk) - pics = Picture.tagged.related_to(instance, pics_qs) - if pics.exists(): - # Reserve one spot for an image. - max_books -= 1 - - books_qs = Book.objects.filter(findable=True) - if not is_picture: - books_qs = books_qs.exclude(common_slug=instance.common_slug).exclude(ancestor=instance) - books = Book.tagged.related_to(instance, books_qs)[:max_books] - - pics = pics[:1 + max_books - books.count()] - - random_excluded_books = [b.pk for b in books] - random_excluded_pics = [p.pk for p in pics] - (random_excluded_pics if is_picture else random_excluded_books).append(instance.pk) - - return { - 'request': context['request'], - 'books': books, - 'pics': pics, - 'random': random, - 'random_excluded_books': random_excluded_books, - 'random_excluded_pics': random_excluded_pics, - } - - @register.simple_tag -def related_books_2022(instance, limit=4, taken=0): +def related_books_2022(book=None, limit=4, taken=0): limit -= taken max_books = limit books_qs = Book.objects.filter(findable=True) - books_qs = books_qs.exclude(common_slug=instance.common_slug).exclude(ancestor=instance) - books = Book.tagged.related_to(instance, books_qs)[:max_books] + if book is not None: + books_qs = books_qs.exclude(common_slug=book.common_slug).exclude(ancestor=book) + books = Book.tagged.related_to(book, books_qs)[:max_books] return books - + @register.simple_tag def download_audio(book, daisy=True, mp3=True): @@ -424,6 +329,9 @@ def download_audio(book, daisy=True, mp3=True): if daisy and book.has_media('daisy'): for dsy in book.get_media('daisy'): links.append("%s" % (dsy.file.url, BookMedia.formats['daisy'].name)) + if daisy and book.has_media('audio.epub'): + for dsy in book.get_media('audio.epub'): + links.append("%s" % (dsy.file.url, BookMedia.formats['audio.epub'].name)) return mark_safe("".join(links)) @@ -453,11 +361,6 @@ def license_locative(license_url, default): return LICENSES.get(license_url, {}).get('locative', default) -@register.filter -def class_name(obj): - return obj.__class__.__name__ - - @register.simple_tag def source_name(url): url = url.lstrip() @@ -518,7 +421,7 @@ def status(book, user): @register.inclusion_tag('catalogue/snippets/content_warning.html') def content_warning(book): warnings_def = { - 'wulgaryzmy': _('vulgar language'), + 'wulgaryzmy': _('wulgaryzmy'), } warnings = book.get_extra_info_json().get('content_warnings', []) warnings = sorted( @@ -528,3 +431,24 @@ def content_warning(book): return { "warnings": warnings } + + +@register.inclusion_tag('catalogue/preview_ad.html', takes_context=True) +def preview_ad(context): + book = Book.objects.filter(parent=None, preview=True).first() + if book is None: + return {} + return { + 'accessible': book.is_accessible_to(context['request'].user), + 'book': book, + } + +@register.inclusion_tag('catalogue/preview_ad_homepage.html', takes_context=True) +def preview_ad_homepage(context): + book = Book.objects.filter(parent=None, preview=True).first() + if book is None: + return {} + return { + 'accessible': book.is_accessible_to(context['request'].user), + 'book': book, + }