tedkulp/Sonarr
1
0
Fork 0
mirror of https://github.com/Sonarr/Sonarr.git synced 2026-04-25 22:46:31 -04:00
Code Issues Projects Releases Wiki Activity

Fixed: Cutoff unmet searches rejecting releases incorrectly

Browse Source
This commit is contained in:
Mark McDowall
2020-03-20 17:34:18 -07:00
parent 4ddf4a22a3
commit e23a879669
14 changed files with 101 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/NzbDrone.Core.Test/IndexerSearchTests/NzbSearchServiceFixture.cs
+13 -13
View File
@@ -152,7 +152,7 @@ namespace NzbDrone.Core.Test.IndexerSearchTests
var allCriteria = WatchForSearchCriteria();
Subject.SeasonSearch(_xemSeries.Id, 1, false, true, false);
Subject.SeasonSearch(_xemSeries.Id, 1, false, false, true, false);
var criteria = allCriteria.OfType<SeasonSearchCriteria>().ToList();
@@ -167,7 +167,7 @@ namespace NzbDrone.Core.Test.IndexerSearchTests
var allCriteria = WatchForSearchCriteria();
Subject.SeasonSearch(_xemSeries.Id, 2, false, true, false);
Subject.SeasonSearch(_xemSeries.Id, 2, false, false, true, false);
var criteria = allCriteria.OfType<SeasonSearchCriteria>().ToList();
@@ -183,7 +183,7 @@ namespace NzbDrone.Core.Test.IndexerSearchTests
var allCriteria = WatchForSearchCriteria();
Subject.SeasonSearch(_xemSeries.Id, 4, false, true, false);
Subject.SeasonSearch(_xemSeries.Id, 4, false, false, true, false);
var criteria1 = allCriteria.OfType<SeasonSearchCriteria>().ToList();
var criteria2 = allCriteria.OfType<SingleEpisodeSearchCriteria>().ToList();
@@ -203,7 +203,7 @@ namespace NzbDrone.Core.Test.IndexerSearchTests
var allCriteria = WatchForSearchCriteria();
Subject.SeasonSearch(_xemSeries.Id, 7, false, true, false);
Subject.SeasonSearch(_xemSeries.Id, 7, false, false, true, false);
var criteria = allCriteria.OfType<SeasonSearchCriteria>().ToList();
@@ -221,7 +221,7 @@ namespace NzbDrone.Core.Test.IndexerSearchTests
var seasonNumber = 1;
var allCriteria = WatchForSearchCriteria();
Subject.SeasonSearch(_xemSeries.Id, seasonNumber, true, true, false);
Subject.SeasonSearch(_xemSeries.Id, seasonNumber, true, false, true, false);
var criteria = allCriteria.OfType<AnimeEpisodeSearchCriteria>().ToList();
@@ -239,7 +239,7 @@ namespace NzbDrone.Core.Test.IndexerSearchTests
var seasonNumber = 1;
var allCriteria = WatchForSearchCriteria();
Subject.SeasonSearch(_xemSeries.Id, seasonNumber, false, true, false);
Subject.SeasonSearch(_xemSeries.Id, seasonNumber, false, false, true, false);
var criteria = allCriteria.OfType<AnimeEpisodeSearchCriteria>().ToList();
@@ -257,7 +257,7 @@ namespace NzbDrone.Core.Test.IndexerSearchTests
var seasonNumber = 1;
var allCriteria = WatchForSearchCriteria();
Subject.SeasonSearch(_xemSeries.Id, seasonNumber, false, true, false);
Subject.SeasonSearch(_xemSeries.Id, seasonNumber, false, false, true, false);
var criteria = allCriteria.OfType<AnimeEpisodeSearchCriteria>().ToList();
@@ -274,7 +274,7 @@ namespace NzbDrone.Core.Test.IndexerSearchTests
var seasonNumber = 1;
var allCriteria = WatchForSearchCriteria();
Subject.SeasonSearch(_xemSeries.Id, seasonNumber, true, true, false);
Subject.SeasonSearch(_xemSeries.Id, seasonNumber, true, false, true, false);
var criteria = allCriteria.OfType<AnimeEpisodeSearchCriteria>().ToList();
@@ -291,7 +291,7 @@ namespace NzbDrone.Core.Test.IndexerSearchTests
var seasonNumber = 1;
var allCriteria = WatchForSearchCriteria();
Subject.SeasonSearch(_xemSeries.Id, seasonNumber, true, true, false);
Subject.SeasonSearch(_xemSeries.Id, seasonNumber, true, false, true, false);
var criteria = allCriteria.OfType<AnimeEpisodeSearchCriteria>().ToList();
@@ -310,7 +310,7 @@ namespace NzbDrone.Core.Test.IndexerSearchTests
var allCriteria = WatchForSearchCriteria();
Subject.SeasonSearch(_xemSeries.Id, 1, false, true, false);
Subject.SeasonSearch(_xemSeries.Id, 1, false, false, true, false);
var criteria = allCriteria.OfType<DailySeasonSearchCriteria>().ToList();
@@ -329,7 +329,7 @@ namespace NzbDrone.Core.Test.IndexerSearchTests
var allCriteria = WatchForSearchCriteria();
Subject.SeasonSearch(_xemSeries.Id, 1, false, true, false);
Subject.SeasonSearch(_xemSeries.Id, 1, false, false, true, false);
var criteria1 = allCriteria.OfType<DailySeasonSearchCriteria>().ToList();
var criteria2 = allCriteria.OfType<DailyEpisodeSearchCriteria>().ToList();
@@ -352,7 +352,7 @@ namespace NzbDrone.Core.Test.IndexerSearchTests
var allCriteria = WatchForSearchCriteria();
Subject.SeasonSearch(_xemSeries.Id, 1, false, true, false);
Subject.SeasonSearch(_xemSeries.Id, 1, false, false, true, false);
var criteria1 = allCriteria.OfType<DailySeasonSearchCriteria>().ToList();
var criteria2 = allCriteria.OfType<DailyEpisodeSearchCriteria>().ToList();
@@ -368,7 +368,7 @@ namespace NzbDrone.Core.Test.IndexerSearchTests
var allCriteria = WatchForSearchCriteria();
Subject.SeasonSearch(_xemSeries.Id, 7, false, true, false);
Subject.SeasonSearch(_xemSeries.Id, 7, false, false, true, false);
Mocker.GetMock<ISceneMappingService>()
.Verify(v => v.GetSceneNames(_xemSeries.Id, It.Is<List<int>>(l => l.Contains(7)), It.Is<List<int>>(l => l.Contains(7))), Times.Once());
src/NzbDrone.Core.Test/IndexerSearchTests/SeriesSearchServiceFixture.cs
+4 -4
View File
@@ -32,7 +32,7 @@ namespace NzbDrone.Core.Test.IndexerSearchTests
.Returns(_series);
Mocker.GetMock<ISearchForNzb>()
.Setup(s => s.SeasonSearch(_series.Id, It.IsAny<int>(), false, true, false))
.Setup(s => s.SeasonSearch(_series.Id, It.IsAny<int>(), false, false, true, false))
.Returns(new List<DownloadDecision>());
Mocker.GetMock<IProcessDownloadDecisions>()
@@ -52,7 +52,7 @@ namespace NzbDrone.Core.Test.IndexerSearchTests
Subject.Execute(new SeriesSearchCommand { SeriesId = _series.Id, Trigger = CommandTrigger.Manual });
Mocker.GetMock<ISearchForNzb>()
.Verify(v => v.SeasonSearch(_series.Id, It.IsAny<int>(), false, true, false), Times.Exactly(_series.Seasons.Count(s => s.Monitored)));
.Verify(v => v.SeasonSearch(_series.Id, It.IsAny<int>(), false, true, true, false), Times.Exactly(_series.Seasons.Count(s => s.Monitored)));
}
[Test]
@@ -68,9 +68,9 @@ namespace NzbDrone.Core.Test.IndexerSearchTests
};
Mocker.GetMock<ISearchForNzb>()
.Setup(s => s.SeasonSearch(_series.Id, It.IsAny<int>(), false, true, false))
.Setup(s => s.SeasonSearch(_series.Id, It.IsAny<int>(), false, true, true, false))
.Returns(new List<DownloadDecision>())
.Callback<int, int, bool, bool, bool>((seriesId, seasonNumber, missingOnly, userInvokedSearch, interactiveSearch) => seasonOrder.Add(seasonNumber));
.Callback<int, int, bool, bool, bool, bool>((seriesId, seasonNumber, missingOnly, monitoredOnly, userInvokedSearch, interactiveSearch) => seasonOrder.Add(seasonNumber));
Subject.Execute(new SeriesSearchCommand { SeriesId = _series.Id, Trigger = CommandTrigger.Manual });