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 8a9965d..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.
 #
 # 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 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
 from piston.resource import Resource
 from ssify import ssi_included

+import catalogue.views

 from api import handlers
 from api.helpers import CsrfExemptResource
 from api import handlers
 from api.helpers import CsrfExemptResource

+from api.piston_patch import oauth_user_auth

 
 auth = OAuthAuthentication(realm="Wolne Lektury")
 
 
 auth = OAuthAuthentication(realm="Wolne Lektury")
 


@@ -50,21 +52,18 @@ def incl(request, model, pk, emitter_format):
     return resp
 
 
     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)),
 
     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'^$', 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<book_id>\d*?)/info\.html$', 'catalogue.views.book_info'),
-    url(r'tag/(?P<tag_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"),
 
     # books by collections
     url(r'^collections/$', collection_list_resource, name="api_collections"),


@@ -92,10 +91,8 @@ urlpatterns = patterns(
         book_list_resource, {"daisy": True}, name='api_daisy_list'),
 
     url(r'^recommended/' + paginate_re, book_list_resource, {"recommended": True}, name='api_recommended_list'),
         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, "count": 20}, name='api_newest_list'),
-    url(r'^filter-books/(?:title-part/(?P<title_part>[^/]+)/)?(?:author-part/(?P<author_part>[^/]+)/)?'
-        r'(?:lektura/(?P<is_lektura>(?:true|false))/)?(?:audiobook/(?P<is_audiobook>(?:true|false))/)?'
-        + paginate_re, filter_book_resource, name='api_filter_books'),
+    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),
 
 
     url(r'^pictures/$', picture_resource),
 


@@ -105,4 +102,4 @@ urlpatterns = patterns(
 
     # tags by category
     url(r'^(?P<category>[a-z0-9-]+)/$', tag_list_resource, name='api_tag_list'),
 
     # tags by category
     url(r'^(?P<category>[a-z0-9-]+)/$', tag_list_resource, name='api_tag_list'),

-)
+]