SeasonSearchJob will do a partial search search and then individual searches, when it is still missing results (greater than 0, but all not found).

Fixed: Season/Series searching shouldn't add duplicate episodes.

NzbDrone.Core.Test/JobTests/SeasonSearchJobTest.cs

@@ -20,22 +20,12 @@ namespace NzbDrone.Core.Test.JobTests
     // ReSharper disable InconsistentNaming
     public class SeasonSearchJobTest : CoreTest
     {
-        [Test]
+        private ProgressNotification notification;
-        public void SeasonSearch_full_season_success()
+
+        [SetUp]
+        public void Setup()
         {
-            var notification = new ProgressNotification("Season Search");
+             notification = new ProgressNotification("Search");
-
-            Mocker.GetMock<SearchProvider>()
-                .Setup(c => c.SeasonSearch(notification, 1, 1)).Returns(true);
-
-            //Act
-            Mocker.Resolve<SeasonSearchJob>().Start(notification, 1, 1);
-
-            //Assert
-            Mocker.VerifyAllMocks();
-            Mocker.GetMock<SearchProvider>().Verify(c => c.SeasonSearch(notification, 1, 1), Times.Once());
-            Mocker.GetMock<SearchProvider>().Verify(c => c.PartialSeasonSearch(notification, 1, 1), Times.Never());
-            Mocker.GetMock<EpisodeSearchJob>().Verify(c => c.Start(notification, It.IsAny<int>(), 0), Times.Never());
         }
 
         [Test]
@@ -53,11 +43,6 @@ namespace NzbDrone.Core.Test.JobTests
                 .With(e => e.SeriesId = 5)
                 .Build();
 
-            var notification = new ProgressNotification("Season Search");
-
-            Mocker.GetMock<SearchProvider>()
-                .Setup(c => c.SeasonSearch(notification, 1, 1)).Returns(false);
-
             Mocker.GetMock<EpisodeProvider>()
                 .Setup(c => c.GetEpisodesBySeason(1, 1)).Returns(episodes);
 
@@ -70,7 +55,6 @@ namespace NzbDrone.Core.Test.JobTests
 
             //Assert
             Mocker.VerifyAllMocks();
-            Mocker.GetMock<SearchProvider>().Verify(c => c.SeasonSearch(notification, 1, 1), Times.Once());
             Mocker.GetMock<SearchProvider>().Verify(c => c.PartialSeasonSearch(notification, 1, 1), Times.Once());
             Mocker.GetMock<EpisodeSearchJob>().Verify(c => c.Start(notification, It.IsAny<int>(), 0), Times.Never());
         }
@@ -86,14 +70,6 @@ namespace NzbDrone.Core.Test.JobTests
                 .With(e => e.AirDate = DateTime.Today.AddDays(-1))
                 .Build();
 
-            var notification = new ProgressNotification("Season Search");
-
-            Mocker.GetMock<SearchProvider>()
-                .Setup(c => c.SeasonSearch(notification, 1, 1)).Returns(false);
-
-            Mocker.GetMock<EpisodeProvider>()
-                .Setup(c => c.GetEpisodesBySeason(1, 1)).Returns(episodes);
-
             Mocker.GetMock<SearchProvider>()
                 .Setup(c => c.PartialSeasonSearch(notification, 1, 1))
                 .Returns(new List<int>());
@@ -103,7 +79,6 @@ namespace NzbDrone.Core.Test.JobTests
 
             //Assert
             Mocker.VerifyAllMocks();
-            Mocker.GetMock<SearchProvider>().Verify(c => c.SeasonSearch(notification, 1, 1), Times.Once());
             Mocker.GetMock<SearchProvider>().Verify(c => c.PartialSeasonSearch(notification, 1, 1), Times.Once());
         }
 
@@ -120,17 +95,12 @@ namespace NzbDrone.Core.Test.JobTests
                 .With(e => e.AirDate = DateTime.Today.AddDays(2))
                 .Build();
 
-            var notification = new ProgressNotification("Season Search");
-
-            Mocker.GetMock<SearchProvider>()
-                .Setup(c => c.SeasonSearch(notification, 1, 1)).Returns(false);
-
             Mocker.GetMock<EpisodeProvider>()
                 .Setup(c => c.GetEpisodesBySeason(1, 1)).Returns(episodes);
 
             Mocker.GetMock<SearchProvider>()
                 .Setup(c => c.PartialSeasonSearch(notification, 1, 1))
-                .Returns(new List<int>());
+                .Returns(new List<int>{1});
 
 
             //Act
@@ -138,23 +108,19 @@ namespace NzbDrone.Core.Test.JobTests
 
             //Assert
             Mocker.VerifyAllMocks();
-            Mocker.GetMock<SearchProvider>().Verify(c => c.SeasonSearch(notification, 1, 1), Times.Once());
             Mocker.GetMock<SearchProvider>().Verify(c => c.PartialSeasonSearch(notification, 1, 1), Times.Once());
         }
 
         [Test]
         public void SeasonSearch_should_allow_searching_of_season_zero()
         {
-            var notification = new ProgressNotification("Season Search");
-
             Mocker.GetMock<SearchProvider>()
-                .Setup(c => c.SeasonSearch(notification, 1, 0)).Returns(true);
+                .Setup(c => c.PartialSeasonSearch(notification, 1, 0)).Returns(new List<int>());
 
             //Act
             Mocker.Resolve<SeasonSearchJob>().Start(notification, 1, 0);
 
             //Assert
-            Mocker.GetMock<SearchProvider>().Verify(c => c.SeasonSearch(notification, 1, 0), Times.Once());
             Mocker.GetMock<SearchProvider>().Verify(c => c.PartialSeasonSearch(notification, 1, 1), Times.Never());
             Mocker.GetMock<EpisodeSearchJob>().Verify(c => c.Start(notification, It.IsAny<int>(), 0), Times.Never());
         }

NzbDrone.Core.Test/ProviderTests/SearchProviderTests/SearchFixture.cs

@@ -166,7 +166,7 @@ namespace NzbDrone.Core.Test.ProviderTests.SearchProviderTests
             var result = Mocker.Resolve<SearchProvider>().SeasonSearch(MockNotification, _series.SeriesId, 1);
 
             //Assert
-            result.Should().BeFalse();
+            result.Should().BeEmpty();
         }
 
         [Test]

NzbDrone.Core/Jobs/SeasonSearchJob.cs

@@ -45,7 +45,11 @@ namespace NzbDrone.Core.Jobs
             if (secondaryTargetId < 0)
                 throw new ArgumentOutOfRangeException("secondaryTargetId");
 
-            if (_searchProvider.SeasonSearch(notification, targetId, secondaryTargetId))
+            //Perform a Partial Season Search - Because a full season search is a waste
+            //3 searches should guarentee results, (24 eps) versus, a potential 4 to get the same eps.
+            var successes = _searchProvider.PartialSeasonSearch(notification, targetId, secondaryTargetId);
+
+            if (successes.Count == 0)
                 return;
 
             Logger.Debug("Getting episodes from database for series: {0} and season: {1}", targetId, secondaryTargetId);
@@ -57,25 +61,15 @@ namespace NzbDrone.Core.Jobs
                 return;
             }
 
-            //Perform a Partial Season Search
+            if (episodes.Count == successes.Count)
-            var addedSeries = _searchProvider.PartialSeasonSearch(notification, targetId, secondaryTargetId);
+                return;
 
-            //addedSeries.Distinct().ToList().Sort();
+            var missingEpisodes = episodes.Select(e => e.EpisodeNumber).Except(successes).ToList();
-            //var episodeNumbers = episodes.Where(w => w.AirDate <= DateTime.Today.AddDays(1)).Select(s => s.EpisodeNumber).ToList();
-            //episodeNumbers.Sort();
 
-            //if (addedSeries.SequenceEqual(episodeNumbers))
+            foreach (var episode in episodes.Where(e => !e.Ignored && missingEpisodes.Contains(e.EpisodeNumber)).OrderBy(o => o.EpisodeNumber))
-            //    return;
+            {
-            
+                _episodeSearchJob.Start(notification, episode.EpisodeId, 0);
-            ////Get the list of episodes that weren't downloaded
+            }
-            //var missingEpisodes = episodeNumbers.Except(addedSeries).ToList();
-
-            //TODO: do one by one check only when max number of feeds have been returned by the indexer
-            //Only process episodes that is in missing episodes (To ensure we double check if the episode is available)
-            //foreach (var episode in episodes.Where(e => !e.Ignored && missingEpisodes.Contains(e.EpisodeNumber)).OrderBy(o => o.EpisodeNumber))
-            //{
-            //    _episodeSearchJob.Start(notification, episode.EpisodeId, 0);
-            //}
         }
     }
 }

NzbDrone.Core/Providers/SearchProvider.cs

@@ -46,7 +46,7 @@ namespace NzbDrone.Core.Providers
         {
         }
 
-        public virtual bool SeasonSearch(ProgressNotification notification, int seriesId, int seasonNumber)
+        public virtual List<int> SeasonSearch(ProgressNotification notification, int seriesId, int seasonNumber)
         {
             var searchResult = new SearchHistory
             {
@@ -60,12 +60,12 @@ namespace NzbDrone.Core.Providers
             if (series == null)
             {
                 Logger.Error("Unable to find an series {0} in database", seriesId);
-                return false;
+                return new List<int>();
             }  
 
             //Return false if the series is a daily series (we only support individual episode searching
             if (series.IsDaily)
-                return false;
+                return new List<int>();
 
             notification.CurrentMessage = String.Format("Searching for {0} Season {1}", series.Title, seasonNumber);
 
@@ -74,7 +74,7 @@ namespace NzbDrone.Core.Providers
             Logger.Debug("Finished searching all indexers. Total {0}", reports.Count);
 
             if (reports.Count == 0)
-                return false;
+                return new List<int>();
 
             Logger.Debug("Getting episodes from database for series: {0} and season: {1}", seriesId, seasonNumber);
             var episodeNumbers = _episodeProvider.GetEpisodeNumbersBySeason(seriesId, seasonNumber);
@@ -82,7 +82,7 @@ namespace NzbDrone.Core.Providers
             if (episodeNumbers == null || episodeNumbers.Count == 0)
             {
                 Logger.Warn("No episodes in database found for series: {0} and season: {1}.", seriesId, seasonNumber);
-                return false;
+                return new List<int>();
             }
 
             notification.CurrentMessage = "Processing search results";
@@ -94,7 +94,7 @@ namespace NzbDrone.Core.Providers
             searchResult.SearchHistoryItems = ProcessSearchResults(notification, reports, searchResult, series, seasonNumber);
             _searchHistoryProvider.Add(searchResult);
 
-            return (searchResult.Successes.Count == episodeNumbers.Count);
+            return searchResult.Successes;
         }
 
         public virtual List<int> PartialSeasonSearch(ProgressNotification notification, int seriesId, int seasonNumber)