Archive-Team
/
sonarr-repo-only
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed: Don't reject standard/absolute numbering mismatch due to season number

This commit is contained in:
Mark McDowall 2019-07-26 17:59:41 -07:00
parent c47e7cd91d
commit 894de923b9
2 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/NzbDrone.Core.Test/MediaFiles/EpisodeImport/Specifications/MatchesFolderSpecificationFixture.cs
View File

@ -192,5 +192,19 @@ namespace NzbDrone.Core.Test.MediaFiles.EpisodeImport.Specifications
Subject.IsSatisfiedBy(localEpisode, null).Accepted.Should().BeTrue(); Subject.IsSatisfiedBy(localEpisode, null).Accepted.Should().BeTrue();
} }
[Test]
public void should_be_accepted_if_file_has_absolute_episode_number_and_folder_uses_standard()
{
_localEpisode.FileEpisodeInfo.SeasonNumber = 0;
_localEpisode.FileEpisodeInfo.AbsoluteEpisodeNumbers = new[] { 1 };
_localEpisode.FolderEpisodeInfo.SeasonNumber = 1;
_localEpisode.FolderEpisodeInfo.EpisodeNumbers = new[] { 1, 2 };
_localEpisode.Path = @"C:\Test\Unsorted\Series.Title.S01.720p.HDTV-Sonarr\S02E01.mkv".AsOsAgnostic();
Subject.IsSatisfiedBy(_localEpisode, null).Accepted.Should().BeTrue();
}
} }
} }

8
src/NzbDrone.Core/MediaFiles/EpisodeImport/Specifications/MatchesFolderSpecification.cs
View File

@ -48,7 +48,13 @@ namespace NzbDrone.Core.MediaFiles.EpisodeImport.Specifications
_logger.Debug("No file ParsedEpisodeInfo, skipping check"); _logger.Debug("No file ParsedEpisodeInfo, skipping check");
return Decision.Accept(); return Decision.Accept();
} }
if (fileInfo.IsAbsoluteNumbering)
{
_logger.Debug("File uses absolute episode numbering, skipping check");
return Decision.Accept();
}
if (folderInfo.SeasonNumber != fileInfo.SeasonNumber) if (folderInfo.SeasonNumber != fileInfo.SeasonNumber)
{ {
return Decision.Reject("Season number {0} was unexpected considering the folder name {1}", fileInfo.SeasonNumber, folderInfo.ReleaseTitle); return Decision.Reject("Season number {0} was unexpected considering the folder name {1}", fileInfo.SeasonNumber, folderInfo.ReleaseTitle);