From 58b19b6f103da0b333d9eaa5e7400a35bcc2082c Mon Sep 17 00:00:00 2001 From: Mark McDowall Date: Tue, 17 May 2011 17:19:05 -0700 Subject: [PATCH] Removed blackhole downloading from IndexerProviderBase. ConfigProvider returns defaults from SabHost and SabPort. --- .../Providers/Core/ConfigProvider.cs | 4 +-- .../Providers/Indexer/IndexerProviderBase.cs | 27 ++++--------------- 2 files changed, 7 insertions(+), 24 deletions(-) diff --git a/NzbDrone.Core/Providers/Core/ConfigProvider.cs b/NzbDrone.Core/Providers/Core/ConfigProvider.cs index 0e74c2f1f..409ad1048 100644 --- a/NzbDrone.Core/Providers/Core/ConfigProvider.cs +++ b/NzbDrone.Core/Providers/Core/ConfigProvider.cs @@ -127,14 +127,14 @@ namespace NzbDrone.Core.Providers.Core public virtual String SabHost { - get { return GetValue("SabHost"); } + get { return GetValue("SabHost", "localhost", true); } set { SetValue("SabHost", value); } } public virtual int SabPort { - get { return GetValueInt("SabPort"); } + get { return GetValueInt("SabPort", 8080); } set { SetValue("SabPort", value); } } diff --git a/NzbDrone.Core/Providers/Indexer/IndexerProviderBase.cs b/NzbDrone.Core/Providers/Indexer/IndexerProviderBase.cs index f10cad1c1..9b34f7216 100644 --- a/NzbDrone.Core/Providers/Indexer/IndexerProviderBase.cs +++ b/NzbDrone.Core/Providers/Indexer/IndexerProviderBase.cs @@ -164,32 +164,15 @@ namespace NzbDrone.Core.Providers.Indexer parseResult.EpisodeTitle = episodes[0].Title; var sabTitle = _sabProvider.GetSabTitle(parseResult); - if (_configProvider.UseBlackhole) + if (_sabProvider.IsInQueue(sabTitle)) { - var blackholeDir = _configProvider.BlackholeDirectory; - var folder = !String.IsNullOrEmpty(blackholeDir) ? blackholeDir : Path.Combine(CentralDispatch.AppPath, "App_Data"); - var fileName = Path.Combine(folder, sabTitle + ".nzb"); - _logger.Info("Downloading NZB: {0}", sabTitle); - if (!_httpProvider.DownloadFile(NzbDownloadUrl(feedItem), fileName)) - { - _logger.Info("Failed to download NZB"); - return; - } + return; } - //else send to SAB - else + if (!_sabProvider.AddByUrl(NzbDownloadUrl(feedItem), sabTitle)) { - if (_sabProvider.IsInQueue(sabTitle)) - { - return; - } - - if (!_sabProvider.AddByUrl(NzbDownloadUrl(feedItem), sabTitle)) - { - _logger.Warn("Unable to add item to SAB queue. {0} {1}", NzbDownloadUrl(feedItem), sabTitle); - return; - } + _logger.Warn("Unable to add item to SAB queue. {0} {1}", NzbDownloadUrl(feedItem), sabTitle); + return; } foreach (var episode in episodes)