X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/c185de4d8edb100d196b516aedd29b8ee0519ce0..c3e563338050cf161ed6568d01c8a5f010257c2f:/src/api/handlers.py?ds=sidebyside diff --git a/src/api/handlers.py b/src/api/handlers.py index 04c56f8f1..7178b9f9e 100644 --- a/src/api/handlers.py +++ b/src/api/handlers.py @@ -6,24 +6,31 @@ import json 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 migdal.models import Entry from piston.handler import AnonymousBaseHandler, BaseHandler from piston.utils import rc from sorl.thumbnail import default +from api.models import BookUserData +from catalogue.api.helpers import books_after, order_books from catalogue.forms import BookImportForm -from catalogue.models import Book, Tag, BookMedia, Fragment, Collection +from catalogue.models import Book, Tag, BookMedia from catalogue.models.tag import prefetch_relations +from paypal.rest import user_is_subscribed from picture.models import Picture from picture.forms import PictureImportForm +from social.utils import likes from stats.utils import piwik_track +from wolnelektury.utils import re_escape -from . import emitters # Register our emitters API_BASE = WL_BASE = MEDIA_BASE = lazy( - lambda: u'http://' + Site.objects.get_current().domain, unicode)() - + lambda: u'https://' + Site.objects.get_current().domain, unicode)() category_singular = { 'authors': 'author', @@ -39,6 +46,9 @@ for k, v in category_singular.items(): 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', 'full_sort_key'] + def read_tags(tags, request, allowed): """ Reads a path of filtering tags. @@ -50,6 +60,7 @@ def read_tags(tags, request, allowed): def process(category, slug): if category == 'book': + # FIXME: Unused? try: books.append(Book.objects.get(slug=slug)) except Book.DoesNotExist: @@ -90,25 +101,7 @@ def read_tags(tags, request, allowed): # RESTful handlers -class BookMediaHandler(BaseHandler): - """ Responsible for representing media in Books. """ - - model = BookMedia - fields = ['name', 'type', 'url', 'artist', 'director'] - - @classmethod - def url(cls, media): - """ Link to media on site. """ - - return MEDIA_BASE + media.file.url - @classmethod - def artist(cls, media): - return media.extra_info.get('artist_name', '') - - @classmethod - def director(cls, media): - return media.extra_info.get('director_name', '') class BookDetails(object): @@ -117,7 +110,7 @@ class BookDetails(object): @classmethod def href(cls, book): """ Returns an URI for a Book in the API. """ - return API_BASE + reverse("api_book", args=[book.slug]) + return API_BASE + reverse("catalogue_api_book", args=[book.slug]) @classmethod def url(cls, book): @@ -144,9 +137,12 @@ class BookDetails(object): book.cover, "139x193").url if book.cover else '' @classmethod - def cover_source_image(cls, book): - url = book.cover_source() - return url.rstrip('/') + '/file/' + def simple_thumb(cls, book): + return MEDIA_BASE + book.cover_api_thumb.url if book.cover_api_thumb else '' + + @classmethod + def simple_cover(cls, book): + return MEDIA_BASE + book.simple_cover.url if book.simple_cover else '' class BookDetailHandler(BaseHandler, BookDetails): @@ -156,7 +152,8 @@ class BookDetailHandler(BaseHandler, BookDetails): """ allowed_methods = ['GET'] fields = ['title', 'parent', 'children'] + Book.formats + [ - 'media', 'url', 'cover', 'cover_thumb'] + [ + 'media', 'url', 'cover', 'cover_thumb', 'simple_thumb', 'simple_cover', 'fragment_data', 'audio_length', + 'preview', 'cover_color'] + [ category_plural[c] for c in book_tag_categories] @piwik_track @@ -175,8 +172,9 @@ class AnonymousBooksHandler(AnonymousBaseHandler, BookDetails): """ allowed_methods = ('GET',) model = Book - fields = book_tag_categories + ['href', 'title', 'url', 'cover', 'cover_thumb', 'slug'] + fields = book_list_fields + # FIXME: Unused? @classmethod def genres(cls, book): """ Returns all media for a book. """ @@ -185,7 +183,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, - 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 @@ -195,6 +193,7 @@ class AnonymousBooksHandler(AnonymousBaseHandler, BookDetails): are returned. """ if pk is not None: + # FIXME: Unused? try: return Book.objects.get(pk=pk) except Book.DoesNotExist: @@ -205,10 +204,9 @@ class AnonymousBooksHandler(AnonymousBaseHandler, BookDetails): except ValueError: return rc.NOT_FOUND + new_api = request.GET.get('new_api') 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'] @@ -220,7 +218,7 @@ class AnonymousBooksHandler(AnonymousBaseHandler, BookDetails): books = Book.tagged.with_all(tags) else: books = books if books is not None else Book.objects.all() - books = books.order_by('slug') + books = order_books(books, new_api) if top_level: books = books.filter(parent=None) @@ -234,19 +232,17 @@ class AnonymousBooksHandler(AnonymousBaseHandler, BookDetails): books = books.order_by('-created_at') if after: - books = books.filter(slug__gt=after) - if before: - books = books.filter(slug__lt=before) + books = 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: - if before: - books = list(reversed(books.order_by('-slug')[:count])) - else: - books = books[:count] + books = books[:count] return books @@ -257,9 +253,23 @@ class AnonymousBooksHandler(AnonymousBaseHandler, BookDetails): class BooksHandler(BookDetailHandler): allowed_methods = ('GET', 'POST') model = Book - fields = book_tag_categories + ['href', 'title', 'url', 'cover', 'cover_thumb', 'slug'] + fields = book_list_fields + ['liked'] anonymous = AnonymousBooksHandler + # hack, because piston is stupid + @classmethod + def liked(cls, book): + return getattr(book, 'liked', None) + + def read(self, request, **kwargs): + books = AnonymousBooksHandler().read(request, **kwargs) + likes = set(Book.tagged.with_any(request.user.tag_set.all()).values_list('id', flat=True)) + + new_books = [ + BookProxy(book).set('liked', book.id in likes) + for book in books] + return QuerySetProxy(new_books) + def create(self, request, *args, **kwargs): if not request.user.has_perm('catalogue.add_book'): return rc.FORBIDDEN @@ -277,34 +287,50 @@ class EBooksHandler(AnonymousBooksHandler): 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' +class BookProxy(models.Model): + class Meta: + managed = False + + def __init__(self, book, key=None): + self.book = book + self.key = key + + def set(self, attr, value): + self.__setattr__(attr, value) + return self + + def __getattr__(self, item): + return self.book.__getattribute__(item) + + +class QuerySetProxy(models.QuerySet): + def __init__(self, l): + self.list = l + + def __iter__(self): + return iter(self.list) + + +class AnonFilterBooksHandler(AnonymousBooksHandler): + fields = book_list_fields + ['key'] + + def parse_bool(self, s): + if s in ('true', 'false'): + return s == '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) + return None + + def read(self, request): + key_sep = '$' + search_string = request.GET.get('search') + is_lektura = self.parse_bool(request.GET.get('lektura')) + 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)) + books = 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: @@ -312,7 +338,68 @@ 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) + if preview is not None: + books = books.filter(preview=preview) + 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, key = after.split(key_sep, 1) + if which == 'title': + book_lists = [(books_after(books_title, key, new_api), 'title')] + else: # which == 'author' + book_lists = [(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: + which, key = after.split(key_sep, 1) + books = books_after(books, key, new_api) + book_lists = [(books, 'book')] + + filtered_books = [] + for book_list, label in book_lists: + 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) + new_books = [ + BookProxy(book, '%s%s%s' % ( + label, key_sep, book.slug if not new_api else book.full_sort_key())) + for book in book_list[:remaining_count]] + filtered_books += new_books + if len(filtered_books) == count: + break + + return QuerySetProxy(filtered_books) + + +class FilterBooksHandler(BooksHandler): + anonymous = AnonFilterBooksHandler + fields = book_list_fields + ['key', 'liked'] + + # hack, because piston is stupid + @classmethod + def liked(cls, book): + return getattr(book, 'liked', None) + + def read(self, request): + qsp = AnonFilterBooksHandler().read(request) + likes = set(Book.tagged.with_any(request.user.tag_set.all()).values_list('id', flat=True)) + for book in qsp.list: + book.set('liked', book.id in likes) + return qsp # add categorized tags fields for Book @@ -335,18 +422,18 @@ def add_tag_getters(): setattr(BookDetails, plural, _tags_getter(singular)) setattr(BookDetails, singular, _tag_getter(singular)) + add_tag_getters() # add fields for files in Book def _file_getter(book_format): - field = "%s_file" % book_format - @classmethod - def get_file(cls, book): - f = getattr(book, field) - if f: - return MEDIA_BASE + f.url + @staticmethod + def get_file(book): + f_url = book.media_url(book_format) + if f_url: + return MEDIA_BASE + f_url else: return '' return get_file @@ -356,213 +443,60 @@ def add_file_getters(): for book_format in Book.formats: setattr(BookDetails, book_format, _file_getter(book_format)) -add_file_getters() - -class CollectionDetails(object): - """Custom Collection fields.""" - - @classmethod - def href(cls, collection): - """ Returns URI in the API for the collection. """ - - return API_BASE + reverse("api_collection", args=[collection.slug]) - - @classmethod - def url(cls, collection): - """ Returns URL on the site. """ - - return WL_BASE + collection.get_absolute_url() +add_file_getters() - @classmethod - def books(cls, collection): - return Book.objects.filter(collection.get_query()) +class PictureHandler(BaseHandler): + model = Picture + fields = ('slug', 'title') + allowed_methods = ('POST',) -class CollectionDetailHandler(BaseHandler, CollectionDetails): - allowed_methods = ('GET',) - fields = ['url', 'title', 'description', 'books'] + def create(self, request): + if not request.user.has_perm('picture.add_picture'): + return rc.FORBIDDEN - @piwik_track - def read(self, request, slug): - """ Returns details of a collection, identified by slug. """ - try: - return Collection.objects.get(slug=slug) - except Collection.DoesNotExist: + data = json.loads(request.POST.get('data')) + form = PictureImportForm(data) + if form.is_valid(): + form.save() + return rc.CREATED + else: return rc.NOT_FOUND -class CollectionsHandler(BaseHandler, CollectionDetails): - allowed_methods = ('GET',) - model = Collection - fields = ['url', 'href', 'title'] +class BlogEntryHandler(BaseHandler): + model = Entry + fields = ( + 'title', 'lead', 'body', 'place', 'time', 'image_url', 'image_thumb', 'gallery_urls', 'type', 'key', 'url') - @piwik_track def read(self, request): - """ Returns all collections. """ - return Collection.objects.all() - - -class TagDetails(object): - """Custom Tag fields.""" - - @classmethod - def href(cls, tag): - """ Returns URI in the API for the tag. """ - - return API_BASE + reverse("api_tag", args=[category_plural[tag.category], tag.slug]) - - @classmethod - def url(cls, tag): - """ Returns URL on the site. """ - - return WL_BASE + tag.get_absolute_url() - - -class TagDetailHandler(BaseHandler, TagDetails): - """ Responsible for details of a single Tag object. """ - - fields = ['name', 'url', 'sort_key', 'description'] - - @piwik_track - def read(self, request, category, slug): - """ Returns details of a tag, identified by category and slug. """ - - try: - category_sng = category_singular[category] - except KeyError: - return rc.NOT_FOUND - - try: - return Tag.objects.get(category=category_sng, slug=slug) - except Tag.DoesNotExist: - return rc.NOT_FOUND - - -class TagsHandler(BaseHandler, TagDetails): - """ Main handler for Tag objects. - - Responsible for lists of Tag objects - and fields used for representing Tags. - - """ - allowed_methods = ('GET',) - model = Tag - fields = ['name', 'href', 'url', 'slug'] - - @piwik_track - def read(self, request, category=None, pk=None): - """ Lists all tags in the category (eg. all themes). """ - if pk is not None: - try: - return Tag.objects.exclude(category='set').get(pk=pk) - except Book.DoesNotExist: - return rc.NOT_FOUND - - try: - category_sng = category_singular[category] - except KeyError: - 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 = int(request.GET.get('count', 20)) + entries = Entry.published_objects.filter(in_stream=True).order_by('-first_published_at') if after: - tags = tags.filter(slug__gt=after) - if before: - tags = tags.filter(slug__lt=before) - + entries = entries.filter(first_published_at__lt=after) if count: - if before: - tags = list(reversed(tags.order_by('-slug')[:count])) - else: - tags = tags[:count] - - return tags - - -class FragmentDetails(object): - """Custom Fragment fields.""" + entries = entries[:count] + return entries @classmethod - def href(cls, fragment): - """ Returns URI in the API for the fragment. """ - - return API_BASE + reverse("api_fragment", args=[fragment.book.slug, fragment.anchor]) + def image_url(cls, entry): + return (WL_BASE + entry.image.url) if entry.image else None @classmethod - def url(cls, fragment): - """ Returns URL on the site for the fragment. """ - - return WL_BASE + fragment.get_absolute_url() + def image_thumb(cls, entry): + return MEDIA_BASE + default.backend.get_thumbnail( + entry.image, "193x193").url if entry.image else '' @classmethod - def themes(cls, fragment): - """ Returns a list of theme tags for the fragment. """ + def gallery_urls(cls, entry): + return [WL_BASE + photo.url() for photo in entry.photo_set.all()] - return fragment.tags.filter(category='theme') - - -class FragmentDetailHandler(BaseHandler, FragmentDetails): - fields = ['book', 'anchor', 'text', 'url', 'themes'] - - @piwik_track - def read(self, request, book, anchor): - """ Returns details of a fragment, identified by book slug and anchor. """ - try: - return Fragment.objects.get(book__slug=book, anchor=anchor) - except Fragment.DoesNotExist: - return rc.NOT_FOUND - - -class FragmentsHandler(BaseHandler, FragmentDetails): - """ Main handler for Fragments. - - Responsible for lists of Fragment objects - and fields used for representing Fragments. - - """ - model = Fragment - fields = ['book', 'url', 'anchor', 'href'] - allowed_methods = ('GET',) - - categories = {'author', 'epoch', 'kind', 'genre', 'book', 'theme'} - - @piwik_track - def read(self, request, tags): - """ Lists all fragments with given book, tags, themes. - - :param tags: should be a path of categories and slugs, i.e.: - books/book-slug/authors/an-author/themes/a-theme/ - - """ - try: - tags, ancestors = read_tags(tags, allowed=self.categories) - except ValueError: - return rc.NOT_FOUND - fragments = Fragment.tagged.with_all(tags).select_related('book') - if fragments.exists(): - return fragments - else: - return rc.NOT_FOUND - - -class PictureHandler(BaseHandler): - model = Picture - fields = ('slug', 'title') - allowed_methods = ('POST',) - - def create(self, request): - if not request.user.has_perm('picture.add_picture'): - return rc.FORBIDDEN + @classmethod + def key(cls, entry): + return entry.first_published_at - data = json.loads(request.POST.get('data')) - form = PictureImportForm(data) - if form.is_valid(): - form.save() - return rc.CREATED - else: - return rc.NOT_FOUND + @classmethod + def url(cls, entry): + return WL_BASE + entry.get_absolute_url()