catalogue style change

[wolnelektury.git] / apps / api / handlers.py

diff --git a/apps/api/handlers.py b/apps/api/handlers.py
index 32a3ce3..fddff74 100644 (file)
--- 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
 # 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.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.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 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 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
 
 
 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
 
     :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 []
     """
     if not tags:
         return []


@@ -52,16 +56,19 @@ def read_tags(tags, allowed):
         try:
             category = category_singular[category]
         except KeyError:
         try:
             category = category_singular[category]
         except KeyError:

-            raise Http404
+            raise ValueError('Unknown category.')

 
         if not category in allowed:
 
         if not category in allowed:

-            raise Http404
+            raise ValueError('Category not allowed.')

 
         # !^%@#$^#!
         if category == 'book':
             slug = 'l-' + slug
 
 
         # !^%@#$^#!
         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
 
 
     return real_tags
 
 


@@ -89,17 +96,19 @@ class BookDetailHandler(BaseHandler):
 
     """
     allowed_methods = ['GET']
 
     """
     allowed_methods = ['GET']

-    fields = ['title', 'parent',
-        'xml', 'html', 'pdf', 'epub', 'txt',
+    fields = ['title', 'parent'] + Book.formats + [

         'media', 'url'] + category_singular.keys()
 
         'media', 'url'] + category_singular.keys()
 

+    @piwik_track

     def read(self, request, slug):
     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
     """ 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()
 
 
         return WL_BASE + book.get_absolute_url()
 

+    @piwik_track

     def read(self, request, tags, top_level=False):
         """ Lists all books with given tags.
 
     def read(self, request, tags, top_level=False):
         """ Lists all books with given tags.
 


@@ -135,12 +145,44 @@ class BooksHandler(BaseHandler):
         tags = read_tags(tags, allowed=self.categories)
         if tags:
             if top_level:
         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:
             else:

-                return Book.tagged.with_all(tags)
+                books = Book.tagged.with_all(tags)

         else:
         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):
 
 # add categorized tags fields for Book
 def _tags_getter(category):


@@ -162,7 +204,7 @@ def _file_getter(format):
         else:
             return ''
     return get_file
         else:
             return ''
     return get_file

-for format in ('xml', 'txt', 'html', 'epub', 'pdf'):
+for format in Book.formats:

     setattr(BooksHandler, format, _file_getter(format))
 
 
     setattr(BooksHandler, format, _file_getter(format))
 
 


@@ -171,6 +213,7 @@ class TagDetailHandler(BaseHandler):
 
     fields = ['name', 'sort_key', 'description']
 
 
     fields = ['name', 'sort_key', 'description']
 

+    @piwik_track

     def read(self, request, category, slug):
         """ Returns details of a tag, identified by category and slug. """
 
     def read(self, request, category, slug):
         """ Returns details of a tag, identified by category and slug. """
 


@@ -179,7 +222,10 @@ class TagDetailHandler(BaseHandler):
         except KeyError, e:
             return rc.NOT_FOUND
 
         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):
 
 
 class TagsHandler(BaseHandler):


@@ -193,6 +239,7 @@ class TagsHandler(BaseHandler):
     model = Tag
     fields = ['name', 'href']
 
     model = Tag
     fields = ['name', 'href']
 

+    @piwik_track

     def read(self, request, category):
         """ Lists all tags in the category (eg. all themes). """
 
     def read(self, request, category):
         """ Lists all tags in the category (eg. all themes). """
 


@@ -201,7 +248,12 @@ class TagsHandler(BaseHandler):
         except KeyError, e:
             return rc.NOT_FOUND
 
         except KeyError, e:
             return rc.NOT_FOUND
 

-        return Tag.objects.filter(category=category_sng)
+        tags = Tag.objects.filter(category=category_sng).exclude(book_count=0)
+        if tags.exists():
+            return tags
+        else:
+            return rc.NOT_FOUND
+

 
     @classmethod
     def href(cls, tag):
 
     @classmethod
     def href(cls, tag):


@@ -213,10 +265,13 @@ class TagsHandler(BaseHandler):
 class FragmentDetailHandler(BaseHandler):
     fields = ['book', 'anchor', 'text', 'url', 'themes']
 
 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. """
     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):
 
 
 class FragmentsHandler(BaseHandler):


@@ -232,6 +287,7 @@ class FragmentsHandler(BaseHandler):
 
     categories = set(['author', 'epoch', 'kind', 'genre', 'book', 'theme'])
 
 
     categories = set(['author', 'epoch', 'kind', 'genre', 'book', 'theme'])
 

+    @piwik_track

     def read(self, request, tags):
         """ Lists all fragments with given book, tags, themes.
 
     def read(self, request, tags):
         """ Lists all fragments with given book, tags, themes.
 


@@ -240,13 +296,18 @@ class FragmentsHandler(BaseHandler):
 
         """
         tags = read_tags(tags, allowed=self.categories)
 
         """
         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):
         """ Returns URI in the API for the fragment. """
 
 
     @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])
+        return API_BASE + reverse("api_fragment", 
+            args=[fragment.book.slug, fragment.anchor])

 
     @classmethod
     def url(cls, fragment):
 
     @classmethod
     def url(cls, fragment):


@@ -292,16 +353,15 @@ class CatalogueHandler(BaseHandler):
 
     @staticmethod
     def book_dict(book, fields=None):
 
     @staticmethod
     def book_dict(book, fields=None):

-        all_fields = ('url', 'title', 'description',
+        all_fields = ['url', 'title', 'description',

                       'gazeta_link', 'wiki_link',
                       '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',
                       '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:
         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:
 
         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] = {
                 f = getattr(book, field+'_file')
                 if f:
                     obj[field] = {


@@ -320,7 +380,7 @@ class CatalogueHandler(BaseHandler):
                         'size': f.size,
                     }
 
                         '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({
                 media = []
                 for m in book.media.filter(type=field):
                     media.append({


@@ -449,7 +509,7 @@ class CatalogueHandler(BaseHandler):
                     changed_at__gte=since,
                     changed_at__lt=until):
             # only serve non-empty tags
                     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:
                 tag_d = cls.tag_dict(tag, fields)
                 updated.append(tag_d)
             elif tag.created_at < since:


@@ -472,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)
     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)
 
         changes = {
             'time_checked': timestamp(until)


@@ -487,12 +557,17 @@ class CatalogueHandler(BaseHandler):
                 if field == 'time_checked':
                     continue
                 changes.setdefault(field, {})[model] = changes_by_type[model][field]
                 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',)
 
         return changes
 
 
 class BookChangesHandler(CatalogueHandler):
     allowed_methods = ('GET',)
 

+    @piwik_track

     def read(self, request, since):
         return self.book_changes(request, since)
 
     def read(self, request, since):
         return self.book_changes(request, since)
 


@@ -500,6 +575,7 @@ class BookChangesHandler(CatalogueHandler):
 class TagChangesHandler(CatalogueHandler):
     allowed_methods = ('GET',)
 
 class TagChangesHandler(CatalogueHandler):
     allowed_methods = ('GET',)
 

+    @piwik_track

     def read(self, request, since):
         return self.tag_changes(request, since)
 
     def read(self, request, since):
         return self.tag_changes(request, since)
 


@@ -507,5 +583,24 @@ class TagChangesHandler(CatalogueHandler):
 class ChangesHandler(CatalogueHandler):
     allowed_methods = ('GET',)
 
 class ChangesHandler(CatalogueHandler):
     allowed_methods = ('GET',)
 

+    @piwik_track

     def read(self, request, since):
         return self.changes(request, since)
     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