X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/b9dc6590aa12ae1b04e11dbb57684c5630c1e3bd..c185de4d8edb100d196b516aedd29b8ee0519ce0:/src/api/handlers.py diff --git a/src/api/handlers.py b/src/api/handlers.py index b81afdaf5..04c56f8f1 100644 --- a/src/api/handlers.py +++ b/src/api/handlers.py @@ -13,6 +13,7 @@ from sorl.thumbnail import default from catalogue.forms import BookImportForm from catalogue.models import Book, Tag, BookMedia, Fragment, Collection +from catalogue.models.tag import prefetch_relations from picture.models import Picture from picture.forms import PictureImportForm @@ -39,13 +40,25 @@ for k, v in category_singular.items(): book_tag_categories = ['author', 'epoch', 'kind', 'genre'] -def read_tags(tags, allowed): +def read_tags(tags, request, allowed): """ Reads a path of filtering tags. :param str tags: a path of category and slug pairs, like: authors/an-author/... :returns: list of Tag objects :raises: ValueError when tags can't be found """ + + def process(category, slug): + if category == 'book': + try: + books.append(Book.objects.get(slug=slug)) + except Book.DoesNotExist: + raise ValueError('Unknown book.') + try: + real_tags.append(Tag.objects.get(category=category, slug=slug)) + except Tag.DoesNotExist: + raise ValueError('Tag not found') + if not tags: return [], [] @@ -63,17 +76,14 @@ def read_tags(tags, allowed): if category not in allowed: raise ValueError('Category not allowed.') - - if category == 'book': - try: - books.append(Book.objects.get(slug=slug)) - except Book.DoesNotExist: - raise ValueError('Unknown book.') - - try: - real_tags.append(Tag.objects.get(category=category, slug=slug)) - except Tag.DoesNotExist: - raise ValueError('Tag not found') + process(category, slug) + + for key in request.GET: + if key in category_singular: + category = category_singular[key] + if category in allowed: + for slug in request.GET.getlist(key): + process(category, slug) return real_tags, books @@ -112,14 +122,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): @@ -135,6 +143,11 @@ class BookDetails(object): return MEDIA_BASE + default.backend.get_thumbnail( book.cover, "139x193").url if book.cover else '' + @classmethod + def cover_source_image(cls, book): + url = book.cover_source() + return url.rstrip('/') + '/file/' + class BookDetailHandler(BaseHandler, BookDetails): """ Main handler for Book objects. @@ -162,7 +175,7 @@ class AnonymousBooksHandler(AnonymousBaseHandler, BookDetails): """ allowed_methods = ('GET',) model = Book - fields = book_tag_categories + ['href', 'title', 'url', 'cover', 'cover_thumb'] + fields = book_tag_categories + ['href', 'title', 'url', 'cover', 'cover_thumb', 'slug'] @classmethod def genres(cls, book): @@ -170,7 +183,9 @@ class AnonymousBooksHandler(AnonymousBaseHandler, BookDetails): return book.tags.filter(category='genre') @piwik_track - def read(self, request, tags=None, top_level=False, audiobooks=False, daisy=False, pk=None): + 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): """ Lists all books with given tags. :param tags: filtering tags; should be a path of categories @@ -186,10 +201,17 @@ class AnonymousBooksHandler(AnonymousBaseHandler, BookDetails): return rc.NOT_FOUND try: - tags, _ancestors = read_tags(tags, allowed=book_tag_categories) + tags, _ancestors = read_tags(tags, request, allowed=book_tag_categories) except ValueError: return rc.NOT_FOUND + 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 tags: if top_level: books = Book.tagged_top_level(tags) @@ -197,7 +219,8 @@ class AnonymousBooksHandler(AnonymousBaseHandler, BookDetails): else: books = Book.tagged.with_all(tags) else: - books = Book.objects.all() + books = books if books is not None else Book.objects.all() + books = books.order_by('slug') if top_level: books = books.filter(parent=None) @@ -205,13 +228,27 @@ class AnonymousBooksHandler(AnonymousBaseHandler, BookDetails): books = books.filter(media__type='mp3').distinct() if daisy: books = books.filter(media__type='daisy').distinct() + if recommended: + books = books.filter(recommended=True) + if newest: + books = books.order_by('-created_at') + + if after: + books = books.filter(slug__gt=after) + if before: + books = books.filter(slug__lt=before) + + books = books.only('slug', 'title', 'cover', 'cover_thumb') + 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.only('slug', 'title', 'cover') - - if books: - return books - else: - return rc.NOT_FOUND + return books def create(self, request, *args, **kwargs): return rc.FORBIDDEN @@ -220,7 +257,7 @@ class AnonymousBooksHandler(AnonymousBaseHandler, BookDetails): class BooksHandler(BookDetailHandler): allowed_methods = ('GET', 'POST') model = Book - fields = book_tag_categories + ['href', 'title', 'url', 'cover', 'cover_thumb'] + fields = book_tag_categories + ['href', 'title', 'url', 'cover', 'cover_thumb', 'slug'] anonymous = AnonymousBooksHandler def create(self, request, *args, **kwargs): @@ -237,7 +274,45 @@ class BooksHandler(BookDetailHandler): class EBooksHandler(AnonymousBooksHandler): - fields = ('author', 'href', 'title', 'cover') + tuple(Book.ebook_formats) + fields = ('author', 'href', 'title', 'cover') + tuple(Book.ebook_formats) + ('slug',) + + +class FilterBooksHandler(AnonymousBooksHandler): + fields = book_tag_categories + [ + 'href', 'title', 'url', 'cover', 'cover_thumb', 'slug', 'cover_source_image', 'fragment_data'] + + 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 + 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) + if is_lektura is not None: + books = books.filter(has_audience=is_lektura) + if is_audiobook is not None: + if is_audiobook: + 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) # add categorized tags fields for Book @@ -251,7 +326,7 @@ def _tags_getter(category): def _tag_getter(category): @classmethod def get_tag(cls, book): - return ', '.join(book.tags.filter(category=category).values_list('name', flat=True)) + return book.tag_unicode(category) return get_tag @@ -373,7 +448,7 @@ class TagsHandler(BaseHandler, TagDetails): """ allowed_methods = ('GET',) model = Tag - fields = ['name', 'href', 'url'] + fields = ['name', 'href', 'url', 'slug'] @piwik_track def read(self, request, category=None, pk=None): @@ -389,11 +464,24 @@ class TagsHandler(BaseHandler, TagDetails): except KeyError: return rc.NOT_FOUND - tags = Tag.objects.filter(category=category_sng).exclude(items=None) - if tags.exists(): - return tags - else: - 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') + + if after: + tags = tags.filter(slug__gt=after) + if before: + tags = tags.filter(slug__lt=before) + + if count: + if before: + tags = list(reversed(tags.order_by('-slug')[:count])) + else: + tags = tags[:count] + + return tags class FragmentDetails(object):