X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/60c3eb6ecbe5c000aa4d24344e85d2ed00d8983c..df60910b2d457f031cbe0a153e51e7378c0165d8:/src/catalogue/views.py?ds=sidebyside diff --git a/src/catalogue/views.py b/src/catalogue/views.py index 6782e5369..037345bf1 100644 --- a/src/catalogue/views.py +++ b/src/catalogue/views.py @@ -1,29 +1,28 @@ -# -*- coding: utf-8 -*- # 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 random +import re from django.conf import settings -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.core.urlresolvers import reverse +from django.shortcuts import get_object_or_404, render, redirect +from django.http import HttpResponse, HttpResponseRedirect, Http404, HttpResponsePermanentRedirect +from django.urls import reverse 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 django.views.decorators.cache import never_cache from ajaxable.utils import AjaxableFormView -from pdcounter.models import BookStub, Author +from club.forms import ScheduleForm +from club.models import Club +from annoy.models import DynamicTextInsert from pdcounter import views as pdcounter_views 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 @@ -36,9 +35,9 @@ 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), + 'books': Book.objects.filter(findable=True, parent=None), 'pictures': Picture.objects.all(), - 'collections': Collection.objects.all(), + 'collections': Collection.objects.filter(listed=True), 'active_menu_item': 'all_works', }) @@ -52,15 +51,14 @@ def book_list(request, filters=None, template_name='catalogue/book_list.html', for tag in books_by_author: if books_by_author[tag]: books_nav.setdefault(tag.sort_key[0], []).append(tag) - # WTF: dlaczego nie include? - return render_to_response(template_name, { + return render(request, template_name, { 'rendered_nav': render_to_string(nav_template_name, {'books_nav': books_nav}), 'rendered_book_list': render_to_string(list_template_name, { 'books_by_author': books_by_author, 'orphans': orphans, 'books_by_parent': books_by_parent, }) - }, context_instance=RequestContext(request)) + }) def daisy_list(request): @@ -69,7 +67,10 @@ def daisy_list(request): def collection(request, slug): coll = get_object_or_404(Collection, slug=slug) - return render(request, 'catalogue/collection.html', {'collection': coll}) + return render(request, 'catalogue/collection.html', { + 'collection': coll, + 'active_menu_item': 'collections', + }) def differentiate_tags(request, tags, ambiguous_slugs): @@ -81,12 +82,15 @@ def differentiate_tags(request, tags, ambiguous_slugs): 'url_args': '/'.join((beginning, tag.url_chunk, unparsed)).strip('/'), 'tags': [tag] }) - return render_to_response( - 'catalogue/differentiate_tags.html', {'tags': tags, 'options': options, 'unparsed': ambiguous_slugs[1:]}, - context_instance=RequestContext(request)) + return render( + request, + 'catalogue/differentiate_tags.html', + {'tags': tags, 'options': options, 'unparsed': ambiguous_slugs[1:]} + ) -def object_list(request, objects, fragments=None, related_tags=None, tags=None, list_type='books', extra=None): +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] @@ -96,7 +100,9 @@ def object_list(request, objects, fragments=None, related_tags=None, tags=None, 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)) + 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': @@ -104,7 +110,9 @@ def object_list(request, objects, fragments=None, related_tags=None, tags=None, 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) + 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') @@ -134,22 +142,15 @@ def object_list(request, objects, fragments=None, related_tags=None, tags=None, } if extra: result.update(extra) - return render_to_response( + return render( + request, 'catalogue/tagged_object_list.html', result, - context_instance=RequestContext(request)) + ) def literature(request): - books = Book.objects.filter(parent=None) - - # last_published = Book.objects.exclude(cover_thumb='').filter(parent=None).order_by('-created_at')[:20] - # most_popular = Book.objects.exclude(cover_thumb='')\ - # .order_by('-popularity__count', 'sort_key_author', 'sort_key')[:20] + books = Book.objects.filter(parent=None, findable=True) return object_list(request, books, related_tags=get_top_level_related_tags([])) - # extra={ - # 'last_published': last_published, - # 'most_popular': most_popular, - # }) def gallery(request): @@ -157,9 +158,9 @@ def gallery(request): def audiobooks(request): - audiobooks = Book.objects.filter(media__type__in=('mp3', 'ogg')).distinct() + audiobooks = Book.objects.filter(findable=True, media__type__in=('mp3', 'ogg')).distinct() return object_list(request, audiobooks, list_type='audiobooks', extra={ - 'daisy': Book.objects.filter(media__type='daisy').distinct(), + 'daisy': Book.objects.filter(findable=True, media__type='daisy').distinct(), }) @@ -178,12 +179,11 @@ def analyse_tags(request, tag_str): chunks = tag_str.split('/') if len(chunks) == 2 and chunks[0] == 'autor': raise ResponseInstead(pdcounter_views.author_detail(request, chunks[1])) - else: - raise Http404 - except Tag.MultipleObjectsReturned, e: + raise Http404 + except Tag.MultipleObjectsReturned as e: # Ask the user to disambiguate raise ResponseInstead(differentiate_tags(request, e.tags, e.ambiguous_slugs)) - except Tag.UrlDeprecationWarning, e: + except Tag.UrlDeprecationWarning as e: raise ResponseInstead(HttpResponsePermanentRedirect( reverse('tagged_object_list', args=['/'.join(tag.url_chunk for tag in e.tags)]))) @@ -208,6 +208,8 @@ def theme_list(request, tags, list_type): # 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)) + elif list_type == 'books': + fragments = fragments.filter(book__findable=True) 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(): @@ -237,19 +239,22 @@ def tagged_object_list(request, tags, list_type): if any(tag.category == 'set' for tag in tags): params = {'objects': books} else: + books = books.filter(findable=True) params = { - 'objects': Book.tagged_top_level(tags), + 'objects': Book.tagged_top_level(tags).filter(findable=True), '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() + audiobooks = Book.objects.filter(findable=True, 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()), + 'daisy': Book.tagged.with_all( + tags, audiobooks.filter(media__type='daisy').distinct() + ), } } else: @@ -264,57 +269,41 @@ def book_fragments(request, slug, theme_slug): fragments = Fragment.tagged.with_all([theme]).filter( Q(book=book) | Q(book__ancestor=book)) - return render_to_response('catalogue/book_fragments.html', { - 'book': book, - 'theme': theme, - 'fragments': fragments, - 'active_menu_item': 'books', - }, context_instance=RequestContext(request)) + return render( + request, + 'catalogue/book_fragments.html', + { + 'book': book, + 'theme': theme, + 'fragments': fragments, + 'active_menu_item': 'books', + }) +@never_cache def book_detail(request, slug): try: book = Book.objects.get(slug=slug) except Book.DoesNotExist: return pdcounter_views.book_stub_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 + new_layout = request.EXPERIMENTS['layout'] + # Not for preview books. + if new_layout.value and not book.is_accessible_to(request.user): + new_layout.override(None) + + return render( + request, + 'catalogue/2022/book_detail.html' if new_layout.value else 'catalogue/book_detail.html', + { + 'book': book, + 'book_children': book.children.all().order_by('parent_number', 'sort_key'), + 'active_menu_item': 'books', + 'club_form': ScheduleForm() if book.preview else None, + 'club': Club.objects.first() if book.preview else None, + + 'EXPERIMENTS_SWITCHABLE_layout': True, + }) # używane w publicznym interfejsie @@ -323,247 +312,35 @@ def player(request, slug): if not book.has_media('mp3'): raise Http404 - audiobooks, projects, have_oggs = get_audiobooks(book) + audiobooks, projects, total_duration = book.get_audiobooks() - return render_to_response('catalogue/player.html', { - 'book': book, - 'audiobook': '', - 'audiobooks': audiobooks, - 'projects': projects, - }, context_instance=RequestContext(request)) + return render( + request, + 'catalogue/player.html', + { + 'book': book, + 'audiobook': '', + 'audiobooks': audiobooks, + 'projects': projects, + }) def book_text(request, slug): book = get_object_or_404(Book, slug=slug) + if not book.is_accessible_to(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. + with book.html_file.open('r') as f: + book_text = f.read() - 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(request, 'catalogue/book_text.html', { + 'book': book, + 'book_text': book_text, + 'inserts': DynamicTextInsert.get_all(request) + }) # ========= @@ -585,11 +362,13 @@ def import_book(request): exception = pprint.pformat(info[1]) tb = '\n'.join(traceback.format_tb(info[2])) return HttpResponse( - _("An error occurred: %(exception)s\n\n%(tb)s") % {'exception': exception, 'tb': tb}, - mimetype='text/plain') + _("An error occurred: %(exception)s\n\n%(tb)s") % { + 'exception': exception, 'tb': tb + }, + content_type='text/plain' + ) return HttpResponse(_("Book imported successfully")) - else: - return HttpResponse(_("Error importing file: %r") % book_import_form.errors) + return HttpResponse(_("Error importing file: %r") % book_import_form.errors) # info views for API @@ -598,7 +377,7 @@ def book_info(request, book_id, lang='pl'): book = get_object_or_404(Book, id=book_id) # set language by hand translation.activate(lang) - return render_to_response('catalogue/book_info.html', {'book': book}, context_instance=RequestContext(request)) + return render(request, 'catalogue/book_info.html', {'book': book}) def tag_info(request, tag_id): @@ -606,6 +385,19 @@ def tag_info(request, tag_id): return HttpResponse(tag.description) +@never_cache +def embargo_link(request, key, format_, slug): + book = get_object_or_404(Book, slug=slug) + if format_ not in Book.formats: + raise Http404 + if key != book.preview_key: + raise Http404 + media_file = book.get_media(format_) + if not book.preview: + return HttpResponseRedirect(media_file.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) @@ -621,6 +413,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): @@ -632,116 +425,20 @@ 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 not book.is_accessible_to(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() -#### -# Includes -#### - - -@ssi_included -def book_mini(request, pk, with_link=True): - # 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, - 'no_link': not with_link, - }) - - -@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(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, - }) - - -@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': Var('social_tags.choose_cite', [ipk])}), - ))(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, - }) - - -@ssi_included -def fragment_short(request, pk): - fragment = get_object_or_404(Fragment, pk=pk) - return render(request, 'catalogue/fragment_short.html', {'fragment': fragment}) - - -@ssi_included -def fragment_promo(request, pk): - fragment = get_object_or_404(Fragment, pk=pk) - return render(request, 'catalogue/fragment_promo.html', {'fragment': fragment}) - - -@ssi_included -def tag_box(request, pk): - tag = get_object_or_404(Tag, pk=pk) - assert tag.category != 'set' - - return render(request, 'catalogue/tag_box.html', { - 'tag': tag, - }) - - -@ssi_included -def collection_box(request, pk): - collection = get_object_or_404(Collection, pk=pk) - - return render(request, 'catalogue/collection_box.html', { - 'collection': collection, - }) - - def tag_catalogue(request, category): if category == 'theme': tags = Tag.objects.usage_for_model( @@ -766,14 +463,29 @@ def tag_catalogue(request, category): def collections(request): - objects = Collection.objects.all() + objects = Collection.objects.filter(listed=True) if len(objects) > 3: - best = random.sample(objects, 3) + best = random.sample(list(objects), 4) else: best = objects return render(request, 'catalogue/collections.html', { 'objects': objects, 'best': best, + 'active_menu_item': 'collections' }) + + +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.get_extra_info_json().get('isbn_%s' % book_format))