# 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, render
+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 ugettext as _, ugettext_lazy
-from django.views.decorators.cache import never_cache
-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 ajaxable.utils import AjaxableFormView
from pdcounter import models as pdcounter_models
from pdcounter import views as pdcounter_views
+from picture.models import Picture, PictureArea
+from picture.views import picture_list_thumb
+from ssify import ssi_included, ssi_expect, SsiVariable as V
from suggest.forms import PublishingSuggestForm
-from picture.models import Picture
+from catalogue import forms
+from catalogue.helpers import get_top_level_related_tags
+from catalogue import models
+from catalogue.utils import split_tags, MultiQuerySet, SortedMultiQuerySet
+from catalogue.templatetags.catalogue_tags import tag_list, collection_list
staff_required = user_passes_test(lambda user: user.is_staff)
-permanent_cache = get_cache('permanent')
-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', [])
+def catalogue(request, as_json=False):
+ common_categories = ('author',)
+ split_categories = ('epoch', 'genre', 'kind')
+
+ categories = split_tags(
+ get_top_level_related_tags(categories=common_categories),
+ models.Tag.objects.usage_for_model(
+ models.Fragment, counts=True).filter(category='theme'),
+ models.Tag.objects.usage_for_model(
+ Picture, counts=True).filter(category__in=common_categories),
+ models.Tag.objects.usage_for_model(
+ PictureArea, counts=True).filter(
+ category='theme')
+ )
+ book_categories = split_tags(
+ get_top_level_related_tags(categories=split_categories)
+ )
+ picture_categories = split_tags(
+ models.Tag.objects.usage_for_model(
+ Picture, counts=True).filter(
+ category__in=split_categories),
+ )
+
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)}
- for category, tags in categories.items():
- output[category] = render_tag_list(tags)
- output['collections'] = render_to_string(
- 'catalogue/collection_list.html', collection_list(collections))
- return JSONResponse(output)
+ def render_tag_list(tags):
+ render_to_string('catalogue/tag_list.html', tag_list(tags))
+
+ def render_split(with_books, with_pictures):
+ 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 = {}
+ output['theme'] = render_tag_list(categories.get('theme', []))
+ 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))
+ if as_json:
+ 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',
+@ssi_included
+def catalogue_json(request):
+ return catalogue(request, True)
+
+
+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 """
- 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))
+ if get_filter:
+ filter = get_filter()
+ books_by_author, orphans, books_by_parent = models.Book.book_list(filter)
+ books_nav = OrderedDict()
+ 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())
return render_to_response(template_name, locals(),
context_instance=RequestContext(request))
return book_list(request, Q(media__type='mp3') | Q(media__type='ogg'),
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',
- 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),
- template_name='catalogue/collection.html',
- cache_key='catalogue.collection:%s' % coll.slug,
+ 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,
context={'collection': coll})
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]
context_instance=RequestContext(request))
-@never_cache
+# TODO: Rewrite this hellish piece of code which tries to do everything
def tagged_object_list(request, tags=''):
+ # preliminary tests and conditions
try:
tags = models.Tag.get_tag_list(tags)
except models.Tag.DoesNotExist:
+ # Perhaps the user is asking about an author in Public Domain
+ # counter (they are not represented in tags)
chunks = tags.split('/')
if len(chunks) == 2 and chunks[0] == 'autor':
return pdcounter_views.author_detail(request, chunks[1])
else:
raise Http404
except models.Tag.MultipleObjectsReturned, e:
+ # Ask the user to disambiguate
return differentiate_tags(request, e.tags, e.ambiguous_slugs)
except models.Tag.UrlDeprecationWarning, e:
return HttpResponsePermanentRedirect(reverse('tagged_object_list', args=['/'.join(tag.url_chunk for tag in e.tags)]))
except AttributeError:
pass
- if len([tag for tag in tags if tag.category == 'book']):
- raise Http404
-
+ # beginning of digestion
theme_is_set = [tag for tag in tags if tag.category == 'theme']
shelf_is_set = [tag for tag in tags if tag.category == 'set']
only_shelf = shelf_is_set and len(tags) == 1
only_my_shelf = only_shelf and request.user.is_authenticated() and request.user == tags[0].user
+ tags_pks = [tag.pk for tag in tags]
- objects = only_author = None
- categories = {}
+ objects = None
if theme_is_set:
shelf_tags = [tag for tag in tags if tag.category == 'set']
fragment_tags = [tag for tag in tags if tag.category != 'set']
fragments = models.Fragment.tagged.with_all(fragment_tags)
+ areas = PictureArea.tagged.with_all(fragment_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.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.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)
-
- objects = fragments
+ fragments = fragments.filter(Q(book__in=books) | Q(book__ancestor__in=books))
+ areas = PictureArea.objects.none()
+
+ categories = split_tags(
+ models.Tag.objects.usage_for_queryset(fragments, counts=True
+ ).exclude(pk__in=tags_pks),
+ models.Tag.objects.usage_for_queryset(areas, counts=True
+ ).exclude(pk__in=tags_pks)
+ )
+
+ # we want the Pictures to go first
+ objects = MultiQuerySet(areas, fragments)
else:
+ all_books = models.Book.tagged.with_all(tags)
if shelf_is_set:
- objects = models.Book.tagged.with_all(tags)
+ books = all_books.order_by('sort_key_author', 'title')
+ pictures = Pictures.objects.none()
+ related_book_tags = models.Tag.objects.usage_for_queryset(
+ books, counts=True).exclude(
+ category='set').exclude(pk__in=tags_pks)
else:
- objects = models.Book.tagged_top_level(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 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 not objects:
- only_author = len(tags) == 1 and tags[0].category == 'author'
- objects = models.Book.objects.none()
-
- # Add pictures
- objects = MultiQuerySet(Picture.tagged.with_all(tags), objects)
+ 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')
+ related_book_tags = get_top_level_related_tags(tags)
+
+ fragments = models.Fragment.objects.filter(book__in=all_books)
+ areas = PictureArea.objects.filter(picture__in=pictures)
+
+ categories = split_tags(
+ related_book_tags,
+ models.Tag.objects.usage_for_queryset(
+ pictures, counts=True).exclude(pk__in=tags_pks),
+ models.Tag.objects.usage_for_queryset(
+ fragments, counts=True).filter(
+ category='theme').exclude(pk__in=tags_pks),
+ models.Tag.objects.usage_for_queryset(
+ areas, counts=True).filter(
+ category__in=('theme', 'thing')).exclude(
+ pk__in=tags_pks),
+ )
+
+ objects = SortedMultiQuerySet(pictures, books,
+ order_by=('sort_key_author', 'title'))
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,
+ 'tags_ids': tags_pks,
'theme_is_set': theme_is_set,
},
context_instance=RequestContext(request))
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))
-@never_cache
def book_detail(request, slug):
try:
book = models.Book.objects.get(slug=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))
def unicode_re_escape(query):
""" Unicode-friendly version of re.escape """
- return re.sub('(?u)(\W)', r'\\\1', query)
+ return re.sub(r'(?u)(\W)', r'\\\1', query)
def _word_starts_with(name, prefix):
"""returns a Q object getting models having `name` contain a word
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)
def _get_result_type(match):
if isinstance(match, models.Book) or isinstance(match, pdcounter_models.BookStub):
- type = 'book'
+ match_type = 'book'
else:
- type = match.category
- return type
+ match_type = match.category
+ return match_type
def books_starting_with(prefix):
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)
result = [prefix, tags_list]
else:
result = {"matches": tags_list}
- return JSONResponse(result, callback)
+ return JsonResponse(result, callback)
# =========
def context_description(self, request, obj):
return obj.pretty_title()
+
+
+####
+# Includes
+####
+
+
+@ssi_included
+def book_mini(request, pk, with_link=True):
+ book = get_object_or_404(models.Book, pk=pk)
+ author_str = ", ".join(tag.name
+ for tag in book.tags.filter(category='author'))
+ return render(request, 'catalogue/book_mini_box.html', {
+ 'book': book,
+ 'author_str': author_str,
+ 'with_link': with_link,
+ 'show_lang': book.language_code() != settings.LANGUAGE_CODE,
+ })
+
+
+@ssi_included(get_ssi_vars=lambda pk: (lambda ipk: (
+ ('ssify.get_csrf_token',),
+ ('social_tags.likes_book', (ipk,)),
+ ('social_tags.book_shelf_tags', (ipk,)),
+ ))(ssi_expect(pk, int)))
+def book_short(request, pk):
+ book = get_object_or_404(models.Book, pk=pk)
+ stage_note, stage_note_url = book.stage_note()
+
+ return render(request, 'catalogue/book_short.html', {
+ 'book': book,
+ 'has_audio': book.has_media('mp3'),
+ 'main_link': book.get_absolute_url(),
+ 'parents': book.parents(),
+ 'tags': split_tags(book.tags.exclude(category__in=('set', 'theme'))),
+ 'show_lang': book.language_code() != settings.LANGUAGE_CODE,
+ 'stage_note': stage_note,
+ 'stage_note_url': stage_note_url,
+ })
+
+
+@ssi_included(get_ssi_vars=lambda pk: book_short.get_ssi_vars(pk) +
+ (lambda ipk: (
+ ('social_tags.choose_cite', [ipk]),
+ ('catalogue_tags.choose_fragment', [ipk], {
+ 'unless': V('social_tags.choose_cite', [ipk])}),
+ ))(ssi_expect(pk, int)))
+def book_wide(request, pk):
+ book = get_object_or_404(models.Book, pk=pk)
+ stage_note, stage_note_url = book.stage_note()
+ extra_info = book.extra_info
+
+ return render(request, 'catalogue/book_wide.html', {
+ 'book': book,
+ 'has_audio': book.has_media('mp3'),
+ 'parents': book.parents(),
+ 'tags': split_tags(book.tags.exclude(category__in=('set', 'theme'))),
+ 'show_lang': book.language_code() != settings.LANGUAGE_CODE,
+ 'stage_note': stage_note,
+ 'stage_note_url': stage_note_url,
+
+ 'main_link': reverse('book_text', args=[book.slug]) if book.html_file else None,
+ 'extra_info': extra_info,
+ 'hide_about': extra_info.get('about', '').startswith('http://wiki.wolnepodreczniki.pl'),
+ 'themes': book.related_themes(),
+ })
+
+
+@ssi_included
+def fragment_short(request, pk):
+ fragment = get_object_or_404(models.Fragment, pk=pk)
+ return render(request, 'catalogue/fragment_short.html',
+ {'fragment': fragment})
+
+
+@ssi_included
+def fragment_promo(request, pk):
+ fragment = get_object_or_404(models.Fragment, pk=pk)
+ return render(request, 'catalogue/fragment_promo.html', {
+ 'fragment': fragment
+ })
fnp / wolnelektury.git / blobdiff