file page reorg

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

diff --git a/src/archive/urls.py b/src/archive/urls.py
index 0deb995..826c0c3 100644 (file)
--- a/src/archive/urls.py
+++ b/src/archive/urls.py
@@ -1,25 +1,23 @@
 from django.conf.urls import url
 from django.conf.urls import url

+from django.urls import path

 from django.views.generic import RedirectView
 from . import views
 
 urlpatterns = [
 from django.views.generic import RedirectView
 from . import views
 
 urlpatterns = [

-    url(r'^$', RedirectView.as_view(url='new/')),
-
+    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'^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'^unpublished/$', views.list_unpublished, name="list_unpublished"),

     url(r'^publishing/$', views.list_publishing, name="list_publishing"),
     url(r'^publishing/$', views.list_publishing, name="list_publishing"),

-    url(r'^published/$', views.list_published, name="list_published"),
+    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'^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)$', 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'^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"),
     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"),