Episode parsing coverage

Emby.Naming/Common/NamingOptions.cs

@@ -282,7 +282,7 @@ namespace Emby.Naming.Common
                 // /server/anything_102.mp4
                 // /server/james.corden.2017.04.20.anne.hathaway.720p.hdtv.x264-crooks.mkv
                 // /server/anything_1996.11.14.mp4
-                new EpisodeExpression(@"[\\\\/\\._ -](?<seriesname>(?![0-9]+[0-9][0-9])([^\\\/])*)[\\\\/\\._ -](?<seasonnumber>[0-9]+)(?<epnumber>[0-9][0-9](?:(?:[a-i]|\\.[1-9])(?![0-9]))?)([\\._ -][^\\\\/]*)$")
+                new EpisodeExpression(@"[\\/._ -](?<seriesname>(?![0-9]+[0-9][0-9])([^\\\/_])*)[\\\/._ -](?<seasonnumber>[0-9]+)(?<epnumber>[0-9][0-9](?:(?:[a-i]|\.[1-9])(?![0-9]))?)([._ -][^\\\/]*)$")
                 {
                     IsOptimistic = true,
                     IsNamed = true,

Emby.Naming/TV/EpisodePathParser.cs

@@ -186,7 +186,7 @@ namespace Emby.Naming.TV
 
         private void FillAdditional(string path, EpisodePathParserResult info)
         {
-            var expressions = _options.MultipleEpisodeExpressions.ToList();
+            var expressions = _options.MultipleEpisodeExpressions.Where(i => i.IsNamed).ToList();
 
             if (string.IsNullOrEmpty(info.SeriesName))
             {
@@ -200,11 +200,6 @@ namespace Emby.Naming.TV
         {
             foreach (var i in expressions)
             {
-                if (!i.IsNamed)
-                {
-                    continue;
-                }
-
                 var result = Parse(path, i);
 
                 if (!result.Success)

tests/Jellyfin.Naming.Tests/TV/EpisodePathParserTest.cs

@@ -1,4 +1,4 @@
-using Emby.Naming.Common;
+using Emby.Naming.Common;
 using Emby.Naming.TV;
 using Xunit;
 
@@ -7,43 +7,94 @@ namespace Jellyfin.Naming.Tests.TV
     public class EpisodePathParserTest
     {
         [Theory]
-        [InlineData("/media/Foo/Foo-S01E01", "Foo", 1, 1)]
-        [InlineData("/media/Foo - S04E011", "Foo", 4, 11)]
-        [InlineData("/media/Foo/Foo s01x01", "Foo", 1, 1)]
-        [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)]
-        [InlineData("/Season 2/Elementary - 02x03-04-15 - Ep Name.mp4", "Elementary", 2, 3)]
-        [InlineData("/Season 1/seriesname S01E02 blah.avi", "seriesname", 1, 2)]
-        [InlineData("/Running Man/Running Man S2017E368.mkv", "Running Man", 2017, 368)]
-        [InlineData("/Season 1/seriesname 01x02 blah.avi", "seriesname", 1, 2)]
-        [InlineData("/Season 25/The Simpsons.S25E09.Steal this episode.mp4", "The Simpsons", 25, 9)]
-        [InlineData("/Season 1/seriesname S01x02 blah.avi", "seriesname", 1, 2)]
-        [InlineData("/Season 2/Elementary - 02x03 - 02x04 - 02x15 - Ep Name.mp4", "Elementary", 2, 3)]
-        [InlineData("/Season 1/seriesname S01xE02 blah.avi", "seriesname", 1, 2)]
-        [InlineData("/Season 02/Elementary - 02x03 - x04 - x15 - Ep Name.mp4", "Elementary", 2, 3)]
-        [InlineData("/Season 02/Elementary - 02x03x04x15 - Ep Name.mp4", "Elementary", 2, 3)]
-        [InlineData("/Season 02/Elementary - 02x03-E15 - Ep Name.mp4", "Elementary", 2, 3)]
-        [InlineData("/Season 1/Elementary - S01E23-E24-E26 - The Woman.mp4", "Elementary", 1, 23)]
-        [InlineData("/The Wonder Years/The.Wonder.Years.S04.PDTV.x264-JCH/The Wonder Years s04e07 Christmas Party NTSC PDTV.avi", "The Wonder Years", 4, 7)]
+        [InlineData("/media/Foo/Foo-S01E01", true, "Foo", 1, 1)]
+        [InlineData("/media/Foo - S04E011", true, "Foo", 4, 11)]
+        [InlineData("/media/Foo/Foo s01x01", true, "Foo", 1, 1)]
+        [InlineData("/media/Foo (2019)/Season 4/Foo (2019).S04E03", true, "Foo (2019)", 4, 3)]
+        [InlineData("D:\\media\\Foo\\Foo-S01E01", true, "Foo", 1, 1)]
+        [InlineData("D:\\media\\Foo - S04E011", true, "Foo", 4, 11)]
+        [InlineData("D:\\media\\Foo\\Foo s01x01", true, "Foo", 1, 1)]
+        [InlineData("D:\\media\\Foo (2019)\\Season 4\\Foo (2019).S04E03", true, "Foo (2019)", 4, 3)]
+        [InlineData("/Season 2/Elementary - 02x03-04-15 - Ep Name.mp4", false, "Elementary", 2, 3)]
+        [InlineData("/Season 1/seriesname S01E02 blah.avi", false, "seriesname", 1, 2)]
+        [InlineData("/Running Man/Running Man S2017E368.mkv", false, "Running Man", 2017, 368)]
+        [InlineData("/Season 1/seriesname 01x02 blah.avi", false, "seriesname", 1, 2)]
+        [InlineData("/Season 25/The Simpsons.S25E09.Steal this episode.mp4", false, "The Simpsons", 25, 9)]
+        [InlineData("/Season 1/seriesname S01x02 blah.avi", false, "seriesname", 1, 2)]
+        [InlineData("/Season 2/Elementary - 02x03 - 02x04 - 02x15 - Ep Name.mp4", false, "Elementary", 2, 3)]
+        [InlineData("/Season 1/seriesname S01xE02 blah.avi", false, "seriesname", 1, 2)]
+        [InlineData("/Season 02/Elementary - 02x03 - x04 - x15 - Ep Name.mp4", false, "Elementary", 2, 3)]
+        [InlineData("/Season 02/Elementary - 02x03x04x15 - Ep Name.mp4", false, "Elementary", 2, 3)]
+        [InlineData("/Season 02/Elementary - 02x03-E15 - Ep Name.mp4", false, "Elementary", 2, 3)]
+        [InlineData("/Season 1/Elementary - S01E23-E24-E26 - The Woman.mp4", false, "Elementary", 1, 23)]
+        [InlineData("/The Wonder Years/The.Wonder.Years.S04.PDTV.x264-JCH/The Wonder Years s04e07 Christmas Party NTSC PDTV.avi", false, "The Wonder Years", 4, 7)]
         // TODO: [InlineData("/Castle Rock 2x01 Que el rio siga su curso [WEB-DL HULU 1080p h264 Dual DD5.1 Subs].mkv", "Castle Rock", 2, 1)]
         // TODO: [InlineData("/After Life 1x06 Episodio 6 [WEB-DL NF 1080p h264 Dual DD 5.1 Sub].mkv", "After Life", 1, 6)]
         // TODO: [InlineData("/Season 4/Uchuu.Senkan.Yamato.2199.E03.avi", "Uchuu Senkan Yamoto 2199", 4, 3)]
         // TODO: [InlineData("The Daily Show/The Daily Show 25x22 - [WEBDL-720p][AAC 2.0][x264] Noah Baumbach-TBS.mkv", "The Daily Show", 25, 22)]
         // TODO: [InlineData("Watchmen (2019)/Watchmen 1x03 [WEBDL-720p][EAC3 5.1][h264][-TBS] - She Was Killed by Space Junk.mkv", "Watchmen (2019)", 1, 3)]
         // TODO: [InlineData("/The.Legend.of.Condor.Heroes.2017.V2.web-dl.1080p.h264.aac-hdctv/The.Legend.of.Condor.Heroes.2017.E07.V2.web-dl.1080p.h264.aac-hdctv.mkv", "The Legend of Condor Heroes 2017", 1, 7)]
-        public void ParseEpisodesCorrectly(string path, string name, int season, int episode)
+        public void ParseEpisodesCorrectly(string path, bool isDirectory, string name, int season, int episode)
         {
             NamingOptions o = new NamingOptions();
             EpisodePathParser p = new EpisodePathParser(o);
-            var res = p.Parse(path, false);
+            var res = p.Parse(path, isDirectory);
 
             Assert.True(res.Success);
             Assert.Equal(name, res.SeriesName);
             Assert.Equal(season, res.SeasonNumber);
             Assert.Equal(episode, res.EpisodeNumber);
         }
+
+        [Theory]
+        [InlineData("/test/01-03.avi", true, true)]
+        public void EpisodePathParserTest_DifferentExpressionsParameters(string path, bool? isNamed, bool? isOptimistic)
+        {
+            NamingOptions o = new NamingOptions();
+            EpisodePathParser p = new EpisodePathParser(o);
+            var res = p.Parse(path, false, isNamed, isOptimistic);
+
+            Assert.True(res.Success);
+        }
+
+        [Fact]
+        public void EpisodePathParserTest_FalsePositivePixelRate()
+        {
+            NamingOptions o = new NamingOptions();
+            EpisodePathParser p = new EpisodePathParser(o);
+            var res = p.Parse("Series Special (1920x1080).mkv", false);
+
+            Assert.False(res.Success);
+        }
+
+        [Fact]
+        public void EpisodeResolverTest_WrongExtension()
+        {
+            var res = new EpisodeResolver(new NamingOptions()).Resolve("test.mp3", false);
+            Assert.Null(res);
+        }
+
+        [Fact]
+        public void EpisodeResolverTest_WrongExtensionStub()
+        {
+            var res = new EpisodeResolver(new NamingOptions()).Resolve("dvd.disc", false);
+            Assert.NotNull(res);
+            Assert.True(res!.IsStub);
+        }
+
+        [Fact]
+        public void EpisodePathParserTest_EmptyDateParsers()
+        {
+            NamingOptions o = new NamingOptions()
+            {
+                EpisodeExpressions = new[] { new EpisodeExpression("(([0-9]{4})-([0-9]{2})-([0-9]{2}) [0-9]{2}:[0-9]{2}:[0-9]{2})", true) }
+            };
+            o.Compile();
+
+            EpisodePathParser p = new EpisodePathParser(o);
+            var res = p.Parse("ABC_2019_10_21 11:00:00", false);
+
+            Assert.True(res.Success);
+        }
     }
 }