X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/04f567d3dcf63ec88484ba25a178c6eb336ea04e..05901815616a29900729502d346b1eed8d9ae923:/src/catalogue/templatetags/catalogue_tags.py?ds=sidebyside
diff --git a/src/catalogue/templatetags/catalogue_tags.py b/src/catalogue/templatetags/catalogue_tags.py
index fa6436feb..b582f89c3 100644
--- a/src/catalogue/templatetags/catalogue_tags.py
+++ b/src/catalogue/templatetags/catalogue_tags.py
@@ -1,44 +1,27 @@
-# -*- coding: utf-8 -*-
# This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later.
# Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
#
from random import randint, random
-from urlparse import urlparse
+from urllib.parse import urlparse
from django.contrib.contenttypes.models import ContentType
from django.conf import settings
from django import template
-from django.core.cache import cache
from django.template import Node, Variable, Template, Context
-from django.core.urlresolvers import reverse
-from django.contrib.auth.forms import UserCreationForm, AuthenticationForm
+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 ssify import ssi_variable
+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()
-class RegistrationForm(UserCreationForm):
- def as_ul(self):
- """Returns this form rendered as HTML
s -- excluding the ."""
- return self._html_output(
- u'%(errors)s%(label)s %(field)s%(help_text)s', u'%s',
- '', u' %s', False)
-
-
-class LoginForm(AuthenticationForm):
- def as_ul(self):
- """Returns this form rendered as HTML s -- excluding the ."""
- return self._html_output(
- u'%(errors)s%(label)s %(field)s%(help_text)s', u'%s',
- '', u' %s', False)
-
-
def iterable(obj):
try:
iter(obj)
@@ -59,8 +42,8 @@ def html_title_from_tags(tags):
if len(tags) < 2:
return title_from_tags(tags)
template = Template("{{ category }}: {{ tag.name }}")
- return capfirst(",
".join(
- template.render(Context({'tag': tag, 'category': _(tag.category)})) for tag in tags))
+ return mark_safe(capfirst(",
".join(
+ template.render(Context({'tag': tag, 'category': _(tag.category)})) for tag in tags)))
def simple_title(tags):
@@ -72,7 +55,7 @@ def simple_title(tags):
@register.simple_tag
def book_title(book, html_links=False):
- return book.pretty_title(html_links)
+ return mark_safe(book.pretty_title(html_links))
@register.simple_tag
@@ -98,48 +81,48 @@ def title_from_tags(tags):
self = split_tags(tags)
- title = u''
+ title = ''
# Specjalny przypadek oglÄ
dania wszystkich lektur na danej póÅce
if len(self) == 1 and 'set' in self:
- return u'PóÅka %s' % self['set']
+ 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 = u'TwórczoÅÄ w %s' % flection.get_case(unicode(self['epoch']), u'miejscownik')
+ 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 = u'%s w twórczoÅci %s' % (
- unicode(self['kind']), flection.get_case(unicode(self['author']), u'dopeÅniacz'))
+ 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 += u'Motyw %s' % unicode(self['theme'])
+ title += 'Motyw %s' % str(self['theme'])
if 'genre' in self:
if 'theme' in self:
- title += u' w %s' % flection.get_case(unicode(self['genre']), u'miejscownik')
+ title += ' w %s' % flection.get_case(str(self['genre']), 'miejscownik')
else:
- title += unicode(self['genre'])
+ title += str(self['genre'])
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 += u' w %s ' % flection.get_case(unicode(self['kind']), u'miejscownik')
+ title += ' w %s ' % flection.get_case(str(self['kind']), 'miejscownik')
else:
- title += u' w twórczoÅci '
+ title += ' w twórczoÅci '
else:
- title += u'%s ' % unicode(self.get('kind', u'twórczoÅÄ'))
+ title += '%s ' % str(self.get('kind', 'twórczoÅÄ'))
if 'author' in self:
- title += flection.get_case(unicode(self['author']), u'dopeÅniacz')
+ title += flection.get_case(str(self['author']), 'dopeÅniacz')
elif 'epoch' in self:
- title += flection.get_case(unicode(self['epoch']), u'dopeÅniacz')
+ title += flection.get_case(str(self['epoch']), 'dopeÅniacz')
return capfirst(title)
@@ -151,7 +134,7 @@ def book_tree(book_list, books_by_parent):
) for book in book_list)
if text:
- return "%s
" % text
+ return mark_safe("%s
" % text)
else:
return ''
@@ -164,14 +147,14 @@ def audiobook_tree(book_list, books_by_parent):
) for book in book_list)
if text:
- return "%s
" % text
+ return mark_safe("%s
" % text)
else:
return ''
@register.simple_tag
def book_tree_texml(book_list, books_by_parent, depth=1):
- return "".join("""
+ return mark_safe("".join("""
%(depth)dem%(title)s
%(audiences)s
%(audiobook)s
@@ -183,7 +166,7 @@ def book_tree_texml(book_list, books_by_parent, depth=1):
"audiences": ", ".join(book.audiences_pl()),
"audiobook": "audiobook" if book.has_media('mp3') else "",
"children": book_tree_texml(books_by_parent.get(book.id, ()), books_by_parent, depth + 1)
- } for book in book_list)
+ } for book in book_list))
@register.simple_tag
@@ -196,7 +179,7 @@ def book_tree_csv(author, book_list, books_by_parent, depth=1, max_depth=3, deli
except ValueError:
return s
- return "".join("""%(author)s%(d)s%(preindent)s%(title)s%(d)s%(postindent)s%(audiences)s%(d)s%(audiobook)s
+ return mark_safe("".join("""%(author)s%(d)s%(preindent)s%(title)s%(d)s%(postindent)s%(audiences)s%(d)s%(audiobook)s
%(children)s""" % {
"d": delimeter,
"preindent": delimeter * (depth - 1),
@@ -207,7 +190,7 @@ def book_tree_csv(author, book_list, books_by_parent, depth=1, max_depth=3, deli
"audiences": ", ".join(book.audiences_pl()),
"audiobook": "audiobook" if book.has_media('mp3') else "",
"children": book_tree_csv(author, books_by_parent.get(book.id, ()), books_by_parent, depth + 1)
- } for book in book_list)
+ } for book in book_list))
@register.simple_tag
@@ -227,16 +210,6 @@ def all_editors(extra_info):
for person in sorted(set(editors)))
-@register.simple_tag
-def user_creation_form():
- return RegistrationForm(prefix='registration').as_ul()
-
-
-@register.simple_tag
-def authentication_form():
- return LoginForm(prefix='login').as_ul()
-
-
@register.tag
def catalogue_url(parser, token):
bits = token.split_contents()
@@ -301,8 +274,7 @@ class CatalogueURLNode(Node):
# @register.inclusion_tag('catalogue/tag_list.html')
-def tag_list(tags, choices=None, category=None, list_type='default'):
- # print(tags, choices, category)
+def tag_list(tags, choices=None, category=None, list_type='books'):
if choices is None:
choices = []
@@ -323,17 +295,8 @@ def tag_list(tags, choices=None, category=None, list_type='default'):
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':
- audiobook_tag_ids = cache.get('audiobook_tags')
- if audiobook_tag_ids is None:
- books_with_audiobook = Book.objects.filter(media__type__in=('mp3', 'ogg'))\
- .distinct().values_list('pk', flat=True)
- audiobook_tag_ids = Tag.objects.filter(
- items__content_type=ct,
- items__object_id__in=list(books_with_audiobook)).distinct().values_list('pk', flat=True)
- audiobook_tag_ids = list(audiobook_tag_ids)
- cache.set('audiobook_tags', audiobook_tag_ids)
-
- other = other.filter(id__in=audiobook_tag_ids)
+ other = other.filter(id__in=get_audiobook_tags())
+ other = other.only('name', 'slug', 'category')
else:
other = []
@@ -348,7 +311,7 @@ def tag_list(tags, choices=None, category=None, list_type='default'):
@register.inclusion_tag('catalogue/inline_tag_list.html')
-def inline_tag_list(tags, choices=None, category=None, list_type='default'):
+def inline_tag_list(tags, choices=None, category=None, list_type='books'):
return tag_list(tags, choices, category, list_type)
@@ -372,7 +335,7 @@ def work_list(context, object_list):
@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='default',
+def plain_list(context, object_list, with_initials=True, by_author=False, choice=None, book=None, list_type='books',
paged=True, initial_blocks=False):
names = [('', [])]
last_initial = None
@@ -387,8 +350,10 @@ def plain_list(context, object_list, with_initials=True, by_author=False, choice
initial = obj.get_initial().upper()
if initial != last_initial:
last_initial = initial
- names.append((obj.author_str() if by_author else initial, []))
+ names.append((obj.author_unicode() if by_author else initial, []))
names[-1][1].append(obj)
+ if names[0] == ('', []):
+ del names[0]
return {
'paged': paged,
'names': names,
@@ -414,7 +379,7 @@ def related_books(context, instance, limit=6, random=1, taken=0):
# Reserve one spot for an image.
max_books -= 1
- books_qs = Book.objects.all()
+ 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]
@@ -436,9 +401,9 @@ def related_books(context, instance, limit=6, random=1, taken=0):
@register.simple_tag
-def download_audio(book, daisy=True):
+def download_audio(book, daisy=True, mp3=True):
links = []
- if book.has_media('mp3'):
+ if mp3 and book.has_media('mp3'):
links.append("%s" % (
reverse('download_zip_mp3', args=[book.slug]), BookMedia.formats['mp3'].name))
if book.has_media('ogg'):
@@ -447,7 +412,7 @@ def download_audio(book, daisy=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))
- return "".join(links)
+ return mark_safe("".join(links))
@register.inclusion_tag("catalogue/snippets/custom_pdf_link_li.html")
@@ -488,35 +453,32 @@ def source_name(url):
return source.name or netloc
-@ssi_variable(register, patch_response=[add_never_cache_headers])
-def catalogue_random_book(request, exclude_ids):
+@register.simple_tag
+def catalogue_random_book(exclude_ids):
from .. import app_settings
if random() < app_settings.RELATED_RANDOM_PICTURE_CHANCE:
return None
- queryset = Book.objects.exclude(pk__in=exclude_ids)
+ queryset = Book.objects.filter(findable=True).exclude(pk__in=exclude_ids)
count = queryset.count()
if count:
- return queryset[randint(0, count - 1)].pk
+ return queryset[randint(0, count - 1)]
else:
return None
-@ssi_variable(register, patch_response=[add_never_cache_headers])
-def choose_fragment(request, book_id=None, tag_ids=None, unless=False):
- if unless:
- return None
-
- if book_id is not None:
- fragment = Book.objects.get(pk=book_id).choose_fragment()
+@register.simple_tag
+def choose_fragment(book=None, tag_ids=None):
+ if book is not None:
+ fragment = book.choose_fragment()
else:
if tag_ids is not None:
tags = Tag.objects.filter(pk__in=tag_ids)
- fragments = Fragment.tagged.with_all(tags).order_by().only('id')
+ fragments = Fragment.tagged.with_all(tags).filter(book__findable=True).order_by().only('id')
else:
- fragments = Fragment.objects.all().order_by().only('id')
+ fragments = Fragment.objects.filter(book__findable=True).order_by().only('id')
fragment_count = fragments.count()
fragment = fragments[randint(0, fragment_count - 1)] if fragment_count else None
- return fragment.pk if fragment is not None else None
+ return fragment
@register.filter
@@ -524,3 +486,28 @@ def strip_tag(html, tag_name):
# docelowo może byÄ warto zainstalowaÄ BeautifulSoup do takich rzeczy
import re
return re.sub(r"<.?%s\b[^>]*>" % tag_name, "", html)
+
+
+@register.filter
+def status(book, user):
+ if not book.preview:
+ return 'open'
+ elif Membership.is_active_for(user):
+ return 'preview'
+ else:
+ return 'closed'
+
+
+@register.inclusion_tag('catalogue/snippets/content_warning.html')
+def content_warning(book):
+ warnings_def = {
+ 'wulgaryzmy': _('vulgar language'),
+ }
+ warnings = book.get_extra_info_json().get('content_warnings', [])
+ warnings = sorted(
+ warnings_def.get(w, w)
+ for w in warnings
+ )
+ return {
+ "warnings": warnings
+ }