Revert "turn on banner for 1%"

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

diff --git a/src/api/urls.py b/src/api/urls.py
index 910d362..29e7a75 100644 (file)
--- a/src/api/urls.py
+++ b/src/api/urls.py
@@ -2,14 +2,16 @@
 # This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later.
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
 #
-from django.conf.urls import patterns, url
+from django.conf.urls import url
 from django.views.decorators.csrf import csrf_exempt
 from django.views.generic import TemplateView
-from piston.authentication import OAuthAuthentication, oauth_access_token
+from piston.authentication import OAuthAuthentication, oauth_access_token, oauth_request_token
 from piston.resource import Resource
 from ssify import ssi_included
+import catalogue.views
 from api import handlers
 from api.helpers import CsrfExemptResource
+from api.piston_patch import oauth_user_auth
 
 auth = OAuthAuthentication(realm="Wolne Lektury")
 
@@ -17,6 +19,7 @@ book_list_resource = CsrfExemptResource(handler=handlers.BooksHandler, authentic
 ebook_list_resource = Resource(handler=handlers.EBooksHandler)
 # book_list_resource = Resource(handler=handlers.BooksHandler)
 book_resource = Resource(handler=handlers.BookDetailHandler)
+filter_book_resource = Resource(handler=handlers.FilterBooksHandler)
 
 collection_resource = Resource(handler=handlers.CollectionDetailHandler)
 collection_list_resource = Resource(handler=handlers.CollectionsHandler)
@@ -30,6 +33,10 @@ fragment_list_resource = Resource(handler=handlers.FragmentsHandler)
 picture_resource = CsrfExemptResource(handler=handlers.PictureHandler, authentication=auth)
 
 
+tags_re = r'^(?P<tags>(?:(?:[a-z0-9-]+/){2}){0,6})'
+paginate_re = r'(?:before/(?P<before>[a-z0-9-]+)/)?(?:after/(?P<after>[a-z0-9-]+)/)?(?:count/(?P<count>[0-9]+)/)?$'
+
+
 @ssi_included
 def incl(request, model, pk, emitter_format):
     resource = {
@@ -45,21 +52,18 @@ def incl(request, model, pk, emitter_format):
     return resp
 
 
-urlpatterns = patterns(
-    'piston.authentication',
-    url(r'^oauth/request_token/$', 'oauth_request_token'),
-    url(r'^oauth/authorize/$', 'oauth_user_auth'),
+urlpatterns = [
+    url(r'^oauth/request_token/$', oauth_request_token),
+    url(r'^oauth/authorize/$', oauth_user_auth, name='oauth_user_auth'),
     url(r'^oauth/access_token/$', csrf_exempt(oauth_access_token)),
 
-) + patterns(
-    '',
     url(r'^$', TemplateView.as_view(template_name='api/main.html'), name='api'),
     url(r'^include/(?P<model>book|fragment|tag)/(?P<pk>\d+)\.(?P<lang>.+)\.(?P<emitter_format>xml|json)$',
         incl, name='api_include'),
 
     # info boxes (used by mobile app)
-    url(r'book/(?P<id>\d*?)/info\.html$', 'catalogue.views.book_info'),
-    url(r'tag/(?P<id>\d*?)/info\.html$', 'catalogue.views.tag_info'),
+    url(r'book/(?P<book_id>\d*?)/info\.html$', catalogue.views.book_info),
+    url(r'tag/(?P<tag_id>\d*?)/info\.html$', catalogue.views.tag_info),
 
     # books by collections
     url(r'^collections/$', collection_list_resource, name="api_collections"),
@@ -73,19 +77,23 @@ urlpatterns = patterns(
         fragment_resource, name="api_fragment"),
 
     # books by tags
-    url(r'^(?P<tags>(?:(?:[a-z0-9-]+/){2}){0,6})books/$',
+    url(tags_re + r'books/' + paginate_re,
         book_list_resource, name='api_book_list'),
-    url(r'^(?P<tags>(?:(?:[a-z0-9-]+/){2}){0,6})ebooks/$',
+    url(tags_re + r'ebooks/' + paginate_re,
         ebook_list_resource, name='api_ebook_list'),
-    url(r'^(?P<tags>(?:(?:[a-z0-9-]+/){2}){0,6})parent_books/$',
+    url(tags_re + r'parent_books/' + paginate_re,
         book_list_resource, {"top_level": True}, name='api_parent_book_list'),
-    url(r'^(?P<tags>(?:(?:[a-z0-9-]+/){2}){0,6})parent_ebooks/$',
+    url(tags_re + r'parent_ebooks/' + paginate_re,
         ebook_list_resource, {"top_level": True}, name='api_parent_ebook_list'),
-    url(r'^(?P<tags>(?:(?:[a-z0-9-]+/){2}){0,6})audiobooks/$',
+    url(tags_re + r'audiobooks/' + paginate_re,
         book_list_resource, {"audiobooks": True}, name='api_audiobook_list'),
-    url(r'^(?P<tags>(?:(?:[a-z0-9-]+/){2}){0,6})daisy/$',
+    url(tags_re + r'daisy/' + paginate_re,
         book_list_resource, {"daisy": True}, name='api_daisy_list'),
 
+    url(r'^recommended/' + paginate_re, book_list_resource, {"recommended": True}, name='api_recommended_list'),
+    url(r'^newest/', book_list_resource, {"newest": True, "top_level": True, "count": 20}, name='api_newest_list'),
+    url(r'^filter-books/', filter_book_resource, name='api_filter_books'),
+
     url(r'^pictures/$', picture_resource),
 
     # fragments by book, tags, themes
@@ -94,4 +102,4 @@ urlpatterns = patterns(
 
     # tags by category
     url(r'^(?P<category>[a-z0-9-]+)/$', tag_list_resource, name='api_tag_list'),
-)
+]