Merge branch 'main' into add_cleanup_on_no_hardlinks

code/Executable/DependencyInjection/QuartzDI.cs

@@ -55,7 +55,7 @@ public static class QuartzDI
         if (contentBlockerConfig?.Enabled is true && queueCleanerConfig is { Enabled: true, RunSequentially: true })
         {
             q.AddJob<QueueCleaner>(queueCleanerConfig, string.Empty);
-            q.AddJobListener(new JobChainingListener(nameof(QueueCleaner)));
+            q.AddJobListener(new JobChainingListener(nameof(ContentBlocker), nameof(QueueCleaner)));
         }
         else
         {

code/Executable/DependencyInjection/ServicesDI.cs

@@ -1,4 +1,8 @@
-using Infrastructure.Interceptors;
+using Common.Configuration.ContentBlocker;
+using Common.Configuration.DownloadCleaner;
+using Common.Configuration.QueueCleaner;
+using Infrastructure.Interceptors;
+using Infrastructure.Providers;
 using Infrastructure.Verticals.Arr;
 using Infrastructure.Verticals.ContentBlocker;
 using Infrastructure.Verticals.DownloadCleaner;
@@ -34,5 +38,8 @@ public static class ServicesDI
             .AddTransient<ArrQueueIterator>()
             .AddTransient<DownloadServiceFactory>()
             .AddSingleton<BlocklistProvider>()
-            .AddSingleton<IStriker, Striker>();
+            .AddSingleton<IStriker, Striker>()
+            .AddSingleton<IgnoredDownloadsProvider<QueueCleanerConfig>>()
+            .AddSingleton<IgnoredDownloadsProvider<ContentBlockerConfig>>()
+            .AddSingleton<IgnoredDownloadsProvider<DownloadCleanerConfig>>();
 }

code/Executable/appsettings.Development.json

@@ -18,11 +18,13 @@
   "ContentBlocker": {
     "Enabled": true,
     "IGNORE_PRIVATE": true,
-    "DELETE_PRIVATE": false
+    "DELETE_PRIVATE": false,
+    "IGNORED_DOWNLOADS_PATH": "../test/data/cleanuperr/ignored_downloads"
   },
   "QueueCleaner": {
     "Enabled": true,
     "RunSequentially": true,
+    "IGNORED_DOWNLOADS_PATH": "../test/data/cleanuperr/ignored_downloads",
     "IMPORT_FAILED_MAX_STRIKES": 5,
     "IMPORT_FAILED_IGNORE_PRIVATE": true,
     "IMPORT_FAILED_DELETE_PRIVATE": false,
@@ -45,6 +47,7 @@
         "MAX_SEED_TIME": -1
       }
     ],
+    "IGNORED_DOWNLOADS_PATH": "../test/data/cleanuperr/ignored_downloads",
     "NO_HL_CATEGORY": "nohardlinks",
     "NO_HL_IGNORE_ROOT_DIR": false,
     "NO_HL_CATEGORIES": [
@@ -55,15 +58,18 @@
   "DOWNLOAD_CLIENT": "qbittorrent",
   "qBittorrent": {
     "Url": "http://localhost:8080",
+    "URL_BASE": "",
     "Username": "test",
     "Password": "testing"
   },
   "Deluge": {
     "Url": "http://localhost:8112",
+    "URL_BASE": "",
     "Password": "testing"
   },
   "Transmission": {
     "Url": "http://localhost:9091",
+    "URL_BASE": "transmission",
     "Username": "test",
     "Password": "testing"
   },

code/Executable/appsettings.json

@@ -17,11 +17,13 @@
   },
   "ContentBlocker": {
     "Enabled": false,
-    "IGNORE_PRIVATE": false
+    "IGNORE_PRIVATE": false,
+    "IGNORED_DOWNLOADS_PATH": ""
   },
   "QueueCleaner": {
     "Enabled": true,
     "RunSequentially": true,
+    "IGNORED_DOWNLOADS_PATH": "",
     "IMPORT_FAILED_MAX_STRIKES": 0,
     "IMPORT_FAILED_IGNORE_PRIVATE": false,
     "IMPORT_FAILED_DELETE_PRIVATE": false,
@@ -34,20 +36,24 @@
   "DownloadCleaner": {
     "Enabled": false,
     "DELETE_PRIVATE": false,
-    "CATEGORIES": []
+    "CATEGORIES": [],
+    "IGNORED_DOWNLOADS_PATH": ""
   },
   "DOWNLOAD_CLIENT": "none",
   "qBittorrent": {
     "Url": "http://localhost:8080",
+    "URL_BASE": "",
     "Username": "",
     "Password": ""
   },
   "Deluge": {
     "Url": "http://localhost:8112",
+    "URL_BASE": "",
     "Password": "testing"
   },
   "Transmission": {
     "Url": "http://localhost:9091",
+    "URL_BASE": "transmission",
     "Username": "test",
     "Password": "testing"
   },