X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/d0072de89eb395f99aedcdf7804e48b547cbbeca..655700e4cde69f00f698a06ca18991eef784ccda:/apps/catalogue/templatetags/catalogue_tags.py diff --git a/apps/catalogue/templatetags/catalogue_tags.py b/apps/catalogue/templatetags/catalogue_tags.py index ba8139a5e..e5e4d4fa0 100644 --- a/apps/catalogue/templatetags/catalogue_tags.py +++ b/apps/catalogue/templatetags/catalogue_tags.py @@ -4,21 +4,17 @@ # import datetime import feedparser -import re from django import template -from django.template import Node, Variable -from django.utils.encoding import smart_str -from django.core.cache import get_cache +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.db.models import Q -from django.conf import settings -from django.template.defaultfilters import stringfilter from django.utils.translation import ugettext as _ +from catalogue import forms from catalogue.utils import split_tags -from catalogue.models import Book, Fragment +from catalogue.models import Book, Fragment, Tag register = template.Library() @@ -50,6 +46,15 @@ def capfirst(text): return '' +@register.simple_tag +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)) + + def simple_title(tags): title = [] @@ -143,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(""" @@ -262,17 +278,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') @@ -282,27 +295,27 @@ def book_info(book): @register.inclusion_tag('catalogue/book_wide.html', takes_context=True) def book_wide(context, book): - formats = {} - # files generated during publication - for ebook_format in book.ebook_formats: - if book.has_media(ebook_format): - formats[ebook_format] = book.get_media(ebook_format) + book_themes = book.related_themes() + extra_info = book.get_extra_info_value() + hide_about = extra_info.get('about', '').startswith('http://wiki.wolnepodreczniki.pl') return { - 'related': book.related_info(), 'book': book, - 'formats': formats, + '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(), + 'hide_about': hide_about, + 'themes': book_themes, 'request': context.get('request'), - 'fragment': book.choose_fragment(), } @register.inclusion_tag('catalogue/book_short.html', takes_context=True) def book_short(context, book): return { - 'related': book.related_info(), 'book': book, + 'main_link': book.get_absolute_url(), + 'related': book.related_info(), 'request': context.get('request'), } @@ -310,8 +323,8 @@ def book_short(context, book): @register.inclusion_tag('catalogue/book_mini_box.html') def book_mini(book): return { - 'related': book.related_info(), 'book': book, + 'related': book.related_info(), } @@ -339,16 +352,39 @@ def fragment_promo(arg=None): } -@register.filter -@stringfilter -def removewholetags(value, tags): - """Removes a space separated list of [X]HTML tags from the output. +@register.inclusion_tag('catalogue/related_books.html') +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, + } + + +@register.inclusion_tag('catalogue/menu.html') +def catalogue_menu(): + tags = Tag.objects.filter( + category__in=('author', 'epoch', 'genre', 'kind', 'theme') + ).exclude(book_count=0) + return split_tags(tags) + - FIXME: It makes the assumption the removed tags aren't nested. - """ - tags = [re.escape(tag) for tag in tags.split()] - tags_re = u'(%s)' % u'|'.join(tags) - tag_re = re.compile(ur'<%s[^>]*>.*?' % tags_re, re.U) - value = tag_re.sub(u'', value) - return value +@register.simple_tag +def tag_url(category, slug): + return reverse('catalogue.views.tagged_object_list', args=[ + '/'.join((Tag.categories_dict[category], slug)) + ])