X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/396d3bd5f45d384a1bfad490cefd3c2999e0685f..b6acaa277803adf1f39dd61b362ca499b1bb6064:/src/catalogue/views.py diff --git a/src/catalogue/views.py b/src/catalogue/views.py index e2d449c30..f6d6cd5eb 100644 --- a/src/catalogue/views.py +++ b/src/catalogue/views.py @@ -3,51 +3,51 @@ # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information. # from collections import OrderedDict -import re import random from django.conf import settings +from django.http.response import HttpResponseForbidden from django.template import RequestContext from django.template.loader import render_to_string from django.shortcuts import render_to_response, get_object_or_404, render, redirect -from django.http import HttpResponse, HttpResponseRedirect, Http404, HttpResponsePermanentRedirect, JsonResponse +from django.http import HttpResponse, HttpResponseRedirect, Http404, HttpResponsePermanentRedirect from django.core.urlresolvers import reverse -from django.db.models import Q +from django.db.models import Q, QuerySet from django.contrib.auth.decorators import login_required, user_passes_test from django.utils.http import urlquote_plus from django.utils import translation from django.utils.translation import ugettext as _, ugettext_lazy from ajaxable.utils import AjaxableFormView -from pdcounter.models import BookStub, Author from pdcounter import views as pdcounter_views +from paypal.rest import user_is_subscribed from picture.models import Picture, PictureArea from ssify import ssi_included, ssi_expect, SsiVariable as Var -from suggest.forms import PublishingSuggestForm from catalogue import constants from catalogue import forms from catalogue.helpers import get_top_level_related_tags from catalogue.models import Book, Collection, Tag, Fragment from catalogue.utils import split_tags +from catalogue.models.tag import prefetch_relations +from wolnelektury.utils import is_crawler staff_required = user_passes_test(lambda user: user.is_staff) def catalogue(request): return render(request, 'catalogue/catalogue.html', { - 'books': Book.objects.filter(parent=None).order_by('sort_key_author', 'sort_key'), - 'pictures': Picture.objects.order_by('sort_key_author', 'sort_key'), + 'books': Book.objects.filter(parent=None), + 'pictures': Picture.objects.all(), 'collections': Collection.objects.all(), + 'active_menu_item': 'all_works', }) -def book_list(request, filter=None, get_filter=None, template_name='catalogue/book_list.html', +def book_list(request, filters=None, template_name='catalogue/book_list.html', nav_template_name='catalogue/snippets/book_list_nav.html', - list_template_name='catalogue/snippets/book_list.html', context=None): - """ generates a listing of all books, optionally filtered with a test function """ - if get_filter: - filter = get_filter() - books_by_author, orphans, books_by_parent = Book.book_list(filter) + list_template_name='catalogue/snippets/book_list.html'): + """ generates a listing of all books, optionally filtered """ + books_by_author, orphans, books_by_parent = Book.book_list(filters) books_nav = OrderedDict() for tag in books_by_author: if books_by_author[tag]: @@ -63,28 +63,8 @@ def book_list(request, filter=None, get_filter=None, template_name='catalogue/bo }, context_instance=RequestContext(request)) -def audiobook_list(request): - books = Book.objects.filter(media__type__in=('mp3', 'ogg')).distinct().order_by( - 'sort_key_author', 'sort_key') - books = list(books) - if len(books) > 3: - best = random.sample(books, 3) - else: - best = books - - daisy = Book.objects.filter(media__type='daisy').distinct().order_by('sort_key_author', 'sort_key') - - return render(request, 'catalogue/audiobook_list.html', { - 'books': books, - 'best': best, - 'daisy': daisy, - }) - - def daisy_list(request): - return book_list(request, Q(media__type='daisy'), - template_name='catalogue/daisy_list.html', - ) + return book_list(request, Q(media__type='daisy'), template_name='catalogue/daisy_list.html') def collection(request, slug): @@ -106,28 +86,98 @@ def differentiate_tags(request, tags, ambiguous_slugs): context_instance=RequestContext(request)) -# TODO: Rewrite this hellish piece of code which tries to do everything -def tagged_object_list(request, tags='', list_type='default'): - raw_tags = tags - # preliminary tests and conditions - gallery = list_type == 'gallery' - audiobooks = list_type == 'audiobooks' +def object_list(request, objects, fragments=None, related_tags=None, tags=None, list_type='books', extra=None): + if not tags: + tags = [] + tag_ids = [tag.pk for tag in tags] + + related_tag_lists = [] + if related_tags: + related_tag_lists.append(related_tags) + else: + related_tag_lists.append( + Tag.objects.usage_for_queryset(objects, counts=True).exclude(category='set').exclude(pk__in=tag_ids)) + if not (extra and extra.get('theme_is_set')): + if fragments is None: + if list_type == 'gallery': + fragments = PictureArea.objects.filter(picture__in=objects) + else: + fragments = Fragment.objects.filter(book__in=objects) + related_tag_lists.append( + Tag.objects.usage_for_queryset(fragments, counts=True).filter(category='theme').exclude(pk__in=tag_ids) + .only('name', 'sort_key', 'category', 'slug')) + if isinstance(objects, QuerySet): + objects = prefetch_relations(objects, 'author') + + categories = split_tags(*related_tag_lists) + + objects = list(objects) + + if not objects and len(tags) == 1 and list_type == 'books': + if PictureArea.tagged.with_any(tags).exists() or Picture.tagged.with_any(tags).exists(): + return redirect('tagged_object_list_gallery', '/'.join(tag.url_chunk for tag in tags)) + + if len(objects) > 3: + best = random.sample(objects, 3) + else: + best = objects + + result = { + 'object_list': objects, + 'categories': categories, + 'list_type': list_type, + 'tags': tags, + + 'formats_form': forms.DownloadFormatsForm(), + 'best': best, + 'active_menu_item': list_type, + } + if extra: + result.update(extra) + return render_to_response( + 'catalogue/tagged_object_list.html', result, + context_instance=RequestContext(request)) + + +def literature(request): + books = Book.objects.filter(parent=None) + return object_list(request, books, related_tags=get_top_level_related_tags([])) + + +def gallery(request): + return object_list(request, Picture.objects.all(), list_type='gallery') + + +def audiobooks(request): + audiobooks = Book.objects.filter(media__type__in=('mp3', 'ogg')).distinct() + return object_list(request, audiobooks, list_type='audiobooks', extra={ + 'daisy': Book.objects.filter(media__type='daisy').distinct(), + }) + + +class ResponseInstead(Exception): + def __init__(self, response): + super(ResponseInstead, self).__init__() + self.response = response + + +def analyse_tags(request, tag_str): try: - tags = Tag.get_tag_list(tags) + tags = Tag.get_tag_list(tag_str) except Tag.DoesNotExist: # Perhaps the user is asking about an author in Public Domain # counter (they are not represented in tags) - chunks = tags.split('/') + chunks = tag_str.split('/') if len(chunks) == 2 and chunks[0] == 'autor': - return pdcounter_views.author_detail(request, chunks[1]) + raise ResponseInstead(pdcounter_views.author_detail(request, chunks[1])) else: raise Http404 except Tag.MultipleObjectsReturned, e: # Ask the user to disambiguate - return differentiate_tags(request, e.tags, e.ambiguous_slugs) + raise ResponseInstead(differentiate_tags(request, e.tags, e.ambiguous_slugs)) except Tag.UrlDeprecationWarning, e: - return HttpResponsePermanentRedirect( - reverse('tagged_object_list', args=['/'.join(tag.url_chunk for tag in e.tags)])) + raise ResponseInstead(HttpResponsePermanentRedirect( + reverse('tagged_object_list', args=['/'.join(tag.url_chunk for tag in e.tags)]))) try: if len(tags) > settings.MAX_TAG_LIST: @@ -135,119 +185,72 @@ def tagged_object_list(request, tags='', list_type='default'): except AttributeError: pass - # beginning of digestion - theme_is_set = any(tag.category == 'theme' for tag in tags) - shelf_is_set = any(tag.category == 'set' for tag in tags) - only_shelf = shelf_is_set and len(tags) == 1 - only_my_shelf = only_shelf and request.user == tags[0].user - tags_pks = [tag.pk for tag in tags] + return tags - if gallery and shelf_is_set: - raise Http404 - daisy = None - if theme_is_set: - # Only fragments (or pirctureareas) here. - shelf_tags = [tag for tag in tags if tag.category == 'set'] - fragment_tags = [tag for tag in tags if tag.category != 'set'] - if gallery: - fragments = PictureArea.tagged.with_all(fragment_tags) - else: - fragments = Fragment.tagged.with_all(fragment_tags) +def theme_list(request, tags, list_type): + shelf_tags = [tag for tag in tags if tag.category == 'set'] + fragment_tags = [tag for tag in tags if tag.category != 'set'] + if list_type == 'gallery': + fragments = PictureArea.tagged.with_all(fragment_tags) + else: + fragments = Fragment.tagged.with_all(fragment_tags) - if shelf_tags: - # TODO: Pictures on shelves not supported yet. - books = Book.tagged.with_all(shelf_tags).order_by() - fragments = fragments.filter(Q(book__in=books) | Q(book__ancestor__in=books)) + if shelf_tags: + # TODO: Pictures on shelves not supported yet. + books = Book.tagged.with_all(shelf_tags).order_by() + fragments = fragments.filter(Q(book__in=books) | Q(book__ancestor__in=books)) - categories = split_tags( - Tag.objects.usage_for_queryset(fragments, counts=True).exclude(pk__in=tags_pks), - ) + if not fragments and len(tags) == 1 and list_type == 'books': + if PictureArea.tagged.with_any(tags).exists() or Picture.tagged.with_any(tags).exists(): + return redirect('tagged_object_list_gallery', '/'.join(tag.url_chunk for tag in tags)) - objects = fragments - else: - if gallery: - # TODO: Pictures on shelves not supported yet. - if tags: - objects = Picture.tagged.with_all(tags) - else: - objects = Picture.objects.all() - areas = PictureArea.objects.filter(picture__in=objects) - categories = split_tags( - Tag.objects.usage_for_queryset( - objects, counts=True).exclude(pk__in=tags_pks), - Tag.objects.usage_for_queryset( - areas, counts=True).filter( - category__in=('theme', 'thing')).exclude( - pk__in=tags_pks), - ) - else: - if audiobooks: - all_books = Book.objects.filter(media__type__in=('mp3', 'ogg')).distinct() - if tags: - all_books = Book.tagged.with_all(tags, all_books) - objects = all_books - # there's never only the daisy audiobook - daisy = objects.filter(media__type='daisy').distinct().order_by('sort_key_author', 'sort_key') - related_book_tags = Tag.objects.usage_for_queryset( - objects, counts=True).exclude( - category='set').exclude(pk__in=tags_pks) - else: - if tags: - all_books = Book.tagged.with_all(tags) - else: - all_books = Book.objects.filter(parent=None) - if shelf_is_set: - objects = all_books - related_book_tags = Tag.objects.usage_for_queryset( - objects, counts=True).exclude( - category='set').exclude(pk__in=tags_pks) - else: - if tags: - objects = Book.tagged_top_level(tags) - else: - objects = all_books - related_book_tags = get_top_level_related_tags(tags) - - fragments = Fragment.objects.filter(book__in=all_books) - - categories = split_tags( - related_book_tags, - Tag.objects.usage_for_queryset( - fragments, counts=True).filter( - category='theme').exclude(pk__in=tags_pks), - ) - objects = objects.order_by('sort_key_author', 'sort_key') + return object_list(request, fragments, tags=tags, list_type=list_type, extra={ + 'theme_is_set': True, + 'active_menu_item': 'theme', + }) - objects = list(objects) - if len(objects) > 3: - best = random.sample(objects, 3) - else: - best = objects - if not gallery and not objects and len(tags) == 1: - tag = tags[0] - if tag.category in ('theme', 'thing') and ( - PictureArea.tagged.with_any([tag]).exists() or - Picture.tagged.with_any([tag]).exists()): - return redirect('tagged_object_list_gallery', raw_tags) +def tagged_object_list(request, tags, list_type): + try: + tags = analyse_tags(request, tags) + except ResponseInstead as e: + return e.response - return render_to_response( - 'catalogue/tagged_object_list.html', - { - 'object_list': objects, - 'categories': categories, - 'only_shelf': only_shelf, - 'only_my_shelf': only_my_shelf, - 'formats_form': forms.DownloadFormatsForm(), - 'tags': tags, - 'tag_ids': tags_pks, - 'theme_is_set': theme_is_set, - 'best': best, - 'list_type': list_type, - 'daisy': daisy, - }, - context_instance=RequestContext(request)) + if is_crawler(request) and len(tags) > 1: + return HttpResponseForbidden('address removed from crawling. check robots.txt') + + if list_type == 'gallery' and any(tag.category == 'set' for tag in tags): + raise Http404 + + if any(tag.category in ('theme', 'thing') for tag in tags): + return theme_list(request, tags, list_type=list_type) + + if list_type == 'books': + books = Book.tagged.with_all(tags) + + if any(tag.category == 'set' for tag in tags): + params = {'objects': books} + else: + params = { + 'objects': Book.tagged_top_level(tags), + 'fragments': Fragment.objects.filter(book__in=books), + 'related_tags': get_top_level_related_tags(tags), + } + elif list_type == 'gallery': + params = {'objects': Picture.tagged.with_all(tags)} + elif list_type == 'audiobooks': + audiobooks = Book.objects.filter(media__type__in=('mp3', 'ogg')).distinct() + params = { + 'objects': Book.tagged.with_all(tags, audiobooks), + 'extra': { + 'daisy': Book.tagged.with_all(tags, audiobooks.filter(media__type='daisy').distinct()), + } + } + else: + raise Http404 + + return object_list(request, tags=tags, list_type=list_type, **params) def book_fragments(request, slug, theme_slug): @@ -260,6 +263,7 @@ def book_fragments(request, slug, theme_slug): 'book': book, 'theme': theme, 'fragments': fragments, + 'active_menu_item': 'books', }, context_instance=RequestContext(request)) @@ -271,51 +275,18 @@ def book_detail(request, slug): return render_to_response('catalogue/book_detail.html', { 'book': book, - 'tags': book.tags.exclude(category__in=('set', 'theme')), 'book_children': book.children.all().order_by('parent_number', 'sort_key'), + 'active_menu_item': 'books', }, context_instance=RequestContext(request)) -def get_audiobooks(book): - ogg_files = {} - 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').iterator(): - # ogg files are always from the same project - meta = mp3.extra_info - project = meta.get('project') - if not project: - # temporary fallback - project = u'CzytamySłuchając' - - projects.add((project, meta.get('funded_by', ''))) - - media = {'mp3': mp3} - - ogg = ogg_files.get(mp3.name) - if ogg: - media['ogg'] = ogg - else: - have_oggs = False - audiobooks.append(media) - - projects = sorted(projects) - return audiobooks, projects, have_oggs - - -# używane tylko do audiobook_tree, które jest używane tylko w snippets/audiobook_list.html, które nie jest używane +# używane w publicznym interfejsie def player(request, slug): book = get_object_or_404(Book, slug=slug) if not book.has_media('mp3'): raise Http404 - audiobooks, projects, have_oggs = get_audiobooks(book) - - # extra_info = book.extra_info + audiobooks, projects = book.get_audiobooks() return render_to_response('catalogue/player.html', { 'book': book, @@ -328,234 +299,12 @@ def player(request, slug): def book_text(request, slug): book = get_object_or_404(Book, slug=slug) + if book.preview and not user_is_subscribed(request.user): + return HttpResponseRedirect(book.get_absolute_url()) + if not book.has_html_file(): raise Http404 - return render_to_response('catalogue/book_text.html', {'book': book,}, context_instance=RequestContext(request)) - - -# ========== -# = Search = -# ========== - -def _no_diacritics_regexp(query): - """ returns a regexp for searching for a query without diacritics - - should be locale-aware """ - names = { - u'a': u'aąĄ', u'c': u'cćĆ', u'e': u'eęĘ', u'l': u'lłŁ', u'n': u'nńŃ', u'o': u'oóÓ', u's': u'sśŚ', - u'z': u'zźżŹŻ', - u'ą': u'ąĄ', u'ć': u'ćĆ', u'ę': u'ęĘ', u'ł': u'łŁ', u'ń': u'ńŃ', u'ó': u'óÓ', u'ś': u'śŚ', u'ź': u'źŹ', - u'ż': u'żŻ' - } - - def repl(m): - l = m.group() - return u"(%s)" % '|'.join(names[l]) - - return re.sub(u'[%s]' % (u''.join(names.keys())), repl, query) - - -def unicode_re_escape(query): - """ Unicode-friendly version of re.escape """ - 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 - starting with `prefix` - - We define word characters as alphanumeric and underscore, like in JS. - - Works for MySQL, PostgreSQL, Oracle. - For SQLite, _sqlite* version is substituted for this. - """ - kwargs = {} - - prefix = _no_diacritics_regexp(unicode_re_escape(prefix)) - # can't use [[:<:]] (word start), - # but we want both `xy` and `(xy` to catch `(xyz)` - kwargs['%s__iregex' % name] = u"(^|[^[:alnum:]_])%s" % prefix - - return Q(**kwargs) - - -def _word_starts_with_regexp(prefix): - prefix = _no_diacritics_regexp(unicode_re_escape(prefix)) - return ur"(^|(?<=[^\wąćęłńóśźżĄĆĘŁŃÓŚŹŻ]))%s" % prefix - - -def _sqlite_word_starts_with(name, prefix): - """ version of _word_starts_with for SQLite - - SQLite in Django uses Python re module - """ - kwargs = {'%s__iregex' % name: _word_starts_with_regexp(prefix)} - return Q(**kwargs) - - -if hasattr(settings, 'DATABASES'): - if settings.DATABASES['default']['ENGINE'] == 'django.db.backends.sqlite3': - _word_starts_with = _sqlite_word_starts_with -elif settings.DATABASE_ENGINE == 'sqlite3': - _word_starts_with = _sqlite_word_starts_with - - -class App: - def __init__(self, name, view): - self.name = name - self._view = view - self.lower = name.lower() - self.category = 'application' - - def view(self): - return reverse(*self._view) - -_apps = ( - App(u'Leśmianator', (u'lesmianator', )), - ) - - -def _tags_starting_with(prefix, user=None): - prefix = prefix.lower() - # PD counter - book_stubs = BookStub.objects.filter(_word_starts_with('title', prefix)) - authors = Author.objects.filter(_word_starts_with('name', prefix)) - - books = Book.objects.filter(_word_starts_with('title', prefix)) - tags = Tag.objects.filter(_word_starts_with('name', prefix)) - if user and user.is_authenticated(): - tags = tags.filter(~Q(category='set') | Q(user=user)) - else: - 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_link(match, tag_list): - if isinstance(match, Tag): - return reverse('catalogue.views.tagged_object_list', - kwargs={'tags': '/'.join(tag.url_chunk for tag in tag_list + [match])}) - elif isinstance(match, App): - return match.view() - else: - return match.get_absolute_url() - - -def _get_result_type(match): - if isinstance(match, Book) or isinstance(match, BookStub): - match_type = 'book' - else: - match_type = match.category - return match_type - - -def books_starting_with(prefix): - prefix = prefix.lower() - return Book.objects.filter(_word_starts_with('title', prefix)) - - -def find_best_matches(query, user=None): - """ Finds a Book, Tag, BookStub or Author best matching a query. - - Returns a with: - - zero elements when nothing is found, - - one element when a best result is found, - - more then one element on multiple exact matches - - Raises a ValueError on too short a query. - """ - - query = query.lower() - if len(query) < 2: - raise ValueError("query must have at least two characters") - - result = tuple(_tags_starting_with(query, user)) - # remove pdcounter stuff - book_titles = set(match.pretty_title().lower() for match in result - if isinstance(match, Book)) - authors = set(match.name.lower() for match in result - if isinstance(match, Tag) and match.category == 'author') - result = tuple(res for res in result if not ( - (isinstance(res, BookStub) and res.pretty_title().lower() in book_titles) or - (isinstance(res, Author) and res.name.lower() in authors) - )) - - exact_matches = tuple(res for res in result if res.name.lower() == query) - if exact_matches: - return exact_matches - else: - return tuple(result)[:1] - - -def search(request): - tags = request.GET.get('tags', '') - prefix = request.GET.get('q', '') - - try: - tag_list = Tag.get_tag_list(tags) - except (Tag.DoesNotExist, Tag.MultipleObjectsReturned, Tag.UrlDeprecationWarning): - tag_list = [] - - try: - result = find_best_matches(prefix, request.user) - except ValueError: - return render_to_response( - 'catalogue/search_too_short.html', {'tags': tag_list, 'prefix': prefix}, - context_instance=RequestContext(request)) - - if len(result) == 1: - return HttpResponseRedirect(_get_result_link(result[0], tag_list)) - elif len(result) > 1: - return render_to_response( - 'catalogue/search_multiple_hits.html', - { - 'tags': tag_list, 'prefix': prefix, - 'results': ((x, _get_result_link(x, tag_list), _get_result_type(x)) for x in result) - }, - context_instance=RequestContext(request)) - else: - form = PublishingSuggestForm(initial={"books": prefix + ", "}) - return render_to_response( - 'catalogue/search_no_hits.html', - {'tags': tag_list, 'prefix': prefix, "pubsuggest_form": form}, - context_instance=RequestContext(request)) - - -def tags_starting_with(request): - prefix = request.GET.get('q', '') - # Prefix must have at least 2 characters - if len(prefix) < 2: - return HttpResponse('') - tags_list = [] - result = "" - for tag in _tags_starting_with(prefix, request.user): - if tag.name not in tags_list: - result += "\n" + tag.name - tags_list.append(tag.name) - return HttpResponse(result) - - -def json_tags_starting_with(request, callback=None): - # Callback for JSONP - prefix = request.GET.get('q', '') - callback = request.GET.get('callback', '') - # Prefix must have at least 2 characters - if len(prefix) < 2: - return HttpResponse('') - tags_list = [] - for tag in _tags_starting_with(prefix, request.user): - if tag.name not in tags_list: - tags_list.append(tag.name) - if request.GET.get('mozhint', ''): - result = [prefix, tags_list] - else: - result = {"matches": tags_list} - response = JsonResponse(result, safe=False) - if callback: - response.content = callback + "(" + response.content + ");" - return response + return render_to_response('catalogue/book_text.html', {'book': book}, context_instance=RequestContext(request)) # ========= @@ -598,6 +347,18 @@ def tag_info(request, tag_id): return HttpResponse(tag.description) +def embargo_link(request, format_, slug): + book = get_object_or_404(Book, slug=slug) + if format_ not in Book.formats: + raise Http404 + media_file = book.get_media(format_) + if not book.preview: + return HttpResponseRedirect(media_file.url) + if not user_is_subscribed(request.user): + return HttpResponseRedirect(book.get_absolute_url()) + return HttpResponse(media_file, content_type=constants.EBOOK_CONTENT_TYPES[format_]) + + def download_zip(request, format, slug=None): if format in Book.ebook_formats: url = Book.zip_format(format) @@ -613,6 +374,7 @@ class CustomPDFFormView(AjaxableFormView): form_class = forms.CustomPDFForm title = ugettext_lazy('Download custom PDF') submit = ugettext_lazy('Download') + template = 'catalogue/custom_pdf_form.html' honeypot = True def __call__(self, *args, **kwargs): @@ -624,8 +386,15 @@ class CustomPDFFormView(AjaxableFormView): """Override to parse view args and give additional args to the form.""" return (obj,), {} + def validate_object(self, obj, request): + book = obj + if book.preview and not user_is_subscribed(request.user): + return HttpResponseRedirect(book.get_absolute_url()) + return super(CustomPDFFormView, self).validate_object(obj, request) + def get_object(self, request, slug, *args, **kwargs): - return get_object_or_404(Book, slug=slug) + book = get_object_or_404(Book, slug=slug) + return book def context_description(self, request, obj): return obj.pretty_title() @@ -638,13 +407,14 @@ class CustomPDFFormView(AjaxableFormView): @ssi_included def book_mini(request, pk, with_link=True): - book = get_object_or_404(Book, pk=pk) - author_str = ", ".join(tag.name for tag in book.tags.filter(category='author')) + # book = get_object_or_404(Book, pk=pk) + try: + book = Book.objects.only('cover_thumb', 'title', 'language', 'slug').get(pk=pk) + except Book.DoesNotExist: + raise Http404 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, + 'no_link': not with_link, }) @@ -655,20 +425,9 @@ def book_mini(request, pk, with_link=True): ))(ssi_expect(pk, int))) def book_short(request, pk): book = get_object_or_404(Book, pk=pk) - stage_note, stage_note_url = book.stage_note() - audiobooks, projects, have_oggs = get_audiobooks(book) 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, - 'audiobooks': audiobooks, - 'have_oggs': have_oggs, }) @@ -681,24 +440,9 @@ def book_short(request, pk): ))(ssi_expect(pk, int))) def book_wide(request, pk): book = get_object_or_404(Book, pk=pk) - stage_note, stage_note_url = book.stage_note() - extra_info = book.extra_info - audiobooks, projects, have_oggs = get_audiobooks(book) 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'), - 'audiobooks': audiobooks, - 'have_oggs': have_oggs, }) @@ -726,10 +470,10 @@ def tag_box(request, pk): @ssi_included def collection_box(request, pk): - obj = get_object_or_404(Collection, pk=pk) + collection = get_object_or_404(Collection, pk=pk) return render(request, 'catalogue/collection_box.html', { - 'obj': obj, + 'collection': collection, }) @@ -752,6 +496,7 @@ def tag_catalogue(request, category): 'best': best, 'title': constants.CATEGORIES_NAME_PLURAL[category], 'whole_category': constants.WHOLE_CATEGORY[category], + 'active_menu_item': 'theme' if category == 'theme' else None, }) @@ -767,3 +512,17 @@ def collections(request): 'objects': objects, 'best': best, }) + + +def ridero_cover(request, slug): + from librarian.cover import make_cover + wldoc = Book.objects.get(slug=slug).wldocument() + cover = make_cover(wldoc.book_info, width=980, bleed=20, format='PNG') + response = HttpResponse(content_type="image/png") + cover.save(response) + return response + + +def get_isbn(request, book_format, slug): + book = Book.objects.get(slug=slug) + return HttpResponse(book.extra_info.get('isbn_%s' % book_format))