X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/08bd2b6b6557481ecbb64b2f07db0d3d9784d9bb..01ba89e7caab3e386df4b1a99a93b98a237a0457:/apps/catalogue/views.py diff --git a/apps/catalogue/views.py b/apps/catalogue/views.py index fd66da9dd..f47329a97 100644 --- a/apps/catalogue/views.py +++ b/apps/catalogue/views.py @@ -2,27 +2,27 @@ # This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later. # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information. # +from collections import OrderedDict 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.shortcuts import render_to_response, get_object_or_404 +from django.http import HttpResponse, HttpResponseRedirect, Http404, HttpResponsePermanentRedirect, JsonResponse from django.core.urlresolvers import reverse from django.db.models import Q from django.contrib.auth.decorators import login_required, user_passes_test -from django.utils.datastructures import SortedDict from django.utils.http import urlquote_plus from django.utils import translation from django.utils.translation import get_language, ugettext as _, ugettext_lazy from django.views.decorators.vary import vary_on_headers -from ajaxable.utils import JSONResponse, AjaxableFormView +from ajaxable.utils import AjaxableFormView from catalogue import models from catalogue import forms +from .helpers import get_related_tags, get_fragment_related_tags, tags_usage_for_books, tags_usage_for_works, tags_usage_for_fragments from catalogue.utils import split_tags, MultiQuerySet, SortedMultiQuerySet from catalogue.templatetags.catalogue_tags import tag_list, collection_list from pdcounter import models as pdcounter_models @@ -30,33 +30,34 @@ from pdcounter import views as pdcounter_views from suggest.forms import PublishingSuggestForm from picture.models import Picture, PictureArea from picture.views import picture_list_thumb -import logging + staff_required = user_passes_test(lambda user: user.is_staff) permanent_cache = get_cache('permanent') @vary_on_headers('X-Requested-With') def catalogue(request): - cache_key='catalogue.catalogue/' + get_language() - output = permanent_cache.get(cache_key) + #cache_key = 'catalogue.catalogue/' + get_language() + #output = permanent_cache.get(cache_key) + output = None 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', []) + common_categories = ('author',) + split_categories = ('epoch', 'genre', 'kind') + + categories = split_tags(tags_usage_for_works(common_categories)) + book_categories = split_tags(tags_usage_for_books(split_categories)) + picture_categories = split_tags( + models.Tag.objects.usage_for_model(Picture, counts=True).filter( + category__in=split_categories)) + # we want global usage for themes + fragment_tags = list(tags_usage_for_fragments(('theme',))) collections = models.Collection.objects.all() render_tag_list = lambda x: render_to_string( 'catalogue/tag_list.html', tag_list(x)) - 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) + + def render_split(with_books, with_pictures): ctx = {} if with_books: ctx['books'] = render_tag_list(with_books) @@ -64,20 +65,20 @@ def catalogue(request): ctx['pictures'] = render_tag_list(with_pictures) return render_to_string('catalogue/tag_list_split.html', ctx) - output = {'theme': {}} + output = {} output['theme'] = render_tag_list(fragment_tags) - for category, tags in categories.items(): - if category in ('author', 'theme'): - output[category] = render_tag_list(tags) - else: - output[category] = render_split(tags) - - + for category in common_categories: + output[category] = render_tag_list(categories.get(category, [])) + for category in split_categories: + output[category] = render_split( + book_categories.get(category, []), + picture_categories.get(category, [])) + output['collections'] = render_to_string( 'catalogue/collection_list.html', collection_list(collections)) - permanent_cache.set(cache_key, output) + #permanent_cache.set(cache_key, output) if request.is_ajax(): - return JSONResponse(output) + return JsonResponse(output) else: return render_to_response('catalogue/catalogue.html', locals(), context_instance=RequestContext(request)) @@ -99,7 +100,7 @@ def book_list(request, filter=None, get_filter=None, if get_filter: filter = get_filter() books_by_author, orphans, books_by_parent = models.Book.book_list(filter) - books_nav = SortedDict() + books_nav = OrderedDict() for tag in books_by_author: if books_by_author[tag]: books_nav.setdefault(tag.sort_key[0], []).append(tag) @@ -143,7 +144,7 @@ def differentiate_tags(request, tags, ambiguous_slugs): beginning = '/'.join(tag.url_chunk for tag in tags) unparsed = '/'.join(ambiguous_slugs[1:]) options = [] - for tag in models.Tag.objects.exclude(category='book').filter(slug=ambiguous_slugs[0]): + for tag in models.Tag.objects.filter(slug=ambiguous_slugs[0]): options.append({ 'url_args': '/'.join((beginning, tag.url_chunk, unparsed)).strip('/'), 'tags': [tag] @@ -188,7 +189,7 @@ def tagged_object_list(request, tags=''): only_my_shelf = only_shelf and request.user.is_authenticated() and request.user == tags[0].user - objects = only_author = None + objects = None categories = {} object_queries = [] @@ -199,33 +200,22 @@ def tagged_object_list(request, tags=''): areas = PictureArea.tagged.with_all(fragment_tags) if shelf_tags: + # FIXME: book tags here 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.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'"]}) - - related_tags = [] - - 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}, - extra={'where': ["catalogue_tag.category != 'book'"]}) - related_tags = (tag for tag in related_tags if tag not in fragment_tags) - categories = split_tags(related_tags, categories) - + related_tags = get_fragment_related_tags(tags) + categories = split_tags(related_tags, categories) object_queries.insert(0, fragments) area_keys = [area.pk for area in areas.iterator()] if area_keys: related_tags = PictureArea.tags.usage(counts=True, filters={'pk__in': area_keys}) - related_tags = (tag for tag in related_tags if tag not in fragment_tags) - + related_tags = (tag for tag in related_tags if tag not in fragment_tags) + categories = split_tags(related_tags, categories) # we want the Pictures to go first @@ -233,62 +223,29 @@ def tagged_object_list(request, tags=''): objects = MultiQuerySet(*object_queries) else: if shelf_is_set: - books = models.Book.tagged.with_all(tags).order_by('sort_key_author') + books = models.Book.tagged.with_all(tags).order_by( + 'sort_key_author', 'title') else: - books = models.Book.tagged_top_level(tags).order_by('sort_key_author') - - pictures = Picture.tagged.with_all(tags).order_by('sort_key_author') - - if books.count() > 0: - # get related tags from `tag_counter` and `theme_counter` - related_counts = {} - tags_pks = [tag.pk for tag in tags] - for book in books: - for tag_pk, value in itertools.chain(book.tag_counter.iteritems(), book.theme_counter.iteritems()): - if tag_pk in tags_pks: - continue - related_counts[tag_pk] = related_counts.get(tag_pk, 0) + value - related_tags = models.Tag.objects.filter(pk__in=related_counts.keys()) - related_tags = [tag for tag in related_tags if tag not in tags] - for tag in related_tags: - tag.count = related_counts[tag.pk] - - categories = split_tags(related_tags) - del related_tags - - if pictures.count() > 0: - related_counts = {} - tags_pks = [tag.pk for tag in tags] - for picture in pictures: - for tag_pk, value in itertools.chain(picture.tag_counter.iteritems(), picture.theme_counter.iteritems()): - if tag_pk in tags_pks: - continue - logging.info("counting tag not in tags_pks: %d", tag_pk) - related_counts[tag_pk] = related_counts.get(tag_pk, 0) + value - related_tags = models.Tag.objects.filter(pk__in=related_counts.keys()) - related_tags = [tag for tag in related_tags if tag not in tags] - for tag in related_tags: - tag.count = related_counts[tag.pk] - - categories = split_tags(related_tags) - del related_tags - - logging.info("Returning %d picutres and %d books" % (pictures.count(), books.count())) - objects = SortedMultiQuerySet(pictures, books, order_by='sort_key_author') + books = models.Book.tagged_top_level(tags).order_by( + 'sort_key_author', 'title') + + pictures = Picture.tagged.with_all(tags).order_by( + 'sort_key_author', 'title') + categories = split_tags(get_related_tags(tags)) + + objects = SortedMultiQuerySet(pictures, books, + order_by=('sort_key_author', 'title')) if not objects: - only_author = len(tags) == 1 and tags[0].category == 'author' objects = models.Book.objects.none() - return render_to_response('catalogue/tagged_object_list.html', { 'object_list': objects, 'categories': categories, 'only_shelf': only_shelf, - 'only_author': only_author, 'only_my_shelf': only_my_shelf, 'formats_form': forms.DownloadFormatsForm(), 'tags': tags, @@ -299,10 +256,9 @@ def tagged_object_list(request, tags=''): def book_fragments(request, slug, theme_slug): book = get_object_or_404(models.Book, slug=slug) - - book_tag = book.book_tag() theme = get_object_or_404(models.Tag, slug=theme_slug, category='theme') - fragments = models.Fragment.tagged.with_all([book_tag, theme]) + fragments = models.Fragment.tagged.with_all([theme]).filter( + Q(book=book) | Q(book__ancestor=book)) return render_to_response('catalogue/book_fragments.html', locals(), context_instance=RequestContext(request)) @@ -363,7 +319,6 @@ def book_text(request, slug): if not book.has_html_file(): raise Http404 - related = book.related_info() return render_to_response('catalogue/book_text.html', locals(), context_instance=RequestContext(request)) @@ -453,9 +408,9 @@ def _tags_starting_with(prefix, user=None): books = models.Book.objects.filter(_word_starts_with('title', prefix)) tags = models.Tag.objects.filter(_word_starts_with('name', prefix)) if user and user.is_authenticated(): - tags = tags.filter(~Q(category='book') & (~Q(category='set') | Q(user=user))) + tags = tags.filter(~Q(category='set') | Q(user=user)) else: - tags = tags.filter(~Q(category='book') & ~Q(category='set')) + tags = tags.exclude(category='set') prefix_regexp = re.compile(_word_starts_with_regexp(prefix)) return list(books) + list(tags) + [app for app in _apps if prefix_regexp.search(app.lower)] + list(book_stubs) + list(authors) @@ -505,7 +460,7 @@ def find_best_matches(query, user=None): book_titles = set(match.pretty_title().lower() for match in result if isinstance(match, models.Book)) authors = set(match.name.lower() for match in result - if isinstance(match, models.Tag) and match.category=='author') + if isinstance(match, models.Tag) and match.category == 'author') result = tuple(res for res in result if not ( (isinstance(res, pdcounter_models.BookStub) and res.pretty_title().lower() in book_titles) or (isinstance(res, pdcounter_models.Author) and res.name.lower() in authors) @@ -574,7 +529,7 @@ def json_tags_starting_with(request, callback=None): result = [prefix, tags_list] else: result = {"matches": tags_list} - return JSONResponse(result, callback) + return JsonResponse(result, callback) # =========