mirror/Sonarr
1
0
Fork 0
mirror of https://github.com/Sonarr/Sonarr synced 2024-12-26 09:47:39 +00:00
Code Issues Releases Wiki Activity

Added sab queue check for multiepisodes.

Browse source
This commit is contained in:
kay.one 2012-01-19 21:49:29 -08:00
parent 9acfb7330c
commit 7483d5d3a5
2 changed files with 18 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
NzbDrone.Core.Test/ProviderTests/SabProviderTest.cs
View file

@ -319,41 +319,44 @@ namespace NzbDrone.Core.Test.ProviderTests
result.Should().BeTrue(); result.Should().BeTrue();
} }
[TestCase(2, 5, "30 Rock", QualityTypes.Bluray1080p, true, Description = "Same Series, Diffrent Season, Episode")] [TestCase(2, new[] { 5 }, "30 Rock", QualityTypes.Bluray1080p, true, Description = "Same Series, Diffrent Season, Episode")]
[TestCase(1, 6, "30 Rock", QualityTypes.Bluray1080p, true, Description = "Same series, diffrent episode")] [TestCase(1, new[] { 6 }, "30 Rock", QualityTypes.Bluray1080p, true, Description = "Same series, diffrent episodes")]
[TestCase(1, 6, "Some other show", QualityTypes.Bluray1080p, true, Description = "Diffrent series, same season, episdoe")] [TestCase(1, new[] { 6,7,8 }, "30 Rock", QualityTypes.Bluray1080p, true, Description = "Same series, diffrent episodes")]
[TestCase(1, 5, "Rock", QualityTypes.Bluray1080p, true, Description = "Similar series, same season, episode")] [TestCase(1, new[] { 6 }, "Some other show", QualityTypes.Bluray1080p, true, Description = "Diffrent series, same season, episdoe")]
[TestCase(1, 5, "30 Rock", QualityTypes.Bluray720p, false, Description = "Same series, higher quality")] [TestCase(1, new[] { 5 }, "Rock", QualityTypes.Bluray1080p, true, Description = "Similar series, same season, episodes")]
[TestCase(1, 5, "30 Rock", QualityTypes.HDTV, true, Description = "Same series, higher quality")] [TestCase(1, new[] { 5 }, "30 Rock", QualityTypes.Bluray720p, false, Description = "Same series, higher quality")]
public void IsInQueue_should_not_find_diffrent_episode_queue(int season, int episode, string title, QualityTypes qualityType, bool proper) [TestCase(1, new[] { 5 }, "30 Rock", QualityTypes.HDTV, true, Description = "Same series, higher quality")]
public void IsInQueue_should_not_find_diffrent_episode_queue(int season, int[] episodes, string title, QualityTypes qualityType, bool proper)
{ {
WithFullQueue(); WithFullQueue();
var parseResult = new EpisodeParseResult var parseResult = new EpisodeParseResult
{ {
EpisodeTitle = "Title", EpisodeTitle = "Title",
EpisodeNumbers = new List<int> { episode }, EpisodeNumbers = new List<int>(episodes),
SeasonNumber = season, SeasonNumber = season,
Quality = new Quality { QualityType = qualityType, Proper = proper }, Quality = new Quality { QualityType = qualityType, Proper = proper },
Series = new Series { Title = title }, Series = new Series { Title = title },
}; };
var result = Mocker.Resolve<SabProvider>().IsInQueue(parseResult); var result = Mocker.Resolve<SabProvider>().IsInQueue(parseResult);
result.Should().BeFalse(); result.Should().BeFalse();
} }
[TestCase(1, 5, "30 Rock", QualityTypes.SDTV, false, Description = "Same Series, lower quality")] [TestCase(1, new[] { 5 }, "30 Rock", QualityTypes.SDTV, false, Description = "Same Series, lower quality")]
[TestCase(1, 5, "30 rocK", QualityTypes.SDTV, false, Description = "Same Series, diffrent casing")] [TestCase(1, new[] { 5 }, "30 rocK", QualityTypes.SDTV, false, Description = "Same Series, diffrent casing")]
[TestCase(1, 5, "30 RocK", QualityTypes.HDTV, false, Description = "Same Series, same quality")] [TestCase(1, new[] { 5 }, "30 RocK", QualityTypes.HDTV, false, Description = "Same Series, same quality")]
public void IsInQueue_should_find_same_or_lower_quality_episode_queue(int season, int episode, string title, QualityTypes qualityType, bool proper) [TestCase(1, new[] { 5, 6 }, "30 RocK", QualityTypes.HDTV, false, Description = "Same Series, same quality, one diffrent episode")]
[TestCase(1, new[] { 5, 6 }, "30 RocK", QualityTypes.HDTV, false, Description = "Same Series, same quality, one diffrent episode")]
public void IsInQueue_should_find_same_or_lower_quality_episode_queue(int season, int[] episodes, string title, QualityTypes qualityType, bool proper)
{ {
WithFullQueue(); WithFullQueue();
var parseResult = new EpisodeParseResult var parseResult = new EpisodeParseResult
{ {
EpisodeTitle = "Title", EpisodeTitle = "Title",
EpisodeNumbers = new List<int> { episode }, EpisodeNumbers = new List<int>(episodes),
SeasonNumber = season, SeasonNumber = season,
Quality = new Quality { QualityType = qualityType, Proper = proper }, Quality = new Quality { QualityType = qualityType, Proper = proper },
Series = new Series { Title = title }, Series = new Series { Title = title },

2
NzbDrone.Core/Providers/SabProvider.cs
View file

@ -77,7 +77,7 @@ namespace NzbDrone.Core.Providers
var queue = GetQueue(); var queue = GetQueue();
return queue.Any(c => String.Equals(c.ParseResult.SeriesTitle, newParseResult.Series.Title, StringComparison.InvariantCultureIgnoreCase) && return queue.Any(c => String.Equals(c.ParseResult.SeriesTitle, newParseResult.Series.Title, StringComparison.InvariantCultureIgnoreCase) &&
c.ParseResult.EpisodeNumbers.SequenceEqual(newParseResult.EpisodeNumbers) && c.ParseResult.EpisodeNumbers.Any(e=> newParseResult.EpisodeNumbers.Contains(e))&&
c.ParseResult.SeasonNumber == newParseResult.SeasonNumber && c.ParseResult.SeasonNumber == newParseResult.SeasonNumber &&
c.ParseResult.Quality >= newParseResult.Quality); c.ParseResult.Quality >= newParseResult.Quality);
} }