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..c9e776c8f 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,7 +11,7 @@ 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 @@ -43,13 +43,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 +65,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 +151,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(""" @@ -310,16 +309,6 @@ def tag_list(tags, choices=None, category=None, list_type='books'): } -@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 { @@ -328,12 +317,6 @@ def book_info(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): @@ -401,16 +384,29 @@ def related_books(context, instance, limit=6, random=1, taken=0): @register.simple_tag -def related_books_2022(instance, limit=4, taken=0): +def related_books_2022(book=None, picture=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) + if book is not None: + books_qs = books_qs.exclude(common_slug=book.common_slug).exclude(ancestor=book) + instance = book or picture books = Book.tagged.related_to(instance, books_qs)[:max_books] return books - + +@register.simple_tag +def related_pictures_2022(book=None, picture=None, limit=4, taken=0): + limit -= taken + max_books = limit + + books_qs = Picture.objects.all() + instance = book or picture + books = Picture.tagged.related_to(instance, books_qs)[:max_books] + + return books + @register.simple_tag def download_audio(book, daisy=True, mp3=True): @@ -424,6 +420,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 +452,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 +512,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 +522,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, + }