mirror of
https://github.com/lidarr/lidarr.git
synced 2025-08-13 18:27:08 -07:00
Failed downloads are removed from queue/history (opt out)
This commit is contained in:
parent
769fcdfc80
commit
d634dd1e5c
10 changed files with 174 additions and 28 deletions
|
@ -1,6 +1,8 @@
|
|||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using NLog;
|
||||
using NzbDrone.Core.Configuration;
|
||||
using NzbDrone.Core.History;
|
||||
using NzbDrone.Core.Messaging.Commands;
|
||||
using NzbDrone.Core.Messaging.Events;
|
||||
|
@ -12,44 +14,53 @@ namespace NzbDrone.Core.Download
|
|||
private readonly IProvideDownloadClient _downloadClientProvider;
|
||||
private readonly IHistoryService _historyService;
|
||||
private readonly IEventAggregator _eventAggregator;
|
||||
private readonly IConfigService _configService;
|
||||
private readonly Logger _logger;
|
||||
|
||||
private readonly IDownloadClient _downloadClient;
|
||||
|
||||
private static string DOWNLOAD_CLIENT = "downloadClient";
|
||||
private static string DOWNLOAD_CLIENT_ID = "downloadClientId";
|
||||
|
||||
public FailedDownloadService(IProvideDownloadClient downloadClientProvider,
|
||||
IHistoryService historyService,
|
||||
IEventAggregator eventAggregator,
|
||||
IConfigService configService,
|
||||
Logger logger)
|
||||
{
|
||||
_downloadClientProvider = downloadClientProvider;
|
||||
_historyService = historyService;
|
||||
_eventAggregator = eventAggregator;
|
||||
_configService = configService;
|
||||
_logger = logger;
|
||||
|
||||
_downloadClient = _downloadClientProvider.GetDownloadClient();
|
||||
}
|
||||
|
||||
private void CheckForFailedDownloads()
|
||||
{
|
||||
var downloadClient = _downloadClientProvider.GetDownloadClient();
|
||||
var downloadClientHistory = downloadClient.GetHistory(0, 20).ToList();
|
||||
var grabbedHistory = _historyService.Grabbed();
|
||||
var failedHistory = _historyService.Failed();
|
||||
|
||||
var failedItems = downloadClientHistory.Where(h => h.Status == HistoryStatus.Failed).ToList();
|
||||
CheckQueue(grabbedHistory, failedHistory);
|
||||
CheckHistory(grabbedHistory, failedHistory);
|
||||
}
|
||||
|
||||
private void CheckQueue(List<History.History> grabbedHistory, List<History.History> failedHistory)
|
||||
{
|
||||
var downloadClientQueue = _downloadClient.GetQueue().ToList();
|
||||
var failedItems = downloadClientQueue.Where(q => q.Title.StartsWith("ENCRYPTED / ")).ToList();
|
||||
|
||||
if (!failedItems.Any())
|
||||
{
|
||||
_logger.Trace("Yay! No failed downloads");
|
||||
_logger.Trace("Yay! No encrypted downloads");
|
||||
return;
|
||||
}
|
||||
|
||||
var grabbedHistory = _historyService.Grabbed();
|
||||
var failedHistory = _historyService.Failed();
|
||||
|
||||
foreach (var failedItem in failedItems)
|
||||
{
|
||||
var failedLocal = failedItem;
|
||||
var historyItems = grabbedHistory.Where(h => h.Data.ContainsKey(DOWNLOAD_CLIENT) &&
|
||||
h.Data[DOWNLOAD_CLIENT_ID].Equals(failedLocal.Id))
|
||||
.ToList();
|
||||
var historyItems = GetHistoryItems(grabbedHistory, failedLocal.Id);
|
||||
|
||||
if (!historyItems.Any())
|
||||
{
|
||||
|
@ -64,21 +75,77 @@ namespace NzbDrone.Core.Download
|
|||
continue;
|
||||
}
|
||||
|
||||
var historyItem = historyItems.First();
|
||||
PublishDownloadFailedEvent(historyItems, "Encypted download detected");
|
||||
|
||||
_eventAggregator.PublishEvent(new DownloadFailedEvent
|
||||
if (_configService.RemoveFailedDownloads)
|
||||
{
|
||||
SeriesId = historyItem.SeriesId,
|
||||
EpisodeIds = historyItems.Select(h => h.EpisodeId).ToList(),
|
||||
Quality = historyItem.Quality,
|
||||
SourceTitle = historyItem.SourceTitle,
|
||||
DownloadClient = historyItem.Data[DOWNLOAD_CLIENT],
|
||||
DownloadClientId = historyItem.Data[DOWNLOAD_CLIENT_ID],
|
||||
Message = failedItem.Message
|
||||
});
|
||||
_logger.Info("Removing encrypted download from queue: {0}", failedItem.Title.Replace("ENCRYPTED / ", ""));
|
||||
_downloadClient.RemoveFromQueue(failedItem.Id);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private void CheckHistory(List<History.History> grabbedHistory, List<History.History> failedHistory)
|
||||
{
|
||||
var downloadClientHistory = _downloadClient.GetHistory(0, 20).ToList();
|
||||
var failedItems = downloadClientHistory.Where(h => h.Status == HistoryStatus.Failed).ToList();
|
||||
|
||||
if (!failedItems.Any())
|
||||
{
|
||||
_logger.Trace("Yay! No failed downloads");
|
||||
return;
|
||||
}
|
||||
|
||||
foreach (var failedItem in failedItems)
|
||||
{
|
||||
var failedLocal = failedItem;
|
||||
var historyItems = GetHistoryItems(grabbedHistory, failedLocal.Id);
|
||||
|
||||
if (!historyItems.Any())
|
||||
{
|
||||
_logger.Trace("Unable to find matching history item");
|
||||
continue;
|
||||
}
|
||||
|
||||
if (failedHistory.Any(h => h.Data.ContainsKey(DOWNLOAD_CLIENT_ID) &&
|
||||
h.Data[DOWNLOAD_CLIENT_ID].Equals(failedLocal.Id)))
|
||||
{
|
||||
_logger.Trace("Already added to history as failed");
|
||||
continue;
|
||||
}
|
||||
|
||||
PublishDownloadFailedEvent(historyItems, failedItem.Message);
|
||||
|
||||
if (_configService.RemoveFailedDownloads)
|
||||
{
|
||||
_logger.Info("Removing failed download from history: {0}", failedItem.Title);
|
||||
_downloadClient.RemoveFromHistory(failedItem.Id);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private List<History.History> GetHistoryItems(List<History.History> grabbedHistory, string downloadClientId)
|
||||
{
|
||||
return grabbedHistory.Where(h => h.Data.ContainsKey(DOWNLOAD_CLIENT) &&
|
||||
h.Data[DOWNLOAD_CLIENT_ID].Equals(downloadClientId))
|
||||
.ToList();
|
||||
}
|
||||
|
||||
private void PublishDownloadFailedEvent(List<History.History> historyItems, string message)
|
||||
{
|
||||
var historyItem = historyItems.First();
|
||||
_eventAggregator.PublishEvent(new DownloadFailedEvent
|
||||
{
|
||||
SeriesId = historyItem.SeriesId,
|
||||
EpisodeIds = historyItems.Select(h => h.EpisodeId).ToList(),
|
||||
Quality = historyItem.Quality,
|
||||
SourceTitle = historyItem.SourceTitle,
|
||||
DownloadClient = historyItem.Data[DOWNLOAD_CLIENT],
|
||||
DownloadClientId = historyItem.Data[DOWNLOAD_CLIENT_ID],
|
||||
Message = message
|
||||
});
|
||||
}
|
||||
|
||||
public void Execute(FailedDownloadCommand message)
|
||||
{
|
||||
CheckForFailedDownloads();
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue