X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/92ff4af75a2e0defd8989e6b29e39196f790d16c..27645bc61a8cb186116d6410217011dd755823f2:/apps/api/handlers.py diff --git a/apps/api/handlers.py b/apps/api/handlers.py index 41b5ac6f9..d34806f0a 100644 --- a/apps/api/handlers.py +++ b/apps/api/handlers.py @@ -15,6 +15,8 @@ from api.helpers import timestamp from api.models import Deleted from catalogue.forms import BookImportForm from catalogue.models import Book, Tag, BookMedia, Fragment +from picture.models import Picture +from picture.forms import PictureImportForm from stats.utils import piwik_track @@ -93,16 +95,18 @@ class BookDetailHandler(BaseHandler): """ allowed_methods = ['GET'] - fields = ['title', 'parent', - 'xml', 'html', 'pdf', 'epub', 'txt', + fields = ['title', 'parent'] + Book.formats + [ 'media', 'url'] + category_singular.keys() @piwik_track - def read(self, request, slug): - """ Returns details of a book, identified by a slug. """ + def read(self, request, book): + """ Returns details of a book, identified by a slug and lang. """ + kwargs = Book.split_urlid(book) + if not kwargs: + return rc.NOT_FOUND try: - return Book.objects.get(slug=slug) + return Book.objects.get(**kwargs) except Book.DoesNotExist: return rc.NOT_FOUND @@ -123,7 +127,7 @@ class AnonymousBooksHandler(AnonymousBaseHandler): @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("api_book", args=[book.urlid()]) @classmethod def url(cls, book): @@ -203,7 +207,7 @@ def _file_getter(format): else: return '' return get_file -for format in ('xml', 'txt', 'html', 'epub', 'pdf'): +for format in Book.formats: setattr(BooksHandler, format, _file_getter(format)) @@ -247,9 +251,8 @@ class TagsHandler(BaseHandler): except KeyError, e: return rc.NOT_FOUND - tags = Tag.objects.filter(category=category_sng) - tags = [t for t in tags if t.get_count() > 0] - if tags: + tags = Tag.objects.filter(category=category_sng).exclude(book_count=0) + if tags.exists(): return tags else: return rc.NOT_FOUND @@ -266,11 +269,18 @@ class FragmentDetailHandler(BaseHandler): fields = ['book', 'anchor', 'text', 'url', 'themes'] @piwik_track - def read(self, request, slug, anchor): + def read(self, request, book, anchor): """ Returns details of a fragment, identified by book slug and anchor. """ + kwargs = Book.split_urlid(book) + if not kwargs: + return rc.NOT_FOUND + + fragment_kwargs = {} + for field, value in kwargs.items(): + fragment_kwargs['book__' + field] = value try: - return Fragment.objects.get(book__slug=slug, anchor=anchor) + return Fragment.objects.get(anchor=anchor, **fragment_kwargs) except Fragment.DoesNotExist: return rc.NOT_FOUND @@ -307,7 +317,7 @@ class FragmentsHandler(BaseHandler): def href(cls, fragment): """ Returns URI in the API for the fragment. """ - return API_BASE + reverse("api_fragment", args=[fragment.book.slug, fragment.anchor]) + return API_BASE + reverse("api_fragment", args=[fragment.book.urlid(), fragment.anchor]) @classmethod def url(cls, fragment): @@ -353,16 +363,15 @@ 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', - 'mp3', 'ogg', 'daisy', + ] + Book.formats + BookMedia.formats + [ '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: @@ -373,7 +382,7 @@ class CatalogueHandler(BaseHandler): obj = {} for field in fields: - if field in ('xml', 'epub', 'txt', 'pdf', 'html'): + if field in Book.formats: f = getattr(book, field+'_file') if f: obj[field] = { @@ -381,7 +390,7 @@ class CatalogueHandler(BaseHandler): 'size': f.size, } - elif field in ('mp3', 'ogg', 'daisy'): + elif field in BookMedia.formats: media = [] for m in book.media.filter(type=field): media.append({ @@ -510,7 +519,7 @@ class CatalogueHandler(BaseHandler): changed_at__gte=since, changed_at__lt=until): # only serve non-empty tags - if tag.get_count(): + if tag.book_count: tag_d = cls.tag_dict(tag, fields) updated.append(tag_d) elif tag.created_at < since: @@ -573,3 +582,21 @@ class ChangesHandler(CatalogueHandler): @piwik_track def read(self, request, since): return self.changes(request, since) + + +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 + + data = json.loads(request.POST.get('data')) + form = PictureImportForm(data) + if form.is_valid(): + form.save() + return rc.CREATED + else: + return rc.NOT_FOUND