refactor: Move CF config objects to ServiceConfiguration

src/Recyclarr.Tests/Config/Services/ConfigurationLoaderTest.cs

@@ -50,6 +50,8 @@ public class ConfigurationLoaderTest
     {
         public string BaseUrl => "";
         public string ApiKey => "";
+        public ICollection<CustomFormatConfig> CustomFormats => new List<CustomFormatConfig>();
+        public bool DeleteOldCustomFormats => false;
     }
 
     [Test, AutoMockData(typeof(ConfigurationLoaderTest), nameof(BuildContainer))]

src/TrashLib.Tests/CustomFormat/Processors/GuideProcessorTest.cs

@@ -6,12 +6,12 @@ using NSubstitute;
 using NUnit.Framework;
 using Serilog;
 using TestLibrary.FluentAssertions;
+using TrashLib.Config.Services;
 using TrashLib.Services.CustomFormat.Guide;
 using TrashLib.Services.CustomFormat.Models;
 using TrashLib.Services.CustomFormat.Processors;
 using TrashLib.Services.CustomFormat.Processors.GuideSteps;
 using TrashLib.Services.Radarr;
-using TrashLib.Services.Radarr.Config;
 using TrashLib.TestLibrary;
 
 namespace TrashLib.Tests.CustomFormat.Processors;

src/TrashLib.Tests/CustomFormat/Processors/GuideSteps/ConfigStepTest.cs

@@ -2,10 +2,10 @@ using FluentAssertions;
 using Newtonsoft.Json.Linq;
 using NUnit.Framework;
 using TestLibrary.AutoFixture;
+using TrashLib.Config.Services;
 using TrashLib.Services.CustomFormat.Models;
 using TrashLib.Services.CustomFormat.Models.Cache;
 using TrashLib.Services.CustomFormat.Processors.GuideSteps;
-using TrashLib.Services.Radarr.Config;
 using TrashLib.TestLibrary;
 
 namespace TrashLib.Tests.CustomFormat.Processors.GuideSteps;

src/TrashLib.Tests/CustomFormat/Processors/GuideSteps/CustomFormatStepTest.cs

@@ -4,10 +4,10 @@ using Newtonsoft.Json.Linq;
 using NUnit.Framework;
 using TestLibrary.AutoFixture;
 using TestLibrary.FluentAssertions;
+using TrashLib.Config.Services;
 using TrashLib.Services.CustomFormat.Models;
 using TrashLib.Services.CustomFormat.Models.Cache;
 using TrashLib.Services.CustomFormat.Processors.GuideSteps;
-using TrashLib.Services.Radarr.Config;
 using TrashLib.TestLibrary;
 
 namespace TrashLib.Tests.CustomFormat.Processors.GuideSteps;

src/TrashLib.Tests/CustomFormat/Processors/GuideSteps/QualityProfileStepTest.cs

@@ -1,8 +1,8 @@
 using FluentAssertions;
 using NUnit.Framework;
+using TrashLib.Config.Services;
 using TrashLib.Services.CustomFormat.Models;
 using TrashLib.Services.CustomFormat.Processors.GuideSteps;
-using TrashLib.Services.Radarr.Config;
 using TrashLib.TestLibrary;
 
 namespace TrashLib.Tests.CustomFormat.Processors.GuideSteps;

src/TrashLib.Tests/Radarr/RadarrConfigurationTest.cs

@@ -4,6 +4,7 @@ using FluentAssertions;
 using FluentValidation;
 using NUnit.Framework;
 using TrashLib.Config;
+using TrashLib.Config.Services;
 using TrashLib.Services.Radarr;
 using TrashLib.Services.Radarr.Config;
 

src/TrashLib.Tests/Sonarr/SonarrCompatibilityTest.cs

@@ -8,8 +8,8 @@ using Newtonsoft.Json.Serialization;
 using NSubstitute;
 using NUnit.Framework;
 using TestLibrary.AutoFixture;
+using TrashLib.Config.Services;
 using TrashLib.ExceptionTypes;
-using TrashLib.Services.Radarr.Config;
 using TrashLib.Services.Sonarr;
 using TrashLib.Services.Sonarr.Api;
 using TrashLib.Services.Sonarr.Api.Objects;

src/TrashLib/Config/Services/IServiceConfiguration.cs

@@ -4,4 +4,6 @@ public interface IServiceConfiguration
 {
     string BaseUrl { get; }
     string ApiKey { get; }
+    ICollection<CustomFormatConfig> CustomFormats { get; }
+    bool DeleteOldCustomFormats { get; }
 }

src/TrashLib/Config/Services/ServiceConfiguration.cs

@@ -1,7 +1,27 @@
+using JetBrains.Annotations;
+
 namespace TrashLib.Config.Services;
 
 public abstract class ServiceConfiguration : IServiceConfiguration
 {
     public string BaseUrl { get; init; } = "";
     public string ApiKey { get; init; } = "";
+    public ICollection<CustomFormatConfig> CustomFormats { get; init; } = new List<CustomFormatConfig>();
+    public bool DeleteOldCustomFormats { get; init; }
+}
+
+[UsedImplicitly(ImplicitUseTargetFlags.WithMembers)]
+public class CustomFormatConfig
+{
+    public ICollection<string> Names { get; init; } = new List<string>();
+    public ICollection<string> TrashIds { get; init; } = new List<string>();
+    public ICollection<QualityProfileConfig> QualityProfiles { get; init; } = new List<QualityProfileConfig>();
+}
+
+[UsedImplicitly(ImplicitUseTargetFlags.WithMembers)]
+public class QualityProfileConfig
+{
+    public string Name { get; init; } = "";
+    public int? Score { get; init; }
+    public bool ResetUnmatchedScores { get; init; }
 }

src/TrashLib/Services/CustomFormat/CustomFormatUpdater.cs

@@ -4,7 +4,6 @@ using Serilog;
 using TrashLib.Config.Services;
 using TrashLib.Services.CustomFormat.Processors;
 using TrashLib.Services.CustomFormat.Processors.PersistenceSteps;
-using TrashLib.Services.Radarr.Config;
 
 namespace TrashLib.Services.CustomFormat;
 

src/TrashLib/Services/CustomFormat/ICustomFormatUpdater.cs

@@ -1,4 +1,4 @@
-using TrashLib.Services.Radarr.Config;
+using TrashLib.Config.Services;
 
 namespace TrashLib.Services.CustomFormat;
 

src/TrashLib/Services/CustomFormat/Models/ProcessedConfigData.cs

@@ -1,4 +1,4 @@
-using TrashLib.Services.Radarr.Config;
+using TrashLib.Config.Services;
 
 namespace TrashLib.Services.CustomFormat.Models;
 

src/TrashLib/Services/CustomFormat/Processors/GuideProcessor.cs

@@ -1,8 +1,8 @@
+using TrashLib.Config.Services;
 using TrashLib.Services.CustomFormat.Models;
 using TrashLib.Services.CustomFormat.Models.Cache;
 using TrashLib.Services.CustomFormat.Processors.GuideSteps;
 using TrashLib.Services.Radarr;
-using TrashLib.Services.Radarr.Config;
 
 namespace TrashLib.Services.CustomFormat.Processors;
 

src/TrashLib/Services/CustomFormat/Processors/GuideSteps/ConfigStep.cs

@@ -1,7 +1,7 @@
 using Common.Extensions;
 using Serilog;
+using TrashLib.Config.Services;
 using TrashLib.Services.CustomFormat.Models;
-using TrashLib.Services.Radarr.Config;
 
 namespace TrashLib.Services.CustomFormat.Processors.GuideSteps;
 

src/TrashLib/Services/CustomFormat/Processors/GuideSteps/CustomFormatStep.cs

@@ -1,7 +1,7 @@
 using Common.Extensions;
+using TrashLib.Config.Services;
 using TrashLib.Services.CustomFormat.Models;
 using TrashLib.Services.CustomFormat.Models.Cache;
-using TrashLib.Services.Radarr.Config;
 
 namespace TrashLib.Services.CustomFormat.Processors.GuideSteps;
 

src/TrashLib/Services/CustomFormat/Processors/GuideSteps/IConfigStep.cs

@@ -1,5 +1,5 @@
+using TrashLib.Config.Services;
 using TrashLib.Services.CustomFormat.Models;
-using TrashLib.Services.Radarr.Config;
 
 namespace TrashLib.Services.CustomFormat.Processors.GuideSteps;
 

src/TrashLib/Services/CustomFormat/Processors/GuideSteps/ICustomFormatStep.cs

@@ -1,6 +1,6 @@
+using TrashLib.Config.Services;
 using TrashLib.Services.CustomFormat.Models;
 using TrashLib.Services.CustomFormat.Models.Cache;
-using TrashLib.Services.Radarr.Config;
 
 namespace TrashLib.Services.CustomFormat.Processors.GuideSteps;
 

src/TrashLib/Services/CustomFormat/Processors/IGuideProcessor.cs

@@ -1,6 +1,6 @@
+using TrashLib.Config.Services;
 using TrashLib.Services.CustomFormat.Models;
 using TrashLib.Services.CustomFormat.Models.Cache;
-using TrashLib.Services.Radarr.Config;
 
 namespace TrashLib.Services.CustomFormat.Processors;
 

src/TrashLib/Services/CustomFormat/Processors/PersistenceProcessor.cs

@@ -3,7 +3,6 @@ using TrashLib.Services.CustomFormat.Api;
 using TrashLib.Services.CustomFormat.Models;
 using TrashLib.Services.CustomFormat.Models.Cache;
 using TrashLib.Services.CustomFormat.Processors.PersistenceSteps;
-using TrashLib.Services.Radarr.Config;
 
 namespace TrashLib.Services.CustomFormat.Processors;
 
@@ -61,7 +60,7 @@ internal class PersistenceProcessor : IPersistenceProcessor
         _steps.JsonTransactionStep.Process(guideCfs, radarrCfs);
 
         // Step 1.1: Optionally record deletions of custom formats in cache but not in the guide
-        var config = (RadarrConfiguration) _configProvider.ActiveConfiguration;
+        var config = _configProvider.ActiveConfiguration;
         if (config.DeleteOldCustomFormats)
         {
             _steps.JsonTransactionStep.RecordDeletions(deletedCfsInCache, radarrCfs);

src/TrashLib/Services/Radarr/Config/RadarrConfiguration.cs

@@ -7,24 +7,6 @@ namespace TrashLib.Services.Radarr.Config;
 public class RadarrConfiguration : ServiceConfiguration
 {
     public QualityDefinitionConfig? QualityDefinition { get; init; }
-    public ICollection<CustomFormatConfig> CustomFormats { get; init; } = new List<CustomFormatConfig>();
-    public bool DeleteOldCustomFormats { get; init; }
-}
-
-[UsedImplicitly(ImplicitUseTargetFlags.WithMembers)]
-public class CustomFormatConfig
-{
-    public ICollection<string> Names { get; init; } = new List<string>();
-    public ICollection<string> TrashIds { get; init; } = new List<string>();
-    public ICollection<QualityProfileConfig> QualityProfiles { get; init; } = new List<QualityProfileConfig>();
-}
-
-[UsedImplicitly(ImplicitUseTargetFlags.WithMembers)]
-public class QualityProfileConfig
-{
-    public string Name { get; init; } = "";
-    public int? Score { get; init; }
-    public bool ResetUnmatchedScores { get; init; }
 }
 
 [UsedImplicitly(ImplicitUseTargetFlags.WithMembers)]

src/TrashLib/Services/Radarr/Config/RadarrConfigurationValidator.cs

@@ -1,6 +1,7 @@
 using Common.FluentValidation;
 using FluentValidation;
 using JetBrains.Annotations;
+using TrashLib.Config.Services;
 
 namespace TrashLib.Services.Radarr.Config;
 

src/TrashLib/Services/Sonarr/Config/SonarrConfiguration.cs

@@ -1,12 +1,10 @@
 using TrashLib.Config.Services;
-using TrashLib.Services.Radarr.Config;
 
 namespace TrashLib.Services.Sonarr.Config;
 
 public class SonarrConfiguration : ServiceConfiguration
 {
     public IList<ReleaseProfileConfig> ReleaseProfiles { get; init; } = Array.Empty<ReleaseProfileConfig>();
-    public ICollection<CustomFormatConfig> CustomFormats { get; init; } = new List<CustomFormatConfig>();
     public string QualityDefinition { get; init; } = "";
 }