From 6a848b50c3edb99dad14b36c7b024c2ff659f892 Mon Sep 17 00:00:00 2001 From: Robert Dailey Date: Mon, 15 Apr 2024 08:46:32 -0500 Subject: [PATCH] refactor: Move SupportedServices to the TrashGuide project It was previously located in Common, which I'm trying to gradually get rid of. Supported services are ultimately determined by what is in the guide, so that seems like the best place for it. --- src/Recyclarr.Cli/Console/Commands/ListCustomFormatsCommand.cs | 2 +- src/Recyclarr.Cli/Console/Commands/ListMediaNamingCommand.cs | 2 +- src/Recyclarr.Cli/Console/Commands/ListQualitiesCommand.cs | 2 +- src/Recyclarr.Cli/Console/Commands/SyncCommand.cs | 2 +- src/Recyclarr.Cli/Console/Settings/IListCustomFormatSettings.cs | 2 +- src/Recyclarr.Cli/Console/Settings/ISyncSettings.cs | 2 +- .../Pipelines/CustomFormat/CustomFormatDataLister.cs | 2 +- .../Pipelines/CustomFormat/CustomFormatPipelineContext.cs | 2 +- src/Recyclarr.Cli/Pipelines/Generic/IPipelineContext.cs | 2 +- .../Pipelines/MediaNaming/MediaNamingAutofacModule.cs | 2 +- .../Pipelines/MediaNaming/MediaNamingDataLister.cs | 2 +- .../Pipelines/MediaNaming/MediaNamingPipelineContext.cs | 2 +- .../MediaNaming/PipelinePhases/MediaNamingConfigPhase.cs | 2 +- .../Pipelines/QualityProfile/QualityProfilePipelineContext.cs | 2 +- .../Pipelines/QualitySize/QualitySizeDataLister.cs | 2 +- .../Pipelines/QualitySize/QualitySizePipelineContext.cs | 2 +- src/Recyclarr.Cli/Processors/Config/ConfigListLocalProcessor.cs | 2 +- .../Processors/Config/ConfigListTemplateProcessor.cs | 1 - src/Recyclarr.Cli/Processors/Sync/SyncProcessor.cs | 2 +- src/Recyclarr.Config/ConfigExtensions.cs | 2 +- src/Recyclarr.Config/ConfigFilterCriteria.cs | 2 +- src/Recyclarr.Config/Models/IServiceConfiguration.cs | 2 +- src/Recyclarr.Config/Models/RadarrConfiguration.cs | 2 +- src/Recyclarr.Config/Models/ServiceConfiguration.cs | 2 +- src/Recyclarr.Config/Models/SonarrConfiguration.cs | 2 +- .../PostProcessing/ConfigMerging/ConfigIncludeProcessor.cs | 2 +- .../Parsing/PostProcessing/ConfigMerging/IIncludeProcessor.cs | 2 +- .../PostProcessing/ConfigMerging/IYamlIncludeResolver.cs | 2 +- .../PostProcessing/ConfigMerging/TemplateIncludeProcessor.cs | 1 - .../Parsing/PostProcessing/ConfigMerging/YamlIncludeResolver.cs | 2 +- .../Parsing/PostProcessing/IncludePostProcessor.cs | 2 +- src/Recyclarr.ServarrApi/MediaNaming/MediaNamingApiService.cs | 2 +- src/Recyclarr.TrashGuide/ConfigTemplateGuideService.cs | 1 - .../CustomFormat/CustomFormatGuideService.cs | 1 - .../CustomFormat/ICustomFormatGuideService.cs | 2 -- src/Recyclarr.TrashGuide/MediaNaming/MediaNamingGuideService.cs | 1 - .../QualitySize/IQualitySizeGuideService.cs | 2 -- src/Recyclarr.TrashGuide/QualitySize/QualitySizeGuideService.cs | 1 - src/Recyclarr.TrashGuide/Recyclarr.TrashGuide.csproj | 1 - .../SupportedServices.cs | 2 +- .../MediaNamingConfigPhaseIntegrationTest.cs | 2 +- .../Recyclarr.Cli.Tests/Processors/ConfigTemplateListerTest.cs | 1 - .../ConfigTemplateGuideServiceIntegrationTest.cs | 1 - .../ConfigurationLoaderSecretsTest.cs | 2 +- tests/Recyclarr.IntegrationTests/ConfigurationLoaderTest.cs | 1 + tests/Recyclarr.IntegrationTests/QualitySizeGuideServiceTest.cs | 2 +- tests/Recyclarr.Tests/Config/ConfigExtensionsTest.cs | 2 +- .../ConfigMerging/TemplateIncludeProcessorTest.cs | 1 - .../PostProcessing/ConfigMerging/YamlIncludeResolverTest.cs | 2 +- 49 files changed, 37 insertions(+), 50 deletions(-) rename src/{Recyclarr.Common => Recyclarr.TrashGuide}/SupportedServices.cs (64%) diff --git a/src/Recyclarr.Cli/Console/Commands/ListCustomFormatsCommand.cs b/src/Recyclarr.Cli/Console/Commands/ListCustomFormatsCommand.cs index 7c6cc499..34d70917 100644 --- a/src/Recyclarr.Cli/Console/Commands/ListCustomFormatsCommand.cs +++ b/src/Recyclarr.Cli/Console/Commands/ListCustomFormatsCommand.cs @@ -4,8 +4,8 @@ using JetBrains.Annotations; using Recyclarr.Cli.Console.Helpers; using Recyclarr.Cli.Console.Settings; using Recyclarr.Cli.Pipelines.CustomFormat; -using Recyclarr.Common; using Recyclarr.Repo; +using Recyclarr.TrashGuide; using Spectre.Console.Cli; #pragma warning disable CS8765 diff --git a/src/Recyclarr.Cli/Console/Commands/ListMediaNamingCommand.cs b/src/Recyclarr.Cli/Console/Commands/ListMediaNamingCommand.cs index 5c1c7a1d..11f723fb 100644 --- a/src/Recyclarr.Cli/Console/Commands/ListMediaNamingCommand.cs +++ b/src/Recyclarr.Cli/Console/Commands/ListMediaNamingCommand.cs @@ -3,8 +3,8 @@ using System.Diagnostics.CodeAnalysis; using JetBrains.Annotations; using Recyclarr.Cli.Console.Helpers; using Recyclarr.Cli.Pipelines.MediaNaming; -using Recyclarr.Common; using Recyclarr.Repo; +using Recyclarr.TrashGuide; using Spectre.Console.Cli; namespace Recyclarr.Cli.Console.Commands; diff --git a/src/Recyclarr.Cli/Console/Commands/ListQualitiesCommand.cs b/src/Recyclarr.Cli/Console/Commands/ListQualitiesCommand.cs index fa1a5971..f72fb898 100644 --- a/src/Recyclarr.Cli/Console/Commands/ListQualitiesCommand.cs +++ b/src/Recyclarr.Cli/Console/Commands/ListQualitiesCommand.cs @@ -3,8 +3,8 @@ using System.Diagnostics.CodeAnalysis; using JetBrains.Annotations; using Recyclarr.Cli.Console.Helpers; using Recyclarr.Cli.Pipelines.QualitySize; -using Recyclarr.Common; using Recyclarr.Repo; +using Recyclarr.TrashGuide; using Spectre.Console.Cli; namespace Recyclarr.Cli.Console.Commands; diff --git a/src/Recyclarr.Cli/Console/Commands/SyncCommand.cs b/src/Recyclarr.Cli/Console/Commands/SyncCommand.cs index a9938a40..6ecc2d5b 100644 --- a/src/Recyclarr.Cli/Console/Commands/SyncCommand.cs +++ b/src/Recyclarr.Cli/Console/Commands/SyncCommand.cs @@ -5,8 +5,8 @@ using Recyclarr.Cli.Console.Helpers; using Recyclarr.Cli.Console.Settings; using Recyclarr.Cli.Migration; using Recyclarr.Cli.Processors.Sync; -using Recyclarr.Common; using Recyclarr.Repo; +using Recyclarr.TrashGuide; using Spectre.Console.Cli; namespace Recyclarr.Cli.Console.Commands; diff --git a/src/Recyclarr.Cli/Console/Settings/IListCustomFormatSettings.cs b/src/Recyclarr.Cli/Console/Settings/IListCustomFormatSettings.cs index 161b5004..cfbc8981 100644 --- a/src/Recyclarr.Cli/Console/Settings/IListCustomFormatSettings.cs +++ b/src/Recyclarr.Cli/Console/Settings/IListCustomFormatSettings.cs @@ -1,4 +1,4 @@ -using Recyclarr.Common; +using Recyclarr.TrashGuide; namespace Recyclarr.Cli.Console.Settings; diff --git a/src/Recyclarr.Cli/Console/Settings/ISyncSettings.cs b/src/Recyclarr.Cli/Console/Settings/ISyncSettings.cs index c3b683de..0be63f5b 100644 --- a/src/Recyclarr.Cli/Console/Settings/ISyncSettings.cs +++ b/src/Recyclarr.Cli/Console/Settings/ISyncSettings.cs @@ -1,4 +1,4 @@ -using Recyclarr.Common; +using Recyclarr.TrashGuide; namespace Recyclarr.Cli.Console.Settings; diff --git a/src/Recyclarr.Cli/Pipelines/CustomFormat/CustomFormatDataLister.cs b/src/Recyclarr.Cli/Pipelines/CustomFormat/CustomFormatDataLister.cs index cc5ee7fa..38c02300 100644 --- a/src/Recyclarr.Cli/Pipelines/CustomFormat/CustomFormatDataLister.cs +++ b/src/Recyclarr.Cli/Pipelines/CustomFormat/CustomFormatDataLister.cs @@ -1,5 +1,5 @@ using Recyclarr.Cli.Console.Settings; -using Recyclarr.Common; +using Recyclarr.TrashGuide; using Recyclarr.TrashGuide.CustomFormat; using Spectre.Console; diff --git a/src/Recyclarr.Cli/Pipelines/CustomFormat/CustomFormatPipelineContext.cs b/src/Recyclarr.Cli/Pipelines/CustomFormat/CustomFormatPipelineContext.cs index 83ab0faa..7d388d8a 100644 --- a/src/Recyclarr.Cli/Pipelines/CustomFormat/CustomFormatPipelineContext.cs +++ b/src/Recyclarr.Cli/Pipelines/CustomFormat/CustomFormatPipelineContext.cs @@ -1,7 +1,7 @@ using Recyclarr.Cli.Pipelines.CustomFormat.Cache; using Recyclarr.Cli.Pipelines.CustomFormat.Models; using Recyclarr.Cli.Pipelines.Generic; -using Recyclarr.Common; +using Recyclarr.TrashGuide; using Recyclarr.TrashGuide.CustomFormat; namespace Recyclarr.Cli.Pipelines.CustomFormat; diff --git a/src/Recyclarr.Cli/Pipelines/Generic/IPipelineContext.cs b/src/Recyclarr.Cli/Pipelines/Generic/IPipelineContext.cs index 0ddfc473..3b721371 100644 --- a/src/Recyclarr.Cli/Pipelines/Generic/IPipelineContext.cs +++ b/src/Recyclarr.Cli/Pipelines/Generic/IPipelineContext.cs @@ -1,4 +1,4 @@ -using Recyclarr.Common; +using Recyclarr.TrashGuide; namespace Recyclarr.Cli.Pipelines.Generic; diff --git a/src/Recyclarr.Cli/Pipelines/MediaNaming/MediaNamingAutofacModule.cs b/src/Recyclarr.Cli/Pipelines/MediaNaming/MediaNamingAutofacModule.cs index 914e7c82..a7eba928 100644 --- a/src/Recyclarr.Cli/Pipelines/MediaNaming/MediaNamingAutofacModule.cs +++ b/src/Recyclarr.Cli/Pipelines/MediaNaming/MediaNamingAutofacModule.cs @@ -1,7 +1,7 @@ using Autofac; using Recyclarr.Cli.Pipelines.MediaNaming.PipelinePhases; using Recyclarr.Cli.Pipelines.MediaNaming.PipelinePhases.Config; -using Recyclarr.Common; +using Recyclarr.TrashGuide; namespace Recyclarr.Cli.Pipelines.MediaNaming; diff --git a/src/Recyclarr.Cli/Pipelines/MediaNaming/MediaNamingDataLister.cs b/src/Recyclarr.Cli/Pipelines/MediaNaming/MediaNamingDataLister.cs index 89b7c1eb..87212776 100644 --- a/src/Recyclarr.Cli/Pipelines/MediaNaming/MediaNamingDataLister.cs +++ b/src/Recyclarr.Cli/Pipelines/MediaNaming/MediaNamingDataLister.cs @@ -1,5 +1,5 @@ using System.Diagnostics.CodeAnalysis; -using Recyclarr.Common; +using Recyclarr.TrashGuide; using Recyclarr.TrashGuide.MediaNaming; using Spectre.Console; diff --git a/src/Recyclarr.Cli/Pipelines/MediaNaming/MediaNamingPipelineContext.cs b/src/Recyclarr.Cli/Pipelines/MediaNaming/MediaNamingPipelineContext.cs index 6d8c822c..ff139a59 100644 --- a/src/Recyclarr.Cli/Pipelines/MediaNaming/MediaNamingPipelineContext.cs +++ b/src/Recyclarr.Cli/Pipelines/MediaNaming/MediaNamingPipelineContext.cs @@ -1,7 +1,7 @@ using Recyclarr.Cli.Pipelines.Generic; using Recyclarr.Cli.Pipelines.MediaNaming.PipelinePhases; -using Recyclarr.Common; using Recyclarr.ServarrApi.MediaNaming; +using Recyclarr.TrashGuide; namespace Recyclarr.Cli.Pipelines.MediaNaming; diff --git a/src/Recyclarr.Cli/Pipelines/MediaNaming/PipelinePhases/MediaNamingConfigPhase.cs b/src/Recyclarr.Cli/Pipelines/MediaNaming/PipelinePhases/MediaNamingConfigPhase.cs index 913aab83..a3cb5a34 100644 --- a/src/Recyclarr.Cli/Pipelines/MediaNaming/PipelinePhases/MediaNamingConfigPhase.cs +++ b/src/Recyclarr.Cli/Pipelines/MediaNaming/PipelinePhases/MediaNamingConfigPhase.cs @@ -1,9 +1,9 @@ using Autofac.Features.Indexed; using Recyclarr.Cli.Pipelines.Generic; using Recyclarr.Cli.Pipelines.MediaNaming.PipelinePhases.Config; -using Recyclarr.Common; using Recyclarr.Config.Models; using Recyclarr.ServarrApi.MediaNaming; +using Recyclarr.TrashGuide; using Recyclarr.TrashGuide.MediaNaming; namespace Recyclarr.Cli.Pipelines.MediaNaming.PipelinePhases; diff --git a/src/Recyclarr.Cli/Pipelines/QualityProfile/QualityProfilePipelineContext.cs b/src/Recyclarr.Cli/Pipelines/QualityProfile/QualityProfilePipelineContext.cs index e2cbdfb4..aea9d345 100644 --- a/src/Recyclarr.Cli/Pipelines/QualityProfile/QualityProfilePipelineContext.cs +++ b/src/Recyclarr.Cli/Pipelines/QualityProfile/QualityProfilePipelineContext.cs @@ -2,7 +2,7 @@ using System.Diagnostics.CodeAnalysis; using Recyclarr.Cli.Pipelines.Generic; using Recyclarr.Cli.Pipelines.QualityProfile.Models; using Recyclarr.Cli.Pipelines.QualityProfile.PipelinePhases; -using Recyclarr.Common; +using Recyclarr.TrashGuide; namespace Recyclarr.Cli.Pipelines.QualityProfile; diff --git a/src/Recyclarr.Cli/Pipelines/QualitySize/QualitySizeDataLister.cs b/src/Recyclarr.Cli/Pipelines/QualitySize/QualitySizeDataLister.cs index ac036f6e..51cf6713 100644 --- a/src/Recyclarr.Cli/Pipelines/QualitySize/QualitySizeDataLister.cs +++ b/src/Recyclarr.Cli/Pipelines/QualitySize/QualitySizeDataLister.cs @@ -1,4 +1,4 @@ -using Recyclarr.Common; +using Recyclarr.TrashGuide; using Recyclarr.TrashGuide.QualitySize; using Spectre.Console; diff --git a/src/Recyclarr.Cli/Pipelines/QualitySize/QualitySizePipelineContext.cs b/src/Recyclarr.Cli/Pipelines/QualitySize/QualitySizePipelineContext.cs index b0c0fee0..0b5ef132 100644 --- a/src/Recyclarr.Cli/Pipelines/QualitySize/QualitySizePipelineContext.cs +++ b/src/Recyclarr.Cli/Pipelines/QualitySize/QualitySizePipelineContext.cs @@ -1,7 +1,7 @@ using System.Diagnostics.CodeAnalysis; using Recyclarr.Cli.Pipelines.Generic; -using Recyclarr.Common; using Recyclarr.ServarrApi.QualityDefinition; +using Recyclarr.TrashGuide; using Recyclarr.TrashGuide.QualitySize; namespace Recyclarr.Cli.Pipelines.QualitySize; diff --git a/src/Recyclarr.Cli/Processors/Config/ConfigListLocalProcessor.cs b/src/Recyclarr.Cli/Processors/Config/ConfigListLocalProcessor.cs index a85efe32..043507ad 100644 --- a/src/Recyclarr.Cli/Processors/Config/ConfigListLocalProcessor.cs +++ b/src/Recyclarr.Cli/Processors/Config/ConfigListLocalProcessor.cs @@ -1,9 +1,9 @@ using System.IO.Abstractions; -using Recyclarr.Common; using Recyclarr.Config; using Recyclarr.Config.Models; using Recyclarr.Config.Parsing; using Recyclarr.Platform; +using Recyclarr.TrashGuide; using Spectre.Console; using Spectre.Console.Rendering; diff --git a/src/Recyclarr.Cli/Processors/Config/ConfigListTemplateProcessor.cs b/src/Recyclarr.Cli/Processors/Config/ConfigListTemplateProcessor.cs index 979be886..f2ffd31e 100644 --- a/src/Recyclarr.Cli/Processors/Config/ConfigListTemplateProcessor.cs +++ b/src/Recyclarr.Cli/Processors/Config/ConfigListTemplateProcessor.cs @@ -1,5 +1,4 @@ using Recyclarr.Cli.Console.Commands; -using Recyclarr.Common; using Recyclarr.TrashGuide; using Spectre.Console; diff --git a/src/Recyclarr.Cli/Processors/Sync/SyncProcessor.cs b/src/Recyclarr.Cli/Processors/Sync/SyncProcessor.cs index 8593679a..5de9a354 100644 --- a/src/Recyclarr.Cli/Processors/Sync/SyncProcessor.cs +++ b/src/Recyclarr.Cli/Processors/Sync/SyncProcessor.cs @@ -1,10 +1,10 @@ using System.Diagnostics.CodeAnalysis; using Recyclarr.Cli.Console.Settings; using Recyclarr.Cli.Processors.ErrorHandling; -using Recyclarr.Common; using Recyclarr.Compatibility; using Recyclarr.Config; using Recyclarr.Config.Models; +using Recyclarr.TrashGuide; using Spectre.Console; namespace Recyclarr.Cli.Processors.Sync; diff --git a/src/Recyclarr.Config/ConfigExtensions.cs b/src/Recyclarr.Config/ConfigExtensions.cs index d42a9f00..904ec9c0 100644 --- a/src/Recyclarr.Config/ConfigExtensions.cs +++ b/src/Recyclarr.Config/ConfigExtensions.cs @@ -1,7 +1,7 @@ -using Recyclarr.Common; using Recyclarr.Common.Extensions; using Recyclarr.Config.Models; using Recyclarr.Config.Parsing; +using Recyclarr.TrashGuide; namespace Recyclarr.Config; diff --git a/src/Recyclarr.Config/ConfigFilterCriteria.cs b/src/Recyclarr.Config/ConfigFilterCriteria.cs index 2d2ed42d..3302d375 100644 --- a/src/Recyclarr.Config/ConfigFilterCriteria.cs +++ b/src/Recyclarr.Config/ConfigFilterCriteria.cs @@ -1,4 +1,4 @@ -using Recyclarr.Common; +using Recyclarr.TrashGuide; namespace Recyclarr.Config; diff --git a/src/Recyclarr.Config/Models/IServiceConfiguration.cs b/src/Recyclarr.Config/Models/IServiceConfiguration.cs index ea2ecb23..7f93c75f 100644 --- a/src/Recyclarr.Config/Models/IServiceConfiguration.cs +++ b/src/Recyclarr.Config/Models/IServiceConfiguration.cs @@ -1,4 +1,4 @@ -using Recyclarr.Common; +using Recyclarr.TrashGuide; namespace Recyclarr.Config.Models; diff --git a/src/Recyclarr.Config/Models/RadarrConfiguration.cs b/src/Recyclarr.Config/Models/RadarrConfiguration.cs index b3f4737e..b3b7f766 100644 --- a/src/Recyclarr.Config/Models/RadarrConfiguration.cs +++ b/src/Recyclarr.Config/Models/RadarrConfiguration.cs @@ -1,4 +1,4 @@ -using Recyclarr.Common; +using Recyclarr.TrashGuide; namespace Recyclarr.Config.Models; diff --git a/src/Recyclarr.Config/Models/ServiceConfiguration.cs b/src/Recyclarr.Config/Models/ServiceConfiguration.cs index 896987f1..b2dbd2f6 100644 --- a/src/Recyclarr.Config/Models/ServiceConfiguration.cs +++ b/src/Recyclarr.Config/Models/ServiceConfiguration.cs @@ -1,5 +1,5 @@ using JetBrains.Annotations; -using Recyclarr.Common; +using Recyclarr.TrashGuide; namespace Recyclarr.Config.Models; diff --git a/src/Recyclarr.Config/Models/SonarrConfiguration.cs b/src/Recyclarr.Config/Models/SonarrConfiguration.cs index 9a023d90..8a51118b 100644 --- a/src/Recyclarr.Config/Models/SonarrConfiguration.cs +++ b/src/Recyclarr.Config/Models/SonarrConfiguration.cs @@ -1,4 +1,4 @@ -using Recyclarr.Common; +using Recyclarr.TrashGuide; namespace Recyclarr.Config.Models; diff --git a/src/Recyclarr.Config/Parsing/PostProcessing/ConfigMerging/ConfigIncludeProcessor.cs b/src/Recyclarr.Config/Parsing/PostProcessing/ConfigMerging/ConfigIncludeProcessor.cs index d472cf0b..55df0825 100644 --- a/src/Recyclarr.Config/Parsing/PostProcessing/ConfigMerging/ConfigIncludeProcessor.cs +++ b/src/Recyclarr.Config/Parsing/PostProcessing/ConfigMerging/ConfigIncludeProcessor.cs @@ -1,6 +1,6 @@ using System.IO.Abstractions; -using Recyclarr.Common; using Recyclarr.Platform; +using Recyclarr.TrashGuide; namespace Recyclarr.Config.Parsing.PostProcessing.ConfigMerging; diff --git a/src/Recyclarr.Config/Parsing/PostProcessing/ConfigMerging/IIncludeProcessor.cs b/src/Recyclarr.Config/Parsing/PostProcessing/ConfigMerging/IIncludeProcessor.cs index e7d1d1b7..a2d13888 100644 --- a/src/Recyclarr.Config/Parsing/PostProcessing/ConfigMerging/IIncludeProcessor.cs +++ b/src/Recyclarr.Config/Parsing/PostProcessing/ConfigMerging/IIncludeProcessor.cs @@ -1,5 +1,5 @@ using System.IO.Abstractions; -using Recyclarr.Common; +using Recyclarr.TrashGuide; namespace Recyclarr.Config.Parsing.PostProcessing.ConfigMerging; diff --git a/src/Recyclarr.Config/Parsing/PostProcessing/ConfigMerging/IYamlIncludeResolver.cs b/src/Recyclarr.Config/Parsing/PostProcessing/ConfigMerging/IYamlIncludeResolver.cs index 6d2e1c93..e2e3a48c 100644 --- a/src/Recyclarr.Config/Parsing/PostProcessing/ConfigMerging/IYamlIncludeResolver.cs +++ b/src/Recyclarr.Config/Parsing/PostProcessing/ConfigMerging/IYamlIncludeResolver.cs @@ -1,5 +1,5 @@ using System.IO.Abstractions; -using Recyclarr.Common; +using Recyclarr.TrashGuide; namespace Recyclarr.Config.Parsing.PostProcessing.ConfigMerging; diff --git a/src/Recyclarr.Config/Parsing/PostProcessing/ConfigMerging/TemplateIncludeProcessor.cs b/src/Recyclarr.Config/Parsing/PostProcessing/ConfigMerging/TemplateIncludeProcessor.cs index 68c7c793..dec51f3f 100644 --- a/src/Recyclarr.Config/Parsing/PostProcessing/ConfigMerging/TemplateIncludeProcessor.cs +++ b/src/Recyclarr.Config/Parsing/PostProcessing/ConfigMerging/TemplateIncludeProcessor.cs @@ -1,5 +1,4 @@ using System.IO.Abstractions; -using Recyclarr.Common; using Recyclarr.Common.Extensions; using Recyclarr.TrashGuide; diff --git a/src/Recyclarr.Config/Parsing/PostProcessing/ConfigMerging/YamlIncludeResolver.cs b/src/Recyclarr.Config/Parsing/PostProcessing/ConfigMerging/YamlIncludeResolver.cs index 3a54b36f..5e20ac80 100644 --- a/src/Recyclarr.Config/Parsing/PostProcessing/ConfigMerging/YamlIncludeResolver.cs +++ b/src/Recyclarr.Config/Parsing/PostProcessing/ConfigMerging/YamlIncludeResolver.cs @@ -1,5 +1,5 @@ using System.IO.Abstractions; -using Recyclarr.Common; +using Recyclarr.TrashGuide; namespace Recyclarr.Config.Parsing.PostProcessing.ConfigMerging; diff --git a/src/Recyclarr.Config/Parsing/PostProcessing/IncludePostProcessor.cs b/src/Recyclarr.Config/Parsing/PostProcessing/IncludePostProcessor.cs index cd6889c6..c44d5ae8 100644 --- a/src/Recyclarr.Config/Parsing/PostProcessing/IncludePostProcessor.cs +++ b/src/Recyclarr.Config/Parsing/PostProcessing/IncludePostProcessor.cs @@ -1,6 +1,6 @@ -using Recyclarr.Common; using Recyclarr.Config.Parsing.PostProcessing.ConfigMerging; using Recyclarr.Platform; +using Recyclarr.TrashGuide; using Serilog.Context; namespace Recyclarr.Config.Parsing.PostProcessing; diff --git a/src/Recyclarr.ServarrApi/MediaNaming/MediaNamingApiService.cs b/src/Recyclarr.ServarrApi/MediaNaming/MediaNamingApiService.cs index a9736ff2..ce933b97 100644 --- a/src/Recyclarr.ServarrApi/MediaNaming/MediaNamingApiService.cs +++ b/src/Recyclarr.ServarrApi/MediaNaming/MediaNamingApiService.cs @@ -1,6 +1,6 @@ using Flurl.Http; -using Recyclarr.Common; using Recyclarr.Config.Models; +using Recyclarr.TrashGuide; namespace Recyclarr.ServarrApi.MediaNaming; diff --git a/src/Recyclarr.TrashGuide/ConfigTemplateGuideService.cs b/src/Recyclarr.TrashGuide/ConfigTemplateGuideService.cs index 1c9c6898..7cf1494d 100644 --- a/src/Recyclarr.TrashGuide/ConfigTemplateGuideService.cs +++ b/src/Recyclarr.TrashGuide/ConfigTemplateGuideService.cs @@ -1,7 +1,6 @@ using System.IO.Abstractions; using System.Text.Json; using JetBrains.Annotations; -using Recyclarr.Common; using Recyclarr.Json; using Recyclarr.Repo; diff --git a/src/Recyclarr.TrashGuide/CustomFormat/CustomFormatGuideService.cs b/src/Recyclarr.TrashGuide/CustomFormat/CustomFormatGuideService.cs index 32a2fa28..7e72ad4c 100644 --- a/src/Recyclarr.TrashGuide/CustomFormat/CustomFormatGuideService.cs +++ b/src/Recyclarr.TrashGuide/CustomFormat/CustomFormatGuideService.cs @@ -1,5 +1,4 @@ using System.IO.Abstractions; -using Recyclarr.Common; using Recyclarr.Repo; namespace Recyclarr.TrashGuide.CustomFormat; diff --git a/src/Recyclarr.TrashGuide/CustomFormat/ICustomFormatGuideService.cs b/src/Recyclarr.TrashGuide/CustomFormat/ICustomFormatGuideService.cs index ca081980..b86c0e57 100644 --- a/src/Recyclarr.TrashGuide/CustomFormat/ICustomFormatGuideService.cs +++ b/src/Recyclarr.TrashGuide/CustomFormat/ICustomFormatGuideService.cs @@ -1,5 +1,3 @@ -using Recyclarr.Common; - namespace Recyclarr.TrashGuide.CustomFormat; public interface ICustomFormatGuideService diff --git a/src/Recyclarr.TrashGuide/MediaNaming/MediaNamingGuideService.cs b/src/Recyclarr.TrashGuide/MediaNaming/MediaNamingGuideService.cs index 03f32f45..d4ebcc2b 100644 --- a/src/Recyclarr.TrashGuide/MediaNaming/MediaNamingGuideService.cs +++ b/src/Recyclarr.TrashGuide/MediaNaming/MediaNamingGuideService.cs @@ -1,5 +1,4 @@ using System.IO.Abstractions; -using Recyclarr.Common; using Recyclarr.Json.Loading; using Recyclarr.Repo; diff --git a/src/Recyclarr.TrashGuide/QualitySize/IQualitySizeGuideService.cs b/src/Recyclarr.TrashGuide/QualitySize/IQualitySizeGuideService.cs index 297b155a..f3aa02af 100644 --- a/src/Recyclarr.TrashGuide/QualitySize/IQualitySizeGuideService.cs +++ b/src/Recyclarr.TrashGuide/QualitySize/IQualitySizeGuideService.cs @@ -1,5 +1,3 @@ -using Recyclarr.Common; - namespace Recyclarr.TrashGuide.QualitySize; public interface IQualitySizeGuideService diff --git a/src/Recyclarr.TrashGuide/QualitySize/QualitySizeGuideService.cs b/src/Recyclarr.TrashGuide/QualitySize/QualitySizeGuideService.cs index 9d0b5720..12e1ba3a 100644 --- a/src/Recyclarr.TrashGuide/QualitySize/QualitySizeGuideService.cs +++ b/src/Recyclarr.TrashGuide/QualitySize/QualitySizeGuideService.cs @@ -1,4 +1,3 @@ -using Recyclarr.Common; using Recyclarr.Repo; namespace Recyclarr.TrashGuide.QualitySize; diff --git a/src/Recyclarr.TrashGuide/Recyclarr.TrashGuide.csproj b/src/Recyclarr.TrashGuide/Recyclarr.TrashGuide.csproj index 13d9cd73..48609d35 100644 --- a/src/Recyclarr.TrashGuide/Recyclarr.TrashGuide.csproj +++ b/src/Recyclarr.TrashGuide/Recyclarr.TrashGuide.csproj @@ -1,6 +1,5 @@ - diff --git a/src/Recyclarr.Common/SupportedServices.cs b/src/Recyclarr.TrashGuide/SupportedServices.cs similarity index 64% rename from src/Recyclarr.Common/SupportedServices.cs rename to src/Recyclarr.TrashGuide/SupportedServices.cs index b4729130..c4b70b61 100644 --- a/src/Recyclarr.Common/SupportedServices.cs +++ b/src/Recyclarr.TrashGuide/SupportedServices.cs @@ -1,4 +1,4 @@ -namespace Recyclarr.Common; +namespace Recyclarr.TrashGuide; public enum SupportedServices { diff --git a/tests/Recyclarr.Cli.IntegrationTests/MediaNamingConfigPhaseIntegrationTest.cs b/tests/Recyclarr.Cli.IntegrationTests/MediaNamingConfigPhaseIntegrationTest.cs index c1ec0943..0ed89a93 100644 --- a/tests/Recyclarr.Cli.IntegrationTests/MediaNamingConfigPhaseIntegrationTest.cs +++ b/tests/Recyclarr.Cli.IntegrationTests/MediaNamingConfigPhaseIntegrationTest.cs @@ -1,8 +1,8 @@ using Autofac.Core.Registration; using Recyclarr.Cli.Pipelines.MediaNaming; using Recyclarr.Cli.Pipelines.MediaNaming.PipelinePhases; -using Recyclarr.Common; using Recyclarr.Config.Models; +using Recyclarr.TrashGuide; namespace Recyclarr.Cli.IntegrationTests; diff --git a/tests/Recyclarr.Cli.Tests/Processors/ConfigTemplateListerTest.cs b/tests/Recyclarr.Cli.Tests/Processors/ConfigTemplateListerTest.cs index ffa2be7b..e55bf888 100644 --- a/tests/Recyclarr.Cli.Tests/Processors/ConfigTemplateListerTest.cs +++ b/tests/Recyclarr.Cli.Tests/Processors/ConfigTemplateListerTest.cs @@ -1,7 +1,6 @@ using System.IO.Abstractions; using Recyclarr.Cli.Console.Commands; using Recyclarr.Cli.Processors.Config; -using Recyclarr.Common; using Recyclarr.TrashGuide; using Spectre.Console.Testing; diff --git a/tests/Recyclarr.IntegrationTests/ConfigTemplateGuideServiceIntegrationTest.cs b/tests/Recyclarr.IntegrationTests/ConfigTemplateGuideServiceIntegrationTest.cs index 624edbb6..5a4feb8f 100644 --- a/tests/Recyclarr.IntegrationTests/ConfigTemplateGuideServiceIntegrationTest.cs +++ b/tests/Recyclarr.IntegrationTests/ConfigTemplateGuideServiceIntegrationTest.cs @@ -1,5 +1,4 @@ using System.IO.Abstractions; -using Recyclarr.Common; using Recyclarr.Repo; using Recyclarr.TestLibrary; using Recyclarr.TestLibrary.AutoFixture; diff --git a/tests/Recyclarr.IntegrationTests/ConfigurationLoaderSecretsTest.cs b/tests/Recyclarr.IntegrationTests/ConfigurationLoaderSecretsTest.cs index 4f685290..0d7c5a74 100644 --- a/tests/Recyclarr.IntegrationTests/ConfigurationLoaderSecretsTest.cs +++ b/tests/Recyclarr.IntegrationTests/ConfigurationLoaderSecretsTest.cs @@ -1,7 +1,7 @@ using System.IO.Abstractions; -using Recyclarr.Common; using Recyclarr.Config; using Recyclarr.Config.Parsing; +using Recyclarr.TrashGuide; namespace Recyclarr.IntegrationTests; diff --git a/tests/Recyclarr.IntegrationTests/ConfigurationLoaderTest.cs b/tests/Recyclarr.IntegrationTests/ConfigurationLoaderTest.cs index 805ac090..233cc8e2 100644 --- a/tests/Recyclarr.IntegrationTests/ConfigurationLoaderTest.cs +++ b/tests/Recyclarr.IntegrationTests/ConfigurationLoaderTest.cs @@ -9,6 +9,7 @@ using Recyclarr.Config; using Recyclarr.Config.Models; using Recyclarr.Config.Parsing; using Recyclarr.TestLibrary.Autofac; +using Recyclarr.TrashGuide; namespace Recyclarr.IntegrationTests; diff --git a/tests/Recyclarr.IntegrationTests/QualitySizeGuideServiceTest.cs b/tests/Recyclarr.IntegrationTests/QualitySizeGuideServiceTest.cs index 167eaa7a..3dfce63b 100644 --- a/tests/Recyclarr.IntegrationTests/QualitySizeGuideServiceTest.cs +++ b/tests/Recyclarr.IntegrationTests/QualitySizeGuideServiceTest.cs @@ -1,8 +1,8 @@ using System.IO.Abstractions; -using Recyclarr.Common; using Recyclarr.Common.Extensions; using Recyclarr.Repo; using Recyclarr.TestLibrary; +using Recyclarr.TrashGuide; using Recyclarr.TrashGuide.QualitySize; namespace Recyclarr.IntegrationTests; diff --git a/tests/Recyclarr.Tests/Config/ConfigExtensionsTest.cs b/tests/Recyclarr.Tests/Config/ConfigExtensionsTest.cs index 25118225..eeec0107 100644 --- a/tests/Recyclarr.Tests/Config/ConfigExtensionsTest.cs +++ b/tests/Recyclarr.Tests/Config/ConfigExtensionsTest.cs @@ -1,6 +1,6 @@ -using Recyclarr.Common; using Recyclarr.Config; using Recyclarr.Config.Models; +using Recyclarr.TrashGuide; namespace Recyclarr.Tests.Config; diff --git a/tests/Recyclarr.Tests/Config/Parsing/PostProcessing/ConfigMerging/TemplateIncludeProcessorTest.cs b/tests/Recyclarr.Tests/Config/Parsing/PostProcessing/ConfigMerging/TemplateIncludeProcessorTest.cs index 04526667..9eaabd36 100644 --- a/tests/Recyclarr.Tests/Config/Parsing/PostProcessing/ConfigMerging/TemplateIncludeProcessorTest.cs +++ b/tests/Recyclarr.Tests/Config/Parsing/PostProcessing/ConfigMerging/TemplateIncludeProcessorTest.cs @@ -1,5 +1,4 @@ using System.IO.Abstractions; -using Recyclarr.Common; using Recyclarr.Config.Parsing.PostProcessing.ConfigMerging; using Recyclarr.TrashGuide; diff --git a/tests/Recyclarr.Tests/Config/Parsing/PostProcessing/ConfigMerging/YamlIncludeResolverTest.cs b/tests/Recyclarr.Tests/Config/Parsing/PostProcessing/ConfigMerging/YamlIncludeResolverTest.cs index c4d1968e..f4e2514e 100644 --- a/tests/Recyclarr.Tests/Config/Parsing/PostProcessing/ConfigMerging/YamlIncludeResolverTest.cs +++ b/tests/Recyclarr.Tests/Config/Parsing/PostProcessing/ConfigMerging/YamlIncludeResolverTest.cs @@ -1,6 +1,6 @@ using System.IO.Abstractions; -using Recyclarr.Common; using Recyclarr.Config.Parsing.PostProcessing.ConfigMerging; +using Recyclarr.TrashGuide; namespace Recyclarr.Tests.Config.Parsing.PostProcessing.ConfigMerging;