Str/bytes fix for publishing audiobooks.

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

diff --git a/src/api/urls.py b/src/api/urls.py
index 973bf03..cb890da 100644 (file)
--- a/src/api/urls.py
+++ b/src/api/urls.py
@@ -5,17 +5,15 @@
 from django.conf.urls import url, include
 from django.views.decorators.csrf import csrf_exempt
 from django.views.generic import TemplateView
 from django.conf.urls import url, include
 from django.views.decorators.csrf import csrf_exempt
 from django.views.generic import TemplateView

-from piston.authentication import oauth_access_token, oauth_request_token

 import catalogue.views
 import catalogue.views

-from api import handlers
-from api.piston_patch import oauth_user_auth
+from stats.utils import piwik_track_view

 from . import views
 
 
 urlpatterns = [
 from . import views
 
 
 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/request_token/$', csrf_exempt(views.OAuth1RequestTokenView.as_view())),
+    url(r'^oauth/authorize/$', views.oauth_user_auth, name='oauth_user_auth'),
+    url(r'^oauth/access_token/$', csrf_exempt(views.OAuth1AccessTokenView.as_view())),

 
     url(r'^$', TemplateView.as_view(template_name='api/main.html'), name='api'),
 
 
     url(r'^$', TemplateView.as_view(template_name='api/main.html'), name='api'),
 


@@ -24,13 +22,20 @@ urlpatterns = [
     url(r'tag/(?P<tag_id>\d*?)/info\.html$', catalogue.views.tag_info),
 
     # reading data
     url(r'tag/(?P<tag_id>\d*?)/info\.html$', catalogue.views.tag_info),
 
     # reading data

-    url(r'^reading/(?P<slug>[a-z0-9-]+)/$', views.BookUserDataView.as_view(), name='api_reading'),
-    url(r'^reading/(?P<slug>[a-z0-9-]+)/(?P<state>[a-z]+)/$', views.BookUserDataView.as_view(), name='api_reading'),
-    url(r'^username/$', views.UserView.as_view(), name='api_username'),
+    url(r'^reading/(?P<slug>[a-z0-9-]+)/$',
+        piwik_track_view(views.BookUserDataView.as_view()),
+        name='api_reading'),
+    url(r'^reading/(?P<slug>[a-z0-9-]+)/(?P<state>[a-z]+)/$',
+        piwik_track_view(views.BookUserDataView.as_view()),
+        name='api_reading'),
+    url(r'^username/$',
+        piwik_track_view(views.UserView.as_view()),
+        name='api_username'),

 
 

-    url(r'^blog/$', views.BlogView.as_view()),
+    url(r'^blog$',
+        piwik_track_view(views.BlogView.as_view())),

 
 

-    url(r'^pictures/$', include('picture.api.urls')),
+    url(r'^pictures/', include('picture.api.urls')),

     url(r'^', include('social.api.urls')),
     url(r'^', include('catalogue.api.urls')),
 ]
     url(r'^', include('social.api.urls')),
     url(r'^', include('catalogue.api.urls')),
 ]