Quellcode durchsuchen

Merge pull request #7741 from LewkyB/fix-improperly-labeled-four-digit-episode-numbering

Fix to allow for episode numbering over 999 in certain scenarios

(cherry picked from commit 3ea67374aecdeab6f90b66fecdaf6ee4e510675d)
Signed-off-by: Joshua Boniface <joshua@boniface.me>
Joshua M. Boniface vor 3 Jahren
Ursprung
Commit
f205661b18

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

@@ -314,7 +314,7 @@ namespace Emby.Naming.Common
                 // This isn't a Kodi naming rule, but the expression below causes false positives,
                 // so we make sure this one gets tested first.
                 // "Foo Bar 889"
-                new EpisodeExpression(@".*[\\\/](?![Ee]pisode)(?<seriesname>[\w\s]+?)\s(?<epnumber>[0-9]{1,3})(-(?<endingepnumber>[0-9]{2,3}))*[^\\\/x]*$")
+                new EpisodeExpression(@".*[\\\/](?![Ee]pisode)(?<seriesname>[\w\s]+?)\s(?<epnumber>[0-9]{1,4})(-(?<endingepnumber>[0-9]{2,4}))*[^\\\/x]*$")
                 {
                     IsNamed = true
                 },

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

@@ -1,4 +1,4 @@
-using Emby.Naming.Common;
+using Emby.Naming.Common;
 using Emby.Naming.TV;
 using Xunit;
 
@@ -9,6 +9,7 @@ namespace Jellyfin.Naming.Tests.TV
         private readonly NamingOptions _namingOptions = new NamingOptions();
 
         [Theory]
+        [InlineData("Season 21/One Piece 1001", 1001)]
         [InlineData("Watchmen (2019)/Watchmen 1x03 [WEBDL-720p][EAC3 5.1][h264][-TBS] - She Was Killed by Space Junk.mkv", 3)]
         [InlineData("The Daily Show/The Daily Show 25x22 - [WEBDL-720p][AAC 2.0][x264] Noah Baumbach-TBS.mkv", 22)]
         [InlineData("Castle Rock 2x01 Que el rio siga su curso [WEB-DL HULU 1080p h264 Dual DD5.1 Subs].mkv", 1)]