X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/51369735b0c2f71ee63c1403da3254d5efed2b93..a73444333e9557df72656fd1f49c01933ff21348:/src/api/handlers.py?ds=sidebyside diff --git a/src/api/handlers.py b/src/api/handlers.py index 6f7179bd5..88106260a 100644 --- a/src/api/handlers.py +++ b/src/api/handlers.py @@ -7,6 +7,7 @@ import json from django.contrib.sites.models import Site from django.core.urlresolvers import reverse from django.utils.functional import lazy +from django.db import models from piston.handler import AnonymousBaseHandler, BaseHandler from piston.utils import rc from sorl.thumbnail import default @@ -18,6 +19,7 @@ from picture.models import Picture from picture.forms import PictureImportForm from stats.utils import piwik_track +from wolnelektury.utils import re_escape from . import emitters # Register our emitters @@ -122,14 +124,12 @@ class BookDetails(object): @classmethod def url(cls, book): """ Returns Book's URL on the site. """ - return WL_BASE + book.get_absolute_url() @classmethod def children(cls, book): """ Returns all children for a book. """ - - return book.children.all() + return book.children.order_by('parent_number', 'sort_key') @classmethod def media(cls, book): @@ -158,7 +158,7 @@ class BookDetailHandler(BaseHandler, BookDetails): """ allowed_methods = ['GET'] fields = ['title', 'parent', 'children'] + Book.formats + [ - 'media', 'url', 'cover', 'cover_thumb'] + [ + 'media', 'url', 'cover', 'cover_thumb', 'fragment_data'] + [ category_plural[c] for c in book_tag_categories] @piwik_track @@ -279,34 +279,45 @@ class EBooksHandler(AnonymousBooksHandler): fields = ('author', 'href', 'title', 'cover') + tuple(Book.ebook_formats) + ('slug',) +class BookProxy(models.Model): + def __init__(self, book, key): + self.book = book + self.key = key + + def __getattr__(self, item): + if item not in ('book', 'key'): + return self.book.__getattribute__(item) + else: + return self.__getattribute__(item) + + +class QuerySetProxy(models.QuerySet): + def __init__(self, l): + self.list = l + + def __iter__(self): + return iter(self.list) + + class FilterBooksHandler(AnonymousBooksHandler): fields = book_tag_categories + [ - 'href', 'title', 'url', 'cover', 'cover_thumb', 'slug', 'cover_source_image', 'fragment_data'] + 'href', 'title', 'url', 'cover', 'cover_thumb', 'key', 'cover_source_image'] - def read(self, request, title_part=None, author_part=None, is_lektura=None, is_audiobook=None, - after=None, before=None, count=None): - if 'title_part' in request.GET: - title_part = request.GET['title_part'] - if 'author_part' in request.GET: - author_part = request.GET['author_part'] - if 'is_lektura' in request.GET: - is_lektura = request.GET['is_lektura'] - if 'is_audiobook' in request.GET: - is_audiobook = request.GET['is_audiobook'] - - if count is None: - count = 50 + def read(self, request): + key_sep = '$' + search_string = request.GET.get('search') + is_lektura = request.GET.get('lektura') + is_audiobook = request.GET.get('audiobook') + + after = request.GET.get('after') + count = int(request.GET.get('count', 50)) if is_lektura in ('true', 'false'): is_lektura = is_lektura == 'true' else: is_lektura = None if is_audiobook in ('true', 'false'): is_audiobook = is_audiobook == 'true' - books = Book.objects.distinct() - if title_part: - books = books.filter(title__iregex='\m' + title_part) - if author_part is not None: - books = books.filter(cached_author__iregex='\m' + author_part) + books = Book.objects.distinct().order_by('slug') if is_lektura is not None: books = books.filter(has_audience=is_lektura) if is_audiobook is not None: @@ -314,7 +325,47 @@ class FilterBooksHandler(AnonymousBooksHandler): books = books.filter(media__type='mp3') else: books = books.exclude(media__type='mp3') - return super(FilterBooksHandler, self).read(request, books=books, after=after, before=before, count=count) + for key in request.GET: + if key in category_singular: + category = category_singular[key] + if category in book_tag_categories: + slugs = request.GET[key].split(',') + tags = Tag.objects.filter(category=category, slug__in=slugs) + books = Book.tagged.with_any(tags, books) + if (search_string is not None) and len(search_string) < 3: + search_string = None + if search_string: + search_string = re_escape(search_string) + books_author = books.filter(cached_author__iregex='\m' + search_string) + 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) + if which == 'title': + book_lists = [(books_title.filter(slug__gt=slug), 'title')] + else: # which == 'author' + book_lists = [(books_author.filter(slug__gt=slug), 'author'), (books_title, 'title')] + 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) + book_lists = [(books, 'book')] + + filtered_books = [] + for book_list, label in book_lists: + book_list = book_list.only('slug', 'title', 'cover', 'cover_thumb') + 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]] + filtered_books += new_books + if len(filtered_books) == count: + break + + return QuerySetProxy(filtered_books) # add categorized tags fields for Book