reqs fix

[audio.git] / apps / archive / urls.py

diff --git a/apps/archive/urls.py b/apps/archive/urls.py
index 3889949..efaeeea 100644 (file)
--- a/apps/archive/urls.py
+++ b/apps/archive/urls.py
@@ -1,7 +1,8 @@
-from django.conf.urls.defaults import patterns, include, url
+from django.conf.urls import patterns, include, url
+from django.views.generic import RedirectView

 
 urlpatterns = patterns('',
 
 urlpatterns = patterns('',

-    url(r'^$', 'django.views.generic.simple.redirect_to', {'url': 'new/'}),
+    url(r'^$', RedirectView.as_view(url='new/')),

 
     url(r'^new/$', 'archive.views.list_new', name="list_new"),
     url(r'^new/(.+)/$', 'archive.views.file_new', name="file_new"),
 
     url(r'^new/$', 'archive.views.list_new', name="list_new"),
     url(r'^new/(.+)/$', 'archive.views.file_new', name="file_new"),


@@ -12,6 +13,9 @@ urlpatterns = patterns('',
     url(r'^published/$', 'archive.views.list_published', name="list_published"),
     url(r'^file/(\d+)/$', 'archive.views.file_managed', name="file"),
     url(r'^publish/(\d+)/$', 'archive.views.publish', name="publish"),
     url(r'^published/$', 'archive.views.list_published', name="list_published"),
     url(r'^file/(\d+)/$', 'archive.views.file_managed', name="file"),
     url(r'^publish/(\d+)/$', 'archive.views.publish', name="publish"),

+    url(r'^convert/(\d+)/$', 'archive.views.publish', {'publish': False}, name="convert"),
+    url(r'^download/(\d+)/$', 'archive.views.download', name="download"),
+    url(r'^download/(\d+)\.(mp3|ogg)$', 'archive.views.download', name="download"),

     url(r'^cancel/(\d+)/$', 'archive.views.cancel_publishing', name="cancel_publishing"),
     url(r'^remove_to_archive/(\d+)/$', 'archive.views.remove_to_archive', name="remove_to_archive"),
 
     url(r'^cancel/(\d+)/$', 'archive.views.cancel_publishing', name="cancel_publishing"),
     url(r'^remove_to_archive/(\d+)/$', 'archive.views.remove_to_archive', name="remove_to_archive"),