X-Git-Url: https://git.mdrn.pl/audio.git/blobdiff_plain/10ee4271e2cb35c585726a1c306e6c4ef561b257..2e76a99938547ca608f9e109bbe3322571976495:/src/archive/urls.py

diff --git a/src/archive/urls.py b/src/archive/urls.py
index 826c0c3..b057df4 100644
--- a/src/archive/urls.py
+++ b/src/archive/urls.py
@@ -1,24 +1,23 @@
-from django.conf.urls import url
 from django.urls import path
 from django.views.generic import RedirectView
 from . import views
 
 urlpatterns = [
     path("", views.AudiobookList.as_view(), name="list_managed"),
-    url(r'^new/$', views.list_new, name="list_new"),
-    url(r'^new/(.+)/$', views.file_new, name="file_new"),
-    url(r'^move_to_archive/(.+)/$', views.move_to_archive, name="move_to_archive"),
-    url(r'^publishing/$', views.list_publishing, name="list_publishing"),
+    path('new/', views.list_new, name="list_new"),
+    path('new/<path:filename>/', views.file_new, name="file_new"),
+    path('move_to_archive/<path:filename>/', views.move_to_archive, name="move_to_archive"),
+    path('publishing/', views.list_publishing, name="list_publishing"),
     path('book/<slug:slug>/', views.BookView.as_view(), name="book"),
     path('book-youtube-volume/<int:aid>/', views.book_youtube_volume, name="book_youtube_volume"),
-    url(r'^file/(\d+)/$', views.file_managed, name="file"),
-    url(r'^publish/(\d+)/$', views.publish, name="publish"),
-    url(r'^convert/(\d+)/$', views.publish, {'publish': False}, name="convert"),
-    url(r'^download/(\d+)/$', views.download, name="download"),
-    url(r'^download/(\d+)\.(mp3|ogg|mkv)$', views.download, name="download"),
-    url(r'^cancel/(\d+)/$', views.cancel_publishing, name="cancel_publishing"),
-    url(r'^remove_to_archive/(\d+)/$', views.remove_to_archive, name="remove_to_archive"),
-    url(r'^unmanaged/$', views.list_unmanaged, name="list_unmanaged"),
-    url(r'^unmanaged/(.+)/$', views.file_unmanaged, name="file_unmanaged"),
-    url(r'^move_to_new/(.+)/$', views.move_to_new, name="move_to_new"),
+    path('file/<int:id>/', views.file_managed, name="file"),
+    path('publish/<int:aid>/', views.publish, name="publish"),
+    path('convert/<int:aid>/', views.publish, {'publish': False}, name="convert"),
+    path('download/<int:aid>/', views.download, name="download"),
+    path('download/<int:aid>.<slug:which>', views.download, name="download"),
+    path('cancel/<int:aid>/', views.cancel_publishing, name="cancel_publishing"),
+    path('remove_to_archive/<int:aid>/', views.remove_to_archive, name="remove_to_archive"),
+    path('unmanaged/', views.list_unmanaged, name="list_unmanaged"),
+    path('unmanaged/<path:filename>/', views.file_unmanaged, name="file_unmanaged"),
+    path('move_to_new/<path:filename>/', views.move_to_new, name="move_to_new"),
 ]