diff --git a/src/Trash.Tests/Config/ConfigurationLoaderTest.cs b/src/Trash.Tests/Config/Services/ConfigurationLoaderTest.cs similarity index 99% rename from src/Trash.Tests/Config/ConfigurationLoaderTest.cs rename to src/Trash.Tests/Config/Services/ConfigurationLoaderTest.cs index 7e016f72..d49fb250 100644 --- a/src/Trash.Tests/Config/ConfigurationLoaderTest.cs +++ b/src/Trash.Tests/Config/Services/ConfigurationLoaderTest.cs @@ -15,6 +15,7 @@ using NUnit.Framework; using TestLibrary; using Trash.Config; using TrashLib.Config; +using TrashLib.Config.Services; using TrashLib.Sonarr.Config; using TrashLib.Sonarr.ReleaseProfile; using YamlDotNet.Serialization.ObjectFactories; diff --git a/src/Trash.Tests/Config/Data/Load_UsingStream_CorrectParsing.yml b/src/Trash.Tests/Config/Services/Data/Load_UsingStream_CorrectParsing.yml similarity index 100% rename from src/Trash.Tests/Config/Data/Load_UsingStream_CorrectParsing.yml rename to src/Trash.Tests/Config/Services/Data/Load_UsingStream_CorrectParsing.yml diff --git a/src/Trash/Config/ConfigurationLoader.cs b/src/Trash/Config/ConfigurationLoader.cs index 41973796..1fc95039 100644 --- a/src/Trash/Config/ConfigurationLoader.cs +++ b/src/Trash/Config/ConfigurationLoader.cs @@ -5,6 +5,7 @@ using System.Linq; using Common.YamlDotNet; using FluentValidation; using TrashLib.Config; +using TrashLib.Config.Services; using YamlDotNet.Core; using YamlDotNet.Core.Events; using YamlDotNet.Serialization; diff --git a/src/Trash/Config/IConfigurationLoader.cs b/src/Trash/Config/IConfigurationLoader.cs index a08af9b8..c0f7dfd2 100644 --- a/src/Trash/Config/IConfigurationLoader.cs +++ b/src/Trash/Config/IConfigurationLoader.cs @@ -1,6 +1,7 @@ using System.Collections.Generic; using System.IO; using TrashLib.Config; +using TrashLib.Config.Services; namespace Trash.Config; diff --git a/src/TrashLib.Tests/Cache/ServiceCacheTest.cs b/src/TrashLib.Tests/Cache/ServiceCacheTest.cs index 4ac54789..7ce0f305 100644 --- a/src/TrashLib.Tests/Cache/ServiceCacheTest.cs +++ b/src/TrashLib.Tests/Cache/ServiceCacheTest.cs @@ -11,6 +11,7 @@ using Serilog; using TestLibrary.NSubstitute; using TrashLib.Cache; using TrashLib.Config; +using TrashLib.Config.Services; namespace TrashLib.Tests.Cache; diff --git a/src/TrashLib.Tests/Radarr/CustomFormat/Processors/PersistenceProcessorTest.cs b/src/TrashLib.Tests/Radarr/CustomFormat/Processors/PersistenceProcessorTest.cs index 284b2127..b3e96172 100644 --- a/src/TrashLib.Tests/Radarr/CustomFormat/Processors/PersistenceProcessorTest.cs +++ b/src/TrashLib.Tests/Radarr/CustomFormat/Processors/PersistenceProcessorTest.cs @@ -5,6 +5,7 @@ using Newtonsoft.Json.Linq; using NSubstitute; using NUnit.Framework; using TrashLib.Config; +using TrashLib.Config.Services; using TrashLib.Radarr.Config; using TrashLib.Radarr.CustomFormat.Api; using TrashLib.Radarr.CustomFormat.Models; diff --git a/src/TrashLib/Cache/ServiceCache.cs b/src/TrashLib/Cache/ServiceCache.cs index 2cd96612..d9295462 100644 --- a/src/TrashLib/Cache/ServiceCache.cs +++ b/src/TrashLib/Cache/ServiceCache.cs @@ -10,6 +10,7 @@ using Newtonsoft.Json.Linq; using Newtonsoft.Json.Serialization; using Serilog; using TrashLib.Config; +using TrashLib.Config.Services; namespace TrashLib.Cache; diff --git a/src/TrashLib/Config/ConfigAutofacModule.cs b/src/TrashLib/Config/ConfigAutofacModule.cs index 7a820c74..c28d5aef 100644 --- a/src/TrashLib/Config/ConfigAutofacModule.cs +++ b/src/TrashLib/Config/ConfigAutofacModule.cs @@ -1,6 +1,7 @@ using System.Reflection; using Autofac; using FluentValidation; +using TrashLib.Config.Services; using Module = Autofac.Module; namespace TrashLib.Config; diff --git a/src/TrashLib/Config/ConfigurationProvider.cs b/src/TrashLib/Config/Services/ConfigurationProvider.cs similarity index 91% rename from src/TrashLib/Config/ConfigurationProvider.cs rename to src/TrashLib/Config/Services/ConfigurationProvider.cs index e15a73c7..e66652fa 100644 --- a/src/TrashLib/Config/ConfigurationProvider.cs +++ b/src/TrashLib/Config/Services/ConfigurationProvider.cs @@ -1,6 +1,6 @@ using System; -namespace TrashLib.Config; +namespace TrashLib.Config.Services; internal class ConfigurationProvider : IConfigurationProvider { diff --git a/src/TrashLib/Config/IConfigurationProvider.cs b/src/TrashLib/Config/Services/IConfigurationProvider.cs similarity index 72% rename from src/TrashLib/Config/IConfigurationProvider.cs rename to src/TrashLib/Config/Services/IConfigurationProvider.cs index 0078d818..b9d9de74 100644 --- a/src/TrashLib/Config/IConfigurationProvider.cs +++ b/src/TrashLib/Config/Services/IConfigurationProvider.cs @@ -1,4 +1,4 @@ -namespace TrashLib.Config; +namespace TrashLib.Config.Services; public interface IConfigurationProvider { diff --git a/src/TrashLib/Config/IServerInfo.cs b/src/TrashLib/Config/Services/IServerInfo.cs similarity index 70% rename from src/TrashLib/Config/IServerInfo.cs rename to src/TrashLib/Config/Services/IServerInfo.cs index 82c9aeb9..d25552c7 100644 --- a/src/TrashLib/Config/IServerInfo.cs +++ b/src/TrashLib/Config/Services/IServerInfo.cs @@ -1,6 +1,6 @@ using Flurl.Http; -namespace TrashLib.Config; +namespace TrashLib.Config.Services; public interface IServerInfo { diff --git a/src/TrashLib/Config/IServiceConfiguration.cs b/src/TrashLib/Config/Services/IServiceConfiguration.cs similarity index 73% rename from src/TrashLib/Config/IServiceConfiguration.cs rename to src/TrashLib/Config/Services/IServiceConfiguration.cs index 1f9abafe..76dfb169 100644 --- a/src/TrashLib/Config/IServiceConfiguration.cs +++ b/src/TrashLib/Config/Services/IServiceConfiguration.cs @@ -1,4 +1,4 @@ -namespace TrashLib.Config; +namespace TrashLib.Config.Services; public interface IServiceConfiguration { diff --git a/src/TrashLib/Config/ServerInfo.cs b/src/TrashLib/Config/Services/ServerInfo.cs similarity index 94% rename from src/TrashLib/Config/ServerInfo.cs rename to src/TrashLib/Config/Services/ServerInfo.cs index 9f6f3184..e002071b 100644 --- a/src/TrashLib/Config/ServerInfo.cs +++ b/src/TrashLib/Config/Services/ServerInfo.cs @@ -3,7 +3,7 @@ using Flurl.Http; using Serilog; using TrashLib.Extensions; -namespace TrashLib.Config; +namespace TrashLib.Config.Services; internal class ServerInfo : IServerInfo { diff --git a/src/TrashLib/Config/ServiceConfiguration.cs b/src/TrashLib/Config/Services/ServiceConfiguration.cs similarity index 80% rename from src/TrashLib/Config/ServiceConfiguration.cs rename to src/TrashLib/Config/Services/ServiceConfiguration.cs index 673b6098..44927584 100644 --- a/src/TrashLib/Config/ServiceConfiguration.cs +++ b/src/TrashLib/Config/Services/ServiceConfiguration.cs @@ -1,4 +1,4 @@ -namespace TrashLib.Config; +namespace TrashLib.Config.Services; public abstract class ServiceConfiguration : IServiceConfiguration { diff --git a/src/TrashLib/Radarr/Config/RadarrConfiguration.cs b/src/TrashLib/Radarr/Config/RadarrConfiguration.cs index 63f919cb..2282a671 100644 --- a/src/TrashLib/Radarr/Config/RadarrConfiguration.cs +++ b/src/TrashLib/Radarr/Config/RadarrConfiguration.cs @@ -1,6 +1,7 @@ using System.Collections.Generic; using JetBrains.Annotations; using TrashLib.Config; +using TrashLib.Config.Services; using TrashLib.Radarr.QualityDefinition; namespace TrashLib.Radarr.Config; diff --git a/src/TrashLib/Radarr/CustomFormat/Api/CustomFormatService.cs b/src/TrashLib/Radarr/CustomFormat/Api/CustomFormatService.cs index 04ef2650..cce5d3e2 100644 --- a/src/TrashLib/Radarr/CustomFormat/Api/CustomFormatService.cs +++ b/src/TrashLib/Radarr/CustomFormat/Api/CustomFormatService.cs @@ -3,6 +3,7 @@ using System.Threading.Tasks; using Flurl.Http; using Newtonsoft.Json.Linq; using TrashLib.Config; +using TrashLib.Config.Services; using TrashLib.Radarr.CustomFormat.Models; namespace TrashLib.Radarr.CustomFormat.Api; diff --git a/src/TrashLib/Radarr/CustomFormat/Api/QualityProfileService.cs b/src/TrashLib/Radarr/CustomFormat/Api/QualityProfileService.cs index 812ac74d..090b8fdc 100644 --- a/src/TrashLib/Radarr/CustomFormat/Api/QualityProfileService.cs +++ b/src/TrashLib/Radarr/CustomFormat/Api/QualityProfileService.cs @@ -3,6 +3,7 @@ using System.Threading.Tasks; using Flurl.Http; using Newtonsoft.Json.Linq; using TrashLib.Config; +using TrashLib.Config.Services; namespace TrashLib.Radarr.CustomFormat.Api; diff --git a/src/TrashLib/Radarr/CustomFormat/Processors/PersistenceProcessor.cs b/src/TrashLib/Radarr/CustomFormat/Processors/PersistenceProcessor.cs index 6139fe07..68cf1ab4 100644 --- a/src/TrashLib/Radarr/CustomFormat/Processors/PersistenceProcessor.cs +++ b/src/TrashLib/Radarr/CustomFormat/Processors/PersistenceProcessor.cs @@ -2,6 +2,7 @@ using System.Collections.Generic; using System.Threading.Tasks; using TrashLib.Config; +using TrashLib.Config.Services; using TrashLib.Radarr.Config; using TrashLib.Radarr.CustomFormat.Api; using TrashLib.Radarr.CustomFormat.Models; diff --git a/src/TrashLib/Radarr/QualityDefinition/Api/QualityDefinitionService.cs b/src/TrashLib/Radarr/QualityDefinition/Api/QualityDefinitionService.cs index aaa24caa..1d2ae8cb 100644 --- a/src/TrashLib/Radarr/QualityDefinition/Api/QualityDefinitionService.cs +++ b/src/TrashLib/Radarr/QualityDefinition/Api/QualityDefinitionService.cs @@ -2,6 +2,7 @@ using System.Threading.Tasks; using Flurl.Http; using TrashLib.Config; +using TrashLib.Config.Services; using TrashLib.Radarr.QualityDefinition.Api.Objects; namespace TrashLib.Radarr.QualityDefinition.Api; diff --git a/src/TrashLib/Radarr/RadarrAutofacModule.cs b/src/TrashLib/Radarr/RadarrAutofacModule.cs index 23646229..41d4baa0 100644 --- a/src/TrashLib/Radarr/RadarrAutofacModule.cs +++ b/src/TrashLib/Radarr/RadarrAutofacModule.cs @@ -1,6 +1,7 @@ using Autofac; using Autofac.Extras.AggregateService; using TrashLib.Config; +using TrashLib.Config.Services; using TrashLib.Radarr.Config; using TrashLib.Radarr.CustomFormat; using TrashLib.Radarr.CustomFormat.Api; diff --git a/src/TrashLib/Sonarr/Api/SonarrApi.cs b/src/TrashLib/Sonarr/Api/SonarrApi.cs index b2fa2831..7c88a041 100644 --- a/src/TrashLib/Sonarr/Api/SonarrApi.cs +++ b/src/TrashLib/Sonarr/Api/SonarrApi.cs @@ -5,6 +5,7 @@ using Flurl.Http; using Newtonsoft.Json.Linq; using Serilog; using TrashLib.Config; +using TrashLib.Config.Services; using TrashLib.Extensions; using TrashLib.Sonarr.Api.Objects; diff --git a/src/TrashLib/Sonarr/Config/SonarrConfiguration.cs b/src/TrashLib/Sonarr/Config/SonarrConfiguration.cs index 3d827d51..c6249817 100644 --- a/src/TrashLib/Sonarr/Config/SonarrConfiguration.cs +++ b/src/TrashLib/Sonarr/Config/SonarrConfiguration.cs @@ -1,5 +1,6 @@ using System.Collections.Generic; using TrashLib.Config; +using TrashLib.Config.Services; using TrashLib.Sonarr.QualityDefinition; using TrashLib.Sonarr.ReleaseProfile; diff --git a/src/TrashLib/Sonarr/SonarrCompatibility.cs b/src/TrashLib/Sonarr/SonarrCompatibility.cs index 18b4724e..1a4ded28 100644 --- a/src/TrashLib/Sonarr/SonarrCompatibility.cs +++ b/src/TrashLib/Sonarr/SonarrCompatibility.cs @@ -3,6 +3,7 @@ using System.Reactive.Concurrency; using System.Reactive.Linq; using Flurl.Http; using TrashLib.Config; +using TrashLib.Config.Services; namespace TrashLib.Sonarr;