mirror/Lidarr
1
0
Fork 0
mirror of https://github.com/lidarr/Lidarr synced 2025-01-03 13:34:54 +00:00
Code Issues Releases Wiki Activity

Fixed: Ensure first history item when marked as failed is the selected item

Browse source 
(cherry picked from commit cf48bf304122bacc597de1d4d4429065d2358fa8)

Closes #3557
This commit is contained in:
Mark McDowall 2023-04-21 17:45:21 -07:00 committed by Bogdan
parent cf33d433a4
commit 1775dc9fa8
1 changed files with 16 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/NzbDrone.Core/Download/FailedDownloadService.cs
View file

@ -40,12 +40,23 @@ public void MarkAsFailed(int historyId, bool skipRedownload = false)
if (downloadId.IsNullOrWhiteSpace()) 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);
return;
} }
else
var grabbedHistory = new List<EntityHistory>();
// If the history item is a grabbed item (it should be, at least from the UI) add it as the first history item
if (history.EventType == EntityHistoryEventType.Grabbed)
{ {
var grabbedHistory = _historyService.Find(downloadId, EntityHistoryEventType.Grabbed).ToList(); grabbedHistory.Add(history);
PublishDownloadFailedEvent(grabbedHistory, "Manually marked as failed");
} }
// Add any other history items for the download ID then filter out any duplicate history items.
grabbedHistory.AddRange(_historyService.Find(downloadId, EntityHistoryEventType.Grabbed));
grabbedHistory = grabbedHistory.DistinctBy(h => h.Id).ToList();
PublishDownloadFailedEvent(grabbedHistory, "Manually marked as failed");
} }
public void MarkAsFailed(string downloadId, bool skipRedownload = false) public void MarkAsFailed(string downloadId, bool skipRedownload = false)
@ -56,7 +67,7 @@ public void MarkAsFailed(string downloadId, bool skipRedownload = false)
{ {
var trackedDownload = _trackedDownloadService.Find(downloadId); var trackedDownload = _trackedDownloadService.Find(downloadId);
PublishDownloadFailedEvent(history, "Manually marked as failed", trackedDownload, skipRedownload); PublishDownloadFailedEvent(history, "Manually marked as failed", trackedDownload, skipRedownload: skipRedownload);
} }
} }
@ -124,7 +135,7 @@ private void PublishDownloadFailedEvent(List<EntityHistory> historyItems, string
var downloadFailedEvent = new DownloadFailedEvent var downloadFailedEvent = new DownloadFailedEvent
{ {
ArtistId = historyItem.ArtistId, ArtistId = historyItem.ArtistId,
AlbumIds = historyItems.Select(h => h.AlbumId).ToList(), AlbumIds = historyItems.Select(h => h.AlbumId).Distinct().ToList(),
Quality = historyItem.Quality, Quality = historyItem.Quality,
SourceTitle = historyItem.SourceTitle, SourceTitle = historyItem.SourceTitle,
DownloadClient = historyItem.Data.GetValueOrDefault(EntityHistory.DOWNLOAD_CLIENT), DownloadClient = historyItem.Data.GetValueOrDefault(EntityHistory.DOWNLOAD_CLIENT),