From 79a2cd810b74a5b550c871073657fbd28ff8c3c4 Mon Sep 17 00:00:00 2001 From: Zoe Roux Date: Mon, 16 Aug 2021 15:12:48 +0200 Subject: [PATCH] Fixing regexs for windows --- Kyoo.Transcoder | 2 +- Kyoo.WebApp/Kyoo.WebApp.csproj | 2 +- Kyoo/Kyoo.csproj | 2 +- Kyoo/settings.json | 8 ++++---- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Kyoo.Transcoder b/Kyoo.Transcoder index 75b49dcd..3315700b 160000 --- a/Kyoo.Transcoder +++ b/Kyoo.Transcoder @@ -1 +1 @@ -Subproject commit 75b49dcd25aed20eda7454faa4bc016a12c51680 +Subproject commit 3315700b84e8aaa8cd66edcd35257ec06bff5efc diff --git a/Kyoo.WebApp/Kyoo.WebApp.csproj b/Kyoo.WebApp/Kyoo.WebApp.csproj index c8c5fe64..e4a4158e 100644 --- a/Kyoo.WebApp/Kyoo.WebApp.csproj +++ b/Kyoo.WebApp/Kyoo.WebApp.csproj @@ -65,6 +65,6 @@ - + diff --git a/Kyoo/Kyoo.csproj b/Kyoo/Kyoo.csproj index e76cf005..28ac7ff0 100644 --- a/Kyoo/Kyoo.csproj +++ b/Kyoo/Kyoo.csproj @@ -35,7 +35,7 @@ - + diff --git a/Kyoo/settings.json b/Kyoo/settings.json index a3d90396..de2d784e 100644 --- a/Kyoo/settings.json +++ b/Kyoo/settings.json @@ -45,12 +45,12 @@ "scan": "24:00:00" } }, - + "media": { "regex": [ - "^\\/?(?.+)?\\/(?.+?)(?: \\((?\\d+)\\))?\\/\\k(?: \\(\\d+\\))? S(?\\d+)E(?\\d+)\\..*$", - "^\\/?(?.+)?\\/(?.+?)(?: \\((?\\d+)\\))?\\/\\k(?: \\(\\d+\\))? (?\\d+)\\..*$", - "^\\/?(?.+)?\\/(?.+?)(?: \\((?\\d+)\\))?\\/\\k(?: \\(\\d+\\))?\\..*$" + "^[\\/\\\\]*(?.+)?[\\/\\\\]+(?.+?)(?: \\((?\\d+)\\))?[\\/\\\\]+\\k(?: \\(\\d+\\))? S(?\\d+)E(?\\d+)\\..*$", + "^[\\/\\\\]*(?.+)?[\\/\\\\]+(?.+?)(?: \\((?\\d+)\\))?[\\/\\\\]+\\k(?: \\(\\d+\\))? (?\\d+)\\..*$", + "^[\\/\\\\]*(?.+)?[\\/\\\\]+(?.+?)(?: \\((?\\d+)\\))?[\\/\\\\]+\\k(?: \\(\\d+\\))?\\..*$" ], "subtitleRegex": [ "^(?.+)\\.(?\\w{1,3})\\.(?default\\.)?(?forced\\.)?.*$"