Merge branch 'main' into add_cleanup_on_no_hardlinks

code/Common/Configuration/ContentBlocker/ContentBlockerConfig.cs

@@ -2,7 +2,7 @@
 
 namespace Common.Configuration.ContentBlocker;
 
-public sealed record ContentBlockerConfig : IJobConfig
+public sealed record ContentBlockerConfig : IJobConfig, IIgnoredDownloadsConfig
 {
     public const string SectionName = "ContentBlocker";
     
@@ -13,6 +13,9 @@ public sealed record ContentBlockerConfig : IJobConfig
     
     [ConfigurationKeyName("DELETE_PRIVATE")]
     public bool DeletePrivate { get; init; }
+
+    [ConfigurationKeyName("IGNORED_DOWNLOADS_PATH")]
+    public string? IgnoredDownloadsPath { get; init; }
     
     public void Validate()
     {

code/Common/Configuration/DownloadCleaner/DownloadCleanerConfig.cs

@@ -1,9 +1,9 @@
-using Common.Exceptions;
+using Common.Exceptions;
 using Microsoft.Extensions.Configuration;
 
 namespace Common.Configuration.DownloadCleaner;
 
-public sealed record DownloadCleanerConfig : IJobConfig
+public sealed record DownloadCleanerConfig : IJobConfig, IIgnoredDownloadsConfig
 {
     public const string SectionName = "DownloadCleaner";
     
@@ -13,6 +13,9 @@ public sealed record DownloadCleanerConfig : IJobConfig
 
     [ConfigurationKeyName("DELETE_PRIVATE")]
     public bool DeletePrivate { get; init; }
+    
+    [ConfigurationKeyName("IGNORED_DOWNLOADS_PATH")]
+    public string? IgnoredDownloadsPath { get; init; }
 
     [ConfigurationKeyName("NO_HL_CATEGORY")]
     public string NoHardLinksCategory { get; init; } = "";

code/Common/Configuration/DownloadClient/DelugeConfig.cs

@@ -1,4 +1,5 @@
-using Common.Exceptions;
+using Common.Exceptions;
+using Microsoft.Extensions.Configuration;
 
 namespace Common.Configuration.DownloadClient;
 
@@ -8,6 +9,9 @@ public sealed record DelugeConfig : IConfig
     
     public Uri? Url { get; init; }
     
+    [ConfigurationKeyName("URL_BASE")]
+    public string UrlBase { get; init; } = string.Empty;
+    
     public string? Password { get; init; }
     
     public void Validate()

code/Common/Configuration/DownloadClient/QBitConfig.cs

@@ -1,4 +1,5 @@
-using Common.Exceptions;
+using Common.Exceptions;
+using Microsoft.Extensions.Configuration;
 
 namespace Common.Configuration.DownloadClient;
 
@@ -8,6 +9,9 @@ public sealed class QBitConfig : IConfig
     
     public Uri? Url { get; init; }
     
+    [ConfigurationKeyName("URL_BASE")]
+    public string UrlBase { get; init; } = string.Empty;
+    
     public string? Username { get; init; }
     
     public string? Password { get; init; }

code/Common/Configuration/DownloadClient/TransmissionConfig.cs

@@ -1,4 +1,5 @@
-using Common.Exceptions;
+using Common.Exceptions;
+using Microsoft.Extensions.Configuration;
 
 namespace Common.Configuration.DownloadClient;
 
@@ -8,6 +9,9 @@ public record TransmissionConfig : IConfig
     
     public Uri? Url { get; init; }
     
+    [ConfigurationKeyName("URL_BASE")]
+    public string UrlBase { get; init; } = "transmission";
+    
     public string? Username { get; init; }
     
     public string? Password { get; init; }

code/Common/Configuration/IIgnoredDownloadsConfig.cs

@@ -0,0 +1,6 @@
+namespace Common.Configuration;
+
+public interface IIgnoredDownloadsConfig
+{
+    string? IgnoredDownloadsPath { get; }
+}

code/Common/Configuration/QueueCleaner/QueueCleanerConfig.cs

@@ -1,8 +1,9 @@
-using Microsoft.Extensions.Configuration;
+using Common.Exceptions;
+using Microsoft.Extensions.Configuration;
 
 namespace Common.Configuration.QueueCleaner;
 
-public sealed record QueueCleanerConfig : IJobConfig
+public sealed record QueueCleanerConfig : IJobConfig, IIgnoredDownloadsConfig
 {
     public const string SectionName = "QueueCleaner";
     
@@ -10,6 +11,9 @@ public sealed record QueueCleanerConfig : IJobConfig
     
     public required bool RunSequentially { get; init; }
     
+    [ConfigurationKeyName("IGNORED_DOWNLOADS_PATH")]
+    public string? IgnoredDownloadsPath { get; init; }
+    
     [ConfigurationKeyName("IMPORT_FAILED_MAX_STRIKES")]
     public ushort ImportFailedMaxStrikes { get; init; }
     
@@ -36,5 +40,14 @@ public sealed record QueueCleanerConfig : IJobConfig
 
     public void Validate()
     {
+        if (ImportFailedMaxStrikes is > 0 and < 3)
+        {
+            throw new ValidationException("the minimum value for IMPORT_FAILED_MAX_STRIKES must be 3");
+        }
+
+        if (StalledMaxStrikes is > 0 and < 3)
+        {
+            throw new ValidationException("the minimum value for STALLED_MAX_STRIKES must be 3");
+        }
     }
 }

code/Common/Enums/DownloadClient.cs

@@ -5,5 +5,6 @@ public enum DownloadClient
     QBittorrent,
     Deluge,
     Transmission,
-    None
+    None,
+    Disabled
 }