X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/dbb1ae2cf25105f7a3831961b08386a1326baef8..dfd584e3b136d770bf56569030d10712a8722569:/apps/catalogue/templatetags/catalogue_tags.py diff --git a/apps/catalogue/templatetags/catalogue_tags.py b/apps/catalogue/templatetags/catalogue_tags.py index 95288a404..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 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() @@ -284,7 +285,7 @@ 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 + 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, @@ -323,37 +324,35 @@ 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'), - 'show_lang': book.language_code() != settings.LANGUAGE_CODE, - } + 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, with_link=True): - author_str = ", ".join(related_tag_name(tag) - for tag in book.related_info()['tags'].get('author', ())) + author_str = ", ".join(tag.name + for tag in book.tags.filter(category='author')) return { 'book': book, 'author_str': author_str, @@ -365,22 +364,24 @@ def book_mini(book, with_link=True): @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(obj).__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, @@ -394,8 +395,8 @@ def related_books(book, limit=6, random=1, taken=0): related = cache.get(cache_key) if related is None: related = Book.tagged.related_to(book, - Book.objects.exclude(common_slug=book.common_slug), - ignore_by_tag=book.book_tag())[:limit-random] + 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( @@ -403,11 +404,14 @@ def related_books(book, limit=6, random=1, taken=0): 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, } @@ -429,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" % @@ -467,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