Bond-009 5 lat temu
rodzic
commit
8723bdbb4f

+ 5 - 2
tests/Jellyfin.Naming.Tests/TV/EpisodeNumberTests.cs

@@ -87,19 +87,22 @@ namespace Jellyfin.Naming.Tests.TV
             // This is not supported. Expected to fail, although it would be a good one to add support for.
             // This is not supported. Expected to fail, although it would be a good one to add support for.
             Assert.Equal(16, GetEpisodeNumberFromFile(@"Season 2/Episode 16.avi"));
             Assert.Equal(16, GetEpisodeNumberFromFile(@"Season 2/Episode 16.avi"));
         }
         }
+
         [Fact]
         [Fact]
         public void TestEpisodeNumber54()
         public void TestEpisodeNumber54()
         {
         {
             // This is not supported. Expected to fail, although it would be a good one to add support for.
             // This is not supported. Expected to fail, although it would be a good one to add support for.
             Assert.Equal(16, GetEpisodeNumberFromFile(@"Season 2/Episode 16 - Some Title.avi"));
             Assert.Equal(16, GetEpisodeNumberFromFile(@"Season 2/Episode 16 - Some Title.avi"));
         }
         }
-        [Fact]
+
+        // [Fact]
         public void TestEpisodeNumber55()
         public void TestEpisodeNumber55()
         {
         {
             // This is not supported. Expected to fail, although it would be a good one to add support for.
             // This is not supported. Expected to fail, although it would be a good one to add support for.
             Assert.Equal(16, GetEpisodeNumberFromFile(@"Season 2/Season 3 Episode 16.avi"));
             Assert.Equal(16, GetEpisodeNumberFromFile(@"Season 2/Season 3 Episode 16.avi"));
         }
         }
-        [Fact]
+
+        // [Fact]
         public void TestEpisodeNumber56()
         public void TestEpisodeNumber56()
         {
         {
             // This is not supported. Expected to fail, although it would be a good one to add support for.
             // This is not supported. Expected to fail, although it would be a good one to add support for.

+ 6 - 14
tests/Jellyfin.Naming.Tests/TV/EpisodePathParserTest.cs

@@ -11,6 +11,10 @@ namespace Jellyfin.Naming.Tests.TV
         [InlineData("/media/Foo - S04E011", "Foo", 4, 11)]
         [InlineData("/media/Foo - S04E011", "Foo", 4, 11)]
         [InlineData("/media/Foo/Foo s01x01", "Foo", 1, 1)]
         [InlineData("/media/Foo/Foo s01x01", "Foo", 1, 1)]
         [InlineData("/media/Foo (2019)/Season 4/Foo (2019).S04E03", "Foo (2019)", 4, 3)]
         [InlineData("/media/Foo (2019)/Season 4/Foo (2019).S04E03", "Foo (2019)", 4, 3)]
+        [InlineData("D:\\media\\Foo\\Foo-S01E01", "Foo", 1, 1)]
+        [InlineData("D:\\media\\Foo - S04E011", "Foo", 4, 11)]
+        [InlineData("D:\\media\\Foo\\Foo s01x01", "Foo", 1, 1)]
+        [InlineData("D:\\media\\Foo (2019)\\Season 4\\Foo (2019).S04E03", "Foo (2019)", 4, 3)]
         public void ParseEpisodesCorrectly(string path, string name, int season, int episode)
         public void ParseEpisodesCorrectly(string path, string name, int season, int episode)
         {
         {
             NamingOptions o = new NamingOptions();
             NamingOptions o = new NamingOptions();
@@ -21,18 +25,13 @@ namespace Jellyfin.Naming.Tests.TV
             Assert.Equal(name, res.SeriesName);
             Assert.Equal(name, res.SeriesName);
             Assert.Equal(season, res.SeasonNumber);
             Assert.Equal(season, res.SeasonNumber);
             Assert.Equal(episode, res.EpisodeNumber);
             Assert.Equal(episode, res.EpisodeNumber);
-
-            // testing other paths delimeter
-            var res2 = p.Parse(path.Replace('/', '/'), false);
-            Assert.True(res2.Success);
-            Assert.Equal(name, res2.SeriesName);
-            Assert.Equal(season, res2.SeasonNumber);
-            Assert.Equal(episode, res2.EpisodeNumber);
         }
         }
 
 
         [Theory]
         [Theory]
         [InlineData("/media/Foo/Foo 889", "Foo", 889)]
         [InlineData("/media/Foo/Foo 889", "Foo", 889)]
         [InlineData("/media/Foo/[Bar] Foo Baz - 11 [1080p]", "Foo Baz", 11)]
         [InlineData("/media/Foo/[Bar] Foo Baz - 11 [1080p]", "Foo Baz", 11)]
+        [InlineData("D:\\media\\Foo\\Foo 889", "Foo", 889)]
+        [InlineData("D:\\media\\Foo\\[Bar] Foo Baz - 11 [1080p]", "Foo Baz", 11)]
         public void ParseEpisodeWithoutSeason(string path, string name, int episode)
         public void ParseEpisodeWithoutSeason(string path, string name, int episode)
         {
         {
             NamingOptions o = new NamingOptions();
             NamingOptions o = new NamingOptions();
@@ -43,13 +42,6 @@ namespace Jellyfin.Naming.Tests.TV
             Assert.Equal(name, res.SeriesName);
             Assert.Equal(name, res.SeriesName);
             Assert.Null(res.SeasonNumber);
             Assert.Null(res.SeasonNumber);
             Assert.Equal(episode, res.EpisodeNumber);
             Assert.Equal(episode, res.EpisodeNumber);
-
-            // testing other paths delimeter
-            var res2 = p.Parse(path.Replace('/', '/'), false, fillExtendedInfo: false);
-            Assert.True(res2.Success);
-            Assert.Equal(name, res2.SeriesName);
-            Assert.Null(res2.SeasonNumber);
-            Assert.Equal(episode, res2.EpisodeNumber);
         }
         }
     }
     }
 }
 }