X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/0c3e8f92c425a22c1b9da737db89977d31312353..c48556c444d6ead2372138a18c11ee21f29e7be5:/apps/catalogue/views.py?ds=sidebyside diff --git a/apps/catalogue/views.py b/apps/catalogue/views.py index fc27e02f3..d69e5428c 100644 --- a/apps/catalogue/views.py +++ b/apps/catalogue/views.py @@ -6,7 +6,9 @@ import re import itertools from django.conf import settings +from django.core.cache import get_cache from django.template import RequestContext +from django.template.loader import render_to_string from django.shortcuts import render_to_response, get_object_or_404, redirect from django.http import HttpResponse, HttpResponseRedirect, Http404, HttpResponsePermanentRedirect from django.core.urlresolvers import reverse @@ -16,66 +18,94 @@ from django.utils.datastructures import SortedDict from django.utils.http import urlquote_plus from django.utils import translation from django.utils.translation import ugettext as _, ugettext_lazy -from django.views.decorators.cache import never_cache +from django.views.decorators.vary import vary_on_headers from ajaxable.utils import JSONResponse, AjaxableFormView - from catalogue import models from catalogue import forms from catalogue.utils import split_tags, MultiQuerySet +from catalogue.templatetags.catalogue_tags import tag_list, collection_list from pdcounter import models as pdcounter_models from pdcounter import views as pdcounter_views from suggest.forms import PublishingSuggestForm from picture.models import Picture staff_required = user_passes_test(lambda user: user.is_staff) +permanent_cache = get_cache('permanent') +@vary_on_headers('X-Requested-With') def catalogue(request): - tags = models.Tag.objects.exclude( - category__in=('set', 'book')).exclude(book_count=0) - tags = list(tags) - for tag in tags: - tag.count = tag.book_count - categories = split_tags(tags) - fragment_tags = categories.get('theme', []) - - return render_to_response('catalogue/catalogue.html', locals(), - context_instance=RequestContext(request)) + cache_key='catalogue.catalogue' + output = permanent_cache.get(cache_key) + if output is None: + tags = models.Tag.objects.exclude( + category__in=('set', 'book')).exclude(book_count=0) + tags = list(tags) + for tag in tags: + tag.count = tag.book_count + categories = split_tags(tags) + fragment_tags = categories.get('theme', []) + collections = models.Collection.objects.all() + render_tag_list = lambda x: render_to_string( + 'catalogue/tag_list.html', tag_list(x)) + output = {'theme': render_tag_list(fragment_tags)} + for category, tags in categories.items(): + output[category] = render_tag_list(tags) + output['collections'] = render_to_string( + 'catalogue/collection_list.html', collection_list(collections)) + permanent_cache.set(cache_key, output) + if request.is_ajax(): + return JSONResponse(output) + else: + return render_to_response('catalogue/catalogue.html', locals(), + context_instance=RequestContext(request)) -def book_list(request, filter=None, template_name='catalogue/book_list.html', - context=None): +def book_list(request, filter=None, get_filter=None, + template_name='catalogue/book_list.html', + nav_template_name='catalogue/snippets/book_list_nav.html', + list_template_name='catalogue/snippets/book_list.html', + cache_key='catalogue.book_list', + context=None, + ): """ generates a listing of all books, optionally filtered with a test function """ - - books_by_author, orphans, books_by_parent = models.Book.book_list(filter) - books_nav = SortedDict() - for tag in books_by_author: - if books_by_author[tag]: - books_nav.setdefault(tag.sort_key[0], []).append(tag) - + cached = permanent_cache.get(cache_key) + if cached is not None: + rendered_nav, rendered_book_list = cached + else: + if get_filter: + filter = get_filter() + books_by_author, orphans, books_by_parent = models.Book.book_list(filter) + books_nav = SortedDict() + for tag in books_by_author: + if books_by_author[tag]: + books_nav.setdefault(tag.sort_key[0], []).append(tag) + rendered_nav = render_to_string(nav_template_name, locals()) + rendered_book_list = render_to_string(list_template_name, locals()) + permanent_cache.set(cache_key, (rendered_nav, rendered_book_list)) return render_to_response(template_name, locals(), context_instance=RequestContext(request)) def audiobook_list(request): return book_list(request, Q(media__type='mp3') | Q(media__type='ogg'), - template_name='catalogue/audiobook_list.html') + template_name='catalogue/audiobook_list.html', + list_template_name='catalogue/snippets/audiobook_list.html', + cache_key='catalogue.audiobook_list') def daisy_list(request): return book_list(request, Q(media__type='daisy'), - template_name='catalogue/daisy_list.html') + template_name='catalogue/daisy_list.html', + cache_key='catalogue.daisy_list') def collection(request, slug): coll = get_object_or_404(models.Collection, slug=slug) - slugs = coll.book_slugs.split() - # allow URIs - slugs = [slug.rstrip('/').rsplit('/', 1)[-1] if '/' in slug else slug - for slug in slugs] - return book_list(request, Q(slug__in=slugs), + return book_list(request, get_filter=coll.get_query, template_name='catalogue/collection.html', + cache_key='catalogue.collection:%s' % coll.slug, context={'collection': coll}) @@ -93,7 +123,6 @@ def differentiate_tags(request, tags, ambiguous_slugs): context_instance=RequestContext(request)) -@never_cache def tagged_object_list(request, tags=''): try: tags = models.Tag.get_tag_list(tags) @@ -202,7 +231,6 @@ def book_fragments(request, slug, theme_slug): context_instance=RequestContext(request)) -@never_cache def book_detail(request, slug): try: book = models.Book.objects.get(slug=slug) @@ -258,13 +286,6 @@ def book_text(request, slug): if not book.has_html_file(): raise Http404 - book_themes = {} - for fragment in book.fragments.all().iterator(): - for theme in fragment.tags.filter(category='theme').iterator(): - book_themes.setdefault(theme, []).append(fragment) - - book_themes = book_themes.items() - book_themes.sort(key=lambda s: s[0].sort_key) related = book.related_info() return render_to_response('catalogue/book_text.html', locals(), context_instance=RequestContext(request))