瀏覽代碼

Remove broken CleanDateTimes regex

crobibero 4 年之前
父節點
當前提交
f512d5167d
共有 2 個文件被更改,包括 6 次插入10 次删除
  1. 1 3
      Emby.Naming/Common/NamingOptions.cs
  2. 5 7
      tests/Jellyfin.Naming.Tests/Video/VideoResolverTests.cs

+ 1 - 3
Emby.Naming/Common/NamingOptions.cs

@@ -132,9 +132,7 @@ namespace Emby.Naming.Common
             CleanDateTimes = new[]
             {
                 @"(.+[^_\,\.\(\)\[\]\-])[_\.\(\)\[\]\-](19[0-9]{2}|20[0-9]{2})(?![0-9]+|\W[0-9]{2}\W[0-9]{2})([ _\,\.\(\)\[\]\-][^0-9]|).*(19[0-9]{2}|20[0-9]{2})*",
-                @"(.+[^_\,\.\(\)\[\]\-])[ _\.\(\)\[\]\-]+(19[0-9]{2}|20[0-9]{2})(?![0-9]+|\W[0-9]{2}\W[0-9]{2})([ _\,\.\(\)\[\]\-][^0-9]|).*(19[0-9]{2}|20[0-9]{2})*",
-                @"(.+\w)\W+\p{Ps}(19[0-9]{2}|20[0-9]{2})\p{Pe}", // Prefer year enclosed in parenthesis (){}[]
-                @"(.+\w)\W+(19[0-9]{2}|20[0-9]{2})(\W|$)", // Secondary year surrounded by non-word chars
+                @"(.+[^_\,\.\(\)\[\]\-])[ _\.\(\)\[\]\-]+(19[0-9]{2}|20[0-9]{2})(?![0-9]+|\W[0-9]{2}\W[0-9]{2})([ _\,\.\(\)\[\]\-][^0-9]|).*(19[0-9]{2}|20[0-9]{2})*"
             };
 
             CleanStrings = new[]

+ 5 - 7
tests/Jellyfin.Naming.Tests/Video/VideoResolverTests.cs

@@ -147,13 +147,11 @@ namespace Jellyfin.Naming.Tests.Video
             };
             yield return new object[]
             {
-                new VideoFileInfo()
-                {
-                    Path = @"/server/Movies/Rain Man 1988 REMASTERED 1080p BluRay x264 AAC - Ozlem/Rain Man 1988 REMASTERED 1080p BluRay x264 AAC - Ozlem.mp4",
-                    Container = "mp4",
-                    Name = "Rain Man",
-                    Year = 1988,
-                }
+                new VideoFileInfo(
+                    path: @"/server/Movies/Rain Man 1988 REMASTERED 1080p BluRay x264 AAC - Ozlem/Rain Man 1988 REMASTERED 1080p BluRay x264 AAC - Ozlem.mp4",
+                    container: "mp4",
+                    name: "Rain Man",
+                    year: 1988)
             };
         }