Archive-Team
/
sonarr-repo-only
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Removed blackhole downloading from IndexerProviderBase. 

ConfigProvider returns defaults from SabHost and SabPort.
This commit is contained in:
Mark McDowall 2011-05-17 17:19:05 -07:00
parent c0b7ebef4b
commit 58b19b6f10
2 changed files with 7 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
NzbDrone.Core/Providers/Core/ConfigProvider.cs
View File

@ -127,14 +127,14 @@ namespace NzbDrone.Core.Providers.Core
public virtual String SabHost public virtual String SabHost
{ {
get { return GetValue("SabHost"); } get { return GetValue("SabHost", "localhost", true); }
set { SetValue("SabHost", value); } set { SetValue("SabHost", value); }
} }
public virtual int SabPort public virtual int SabPort
{ {
get { return GetValueInt("SabPort"); } get { return GetValueInt("SabPort", 8080); }
set { SetValue("SabPort", value); } set { SetValue("SabPort", value); }
} }

27
NzbDrone.Core/Providers/Indexer/IndexerProviderBase.cs
View File

@ -164,32 +164,15 @@ namespace NzbDrone.Core.Providers.Indexer
parseResult.EpisodeTitle = episodes[0].Title; parseResult.EpisodeTitle = episodes[0].Title;
var sabTitle = _sabProvider.GetSabTitle(parseResult); var sabTitle = _sabProvider.GetSabTitle(parseResult);
if (_configProvider.UseBlackhole) if (_sabProvider.IsInQueue(sabTitle))
{ {
var blackholeDir = _configProvider.BlackholeDirectory; return;
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;
}
} }
//else send to SAB if (!_sabProvider.AddByUrl(NzbDownloadUrl(feedItem), sabTitle))
else
{ {
if (_sabProvider.IsInQueue(sabTitle)) _logger.Warn("Unable to add item to SAB queue. {0} {1}", NzbDownloadUrl(feedItem), sabTitle);
{ return;
return;
}
if (!_sabProvider.AddByUrl(NzbDownloadUrl(feedItem), sabTitle))
{
_logger.Warn("Unable to add item to SAB queue. {0} {1}", NzbDownloadUrl(feedItem), sabTitle);
return;
}
} }
foreach (var episode in episodes) foreach (var episode in episodes)