X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/5eeb9dace6068f83e2b70b5222cfab0c0a5e71eb..ac21bdd330d4f33ec70509695f55bf65d8af0427:/apps/catalogue/views.py?ds=sidebyside diff --git a/apps/catalogue/views.py b/apps/catalogue/views.py index d2176bf6b..66036bf77 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 @@ -23,12 +25,14 @@ 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 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') def catalogue(request): @@ -40,32 +44,52 @@ def catalogue(request): categories = split_tags(tags) fragment_tags = categories.get('theme', []) - return render_to_response('catalogue/catalogue.html', locals(), - context_instance=RequestContext(request)) + if request.is_ajax(): + 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) + 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): + 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: + 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): @@ -76,6 +100,7 @@ def collection(request, slug): for slug in slugs] return book_list(request, Q(slug__in=slugs), template_name='catalogue/collection.html', + cache_key='catalogue.collection:%s' % coll.slug, context={'collection': coll}) @@ -132,13 +157,14 @@ def tagged_object_list(request, tags=''): if shelf_tags: books = models.Book.tagged.with_all(shelf_tags).order_by() - l_tags = models.Tag.objects.filter(category='book', slug__in=[book.book_tag_slug() for book in books]) + l_tags = models.Tag.objects.filter(category='book', + slug__in=[book.book_tag_slug() for book in books.iterator()]) fragments = models.Fragment.tagged.with_any(l_tags, fragments) # newtagging goes crazy if we just try: #related_tags = models.Tag.objects.usage_for_queryset(fragments, counts=True, # extra={'where': ["catalogue_tag.category != 'book'"]}) - fragment_keys = [fragment.pk for fragment in fragments] + fragment_keys = [fragment.pk for fragment in fragments.iterator()] if fragment_keys: related_tags = models.Fragment.tags.usage(counts=True, filters={'pk__in': fragment_keys}, @@ -156,7 +182,7 @@ def tagged_object_list(request, tags=''): # get related tags from `tag_counter` and `theme_counter` related_counts = {} tags_pks = [tag.pk for tag in tags] - for book in objects: + for book in objects.iterator(): for tag_pk, value in itertools.chain(book.tag_counter.iteritems(), book.theme_counter.iteritems()): if tag_pk in tags_pks: continue @@ -219,15 +245,15 @@ def player(request, slug): raise Http404 ogg_files = {} - for m in book.media.filter(type='ogg').order_by(): + for m in book.media.filter(type='ogg').order_by().iterator(): ogg_files[m.name] = m audiobooks = [] have_oggs = True projects = set() - for mp3 in book.media.filter(type='mp3'): + for mp3 in book.media.filter(type='mp3').iterator(): # ogg files are always from the same project - meta = mp3.get_extra_info_value() + meta = mp3.extra_info project = meta.get('project') if not project: # temporary fallback @@ -246,7 +272,7 @@ def player(request, slug): projects = sorted(projects) - extra_info = book.get_extra_info_value() + extra_info = book.extra_info return render_to_response('catalogue/player.html', locals(), context_instance=RequestContext(request)) @@ -258,12 +284,13 @@ def book_text(request, slug): if not book.has_html_file(): raise Http404 book_themes = {} - for fragment in book.fragments.all(): - for theme in fragment.tags.filter(category='theme'): + 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)) @@ -534,6 +561,11 @@ class CustomPDFFormView(AjaxableFormView): submit = ugettext_lazy('Download') honeypot = True + def __call__(self, *args, **kwargs): + if settings.NO_CUSTOM_PDF: + raise Http404('Custom PDF is disabled') + return super(CustomPDFFormView, self).__call__(*args, **kwargs) + def form_args(self, request, obj): """Override to parse view args and give additional args to the form.""" return (obj,), {}