Add Lidarr support (#30)

2026-05-06 05:44:23 -04:00 · 2025-01-15 23:55:34 +02:00
parent 2bc8e445ce
commit 922f586706
63 changed files with 943 additions and 243 deletions
--- a/code/Executable/DependencyInjection/ConfigurationDI.cs
+++ b/code/Executable/DependencyInjection/ConfigurationDI.cs
@@ -1,10 +1,8 @@
-using Common.Configuration;
-using Common.Configuration.Arr;
+using Common.Configuration.Arr;
 using Common.Configuration.ContentBlocker;
 using Common.Configuration.DownloadClient;
 using Common.Configuration.Logging;
 using Common.Configuration.QueueCleaner;
-using Domain.Enums;

 namespace Executable.DependencyInjection;

@@ -20,5 +18,6 @@ public static class ConfigurationDI
            .Configure<TransmissionConfig>(configuration.GetSection(TransmissionConfig.SectionName))
            .Configure<SonarrConfig>(configuration.GetSection(SonarrConfig.SectionName))
            .Configure<RadarrConfig>(configuration.GetSection(RadarrConfig.SectionName))
+            .Configure<LidarrConfig>(configuration.GetSection(LidarrConfig.SectionName))
            .Configure<LoggingConfig>(configuration.GetSection(LoggingConfig.SectionName));
 }
--- a/code/Executable/DependencyInjection/LoggingDI.cs
+++ b/code/Executable/DependencyInjection/LoggingDI.cs
@@ -1,4 +1,5 @@
 using Common.Configuration.Logging;
+using Domain.Enums;
 using Infrastructure.Verticals.ContentBlocker;
 using Infrastructure.Verticals.QueueCleaner;
 using Serilog;
@@ -27,11 +28,22 @@ public static class LoggingDI
        }
        
        LoggerConfiguration logConfig = new();
-        const string consoleOutputTemplate = "[{@t:yyyy-MM-dd HH:mm:ss.fff} {@l:u3}]{#if JobName is not null} {Concat('[',JobName,']'),PAD}{#end} {@m}\n{@x}";
-        const string fileOutputTemplate = "{@t:yyyy-MM-dd HH:mm:ss.fff zzz} [{@l:u3}]{#if JobName is not null} {Concat('[',JobName,']'),PAD}{#end} {@m:lj}\n{@x}";
+        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 consoleOutputTemplate = $"[{{@t:yyyy-MM-dd HH:mm:ss.fff}} {{@l:u3}}]{jobNameTemplate}{instanceNameTemplate}{{#end}} {{@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> jobNames = [nameof(ContentBlocker), nameof(QueueCleaner)];
-        int padding = jobNames.Max(x => x.Length) + 2;
+        List<string> names = [nameof(ContentBlocker), nameof(QueueCleaner)];
+        int jobPadding = names.Max(x => x.Length) + 2;
+        names = [InstanceType.Sonarr.ToString(), InstanceType.Radarr.ToString(), InstanceType.Lidarr.ToString()];
+        int arrPadding = names.Max(x => x.Length) + 2;
+
+        string consoleTemplate = consoleOutputTemplate
+            .Replace("JOB_PAD", jobPadding.ToString())
+            .Replace("ARR_PAD", arrPadding.ToString());
+        string fileTemplate = fileOutputTemplate
+            .Replace("JOB_PAD", jobPadding.ToString())
+            .Replace("ARR_PAD", arrPadding.ToString());

        if (config is not null)
        {
@@ -41,7 +53,7 @@ public static class LoggingDI
            {
                logConfig.WriteTo.File(
                    path: Path.Combine(config.File.Path, "cleanuperr-.txt"),
-                    formatter: new ExpressionTemplate(fileOutputTemplate.Replace("PAD", padding.ToString())),
+                    formatter: new ExpressionTemplate(fileTemplate),
                    fileSizeLimitBytes: 10L * 1024 * 1024,
                    rollingInterval: RollingInterval.Day,
                    rollOnFileSizeLimit: true
@@ -55,7 +67,7 @@ public static class LoggingDI
            .MinimumLevel.Override("Microsoft.Extensions.Http", LogEventLevel.Warning)
            .MinimumLevel.Override("Quartz", LogEventLevel.Warning)
            .MinimumLevel.Override("System.Net.Http.HttpClient", LogEventLevel.Error)
-            .WriteTo.Console(new ExpressionTemplate(consoleOutputTemplate.Replace("PAD", padding.ToString())))
+            .WriteTo.Console(new ExpressionTemplate(consoleTemplate))
            .Enrich.FromLogContext()
            .Enrich.WithProperty("ApplicationName", "cleanuperr")
            .CreateLogger();
--- a/code/Executable/DependencyInjection/ServicesDI.cs
+++ b/code/Executable/DependencyInjection/ServicesDI.cs
@@ -15,6 +15,7 @@ public static class ServicesDI
        services
            .AddTransient<SonarrClient>()
            .AddTransient<RadarrClient>()
+            .AddTransient<LidarrClient>()
            .AddTransient<QueueCleaner>()
            .AddTransient<ContentBlocker>()
            .AddTransient<FilenameEvaluator>()
--- a/code/Executable/appsettings.Development.json
+++ b/code/Executable/appsettings.Development.json
@@ -15,15 +15,7 @@
  },
  "ContentBlocker": {
    "Enabled": true,
-    "IGNORE_PRIVATE": true,
-    "Blacklist": {
-      "Enabled": false,
-      "Path": "https://raw.githubusercontent.com/flmorg/cleanuperr/refs/heads/main/blacklist"
-    },
-    "Whitelist": {
-      "Enabled": false,
-      "Path": "https://raw.githubusercontent.com/flmorg/cleanuperr/refs/heads/main/whitelist"
-    }
+    "IGNORE_PRIVATE": true
  },
  "QueueCleaner": {
    "Enabled": true,
@@ -54,19 +46,40 @@
  "Sonarr": {
    "Enabled": true,
    "SearchType": "Episode",
+    "Block": {
+      "Type": "blacklist",
+      "Path": "https://raw.githubusercontent.com/flmorg/cleanuperr/refs/heads/main/blacklist"
+    },
    "Instances": [
      {
        "Url": "http://localhost:8989",
-        "ApiKey": "96736c3eb3144936b8f1d62d27be8cee"
+        "ApiKey": "425d1e713f0c405cbbf359ac0502c1f4"
      }
    ]
  },
  "Radarr": {
    "Enabled": true,
+    "Block": {
+      "Type": "blacklist",
+      "Path": "https://raw.githubusercontent.com/flmorg/cleanuperr/refs/heads/main/blacklist"
+    },
    "Instances": [
      {
        "Url": "http://localhost:7878",
-        "ApiKey": "705b553732ab4167ab23909305d60600"
+        "ApiKey": "8b7454f668e54c5b8f44f56f93969761"
+      }
+    ]
+  },
+  "Lidarr": {
+    "Enabled": true,
+    "Block": {
+      "Type": "blacklist",
+      "Path": "https://raw.githubusercontent.com/flmorg/cleanuperr/refs/heads/main/blacklist"
+    },
+    "Instances": [
+      {
+        "Url": "http://localhost:8686",
+        "ApiKey": "7f677cfdc074414397af53dd633860c5"
      }
    ]
  }
--- a/code/Executable/appsettings.json
+++ b/code/Executable/appsettings.json
@@ -15,15 +15,7 @@
  },
  "ContentBlocker": {
    "Enabled": false,
-    "IGNORE_PRIVATE": false,
-    "Blacklist": {
-      "Enabled": false,
-      "Path": ""
-    },
-    "Whitelist": {
-      "Enabled": false,
-      "Path": ""
-    }
+    "IGNORE_PRIVATE": false
  },
  "QueueCleaner": {
    "Enabled": true,
@@ -34,7 +26,7 @@
    "STALLED_MAX_STRIKES": 5,
    "STALLED_IGNORE_PRIVATE": false
  },
-  "DOWNLOAD_CLIENT": "qbittorrent",
+  "DOWNLOAD_CLIENT": "none",
  "qBittorrent": {
    "Url": "http://localhost:8080",
    "Username": "",
@@ -50,8 +42,12 @@
    "Password": "testing"
  },
  "Sonarr": {
-    "Enabled": true,
+    "Enabled": false,
    "SearchType": "Episode",
+    "Block": {
+      "Type": "blacklist",
+      "Path": ""
+    },
    "Instances": [
      {
        "Url": "http://localhost:8989",
@@ -61,11 +57,28 @@
  },
  "Radarr": {
    "Enabled": false,
+    "Block": {
+      "Type": "blacklist",
+      "Path": ""
+    },
    "Instances": [
      {
        "Url": "http://localhost:7878",
        "ApiKey": ""
      }
    ]
+  },
+  "Lidarr": {
+    "Enabled": false,
+    "Block": {
+      "Type": "blacklist",
+      "Path": ""
+    },
+    "Instances": [
+      {
+        "Url": "http://localhost:8686",
+        "ApiKey": ""
+      }
+    ]
  }
 }