Fix content blocker env var usage (#44)

README.md

@@ -221,13 +221,13 @@ services:
 | RADARR__ENABLED | No | Enable or disable Radarr cleanup  | false |
 | RADARR__BLOCK__TYPE | No | Block type<br>Can be `blacklist` or `whitelist` | `blacklist` |
 | RADARR__BLOCK__PATH | No | Path to the blocklist (local file or url)<br>Needs to be json compatible | empty |
-| RADARR__INSTANCES__0__URL | No | First Radarr instance url | http://localhost:8989 |
+| RADARR__INSTANCES__0__URL | No | First Radarr instance url | http://localhost:7878 |
 | RADARR__INSTANCES__0__APIKEY | No | First Radarr instance API key | empty |
 |||||
 | LIDARR__ENABLED | No | Enable or disable LIDARR cleanup  | false |
 | LIDARR__BLOCK__TYPE | No | Block type<br>Can be `blacklist` or `whitelist` | `blacklist` |
 | LIDARR__BLOCK__PATH | No | Path to the blocklist (local file or url)<br>Needs to be json compatible | empty |
-| LIDARR__INSTANCES__0__URL | No | First LIDARR instance url | http://localhost:8989 |
+| LIDARR__INSTANCES__0__URL | No | First LIDARR instance url | http://localhost:8686 |
 | LIDARR__INSTANCES__0__APIKEY | No | First LIDARR instance API key | empty |
 </details>
 

code/Executable/DependencyInjection/LoggingDI.cs

@@ -29,8 +29,8 @@ public static class LoggingDI
         
         LoggerConfiguration logConfig = new();
         const string jobNameTemplate = "{#if JobName is not null} {Concat('[',JobName,']'),JOB_PAD}{#end}";
-        const string instanceNameTemplate = "{#if InstanceName is not null} {Concat('[',InstanceName,']'),ARR_PAD}";
+        const string instanceNameTemplate = "{#if InstanceName is not null} {Concat('[',InstanceName,']'),ARR_PAD}{#end}";
-        const string consoleOutputTemplate = $"[{{@t:yyyy-MM-dd HH:mm:ss.fff}} {{@l:u3}}]{jobNameTemplate}{instanceNameTemplate}{{#end}} {{@m}}\n{{@x}}";
+        const string consoleOutputTemplate = $"[{{@t:yyyy-MM-dd HH:mm:ss.fff}} {{@l:u3}}]{jobNameTemplate}{instanceNameTemplate} {{@m}}\n{{@x}}";
         const string fileOutputTemplate = $"{{@t:yyyy-MM-dd HH:mm:ss.fff zzz}} [{{@l:u3}}]{jobNameTemplate}{instanceNameTemplate} {{@m:lj}}\n{{@x}}";
         LogEventLevel level = LogEventLevel.Information;
         List<string> names = [nameof(ContentBlocker), nameof(QueueCleaner)];

code/Infrastructure/Verticals/DownloadClient/Deluge/DelugeService.cs

@@ -20,9 +20,10 @@ public sealed class DelugeService : DownloadServiceBase
         IOptions<DelugeConfig> config,
         IHttpClientFactory httpClientFactory,
         IOptions<QueueCleanerConfig> queueCleanerConfig,
+        IOptions<ContentBlockerConfig> contentBlockerConfig,
         FilenameEvaluator filenameEvaluator,
         Striker striker
-    ) : base(logger, queueCleanerConfig, filenameEvaluator, striker)
+    ) : base(logger, queueCleanerConfig, contentBlockerConfig, filenameEvaluator, striker)
     {
         config.Value.Validate();
         _client = new (config, httpClientFactory);
@@ -92,7 +93,7 @@ public sealed class DelugeService : DownloadServiceBase
             return false;
         }
         
-        if (_queueCleanerConfig.StalledIgnorePrivate && status.Private)
+        if (_contentBlockerConfig.IgnorePrivate && status.Private)
         {
             // ignore private trackers
             _logger.LogDebug("skip files check | download is private | {name}", status.Name);

code/Infrastructure/Verticals/DownloadClient/DownloadServiceBase.cs

@@ -14,18 +14,21 @@ public abstract class DownloadServiceBase : IDownloadService
 {
     protected readonly ILogger<DownloadServiceBase> _logger;
     protected readonly QueueCleanerConfig _queueCleanerConfig;
+    protected readonly ContentBlockerConfig _contentBlockerConfig;
     protected readonly FilenameEvaluator _filenameEvaluator;
     protected readonly Striker _striker;
     
     protected DownloadServiceBase(
         ILogger<DownloadServiceBase> logger,
         IOptions<QueueCleanerConfig> queueCleanerConfig,
+        IOptions<ContentBlockerConfig> contentBlockerConfig,
         FilenameEvaluator filenameEvaluator,
         Striker striker
     )
     {
         _logger = logger;
         _queueCleanerConfig = queueCleanerConfig.Value;
+        _contentBlockerConfig = contentBlockerConfig.Value;
         _filenameEvaluator = filenameEvaluator;
         _striker = striker;
     }

code/Infrastructure/Verticals/DownloadClient/DummyDownloadService.cs

@@ -11,7 +11,7 @@ namespace Infrastructure.Verticals.DownloadClient;
 
 public sealed class DummyDownloadService : DownloadServiceBase
 {
-    public DummyDownloadService(ILogger<DownloadServiceBase> logger, IOptions<QueueCleanerConfig> queueCleanerConfig, FilenameEvaluator filenameEvaluator, Striker striker) : base(logger, queueCleanerConfig, filenameEvaluator, striker)
+    public DummyDownloadService(ILogger<DownloadServiceBase> logger, IOptions<QueueCleanerConfig> queueCleanerConfig, IOptions<ContentBlockerConfig> contentBlockerConfig, FilenameEvaluator filenameEvaluator, Striker striker) : base(logger, queueCleanerConfig, contentBlockerConfig, filenameEvaluator, striker)
     {
     }
 

code/Infrastructure/Verticals/DownloadClient/QBittorrent/QBitService.cs

@@ -22,9 +22,10 @@ public sealed class QBitService : DownloadServiceBase
         IHttpClientFactory httpClientFactory,
         IOptions<QBitConfig> config,
         IOptions<QueueCleanerConfig> queueCleanerConfig,
+        IOptions<ContentBlockerConfig> contentBlockerConfig,
         FilenameEvaluator filenameEvaluator,
         Striker striker
-    ) : base(logger, queueCleanerConfig, filenameEvaluator, striker)
+    ) : base(logger, queueCleanerConfig, contentBlockerConfig, filenameEvaluator, striker)
     {
         _config = config.Value;
         _config.Validate();
@@ -116,7 +117,7 @@ public sealed class QBitService : DownloadServiceBase
                          bool.TryParse(dictValue?.ToString(), out bool boolValue)
                          && boolValue;
 
-        if (_queueCleanerConfig.StalledIgnorePrivate && isPrivate)
+        if (_contentBlockerConfig.IgnorePrivate && isPrivate)
         {
             // ignore private trackers
             _logger.LogDebug("skip files check | download is private | {name}", torrent.Name);

code/Infrastructure/Verticals/DownloadClient/Transmission/TransmissionService.cs

@@ -25,9 +25,10 @@ public sealed class TransmissionService : DownloadServiceBase
         ILogger<TransmissionService> logger,
         IOptions<TransmissionConfig> config,
         IOptions<QueueCleanerConfig> queueCleanerConfig,
+        IOptions<ContentBlockerConfig> contentBlockerConfig,
         FilenameEvaluator filenameEvaluator,
         Striker striker
-    ) : base(logger, queueCleanerConfig, filenameEvaluator, striker)
+    ) : base(logger, queueCleanerConfig, contentBlockerConfig, filenameEvaluator, striker)
     {
         _config = config.Value;
         _config.Validate();
@@ -95,7 +96,7 @@ public sealed class TransmissionService : DownloadServiceBase
             return false;
         }
         
-        if (_queueCleanerConfig.StalledIgnorePrivate && (torrent.IsPrivate ?? false))
+        if (_contentBlockerConfig.IgnorePrivate && (torrent.IsPrivate ?? false))
         {
             // ignore private trackers
             _logger.LogDebug("skip files check | download is private | {name}", torrent.Name);