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

Failed download handling won't error when download client hasn't been configured

This commit is contained in:
Mark McDowall 2014-02-18 23:19:21 -08:00
parent 7d4a514a68
commit d86a54d208
1 changed files with 26 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/NzbDrone.Core/Download/FailedDownloadService.cs
View File

@ -1,6 +1,5 @@
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Net;
using NLog; using NLog;
using NzbDrone.Core.Configuration; using NzbDrone.Core.Configuration;
using NzbDrone.Core.History; using NzbDrone.Core.History;
@ -46,7 +45,14 @@ namespace NzbDrone.Core.Download
private void CheckQueue(List<History.History> grabbedHistory, List<History.History> failedHistory) private void CheckQueue(List<History.History> grabbedHistory, List<History.History> failedHistory)
{ {
var downloadClientQueue = GetDownloadClient().GetQueue().ToList(); var downloadClient = GetDownloadClient();
if (downloadClient == null)
{
return;
}
var downloadClientQueue = downloadClient.GetQueue().ToList();
var failedItems = downloadClientQueue.Where(q => q.Title.StartsWith("ENCRYPTED / ")).ToList(); var failedItems = downloadClientQueue.Where(q => q.Title.StartsWith("ENCRYPTED / ")).ToList();
if (!failedItems.Any()) if (!failedItems.Any())
@ -78,14 +84,21 @@ namespace NzbDrone.Core.Download
if (_configService.RemoveFailedDownloads) if (_configService.RemoveFailedDownloads)
{ {
_logger.Info("Removing encrypted download from queue: {0}", failedItem.Title.Replace("ENCRYPTED / ", "")); _logger.Info("Removing encrypted download from queue: {0}", failedItem.Title.Replace("ENCRYPTED / ", ""));
GetDownloadClient().RemoveFromQueue(failedItem.Id); downloadClient.RemoveFromQueue(failedItem.Id);
} }
} }
} }
private void CheckHistory(List<History.History> grabbedHistory, List<History.History> failedHistory) private void CheckHistory(List<History.History> grabbedHistory, List<History.History> failedHistory)
{ {
var downloadClientHistory = GetDownloadClient().GetHistory(0, 20).ToList(); var downloadClient = GetDownloadClient();
if (downloadClient == null)
{
return;
}
var downloadClientHistory = downloadClient.GetHistory(0, 20).ToList();
var failedItems = downloadClientHistory.Where(h => h.Status == HistoryStatus.Failed).ToList(); var failedItems = downloadClientHistory.Where(h => h.Status == HistoryStatus.Failed).ToList();
if (!failedItems.Any()) if (!failedItems.Any())
@ -117,7 +130,7 @@ namespace NzbDrone.Core.Download
if (_configService.RemoveFailedDownloads) if (_configService.RemoveFailedDownloads)
{ {
_logger.Info("Removing failed download from history: {0}", failedItem.Title); _logger.Info("Removing failed download from history: {0}", failedItem.Title);
GetDownloadClient().RemoveFromHistory(failedItem.Id); downloadClient.RemoveFromHistory(failedItem.Id);
} }
} }
} }
@ -152,7 +165,14 @@ namespace NzbDrone.Core.Download
private IDownloadClient GetDownloadClient() private IDownloadClient GetDownloadClient()
{ {
return _downloadClientProvider.GetDownloadClient(); var downloadClient = _downloadClientProvider.GetDownloadClient();
if (downloadClient == null)
{
_logger.Trace("No download client is configured");
}
return downloadClient;
} }
public void Execute(CheckForFailedDownloadCommand message) public void Execute(CheckForFailedDownloadCommand message)