More Py3 compatibility fixes.

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

diff --git a/src/catalogue/api/urls.py b/src/catalogue/api/urls.py
index 7235267..d70338a 100644 (file)
--- a/src/catalogue/api/urls.py
+++ b/src/catalogue/api/urls.py
@@ -3,23 +3,77 @@
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
 #
 from django.conf.urls import include, url
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
 #
 from django.conf.urls import include, url

+from stats.utils import piwik_track_view

 from . import views
 
 
 from . import views
 
 

+tags_re = r'^(?P<tags>(?:(?:[a-z0-9-]+/){2}){0,6})'
+paginate_re = r'(?:after/(?P<after>[a-z0-9-]+)/)?(?:count/(?P<count>[0-9]+)/)?$'
+
+

 urlpatterns = [
     # books by collections
 urlpatterns = [
     # books by collections

-    url(r'^collections/$', views.CollectionList.as_view(), name="api_collections"),
+    url(r'^collections/$',
+        piwik_track_view(views.CollectionList.as_view()),
+        name="catalogue_api_collections"),

     url(r'^collections/(?P<slug>[^/]+)/$',
     url(r'^collections/(?P<slug>[^/]+)/$',

-        views.CollectionDetail.as_view(), name="collection-detail"),
+        piwik_track_view(views.CollectionDetail.as_view()),
+        name="collection-detail"),
+
+    url(tags_re + r'books/' + paginate_re,
+        piwik_track_view(views.BookList.as_view()),
+        name='catalogue_api_book_list'),
+    url(tags_re + r'parent_books/' + paginate_re,
+        piwik_track_view(views.BookList.as_view()),
+        {"top_level": True}, name='catalogue_api_parent_book_list'),
+    url(tags_re + r'audiobooks/' + paginate_re,
+        piwik_track_view(views.BookList.as_view()),
+        {"audiobooks": True}, name='catalogue_api_audiobook_list'),
+    url(tags_re + r'daisy/' + paginate_re,
+        piwik_track_view(views.BookList.as_view()),
+        {"daisy": True}, name='catalogue_api_daisy_list'),
+    url(r'^recommended/' + paginate_re,
+        piwik_track_view(views.BookList.as_view()),
+        {"recommended": True}, name='catalogue_api_recommended_list'),
+    url(r'^newest/$',
+        piwik_track_view(views.BookList.as_view()),
+        {"newest": True, "top_level": True, "count": 20},
+        name='catalogue_api_newest_list'),
+
+    url(r'^books/(?P<slug>[^/]+)/$',
+        piwik_track_view(views.BookDetail.as_view()),
+        name='catalogue_api_book'),
+
+    url(tags_re + r'ebooks/' + paginate_re,
+        piwik_track_view(views.EbookList.as_view()),
+        name='catalogue_api_ebook_list'),
+    url(tags_re + r'parent_ebooks/' + paginate_re,
+        piwik_track_view(views.EbookList.as_view()),
+        {"top_level": True},
+        name='catalogue_api_parent_ebook_list'),
+
+    url(r'^filter-books/$',
+        piwik_track_view(views.FilterBookList.as_view()),
+        name='catalogue_api_filter_books'),

 
 

-    url(r'^books/(?P<slug>[^/]+)/$', views.BookDetail.as_view(), name='catalogue_api_book'),
+    url(r'^epub/(?P<slug>[a-z0-9-]+)/$',
+        piwik_track_view(views.EpubView.as_view()),
+        name='catalogue_api_epub'),

 
 

-    url(r'^epub/(?P<slug>[a-z0-9-]+)/$', views.EpubView.as_view(), name='catalogue_api_epub'),
+    url(r'^preview/$',
+        piwik_track_view(views.Preview.as_view()),
+        name='catalogue_api_preview'),

 
 

-    url(r'^(?P<tags>(?:(?:[a-z0-9-]+/){2}){1,6})fragments/$', views.FragmentList.as_view()),
+    url(r'^(?P<tags>(?:(?:[a-z0-9-]+/){2}){1,6})fragments/$',
+        piwik_track_view(views.FragmentList.as_view())),

     url(r'^books/(?P<book>[a-z0-9-]+)/fragments/(?P<anchor>[a-z0-9-]+)/$',
     url(r'^books/(?P<book>[a-z0-9-]+)/fragments/(?P<anchor>[a-z0-9-]+)/$',

-        views.FragmentView.as_view(), name="catalogue_api_fragment"),
+        piwik_track_view(views.FragmentView.as_view()),
+        name="catalogue_api_fragment"),

 
 

-    url(r'^(?P<category>[a-z]+)s/$', views.TagCategoryView.as_view(), name='catalogue_api_tag_list'),
-    url(r'^(?P<category>[a-z]+)s/(?P<slug>[a-z0-9-]+)/$', views.TagView.as_view(), name="catalogue_api_tag"),
+    url(r'^(?P<category>[a-z]+)s/$',
+        piwik_track_view(views.TagCategoryView.as_view()),
+        name='catalogue_api_tag_list'),
+    url(r'^(?P<category>[a-z]+)s/(?P<slug>[a-z0-9-]+)/$',
+        piwik_track_view(views.TagView.as_view()),
+        name="catalogue_api_tag"),

 ]
 ]