X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/357027375ff8867f42ca34bcbfb5a78b5b185fc3..a04dc488f5fea78a2a51bde4b59b4aad50cf3204:/src/api/urls.py

diff --git a/src/api/urls.py b/src/api/urls.py
index 1c2e656d1..310460e04 100644
--- a/src/api/urls.py
+++ b/src/api/urls.py
@@ -15,8 +15,9 @@ auth = OAuthAuthentication(realm="Wolne Lektury")
 
 book_list_resource = CsrfExemptResource(handler=handlers.BooksHandler, authentication=auth)
 ebook_list_resource = Resource(handler=handlers.EBooksHandler)
-#book_list_resource = Resource(handler=handlers.BooksHandler)
+# 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 +31,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 = {
@@ -51,14 +56,15 @@ urlpatterns = patterns(
     url(r'^oauth/authorize/$', 'oauth_user_auth'),
     url(r'^oauth/access_token/$', csrf_exempt(oauth_access_token)),
 
-) + patterns('',
+) + 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"),
@@ -72,19 +78,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, "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