X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/38b4defd76b7ed4fedcd81631ec6a4351b469cdc..8b315975fe02851ec4d0b6d1ce1c30b37a0ebf3d:/apps/api/handlers.py

diff --git a/apps/api/handlers.py b/apps/api/handlers.py
index bd44e57a8..fddff7407 100644
--- a/apps/api/handlers.py
+++ b/apps/api/handlers.py
@@ -3,19 +3,23 @@
 # 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.cache import get_cache
 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 picture.models import Picture
+from picture.forms import PictureImportForm
 
+from stats.utils import piwik_track
 
 API_BASE = WL_BASE = MEDIA_BASE = 'http://' + Site.objects.get_current().domain
 
@@ -38,7 +42,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 +56,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 +96,19 @@ 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. """
-
-        return get_object_or_404(Book, slug=slug)
+        """ Returns details of a book, identified by a slug and lang. """
+        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 +132,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.
 
@@ -147,6 +157,32 @@ class BooksHandler(BaseHandler):
         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):
@@ -168,7 +204,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))
 
 
@@ -177,6 +213,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. """
 
@@ -185,7 +222,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):
@@ -199,6 +239,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). """
 
@@ -207,9 +248,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
@@ -225,10 +265,13 @@ 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):
@@ -244,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.
 
@@ -262,7 +306,8 @@ 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.slug, fragment.anchor])
 
     @classmethod
     def url(cls, fragment):
@@ -308,16 +353,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:
@@ -328,7 +372,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] = {
@@ -336,7 +380,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({
@@ -465,7 +509,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:
@@ -488,6 +532,16 @@ class CatalogueHandler(BaseHandler):
     def changes(cls, request=None, since=0, until=None, book_fields=None,
                 tag_fields=None, tag_categories=None):
         until = cls.until(until)
+        since = int(since)
+
+        if not since:
+            cache = get_cache('api')
+            key = hash((book_fields, tag_fields, tag_categories,
+                    tuple(sorted(request.GET.items()))
+                  ))
+            value = cache.get(key)
+            if value is not None:
+                return value
 
         changes = {
             'time_checked': timestamp(until)
@@ -503,12 +557,17 @@ class CatalogueHandler(BaseHandler):
                 if field == 'time_checked':
                     continue
                 changes.setdefault(field, {})[model] = changes_by_type[model][field]
+
+        if not since:
+            cache.set(key, changes)
+
         return changes
 
 
 class BookChangesHandler(CatalogueHandler):
     allowed_methods = ('GET',)
 
+    @piwik_track
     def read(self, request, since):
         return self.book_changes(request, since)
 
@@ -516,6 +575,7 @@ class BookChangesHandler(CatalogueHandler):
 class TagChangesHandler(CatalogueHandler):
     allowed_methods = ('GET',)
 
+    @piwik_track
     def read(self, request, since):
         return self.tag_changes(request, since)
 
@@ -523,5 +583,24 @@ class TagChangesHandler(CatalogueHandler):
 class ChangesHandler(CatalogueHandler):
     allowed_methods = ('GET',)
 
+    @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