From f2c7e235af1693974e4a0a786aabb57663c05ff2 Mon Sep 17 00:00:00 2001 From: Taloth Saldono Date: Sat, 25 Dec 2021 01:06:53 +0100 Subject: [PATCH] Parse specials directly in ParsingService rather than callee. --- src/NzbDrone.Core/Parser/Parser.cs | 4 ++-- src/NzbDrone.Core/Parser/ParsingService.cs | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/NzbDrone.Core/Parser/Parser.cs b/src/NzbDrone.Core/Parser/Parser.cs index a5bfa5518..953a550fc 100644 --- a/src/NzbDrone.Core/Parser/Parser.cs +++ b/src/NzbDrone.Core/Parser/Parser.cs @@ -348,10 +348,10 @@ namespace NzbDrone.Core.Parser private static readonly Regex[] SpecialEpisodeTitleRegex = new Regex[] { - new Regex(@"\.S\d+E00\.(?.+?)(?:\.(?:720p|1080p|HDTV|WEB|WEBRip|WEB-DL)\.|$)", + new Regex(@"\.S\d+E00\.(?.+?)(?:\.(?:720p|1080p|2160p|HDTV|WEB|WEBRip|WEB-DL)\.|$)", RegexOptions.IgnoreCase | RegexOptions.Compiled), - new Regex(@"\.S\d+\.Special\.(?.+?)(?:\.(?:720p|1080p|HDTV|WEB|WEBRip|WEB-DL)\.|$)", + new Regex(@"\.S\d+\.Special\.(?.+?)(?:\.(?:720p|1080p|2160p|HDTV|WEB|WEBRip|WEB-DL)\.|$)", RegexOptions.IgnoreCase | RegexOptions.Compiled) }; diff --git a/src/NzbDrone.Core/Parser/ParsingService.cs b/src/NzbDrone.Core/Parser/ParsingService.cs index 2d8b1e57f..afdf2879e 100644 --- a/src/NzbDrone.Core/Parser/ParsingService.cs +++ b/src/NzbDrone.Core/Parser/ParsingService.cs @@ -234,6 +234,11 @@ namespace NzbDrone.Core.Parser return GetAnimeEpisodes(series, parsedEpisodeInfo, mappedSeasonNumber, sceneSource, searchCriteria); } + if (parsedEpisodeInfo.IsPossibleSceneSeasonSpecial) + { + parsedEpisodeInfo = ParseSpecialEpisodeTitle(parsedEpisodeInfo, parsedEpisodeInfo.ReleaseTitle, series) ?? parsedEpisodeInfo; + } + return GetStandardEpisodes(series, parsedEpisodeInfo, mappedSeasonNumber, sceneSource, searchCriteria); }