From 5f725a0a4df9c86f95e933a5d2ec3619288b00fb Mon Sep 17 00:00:00 2001 From: PearsonFlyer Date: Wed, 8 Dec 2021 09:43:10 -0500 Subject: [PATCH] Fixed: Manual adding to blocklist --- src/Lidarr.Api.V1/Blocklist/BlocklistController.cs | 2 +- src/Lidarr.Api.V1/Queue/QueueController.cs | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/Lidarr.Api.V1/Blocklist/BlocklistController.cs b/src/Lidarr.Api.V1/Blocklist/BlocklistController.cs index 7a9e2c7ca..aa482dc6d 100644 --- a/src/Lidarr.Api.V1/Blocklist/BlocklistController.cs +++ b/src/Lidarr.Api.V1/Blocklist/BlocklistController.cs @@ -18,7 +18,7 @@ namespace Lidarr.Api.V1.Blocklist } [HttpGet] - public PagingResource GetBlacklist() + public PagingResource GetBlocklist() { var pagingResource = Request.ReadPagingResourceFromRequest(); var pagingSpec = pagingResource.MapToPagingSpec("date", SortDirection.Descending); diff --git a/src/Lidarr.Api.V1/Queue/QueueController.cs b/src/Lidarr.Api.V1/Queue/QueueController.cs index 8c444e264..a9c2bea77 100644 --- a/src/Lidarr.Api.V1/Queue/QueueController.cs +++ b/src/Lidarr.Api.V1/Queue/QueueController.cs @@ -59,9 +59,9 @@ namespace Lidarr.Api.V1.Queue } [RestDeleteById] - public void RemoveAction(int id, bool removeFromClient = true, bool blacklist = false, bool skipReDownload = false) + public void RemoveAction(int id, bool removeFromClient = true, bool blocklist = false, bool skipReDownload = false) { - var trackedDownload = Remove(id, removeFromClient, blacklist, skipReDownload); + var trackedDownload = Remove(id, removeFromClient, blocklist, skipReDownload); if (trackedDownload != null) { @@ -70,13 +70,13 @@ namespace Lidarr.Api.V1.Queue } [HttpDelete("bulk")] - public object RemoveMany([FromBody] QueueBulkResource resource, [FromQuery] bool removeFromClient = true, [FromQuery] bool blacklist = 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(); foreach (var id in resource.Ids) { - var trackedDownload = Remove(id, removeFromClient, blacklist, skipReDownload); + var trackedDownload = Remove(id, removeFromClient, blocklist, skipReDownload); if (trackedDownload != null) { @@ -191,7 +191,7 @@ namespace Lidarr.Api.V1.Queue } } - private TrackedDownload Remove(int id, bool removeFromClient, bool blacklist, bool skipReDownload) + private TrackedDownload Remove(int id, bool removeFromClient, bool blocklist, bool skipReDownload) { var pendingRelease = _pendingReleaseService.FindPendingQueueItem(id); @@ -221,12 +221,12 @@ namespace Lidarr.Api.V1.Queue downloadClient.RemoveItem(trackedDownload.DownloadItem.DownloadId, true); } - if (blacklist) + if (blocklist) { _failedDownloadService.MarkAsFailed(trackedDownload.DownloadItem.DownloadId, skipReDownload); } - if (!removeFromClient && !blacklist) + if (!removeFromClient && !blocklist) { if (!_ignoredDownloadService.IgnoreDownload(trackedDownload)) {