X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/04f567d3dcf63ec88484ba25a178c6eb336ea04e..b74fa4eb15c62d11fe0fa2b1015571c90681dd86:/src/catalogue/templatetags/catalogue_tags.py
diff --git a/src/catalogue/templatetags/catalogue_tags.py b/src/catalogue/templatetags/catalogue_tags.py
index fa6436feb..263f12cfa 100644
--- a/src/catalogue/templatetags/catalogue_tags.py
+++ b/src/catalogue/templatetags/catalogue_tags.py
@@ -8,37 +8,23 @@ 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.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 paypal.rest import user_is_subscribed
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)
@@ -72,7 +58,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
@@ -151,7 +137,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 +150,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 +169,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 +182,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 +193,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 +213,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,7 +277,7 @@ class CatalogueURLNode(Node):
# @register.inclusion_tag('catalogue/tag_list.html')
-def tag_list(tags, choices=None, category=None, list_type='default'):
+def tag_list(tags, choices=None, category=None, list_type='books'):
# print(tags, choices, category)
if choices is None:
choices = []
@@ -323,17 +299,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 +315,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 +339,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 +354,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,
@@ -436,9 +405,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 +416,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")
@@ -524,3 +493,13 @@ 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 user_is_subscribed(user):
+ return 'preview'
+ else:
+ return 'closed'