X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/8fefd8bdaca07a3f5607de79c081dc0f7876fbc7..d91638bdfd7642eebec0147997f834952707dd92:/apps/catalogue/templatetags/catalogue_tags.py?ds=sidebyside
diff --git a/apps/catalogue/templatetags/catalogue_tags.py b/apps/catalogue/templatetags/catalogue_tags.py
index cf80bebb5..78ce04ab5 100644
--- a/apps/catalogue/templatetags/catalogue_tags.py
+++ b/apps/catalogue/templatetags/catalogue_tags.py
@@ -7,6 +7,7 @@ import feedparser
from django import template
from django.template import Node, Variable, Template, Context
+from django.core.cache import cache
from django.core.urlresolvers import reverse
from django.contrib.auth.forms import UserCreationForm, AuthenticationForm
from django.utils.translation import ugettext as _
@@ -147,6 +148,17 @@ def book_tree(book_list, books_by_parent):
else:
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 "%s
" % text
+ else:
+ return ''
+
@register.simple_tag
def book_tree_texml(book_list, books_by_parent, depth=1):
return "".join("""
@@ -194,7 +206,6 @@ def authentication_form():
@register.tag
def catalogue_url(parser, token):
bits = token.split_contents()
- tag_name = bits[0]
tags_to_add = []
tags_to_remove = []
@@ -266,17 +277,14 @@ def latest_blog_posts(feed_url, posts_to_show=5):
def tag_list(tags, choices=None):
if choices is None:
choices = []
- if len(tags) == 1:
+ if len(tags) == 1 and tags[0].category not in [t.category for t in choices]:
one_tag = tags[0]
return locals()
+
@register.inclusion_tag('catalogue/inline_tag_list.html')
def inline_tag_list(tags, choices=None):
- if choices is None:
- choices = []
- if len(tags) == 1:
- one_tag = tags[0]
- return locals()
+ return tag_list(tags, choices)
@register.inclusion_tag('catalogue/book_info.html')
@@ -286,21 +294,17 @@ def book_info(book):
@register.inclusion_tag('catalogue/book_wide.html', takes_context=True)
def book_wide(context, book):
- theme_counter = book.theme_counter
- book_themes = Tag.objects.filter(pk__in=theme_counter.keys())
- for tag in book_themes:
- tag.count = theme_counter[tag.pk]
- extra_info = book.get_extra_info_value()
+ book_themes = book.related_themes()
+ extra_info = book.extra_info
hide_about = extra_info.get('about', '').startswith('http://wiki.wolnepodreczniki.pl')
return {
'book': book,
- 'main_link': reverse('book_text', args=[book.slug]),
+ 'main_link': reverse('book_text', args=[book.slug]) if book.html_file else None,
'related': book.related_info(),
- 'extra_info': book.get_extra_info_value(),
+ 'extra_info': extra_info,
'hide_about': hide_about,
'themes': book_themes,
- 'custom_pdf_form': forms.CustomPDFForm(),
'request': context.get('request'),
}
@@ -348,14 +352,22 @@ def fragment_promo(arg=None):
@register.inclusion_tag('catalogue/related_books.html')
-def related_books(book, limit=6):
- related = list(Book.objects.filter(
- common_slug=book.common_slug).exclude(pk=book.pk)[:limit])
- limit -= len(related)
- if limit:
- related += Book.tagged.related_to(book,
- Book.objects.exclude(common_slug=book.common_slug),
- ignore_by_tag=book.book_tag())[:limit]
+def related_books(book, limit=6, random=1):
+ cache_key = "catalogue.related_books.%d.%d" % (book.id, limit - random)
+ related = cache.get(cache_key)
+ if related is None:
+ related = list(Book.objects.filter(
+ common_slug=book.common_slug).exclude(pk=book.pk)[:limit])
+ limit -= len(related)
+ if limit > random:
+ related += Book.tagged.related_to(book,
+ Book.objects.exclude(common_slug=book.common_slug),
+ ignore_by_tag=book.book_tag())[:limit-random]
+ cache.set(cache_key, related, 1800)
+ if random:
+ related += list(Book.objects.exclude(
+ pk__in=[b.pk for b in related] + [book.pk]
+ ).order_by('?')[:random])
return {
'books': related,
}