Fixed: Reprocessing items that were previously blocked during importing

(cherry picked from commit bce848facf8aeaeac6a1d59c92941d00589034a4)

azure-pipelines.yml

@@ -20,7 +20,7 @@ variables:
   innoVersion: '6.2.0'
   windowsImage: 'windows-2022'
   linuxImage: 'ubuntu-20.04'
-  macImage: 'macOS-12'
+  macImage: 'macOS-11'
 
 trigger:
   branches:

src/NzbDrone.Core/Download/FailedDownloadService.cs

@@ -62,8 +62,8 @@ namespace NzbDrone.Core.Download
 
         public void Check(TrackedDownload trackedDownload)
         {
-            // Only process tracked downloads that are still downloading
+            // Only process tracked downloads that are still downloading or import is blocked (if they fail after attempting to be processed)
-            if (trackedDownload.State != TrackedDownloadState.Downloading)
+            if (trackedDownload.State != TrackedDownloadState.Downloading && trackedDownload.State != TrackedDownloadState.ImportBlocked)
             {
                 return;
             }

src/NzbDrone.Core/Download/TrackedDownloads/DownloadMonitoringService.cs

@@ -115,7 +115,7 @@ namespace NzbDrone.Core.Download.TrackedDownloads
             {
                 var trackedDownload = _trackedDownloadService.TrackDownload((DownloadClientDefinition)downloadClient.Definition, downloadItem);
 
-                if (trackedDownload != null && trackedDownload.State == TrackedDownloadState.Downloading)
+                if (trackedDownload is { State: TrackedDownloadState.Downloading or TrackedDownloadState.ImportBlocked })
                 {
                     _failedDownloadService.Check(trackedDownload);
                     _completedDownloadService.Check(trackedDownload);

src/NzbDrone.Core/Housekeeping/Housekeepers/TrimLogDatabase.cs

@@ -1,26 +1,18 @@
-using NzbDrone.Core.Configuration;
+using NzbDrone.Core.Instrumentation;
-using NzbDrone.Core.Instrumentation;
 
 namespace NzbDrone.Core.Housekeeping.Housekeepers
 {
     public class TrimLogDatabase : IHousekeepingTask
     {
         private readonly ILogRepository _logRepo;
-        private readonly IConfigFileProvider _configFileProvider;
 
-        public TrimLogDatabase(ILogRepository logRepo, IConfigFileProvider configFileProvider)
+        public TrimLogDatabase(ILogRepository logRepo)
         {
             _logRepo = logRepo;
-            _configFileProvider = configFileProvider;
         }
 
         public void Clean()
         {
-            if (!_configFileProvider.LogDbEnabled)
-            {
-                return;
-            }
-
             _logRepo.Trim();
         }
     }