From 2aefe9ed5a32a91c6e089456a082471f2c51b94b Mon Sep 17 00:00:00 2001 From: crobibero Date: Sun, 22 Nov 2020 14:17:42 -0700 Subject: [PATCH 1/2] Only trim file name if folder name is shorter --- Emby.Naming/Video/VideoListResolver.cs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Emby.Naming/Video/VideoListResolver.cs b/Emby.Naming/Video/VideoListResolver.cs index 5f83355c8f..4c33941296 100644 --- a/Emby.Naming/Video/VideoListResolver.cs +++ b/Emby.Naming/Video/VideoListResolver.cs @@ -226,8 +226,11 @@ namespace Emby.Naming.Video { testFilename = cleanName.ToString(); } + else if (folderName.Length <= testFilename.Length) + { + testFilename = testFilename.Substring(folderName.Length).Trim(); + } - testFilename = testFilename.Substring(folderName.Length).Trim(); return string.IsNullOrEmpty(testFilename) || testFilename[0].Equals('-') || testFilename[0].Equals('_') From 20251e670f485dde010de5ff63454cacb2f6ba5f Mon Sep 17 00:00:00 2001 From: crobibero Date: Sun, 22 Nov 2020 14:39:34 -0700 Subject: [PATCH 2/2] Fix tests --- Emby.Naming/Video/VideoListResolver.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Emby.Naming/Video/VideoListResolver.cs b/Emby.Naming/Video/VideoListResolver.cs index 4c33941296..fd16774739 100644 --- a/Emby.Naming/Video/VideoListResolver.cs +++ b/Emby.Naming/Video/VideoListResolver.cs @@ -226,7 +226,8 @@ namespace Emby.Naming.Video { testFilename = cleanName.ToString(); } - else if (folderName.Length <= testFilename.Length) + + if (folderName.Length <= testFilename.Length) { testFilename = testFilename.Substring(folderName.Length).Trim(); }