X-Git-Url: https://git.mdrn.pl/audio.git/blobdiff_plain/2d1d955bb3b4a5ca4dad1153c062c9ab3b6319e7..5c11ba52a0f81411f3b3a092e2547e3722a8ee59:/apps/archive/urls.py

diff --git a/apps/archive/urls.py b/apps/archive/urls.py
index c5fe97c..efaeeea 100644
--- a/apps/archive/urls.py
+++ b/apps/archive/urls.py
@@ -1,19 +1,25 @@
-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('',
-    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'^move_to_archive/([^/]+)/$', 'archive.views.move_to_archive', name="move_to_archive"),
+    url(r'^new/(.+)/$', 'archive.views.file_new', name="file_new"),
+    url(r'^move_to_archive/(.+)/$', 'archive.views.move_to_archive', name="move_to_archive"),
 
     url(r'^unpublished/$', 'archive.views.list_unpublished', name="list_unpublished"),
+    url(r'^publishing/$', 'archive.views.list_publishing', name="list_publishing"),
     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'^unmanaged/$', 'archive.views.list_unmanaged', name="list_unmanaged"),
-    url(r'^unmanaged/([^/]+)/$', 'archive.views.file_unmanaged', name="file_unmanaged"),
-    url(r'^move_to_new/([^/]+)/$', 'archive.views.move_to_new', name="move_to_new"),
+    url(r'^unmanaged/(.+)/$', 'archive.views.file_unmanaged', name="file_unmanaged"),
+    url(r'^move_to_new/(.+)/$', 'archive.views.move_to_new', name="move_to_new"),
 )