X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/d2199704c75d29ba98e0f92d27cb63743183e906..dfd584e3b136d770bf56569030d10712a8722569:/apps/catalogue/templatetags/catalogue_tags.py
diff --git a/apps/catalogue/templatetags/catalogue_tags.py b/apps/catalogue/templatetags/catalogue_tags.py
index 2020d9097..515c1fe97 100644
--- a/apps/catalogue/templatetags/catalogue_tags.py
+++ b/apps/catalogue/templatetags/catalogue_tags.py
@@ -5,6 +5,7 @@
import datetime
import feedparser
from random import randint
+from urlparse import urlparse
from django.conf import settings
from django import template
@@ -14,8 +15,8 @@ from django.core.urlresolvers import reverse
from django.contrib.auth.forms import UserCreationForm, AuthenticationForm
from django.utils.translation import ugettext as _
-from catalogue.utils import split_tags, related_tag_name as _related_tag_name
-from catalogue.models import Book, BookMedia, Fragment, Tag
+from catalogue.utils import split_tags
+from catalogue.models import Book, BookMedia, Fragment, Tag, Source
from catalogue.constants import LICENSES
register = template.Library()
@@ -55,7 +56,7 @@ def html_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 = []
@@ -186,12 +187,12 @@ def book_tree_csv(author, book_list, books_by_parent, depth=1, max_depth=3, deli
return '"%s"' % s
except ValueError:
return s
-
+
return "".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),
- "postindent": delimeter * (max_depth - depth),
+ "postindent": delimeter * (max_depth - depth),
"depth": depth,
"author": quote_if_necessary(author.name),
"title": quote_if_necessary(book.title),
@@ -284,8 +285,8 @@ def latest_blog_posts(feed_url, posts_to_show=5):
feed = feedparser.parse(str(feed_url))
posts = []
for i in range(posts_to_show):
- pub_date = feed['entries'][i].updated_parsed
- published = datetime.date(pub_date[0], pub_date[1], pub_date[2] )
+ pub_date = feed['entries'][i].published_parsed
+ published = datetime.date(pub_date[0], pub_date[1], pub_date[2])
posts.append({
'title': feed['entries'][i].title,
'summary': feed['entries'][i].summary,
@@ -323,60 +324,64 @@ def book_info(book):
@register.inclusion_tag('catalogue/book_wide.html', takes_context=True)
def book_wide(context, book):
- 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]) if book.html_file else None,
- 'related': book.related_info(),
- 'extra_info': extra_info,
- 'hide_about': hide_about,
- 'themes': book_themes,
- 'request': context.get('request'),
- }
+ ctx = book_short(context, book)
+ ctx['extra_info'] = book.extra_info
+ ctx['hide_about'] = ctx['extra_info'].get('about', '').startswith('http://wiki.wolnepodreczniki.pl')
+ ctx['themes'] = book.related_themes()
+ ctx['main_link'] = reverse('book_text', args=[book.slug]) if book.html_file else None
+ return ctx
@register.inclusion_tag('catalogue/book_short.html', takes_context=True)
def book_short(context, book):
+ stage_note, stage_note_url = book.stage_note()
+
return {
'book': book,
+ 'has_audio': book.has_media('mp3'),
'main_link': book.get_absolute_url(),
- 'related': book.related_info(),
+ 'parents': book.parents(),
+ 'tags': split_tags(book.tags.exclude(category__in=('set', 'theme'))),
'request': context.get('request'),
+ 'show_lang': book.language_code() != settings.LANGUAGE_CODE,
+ 'stage_note': stage_note,
+ 'stage_note_url': stage_note_url,
}
@register.inclusion_tag('catalogue/book_mini_box.html')
-def book_mini(book):
- author_str = ", ".join(related_tag_name(tag)
- for tag in book.related_info()['tags'].get('author', ()))
+def book_mini(book, with_link=True):
+ author_str = ", ".join(tag.name
+ for tag in book.tags.filter(category='author'))
return {
'book': book,
'author_str': author_str,
+ 'with_link': with_link,
+ 'show_lang': book.language_code() != settings.LANGUAGE_CODE,
}
@register.inclusion_tag('catalogue/work-list.html', takes_context=True)
def work_list(context, object_list):
request = context.get('request')
- for obj in object_list:
- obj.object_type = type(object_list[0]).__name__
-
return locals()
@register.inclusion_tag('catalogue/fragment_promo.html')
def fragment_promo(arg=None):
- if arg is None:
- fragments = Fragment.objects.all().order_by('?')
- fragment = fragments[0] if fragments.exists() else None
- elif isinstance(arg, Book):
+ if isinstance(arg, Book):
fragment = arg.choose_fragment()
else:
- fragments = Fragment.tagged.with_all(arg).order_by('?')
- fragment = fragments[0] if fragments.exists() else None
+ if arg is None:
+ fragments = Fragment.objects.all()
+ else:
+ fragments = Fragment.tagged.with_all(arg)
+ fragments = fragments.order_by().only('id')
+ fragments_count = fragments.count()
+ if fragments_count:
+ fragment = fragments.order_by()[randint(0, fragments_count - 1)]
+ else:
+ fragment = None
return {
'fragment': fragment,
@@ -384,17 +389,14 @@ def fragment_promo(arg=None):
@register.inclusion_tag('catalogue/related_books.html')
-def related_books(book, limit=6, random=1):
+def related_books(book, limit=6, random=1, taken=0):
+ limit = limit - taken
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]
+ related = Book.tagged.related_to(book,
+ Book.objects.exclude(common_slug=book.common_slug)
+ ).exclude(ancestor=book)[:limit-random]
cache.set(cache_key, related, 1800)
if random:
random_books = Book.objects.exclude(
@@ -402,11 +404,14 @@ def related_books(book, limit=6, random=1):
if random == 1:
count = random_books.count()
if count:
- related.append(random_books[randint(0, count - 1)])
+ random_related = [random_books[randint(0, count - 1)]]
else:
- related += list(random_books.order_by('?')[:random])
+ random_related = list(random_books.order_by('?')[:random])
+ else:
+ random_related = []
return {
'books': related,
+ 'random_related': random_related,
}
@@ -417,7 +422,7 @@ def catalogue_menu():
('genre', _('Genres'), 'gatunki'),
('kind', _('Kinds'), 'rodzaje'),
('epoch', _('Epochs'), 'epoki'),
- ('theme', _('Themes'), 'autorzy'),
+ ('theme', _('Themes'), 'motywy'),
]}
@@ -428,7 +433,6 @@ def tag_url(category, slug):
@register.simple_tag
def download_audio(book, daisy=True):
- related = book.related_info()
links = []
if related['media'].get('mp3'):
links.append("%s" %
@@ -466,12 +470,18 @@ def license_icon(license_url):
}
-@register.simple_tag
-def related_tag_name(tag, lang=None):
- return _related_tag_name(tag, lang)
-
-
-@register.simple_tag
+@register.filter
def class_name(obj):
return obj.__class__.__name__
+
+@register.simple_tag
+def source_name(url):
+ url = url.lstrip()
+ netloc = urlparse(url).netloc
+ if not netloc:
+ netloc = urlparse('http://' + url).netloc
+ if not netloc:
+ return ''
+ source, created = Source.objects.get_or_create(netloc=netloc)
+ return source.name or netloc