Archive-Team
/
sonarr-repo-only
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

This commit is contained in:
Mark McDowall 2023-04-21 17:45:21 -07:00
parent 6fe5573298
commit cf48bf3041
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/NzbDrone.Core/Download/FailedDownloadService.cs
View File

@ -38,12 +38,23 @@ namespace NzbDrone.Core.Download
if (downloadId.IsNullOrWhiteSpace()) if (downloadId.IsNullOrWhiteSpace())
{ {
PublishDownloadFailedEvent(new List<EpisodeHistory> { history }, "Manually marked as failed"); PublishDownloadFailedEvent(new List<EpisodeHistory> { history }, "Manually marked as failed");
return;
} }
else
var grabbedHistory = new List<EpisodeHistory>();
// 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 == EpisodeHistoryEventType.Grabbed)
{ {
var grabbedHistory = _historyService.Find(downloadId, EpisodeHistoryEventType.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, EpisodeHistoryEventType.Grabbed));
grabbedHistory = grabbedHistory.DistinctBy(h => h.Id).ToList();
PublishDownloadFailedEvent(grabbedHistory, "Manually marked as failed");
} }
public void MarkAsFailed(string downloadId) public void MarkAsFailed(string downloadId)
@ -121,7 +132,7 @@ namespace NzbDrone.Core.Download
var downloadFailedEvent = new DownloadFailedEvent var downloadFailedEvent = new DownloadFailedEvent
{ {
SeriesId = historyItem.SeriesId, SeriesId = historyItem.SeriesId,
EpisodeIds = historyItems.Select(h => h.EpisodeId).ToList(), EpisodeIds = historyItems.Select(h => h.EpisodeId).Distinct().ToList(),
Quality = historyItem.Quality, Quality = historyItem.Quality,
SourceTitle = historyItem.SourceTitle, SourceTitle = historyItem.SourceTitle,
DownloadClient = historyItem.Data.GetValueOrDefault(EpisodeHistory.DOWNLOAD_CLIENT), DownloadClient = historyItem.Data.GetValueOrDefault(EpisodeHistory.DOWNLOAD_CLIENT),