mirror of
https://github.com/Sonarr/Sonarr.git
synced 2024-12-14 11:23:42 +02:00
Fixed: Ensure first history item when marked as failed is the selected item
This commit is contained in:
parent
6fe5573298
commit
cf48bf3041
@ -38,12 +38,23 @@ public void MarkAsFailed(int historyId)
|
||||
if (downloadId.IsNullOrWhiteSpace())
|
||||
{
|
||||
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();
|
||||
PublishDownloadFailedEvent(grabbedHistory, "Manually marked as failed");
|
||||
grabbedHistory.Add(history);
|
||||
}
|
||||
|
||||
// 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)
|
||||
@ -121,7 +132,7 @@ private void PublishDownloadFailedEvent(List<EpisodeHistory> historyItems, strin
|
||||
var downloadFailedEvent = new DownloadFailedEvent
|
||||
{
|
||||
SeriesId = historyItem.SeriesId,
|
||||
EpisodeIds = historyItems.Select(h => h.EpisodeId).ToList(),
|
||||
EpisodeIds = historyItems.Select(h => h.EpisodeId).Distinct().ToList(),
|
||||
Quality = historyItem.Quality,
|
||||
SourceTitle = historyItem.SourceTitle,
|
||||
DownloadClient = historyItem.Data.GetValueOrDefault(EpisodeHistory.DOWNLOAD_CLIENT),
|
||||
|
Loading…
Reference in New Issue
Block a user