From c59f1a537d5a1f5604388856e8fe3bce6659b98b Mon Sep 17 00:00:00 2001 From: Mark McDowall Date: Tue, 8 May 2012 15:49:10 -0700 Subject: [PATCH] Fixed: An issue with Season and Series searching crashing the JobProvider. Added Nzb.su image to project file. --- NzbDrone.Core/Providers/SearchProvider.cs | 11 ++++++----- NzbDrone.Web/NzbDrone.Web.csproj | 1 + 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/NzbDrone.Core/Providers/SearchProvider.cs b/NzbDrone.Core/Providers/SearchProvider.cs index 036411ecd..ff958d017 100644 --- a/NzbDrone.Core/Providers/SearchProvider.cs +++ b/NzbDrone.Core/Providers/SearchProvider.cs @@ -52,7 +52,8 @@ namespace NzbDrone.Core.Providers { SearchTime = DateTime.Now, SeriesId = seriesId, - SeasonNumber = seasonNumber + SeasonNumber = seasonNumber, + Successes = new List() }; var series = _seriesProvider.GetSeries(seriesId); @@ -103,7 +104,8 @@ namespace NzbDrone.Core.Providers { SearchTime = DateTime.Now, SeriesId = seriesId, - SeasonNumber = seasonNumber + SeasonNumber = seasonNumber, + Successes = new List() }; var series = _seriesProvider.GetSeries(seriesId); @@ -259,7 +261,6 @@ namespace NzbDrone.Core.Providers public List ProcessSearchResults(ProgressNotification notification, IEnumerable reports, SearchHistory searchResult, Series series, int seasonNumber, int? episodeNumber = null) { - var successes = new List(); var items = new List(); foreach (var episodeParseResult in reports.OrderByDescending(c => c.Quality).ThenBy(c => c.Age)) @@ -310,7 +311,7 @@ namespace NzbDrone.Core.Providers } //Make sure we haven't already downloaded a report with this episodenumber, if we have, skip the report. - if (successes.Intersect(episodeParseResult.EpisodeNumbers).Any()) + if (searchResult.Successes.Intersect(episodeParseResult.EpisodeNumbers).Any()) { Logger.Trace("Episode has already been downloaded in this search, skipping."); item.SearchError = ReportRejectionType.Skipped; @@ -328,7 +329,7 @@ namespace NzbDrone.Core.Providers notification.CurrentMessage = String.Format("{0} Added to download queue", episodeParseResult); //Add the list of episode numbers from this release - successes.AddRange(episodeParseResult.EpisodeNumbers); + searchResult.Successes.AddRange(episodeParseResult.EpisodeNumbers); item.Success = true; } else diff --git a/NzbDrone.Web/NzbDrone.Web.csproj b/NzbDrone.Web/NzbDrone.Web.csproj index a6e407859..54982fe89 100644 --- a/NzbDrone.Web/NzbDrone.Web.csproj +++ b/NzbDrone.Web/NzbDrone.Web.csproj @@ -164,6 +164,7 @@ +