Update librarian

[wolnelektury.git] / src / catalogue / views.py

diff --git a/src/catalogue/views.py b/src/catalogue/views.py
index f6d6cd5..fca48b9 100644 (file)
--- 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.
 #
 # This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later.
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
 #


@@ -7,20 +6,20 @@ import random
 
 from django.conf import settings
 from django.http.response import HttpResponseForbidden
 
 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.template.loader import render_to_string

-from django.shortcuts import render_to_response, get_object_or_404, render, redirect
+from django.shortcuts import get_object_or_404, render, redirect

 from django.http import HttpResponse, HttpResponseRedirect, Http404, HttpResponsePermanentRedirect
 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.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 ajaxable.utils import AjaxableFormView

+from club.models import Membership

 from pdcounter import views as pdcounter_views
 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 picture.models import Picture, PictureArea
 from ssify import ssi_included, ssi_expect, SsiVariable as Var
 from catalogue import constants


@@ -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)
     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,
         })
         '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):
 
 
 def daisy_list(request):


@@ -81,9 +79,9 @@ def differentiate_tags(request, tags, ambiguous_slugs):
             'url_args': '/'.join((beginning, tag.url_chunk, unparsed)).strip('/'),
             'tags': [tag]
         })
             '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):


@@ -134,9 +132,10 @@ def object_list(request, objects, fragments=None, related_tags=None, tags=None,
     }
     if extra:
         result.update(extra)
     }
     if extra:
         result.update(extra)

-    return render_to_response(
+    return render(
+        request,

         'catalogue/tagged_object_list.html', result,
         'catalogue/tagged_object_list.html', result,

-        context_instance=RequestContext(request))
+    )

 
 
 def literature(request):
 
 
 def literature(request):


@@ -172,10 +171,10 @@ def analyse_tags(request, tag_str):
             raise ResponseInstead(pdcounter_views.author_detail(request, chunks[1]))
         else:
             raise Http404
             raise ResponseInstead(pdcounter_views.author_detail(request, chunks[1]))
         else:
             raise Http404

-    except Tag.MultipleObjectsReturned, e:
+    except Tag.MultipleObjectsReturned as e:

         # Ask the user to disambiguate
         raise ResponseInstead(differentiate_tags(request, e.tags, e.ambiguous_slugs))
         # 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)])))
 
         raise ResponseInstead(HttpResponsePermanentRedirect(
             reverse('tagged_object_list', args=['/'.join(tag.url_chunk for tag in e.tags)])))
 


@@ -259,25 +258,32 @@ def book_fragments(request, slug, theme_slug):
     fragments = Fragment.tagged.with_all([theme]).filter(
         Q(book=book) | Q(book__ancestor=book))
 
     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)
 
 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,
-        'book_children': book.children.all().order_by('parent_number', 'sort_key'),
-        'active_menu_item': 'books',
-    }, context_instance=RequestContext(request))
+    return render(
+        request,
+        'catalogue/book_detail.html',
+        {
+            'book': book,
+            'book_children': book.children.all().order_by('parent_number', 'sort_key'),
+            'active_menu_item': 'books',
+        })

 
 
 # używane w publicznym interfejsie
 
 
 # używane w publicznym interfejsie


@@ -288,23 +294,26 @@ def player(request, slug):
 
     audiobooks, projects = book.get_audiobooks()
 
 
     audiobooks, projects = 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)
 
 
 
 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 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))
+    return render(request, 'catalogue/book_text.html', {'book': book})

 
 
 # =========
 
 
 # =========


@@ -339,7 +348,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)
     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):
 
 
 def tag_info(request, tag_id):


@@ -347,15 +356,16 @@ def tag_info(request, tag_id):
     return HttpResponse(tag.description)
 
 
     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
     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)
     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_])
 
 
     return HttpResponse(media_file, content_type=constants.EBOOK_CONTENT_TYPES[format_])
 
 


@@ -388,7 +398,7 @@ class CustomPDFFormView(AjaxableFormView):
 
     def validate_object(self, obj, request):
         book = obj
 
     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)
 
             return HttpResponseRedirect(book.get_absolute_url())
         return super(CustomPDFFormView, self).validate_object(obj, request)
 


@@ -405,19 +415,6 @@ class CustomPDFFormView(AjaxableFormView):
 ####
 
 
 ####
 
 

-@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,)),
 @ssi_included(get_ssi_vars=lambda pk: (lambda ipk: (
         ('ssify.get_csrf_token',),
         ('social_tags.likes_book', (ipk,)),


@@ -504,7 +501,7 @@ def collections(request):
     objects = Collection.objects.all()
 
     if len(objects) > 3:
     objects = Collection.objects.all()
 
     if len(objects) > 3:

-        best = random.sample(objects, 3)
+        best = random.sample(list(objects), 3)

     else:
         best = objects
 
     else:
         best = objects