X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/81f4a0e5709e2bf818244a07cbb715a54c96f3eb..041af9eb76b4687798e75918976a738556621ff0:/apps/api/urls.py diff --git a/apps/api/urls.py b/apps/api/urls.py index 9bad68a12..a22f3b772 100644 --- a/apps/api/urls.py +++ b/apps/api/urls.py @@ -5,7 +5,6 @@ from piston.resource import Resource from api import handlers from catalogue.models import Book -from picture.models import Picture auth = OAuthAuthentication(realm="Wolne Lektury") @@ -23,7 +22,7 @@ tag_resource = Resource(handler=handlers.TagDetailHandler) fragment_resource = Resource(handler=handlers.FragmentDetailHandler) fragment_list_resource = Resource(handler=handlers.FragmentsHandler) -picture_resource = Resource(handler=handlers.PictureHandler) +picture_resource = Resource(handler=handlers.PictureHandler, authentication=auth) urlpatterns = patterns( 'piston.authentication', @@ -33,7 +32,7 @@ urlpatterns = patterns( ) + patterns('', url(r'^$', 'django.views.generic.simple.direct_to_template', - {'template': 'api/main.html'}), + {'template': 'api/main.html'}, name='api'), # changes handlers @@ -48,23 +47,28 @@ urlpatterns = patterns( # objects details - url(r'^books/(?P%s)/$' % Book.URLID_RE, book_resource, name="api_book"), + url(r'^books/(?P[a-z0-9-]+)/$', book_resource, name="api_book"), url(r'^(?P[a-z0-9-]+)/(?P[a-z0-9-]+)/$', tag_resource, name="api_tag"), - url(r'^books/(?P%s)/fragments/(?P[a-z0-9-]+)/$' % Book.URLID_RE, + url(r'^books/(?P[a-z0-9-]+)/fragments/(?P[a-z0-9-]+)/$', fragment_resource, name="api_fragment"), # books by tags - url(r'^(?P(?:(?:[a-z0-9-]+/){2}){0,6})books/$', book_list_resource), - url(r'^(?P(?:(?:[a-z0-9-]+/){2}){0,6})parent_books/$', book_list_resource, {"top_level": True}), + url(r'^(?P(?:(?:[a-z0-9-]+/){2}){0,6})books/$', + book_list_resource, name='api_book_list'), + url(r'^(?P(?:(?:[a-z0-9-]+/){2}){0,6})parent_books/$', + book_list_resource, {"top_level": True}, name='api_parent_book_list'), + url(r'^(?P(?:(?:[a-z0-9-]+/){2}){0,6})audiobooks/$', + book_list_resource, {"audiobooks": True}, name='api_audiobook_list'), + url(r'^(?P(?:(?:[a-z0-9-]+/){2}){0,6})daisy/$', + book_list_resource, {"daisy": True}, name='api_daisy_list'), + + url(r'^pictures/$', picture_resource), # fragments by book, tags, themes # this should be paged url(r'^(?P(?:(?:[a-z0-9-]+/){2}){1,6})fragments/$', fragment_list_resource), # tags by category - url(r'^(?P[a-z0-9-]+)/$', tag_list_resource), - - # picture by slug - url(r'^pictures/$', picture_resource) + url(r'^(?P[a-z0-9-]+)/$', tag_list_resource, name='api_tag_list'), )