X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/967eed676fc83d15b26149047f353ac61faa8217..fc0b706f8c7eb67531df0a2acd972412e47c7010:/src/catalogue/views.py diff --git a/src/catalogue/views.py b/src/catalogue/views.py index 5beb6dc01..007ebe470 100644 --- a/src/catalogue/views.py +++ b/src/catalogue/views.py @@ -1,4 +1,3 @@ -# -*- 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. # @@ -10,18 +9,18 @@ from django.http.response import HttpResponseForbidden from django.template.loader import render_to_string from django.shortcuts import get_object_or_404, render, redirect from django.http import HttpResponse, HttpResponseRedirect, Http404, HttpResponsePermanentRedirect -from django.core.urlresolvers import reverse +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 club.models import Membership 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 catalogue import constants from catalogue import forms from catalogue.helpers import get_top_level_related_tags @@ -269,6 +268,7 @@ def book_fragments(request, slug, theme_slug): }) +@never_cache def book_detail(request, slug): try: book = Book.objects.get(slug=slug) @@ -307,12 +307,17 @@ 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): + if book.preview and not Membership.is_active_for(request.user): return HttpResponseRedirect(book.get_absolute_url()) if not book.has_html_file(): raise Http404 - return render(request, 'catalogue/book_text.html', {'book': book}) + with book.html_file.open('r') as f: + book_text = f.read() + return render(request, 'catalogue/book_text.html', { + 'book': book, + 'book_text': book_text, + }) # ========= @@ -355,15 +360,16 @@ def tag_info(request, tag_id): return HttpResponse(tag.description) -def embargo_link(request, format_, slug): +@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) - if not user_is_subscribed(request.user): - return HttpResponseRedirect(book.get_absolute_url()) return HttpResponse(media_file, content_type=constants.EBOOK_CONTENT_TYPES[format_]) @@ -396,7 +402,7 @@ class CustomPDFFormView(AjaxableFormView): def validate_object(self, obj, request): book = obj - if book.preview and not user_is_subscribed(request.user): + if book.preview and not Membership_is_active_for(request.user): return HttpResponseRedirect(book.get_absolute_url()) return super(CustomPDFFormView, self).validate_object(obj, request) @@ -408,83 +414,6 @@ class CustomPDFFormView(AjaxableFormView): 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) - - return render(request, 'catalogue/book_short.html', { - 'book': book, - }) - - -@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) - - return render(request, 'catalogue/book_wide.html', { - 'book': book, - }) - - -@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( @@ -512,7 +441,7 @@ def collections(request): objects = Collection.objects.all() if len(objects) > 3: - best = random.sample(objects, 3) + best = random.sample(list(objects), 3) else: best = objects @@ -533,4 +462,4 @@ def ridero_cover(request, slug): def get_isbn(request, book_format, slug): book = Book.objects.get(slug=slug) - return HttpResponse(book.extra_info.get('isbn_%s' % book_format)) + return HttpResponse(book.get_extra_info_json().get('isbn_%s' % book_format))