瀏覽代碼

Fix failing tests?

Delgan 5 年之前
父節點
當前提交
90d289f946
共有 2 個文件被更改,包括 5 次插入4 次删除
  1. 1 0
      Emby.Naming/Common/NamingOptions.cs
  2. 4 4
      tests/Jellyfin.Naming.Tests/Video/CleanDateTimeTests.cs

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

@@ -136,6 +136,7 @@ namespace Emby.Naming.Common
 
 
             CleanDateTimes = new[]
             CleanDateTimes = new[]
             {
             {
+                @"(.+[^_\,\.\(\)\[\]\-])[_\.\(\)\[\]\-](19\d{2}|20\d{2})([ _\,\.\(\)\[\]\-][^0-9]|).*(19\d{2}|20\d{2})*",
                 @"(.+[^_\,\.\(\)\[\]\-])[ _\.\(\)\[\]\-](19\d{2}|20\d{2})([ _\,\.\(\)\[\]\-][^0-9]|).*(19\d{2}|20\d{2})*"
                 @"(.+[^_\,\.\(\)\[\]\-])[ _\.\(\)\[\]\-](19\d{2}|20\d{2})([ _\,\.\(\)\[\]\-][^0-9]|).*(19\d{2}|20\d{2})*"
             };
             };
 
 

+ 4 - 4
tests/Jellyfin.Naming.Tests/Video/CleanDateTimeTests.cs

@@ -39,12 +39,12 @@ namespace Jellyfin.Naming.Tests.Video
         [InlineData(@"[rec].mkv", "[rec].mkv", null)]
         [InlineData(@"[rec].mkv", "[rec].mkv", null)]
         [InlineData(@"St. Vincent (2014)", "St. Vincent", 2014)]
         [InlineData(@"St. Vincent (2014)", "St. Vincent", 2014)]
         [InlineData("Super movie(2009).mp4", "Super movie", 2009)]
         [InlineData("Super movie(2009).mp4", "Super movie", 2009)]
-        // FIXME: [InlineData("Drug War 2013.mp4", "Drug War", 2013)]
+        [InlineData("Drug War 2013.mp4", "Drug War", 2013)]
         [InlineData("My Movie (1997) - GreatestReleaseGroup 2019.mp4", "My Movie", 1997)]
         [InlineData("My Movie (1997) - GreatestReleaseGroup 2019.mp4", "My Movie", 1997)]
-        // FIXME: [InlineData("First Man 2018 1080p.mkv", "First Man", 2018)]
+        [InlineData("First Man 2018 1080p.mkv", "First Man", 2018)]
         [InlineData("First Man (2018) 1080p.mkv", "First Man", 2018)]
         [InlineData("First Man (2018) 1080p.mkv", "First Man", 2018)]
-        // FIXME: [InlineData("Maximum Ride - 2016 - WEBDL-1080p - x264 AC3.mkv", "Maximum Ride", 2016)]
-        // FIXME: [InlineData("Robin Hood [Multi-Subs] [2018].mkv", "Robin Hood", 2018)]
+        [InlineData("Maximum Ride - 2016 - WEBDL-1080p - x264 AC3.mkv", "Maximum Ride", 2016)]
+        [InlineData("Robin Hood [Multi-Subs] [2018].mkv", "Robin Hood", 2018)]
         [InlineData(@"3.Days.to.Kill.2014.720p.BluRay.x264.YIFY.mkv", "3.Days.to.Kill", 2014)] // In this test case, running CleanDateTime first produces no date, so it will attempt to run CleanString first and then CleanDateTime again
         [InlineData(@"3.Days.to.Kill.2014.720p.BluRay.x264.YIFY.mkv", "3.Days.to.Kill", 2014)] // In this test case, running CleanDateTime first produces no date, so it will attempt to run CleanString first and then CleanDateTime again
         public void CleanDateTimeTest(string input, string expectedName, int? expectedYear)
         public void CleanDateTimeTest(string input, string expectedName, int? expectedYear)
         {
         {