update librarian

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

diff --git a/src/catalogue/views.py b/src/catalogue/views.py
index 0a5ab58..f6d6cd5 100644 (file)
--- a/src/catalogue/views.py
+++ b/src/catalogue/views.py
@@ -20,6 +20,7 @@ from django.utils.translation import ugettext as _, ugettext_lazy
 
 from ajaxable.utils import AjaxableFormView
 from pdcounter import views as pdcounter_views
 
 from ajaxable.utils import AjaxableFormView
 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


@@ -140,15 +141,7 @@ def object_list(request, objects, fragments=None, related_tags=None, tags=None,
 
 def literature(request):
     books = Book.objects.filter(parent=None)
 
 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]

     return object_list(request, books, related_tags=get_top_level_related_tags([]))
     return object_list(request, books, related_tags=get_top_level_related_tags([]))

-    # extra={
-    #     'last_published': last_published,
-    #     'most_popular': most_popular,
-    # })

 
 
 def gallery(request):
 
 
 def gallery(request):


@@ -282,7 +275,6 @@ def book_detail(request, slug):
 
     return render_to_response('catalogue/book_detail.html', {
         'book': book,
 
     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))
         'book_children': book.children.all().order_by('parent_number', 'sort_key'),
         'active_menu_item': 'books',
     }, context_instance=RequestContext(request))


@@ -307,6 +299,9 @@ def player(request, slug):
 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):
+        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))
     if not book.has_html_file():
         raise Http404
     return render_to_response('catalogue/book_text.html', {'book': book}, context_instance=RequestContext(request))


@@ -352,6 +347,18 @@ def tag_info(request, tag_id):
     return HttpResponse(tag.description)
 
 
     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)
 def download_zip(request, format, slug=None):
     if format in Book.ebook_formats:
         url = Book.zip_format(format)


@@ -379,8 +386,15 @@ class CustomPDFFormView(AjaxableFormView):
         """Override to parse view args and give additional args to the form."""
         return (obj,), {}
 
         """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):
     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()
 
     def context_description(self, request, obj):
         return obj.pretty_title()