Merge branch 'picture' into pretty

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

diff --git a/apps/api/handlers.py b/apps/api/handlers.py
index 41b5ac6..e10a4b5 100644 (file)
--- a/apps/api/handlers.py
+++ b/apps/api/handlers.py
@@ -93,16 +93,18 @@ 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()
 
     @piwik_track
         '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:
 
         try:

-            return Book.objects.get(slug=slug)
+            return Book.objects.get(**kwargs)

         except Book.DoesNotExist:
             return rc.NOT_FOUND
 
         except Book.DoesNotExist:
             return rc.NOT_FOUND
 


@@ -123,7 +125,7 @@ class AnonymousBooksHandler(AnonymousBaseHandler):
     @classmethod
     def href(cls, book):
         """ Returns an URI for a Book in the API. """
     @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):
 
     @classmethod
     def url(cls, book):


@@ -203,7 +205,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))
 
 


@@ -266,11 +268,18 @@ class FragmentDetailHandler(BaseHandler):
     fields = ['book', 'anchor', 'text', 'url', 'themes']
 
     @piwik_track
     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. """
         """ 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:
 
         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
 
         except Fragment.DoesNotExist:
             return rc.NOT_FOUND
 


@@ -307,7 +316,7 @@ class FragmentsHandler(BaseHandler):
     def href(cls, fragment):
         """ Returns URI in the API for the fragment. """
 
     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):
 
     @classmethod
     def url(cls, fragment):


@@ -353,16 +362,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:


@@ -373,7 +381,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] = {


@@ -381,7 +389,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({