1
0
mirror of https://github.com/Sonarr/Sonarr.git synced 2026-04-17 21:26:13 -04:00

Compare commits

...

2 Commits

Author SHA1 Message Date
Stevie Robinson
6f1fc1686f Fixed: Don't return warning in title field for rejected downloads
Closes #7663
2025-02-22 12:42:35 -08:00
Stevie Robinson
b7407837b7 Fixed: Rejected Imports with no associated release or indexer 2025-02-22 12:40:49 -08:00

View File

@@ -1,4 +1,3 @@
using System.Collections.Generic;
using System.Linq; using System.Linq;
using NzbDrone.Core.Download.TrackedDownloads; using NzbDrone.Core.Download.TrackedDownloads;
using NzbDrone.Core.Indexers; using NzbDrone.Core.Indexers;
@@ -22,7 +21,7 @@ public class RejectedImportService : IRejectedImportService
public bool Process(TrackedDownload trackedDownload, ImportResult importResult) public bool Process(TrackedDownload trackedDownload, ImportResult importResult)
{ {
if (importResult.Result != ImportResultType.Rejected || importResult.ImportDecision.LocalEpisode == null) if (importResult.Result != ImportResultType.Rejected || importResult.ImportDecision.LocalEpisode == null || trackedDownload.RemoteEpisode?.Release == null)
{ {
return false; return false;
} }
@@ -30,6 +29,12 @@ public class RejectedImportService : IRejectedImportService
var indexerSettings = _cachedIndexerSettingsProvider.GetSettings(trackedDownload.RemoteEpisode.Release.IndexerId); var indexerSettings = _cachedIndexerSettingsProvider.GetSettings(trackedDownload.RemoteEpisode.Release.IndexerId);
var rejectionReason = importResult.ImportDecision.Rejections.FirstOrDefault()?.Reason; var rejectionReason = importResult.ImportDecision.Rejections.FirstOrDefault()?.Reason;
if (indexerSettings == null)
{
trackedDownload.Warn(new TrackedDownloadStatusMessage(trackedDownload.DownloadItem.Title, importResult.Errors));
return true;
}
if (rejectionReason == ImportRejectionReason.DangerousFile && if (rejectionReason == ImportRejectionReason.DangerousFile &&
indexerSettings.FailDownloads.Contains(FailDownloads.PotentiallyDangerous)) indexerSettings.FailDownloads.Contains(FailDownloads.PotentiallyDangerous))
{ {
@@ -42,7 +47,7 @@ public class RejectedImportService : IRejectedImportService
} }
else else
{ {
trackedDownload.Warn(new TrackedDownloadStatusMessage(importResult.Errors.First(), new List<string>())); trackedDownload.Warn(new TrackedDownloadStatusMessage(trackedDownload.DownloadItem.Title, importResult.Errors));
} }
return true; return true;