Fix all urls for default APPEND_SLASH setting work

opds_catalog/urls.py

@@ -28,21 +28,20 @@ urlpatterns = [
     url(r'^search/$',feeds.OpenSearch, name='opensearch'),
     #url(r'search/{searchTerms}/$',feeds.OpenSearch, name='search_template'),
    
-    url(r'^search/books/(?P<searchtype>[bmasgued])/(?P<searchterms>.+)/(?P<page>\d+)/',feeds.SearchBooksFeed(), name='searchbooks'),
-    url(r'^search/books/(?P<searchtype>[bmasgued])/(?P<searchterms>.+)/',feeds.SearchBooksFeed(), name='searchbooks'),    
-    url(r'^search/books/(?P<searchtype>as)/(?P<searchterms>.+)/(?P<searchterms0>.+)/(?P<page>\d+)/',feeds.SearchBooksFeed(), name='searchbooks'),
-    url(r'^search/books/(?P<searchtype>as)/(?P<searchterms>.+)/(?P<searchterms0>.+)/',feeds.SearchBooksFeed(), name='searchbooks'),
-    url(r'^search/books/(?P<searchtype>as)/(?P<searchterms>.+)/',feeds.SelectSeriesFeed(), name='searchbooks'),      
-    url(r'^search/books/u/0/',feeds.SearchBooksFeed(), name='bookshelf'),
+    url(r'^search/books/(?P<searchtype>[bmasgued])/(?P<searchterms>.+)/(?P<page>\d+)/$',feeds.SearchBooksFeed(), name='searchbooks'),
+    url(r'^search/books/(?P<searchtype>[bmasgued])/(?P<searchterms>.+)/$',feeds.SearchBooksFeed(), name='searchbooks'),
+    url(r'^search/books/(?P<searchtype>as)/(?P<searchterms>.+)/(?P<searchterms0>.+)/(?P<page>\d+)/$',feeds.SearchBooksFeed(), name='searchbooks'),
+    url(r'^search/books/(?P<searchtype>as)/(?P<searchterms>.+)/(?P<searchterms0>.+)/$',feeds.SearchBooksFeed(), name='searchbooks'),
+    url(r'^search/books/(?P<searchtype>as)/(?P<searchterms>.+)/$',feeds.SelectSeriesFeed(), name='searchbooks'),
+    url(r'^search/books/u/0/$',feeds.SearchBooksFeed(), name='bookshelf'),
                  
-    url(r'^search/authors/(?P<searchtype>[bme])/(?P<searchterms>.+)/(?P<page>\d+)/',feeds.SearchAuthorsFeed(), name='searchauthors'),
-    url(r'^search/authors/(?P<searchtype>[bme])/(?P<searchterms>.+)/',feeds.SearchAuthorsFeed(), name='searchauthors'),       
+    url(r'^search/authors/(?P<searchtype>[bme])/(?P<searchterms>.+)/(?P<page>\d+)/$',feeds.SearchAuthorsFeed(), name='searchauthors'),
+    url(r'^search/authors/(?P<searchtype>[bme])/(?P<searchterms>.+)/$',feeds.SearchAuthorsFeed(), name='searchauthors'),
        
-    url(r'^search/series/(?P<searchtype>[bmae])/(?P<searchterms>.+)/(?P<page>\d+)/',feeds.SearchSeriesFeed(), name='searchseries'),
-    url(r'^search/series/(?P<searchtype>[bmae])/(?P<searchterms>.+)/',feeds.SearchSeriesFeed(), name='searchseries'), 
+    url(r'^search/series/(?P<searchtype>[bmae])/(?P<searchterms>.+)/(?P<page>\d+)/$',feeds.SearchSeriesFeed(), name='searchseries'),
+    url(r'^search/series/(?P<searchtype>[bmae])/(?P<searchterms>.+)/$',feeds.SearchSeriesFeed(), name='searchseries'),
 
     url(r'^search/(?P<searchterms>.+)/$',feeds.SearchTypesFeed(), name='searchtypes'),
-    url(r'^search/(?P<searchterms>.+)$',feeds.SearchTypesFeed(), name='searchtypes'),
     
     url(r'^convert/(?P<book_id>[0-9]+)/(?P<convert_type>.+)/$',dl.ConvertFB2, name='convert'),
     url(r'^download/(?P<book_id>[0-9]+)/(?P<zip_flag>[0-1])/$',dl.Download, name='download'),
@@ -50,5 +49,5 @@ urlpatterns = [
     url(r'^thumb/(?P<book_id>[0-9]+)/$',dl.Thumbnail, name='thumb'),
     url(r'^thumb/$',dl.Cover, name='covertmpl'),
         
-    url(r'^',feeds.MainFeed(), name='main'),
+    url(r'^$',feeds.MainFeed(), name='main'),
 ]

sopds/urls.py

@@ -22,5 +22,5 @@ urlpatterns = [
     url(r'^web/', include('sopds_web_backend.urls', namespace='web', app_name='opds_web_backend')),
     url(r'^admin/', admin.site.urls),
     #url(r'^logout/$', logout, {'next_page':'/web/'},name='logout'),   
-    url(r'^', include('sopds_web_backend.urls', namespace='web', app_name='opds_web_backend')),
+    url(r'^$', include('sopds_web_backend.urls', namespace='web', app_name='opds_web_backend')),
 ]

sopds_web_backend/urls.py

@@ -3,17 +3,17 @@ from django.conf.urls import url
 from sopds_web_backend import views
 
 urlpatterns = [
-    url(r'^search/books/',views.SearchBooksView, name='searchbooks'),
-    url(r'^search/authors/',views.SearchAuthorsView, name='searchauthors'),                        
-    url(r'^search/series/',views.SearchSeriesView, name='searchseries'),       
-    url(r'^catalog/',views.CatalogsView, name='catalog'),  
-    url(r'^book/',views.BooksView, name='book'), 
-    url(r'^author/',views.AuthorsView, name='author'), 
-    url(r'^genre/',views.GenresView, name='genre'),        
-    url(r'^series/',views.SeriesView, name='series'),   
-    url(r'^login/',views.LoginView, name='login'),    
-    url(r'^logout/',views.LogoutView, name='logout'),  
-    url(r'^bs/delete/',views.BSDelView, name='bsdel'),
-    url(r'^bs/clear/', views.BSClearView, name='bsclear'),
-    url(r'^',views.hello, name='main'),         
+    url(r'^search/books/$',views.SearchBooksView, name='searchbooks'),
+    url(r'^search/authors/$',views.SearchAuthorsView, name='searchauthors'),
+    url(r'^search/series/$',views.SearchSeriesView, name='searchseries'),
+    url(r'^catalog/$',views.CatalogsView, name='catalog'),
+    url(r'^book/$',views.BooksView, name='book'),
+    url(r'^author/$',views.AuthorsView, name='author'),
+    url(r'^genre/$',views.GenresView, name='genre'),
+    url(r'^series/$',views.SeriesView, name='series'),
+    url(r'^login/$',views.LoginView, name='login'),
+    url(r'^logout/$',views.LogoutView, name='logout'),
+    url(r'^bs/delete/$',views.BSDelView, name='bsdel'),
+    url(r'^bs/clear/$', views.BSClearView, name='bsclear'),
+    url(r'^$',views.hello, name='main'),
 ]