From 06df8a86b60b51ddca761c0d415c96f8f1e88f37 Mon Sep 17 00:00:00 2001 From: Mark McDowall Date: Sun, 22 Apr 2012 23:47:30 -0700 Subject: [PATCH] Forced downloads now have episode titles. --- NzbDrone.Core/Providers/DownloadProvider.cs | 2 +- NzbDrone.Core/Providers/SearchResultProvider.cs | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/NzbDrone.Core/Providers/DownloadProvider.cs b/NzbDrone.Core/Providers/DownloadProvider.cs index f9473c0bc..521491f4f 100644 --- a/NzbDrone.Core/Providers/DownloadProvider.cs +++ b/NzbDrone.Core/Providers/DownloadProvider.cs @@ -124,7 +124,7 @@ namespace NzbDrone.Core.Providers foreach (var episode in parseResult.EpisodeNumbers) { - episodeString.Add(String.Format("{0}x{1}", parseResult.SeasonNumber, episode)); + episodeString.Add(String.Format("{0}x{1:00}", parseResult.SeasonNumber, episode)); } var epNumberString = String.Join("-", episodeString); diff --git a/NzbDrone.Core/Providers/SearchResultProvider.cs b/NzbDrone.Core/Providers/SearchResultProvider.cs index f01b9ffdb..edd48b266 100644 --- a/NzbDrone.Core/Providers/SearchResultProvider.cs +++ b/NzbDrone.Core/Providers/SearchResultProvider.cs @@ -15,15 +15,18 @@ namespace NzbDrone.Core.Providers private readonly IDatabase _database; private readonly SeriesProvider _seriesProvider; private readonly DownloadProvider _downloadProvider; + private readonly EpisodeProvider _episodeProvider; + private static readonly Logger logger = LogManager.GetCurrentClassLogger(); [Inject] public SearchResultProvider(IDatabase database, SeriesProvider seriesProvider, - DownloadProvider downloadProvider) + DownloadProvider downloadProvider, EpisodeProvider episodeProvider) { _database = database; _seriesProvider = seriesProvider; _downloadProvider = downloadProvider; + _episodeProvider = episodeProvider; } public SearchResultProvider() @@ -101,11 +104,12 @@ namespace NzbDrone.Core.Providers var item = _database.Single(itemId); var searchResult = _database.Single(item.SearchResultId); var series = _seriesProvider.GetSeries(searchResult.SeriesId); - + var parseResult = Parser.ParseTitle(item.ReportTitle); parseResult.NzbUrl = item.NzbUrl; parseResult.Series = series; parseResult.Indexer = item.Indexer; + var episodes = _episodeProvider.GetEpisodesByParseResult(parseResult); _downloadProvider.DownloadReport(parseResult); }