X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/5a15f6f4162ddda647b1ca9eec4e36f85f457056..7d840022e6bd987ea1827f91357b096d47933b7d:/apps/api/handlers.py?ds=sidebyside diff --git a/apps/api/handlers.py b/apps/api/handlers.py index 32a3ce300..8f06deafc 100644 --- a/apps/api/handlers.py +++ b/apps/api/handlers.py @@ -3,19 +3,20 @@ # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information. from datetime import datetime, timedelta +import json from django.conf import settings from django.contrib.sites.models import Site from django.core.urlresolvers import reverse -from django.http import Http404 -from django.shortcuts import get_object_or_404 -from piston.handler import BaseHandler +from piston.handler import AnonymousBaseHandler, BaseHandler from piston.utils import rc from api.helpers import timestamp from api.models import Deleted +from catalogue.forms import BookImportForm from catalogue.models import Book, Tag, BookMedia, Fragment +from stats.utils import piwik_track API_BASE = WL_BASE = MEDIA_BASE = 'http://' + Site.objects.get_current().domain @@ -38,7 +39,7 @@ def read_tags(tags, allowed): :param str tags: a path of category and slug pairs, like: authors/an-author/... :returns: list of Tag objects - :raises: django.http.Http404 + :raises: ValueError when tags can't be found """ if not tags: return [] @@ -52,16 +53,19 @@ def read_tags(tags, allowed): try: category = category_singular[category] except KeyError: - raise Http404 + raise ValueError('Unknown category.') if not category in allowed: - raise Http404 + raise ValueError('Category not allowed.') # !^%@#$^#! if category == 'book': slug = 'l-' + slug - real_tags.append(get_object_or_404(Tag, category=category, slug=slug)) + try: + real_tags.append(Tag.objects.get(category=category, slug=slug)) + except Tag.DoesNotExist: + raise ValueError('Tag not found') return real_tags @@ -89,17 +93,20 @@ class BookDetailHandler(BaseHandler): """ allowed_methods = ['GET'] - fields = ['title', 'parent', - 'xml', 'html', 'pdf', 'epub', 'txt', + fields = ['title', 'parent'] + Book.file_types + [ 'media', 'url'] + category_singular.keys() + @piwik_track def read(self, request, slug): """ Returns details of a book, identified by a slug. """ - return get_object_or_404(Book, slug=slug) + try: + return Book.objects.get(slug=slug) + except Book.DoesNotExist: + return rc.NOT_FOUND -class BooksHandler(BaseHandler): +class AnonymousBooksHandler(AnonymousBaseHandler): """ Main handler for Book objects. Responsible for lists of Book objects @@ -123,6 +130,7 @@ class BooksHandler(BaseHandler): return WL_BASE + book.get_absolute_url() + @piwik_track def read(self, request, tags, top_level=False): """ Lists all books with given tags. @@ -135,12 +143,44 @@ class BooksHandler(BaseHandler): tags = read_tags(tags, allowed=self.categories) if tags: if top_level: - return Book.tagged_top_level(tags) + books = Book.tagged_top_level(tags) + return books if books else rc.NOT_FOUND else: - return Book.tagged.with_all(tags) + books = Book.tagged.with_all(tags) else: - return Book.objects.all() + books = Book.objects.all() + + if books.exists(): + return books + else: + return rc.NOT_FOUND + def create(self, request, tags, top_level=False): + return 'aaa' + + @classmethod + def media(self, book): + """ Returns all media for a book. """ + + return book.media.all() + + +class BooksHandler(BaseHandler): + model = Book + fields = ('slug', 'title') + anonymous = AnonymousBooksHandler + + def create(self, request, tags, top_level=False): + if not request.user.has_perm('catalogue.add_book'): + return rc.FORBIDDEN + + data = json.loads(request.POST.get('data')) + form = BookImportForm(data) + if form.is_valid(): + form.save() + return rc.CREATED + else: + return rc.NOT_FOUND # add categorized tags fields for Book def _tags_getter(category): @@ -162,7 +202,7 @@ def _file_getter(format): else: return '' return get_file -for format in ('xml', 'txt', 'html', 'epub', 'pdf'): +for format in Book.file_types: setattr(BooksHandler, format, _file_getter(format)) @@ -171,6 +211,7 @@ class TagDetailHandler(BaseHandler): fields = ['name', 'sort_key', 'description'] + @piwik_track def read(self, request, category, slug): """ Returns details of a tag, identified by category and slug. """ @@ -179,7 +220,10 @@ class TagDetailHandler(BaseHandler): except KeyError, e: return rc.NOT_FOUND - return get_object_or_404(Tag, category=category_sng, slug=slug) + try: + return Tag.objects.get(category=category_sng, slug=slug) + except Tag.DoesNotExist: + return rc.NOT_FOUND class TagsHandler(BaseHandler): @@ -193,6 +237,7 @@ class TagsHandler(BaseHandler): model = Tag fields = ['name', 'href'] + @piwik_track def read(self, request, category): """ Lists all tags in the category (eg. all themes). """ @@ -201,7 +246,13 @@ class TagsHandler(BaseHandler): except KeyError, e: return rc.NOT_FOUND - return Tag.objects.filter(category=category_sng) + tags = Tag.objects.filter(category=category_sng) + tags = [t for t in tags if t.get_count() > 0] + if tags: + return tags + else: + return rc.NOT_FOUND + @classmethod def href(cls, tag): @@ -213,10 +264,14 @@ class TagsHandler(BaseHandler): class FragmentDetailHandler(BaseHandler): fields = ['book', 'anchor', 'text', 'url', 'themes'] + @piwik_track def read(self, request, slug, anchor): """ Returns details of a fragment, identified by book slug and anchor. """ - return get_object_or_404(Fragment, book__slug=slug, anchor=anchor) + try: + return Fragment.objects.get(book__slug=slug, anchor=anchor) + except Fragment.DoesNotExist: + return rc.NOT_FOUND class FragmentsHandler(BaseHandler): @@ -232,6 +287,7 @@ class FragmentsHandler(BaseHandler): categories = set(['author', 'epoch', 'kind', 'genre', 'book', 'theme']) + @piwik_track def read(self, request, tags): """ Lists all fragments with given book, tags, themes. @@ -240,7 +296,11 @@ class FragmentsHandler(BaseHandler): """ tags = read_tags(tags, allowed=self.categories) - return Fragment.tagged.with_all(tags).select_related('book') + fragments = Fragment.tagged.with_all(tags).select_related('book') + if fragments.exists(): + return fragments + else: + return rc.NOT_FOUND @classmethod def href(cls, fragment): @@ -292,16 +352,16 @@ class CatalogueHandler(BaseHandler): @staticmethod def book_dict(book, fields=None): - all_fields = ('url', 'title', 'description', + all_fields = ['url', 'title', 'description', 'gazeta_link', 'wiki_link', - 'xml', 'epub', 'txt', 'pdf', 'html', + ] + Book.file_types + [ 'mp3', 'ogg', 'daisy', 'parent', 'parent_number', 'tags', 'license', 'license_description', 'source_name', 'technical_editors', 'editors', 'author', 'sort_key', - ) + ] if fields: fields = (f for f in fields if f in all_fields) else: @@ -312,7 +372,7 @@ class CatalogueHandler(BaseHandler): obj = {} for field in fields: - if field in ('xml', 'epub', 'txt', 'pdf', 'html'): + if field in Book.file_types: f = getattr(book, field+'_file') if f: obj[field] = { @@ -493,6 +553,7 @@ class CatalogueHandler(BaseHandler): class BookChangesHandler(CatalogueHandler): allowed_methods = ('GET',) + @piwik_track def read(self, request, since): return self.book_changes(request, since) @@ -500,6 +561,7 @@ class BookChangesHandler(CatalogueHandler): class TagChangesHandler(CatalogueHandler): allowed_methods = ('GET',) + @piwik_track def read(self, request, since): return self.tag_changes(request, since) @@ -507,5 +569,6 @@ class TagChangesHandler(CatalogueHandler): class ChangesHandler(CatalogueHandler): allowed_methods = ('GET',) + @piwik_track def read(self, request, since): return self.changes(request, since)