Merge remote-tracking branch 'zawadzki/new-design'

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

diff --git a/src/catalogue/api/views.py b/src/catalogue/api/views.py
index c70a73e..885df24 100644 (file)
--- a/src/catalogue/api/views.py
+++ b/src/catalogue/api/views.py
@@ -2,6 +2,8 @@
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
 #
 import json
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
 #
 import json

+import os.path
+from django.conf import settings

 from django.http import Http404, HttpResponse
 from django.utils.decorators import method_decorator
 from django.views.decorators.cache import never_cache
 from django.http import Http404, HttpResponse
 from django.utils.decorators import method_decorator
 from django.views.decorators.cache import never_cache


@@ -25,7 +27,7 @@ book_tag_categories = ['author', 'epoch', 'kind', 'genre']
 
 
 class CollectionList(ListAPIView):
 
 
 class CollectionList(ListAPIView):

-    queryset = Collection.objects.all()
+    queryset = Collection.objects.filter(listed=True)

     serializer_class = serializers.CollectionListSerializer
 
 
     serializer_class = serializers.CollectionListSerializer
 
 


@@ -42,6 +44,16 @@ class BookList(ListAPIView):
     queryset = Book.objects.none()  # Required for DjangoModelPermissions
     serializer_class = serializers.BookListSerializer
 
     queryset = Book.objects.none()  # Required for DjangoModelPermissions
     serializer_class = serializers.BookListSerializer
 

+    def get(self, request, filename=None, **kwargs):
+        if filename and not kwargs.get('tags') and 'count' not in request.query_params:
+            try:
+                with open(os.path.join(settings.MEDIA_ROOT, 'api', '%s.%s' % (filename, request.accepted_renderer.format)), 'rb') as f:
+                    content = f.read()
+                return HttpResponse(content, content_type=request.accepted_media_type)
+            except:
+                pass
+        return super().get(request, filename=filename, **kwargs)
+

     def get_queryset(self):
         try:
             tags, ancestors = read_tags(
     def get_queryset(self):
         try:
             tags, ancestors = read_tags(


@@ -70,6 +82,7 @@ class BookList(ListAPIView):
                 books = Book.tagged.with_all(tags)
         else:
             books = Book.objects.all()
                 books = Book.tagged.with_all(tags)
         else:
             books = Book.objects.all()

+        books = books.filter(findable=True)

         books = order_books(books, new_api)
 
         if not Membership.is_active_for(self.request.user):
         books = order_books(books, new_api)
 
         if not Membership.is_active_for(self.request.user):


@@ -122,6 +135,9 @@ class BookList(ListAPIView):
         name = request.POST.get('name', '')
         part_name = request.POST.get('part_name', '')
 
         name = request.POST.get('name', '')
         part_name = request.POST.get('part_name', '')
 

+        project_description = request.POST.get('project_description', '')
+        project_icon = request.POST.get('project_icon', '')
+

         _rest, slug = request.POST['book'].rstrip('/').rsplit('/', 1)
         book = Book.objects.get(slug=slug)
 
         _rest, slug = request.POST['book'].rstrip('/').rsplit('/', 1)
         book = Book.objects.get(slug=slug)
 


@@ -133,6 +149,8 @@ class BookList(ListAPIView):
         bm.name = name
         bm.part_name = part_name
         bm.index = index
         bm.name = name
         bm.part_name = part_name
         bm.index = index

+        bm.project_description = project_description
+        bm.project_icon = project_icon

         bm.file.save(None, request.data['file'], save=False)
         bm.save(parts_count=parts_count)
 
         bm.file.save(None, request.data['file'], save=False)
         bm.save(parts_count=parts_count)
 


@@ -187,6 +205,7 @@ class FilterBookList(ListAPIView):
         after = self.request.query_params.get('after')
         count = int(self.request.query_params.get('count', 50))
         books = order_books(Book.objects.distinct(), new_api)
         after = self.request.query_params.get('after')
         count = int(self.request.query_params.get('count', 50))
         books = order_books(Book.objects.distinct(), new_api)

+        books = books.filter(findable=True)

         if is_lektura is not None:
             books = books.filter(has_audience=is_lektura)
         if is_audiobook is not None:
         if is_lektura is not None:
             books = books.filter(has_audience=is_lektura)
         if is_audiobook is not None:


@@ -293,7 +312,7 @@ class FragmentList(ListAPIView):
             )
         except ValueError:
             raise Http404
             )
         except ValueError:
             raise Http404

-        return Fragment.tagged.with_all(tags).select_related('book')
+        return Fragment.tagged.with_all(tags).filter(book__findable=True).select_related('book')

 
 
 @vary_on_auth  # Because of 'liked'.
 
 
 @vary_on_auth  # Because of 'liked'.