From 198917480194b5dc7608917c96a7ccd53772c54f Mon Sep 17 00:00:00 2001 From: Bogdan Date: Sun, 23 Jul 2023 05:01:08 +0300 Subject: [PATCH] Fix typo in SkipRedownload Closes #2711 --- frontend/src/Activity/Queue/QueueRow.js | 4 ++-- .../src/Activity/Queue/RemoveQueueItemModal.js | 18 +++++++++--------- .../Activity/Queue/RemoveQueueItemsModal.js | 18 +++++++++--------- frontend/src/Store/Actions/queueActions.js | 8 ++++---- .../RedownloadFailedDownloadServiceFixture.cs | 2 +- .../Download/DownloadFailedEvent.cs | 2 +- .../Download/FailedDownloadService.cs | 16 ++++++++-------- .../RedownloadFailedDownloadService.cs | 2 +- src/NzbDrone.Core/Localization/Core/en.json | 2 +- src/Readarr.Api.V1/Queue/QueueController.cs | 12 ++++++------ src/Readarr.Api.V1/openapi.json | 4 ++-- 11 files changed, 44 insertions(+), 44 deletions(-) diff --git a/frontend/src/Activity/Queue/QueueRow.js b/frontend/src/Activity/Queue/QueueRow.js index 017960c16..977825b43 100644 --- a/frontend/src/Activity/Queue/QueueRow.js +++ b/frontend/src/Activity/Queue/QueueRow.js @@ -46,14 +46,14 @@ class QueueRow extends Component { this.setState({ isRemoveQueueItemModalOpen: true }); }; - onRemoveQueueItemModalConfirmed = (blocklist, skipredownload) => { + onRemoveQueueItemModalConfirmed = (blocklist, skipRedownload) => { const { onRemoveQueueItemPress, onQueueRowModalOpenOrClose } = this.props; onQueueRowModalOpenOrClose(false); - onRemoveQueueItemPress(blocklist, skipredownload); + onRemoveQueueItemPress(blocklist, skipRedownload); this.setState({ isRemoveQueueItemModalOpen: false }); }; diff --git a/frontend/src/Activity/Queue/RemoveQueueItemModal.js b/frontend/src/Activity/Queue/RemoveQueueItemModal.js index 65ff22283..7f10ae8fe 100644 --- a/frontend/src/Activity/Queue/RemoveQueueItemModal.js +++ b/frontend/src/Activity/Queue/RemoveQueueItemModal.js @@ -23,7 +23,7 @@ class RemoveQueueItemModal extends Component { this.state = { remove: true, blocklist: false, - skipredownload: false + skipRedownload: false }; } @@ -34,7 +34,7 @@ class RemoveQueueItemModal extends Component { this.setState({ remove: true, blocklist: false, - skipredownload: false + skipRedownload: false }); }; @@ -49,8 +49,8 @@ class RemoveQueueItemModal extends Component { this.setState({ blocklist: value }); }; - onSkipReDownloadChange = ({ value }) => { - this.setState({ skipredownload: value }); + onSkipRedownloadChange = ({ value }) => { + this.setState({ skipRedownload: value }); }; onRemoveConfirmed = () => { @@ -76,7 +76,7 @@ class RemoveQueueItemModal extends Component { isPending } = this.props; - const { remove, blocklist, skipredownload } = this.state; + const { remove, blocklist, skipRedownload } = this.state; return ( } diff --git a/frontend/src/Activity/Queue/RemoveQueueItemsModal.js b/frontend/src/Activity/Queue/RemoveQueueItemsModal.js index c9f5caea6..aebee05b0 100644 --- a/frontend/src/Activity/Queue/RemoveQueueItemsModal.js +++ b/frontend/src/Activity/Queue/RemoveQueueItemsModal.js @@ -24,7 +24,7 @@ class RemoveQueueItemsModal extends Component { this.state = { remove: true, blocklist: false, - skipredownload: false + skipRedownload: false }; } @@ -35,7 +35,7 @@ class RemoveQueueItemsModal extends Component { this.setState({ remove: true, blocklist: false, - skipredownload: false + skipRedownload: false }); }; @@ -50,8 +50,8 @@ class RemoveQueueItemsModal extends Component { this.setState({ blocklist: value }); }; - onSkipReDownloadChange = ({ value }) => { - this.setState({ skipredownload: value }); + onSkipRedownloadChange = ({ value }) => { + this.setState({ skipRedownload: value }); }; onRemoveConfirmed = () => { @@ -77,7 +77,7 @@ class RemoveQueueItemsModal extends Component { allPending } = this.props; - const { remove, blocklist, skipredownload } = this.state; + const { remove, blocklist, skipRedownload } = this.state; return ( } diff --git a/frontend/src/Store/Actions/queueActions.js b/frontend/src/Store/Actions/queueActions.js index 002bb7bd3..a8b0e00de 100644 --- a/frontend/src/Store/Actions/queueActions.js +++ b/frontend/src/Store/Actions/queueActions.js @@ -371,13 +371,13 @@ export const actionHandlers = handleThunks({ id, remove, blocklist, - skipredownload + skipRedownload } = payload; dispatch(updateItem({ section: paged, id, isRemoving: true })); const promise = createAjaxRequest({ - url: `/queue/${id}?removeFromClient=${remove}&blocklist=${blocklist}&skipredownload=${skipredownload}`, + url: `/queue/${id}?removeFromClient=${remove}&blocklist=${blocklist}&skipRedownload=${skipRedownload}`, method: 'DELETE' }).request; @@ -395,7 +395,7 @@ export const actionHandlers = handleThunks({ ids, remove, blocklist, - skipredownload + skipRedownload } = payload; dispatch(batchActions([ @@ -411,7 +411,7 @@ export const actionHandlers = handleThunks({ ])); const promise = createAjaxRequest({ - url: `/queue/bulk?removeFromClient=${remove}&blocklist=${blocklist}&skipredownload=${skipredownload}`, + url: `/queue/bulk?removeFromClient=${remove}&blocklist=${blocklist}&skipRedownload=${skipRedownload}`, method: 'DELETE', dataType: 'json', data: JSON.stringify({ ids }) diff --git a/src/NzbDrone.Core.Test/Download/RedownloadFailedDownloadServiceFixture.cs b/src/NzbDrone.Core.Test/Download/RedownloadFailedDownloadServiceFixture.cs index d560002ec..d2c38941f 100644 --- a/src/NzbDrone.Core.Test/Download/RedownloadFailedDownloadServiceFixture.cs +++ b/src/NzbDrone.Core.Test/Download/RedownloadFailedDownloadServiceFixture.cs @@ -33,7 +33,7 @@ namespace NzbDrone.Core.Test.Download { AuthorId = 1, BookIds = new List { 1 }, - SkipReDownload = true + SkipRedownload = true }; Subject.Handle(failedEvent); diff --git a/src/NzbDrone.Core/Download/DownloadFailedEvent.cs b/src/NzbDrone.Core/Download/DownloadFailedEvent.cs index 870045ba2..a65cce3e0 100644 --- a/src/NzbDrone.Core/Download/DownloadFailedEvent.cs +++ b/src/NzbDrone.Core/Download/DownloadFailedEvent.cs @@ -21,6 +21,6 @@ namespace NzbDrone.Core.Download public string Message { get; set; } public Dictionary Data { get; set; } public TrackedDownload TrackedDownload { 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 7d9dbbcfc..2562e25a3 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); } else { @@ -46,7 +46,7 @@ namespace NzbDrone.Core.Download } } - public void MarkAsFailed(string downloadId, bool skipReDownload = false) + public void MarkAsFailed(string downloadId, bool skipRedownload = false) { var history = _historyService.Find(downloadId, EntityHistoryEventType.Grabbed); @@ -54,7 +54,7 @@ namespace NzbDrone.Core.Download { var trackedDownload = _trackedDownloadService.Find(downloadId); - PublishDownloadFailedEvent(history, "Manually marked as failed", trackedDownload, skipReDownload); + PublishDownloadFailedEvent(history, "Manually marked as failed", trackedDownload, skipRedownload); } } @@ -114,7 +114,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(); @@ -129,7 +129,7 @@ namespace NzbDrone.Core.Download Message = message, Data = historyItem.Data, TrackedDownload = trackedDownload, - SkipReDownload = skipReDownload + SkipRedownload = skipRedownload }; _eventAggregator.PublishEvent(downloadFailedEvent); diff --git a/src/NzbDrone.Core/Download/RedownloadFailedDownloadService.cs b/src/NzbDrone.Core/Download/RedownloadFailedDownloadService.cs index 01efe79b2..6ddcafe78 100644 --- a/src/NzbDrone.Core/Download/RedownloadFailedDownloadService.cs +++ b/src/NzbDrone.Core/Download/RedownloadFailedDownloadService.cs @@ -29,7 +29,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/NzbDrone.Core/Localization/Core/en.json b/src/NzbDrone.Core/Localization/Core/en.json index 94fc3d8e8..562588b04 100644 --- a/src/NzbDrone.Core/Localization/Core/en.json +++ b/src/NzbDrone.Core/Localization/Core/en.json @@ -825,8 +825,8 @@ "SkipFreeSpaceCheckWhenImportingHelpText": "Use when Readarr is unable to detect free space from your author root folder", "SkipPartBooksAndSets": "Skip part books and sets", "SkipRedownload": "Skip Redownload", + "SkipRedownloadHelpText": "Prevents Readarr from trying download alternative releases for the removed items", "SkipSecondarySeriesBooks": "Skip secondary series books", - "SkipredownloadHelpText": "Prevents Readarr from trying download alternative releases for the removed items", "SmartReplace": "Smart Replace", "SorryThatAuthorCannotBeFound": "Sorry, that author cannot be found.", "SorryThatBookCannotBeFound": "Sorry, that book cannot be found.", diff --git a/src/Readarr.Api.V1/Queue/QueueController.cs b/src/Readarr.Api.V1/Queue/QueueController.cs index 02416e568..87606ef6d 100644 --- a/src/Readarr.Api.V1/Queue/QueueController.cs +++ b/src/Readarr.Api.V1/Queue/QueueController.cs @@ -69,9 +69,9 @@ namespace Readarr.Api.V1.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 trackedDownload = Remove(id, removeFromClient, blocklist, skipReDownload); + var trackedDownload = Remove(id, removeFromClient, blocklist, skipRedownload); if (trackedDownload != null) { @@ -80,13 +80,13 @@ namespace Readarr.Api.V1.Queue } [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(); foreach (var id in resource.Ids) { - var trackedDownload = Remove(id, removeFromClient, blocklist, skipReDownload); + var trackedDownload = Remove(id, removeFromClient, blocklist, skipRedownload); if (trackedDownload != null) { @@ -205,7 +205,7 @@ namespace Readarr.Api.V1.Queue } } - private TrackedDownload Remove(int id, bool removeFromClient, bool blocklist, bool skipReDownload) + private TrackedDownload Remove(int id, bool removeFromClient, bool blocklist, bool skipRedownload) { var pendingRelease = _pendingReleaseService.FindPendingQueueItem(id); @@ -238,7 +238,7 @@ namespace Readarr.Api.V1.Queue if (blocklist) { - _failedDownloadService.MarkAsFailed(trackedDownload.DownloadItem.DownloadId, skipReDownload); + _failedDownloadService.MarkAsFailed(trackedDownload.DownloadItem.DownloadId, skipRedownload); } if (!removeFromClient && !blocklist) diff --git a/src/Readarr.Api.V1/openapi.json b/src/Readarr.Api.V1/openapi.json index dc46b2d99..49ef651f4 100644 --- a/src/Readarr.Api.V1/openapi.json +++ b/src/Readarr.Api.V1/openapi.json @@ -6190,7 +6190,7 @@ } }, { - "name": "skipReDownload", + "name": "skipRedownload", "in": "query", "schema": { "type": "boolean", @@ -6228,7 +6228,7 @@ } }, { - "name": "skipReDownload", + "name": "skipRedownload", "in": "query", "schema": { "type": "boolean",