Fixes for woblink.

[redakcja.git] / src / cover / urls.py

diff --git a/src/cover/urls.py b/src/cover/urls.py
index 8278835..20cd7d6 100644 (file)
--- a/src/cover/urls.py
+++ b/src/cover/urls.py
@@ -1,22 +1,21 @@
 # This file is part of FNP-Redakcja, licensed under GNU Affero GPLv3 or later.
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
 #
 # This file is part of FNP-Redakcja, licensed under GNU Affero GPLv3 or later.
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
 #

-from django.conf.urls import url

 from django.urls import path
 from . import views
 
 
 urlpatterns = [
 from django.urls import path
 from . import views
 
 
 urlpatterns = [

-    url(r'^preview/$', views.preview_from_xml, name='cover_preview'),
-    url(r'^preview/(?P<book>[^/]+)/$', views.preview, name='cover_preview'),
-    url(r'^preview/(?P<book>[^/]+)/(?P<chunk>[^/]+)/$',
+    path('preview/', views.preview_from_xml, name='cover_preview'),
+    path('preview/<slug:book>/', views.preview, name='cover_preview'),
+    path('preview/<slug:book>/<slug:chunk>/',

             views.preview, name='cover_preview'),
             views.preview, name='cover_preview'),

-    url(r'^preview/(?P<book>[^/]+)/(?P<chunk>[^/]+)/(?P<rev>\d+)/$',
+    path('preview/<slug:book>/<slug:chunk>/<int:rev>/',

             views.preview, name='cover_preview'),
 
             views.preview, name='cover_preview'),
 

-    url(r'^image/$', views.image_list, name='cover_image_list'),
-    url(r'^image/(?P<pk>\d+)/?$', views.image, name='cover_image'),
-    url(r'^image/(?P<pk>\d+)/file/', views.image_file, name='cover_file'),
-    url(r'^add_image/$', views.add_image, name='cover_add_image'),
+    path('image/', views.image_list, name='cover_image_list'),
+    path('image/<int:pk>/', views.image, name='cover_image'),
+    path('image/<int:pk>/file/', views.image_file, name='cover_file'),
+    path('add_image/', views.add_image, name='cover_add_image'),

     path('quick-import/<int:pk>/', views.quick_import, name='cover_quick_import'),
 ]
     path('quick-import/<int:pk>/', views.quick_import, name='cover_quick_import'),
 ]