X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/12aefaa8ec09e42f4912f952dbf08b4929cda7be..1ff260641b29888f28d24acb58195ea231207494:/apps/catalogue/views.py?ds=inline diff --git a/apps/catalogue/views.py b/apps/catalogue/views.py index e61feb6c2..27d141fb5 100644 --- a/apps/catalogue/views.py +++ b/apps/catalogue/views.py @@ -18,7 +18,6 @@ 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 @@ -30,6 +29,7 @@ from pdcounter import models as pdcounter_models from pdcounter import views as pdcounter_views from suggest.forms import PublishingSuggestForm from picture.models import Picture +from picture.views import picture_list_thumb staff_required = user_passes_test(lambda user: user.is_staff) permanent_cache = get_cache('permanent') @@ -37,30 +37,50 @@ 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', []) - collections = models.Collection.objects.all() + 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, picture_count=0) + tags = list(tags) + for tag in tags: + tag.count = tag.book_count + tag.picture_count + categories = split_tags(tags) + fragment_tags = categories.get('theme', []) + collections = models.Collection.objects.all() - 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)} + has_pictures = lambda x: filter(lambda y: y.picture_count>0, x) + has_books = lambda x: filter(lambda y: y.book_count>0, x) + def render_split(tags): + with_books = has_books(tags) + with_pictures = has_pictures(tags) + ctx = {} + if with_books: + ctx['books'] = render_tag_list(with_books) + if with_pictures: + ctx['pictures'] = render_tag_list(with_pictures) + return render_to_string('catalogue/tag_list_split.html', ctx) + + output = {'theme': {}} + output['theme'] = render_split(fragment_tags) for category, tags in categories.items(): - output[category] = render_tag_list(tags) + output[category] = render_split(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', +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', @@ -71,6 +91,8 @@ def book_list(request, filter=None, template_name='catalogue/book_list.html', 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: @@ -98,12 +120,16 @@ def daisy_list(request): 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), - template_name='catalogue/collection.html', + if coll.kind == 'book': + view = book_list + tmpl = "catalogue/collection.html" + elif coll.kind == 'picture': + view = picture_list_thumb + tmpl = "picture/collection.html" + else: + raise ValueError('How do I show this kind of collection? %s' % coll.kind) + return view(request, get_filter=coll.get_query, + template_name=tmpl, cache_key='catalogue.collection:%s' % coll.slug, context={'collection': coll}) @@ -122,7 +148,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) @@ -186,7 +211,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.iterator(): + for book in objects: for tag_pk, value in itertools.chain(book.tag_counter.iteritems(), book.theme_counter.iteritems()): if tag_pk in tags_pks: continue @@ -231,7 +256,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) @@ -287,13 +311,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))