From 9c79fc3267965a0bcad5f930c83f11a2f21e22b2 Mon Sep 17 00:00:00 2001 From: PearsonFlyer Date: Fri, 14 Jul 2023 07:07:36 -0400 Subject: [PATCH] Added the ability to skip redownload when marking an item as failed in the activity queue --- .../src/Activity/Queue/RemoveQueueItemModal.js | 2 +- .../src/Activity/Queue/RemoveQueueItemsModal.js | 2 +- .../Download/DownloadFailedEvent.cs | 2 +- .../Download/FailedDownloadService.cs | 16 ++++++++-------- .../Download/RedownloadFailedDownloadService.cs | 2 +- src/Sonarr.Api.V3/Queue/QueueController.cs | 12 ++++++------ 6 files changed, 18 insertions(+), 18 deletions(-) diff --git a/frontend/src/Activity/Queue/RemoveQueueItemModal.js b/frontend/src/Activity/Queue/RemoveQueueItemModal.js index 1ec8c369c..f5ad6c4d6 100644 --- a/frontend/src/Activity/Queue/RemoveQueueItemModal.js +++ b/frontend/src/Activity/Queue/RemoveQueueItemModal.js @@ -49,7 +49,7 @@ class RemoveQueueItemModal extends Component { this.setState({ blocklist: value }); }; - onSkipReDownloadChange = ({ value }) => { + onSkipRedownloadChange = ({ value }) => { this.setState({ skipredownload: value }); }; diff --git a/frontend/src/Activity/Queue/RemoveQueueItemsModal.js b/frontend/src/Activity/Queue/RemoveQueueItemsModal.js index 67f4328f2..49bff5f4e 100644 --- a/frontend/src/Activity/Queue/RemoveQueueItemsModal.js +++ b/frontend/src/Activity/Queue/RemoveQueueItemsModal.js @@ -50,7 +50,7 @@ class RemoveQueueItemsModal extends Component { this.setState({ blocklist: value }); }; - onSkipReDownloadChange = ({ value }) => { + onSkipRedownloadChange = ({ value }) => { this.setState({ skipredownload: value }); }; diff --git a/src/NzbDrone.Core/Download/DownloadFailedEvent.cs b/src/NzbDrone.Core/Download/DownloadFailedEvent.cs index a504f305f..757e5da97 100644 --- a/src/NzbDrone.Core/Download/DownloadFailedEvent.cs +++ b/src/NzbDrone.Core/Download/DownloadFailedEvent.cs @@ -23,6 +23,6 @@ namespace NzbDrone.Core.Download public Dictionary Data { get; set; } public TrackedDownload TrackedDownload { get; set; } public List Languages { get; set; } - public bool SkipReDownload { get; set; } + public bool SkipRedownload { get; set; } } } diff --git a/src/NzbDrone.Core/Download/FailedDownloadService.cs b/src/NzbDrone.Core/Download/FailedDownloadService.cs index 95b629a25..8e07b23fd 100644 --- a/src/NzbDrone.Core/Download/FailedDownloadService.cs +++ b/src/NzbDrone.Core/Download/FailedDownloadService.cs @@ -9,8 +9,8 @@ namespace NzbDrone.Core.Download { public interface IFailedDownloadService { - void MarkAsFailed(int historyId, bool skipReDownload = false); - void MarkAsFailed(string downloadId, bool skipReDownload = false); + void MarkAsFailed(int historyId, bool skipRedownload = false); + void MarkAsFailed(string downloadId, bool skipRedownload = false); void Check(TrackedDownload trackedDownload); void ProcessFailed(TrackedDownload trackedDownload); } @@ -30,14 +30,14 @@ namespace NzbDrone.Core.Download _eventAggregator = eventAggregator; } - public void MarkAsFailed(int historyId, bool skipReDownload = false) + public void MarkAsFailed(int historyId, bool skipRedownload = false) { var history = _historyService.Get(historyId); var downloadId = history.DownloadId; if (downloadId.IsNullOrWhiteSpace()) { - PublishDownloadFailedEvent(new List { history }, "Manually marked as failed", skipReDownload: skipReDownload); + PublishDownloadFailedEvent(new List { history }, "Manually marked as failed", skipRedownload: skipRedownload); return; } @@ -57,7 +57,7 @@ namespace NzbDrone.Core.Download PublishDownloadFailedEvent(grabbedHistory, "Manually marked as failed"); } - public void MarkAsFailed(string downloadId, bool skipReDownload = false) + public void MarkAsFailed(string downloadId, bool skipRedownload = false) { var history = _historyService.Find(downloadId, EpisodeHistoryEventType.Grabbed); @@ -65,7 +65,7 @@ namespace NzbDrone.Core.Download { var trackedDownload = _trackedDownloadService.Find(downloadId); - PublishDownloadFailedEvent(history, "Manually marked as failed", trackedDownload, skipReDownload: skipReDownload); + PublishDownloadFailedEvent(history, "Manually marked as failed", trackedDownload, skipRedownload: skipRedownload); } } @@ -125,7 +125,7 @@ namespace NzbDrone.Core.Download PublishDownloadFailedEvent(grabbedItems, failure, trackedDownload); } - private void PublishDownloadFailedEvent(List historyItems, string message, TrackedDownload trackedDownload = null, bool skipReDownload = false) + private void PublishDownloadFailedEvent(List historyItems, string message, TrackedDownload trackedDownload = null, bool skipRedownload = false) { var historyItem = historyItems.First(); @@ -141,7 +141,7 @@ namespace NzbDrone.Core.Download Data = historyItem.Data, TrackedDownload = trackedDownload, Languages = historyItem.Languages, - SkipReDownload = skipReDownload + SkipRedownload = skipRedownload }; _eventAggregator.PublishEvent(downloadFailedEvent); diff --git a/src/NzbDrone.Core/Download/RedownloadFailedDownloadService.cs b/src/NzbDrone.Core/Download/RedownloadFailedDownloadService.cs index 5561c9d60..20c19e15d 100644 --- a/src/NzbDrone.Core/Download/RedownloadFailedDownloadService.cs +++ b/src/NzbDrone.Core/Download/RedownloadFailedDownloadService.cs @@ -30,7 +30,7 @@ namespace NzbDrone.Core.Download [EventHandleOrder(EventHandleOrder.Last)] public void Handle(DownloadFailedEvent message) { - if (message.SkipReDownload) + if (message.SkipRedownload) { _logger.Debug("Skip redownloading requested by user"); return; diff --git a/src/Sonarr.Api.V3/Queue/QueueController.cs b/src/Sonarr.Api.V3/Queue/QueueController.cs index 9e78f4f54..6259956c3 100644 --- a/src/Sonarr.Api.V3/Queue/QueueController.cs +++ b/src/Sonarr.Api.V3/Queue/QueueController.cs @@ -70,7 +70,7 @@ namespace Sonarr.Api.V3.Queue } [RestDeleteById] - public void RemoveAction(int id, bool removeFromClient = true, bool blocklist = false, bool skipReDownload = false) + public void RemoveAction(int id, bool removeFromClient = true, bool blocklist = false, bool skipRedownload = false) { var pendingRelease = _pendingReleaseService.FindPendingQueueItem(id); @@ -88,12 +88,12 @@ namespace Sonarr.Api.V3.Queue throw new NotFoundException(); } - Remove(trackedDownload, removeFromClient, blocklist, skipReDownload); + Remove(trackedDownload, removeFromClient, blocklist, skipRedownload); _trackedDownloadService.StopTracking(trackedDownload.DownloadItem.DownloadId); } [HttpDelete("bulk")] - public object RemoveMany([FromBody] QueueBulkResource resource, [FromQuery] bool removeFromClient = true, [FromQuery] bool blocklist = false, [FromQuery] bool skipReDownload = false) + public object RemoveMany([FromBody] QueueBulkResource resource, [FromQuery] bool removeFromClient = true, [FromQuery] bool blocklist = false, [FromQuery] bool skipRedownload = false) { var trackedDownloadIds = new List(); var pendingToRemove = new List(); @@ -124,7 +124,7 @@ namespace Sonarr.Api.V3.Queue foreach (var trackedDownload in trackedToRemove.DistinctBy(t => t.DownloadItem.DownloadId)) { - Remove(trackedDownload, removeFromClient, blocklist, skipReDownload); + Remove(trackedDownload, removeFromClient, blocklist, skipRedownload); trackedDownloadIds.Add(trackedDownload.DownloadItem.DownloadId); } @@ -255,7 +255,7 @@ namespace Sonarr.Api.V3.Queue _pendingReleaseService.RemovePendingQueueItems(pendingRelease.Id); } - private TrackedDownload Remove(TrackedDownload trackedDownload, bool removeFromClient, bool blocklist, bool skipReDownload) + private TrackedDownload Remove(TrackedDownload trackedDownload, bool removeFromClient, bool blocklist, bool skipRedownload) { if (removeFromClient) { @@ -271,7 +271,7 @@ namespace Sonarr.Api.V3.Queue if (blocklist) { - _failedDownloadService.MarkAsFailed(trackedDownload.DownloadItem.DownloadId, skipReDownload); + _failedDownloadService.MarkAsFailed(trackedDownload.DownloadItem.DownloadId, skipRedownload); } if (!removeFromClient && !blocklist)