fixes

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

diff --git a/apps/api/urls.py b/apps/api/urls.py
index f9f9c22..a2e3197 100644 (file)
--- a/apps/api/urls.py
+++ b/apps/api/urls.py
@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 from django.conf.urls.defaults import *
 from django.views.decorators.csrf import csrf_exempt
 # -*- coding: utf-8 -*-
 from django.conf.urls.defaults import *
 from django.views.decorators.csrf import csrf_exempt

+from django.views.generic import TemplateView

 from piston.authentication import OAuthAuthentication, oauth_access_token 
 from piston.resource import Resource
 
 from piston.authentication import OAuthAuthentication, oauth_access_token 
 from piston.resource import Resource
 


@@ -14,9 +15,13 @@ tag_changes_resource = Resource(handler=handlers.TagChangesHandler)
 changes_resource = Resource(handler=handlers.ChangesHandler)
 
 book_list_resource = CsrfExemptResource(handler=handlers.BooksHandler, authentication=auth)
 changes_resource = Resource(handler=handlers.ChangesHandler)
 
 book_list_resource = CsrfExemptResource(handler=handlers.BooksHandler, authentication=auth)

+ebook_list_resource = Resource(handler=handlers.EBooksHandler)

 #book_list_resource = Resource(handler=handlers.BooksHandler)
 book_resource = Resource(handler=handlers.BookDetailHandler)
 
 #book_list_resource = Resource(handler=handlers.BooksHandler)
 book_resource = Resource(handler=handlers.BookDetailHandler)
 

+collection_resource = Resource(handler=handlers.CollectionDetailHandler)
+collection_list_resource = Resource(handler=handlers.CollectionsHandler)
+

 tag_list_resource = Resource(handler=handlers.TagsHandler)
 tag_resource = Resource(handler=handlers.TagDetailHandler)
 
 tag_list_resource = Resource(handler=handlers.TagsHandler)
 tag_resource = Resource(handler=handlers.TagDetailHandler)
 


@@ -32,8 +37,7 @@ urlpatterns = patterns(
     url(r'^oauth/access_token/$', csrf_exempt(oauth_access_token)),
 
 ) + patterns('',
     url(r'^oauth/access_token/$', csrf_exempt(oauth_access_token)),
 
 ) + patterns('',

-    url(r'^$', 'django.views.generic.simple.direct_to_template',
-            {'template': 'api/main.html'}, name='api'),
+    url(r'^$', TemplateView.as_view(template_name='api/main.html'), name='api'),

 
 
     # changes handlers
 
 
     # changes handlers


@@ -47,6 +51,10 @@ urlpatterns = patterns(
     url(r'tag/(?P<id>\d*?)/info\.html$', 'catalogue.views.tag_info'),
 
 
     url(r'tag/(?P<id>\d*?)/info\.html$', 'catalogue.views.tag_info'),
 
 

+    # books by collections
+    url(r'^collections/$', collection_list_resource, name="api_collections"),
+    url(r'^collections/(?P<slug>[^/]+)/$', collection_resource, name="api_collection"),
+

     # objects details
     url(r'^books/(?P<book>[a-z0-9-]+)/$', book_resource, name="api_book"),
     url(r'^(?P<category>[a-z0-9-]+)/(?P<slug>[a-z0-9-]+)/$',
     # objects details
     url(r'^books/(?P<book>[a-z0-9-]+)/$', book_resource, name="api_book"),
     url(r'^(?P<category>[a-z0-9-]+)/(?P<slug>[a-z0-9-]+)/$',


@@ -57,8 +65,12 @@ urlpatterns = patterns(
     # books by tags
     url(r'^(?P<tags>(?:(?:[a-z0-9-]+/){2}){0,6})books/$',
         book_list_resource, name='api_book_list'),
     # books by tags
     url(r'^(?P<tags>(?:(?:[a-z0-9-]+/){2}){0,6})books/$',
         book_list_resource, name='api_book_list'),

+    url(r'^(?P<tags>(?:(?:[a-z0-9-]+/){2}){0,6})ebooks/$',
+        ebook_list_resource, name='api_ebook_list'),

     url(r'^(?P<tags>(?:(?:[a-z0-9-]+/){2}){0,6})parent_books/$',
         book_list_resource, {"top_level": True}, name='api_parent_book_list'),
     url(r'^(?P<tags>(?:(?:[a-z0-9-]+/){2}){0,6})parent_books/$',
         book_list_resource, {"top_level": True}, name='api_parent_book_list'),

+    url(r'^(?P<tags>(?:(?:[a-z0-9-]+/){2}){0,6})parent_ebooks/$',
+        ebook_list_resource, {"top_level": True}, name='api_parent_ebook_list'),

     url(r'^(?P<tags>(?:(?:[a-z0-9-]+/){2}){0,6})audiobooks/$',
         book_list_resource, {"audiobooks": True}, name='api_audiobook_list'),
     url(r'^(?P<tags>(?:(?:[a-z0-9-]+/){2}){0,6})daisy/$',
     url(r'^(?P<tags>(?:(?:[a-z0-9-]+/){2}){0,6})audiobooks/$',
         book_list_resource, {"audiobooks": True}, name='api_audiobook_list'),
     url(r'^(?P<tags>(?:(?:[a-z0-9-]+/){2}){0,6})daisy/$',