update librarian

[wolnelektury.git] / src / api / handlers.py

diff --git a/src/api/handlers.py b/src/api/handlers.py
index 9fb2886..eb18e05 100644 (file)
--- a/src/api/handlers.py
+++ b/src/api/handlers.py
@@ -6,6 +6,7 @@ import json
 
 from django.contrib.sites.models import Site
 from django.core.urlresolvers import reverse
 
 from django.contrib.sites.models import Site
 from django.core.urlresolvers import reverse

+from django.db.models import Q

 from django.http.response import HttpResponse
 from django.utils.functional import lazy
 from django.db import models
 from django.http.response import HttpResponse
 from django.utils.functional import lazy
 from django.db import models


@@ -18,8 +19,8 @@ from api.models import BookUserData
 from catalogue.forms import BookImportForm
 from catalogue.models import Book, Tag, BookMedia, Fragment, Collection
 from catalogue.models.tag import prefetch_relations
 from catalogue.forms import BookImportForm
 from catalogue.models import Book, Tag, BookMedia, Fragment, Collection
 from catalogue.models.tag import prefetch_relations

-from catalogue.utils import is_subscribed

 from librarian.cover import WLCover
 from librarian.cover import WLCover

+from paypal.rest import user_is_subscribed

 from picture.models import Picture
 from picture.forms import PictureImportForm
 from social.utils import likes
 from picture.models import Picture
 from picture.forms import PictureImportForm
 from social.utils import likes


@@ -32,6 +33,7 @@ from . import emitters  # Register our emitters
 API_BASE = WL_BASE = MEDIA_BASE = lazy(
     lambda: u'https://' + Site.objects.get_current().domain, unicode)()
 
 API_BASE = WL_BASE = MEDIA_BASE = lazy(
     lambda: u'https://' + Site.objects.get_current().domain, unicode)()
 

+SORT_KEY_SEP = '$'

 
 category_singular = {
     'authors': 'author',
 
 category_singular = {
     'authors': 'author',


@@ -48,7 +50,7 @@ for k, v in category_singular.items():
 book_tag_categories = ['author', 'epoch', 'kind', 'genre']
 
 book_list_fields = book_tag_categories + [
 book_tag_categories = ['author', 'epoch', 'kind', 'genre']
 
 book_list_fields = book_tag_categories + [

-    'href', 'title', 'url', 'cover', 'cover_thumb', 'slug', 'simple_thumb', 'has_audio', 'cover_color']
+    'href', 'title', 'url', 'cover', 'cover_thumb', 'slug', 'simple_thumb', 'has_audio', 'cover_color', 'full_sort_key']

 
 
 def read_tags(tags, request, allowed):
 
 
 def read_tags(tags, request, allowed):


@@ -166,6 +168,29 @@ class BookDetails(object):
     def cover_color(cls, book):
         return WLCover.epoch_colors.get(book.extra_info.get('epoch'), '#000000')
 
     def cover_color(cls, book):
         return WLCover.epoch_colors.get(book.extra_info.get('epoch'), '#000000')
 

+    @classmethod
+    def full_sort_key(cls, book):
+        return '%s%s%s%s%s' % (book.sort_key_author, SORT_KEY_SEP, book.sort_key, SORT_KEY_SEP, book.id)
+
+    @staticmethod
+    def books_after(books, after, new_api):
+        if not new_api:
+            return books.filter(slug__gt=after)
+        try:
+            author, title, book_id = after.split(SORT_KEY_SEP)
+        except ValueError:
+            return Book.objects.none()
+        return books.filter(Q(sort_key_author__gt=author)
+                            | (Q(sort_key_author=author) & Q(sort_key__gt=title))
+                            | (Q(sort_key_author=author) & Q(sort_key=title) & Q(id__gt=int(book_id))))
+
+    @staticmethod
+    def order_books(books, new_api):
+        if new_api:
+            return books.order_by('sort_key_author', 'sort_key', 'id')
+        else:
+            return books.order_by('slug')
+

 
 class BookDetailHandler(BaseHandler, BookDetails):
     """ Main handler for Book objects.
 
 class BookDetailHandler(BaseHandler, BookDetails):
     """ Main handler for Book objects.


@@ -204,7 +229,7 @@ class AnonymousBooksHandler(AnonymousBaseHandler, BookDetails):
     @piwik_track
     def read(self, request, tags=None, top_level=False, audiobooks=False, daisy=False, pk=None,
              recommended=False, newest=False, books=None,
     @piwik_track
     def read(self, request, tags=None, top_level=False, audiobooks=False, daisy=False, pk=None,
              recommended=False, newest=False, books=None,

-             after=None, before=None, count=None):
+             after=None, count=None):

         """ Lists all books with given tags.
 
         :param tags: filtering tags; should be a path of categories
         """ Lists all books with given tags.
 
         :param tags: filtering tags; should be a path of categories


@@ -224,10 +249,9 @@ class AnonymousBooksHandler(AnonymousBaseHandler, BookDetails):
         except ValueError:
             return rc.NOT_FOUND
 
         except ValueError:
             return rc.NOT_FOUND
 

+        new_api = request.GET.get('new_api')

         if 'after' in request.GET:
             after = request.GET['after']
         if 'after' in request.GET:
             after = request.GET['after']

-        if 'before' in request.GET:
-            before = request.GET['before']

         if 'count' in request.GET:
             count = request.GET['count']
 
         if 'count' in request.GET:
             count = request.GET['count']
 


@@ -239,7 +263,7 @@ class AnonymousBooksHandler(AnonymousBaseHandler, BookDetails):
                 books = Book.tagged.with_all(tags)
         else:
             books = books if books is not None else Book.objects.all()
                 books = Book.tagged.with_all(tags)
         else:
             books = books if books is not None else Book.objects.all()

-        books = books.order_by('slug')
+        books = self.order_books(books, new_api)

 
         if top_level:
             books = books.filter(parent=None)
 
         if top_level:
             books = books.filter(parent=None)


@@ -253,19 +277,17 @@ class AnonymousBooksHandler(AnonymousBaseHandler, BookDetails):
             books = books.order_by('-created_at')
 
         if after:
             books = books.order_by('-created_at')
 
         if after:

-            books = books.filter(slug__gt=after)
-        if before:
-            books = books.filter(slug__lt=before)
+            books = self.books_after(books, after, new_api)

 
 

-        books = books.only('slug', 'title', 'cover', 'cover_thumb')
+        if new_api:
+            books = books.only('slug', 'title', 'cover', 'cover_thumb', 'sort_key', 'sort_key_author')
+        else:
+            books = books.only('slug', 'title', 'cover', 'cover_thumb')

         for category in book_tag_categories:
             books = prefetch_relations(books, category)
 
         if count:
         for category in book_tag_categories:
             books = prefetch_relations(books, category)
 
         if count:

-            if before:
-                books = list(reversed(books.order_by('-slug')[:count]))
-            else:
-                books = books[:count]
+            books = books[:count]

 
         return books
 
 
         return books
 


@@ -282,7 +304,7 @@ class BooksHandler(BookDetailHandler):
     # hack, because piston is stupid
     @classmethod
     def liked(cls, book):
     # hack, because piston is stupid
     @classmethod
     def liked(cls, book):

-        return book.liked
+        return getattr(book, 'liked', None)

 
     def read(self, request, **kwargs):
         books = AnonymousBooksHandler().read(request, **kwargs)
 
     def read(self, request, **kwargs):
         books = AnonymousBooksHandler().read(request, **kwargs)


@@ -308,7 +330,7 @@ class BooksHandler(BookDetailHandler):
 
 class EpubHandler(BookDetailHandler):
     def read(self, request, slug):
 
 class EpubHandler(BookDetailHandler):
     def read(self, request, slug):

-        if not is_subscribed(request.user):
+        if not user_is_subscribed(request.user):

             return rc.FORBIDDEN
         try:
             book = Book.objects.get(slug=slug)
             return rc.FORBIDDEN
         try:
             book = Book.objects.get(slug=slug)


@@ -362,9 +384,10 @@ class AnonFilterBooksHandler(AnonymousBooksHandler):
         is_audiobook = self.parse_bool(request.GET.get('audiobook'))
         preview = self.parse_bool(request.GET.get('preview'))
 
         is_audiobook = self.parse_bool(request.GET.get('audiobook'))
         preview = self.parse_bool(request.GET.get('preview'))
 

+        new_api = request.GET.get('new_api')

         after = request.GET.get('after')
         count = int(request.GET.get('count', 50))
         after = request.GET.get('after')
         count = int(request.GET.get('count', 50))

-        books = Book.objects.distinct().order_by('slug')
+        books = self.order_books(Book.objects.distinct(), new_api)

         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:


@@ -389,27 +412,29 @@ class AnonFilterBooksHandler(AnonymousBooksHandler):
             books_title = books.filter(title__iregex='\m' + search_string)
             books_title = books_title.exclude(id__in=list(books_author.values_list('id', flat=True)))
             if after and (key_sep in after):
             books_title = books.filter(title__iregex='\m' + search_string)
             books_title = books_title.exclude(id__in=list(books_author.values_list('id', flat=True)))
             if after and (key_sep in after):

-                which, slug = after.split(key_sep, 1)
+                which, key = after.split(key_sep, 1)

                 if which == 'title':
                 if which == 'title':

-                    book_lists = [(books_title.filter(slug__gt=slug), 'title')]
+                    book_lists = [(self.books_after(books_title, key, new_api), 'title')]

                 else:  # which == 'author'
                 else:  # which == 'author'

-                    book_lists = [(books_author.filter(slug__gt=slug), 'author'), (books_title, 'title')]
+                    book_lists = [(self.books_after(books_author, key, new_api), 'author'), (books_title, 'title')]

             else:
                 book_lists = [(books_author, 'author'), (books_title, 'title')]
         else:
             if after and key_sep in after:
             else:
                 book_lists = [(books_author, 'author'), (books_title, 'title')]
         else:
             if after and key_sep in after:

-                which, slug = after.split(key_sep, 1)
-                books = books.filter(slug__gt=slug)
+                which, key = after.split(key_sep, 1)
+                books = self.books_after(books, key, new_api)

             book_lists = [(books, 'book')]
 
         filtered_books = []
         for book_list, label in book_lists:
             book_lists = [(books, 'book')]
 
         filtered_books = []
         for book_list, label in book_lists:

-            book_list = book_list.only('slug', 'title', 'cover', 'cover_thumb')
+            book_list = book_list.only('slug', 'title', 'cover', 'cover_thumb', 'sort_key_author', 'sort_key')

             for category in book_tag_categories:
                 book_list = prefetch_relations(book_list, category)
             remaining_count = count - len(filtered_books)
             for category in book_tag_categories:
                 book_list = prefetch_relations(book_list, category)
             remaining_count = count - len(filtered_books)

-            new_books = [BookProxy(book, '%s%s%s' % (label, key_sep, book.slug))
-                         for book in book_list[:remaining_count]]
+            new_books = [
+                BookProxy(book, '%s%s%s' % (
+                    label, key_sep, book.slug if not new_api else self.full_sort_key(book)))
+                for book in book_list[:remaining_count]]

             filtered_books += new_books
             if len(filtered_books) == count:
                 break
             filtered_books += new_books
             if len(filtered_books) == count:
                 break


@@ -424,7 +449,7 @@ class FilterBooksHandler(BooksHandler):
     # hack, because piston is stupid
     @classmethod
     def liked(cls, book):
     # hack, because piston is stupid
     @classmethod
     def liked(cls, book):

-        return book.liked
+        return getattr(book, 'liked', None)

 
     def read(self, request):
         qsp = AnonFilterBooksHandler().read(request)
 
     def read(self, request):
         qsp = AnonFilterBooksHandler().read(request)


@@ -592,7 +617,6 @@ class TagsHandler(BaseHandler, TagDetails):
             return rc.NOT_FOUND
 
         after = request.GET.get('after')
             return rc.NOT_FOUND
 
         after = request.GET.get('after')

-        before = request.GET.get('before')

         count = request.GET.get('count')
 
         tags = Tag.objects.filter(category=category_sng).exclude(items=None).order_by('slug')
         count = request.GET.get('count')
 
         tags = Tag.objects.filter(category=category_sng).exclude(items=None).order_by('slug')


@@ -606,14 +630,9 @@ class TagsHandler(BaseHandler, TagDetails):
 
         if after:
             tags = tags.filter(slug__gt=after)
 
         if after:
             tags = tags.filter(slug__gt=after)

-        if before:
-            tags = tags.filter(slug__lt=before)

 
         if count:
 
         if count:

-            if before:
-                tags = list(reversed(tags.order_by('-slug')[:count]))
-            else:
-                tags = tags[:count]
+            tags = tags[:count]

 
         return tags
 
 
         return tags
 


@@ -711,7 +730,7 @@ class UserDataHandler(BaseHandler):
         if not request.user.is_authenticated():
             return rc.FORBIDDEN
         if slug is None:
         if not request.user.is_authenticated():
             return rc.FORBIDDEN
         if slug is None:

-            return {'username': request.user.username, 'premium': is_subscribed(request.user)}
+            return {'username': request.user.username, 'premium': user_is_subscribed(request.user)}

         try:
             book = Book.objects.get(slug=slug)
         except Book.DoesNotExist:
         try:
             book = Book.objects.get(slug=slug)
         except Book.DoesNotExist:


@@ -749,7 +768,7 @@ class UserShelfHandler(BookDetailHandler):
     # hack, because piston is stupid
     @classmethod
     def liked(cls, book):
     # hack, because piston is stupid
     @classmethod
     def liked(cls, book):

-        return book.liked
+        return getattr(book, 'liked', None)

 
     def read(self, request, state):
         if not request.user.is_authenticated():
 
     def read(self, request, state):
         if not request.user.is_authenticated():


@@ -757,6 +776,7 @@ class UserShelfHandler(BookDetailHandler):
         likes = set(Book.tagged.with_any(request.user.tag_set.all()).values_list('id', flat=True))
         if state not in ('reading', 'complete', 'likes'):
             return rc.NOT_FOUND
         likes = set(Book.tagged.with_any(request.user.tag_set.all()).values_list('id', flat=True))
         if state not in ('reading', 'complete', 'likes'):
             return rc.NOT_FOUND

+        new_api = request.GET.get('new_api')

         after = request.GET.get('after')
         count = int(request.GET.get('count', 50))
         if state == 'likes':
         after = request.GET.get('after')
         count = int(request.GET.get('count', 50))
         if state == 'likes':


@@ -764,9 +784,10 @@ class UserShelfHandler(BookDetailHandler):
         else:
             ids = BookUserData.objects.filter(user=request.user, complete=state == 'complete')\
                 .values_list('book_id', flat=True)
         else:
             ids = BookUserData.objects.filter(user=request.user, complete=state == 'complete')\
                 .values_list('book_id', flat=True)

-            books = Book.objects.filter(id__in=list(ids)).distinct().order_by('slug')
+            books = Book.objects.filter(id__in=list(ids)).distinct()
+            books = self.order_books(books, new_api)

         if after:
         if after:

-            books = books.filter(slug__gt=after)
+            books = self.books_after(books, after, new_api)

         if count:
             books = books[:count]
         new_books = []
         if count:
             books = books[:count]
         new_books = []