Fix typo in SkipRedownload

This commit is contained in:
Bogdan
2023-07-13 23:40:04 +03:00
parent 63f9196370
commit 6ecab2d84b
10 changed files with 64 additions and 62 deletions
+6 -6
View File
@@ -60,9 +60,9 @@ namespace Lidarr.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)
{
@@ -71,13 +71,13 @@ namespace Lidarr.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<string>();
foreach (var id in resource.Ids)
{
var trackedDownload = Remove(id, removeFromClient, blocklist, skipReDownload);
var trackedDownload = Remove(id, removeFromClient, blocklist, skipRedownload);
if (trackedDownload != null)
{
@@ -195,7 +195,7 @@ namespace Lidarr.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);
@@ -227,7 +227,7 @@ namespace Lidarr.Api.V1.Queue
if (blocklist)
{
_failedDownloadService.MarkAsFailed(trackedDownload.DownloadItem.DownloadId, skipReDownload);
_failedDownloadService.MarkAsFailed(trackedDownload.DownloadItem.DownloadId, skipRedownload);
}
if (!removeFromClient && !blocklist)
@@ -33,7 +33,7 @@ namespace NzbDrone.Core.Test.Download
{
ArtistId = 1,
AlbumIds = new List<int> { 1 },
SkipReDownload = true
SkipRedownload = true
};
Subject.Handle(failedEvent);
@@ -21,6 +21,6 @@ namespace NzbDrone.Core.Download
public string Message { get; set; }
public Dictionary<string, string> Data { get; set; }
public TrackedDownload TrackedDownload { get; set; }
public bool SkipReDownload { get; set; }
public bool SkipRedownload { get; set; }
}
}
@@ -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<EntityHistory> { history }, "Manually marked as failed", skipReDownload: skipReDownload);
PublishDownloadFailedEvent(new List<EntityHistory> { 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<EntityHistory> historyItems, string message, TrackedDownload trackedDownload = null, bool skipReDownload = false)
private void PublishDownloadFailedEvent(List<EntityHistory> 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);
@@ -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;
+4 -2
View File
@@ -743,12 +743,14 @@
"RemoveFilter": "Remove filter",
"RemoveFromBlocklist": "Remove from blocklist",
"RemoveFromDownloadClient": "Remove From Download Client",
"RemoveFromDownloadClientHelpTextWarning": "Removing will remove the download and the file(s) from the download client.",
"RemoveFromQueue": "Remove from queue",
"RemoveHelpTextWarning": "Removing will remove the download and the file(s) from the download client.",
"RemoveSelected": "Remove Selected",
"RemoveSelectedItem": "Remove Selected Item",
"RemoveSelectedItemBlocklistMessageText": "Are you sure you want to remove the selected items from the blocklist?",
"RemoveSelectedItemQueueMessageText": "Are you sure you want to remove 1 item from the queue?",
"RemoveSelectedItems": "Remove Selected Items",
"RemoveSelectedItemsQueueMessageText": "Are you sure you want to remove {0} items from the queue?",
"RemoveTagExistingTag": "Existing tag",
"RemoveTagRemovingTag": "Removing tag",
"RemovedFromTaskQueue": "Removed from task queue",
@@ -876,7 +878,7 @@
"SkipFreeSpaceCheck": "Skip Free Space Check",
"SkipFreeSpaceCheckWhenImportingHelpText": "Use when Lidarr is unable to detect free space from your artist root folder",
"SkipRedownload": "Skip Redownload",
"SkipredownloadHelpText": "Prevents Lidarr from trying download alternative releases for the removed items",
"SkipRedownloadHelpText": "Prevents Lidarr from trying download alternative releases for the removed items",
"SmartReplace": "Smart Replace",
"SomeResultsFiltered": "Some results are hidden by the applied filter",
"SorryThatAlbumCannotBeFound": "Sorry, that album cannot be found.",