From e68641e94a77d046a38dedc2955c35bbc454e5a6 Mon Sep 17 00:00:00 2001 From: Robert Dailey Date: Fri, 18 Oct 2024 18:00:51 -0500 Subject: [PATCH] refactor: Reorganize and simplify project structure Previously, code was organized into projects that were too granular. This resulted in slower solution builds in addition to added complexity. Most class library projects have been consolidated into a single project, Recyclarr.Core. --- Recyclarr.sln | 88 ++----------------- src/Recyclarr.Cache/Recyclarr.Cache.csproj | 10 --- src/Recyclarr.Cli/Recyclarr.Cli.csproj | 7 +- src/Recyclarr.Common/Recyclarr.Common.csproj | 12 --- src/Recyclarr.Config/Recyclarr.Config.csproj | 18 ---- .../Cache}/BaseCache.cs | 0 .../Cache}/CacheAutofacModule.cs | 0 .../Cache}/CacheException.cs | 0 .../Cache}/CacheObject.cs | 0 .../Cache}/CacheObjectNameAttribute.cs | 0 .../Cache}/CachePersister.cs | 1 - .../Cache}/CacheStoragePath.cs | 0 .../Cache}/ICachePersister.cs | 0 .../Cache}/ICacheStoragePath.cs | 0 .../Common}/CommonAutofacModule.cs | 0 .../Common}/ConflictingYamlFilesException.cs | 0 .../Common}/Extensions/AutofacExtensions.cs | 0 .../Extensions/CollectionExtensions.cs | 0 .../Extensions/DictionaryExtensions.cs | 0 .../Extensions/FileSystemExtensions.cs | 0 .../Common}/Extensions/HashCodeExtensions.cs | 0 .../Common}/Extensions/RxExtensions.cs | 0 .../Common}/Extensions/StringExtensions.cs | 0 .../Common}/Extensions/TypeExtensions.cs | 0 .../FluentValidation/CustomValidator.cs | 0 .../FluentValidationExtensions.cs | 0 .../IRuntimeValidationService.cs | 0 .../RuntimeValidationService.cs | 0 .../Common}/GenericEqualityComparer.cs | 0 .../Common}/GlobalUsings.cs | 0 .../Common}/IResourceDataReader.cs | 0 .../Common}/ResourceDataReader.cs | 0 .../Common}/ScopedState.cs | 0 .../CompatibilityAutofacModule.cs | 0 .../Compatibility}/IServiceInformation.cs | 0 .../Radarr/IRadarrCapabilityFetcher.cs | 0 .../Radarr/RadarrCapabilities.cs | 0 .../Radarr/RadarrCapabilityEnforcer.cs | 0 .../Radarr/RadarrCapabilityFetcher.cs | 0 .../Recyclarr.Compatibility.csproj | 0 .../ServiceAgnosticCapabilityEnforcer.cs | 0 .../ServiceCapabilityFetcher.cs | 0 .../ServiceIncompatibilityException.cs | 0 .../Compatibility}/ServiceInformation.cs | 1 - .../Sonarr/ISonarrCapabilityFetcher.cs | 0 .../Sonarr/SonarrCapabilities.cs | 0 .../Sonarr/SonarrCapabilityEnforcer.cs | 0 .../Sonarr/SonarrCapabilityFetcher.cs | 0 .../Config}/ConfigAutofacModule.cs | 0 .../Config}/ConfigExtensions.cs | 0 .../Config}/ConfigFilterCriteria.cs | 0 .../Config}/ConfigurationRegistry.cs | 0 .../Config}/ConfigurationScope.cs | 0 .../Config}/ConfigurationScopeFactory.cs | 0 .../EnvironmentVariableNotDefinedException.cs | 0 .../EnvironmentVariablesDeserializer.cs | 0 .../EnvironmentVariablesYamlBehavior.cs | 0 .../DuplicateInstancesException.cs | 0 .../InvalidInstancesException.cs | 0 .../ExceptionTypes/SplitInstancesException.cs | 0 .../Config}/IConfigurationRegistry.cs | 0 .../Config}/Models/IServiceConfiguration.cs | 0 .../Config}/Models/RadarrConfiguration.cs | 0 .../Config}/Models/ServiceConfiguration.cs | 0 .../Config}/Models/SonarrConfiguration.cs | 0 .../Config}/Parsing/ConfigParser.cs | 0 .../Config}/Parsing/ConfigSaver.cs | 0 .../Parsing/ConfigValidationExecutor.cs | 0 .../Parsing/ConfigYamlDataObjects.Radarr.cs | 0 .../Parsing/ConfigYamlDataObjects.Sonarr.cs | 0 .../Config}/Parsing/ConfigYamlDataObjects.cs | 0 .../ConfigYamlDataObjectsValidation.cs | 0 .../Parsing/ConfigYamlMapperProfile.cs | 0 .../Config}/Parsing/ConfigurationFinder.cs | 0 .../Config}/Parsing/ConfigurationLoader.cs | 0 .../ErrorHandling/ConfigContextualMessages.cs | 0 .../ConfigFeatureRemovalBehavior.cs | 0 .../ErrorHandling/FeatureRemovalChecker.cs | 0 .../ErrorHandling/FeatureRemovalException.cs | 0 .../InvalidConfigurationFilesException.cs | 0 .../NoConfigurationFilesException.cs | 0 .../ErrorHandling/PostProcessingException.cs | 0 .../Config}/Parsing/IConfigurationFinder.cs | 0 .../Config}/Parsing/IConfigurationLoader.cs | 0 .../ConfigDeprecationPostProcessor.cs | 0 .../ConfigMerging/ConfigIncludeProcessor.cs | 0 .../ConfigMerging/IIncludeProcessor.cs | 0 .../ConfigMerging/IYamlIncludeResolver.cs | 0 .../PolymorphicIncludeYamlBehavior.cs | 0 .../ConfigMerging/RadarrConfigMerger.cs | 0 .../ConfigMerging/ServiceConfigMerger.cs | 0 .../ConfigMerging/SonarrConfigMerger.cs | 0 .../ConfigMerging/TemplateIncludeProcessor.cs | 0 .../ConfigMerging/YamlIncludeDataObjects.cs | 0 .../ConfigMerging/YamlIncludeException.cs | 0 .../ConfigMerging/YamlIncludeResolver.cs | 0 .../CfQualityProfilesDeprecationCheck.cs | 0 .../Deprecations/ConfigDeprecations.cs | 0 .../Deprecations/IConfigDeprecationCheck.cs | 0 .../PostProcessing/IConfigPostProcessor.cs | 0 .../ImplicitUrlAndKeyPostProcessor.cs | 0 .../PostProcessing/IncludePostProcessor.cs | 0 .../Config}/Parsing/YamlValidatorRuleSets.cs | 0 .../Config}/Secrets/ISecretsProvider.cs | 0 .../Secrets/SecretNotFoundException.cs | 0 .../Config}/Secrets/SecretsDeserializer.cs | 0 .../Config}/Secrets/SecretsProvider.cs | 0 .../Config}/Secrets/SecretsYamlBehavior.cs | 0 .../GlobalUsings.cs | 1 + .../Http}/FlurlLogging.cs | 1 - .../Http}/FlurlLoggingEventHandlers.cs | 1 - .../Http}/FlurlSpecificEventHandler.cs | 0 .../Http}/HttpAutofacModule.cs | 0 .../Json}/CollectionJsonConverter.cs | 0 .../Json}/GlobalJsonSerializerSettings.cs | 0 src/Recyclarr.Core/Json/GlobalUsings.cs | 1 + .../Json}/JsonAutofacModule.cs | 0 .../Json}/JsonExtensions.cs | 0 .../Json}/JsonSerializationModifiers.cs | 0 .../Json}/JsonUtils.cs | 0 .../Json}/Loading/BulkJsonLoader.cs | 0 .../Json}/Loading/GuideJsonLoader.cs | 0 .../Json}/Loading/IBulkJsonLoader.cs | 0 .../Json}/Loading/ServiceJsonLoader.cs | 0 .../Json}/ReadOnlyCollectionJsonConverter.cs | 0 .../Logging}/ExceptionExtensions.cs | 0 .../FlurlExceptionSanitizingEnricher.cs | 0 .../Logging}/ILogConfigurator.cs | 2 - .../Logging}/LogProperty.cs | 0 .../Logging}/LogSetup.cs | 1 - .../Logging}/Sanitize.cs | 0 .../Platform}/AppPaths.cs | 0 .../Platform}/DefaultAppDataSetup.cs | 0 .../Platform}/DefaultEnvironment.cs | 0 .../Platform}/DefaultRuntimeInformation.cs | 0 .../Platform}/IAppDataSetup.cs | 0 .../Platform}/IAppPaths.cs | 0 .../Platform}/IEnvironment.cs | 0 .../Platform}/IRuntimeInformation.cs | 0 .../Platform}/NoHomeDirectoryException.cs | 0 .../Platform}/PlatformAutofacModule.cs | 0 src/Recyclarr.Core/Recyclarr.Core.csproj | 25 ++++++ .../Repo}/ConfigTemplatesRepo.cs | 0 .../Repo}/ConsoleMultiRepoUpdater.cs | 0 .../Repo}/GitPath.cs | 0 .../Repo}/IConfigTemplatesRepo.cs | 0 .../Repo}/IMultiRepoUpdater.cs | 0 .../Repo}/IRepoMetadataBuilder.cs | 0 .../Repo}/IRepoUpdater.cs | 0 .../Repo}/ITrashGuidesRepo.cs | 0 .../Repo}/IUpdateableRepo.cs | 0 .../Repo}/RepoAutofacModule.cs | 0 .../Repo}/RepoMetadata.cs | 0 .../Repo}/RepoUpdater.cs | 1 - .../Repo}/TrashGuidesRepo.cs | 0 .../Repo}/TrashRepoMetadataBuilder.cs | 0 .../CustomFormat/CustomFormatApiService.cs | 0 .../CustomFormat/ICustomFormatApiService.cs | 0 .../ServarrApi}/DtoUtil.cs | 0 .../ServarrApi}/IServarrRequestBuilder.cs | 0 .../MediaNaming/IMediaNamingApiService.cs | 0 .../MediaNaming/MediaNamingApiService.cs | 0 .../ServarrApi}/MediaNaming/MediaNamingDto.cs | 0 .../MediaNaming/MediaNamingDtoExtensions.cs | 0 .../MediaNaming/RadarrMediaNamingDto.cs | 0 .../MediaNaming/SonarrMediaNamingDto.cs | 0 .../IQualityDefinitionApiService.cs | 0 .../QualityDefinitionApiService.cs | 0 .../ServiceQualityDefinitionItem.cs | 0 .../IQualityProfileApiService.cs | 0 .../QualityProfileApiExtensions.cs | 0 .../QualityProfileApiService.cs | 0 .../QualityProfile/QualityProfileDto.cs | 0 .../ServarrApi}/ServarrApiAutofacModule.cs | 0 .../ServarrApi}/ServarrRequestBuilder.cs | 1 - .../ServarrApi}/System/ISystemApiService.cs | 0 .../ServarrApi}/System/SystemApiService.cs | 0 .../ServarrApi}/System/SystemStatus.cs | 0 .../Settings}/IRepositorySettings.cs | 0 .../Settings}/ISettings.cs | 0 .../Settings}/RecyclarrSettings.cs | 0 .../Settings}/Settings.cs | 0 .../Settings}/SettingsAutofacModule.cs | 0 .../Settings}/SettingsContextualMessages.cs | 0 .../Settings}/SettingsExtensions.cs | 0 .../Settings}/SettingsLoader.cs | 0 .../Settings}/SettingsProvider.cs | 0 .../TrashGuide}/ConfigTemplateGuideService.cs | 0 .../CustomFormat/CustomFormatCategoryItem.cs | 0 .../CustomFormatCategoryParser.cs | 0 .../CustomFormat/CustomFormatData.cs | 0 .../CustomFormat/CustomFormatGuideService.cs | 0 .../CustomFormat/CustomFormatLoader.cs | 0 .../CustomFormat/CustomFormatPaths.cs | 0 .../CustomFormat/FieldsArrayJsonConverter.cs | 0 .../ICustomFormatCategoryParser.cs | 0 .../CustomFormat/ICustomFormatGuideService.cs | 0 .../CustomFormat/ICustomFormatLoader.cs | 0 .../NondeterministicValueConverter.cs | 0 .../TrashGuide}/GlobalUsings.cs | 0 .../TrashGuide}/GuideAutofacModule.cs | 0 .../IConfigTemplateGuideService.cs | 0 .../MediaNaming/IMediaNamingGuideService.cs | 0 .../MediaNaming/MediaNamingGuideService.cs | 0 .../MediaNaming/RadarrMediaNamingData.cs | 0 .../MediaNaming/SonarrMediaNamingData.cs | 0 .../QualitySize/IQualityItemLimitFetcher.cs | 0 .../QualitySize/IQualitySizeGuideService.cs | 0 .../TrashGuide}/QualitySize/QualityItem.cs | 0 .../QualitySize/QualityItemWithLimits.cs | 0 .../QualitySize/QualitySizeData.cs | 0 .../QualitySize/QualitySizeGuideParser.cs | 0 .../QualitySize/QualitySizeGuideService.cs | 0 .../QualitySize/QualitySizePaths.cs | 0 .../TrashGuide}/SupportedServices.cs | 0 .../VersionControl}/GitCmdException.cs | 0 .../VersionControl}/GitRepository.cs | 1 - .../VersionControl}/GitRepositoryFactory.cs | 1 - .../VersionControl}/IGitPath.cs | 0 .../VersionControl}/IGitRepository.cs | 0 .../VersionControl}/IGitRepositoryFactory.cs | 0 .../VersionControlAutofacModule.cs | 0 .../Yaml}/GlobalUsings.cs | 0 .../Yaml}/IYamlBehavior.cs | 0 .../Yaml}/IYamlSerializerFactory.cs | 0 .../Yaml}/UnknownYamlException.cs | 0 .../Yaml}/YamlAutofacModule.cs | 0 .../YamlDotNet/CannotBeEmptyAttribute.cs | 0 .../Yaml}/YamlDotNet/ForceEmptySequences.cs | 0 .../ReadOnlyCollectionNodeTypeResolver.cs | 0 .../Yaml}/YamlDotNet/SyntaxErrorHelper.cs | 0 .../YamlNullableEnumTypeConverter.cs | 0 .../Yaml}/YamlSerializerFactory.cs | 0 src/Recyclarr.Gui/Recyclarr.Gui.csproj | 2 +- src/Recyclarr.Http/Recyclarr.Http.csproj | 11 --- src/Recyclarr.Json/Recyclarr.Json.csproj | 12 --- .../Recyclarr.Logging.csproj | 10 --- .../Recyclarr.Platform.csproj | 7 -- src/Recyclarr.Repo/Recyclarr.Repo.csproj | 8 -- .../Recyclarr.ServarrApi.csproj | 12 --- .../Recyclarr.Settings.csproj | 9 -- src/Recyclarr.TrashGuide/GlobalUsings.cs | 2 - .../Recyclarr.TrashGuide.csproj | 9 -- .../Recyclarr.VersionControl.csproj | 9 -- src/Recyclarr.Yaml/Recyclarr.Yaml.csproj | 9 -- .../BaseCommandSetupIntegrationTest.cs | 2 +- .../Recyclarr.Cli.IntegrationTests.csproj | 1 + .../Recyclarr.Cli.TestLibrary.csproj | 1 + .../Recyclarr.Cli.Tests.csproj | 1 + .../Recyclarr.IntegrationTests.csproj | 5 +- .../Recyclarr.TestLibrary.csproj | 2 +- .../Recyclarr.Tests.TestLibrary.csproj | 3 +- .../Platform/DefaultAppDataSetupTest.cs | 1 + tests/Recyclarr.Tests/Recyclarr.Tests.csproj | 3 +- 254 files changed, 43 insertions(+), 249 deletions(-) delete mode 100644 src/Recyclarr.Cache/Recyclarr.Cache.csproj delete mode 100644 src/Recyclarr.Common/Recyclarr.Common.csproj delete mode 100644 src/Recyclarr.Config/Recyclarr.Config.csproj rename src/{Recyclarr.Cache => Recyclarr.Core/Cache}/BaseCache.cs (100%) rename src/{Recyclarr.Cache => Recyclarr.Core/Cache}/CacheAutofacModule.cs (100%) rename src/{Recyclarr.Cache => Recyclarr.Core/Cache}/CacheException.cs (100%) rename src/{Recyclarr.Cache => Recyclarr.Core/Cache}/CacheObject.cs (100%) rename src/{Recyclarr.Cache => Recyclarr.Core/Cache}/CacheObjectNameAttribute.cs (100%) rename src/{Recyclarr.Cache => Recyclarr.Core/Cache}/CachePersister.cs (99%) rename src/{Recyclarr.Cache => Recyclarr.Core/Cache}/CacheStoragePath.cs (100%) rename src/{Recyclarr.Cache => Recyclarr.Core/Cache}/ICachePersister.cs (100%) rename src/{Recyclarr.Cache => Recyclarr.Core/Cache}/ICacheStoragePath.cs (100%) rename src/{Recyclarr.Common => Recyclarr.Core/Common}/CommonAutofacModule.cs (100%) rename src/{Recyclarr.Common => Recyclarr.Core/Common}/ConflictingYamlFilesException.cs (100%) rename src/{Recyclarr.Common => Recyclarr.Core/Common}/Extensions/AutofacExtensions.cs (100%) rename src/{Recyclarr.Common => Recyclarr.Core/Common}/Extensions/CollectionExtensions.cs (100%) rename src/{Recyclarr.Common => Recyclarr.Core/Common}/Extensions/DictionaryExtensions.cs (100%) rename src/{Recyclarr.Common => Recyclarr.Core/Common}/Extensions/FileSystemExtensions.cs (100%) rename src/{Recyclarr.Common => Recyclarr.Core/Common}/Extensions/HashCodeExtensions.cs (100%) rename src/{Recyclarr.Common => Recyclarr.Core/Common}/Extensions/RxExtensions.cs (100%) rename src/{Recyclarr.Common => Recyclarr.Core/Common}/Extensions/StringExtensions.cs (100%) rename src/{Recyclarr.Common => Recyclarr.Core/Common}/Extensions/TypeExtensions.cs (100%) rename src/{Recyclarr.Common => Recyclarr.Core/Common}/FluentValidation/CustomValidator.cs (100%) rename src/{Recyclarr.Common => Recyclarr.Core/Common}/FluentValidation/FluentValidationExtensions.cs (100%) rename src/{Recyclarr.Common => Recyclarr.Core/Common}/FluentValidation/IRuntimeValidationService.cs (100%) rename src/{Recyclarr.Common => Recyclarr.Core/Common}/FluentValidation/RuntimeValidationService.cs (100%) rename src/{Recyclarr.Common => Recyclarr.Core/Common}/GenericEqualityComparer.cs (100%) rename src/{Recyclarr.Common => Recyclarr.Core/Common}/GlobalUsings.cs (100%) rename src/{Recyclarr.Common => Recyclarr.Core/Common}/IResourceDataReader.cs (100%) rename src/{Recyclarr.Common => Recyclarr.Core/Common}/ResourceDataReader.cs (100%) rename src/{Recyclarr.Common => Recyclarr.Core/Common}/ScopedState.cs (100%) rename src/{Recyclarr.Compatibility => Recyclarr.Core/Compatibility}/CompatibilityAutofacModule.cs (100%) rename src/{Recyclarr.Compatibility => Recyclarr.Core/Compatibility}/IServiceInformation.cs (100%) rename src/{Recyclarr.Compatibility => Recyclarr.Core/Compatibility}/Radarr/IRadarrCapabilityFetcher.cs (100%) rename src/{Recyclarr.Compatibility => Recyclarr.Core/Compatibility}/Radarr/RadarrCapabilities.cs (100%) rename src/{Recyclarr.Compatibility => Recyclarr.Core/Compatibility}/Radarr/RadarrCapabilityEnforcer.cs (100%) rename src/{Recyclarr.Compatibility => Recyclarr.Core/Compatibility}/Radarr/RadarrCapabilityFetcher.cs (100%) rename src/{Recyclarr.Compatibility => Recyclarr.Core/Compatibility}/Recyclarr.Compatibility.csproj (100%) rename src/{Recyclarr.Compatibility => Recyclarr.Core/Compatibility}/ServiceAgnosticCapabilityEnforcer.cs (100%) rename src/{Recyclarr.Compatibility => Recyclarr.Core/Compatibility}/ServiceCapabilityFetcher.cs (100%) rename src/{Recyclarr.Compatibility => Recyclarr.Core/Compatibility}/ServiceIncompatibilityException.cs (100%) rename src/{Recyclarr.Compatibility => Recyclarr.Core/Compatibility}/ServiceInformation.cs (98%) rename src/{Recyclarr.Compatibility => Recyclarr.Core/Compatibility}/Sonarr/ISonarrCapabilityFetcher.cs (100%) rename src/{Recyclarr.Compatibility => Recyclarr.Core/Compatibility}/Sonarr/SonarrCapabilities.cs (100%) rename src/{Recyclarr.Compatibility => Recyclarr.Core/Compatibility}/Sonarr/SonarrCapabilityEnforcer.cs (100%) rename src/{Recyclarr.Compatibility => Recyclarr.Core/Compatibility}/Sonarr/SonarrCapabilityFetcher.cs (100%) rename src/{Recyclarr.Config => Recyclarr.Core/Config}/ConfigAutofacModule.cs (100%) rename src/{Recyclarr.Config => Recyclarr.Core/Config}/ConfigExtensions.cs (100%) rename src/{Recyclarr.Config => Recyclarr.Core/Config}/ConfigFilterCriteria.cs (100%) rename src/{Recyclarr.Config => Recyclarr.Core/Config}/ConfigurationRegistry.cs (100%) rename src/{Recyclarr.Config => Recyclarr.Core/Config}/ConfigurationScope.cs (100%) rename src/{Recyclarr.Config => Recyclarr.Core/Config}/ConfigurationScopeFactory.cs (100%) rename src/{Recyclarr.Config => Recyclarr.Core/Config}/EnvironmentVariables/EnvironmentVariableNotDefinedException.cs (100%) rename src/{Recyclarr.Config => Recyclarr.Core/Config}/EnvironmentVariables/EnvironmentVariablesDeserializer.cs (100%) rename src/{Recyclarr.Config => Recyclarr.Core/Config}/EnvironmentVariables/EnvironmentVariablesYamlBehavior.cs (100%) rename src/{Recyclarr.Config => Recyclarr.Core/Config}/ExceptionTypes/DuplicateInstancesException.cs (100%) rename src/{Recyclarr.Config => Recyclarr.Core/Config}/ExceptionTypes/InvalidInstancesException.cs (100%) rename src/{Recyclarr.Config => Recyclarr.Core/Config}/ExceptionTypes/SplitInstancesException.cs (100%) rename src/{Recyclarr.Config => Recyclarr.Core/Config}/IConfigurationRegistry.cs (100%) rename src/{Recyclarr.Config => Recyclarr.Core/Config}/Models/IServiceConfiguration.cs (100%) rename src/{Recyclarr.Config => Recyclarr.Core/Config}/Models/RadarrConfiguration.cs (100%) rename src/{Recyclarr.Config => Recyclarr.Core/Config}/Models/ServiceConfiguration.cs (100%) rename src/{Recyclarr.Config => Recyclarr.Core/Config}/Models/SonarrConfiguration.cs (100%) rename src/{Recyclarr.Config => Recyclarr.Core/Config}/Parsing/ConfigParser.cs (100%) rename src/{Recyclarr.Config => Recyclarr.Core/Config}/Parsing/ConfigSaver.cs (100%) rename src/{Recyclarr.Config => Recyclarr.Core/Config}/Parsing/ConfigValidationExecutor.cs (100%) rename src/{Recyclarr.Config => Recyclarr.Core/Config}/Parsing/ConfigYamlDataObjects.Radarr.cs (100%) rename src/{Recyclarr.Config => Recyclarr.Core/Config}/Parsing/ConfigYamlDataObjects.Sonarr.cs (100%) rename src/{Recyclarr.Config => Recyclarr.Core/Config}/Parsing/ConfigYamlDataObjects.cs (100%) rename src/{Recyclarr.Config => Recyclarr.Core/Config}/Parsing/ConfigYamlDataObjectsValidation.cs (100%) rename src/{Recyclarr.Config => Recyclarr.Core/Config}/Parsing/ConfigYamlMapperProfile.cs (100%) rename src/{Recyclarr.Config => Recyclarr.Core/Config}/Parsing/ConfigurationFinder.cs (100%) rename src/{Recyclarr.Config => Recyclarr.Core/Config}/Parsing/ConfigurationLoader.cs (100%) rename src/{Recyclarr.Config => Recyclarr.Core/Config}/Parsing/ErrorHandling/ConfigContextualMessages.cs (100%) rename src/{Recyclarr.Config => Recyclarr.Core/Config}/Parsing/ErrorHandling/ConfigFeatureRemovalBehavior.cs (100%) rename src/{Recyclarr.Config => Recyclarr.Core/Config}/Parsing/ErrorHandling/FeatureRemovalChecker.cs (100%) rename src/{Recyclarr.Config => Recyclarr.Core/Config}/Parsing/ErrorHandling/FeatureRemovalException.cs (100%) rename src/{Recyclarr.Config => Recyclarr.Core/Config}/Parsing/ErrorHandling/InvalidConfigurationFilesException.cs (100%) rename src/{Recyclarr.Config => Recyclarr.Core/Config}/Parsing/ErrorHandling/NoConfigurationFilesException.cs (100%) rename src/{Recyclarr.Config => Recyclarr.Core/Config}/Parsing/ErrorHandling/PostProcessingException.cs (100%) rename src/{Recyclarr.Config => Recyclarr.Core/Config}/Parsing/IConfigurationFinder.cs (100%) rename src/{Recyclarr.Config => Recyclarr.Core/Config}/Parsing/IConfigurationLoader.cs (100%) rename src/{Recyclarr.Config => Recyclarr.Core/Config}/Parsing/PostProcessing/ConfigDeprecationPostProcessor.cs (100%) rename src/{Recyclarr.Config => Recyclarr.Core/Config}/Parsing/PostProcessing/ConfigMerging/ConfigIncludeProcessor.cs (100%) rename src/{Recyclarr.Config => Recyclarr.Core/Config}/Parsing/PostProcessing/ConfigMerging/IIncludeProcessor.cs (100%) rename src/{Recyclarr.Config => Recyclarr.Core/Config}/Parsing/PostProcessing/ConfigMerging/IYamlIncludeResolver.cs (100%) rename src/{Recyclarr.Config => Recyclarr.Core/Config}/Parsing/PostProcessing/ConfigMerging/PolymorphicIncludeYamlBehavior.cs (100%) rename src/{Recyclarr.Config => Recyclarr.Core/Config}/Parsing/PostProcessing/ConfigMerging/RadarrConfigMerger.cs (100%) rename src/{Recyclarr.Config => Recyclarr.Core/Config}/Parsing/PostProcessing/ConfigMerging/ServiceConfigMerger.cs (100%) rename src/{Recyclarr.Config => Recyclarr.Core/Config}/Parsing/PostProcessing/ConfigMerging/SonarrConfigMerger.cs (100%) rename src/{Recyclarr.Config => Recyclarr.Core/Config}/Parsing/PostProcessing/ConfigMerging/TemplateIncludeProcessor.cs (100%) rename src/{Recyclarr.Config => Recyclarr.Core/Config}/Parsing/PostProcessing/ConfigMerging/YamlIncludeDataObjects.cs (100%) rename src/{Recyclarr.Config => Recyclarr.Core/Config}/Parsing/PostProcessing/ConfigMerging/YamlIncludeException.cs (100%) rename src/{Recyclarr.Config => Recyclarr.Core/Config}/Parsing/PostProcessing/ConfigMerging/YamlIncludeResolver.cs (100%) rename src/{Recyclarr.Config => Recyclarr.Core/Config}/Parsing/PostProcessing/Deprecations/CfQualityProfilesDeprecationCheck.cs (100%) rename src/{Recyclarr.Config => Recyclarr.Core/Config}/Parsing/PostProcessing/Deprecations/ConfigDeprecations.cs (100%) rename src/{Recyclarr.Config => Recyclarr.Core/Config}/Parsing/PostProcessing/Deprecations/IConfigDeprecationCheck.cs (100%) rename src/{Recyclarr.Config => Recyclarr.Core/Config}/Parsing/PostProcessing/IConfigPostProcessor.cs (100%) rename src/{Recyclarr.Config => Recyclarr.Core/Config}/Parsing/PostProcessing/ImplicitUrlAndKeyPostProcessor.cs (100%) rename src/{Recyclarr.Config => Recyclarr.Core/Config}/Parsing/PostProcessing/IncludePostProcessor.cs (100%) rename src/{Recyclarr.Config => Recyclarr.Core/Config}/Parsing/YamlValidatorRuleSets.cs (100%) rename src/{Recyclarr.Config => Recyclarr.Core/Config}/Secrets/ISecretsProvider.cs (100%) rename src/{Recyclarr.Config => Recyclarr.Core/Config}/Secrets/SecretNotFoundException.cs (100%) rename src/{Recyclarr.Config => Recyclarr.Core/Config}/Secrets/SecretsDeserializer.cs (100%) rename src/{Recyclarr.Config => Recyclarr.Core/Config}/Secrets/SecretsProvider.cs (100%) rename src/{Recyclarr.Config => Recyclarr.Core/Config}/Secrets/SecretsYamlBehavior.cs (100%) rename src/{Recyclarr.Json => Recyclarr.Core}/GlobalUsings.cs (70%) rename src/{Recyclarr.Http => Recyclarr.Core/Http}/FlurlLogging.cs (97%) rename src/{Recyclarr.Http => Recyclarr.Core/Http}/FlurlLoggingEventHandlers.cs (99%) rename src/{Recyclarr.Http => Recyclarr.Core/Http}/FlurlSpecificEventHandler.cs (100%) rename src/{Recyclarr.Http => Recyclarr.Core/Http}/HttpAutofacModule.cs (100%) rename src/{Recyclarr.Json => Recyclarr.Core/Json}/CollectionJsonConverter.cs (100%) rename src/{Recyclarr.Json => Recyclarr.Core/Json}/GlobalJsonSerializerSettings.cs (100%) create mode 100644 src/Recyclarr.Core/Json/GlobalUsings.cs rename src/{Recyclarr.Json => Recyclarr.Core/Json}/JsonAutofacModule.cs (100%) rename src/{Recyclarr.Json => Recyclarr.Core/Json}/JsonExtensions.cs (100%) rename src/{Recyclarr.Json => Recyclarr.Core/Json}/JsonSerializationModifiers.cs (100%) rename src/{Recyclarr.Json => Recyclarr.Core/Json}/JsonUtils.cs (100%) rename src/{Recyclarr.Json => Recyclarr.Core/Json}/Loading/BulkJsonLoader.cs (100%) rename src/{Recyclarr.Json => Recyclarr.Core/Json}/Loading/GuideJsonLoader.cs (100%) rename src/{Recyclarr.Json => Recyclarr.Core/Json}/Loading/IBulkJsonLoader.cs (100%) rename src/{Recyclarr.Json => Recyclarr.Core/Json}/Loading/ServiceJsonLoader.cs (100%) rename src/{Recyclarr.Json => Recyclarr.Core/Json}/ReadOnlyCollectionJsonConverter.cs (100%) rename src/{Recyclarr.Logging => Recyclarr.Core/Logging}/ExceptionExtensions.cs (100%) rename src/{Recyclarr.Logging => Recyclarr.Core/Logging}/FlurlExceptionSanitizingEnricher.cs (100%) rename src/{Recyclarr.Logging => Recyclarr.Core/Logging}/ILogConfigurator.cs (87%) rename src/{Recyclarr.Logging => Recyclarr.Core/Logging}/LogProperty.cs (100%) rename src/{Recyclarr.Logging => Recyclarr.Core/Logging}/LogSetup.cs (97%) rename src/{Recyclarr.Logging => Recyclarr.Core/Logging}/Sanitize.cs (100%) rename src/{Recyclarr.Platform => Recyclarr.Core/Platform}/AppPaths.cs (100%) rename src/{Recyclarr.Platform => Recyclarr.Core/Platform}/DefaultAppDataSetup.cs (100%) rename src/{Recyclarr.Platform => Recyclarr.Core/Platform}/DefaultEnvironment.cs (100%) rename src/{Recyclarr.Platform => Recyclarr.Core/Platform}/DefaultRuntimeInformation.cs (100%) rename src/{Recyclarr.Platform => Recyclarr.Core/Platform}/IAppDataSetup.cs (100%) rename src/{Recyclarr.Platform => Recyclarr.Core/Platform}/IAppPaths.cs (100%) rename src/{Recyclarr.Platform => Recyclarr.Core/Platform}/IEnvironment.cs (100%) rename src/{Recyclarr.Platform => Recyclarr.Core/Platform}/IRuntimeInformation.cs (100%) rename src/{Recyclarr.Platform => Recyclarr.Core/Platform}/NoHomeDirectoryException.cs (100%) rename src/{Recyclarr.Platform => Recyclarr.Core/Platform}/PlatformAutofacModule.cs (100%) create mode 100644 src/Recyclarr.Core/Recyclarr.Core.csproj rename src/{Recyclarr.Repo => Recyclarr.Core/Repo}/ConfigTemplatesRepo.cs (100%) rename src/{Recyclarr.Repo => Recyclarr.Core/Repo}/ConsoleMultiRepoUpdater.cs (100%) rename src/{Recyclarr.Repo => Recyclarr.Core/Repo}/GitPath.cs (100%) rename src/{Recyclarr.Repo => Recyclarr.Core/Repo}/IConfigTemplatesRepo.cs (100%) rename src/{Recyclarr.Repo => Recyclarr.Core/Repo}/IMultiRepoUpdater.cs (100%) rename src/{Recyclarr.Repo => Recyclarr.Core/Repo}/IRepoMetadataBuilder.cs (100%) rename src/{Recyclarr.Repo => Recyclarr.Core/Repo}/IRepoUpdater.cs (100%) rename src/{Recyclarr.Repo => Recyclarr.Core/Repo}/ITrashGuidesRepo.cs (100%) rename src/{Recyclarr.Repo => Recyclarr.Core/Repo}/IUpdateableRepo.cs (100%) rename src/{Recyclarr.Repo => Recyclarr.Core/Repo}/RepoAutofacModule.cs (100%) rename src/{Recyclarr.Repo => Recyclarr.Core/Repo}/RepoMetadata.cs (100%) rename src/{Recyclarr.Repo => Recyclarr.Core/Repo}/RepoUpdater.cs (99%) rename src/{Recyclarr.Repo => Recyclarr.Core/Repo}/TrashGuidesRepo.cs (100%) rename src/{Recyclarr.Repo => Recyclarr.Core/Repo}/TrashRepoMetadataBuilder.cs (100%) rename src/{Recyclarr.ServarrApi => Recyclarr.Core/ServarrApi}/CustomFormat/CustomFormatApiService.cs (100%) rename src/{Recyclarr.ServarrApi => Recyclarr.Core/ServarrApi}/CustomFormat/ICustomFormatApiService.cs (100%) rename src/{Recyclarr.ServarrApi => Recyclarr.Core/ServarrApi}/DtoUtil.cs (100%) rename src/{Recyclarr.ServarrApi => Recyclarr.Core/ServarrApi}/IServarrRequestBuilder.cs (100%) rename src/{Recyclarr.ServarrApi => Recyclarr.Core/ServarrApi}/MediaNaming/IMediaNamingApiService.cs (100%) rename src/{Recyclarr.ServarrApi => Recyclarr.Core/ServarrApi}/MediaNaming/MediaNamingApiService.cs (100%) rename src/{Recyclarr.ServarrApi => Recyclarr.Core/ServarrApi}/MediaNaming/MediaNamingDto.cs (100%) rename src/{Recyclarr.ServarrApi => Recyclarr.Core/ServarrApi}/MediaNaming/MediaNamingDtoExtensions.cs (100%) rename src/{Recyclarr.ServarrApi => Recyclarr.Core/ServarrApi}/MediaNaming/RadarrMediaNamingDto.cs (100%) rename src/{Recyclarr.ServarrApi => Recyclarr.Core/ServarrApi}/MediaNaming/SonarrMediaNamingDto.cs (100%) rename src/{Recyclarr.ServarrApi => Recyclarr.Core/ServarrApi}/QualityDefinition/IQualityDefinitionApiService.cs (100%) rename src/{Recyclarr.ServarrApi => Recyclarr.Core/ServarrApi}/QualityDefinition/QualityDefinitionApiService.cs (100%) rename src/{Recyclarr.ServarrApi => Recyclarr.Core/ServarrApi}/QualityDefinition/ServiceQualityDefinitionItem.cs (100%) rename src/{Recyclarr.ServarrApi => Recyclarr.Core/ServarrApi}/QualityProfile/IQualityProfileApiService.cs (100%) rename src/{Recyclarr.ServarrApi => Recyclarr.Core/ServarrApi}/QualityProfile/QualityProfileApiExtensions.cs (100%) rename src/{Recyclarr.ServarrApi => Recyclarr.Core/ServarrApi}/QualityProfile/QualityProfileApiService.cs (100%) rename src/{Recyclarr.ServarrApi => Recyclarr.Core/ServarrApi}/QualityProfile/QualityProfileDto.cs (100%) rename src/{Recyclarr.ServarrApi => Recyclarr.Core/ServarrApi}/ServarrApiAutofacModule.cs (100%) rename src/{Recyclarr.ServarrApi => Recyclarr.Core/ServarrApi}/ServarrRequestBuilder.cs (99%) rename src/{Recyclarr.ServarrApi => Recyclarr.Core/ServarrApi}/System/ISystemApiService.cs (100%) rename src/{Recyclarr.ServarrApi => Recyclarr.Core/ServarrApi}/System/SystemApiService.cs (100%) rename src/{Recyclarr.ServarrApi => Recyclarr.Core/ServarrApi}/System/SystemStatus.cs (100%) rename src/{Recyclarr.Settings => Recyclarr.Core/Settings}/IRepositorySettings.cs (100%) rename src/{Recyclarr.Settings => Recyclarr.Core/Settings}/ISettings.cs (100%) rename src/{Recyclarr.Settings => Recyclarr.Core/Settings}/RecyclarrSettings.cs (100%) rename src/{Recyclarr.Settings => Recyclarr.Core/Settings}/Settings.cs (100%) rename src/{Recyclarr.Settings => Recyclarr.Core/Settings}/SettingsAutofacModule.cs (100%) rename src/{Recyclarr.Settings => Recyclarr.Core/Settings}/SettingsContextualMessages.cs (100%) rename src/{Recyclarr.Settings => Recyclarr.Core/Settings}/SettingsExtensions.cs (100%) rename src/{Recyclarr.Settings => Recyclarr.Core/Settings}/SettingsLoader.cs (100%) rename src/{Recyclarr.Settings => Recyclarr.Core/Settings}/SettingsProvider.cs (100%) rename src/{Recyclarr.TrashGuide => Recyclarr.Core/TrashGuide}/ConfigTemplateGuideService.cs (100%) rename src/{Recyclarr.TrashGuide => Recyclarr.Core/TrashGuide}/CustomFormat/CustomFormatCategoryItem.cs (100%) rename src/{Recyclarr.TrashGuide => Recyclarr.Core/TrashGuide}/CustomFormat/CustomFormatCategoryParser.cs (100%) rename src/{Recyclarr.TrashGuide => Recyclarr.Core/TrashGuide}/CustomFormat/CustomFormatData.cs (100%) rename src/{Recyclarr.TrashGuide => Recyclarr.Core/TrashGuide}/CustomFormat/CustomFormatGuideService.cs (100%) rename src/{Recyclarr.TrashGuide => Recyclarr.Core/TrashGuide}/CustomFormat/CustomFormatLoader.cs (100%) rename src/{Recyclarr.TrashGuide => Recyclarr.Core/TrashGuide}/CustomFormat/CustomFormatPaths.cs (100%) rename src/{Recyclarr.TrashGuide => Recyclarr.Core/TrashGuide}/CustomFormat/FieldsArrayJsonConverter.cs (100%) rename src/{Recyclarr.TrashGuide => Recyclarr.Core/TrashGuide}/CustomFormat/ICustomFormatCategoryParser.cs (100%) rename src/{Recyclarr.TrashGuide => Recyclarr.Core/TrashGuide}/CustomFormat/ICustomFormatGuideService.cs (100%) rename src/{Recyclarr.TrashGuide => Recyclarr.Core/TrashGuide}/CustomFormat/ICustomFormatLoader.cs (100%) rename src/{Recyclarr.TrashGuide => Recyclarr.Core/TrashGuide}/CustomFormat/NondeterministicValueConverter.cs (100%) rename src/{Recyclarr.Config => Recyclarr.Core/TrashGuide}/GlobalUsings.cs (100%) rename src/{Recyclarr.TrashGuide => Recyclarr.Core/TrashGuide}/GuideAutofacModule.cs (100%) rename src/{Recyclarr.TrashGuide => Recyclarr.Core/TrashGuide}/IConfigTemplateGuideService.cs (100%) rename src/{Recyclarr.TrashGuide => Recyclarr.Core/TrashGuide}/MediaNaming/IMediaNamingGuideService.cs (100%) rename src/{Recyclarr.TrashGuide => Recyclarr.Core/TrashGuide}/MediaNaming/MediaNamingGuideService.cs (100%) rename src/{Recyclarr.TrashGuide => Recyclarr.Core/TrashGuide}/MediaNaming/RadarrMediaNamingData.cs (100%) rename src/{Recyclarr.TrashGuide => Recyclarr.Core/TrashGuide}/MediaNaming/SonarrMediaNamingData.cs (100%) rename src/{Recyclarr.TrashGuide => Recyclarr.Core/TrashGuide}/QualitySize/IQualityItemLimitFetcher.cs (100%) rename src/{Recyclarr.TrashGuide => Recyclarr.Core/TrashGuide}/QualitySize/IQualitySizeGuideService.cs (100%) rename src/{Recyclarr.TrashGuide => Recyclarr.Core/TrashGuide}/QualitySize/QualityItem.cs (100%) rename src/{Recyclarr.TrashGuide => Recyclarr.Core/TrashGuide}/QualitySize/QualityItemWithLimits.cs (100%) rename src/{Recyclarr.TrashGuide => Recyclarr.Core/TrashGuide}/QualitySize/QualitySizeData.cs (100%) rename src/{Recyclarr.TrashGuide => Recyclarr.Core/TrashGuide}/QualitySize/QualitySizeGuideParser.cs (100%) rename src/{Recyclarr.TrashGuide => Recyclarr.Core/TrashGuide}/QualitySize/QualitySizeGuideService.cs (100%) rename src/{Recyclarr.TrashGuide => Recyclarr.Core/TrashGuide}/QualitySize/QualitySizePaths.cs (100%) rename src/{Recyclarr.TrashGuide => Recyclarr.Core/TrashGuide}/SupportedServices.cs (100%) rename src/{Recyclarr.VersionControl => Recyclarr.Core/VersionControl}/GitCmdException.cs (100%) rename src/{Recyclarr.VersionControl => Recyclarr.Core/VersionControl}/GitRepository.cs (99%) rename src/{Recyclarr.VersionControl => Recyclarr.Core/VersionControl}/GitRepositoryFactory.cs (99%) rename src/{Recyclarr.VersionControl => Recyclarr.Core/VersionControl}/IGitPath.cs (100%) rename src/{Recyclarr.VersionControl => Recyclarr.Core/VersionControl}/IGitRepository.cs (100%) rename src/{Recyclarr.VersionControl => Recyclarr.Core/VersionControl}/IGitRepositoryFactory.cs (100%) rename src/{Recyclarr.VersionControl => Recyclarr.Core/VersionControl}/VersionControlAutofacModule.cs (100%) rename src/{Recyclarr.Yaml => Recyclarr.Core/Yaml}/GlobalUsings.cs (100%) rename src/{Recyclarr.Yaml => Recyclarr.Core/Yaml}/IYamlBehavior.cs (100%) rename src/{Recyclarr.Yaml => Recyclarr.Core/Yaml}/IYamlSerializerFactory.cs (100%) rename src/{Recyclarr.Yaml => Recyclarr.Core/Yaml}/UnknownYamlException.cs (100%) rename src/{Recyclarr.Yaml => Recyclarr.Core/Yaml}/YamlAutofacModule.cs (100%) rename src/{Recyclarr.Yaml => Recyclarr.Core/Yaml}/YamlDotNet/CannotBeEmptyAttribute.cs (100%) rename src/{Recyclarr.Yaml => Recyclarr.Core/Yaml}/YamlDotNet/ForceEmptySequences.cs (100%) rename src/{Recyclarr.Yaml => Recyclarr.Core/Yaml}/YamlDotNet/ReadOnlyCollectionNodeTypeResolver.cs (100%) rename src/{Recyclarr.Yaml => Recyclarr.Core/Yaml}/YamlDotNet/SyntaxErrorHelper.cs (100%) rename src/{Recyclarr.Yaml => Recyclarr.Core/Yaml}/YamlDotNet/YamlNullableEnumTypeConverter.cs (100%) rename src/{Recyclarr.Yaml => Recyclarr.Core/Yaml}/YamlSerializerFactory.cs (100%) delete mode 100644 src/Recyclarr.Http/Recyclarr.Http.csproj delete mode 100644 src/Recyclarr.Json/Recyclarr.Json.csproj delete mode 100644 src/Recyclarr.Logging/Recyclarr.Logging.csproj delete mode 100644 src/Recyclarr.Platform/Recyclarr.Platform.csproj delete mode 100644 src/Recyclarr.Repo/Recyclarr.Repo.csproj delete mode 100644 src/Recyclarr.ServarrApi/Recyclarr.ServarrApi.csproj delete mode 100644 src/Recyclarr.Settings/Recyclarr.Settings.csproj delete mode 100644 src/Recyclarr.TrashGuide/GlobalUsings.cs delete mode 100644 src/Recyclarr.TrashGuide/Recyclarr.TrashGuide.csproj delete mode 100644 src/Recyclarr.VersionControl/Recyclarr.VersionControl.csproj delete mode 100644 src/Recyclarr.Yaml/Recyclarr.Yaml.csproj diff --git a/Recyclarr.sln b/Recyclarr.sln index e00e2970..b21b1ce4 100644 --- a/Recyclarr.sln +++ b/Recyclarr.sln @@ -16,8 +16,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Props", "Props", "{305C2AC5 GitVersion.yml = GitVersion.yml EndProjectSection EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Recyclarr.Common", "src\Recyclarr.Common\Recyclarr.Common.csproj", "{18CF1FCA-7983-4423-8B7E-4A830108C624}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Recyclarr.Tests", "tests\Recyclarr.Tests\Recyclarr.Tests.csproj", "{A4EC7E0D-C591-4874-B9AC-EB12A96F3E83}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Recyclarr.Gui", "src\Recyclarr.Gui\Recyclarr.Gui.csproj", "{53EECBC0-E0EA-4D6C-925C-5DB8C42CCB85}" @@ -27,26 +25,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{18E17C53 tests\Directory.Build.props = tests\Directory.Build.props EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Recyclarr.Config", "src\Recyclarr.Config\Recyclarr.Config.csproj", "{7B8F0720-A6E1-48FF-BD60-8B6964366B7F}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Recyclarr.Yaml", "src\Recyclarr.Yaml\Recyclarr.Yaml.csproj", "{62D0B120-75A0-4C86-B088-FD42E3FA1508}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Recyclarr.TrashGuide", "src\Recyclarr.TrashGuide\Recyclarr.TrashGuide.csproj", "{37220364-7C1E-4561-A369-C32BA195A0C3}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Recyclarr.Json", "src\Recyclarr.Json\Recyclarr.Json.csproj", "{A9E2F11E-73F8-48CC-8770-0AFD41E80141}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Recyclarr.Platform", "src\Recyclarr.Platform\Recyclarr.Platform.csproj", "{CB296D81-813B-48C3-9D4B-A52951EF26BF}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Recyclarr.VersionControl", "src\Recyclarr.VersionControl\Recyclarr.VersionControl.csproj", "{0495507A-0307-43EA-B97F-EDF2C0241839}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Recyclarr.Repo", "src\Recyclarr.Repo\Recyclarr.Repo.csproj", "{6A4E06DF-464E-4DD4-890C-EC5182E96C13}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Recyclarr.Settings", "src\Recyclarr.Settings\Recyclarr.Settings.csproj", "{CDB0249D-18F2-4262-BAF3-3A3DB10E31F8}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Recyclarr.ServarrApi", "src\Recyclarr.ServarrApi\Recyclarr.ServarrApi.csproj", "{5B48995A-1181-46AA-AC38-C040BDD3D7B7}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Recyclarr.Compatibility", "src\Recyclarr.Compatibility\Recyclarr.Compatibility.csproj", "{03B4A46E-234D-47C9-8078-0B749800229A}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Recyclarr.Tests.TestLibrary", "tests\Recyclarr.Tests.TestLibrary\Recyclarr.Tests.TestLibrary.csproj", "{DE198BA1-2906-43BB-9CDB-977B9218A670}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Recyclarr.IntegrationTests", "tests\Recyclarr.IntegrationTests\Recyclarr.IntegrationTests.csproj", "{0D472E9E-81D9-4E33-8542-A973CF9E4EA8}" @@ -55,13 +33,9 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Recyclarr.Cli.IntegrationTe EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Recyclarr.Cli.Tests", "tests\Recyclarr.Cli.Tests\Recyclarr.Cli.Tests.csproj", "{59886A2A-338F-4864-9735-1633433B1F8F}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Recyclarr.Http", "src\Recyclarr.Http\Recyclarr.Http.csproj", "{9B90CD1F-5D31-42A4-B0DD-A12BB7DC68CD}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Recyclarr.Cache", "src\Recyclarr.Cache\Recyclarr.Cache.csproj", "{5B9A6ECF-8DC7-427E-8D98-3DC574D87255}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Recyclarr.Cli.TestLibrary", "tests\Recyclarr.Cli.TestLibrary\Recyclarr.Cli.TestLibrary.csproj", "{7B730BDB-1519-4847-BA23-998AB3750E31}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Recyclarr.Logging", "src\Recyclarr.Logging\Recyclarr.Logging.csproj", "{0CE6D5F2-A7DC-4C03-B367-ECF8D06FC51E}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Recyclarr.Core", "src\Recyclarr.Core\Recyclarr.Core.csproj", "{14F923B3-13EB-46D2-8AD0-D0811B46952A}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -77,10 +51,6 @@ Global {49F28A82-468F-4C48-9A59-D41B8FE26D6E}.Debug|Any CPU.Build.0 = Debug|Any CPU {49F28A82-468F-4C48-9A59-D41B8FE26D6E}.Release|Any CPU.ActiveCfg = Release|Any CPU {49F28A82-468F-4C48-9A59-D41B8FE26D6E}.Release|Any CPU.Build.0 = Release|Any CPU - {18CF1FCA-7983-4423-8B7E-4A830108C624}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {18CF1FCA-7983-4423-8B7E-4A830108C624}.Debug|Any CPU.Build.0 = Debug|Any CPU - {18CF1FCA-7983-4423-8B7E-4A830108C624}.Release|Any CPU.ActiveCfg = Release|Any CPU - {18CF1FCA-7983-4423-8B7E-4A830108C624}.Release|Any CPU.Build.0 = Release|Any CPU {A4EC7E0D-C591-4874-B9AC-EB12A96F3E83}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {A4EC7E0D-C591-4874-B9AC-EB12A96F3E83}.Debug|Any CPU.Build.0 = Debug|Any CPU {A4EC7E0D-C591-4874-B9AC-EB12A96F3E83}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -89,46 +59,6 @@ Global {53EECBC0-E0EA-4D6C-925C-5DB8C42CCB85}.Debug|Any CPU.Build.0 = Debug|Any CPU {53EECBC0-E0EA-4D6C-925C-5DB8C42CCB85}.Release|Any CPU.ActiveCfg = Release|Any CPU {53EECBC0-E0EA-4D6C-925C-5DB8C42CCB85}.Release|Any CPU.Build.0 = Release|Any CPU - {7B8F0720-A6E1-48FF-BD60-8B6964366B7F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7B8F0720-A6E1-48FF-BD60-8B6964366B7F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7B8F0720-A6E1-48FF-BD60-8B6964366B7F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7B8F0720-A6E1-48FF-BD60-8B6964366B7F}.Release|Any CPU.Build.0 = Release|Any CPU - {62D0B120-75A0-4C86-B088-FD42E3FA1508}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {62D0B120-75A0-4C86-B088-FD42E3FA1508}.Debug|Any CPU.Build.0 = Debug|Any CPU - {62D0B120-75A0-4C86-B088-FD42E3FA1508}.Release|Any CPU.ActiveCfg = Release|Any CPU - {62D0B120-75A0-4C86-B088-FD42E3FA1508}.Release|Any CPU.Build.0 = Release|Any CPU - {37220364-7C1E-4561-A369-C32BA195A0C3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {37220364-7C1E-4561-A369-C32BA195A0C3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {37220364-7C1E-4561-A369-C32BA195A0C3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {37220364-7C1E-4561-A369-C32BA195A0C3}.Release|Any CPU.Build.0 = Release|Any CPU - {A9E2F11E-73F8-48CC-8770-0AFD41E80141}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A9E2F11E-73F8-48CC-8770-0AFD41E80141}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A9E2F11E-73F8-48CC-8770-0AFD41E80141}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A9E2F11E-73F8-48CC-8770-0AFD41E80141}.Release|Any CPU.Build.0 = Release|Any CPU - {CB296D81-813B-48C3-9D4B-A52951EF26BF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CB296D81-813B-48C3-9D4B-A52951EF26BF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CB296D81-813B-48C3-9D4B-A52951EF26BF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CB296D81-813B-48C3-9D4B-A52951EF26BF}.Release|Any CPU.Build.0 = Release|Any CPU - {0495507A-0307-43EA-B97F-EDF2C0241839}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0495507A-0307-43EA-B97F-EDF2C0241839}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0495507A-0307-43EA-B97F-EDF2C0241839}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0495507A-0307-43EA-B97F-EDF2C0241839}.Release|Any CPU.Build.0 = Release|Any CPU - {6A4E06DF-464E-4DD4-890C-EC5182E96C13}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6A4E06DF-464E-4DD4-890C-EC5182E96C13}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6A4E06DF-464E-4DD4-890C-EC5182E96C13}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6A4E06DF-464E-4DD4-890C-EC5182E96C13}.Release|Any CPU.Build.0 = Release|Any CPU - {CDB0249D-18F2-4262-BAF3-3A3DB10E31F8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CDB0249D-18F2-4262-BAF3-3A3DB10E31F8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CDB0249D-18F2-4262-BAF3-3A3DB10E31F8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CDB0249D-18F2-4262-BAF3-3A3DB10E31F8}.Release|Any CPU.Build.0 = Release|Any CPU - {5B48995A-1181-46AA-AC38-C040BDD3D7B7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5B48995A-1181-46AA-AC38-C040BDD3D7B7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5B48995A-1181-46AA-AC38-C040BDD3D7B7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5B48995A-1181-46AA-AC38-C040BDD3D7B7}.Release|Any CPU.Build.0 = Release|Any CPU - {03B4A46E-234D-47C9-8078-0B749800229A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {03B4A46E-234D-47C9-8078-0B749800229A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {03B4A46E-234D-47C9-8078-0B749800229A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {03B4A46E-234D-47C9-8078-0B749800229A}.Release|Any CPU.Build.0 = Release|Any CPU {DE198BA1-2906-43BB-9CDB-977B9218A670}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {DE198BA1-2906-43BB-9CDB-977B9218A670}.Debug|Any CPU.Build.0 = Debug|Any CPU {DE198BA1-2906-43BB-9CDB-977B9218A670}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -145,22 +75,14 @@ Global {59886A2A-338F-4864-9735-1633433B1F8F}.Debug|Any CPU.Build.0 = Debug|Any CPU {59886A2A-338F-4864-9735-1633433B1F8F}.Release|Any CPU.ActiveCfg = Release|Any CPU {59886A2A-338F-4864-9735-1633433B1F8F}.Release|Any CPU.Build.0 = Release|Any CPU - {9B90CD1F-5D31-42A4-B0DD-A12BB7DC68CD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9B90CD1F-5D31-42A4-B0DD-A12BB7DC68CD}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9B90CD1F-5D31-42A4-B0DD-A12BB7DC68CD}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9B90CD1F-5D31-42A4-B0DD-A12BB7DC68CD}.Release|Any CPU.Build.0 = Release|Any CPU - {5B9A6ECF-8DC7-427E-8D98-3DC574D87255}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5B9A6ECF-8DC7-427E-8D98-3DC574D87255}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5B9A6ECF-8DC7-427E-8D98-3DC574D87255}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5B9A6ECF-8DC7-427E-8D98-3DC574D87255}.Release|Any CPU.Build.0 = Release|Any CPU {7B730BDB-1519-4847-BA23-998AB3750E31}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {7B730BDB-1519-4847-BA23-998AB3750E31}.Debug|Any CPU.Build.0 = Debug|Any CPU {7B730BDB-1519-4847-BA23-998AB3750E31}.Release|Any CPU.ActiveCfg = Release|Any CPU {7B730BDB-1519-4847-BA23-998AB3750E31}.Release|Any CPU.Build.0 = Release|Any CPU - {0CE6D5F2-A7DC-4C03-B367-ECF8D06FC51E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0CE6D5F2-A7DC-4C03-B367-ECF8D06FC51E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0CE6D5F2-A7DC-4C03-B367-ECF8D06FC51E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0CE6D5F2-A7DC-4C03-B367-ECF8D06FC51E}.Release|Any CPU.Build.0 = Release|Any CPU + {14F923B3-13EB-46D2-8AD0-D0811B46952A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {14F923B3-13EB-46D2-8AD0-D0811B46952A}.Debug|Any CPU.Build.0 = Debug|Any CPU + {14F923B3-13EB-46D2-8AD0-D0811B46952A}.Release|Any CPU.ActiveCfg = Release|Any CPU + {14F923B3-13EB-46D2-8AD0-D0811B46952A}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/src/Recyclarr.Cache/Recyclarr.Cache.csproj b/src/Recyclarr.Cache/Recyclarr.Cache.csproj deleted file mode 100644 index a107a9c4..00000000 --- a/src/Recyclarr.Cache/Recyclarr.Cache.csproj +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - diff --git a/src/Recyclarr.Cli/Recyclarr.Cli.csproj b/src/Recyclarr.Cli/Recyclarr.Cli.csproj index f92d3b83..96f6b3fc 100644 --- a/src/Recyclarr.Cli/Recyclarr.Cli.csproj +++ b/src/Recyclarr.Cli/Recyclarr.Cli.csproj @@ -26,12 +26,7 @@ - - - - - - + diff --git a/src/Recyclarr.Common/Recyclarr.Common.csproj b/src/Recyclarr.Common/Recyclarr.Common.csproj deleted file mode 100644 index 6312e64a..00000000 --- a/src/Recyclarr.Common/Recyclarr.Common.csproj +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/src/Recyclarr.Config/Recyclarr.Config.csproj b/src/Recyclarr.Config/Recyclarr.Config.csproj deleted file mode 100644 index 9ddfa9d3..00000000 --- a/src/Recyclarr.Config/Recyclarr.Config.csproj +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - - - - - - - - - - diff --git a/src/Recyclarr.Cache/BaseCache.cs b/src/Recyclarr.Core/Cache/BaseCache.cs similarity index 100% rename from src/Recyclarr.Cache/BaseCache.cs rename to src/Recyclarr.Core/Cache/BaseCache.cs diff --git a/src/Recyclarr.Cache/CacheAutofacModule.cs b/src/Recyclarr.Core/Cache/CacheAutofacModule.cs similarity index 100% rename from src/Recyclarr.Cache/CacheAutofacModule.cs rename to src/Recyclarr.Core/Cache/CacheAutofacModule.cs diff --git a/src/Recyclarr.Cache/CacheException.cs b/src/Recyclarr.Core/Cache/CacheException.cs similarity index 100% rename from src/Recyclarr.Cache/CacheException.cs rename to src/Recyclarr.Core/Cache/CacheException.cs diff --git a/src/Recyclarr.Cache/CacheObject.cs b/src/Recyclarr.Core/Cache/CacheObject.cs similarity index 100% rename from src/Recyclarr.Cache/CacheObject.cs rename to src/Recyclarr.Core/Cache/CacheObject.cs diff --git a/src/Recyclarr.Cache/CacheObjectNameAttribute.cs b/src/Recyclarr.Core/Cache/CacheObjectNameAttribute.cs similarity index 100% rename from src/Recyclarr.Cache/CacheObjectNameAttribute.cs rename to src/Recyclarr.Core/Cache/CacheObjectNameAttribute.cs diff --git a/src/Recyclarr.Cache/CachePersister.cs b/src/Recyclarr.Core/Cache/CachePersister.cs similarity index 99% rename from src/Recyclarr.Cache/CachePersister.cs rename to src/Recyclarr.Core/Cache/CachePersister.cs index e47e31fe..b94b631c 100644 --- a/src/Recyclarr.Cache/CachePersister.cs +++ b/src/Recyclarr.Core/Cache/CachePersister.cs @@ -2,7 +2,6 @@ using System.Text.Json; using Recyclarr.Common.Extensions; using Recyclarr.Config.Models; using Recyclarr.Json; -using Serilog; namespace Recyclarr.Cache; diff --git a/src/Recyclarr.Cache/CacheStoragePath.cs b/src/Recyclarr.Core/Cache/CacheStoragePath.cs similarity index 100% rename from src/Recyclarr.Cache/CacheStoragePath.cs rename to src/Recyclarr.Core/Cache/CacheStoragePath.cs diff --git a/src/Recyclarr.Cache/ICachePersister.cs b/src/Recyclarr.Core/Cache/ICachePersister.cs similarity index 100% rename from src/Recyclarr.Cache/ICachePersister.cs rename to src/Recyclarr.Core/Cache/ICachePersister.cs diff --git a/src/Recyclarr.Cache/ICacheStoragePath.cs b/src/Recyclarr.Core/Cache/ICacheStoragePath.cs similarity index 100% rename from src/Recyclarr.Cache/ICacheStoragePath.cs rename to src/Recyclarr.Core/Cache/ICacheStoragePath.cs diff --git a/src/Recyclarr.Common/CommonAutofacModule.cs b/src/Recyclarr.Core/Common/CommonAutofacModule.cs similarity index 100% rename from src/Recyclarr.Common/CommonAutofacModule.cs rename to src/Recyclarr.Core/Common/CommonAutofacModule.cs diff --git a/src/Recyclarr.Common/ConflictingYamlFilesException.cs b/src/Recyclarr.Core/Common/ConflictingYamlFilesException.cs similarity index 100% rename from src/Recyclarr.Common/ConflictingYamlFilesException.cs rename to src/Recyclarr.Core/Common/ConflictingYamlFilesException.cs diff --git a/src/Recyclarr.Common/Extensions/AutofacExtensions.cs b/src/Recyclarr.Core/Common/Extensions/AutofacExtensions.cs similarity index 100% rename from src/Recyclarr.Common/Extensions/AutofacExtensions.cs rename to src/Recyclarr.Core/Common/Extensions/AutofacExtensions.cs diff --git a/src/Recyclarr.Common/Extensions/CollectionExtensions.cs b/src/Recyclarr.Core/Common/Extensions/CollectionExtensions.cs similarity index 100% rename from src/Recyclarr.Common/Extensions/CollectionExtensions.cs rename to src/Recyclarr.Core/Common/Extensions/CollectionExtensions.cs diff --git a/src/Recyclarr.Common/Extensions/DictionaryExtensions.cs b/src/Recyclarr.Core/Common/Extensions/DictionaryExtensions.cs similarity index 100% rename from src/Recyclarr.Common/Extensions/DictionaryExtensions.cs rename to src/Recyclarr.Core/Common/Extensions/DictionaryExtensions.cs diff --git a/src/Recyclarr.Common/Extensions/FileSystemExtensions.cs b/src/Recyclarr.Core/Common/Extensions/FileSystemExtensions.cs similarity index 100% rename from src/Recyclarr.Common/Extensions/FileSystemExtensions.cs rename to src/Recyclarr.Core/Common/Extensions/FileSystemExtensions.cs diff --git a/src/Recyclarr.Common/Extensions/HashCodeExtensions.cs b/src/Recyclarr.Core/Common/Extensions/HashCodeExtensions.cs similarity index 100% rename from src/Recyclarr.Common/Extensions/HashCodeExtensions.cs rename to src/Recyclarr.Core/Common/Extensions/HashCodeExtensions.cs diff --git a/src/Recyclarr.Common/Extensions/RxExtensions.cs b/src/Recyclarr.Core/Common/Extensions/RxExtensions.cs similarity index 100% rename from src/Recyclarr.Common/Extensions/RxExtensions.cs rename to src/Recyclarr.Core/Common/Extensions/RxExtensions.cs diff --git a/src/Recyclarr.Common/Extensions/StringExtensions.cs b/src/Recyclarr.Core/Common/Extensions/StringExtensions.cs similarity index 100% rename from src/Recyclarr.Common/Extensions/StringExtensions.cs rename to src/Recyclarr.Core/Common/Extensions/StringExtensions.cs diff --git a/src/Recyclarr.Common/Extensions/TypeExtensions.cs b/src/Recyclarr.Core/Common/Extensions/TypeExtensions.cs similarity index 100% rename from src/Recyclarr.Common/Extensions/TypeExtensions.cs rename to src/Recyclarr.Core/Common/Extensions/TypeExtensions.cs diff --git a/src/Recyclarr.Common/FluentValidation/CustomValidator.cs b/src/Recyclarr.Core/Common/FluentValidation/CustomValidator.cs similarity index 100% rename from src/Recyclarr.Common/FluentValidation/CustomValidator.cs rename to src/Recyclarr.Core/Common/FluentValidation/CustomValidator.cs diff --git a/src/Recyclarr.Common/FluentValidation/FluentValidationExtensions.cs b/src/Recyclarr.Core/Common/FluentValidation/FluentValidationExtensions.cs similarity index 100% rename from src/Recyclarr.Common/FluentValidation/FluentValidationExtensions.cs rename to src/Recyclarr.Core/Common/FluentValidation/FluentValidationExtensions.cs diff --git a/src/Recyclarr.Common/FluentValidation/IRuntimeValidationService.cs b/src/Recyclarr.Core/Common/FluentValidation/IRuntimeValidationService.cs similarity index 100% rename from src/Recyclarr.Common/FluentValidation/IRuntimeValidationService.cs rename to src/Recyclarr.Core/Common/FluentValidation/IRuntimeValidationService.cs diff --git a/src/Recyclarr.Common/FluentValidation/RuntimeValidationService.cs b/src/Recyclarr.Core/Common/FluentValidation/RuntimeValidationService.cs similarity index 100% rename from src/Recyclarr.Common/FluentValidation/RuntimeValidationService.cs rename to src/Recyclarr.Core/Common/FluentValidation/RuntimeValidationService.cs diff --git a/src/Recyclarr.Common/GenericEqualityComparer.cs b/src/Recyclarr.Core/Common/GenericEqualityComparer.cs similarity index 100% rename from src/Recyclarr.Common/GenericEqualityComparer.cs rename to src/Recyclarr.Core/Common/GenericEqualityComparer.cs diff --git a/src/Recyclarr.Common/GlobalUsings.cs b/src/Recyclarr.Core/Common/GlobalUsings.cs similarity index 100% rename from src/Recyclarr.Common/GlobalUsings.cs rename to src/Recyclarr.Core/Common/GlobalUsings.cs diff --git a/src/Recyclarr.Common/IResourceDataReader.cs b/src/Recyclarr.Core/Common/IResourceDataReader.cs similarity index 100% rename from src/Recyclarr.Common/IResourceDataReader.cs rename to src/Recyclarr.Core/Common/IResourceDataReader.cs diff --git a/src/Recyclarr.Common/ResourceDataReader.cs b/src/Recyclarr.Core/Common/ResourceDataReader.cs similarity index 100% rename from src/Recyclarr.Common/ResourceDataReader.cs rename to src/Recyclarr.Core/Common/ResourceDataReader.cs diff --git a/src/Recyclarr.Common/ScopedState.cs b/src/Recyclarr.Core/Common/ScopedState.cs similarity index 100% rename from src/Recyclarr.Common/ScopedState.cs rename to src/Recyclarr.Core/Common/ScopedState.cs diff --git a/src/Recyclarr.Compatibility/CompatibilityAutofacModule.cs b/src/Recyclarr.Core/Compatibility/CompatibilityAutofacModule.cs similarity index 100% rename from src/Recyclarr.Compatibility/CompatibilityAutofacModule.cs rename to src/Recyclarr.Core/Compatibility/CompatibilityAutofacModule.cs diff --git a/src/Recyclarr.Compatibility/IServiceInformation.cs b/src/Recyclarr.Core/Compatibility/IServiceInformation.cs similarity index 100% rename from src/Recyclarr.Compatibility/IServiceInformation.cs rename to src/Recyclarr.Core/Compatibility/IServiceInformation.cs diff --git a/src/Recyclarr.Compatibility/Radarr/IRadarrCapabilityFetcher.cs b/src/Recyclarr.Core/Compatibility/Radarr/IRadarrCapabilityFetcher.cs similarity index 100% rename from src/Recyclarr.Compatibility/Radarr/IRadarrCapabilityFetcher.cs rename to src/Recyclarr.Core/Compatibility/Radarr/IRadarrCapabilityFetcher.cs diff --git a/src/Recyclarr.Compatibility/Radarr/RadarrCapabilities.cs b/src/Recyclarr.Core/Compatibility/Radarr/RadarrCapabilities.cs similarity index 100% rename from src/Recyclarr.Compatibility/Radarr/RadarrCapabilities.cs rename to src/Recyclarr.Core/Compatibility/Radarr/RadarrCapabilities.cs diff --git a/src/Recyclarr.Compatibility/Radarr/RadarrCapabilityEnforcer.cs b/src/Recyclarr.Core/Compatibility/Radarr/RadarrCapabilityEnforcer.cs similarity index 100% rename from src/Recyclarr.Compatibility/Radarr/RadarrCapabilityEnforcer.cs rename to src/Recyclarr.Core/Compatibility/Radarr/RadarrCapabilityEnforcer.cs diff --git a/src/Recyclarr.Compatibility/Radarr/RadarrCapabilityFetcher.cs b/src/Recyclarr.Core/Compatibility/Radarr/RadarrCapabilityFetcher.cs similarity index 100% rename from src/Recyclarr.Compatibility/Radarr/RadarrCapabilityFetcher.cs rename to src/Recyclarr.Core/Compatibility/Radarr/RadarrCapabilityFetcher.cs diff --git a/src/Recyclarr.Compatibility/Recyclarr.Compatibility.csproj b/src/Recyclarr.Core/Compatibility/Recyclarr.Compatibility.csproj similarity index 100% rename from src/Recyclarr.Compatibility/Recyclarr.Compatibility.csproj rename to src/Recyclarr.Core/Compatibility/Recyclarr.Compatibility.csproj diff --git a/src/Recyclarr.Compatibility/ServiceAgnosticCapabilityEnforcer.cs b/src/Recyclarr.Core/Compatibility/ServiceAgnosticCapabilityEnforcer.cs similarity index 100% rename from src/Recyclarr.Compatibility/ServiceAgnosticCapabilityEnforcer.cs rename to src/Recyclarr.Core/Compatibility/ServiceAgnosticCapabilityEnforcer.cs diff --git a/src/Recyclarr.Compatibility/ServiceCapabilityFetcher.cs b/src/Recyclarr.Core/Compatibility/ServiceCapabilityFetcher.cs similarity index 100% rename from src/Recyclarr.Compatibility/ServiceCapabilityFetcher.cs rename to src/Recyclarr.Core/Compatibility/ServiceCapabilityFetcher.cs diff --git a/src/Recyclarr.Compatibility/ServiceIncompatibilityException.cs b/src/Recyclarr.Core/Compatibility/ServiceIncompatibilityException.cs similarity index 100% rename from src/Recyclarr.Compatibility/ServiceIncompatibilityException.cs rename to src/Recyclarr.Core/Compatibility/ServiceIncompatibilityException.cs diff --git a/src/Recyclarr.Compatibility/ServiceInformation.cs b/src/Recyclarr.Core/Compatibility/ServiceInformation.cs similarity index 98% rename from src/Recyclarr.Compatibility/ServiceInformation.cs rename to src/Recyclarr.Core/Compatibility/ServiceInformation.cs index 7f42b006..08ec6851 100644 --- a/src/Recyclarr.Compatibility/ServiceInformation.cs +++ b/src/Recyclarr.Core/Compatibility/ServiceInformation.cs @@ -1,6 +1,5 @@ using Flurl.Http; using Recyclarr.ServarrApi.System; -using Serilog; namespace Recyclarr.Compatibility; diff --git a/src/Recyclarr.Compatibility/Sonarr/ISonarrCapabilityFetcher.cs b/src/Recyclarr.Core/Compatibility/Sonarr/ISonarrCapabilityFetcher.cs similarity index 100% rename from src/Recyclarr.Compatibility/Sonarr/ISonarrCapabilityFetcher.cs rename to src/Recyclarr.Core/Compatibility/Sonarr/ISonarrCapabilityFetcher.cs diff --git a/src/Recyclarr.Compatibility/Sonarr/SonarrCapabilities.cs b/src/Recyclarr.Core/Compatibility/Sonarr/SonarrCapabilities.cs similarity index 100% rename from src/Recyclarr.Compatibility/Sonarr/SonarrCapabilities.cs rename to src/Recyclarr.Core/Compatibility/Sonarr/SonarrCapabilities.cs diff --git a/src/Recyclarr.Compatibility/Sonarr/SonarrCapabilityEnforcer.cs b/src/Recyclarr.Core/Compatibility/Sonarr/SonarrCapabilityEnforcer.cs similarity index 100% rename from src/Recyclarr.Compatibility/Sonarr/SonarrCapabilityEnforcer.cs rename to src/Recyclarr.Core/Compatibility/Sonarr/SonarrCapabilityEnforcer.cs diff --git a/src/Recyclarr.Compatibility/Sonarr/SonarrCapabilityFetcher.cs b/src/Recyclarr.Core/Compatibility/Sonarr/SonarrCapabilityFetcher.cs similarity index 100% rename from src/Recyclarr.Compatibility/Sonarr/SonarrCapabilityFetcher.cs rename to src/Recyclarr.Core/Compatibility/Sonarr/SonarrCapabilityFetcher.cs diff --git a/src/Recyclarr.Config/ConfigAutofacModule.cs b/src/Recyclarr.Core/Config/ConfigAutofacModule.cs similarity index 100% rename from src/Recyclarr.Config/ConfigAutofacModule.cs rename to src/Recyclarr.Core/Config/ConfigAutofacModule.cs diff --git a/src/Recyclarr.Config/ConfigExtensions.cs b/src/Recyclarr.Core/Config/ConfigExtensions.cs similarity index 100% rename from src/Recyclarr.Config/ConfigExtensions.cs rename to src/Recyclarr.Core/Config/ConfigExtensions.cs diff --git a/src/Recyclarr.Config/ConfigFilterCriteria.cs b/src/Recyclarr.Core/Config/ConfigFilterCriteria.cs similarity index 100% rename from src/Recyclarr.Config/ConfigFilterCriteria.cs rename to src/Recyclarr.Core/Config/ConfigFilterCriteria.cs diff --git a/src/Recyclarr.Config/ConfigurationRegistry.cs b/src/Recyclarr.Core/Config/ConfigurationRegistry.cs similarity index 100% rename from src/Recyclarr.Config/ConfigurationRegistry.cs rename to src/Recyclarr.Core/Config/ConfigurationRegistry.cs diff --git a/src/Recyclarr.Config/ConfigurationScope.cs b/src/Recyclarr.Core/Config/ConfigurationScope.cs similarity index 100% rename from src/Recyclarr.Config/ConfigurationScope.cs rename to src/Recyclarr.Core/Config/ConfigurationScope.cs diff --git a/src/Recyclarr.Config/ConfigurationScopeFactory.cs b/src/Recyclarr.Core/Config/ConfigurationScopeFactory.cs similarity index 100% rename from src/Recyclarr.Config/ConfigurationScopeFactory.cs rename to src/Recyclarr.Core/Config/ConfigurationScopeFactory.cs diff --git a/src/Recyclarr.Config/EnvironmentVariables/EnvironmentVariableNotDefinedException.cs b/src/Recyclarr.Core/Config/EnvironmentVariables/EnvironmentVariableNotDefinedException.cs similarity index 100% rename from src/Recyclarr.Config/EnvironmentVariables/EnvironmentVariableNotDefinedException.cs rename to src/Recyclarr.Core/Config/EnvironmentVariables/EnvironmentVariableNotDefinedException.cs diff --git a/src/Recyclarr.Config/EnvironmentVariables/EnvironmentVariablesDeserializer.cs b/src/Recyclarr.Core/Config/EnvironmentVariables/EnvironmentVariablesDeserializer.cs similarity index 100% rename from src/Recyclarr.Config/EnvironmentVariables/EnvironmentVariablesDeserializer.cs rename to src/Recyclarr.Core/Config/EnvironmentVariables/EnvironmentVariablesDeserializer.cs diff --git a/src/Recyclarr.Config/EnvironmentVariables/EnvironmentVariablesYamlBehavior.cs b/src/Recyclarr.Core/Config/EnvironmentVariables/EnvironmentVariablesYamlBehavior.cs similarity index 100% rename from src/Recyclarr.Config/EnvironmentVariables/EnvironmentVariablesYamlBehavior.cs rename to src/Recyclarr.Core/Config/EnvironmentVariables/EnvironmentVariablesYamlBehavior.cs diff --git a/src/Recyclarr.Config/ExceptionTypes/DuplicateInstancesException.cs b/src/Recyclarr.Core/Config/ExceptionTypes/DuplicateInstancesException.cs similarity index 100% rename from src/Recyclarr.Config/ExceptionTypes/DuplicateInstancesException.cs rename to src/Recyclarr.Core/Config/ExceptionTypes/DuplicateInstancesException.cs diff --git a/src/Recyclarr.Config/ExceptionTypes/InvalidInstancesException.cs b/src/Recyclarr.Core/Config/ExceptionTypes/InvalidInstancesException.cs similarity index 100% rename from src/Recyclarr.Config/ExceptionTypes/InvalidInstancesException.cs rename to src/Recyclarr.Core/Config/ExceptionTypes/InvalidInstancesException.cs diff --git a/src/Recyclarr.Config/ExceptionTypes/SplitInstancesException.cs b/src/Recyclarr.Core/Config/ExceptionTypes/SplitInstancesException.cs similarity index 100% rename from src/Recyclarr.Config/ExceptionTypes/SplitInstancesException.cs rename to src/Recyclarr.Core/Config/ExceptionTypes/SplitInstancesException.cs diff --git a/src/Recyclarr.Config/IConfigurationRegistry.cs b/src/Recyclarr.Core/Config/IConfigurationRegistry.cs similarity index 100% rename from src/Recyclarr.Config/IConfigurationRegistry.cs rename to src/Recyclarr.Core/Config/IConfigurationRegistry.cs diff --git a/src/Recyclarr.Config/Models/IServiceConfiguration.cs b/src/Recyclarr.Core/Config/Models/IServiceConfiguration.cs similarity index 100% rename from src/Recyclarr.Config/Models/IServiceConfiguration.cs rename to src/Recyclarr.Core/Config/Models/IServiceConfiguration.cs diff --git a/src/Recyclarr.Config/Models/RadarrConfiguration.cs b/src/Recyclarr.Core/Config/Models/RadarrConfiguration.cs similarity index 100% rename from src/Recyclarr.Config/Models/RadarrConfiguration.cs rename to src/Recyclarr.Core/Config/Models/RadarrConfiguration.cs diff --git a/src/Recyclarr.Config/Models/ServiceConfiguration.cs b/src/Recyclarr.Core/Config/Models/ServiceConfiguration.cs similarity index 100% rename from src/Recyclarr.Config/Models/ServiceConfiguration.cs rename to src/Recyclarr.Core/Config/Models/ServiceConfiguration.cs diff --git a/src/Recyclarr.Config/Models/SonarrConfiguration.cs b/src/Recyclarr.Core/Config/Models/SonarrConfiguration.cs similarity index 100% rename from src/Recyclarr.Config/Models/SonarrConfiguration.cs rename to src/Recyclarr.Core/Config/Models/SonarrConfiguration.cs diff --git a/src/Recyclarr.Config/Parsing/ConfigParser.cs b/src/Recyclarr.Core/Config/Parsing/ConfigParser.cs similarity index 100% rename from src/Recyclarr.Config/Parsing/ConfigParser.cs rename to src/Recyclarr.Core/Config/Parsing/ConfigParser.cs diff --git a/src/Recyclarr.Config/Parsing/ConfigSaver.cs b/src/Recyclarr.Core/Config/Parsing/ConfigSaver.cs similarity index 100% rename from src/Recyclarr.Config/Parsing/ConfigSaver.cs rename to src/Recyclarr.Core/Config/Parsing/ConfigSaver.cs diff --git a/src/Recyclarr.Config/Parsing/ConfigValidationExecutor.cs b/src/Recyclarr.Core/Config/Parsing/ConfigValidationExecutor.cs similarity index 100% rename from src/Recyclarr.Config/Parsing/ConfigValidationExecutor.cs rename to src/Recyclarr.Core/Config/Parsing/ConfigValidationExecutor.cs diff --git a/src/Recyclarr.Config/Parsing/ConfigYamlDataObjects.Radarr.cs b/src/Recyclarr.Core/Config/Parsing/ConfigYamlDataObjects.Radarr.cs similarity index 100% rename from src/Recyclarr.Config/Parsing/ConfigYamlDataObjects.Radarr.cs rename to src/Recyclarr.Core/Config/Parsing/ConfigYamlDataObjects.Radarr.cs diff --git a/src/Recyclarr.Config/Parsing/ConfigYamlDataObjects.Sonarr.cs b/src/Recyclarr.Core/Config/Parsing/ConfigYamlDataObjects.Sonarr.cs similarity index 100% rename from src/Recyclarr.Config/Parsing/ConfigYamlDataObjects.Sonarr.cs rename to src/Recyclarr.Core/Config/Parsing/ConfigYamlDataObjects.Sonarr.cs diff --git a/src/Recyclarr.Config/Parsing/ConfigYamlDataObjects.cs b/src/Recyclarr.Core/Config/Parsing/ConfigYamlDataObjects.cs similarity index 100% rename from src/Recyclarr.Config/Parsing/ConfigYamlDataObjects.cs rename to src/Recyclarr.Core/Config/Parsing/ConfigYamlDataObjects.cs diff --git a/src/Recyclarr.Config/Parsing/ConfigYamlDataObjectsValidation.cs b/src/Recyclarr.Core/Config/Parsing/ConfigYamlDataObjectsValidation.cs similarity index 100% rename from src/Recyclarr.Config/Parsing/ConfigYamlDataObjectsValidation.cs rename to src/Recyclarr.Core/Config/Parsing/ConfigYamlDataObjectsValidation.cs diff --git a/src/Recyclarr.Config/Parsing/ConfigYamlMapperProfile.cs b/src/Recyclarr.Core/Config/Parsing/ConfigYamlMapperProfile.cs similarity index 100% rename from src/Recyclarr.Config/Parsing/ConfigYamlMapperProfile.cs rename to src/Recyclarr.Core/Config/Parsing/ConfigYamlMapperProfile.cs diff --git a/src/Recyclarr.Config/Parsing/ConfigurationFinder.cs b/src/Recyclarr.Core/Config/Parsing/ConfigurationFinder.cs similarity index 100% rename from src/Recyclarr.Config/Parsing/ConfigurationFinder.cs rename to src/Recyclarr.Core/Config/Parsing/ConfigurationFinder.cs diff --git a/src/Recyclarr.Config/Parsing/ConfigurationLoader.cs b/src/Recyclarr.Core/Config/Parsing/ConfigurationLoader.cs similarity index 100% rename from src/Recyclarr.Config/Parsing/ConfigurationLoader.cs rename to src/Recyclarr.Core/Config/Parsing/ConfigurationLoader.cs diff --git a/src/Recyclarr.Config/Parsing/ErrorHandling/ConfigContextualMessages.cs b/src/Recyclarr.Core/Config/Parsing/ErrorHandling/ConfigContextualMessages.cs similarity index 100% rename from src/Recyclarr.Config/Parsing/ErrorHandling/ConfigContextualMessages.cs rename to src/Recyclarr.Core/Config/Parsing/ErrorHandling/ConfigContextualMessages.cs diff --git a/src/Recyclarr.Config/Parsing/ErrorHandling/ConfigFeatureRemovalBehavior.cs b/src/Recyclarr.Core/Config/Parsing/ErrorHandling/ConfigFeatureRemovalBehavior.cs similarity index 100% rename from src/Recyclarr.Config/Parsing/ErrorHandling/ConfigFeatureRemovalBehavior.cs rename to src/Recyclarr.Core/Config/Parsing/ErrorHandling/ConfigFeatureRemovalBehavior.cs diff --git a/src/Recyclarr.Config/Parsing/ErrorHandling/FeatureRemovalChecker.cs b/src/Recyclarr.Core/Config/Parsing/ErrorHandling/FeatureRemovalChecker.cs similarity index 100% rename from src/Recyclarr.Config/Parsing/ErrorHandling/FeatureRemovalChecker.cs rename to src/Recyclarr.Core/Config/Parsing/ErrorHandling/FeatureRemovalChecker.cs diff --git a/src/Recyclarr.Config/Parsing/ErrorHandling/FeatureRemovalException.cs b/src/Recyclarr.Core/Config/Parsing/ErrorHandling/FeatureRemovalException.cs similarity index 100% rename from src/Recyclarr.Config/Parsing/ErrorHandling/FeatureRemovalException.cs rename to src/Recyclarr.Core/Config/Parsing/ErrorHandling/FeatureRemovalException.cs diff --git a/src/Recyclarr.Config/Parsing/ErrorHandling/InvalidConfigurationFilesException.cs b/src/Recyclarr.Core/Config/Parsing/ErrorHandling/InvalidConfigurationFilesException.cs similarity index 100% rename from src/Recyclarr.Config/Parsing/ErrorHandling/InvalidConfigurationFilesException.cs rename to src/Recyclarr.Core/Config/Parsing/ErrorHandling/InvalidConfigurationFilesException.cs diff --git a/src/Recyclarr.Config/Parsing/ErrorHandling/NoConfigurationFilesException.cs b/src/Recyclarr.Core/Config/Parsing/ErrorHandling/NoConfigurationFilesException.cs similarity index 100% rename from src/Recyclarr.Config/Parsing/ErrorHandling/NoConfigurationFilesException.cs rename to src/Recyclarr.Core/Config/Parsing/ErrorHandling/NoConfigurationFilesException.cs diff --git a/src/Recyclarr.Config/Parsing/ErrorHandling/PostProcessingException.cs b/src/Recyclarr.Core/Config/Parsing/ErrorHandling/PostProcessingException.cs similarity index 100% rename from src/Recyclarr.Config/Parsing/ErrorHandling/PostProcessingException.cs rename to src/Recyclarr.Core/Config/Parsing/ErrorHandling/PostProcessingException.cs diff --git a/src/Recyclarr.Config/Parsing/IConfigurationFinder.cs b/src/Recyclarr.Core/Config/Parsing/IConfigurationFinder.cs similarity index 100% rename from src/Recyclarr.Config/Parsing/IConfigurationFinder.cs rename to src/Recyclarr.Core/Config/Parsing/IConfigurationFinder.cs diff --git a/src/Recyclarr.Config/Parsing/IConfigurationLoader.cs b/src/Recyclarr.Core/Config/Parsing/IConfigurationLoader.cs similarity index 100% rename from src/Recyclarr.Config/Parsing/IConfigurationLoader.cs rename to src/Recyclarr.Core/Config/Parsing/IConfigurationLoader.cs diff --git a/src/Recyclarr.Config/Parsing/PostProcessing/ConfigDeprecationPostProcessor.cs b/src/Recyclarr.Core/Config/Parsing/PostProcessing/ConfigDeprecationPostProcessor.cs similarity index 100% rename from src/Recyclarr.Config/Parsing/PostProcessing/ConfigDeprecationPostProcessor.cs rename to src/Recyclarr.Core/Config/Parsing/PostProcessing/ConfigDeprecationPostProcessor.cs diff --git a/src/Recyclarr.Config/Parsing/PostProcessing/ConfigMerging/ConfigIncludeProcessor.cs b/src/Recyclarr.Core/Config/Parsing/PostProcessing/ConfigMerging/ConfigIncludeProcessor.cs similarity index 100% rename from src/Recyclarr.Config/Parsing/PostProcessing/ConfigMerging/ConfigIncludeProcessor.cs rename to src/Recyclarr.Core/Config/Parsing/PostProcessing/ConfigMerging/ConfigIncludeProcessor.cs diff --git a/src/Recyclarr.Config/Parsing/PostProcessing/ConfigMerging/IIncludeProcessor.cs b/src/Recyclarr.Core/Config/Parsing/PostProcessing/ConfigMerging/IIncludeProcessor.cs similarity index 100% rename from src/Recyclarr.Config/Parsing/PostProcessing/ConfigMerging/IIncludeProcessor.cs rename to src/Recyclarr.Core/Config/Parsing/PostProcessing/ConfigMerging/IIncludeProcessor.cs diff --git a/src/Recyclarr.Config/Parsing/PostProcessing/ConfigMerging/IYamlIncludeResolver.cs b/src/Recyclarr.Core/Config/Parsing/PostProcessing/ConfigMerging/IYamlIncludeResolver.cs similarity index 100% rename from src/Recyclarr.Config/Parsing/PostProcessing/ConfigMerging/IYamlIncludeResolver.cs rename to src/Recyclarr.Core/Config/Parsing/PostProcessing/ConfigMerging/IYamlIncludeResolver.cs diff --git a/src/Recyclarr.Config/Parsing/PostProcessing/ConfigMerging/PolymorphicIncludeYamlBehavior.cs b/src/Recyclarr.Core/Config/Parsing/PostProcessing/ConfigMerging/PolymorphicIncludeYamlBehavior.cs similarity index 100% rename from src/Recyclarr.Config/Parsing/PostProcessing/ConfigMerging/PolymorphicIncludeYamlBehavior.cs rename to src/Recyclarr.Core/Config/Parsing/PostProcessing/ConfigMerging/PolymorphicIncludeYamlBehavior.cs diff --git a/src/Recyclarr.Config/Parsing/PostProcessing/ConfigMerging/RadarrConfigMerger.cs b/src/Recyclarr.Core/Config/Parsing/PostProcessing/ConfigMerging/RadarrConfigMerger.cs similarity index 100% rename from src/Recyclarr.Config/Parsing/PostProcessing/ConfigMerging/RadarrConfigMerger.cs rename to src/Recyclarr.Core/Config/Parsing/PostProcessing/ConfigMerging/RadarrConfigMerger.cs diff --git a/src/Recyclarr.Config/Parsing/PostProcessing/ConfigMerging/ServiceConfigMerger.cs b/src/Recyclarr.Core/Config/Parsing/PostProcessing/ConfigMerging/ServiceConfigMerger.cs similarity index 100% rename from src/Recyclarr.Config/Parsing/PostProcessing/ConfigMerging/ServiceConfigMerger.cs rename to src/Recyclarr.Core/Config/Parsing/PostProcessing/ConfigMerging/ServiceConfigMerger.cs diff --git a/src/Recyclarr.Config/Parsing/PostProcessing/ConfigMerging/SonarrConfigMerger.cs b/src/Recyclarr.Core/Config/Parsing/PostProcessing/ConfigMerging/SonarrConfigMerger.cs similarity index 100% rename from src/Recyclarr.Config/Parsing/PostProcessing/ConfigMerging/SonarrConfigMerger.cs rename to src/Recyclarr.Core/Config/Parsing/PostProcessing/ConfigMerging/SonarrConfigMerger.cs diff --git a/src/Recyclarr.Config/Parsing/PostProcessing/ConfigMerging/TemplateIncludeProcessor.cs b/src/Recyclarr.Core/Config/Parsing/PostProcessing/ConfigMerging/TemplateIncludeProcessor.cs similarity index 100% rename from src/Recyclarr.Config/Parsing/PostProcessing/ConfigMerging/TemplateIncludeProcessor.cs rename to src/Recyclarr.Core/Config/Parsing/PostProcessing/ConfigMerging/TemplateIncludeProcessor.cs diff --git a/src/Recyclarr.Config/Parsing/PostProcessing/ConfigMerging/YamlIncludeDataObjects.cs b/src/Recyclarr.Core/Config/Parsing/PostProcessing/ConfigMerging/YamlIncludeDataObjects.cs similarity index 100% rename from src/Recyclarr.Config/Parsing/PostProcessing/ConfigMerging/YamlIncludeDataObjects.cs rename to src/Recyclarr.Core/Config/Parsing/PostProcessing/ConfigMerging/YamlIncludeDataObjects.cs diff --git a/src/Recyclarr.Config/Parsing/PostProcessing/ConfigMerging/YamlIncludeException.cs b/src/Recyclarr.Core/Config/Parsing/PostProcessing/ConfigMerging/YamlIncludeException.cs similarity index 100% rename from src/Recyclarr.Config/Parsing/PostProcessing/ConfigMerging/YamlIncludeException.cs rename to src/Recyclarr.Core/Config/Parsing/PostProcessing/ConfigMerging/YamlIncludeException.cs diff --git a/src/Recyclarr.Config/Parsing/PostProcessing/ConfigMerging/YamlIncludeResolver.cs b/src/Recyclarr.Core/Config/Parsing/PostProcessing/ConfigMerging/YamlIncludeResolver.cs similarity index 100% rename from src/Recyclarr.Config/Parsing/PostProcessing/ConfigMerging/YamlIncludeResolver.cs rename to src/Recyclarr.Core/Config/Parsing/PostProcessing/ConfigMerging/YamlIncludeResolver.cs diff --git a/src/Recyclarr.Config/Parsing/PostProcessing/Deprecations/CfQualityProfilesDeprecationCheck.cs b/src/Recyclarr.Core/Config/Parsing/PostProcessing/Deprecations/CfQualityProfilesDeprecationCheck.cs similarity index 100% rename from src/Recyclarr.Config/Parsing/PostProcessing/Deprecations/CfQualityProfilesDeprecationCheck.cs rename to src/Recyclarr.Core/Config/Parsing/PostProcessing/Deprecations/CfQualityProfilesDeprecationCheck.cs diff --git a/src/Recyclarr.Config/Parsing/PostProcessing/Deprecations/ConfigDeprecations.cs b/src/Recyclarr.Core/Config/Parsing/PostProcessing/Deprecations/ConfigDeprecations.cs similarity index 100% rename from src/Recyclarr.Config/Parsing/PostProcessing/Deprecations/ConfigDeprecations.cs rename to src/Recyclarr.Core/Config/Parsing/PostProcessing/Deprecations/ConfigDeprecations.cs diff --git a/src/Recyclarr.Config/Parsing/PostProcessing/Deprecations/IConfigDeprecationCheck.cs b/src/Recyclarr.Core/Config/Parsing/PostProcessing/Deprecations/IConfigDeprecationCheck.cs similarity index 100% rename from src/Recyclarr.Config/Parsing/PostProcessing/Deprecations/IConfigDeprecationCheck.cs rename to src/Recyclarr.Core/Config/Parsing/PostProcessing/Deprecations/IConfigDeprecationCheck.cs diff --git a/src/Recyclarr.Config/Parsing/PostProcessing/IConfigPostProcessor.cs b/src/Recyclarr.Core/Config/Parsing/PostProcessing/IConfigPostProcessor.cs similarity index 100% rename from src/Recyclarr.Config/Parsing/PostProcessing/IConfigPostProcessor.cs rename to src/Recyclarr.Core/Config/Parsing/PostProcessing/IConfigPostProcessor.cs diff --git a/src/Recyclarr.Config/Parsing/PostProcessing/ImplicitUrlAndKeyPostProcessor.cs b/src/Recyclarr.Core/Config/Parsing/PostProcessing/ImplicitUrlAndKeyPostProcessor.cs similarity index 100% rename from src/Recyclarr.Config/Parsing/PostProcessing/ImplicitUrlAndKeyPostProcessor.cs rename to src/Recyclarr.Core/Config/Parsing/PostProcessing/ImplicitUrlAndKeyPostProcessor.cs diff --git a/src/Recyclarr.Config/Parsing/PostProcessing/IncludePostProcessor.cs b/src/Recyclarr.Core/Config/Parsing/PostProcessing/IncludePostProcessor.cs similarity index 100% rename from src/Recyclarr.Config/Parsing/PostProcessing/IncludePostProcessor.cs rename to src/Recyclarr.Core/Config/Parsing/PostProcessing/IncludePostProcessor.cs diff --git a/src/Recyclarr.Config/Parsing/YamlValidatorRuleSets.cs b/src/Recyclarr.Core/Config/Parsing/YamlValidatorRuleSets.cs similarity index 100% rename from src/Recyclarr.Config/Parsing/YamlValidatorRuleSets.cs rename to src/Recyclarr.Core/Config/Parsing/YamlValidatorRuleSets.cs diff --git a/src/Recyclarr.Config/Secrets/ISecretsProvider.cs b/src/Recyclarr.Core/Config/Secrets/ISecretsProvider.cs similarity index 100% rename from src/Recyclarr.Config/Secrets/ISecretsProvider.cs rename to src/Recyclarr.Core/Config/Secrets/ISecretsProvider.cs diff --git a/src/Recyclarr.Config/Secrets/SecretNotFoundException.cs b/src/Recyclarr.Core/Config/Secrets/SecretNotFoundException.cs similarity index 100% rename from src/Recyclarr.Config/Secrets/SecretNotFoundException.cs rename to src/Recyclarr.Core/Config/Secrets/SecretNotFoundException.cs diff --git a/src/Recyclarr.Config/Secrets/SecretsDeserializer.cs b/src/Recyclarr.Core/Config/Secrets/SecretsDeserializer.cs similarity index 100% rename from src/Recyclarr.Config/Secrets/SecretsDeserializer.cs rename to src/Recyclarr.Core/Config/Secrets/SecretsDeserializer.cs diff --git a/src/Recyclarr.Config/Secrets/SecretsProvider.cs b/src/Recyclarr.Core/Config/Secrets/SecretsProvider.cs similarity index 100% rename from src/Recyclarr.Config/Secrets/SecretsProvider.cs rename to src/Recyclarr.Core/Config/Secrets/SecretsProvider.cs diff --git a/src/Recyclarr.Config/Secrets/SecretsYamlBehavior.cs b/src/Recyclarr.Core/Config/Secrets/SecretsYamlBehavior.cs similarity index 100% rename from src/Recyclarr.Config/Secrets/SecretsYamlBehavior.cs rename to src/Recyclarr.Core/Config/Secrets/SecretsYamlBehavior.cs diff --git a/src/Recyclarr.Json/GlobalUsings.cs b/src/Recyclarr.Core/GlobalUsings.cs similarity index 70% rename from src/Recyclarr.Json/GlobalUsings.cs rename to src/Recyclarr.Core/GlobalUsings.cs index afb03cf0..088604bf 100644 --- a/src/Recyclarr.Json/GlobalUsings.cs +++ b/src/Recyclarr.Core/GlobalUsings.cs @@ -1,2 +1,3 @@ +global using SuperLinq; global using Serilog; global using JetBrains.Annotations; diff --git a/src/Recyclarr.Http/FlurlLogging.cs b/src/Recyclarr.Core/Http/FlurlLogging.cs similarity index 97% rename from src/Recyclarr.Http/FlurlLogging.cs rename to src/Recyclarr.Core/Http/FlurlLogging.cs index 2ab2042a..8d631843 100644 --- a/src/Recyclarr.Http/FlurlLogging.cs +++ b/src/Recyclarr.Core/Http/FlurlLogging.cs @@ -1,6 +1,5 @@ using System.Text.Json; using Flurl; -using Serilog; namespace Recyclarr.Http; diff --git a/src/Recyclarr.Http/FlurlLoggingEventHandlers.cs b/src/Recyclarr.Core/Http/FlurlLoggingEventHandlers.cs similarity index 99% rename from src/Recyclarr.Http/FlurlLoggingEventHandlers.cs rename to src/Recyclarr.Core/Http/FlurlLoggingEventHandlers.cs index e9b85624..a1705e12 100644 --- a/src/Recyclarr.Http/FlurlLoggingEventHandlers.cs +++ b/src/Recyclarr.Core/Http/FlurlLoggingEventHandlers.cs @@ -1,6 +1,5 @@ using Flurl.Http; using Recyclarr.Logging; -using Serilog; namespace Recyclarr.Http; diff --git a/src/Recyclarr.Http/FlurlSpecificEventHandler.cs b/src/Recyclarr.Core/Http/FlurlSpecificEventHandler.cs similarity index 100% rename from src/Recyclarr.Http/FlurlSpecificEventHandler.cs rename to src/Recyclarr.Core/Http/FlurlSpecificEventHandler.cs diff --git a/src/Recyclarr.Http/HttpAutofacModule.cs b/src/Recyclarr.Core/Http/HttpAutofacModule.cs similarity index 100% rename from src/Recyclarr.Http/HttpAutofacModule.cs rename to src/Recyclarr.Core/Http/HttpAutofacModule.cs diff --git a/src/Recyclarr.Json/CollectionJsonConverter.cs b/src/Recyclarr.Core/Json/CollectionJsonConverter.cs similarity index 100% rename from src/Recyclarr.Json/CollectionJsonConverter.cs rename to src/Recyclarr.Core/Json/CollectionJsonConverter.cs diff --git a/src/Recyclarr.Json/GlobalJsonSerializerSettings.cs b/src/Recyclarr.Core/Json/GlobalJsonSerializerSettings.cs similarity index 100% rename from src/Recyclarr.Json/GlobalJsonSerializerSettings.cs rename to src/Recyclarr.Core/Json/GlobalJsonSerializerSettings.cs diff --git a/src/Recyclarr.Core/Json/GlobalUsings.cs b/src/Recyclarr.Core/Json/GlobalUsings.cs new file mode 100644 index 00000000..d1ab45b3 --- /dev/null +++ b/src/Recyclarr.Core/Json/GlobalUsings.cs @@ -0,0 +1 @@ +global using Serilog; diff --git a/src/Recyclarr.Json/JsonAutofacModule.cs b/src/Recyclarr.Core/Json/JsonAutofacModule.cs similarity index 100% rename from src/Recyclarr.Json/JsonAutofacModule.cs rename to src/Recyclarr.Core/Json/JsonAutofacModule.cs diff --git a/src/Recyclarr.Json/JsonExtensions.cs b/src/Recyclarr.Core/Json/JsonExtensions.cs similarity index 100% rename from src/Recyclarr.Json/JsonExtensions.cs rename to src/Recyclarr.Core/Json/JsonExtensions.cs diff --git a/src/Recyclarr.Json/JsonSerializationModifiers.cs b/src/Recyclarr.Core/Json/JsonSerializationModifiers.cs similarity index 100% rename from src/Recyclarr.Json/JsonSerializationModifiers.cs rename to src/Recyclarr.Core/Json/JsonSerializationModifiers.cs diff --git a/src/Recyclarr.Json/JsonUtils.cs b/src/Recyclarr.Core/Json/JsonUtils.cs similarity index 100% rename from src/Recyclarr.Json/JsonUtils.cs rename to src/Recyclarr.Core/Json/JsonUtils.cs diff --git a/src/Recyclarr.Json/Loading/BulkJsonLoader.cs b/src/Recyclarr.Core/Json/Loading/BulkJsonLoader.cs similarity index 100% rename from src/Recyclarr.Json/Loading/BulkJsonLoader.cs rename to src/Recyclarr.Core/Json/Loading/BulkJsonLoader.cs diff --git a/src/Recyclarr.Json/Loading/GuideJsonLoader.cs b/src/Recyclarr.Core/Json/Loading/GuideJsonLoader.cs similarity index 100% rename from src/Recyclarr.Json/Loading/GuideJsonLoader.cs rename to src/Recyclarr.Core/Json/Loading/GuideJsonLoader.cs diff --git a/src/Recyclarr.Json/Loading/IBulkJsonLoader.cs b/src/Recyclarr.Core/Json/Loading/IBulkJsonLoader.cs similarity index 100% rename from src/Recyclarr.Json/Loading/IBulkJsonLoader.cs rename to src/Recyclarr.Core/Json/Loading/IBulkJsonLoader.cs diff --git a/src/Recyclarr.Json/Loading/ServiceJsonLoader.cs b/src/Recyclarr.Core/Json/Loading/ServiceJsonLoader.cs similarity index 100% rename from src/Recyclarr.Json/Loading/ServiceJsonLoader.cs rename to src/Recyclarr.Core/Json/Loading/ServiceJsonLoader.cs diff --git a/src/Recyclarr.Json/ReadOnlyCollectionJsonConverter.cs b/src/Recyclarr.Core/Json/ReadOnlyCollectionJsonConverter.cs similarity index 100% rename from src/Recyclarr.Json/ReadOnlyCollectionJsonConverter.cs rename to src/Recyclarr.Core/Json/ReadOnlyCollectionJsonConverter.cs diff --git a/src/Recyclarr.Logging/ExceptionExtensions.cs b/src/Recyclarr.Core/Logging/ExceptionExtensions.cs similarity index 100% rename from src/Recyclarr.Logging/ExceptionExtensions.cs rename to src/Recyclarr.Core/Logging/ExceptionExtensions.cs diff --git a/src/Recyclarr.Logging/FlurlExceptionSanitizingEnricher.cs b/src/Recyclarr.Core/Logging/FlurlExceptionSanitizingEnricher.cs similarity index 100% rename from src/Recyclarr.Logging/FlurlExceptionSanitizingEnricher.cs rename to src/Recyclarr.Core/Logging/FlurlExceptionSanitizingEnricher.cs diff --git a/src/Recyclarr.Logging/ILogConfigurator.cs b/src/Recyclarr.Core/Logging/ILogConfigurator.cs similarity index 87% rename from src/Recyclarr.Logging/ILogConfigurator.cs rename to src/Recyclarr.Core/Logging/ILogConfigurator.cs index 703cef54..4ba45186 100644 --- a/src/Recyclarr.Logging/ILogConfigurator.cs +++ b/src/Recyclarr.Core/Logging/ILogConfigurator.cs @@ -1,5 +1,3 @@ -using Serilog; - namespace Recyclarr.Logging; public interface ILogConfigurator diff --git a/src/Recyclarr.Logging/LogProperty.cs b/src/Recyclarr.Core/Logging/LogProperty.cs similarity index 100% rename from src/Recyclarr.Logging/LogProperty.cs rename to src/Recyclarr.Core/Logging/LogProperty.cs diff --git a/src/Recyclarr.Logging/LogSetup.cs b/src/Recyclarr.Core/Logging/LogSetup.cs similarity index 97% rename from src/Recyclarr.Logging/LogSetup.cs rename to src/Recyclarr.Core/Logging/LogSetup.cs index 006ab088..8ca06411 100644 --- a/src/Recyclarr.Logging/LogSetup.cs +++ b/src/Recyclarr.Core/Logging/LogSetup.cs @@ -1,4 +1,3 @@ -using Serilog; using Serilog.Events; namespace Recyclarr.Logging; diff --git a/src/Recyclarr.Logging/Sanitize.cs b/src/Recyclarr.Core/Logging/Sanitize.cs similarity index 100% rename from src/Recyclarr.Logging/Sanitize.cs rename to src/Recyclarr.Core/Logging/Sanitize.cs diff --git a/src/Recyclarr.Platform/AppPaths.cs b/src/Recyclarr.Core/Platform/AppPaths.cs similarity index 100% rename from src/Recyclarr.Platform/AppPaths.cs rename to src/Recyclarr.Core/Platform/AppPaths.cs diff --git a/src/Recyclarr.Platform/DefaultAppDataSetup.cs b/src/Recyclarr.Core/Platform/DefaultAppDataSetup.cs similarity index 100% rename from src/Recyclarr.Platform/DefaultAppDataSetup.cs rename to src/Recyclarr.Core/Platform/DefaultAppDataSetup.cs diff --git a/src/Recyclarr.Platform/DefaultEnvironment.cs b/src/Recyclarr.Core/Platform/DefaultEnvironment.cs similarity index 100% rename from src/Recyclarr.Platform/DefaultEnvironment.cs rename to src/Recyclarr.Core/Platform/DefaultEnvironment.cs diff --git a/src/Recyclarr.Platform/DefaultRuntimeInformation.cs b/src/Recyclarr.Core/Platform/DefaultRuntimeInformation.cs similarity index 100% rename from src/Recyclarr.Platform/DefaultRuntimeInformation.cs rename to src/Recyclarr.Core/Platform/DefaultRuntimeInformation.cs diff --git a/src/Recyclarr.Platform/IAppDataSetup.cs b/src/Recyclarr.Core/Platform/IAppDataSetup.cs similarity index 100% rename from src/Recyclarr.Platform/IAppDataSetup.cs rename to src/Recyclarr.Core/Platform/IAppDataSetup.cs diff --git a/src/Recyclarr.Platform/IAppPaths.cs b/src/Recyclarr.Core/Platform/IAppPaths.cs similarity index 100% rename from src/Recyclarr.Platform/IAppPaths.cs rename to src/Recyclarr.Core/Platform/IAppPaths.cs diff --git a/src/Recyclarr.Platform/IEnvironment.cs b/src/Recyclarr.Core/Platform/IEnvironment.cs similarity index 100% rename from src/Recyclarr.Platform/IEnvironment.cs rename to src/Recyclarr.Core/Platform/IEnvironment.cs diff --git a/src/Recyclarr.Platform/IRuntimeInformation.cs b/src/Recyclarr.Core/Platform/IRuntimeInformation.cs similarity index 100% rename from src/Recyclarr.Platform/IRuntimeInformation.cs rename to src/Recyclarr.Core/Platform/IRuntimeInformation.cs diff --git a/src/Recyclarr.Platform/NoHomeDirectoryException.cs b/src/Recyclarr.Core/Platform/NoHomeDirectoryException.cs similarity index 100% rename from src/Recyclarr.Platform/NoHomeDirectoryException.cs rename to src/Recyclarr.Core/Platform/NoHomeDirectoryException.cs diff --git a/src/Recyclarr.Platform/PlatformAutofacModule.cs b/src/Recyclarr.Core/Platform/PlatformAutofacModule.cs similarity index 100% rename from src/Recyclarr.Platform/PlatformAutofacModule.cs rename to src/Recyclarr.Core/Platform/PlatformAutofacModule.cs diff --git a/src/Recyclarr.Core/Recyclarr.Core.csproj b/src/Recyclarr.Core/Recyclarr.Core.csproj new file mode 100644 index 00000000..0ea2019f --- /dev/null +++ b/src/Recyclarr.Core/Recyclarr.Core.csproj @@ -0,0 +1,25 @@ + + + + Recyclarr + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Recyclarr.Repo/ConfigTemplatesRepo.cs b/src/Recyclarr.Core/Repo/ConfigTemplatesRepo.cs similarity index 100% rename from src/Recyclarr.Repo/ConfigTemplatesRepo.cs rename to src/Recyclarr.Core/Repo/ConfigTemplatesRepo.cs diff --git a/src/Recyclarr.Repo/ConsoleMultiRepoUpdater.cs b/src/Recyclarr.Core/Repo/ConsoleMultiRepoUpdater.cs similarity index 100% rename from src/Recyclarr.Repo/ConsoleMultiRepoUpdater.cs rename to src/Recyclarr.Core/Repo/ConsoleMultiRepoUpdater.cs diff --git a/src/Recyclarr.Repo/GitPath.cs b/src/Recyclarr.Core/Repo/GitPath.cs similarity index 100% rename from src/Recyclarr.Repo/GitPath.cs rename to src/Recyclarr.Core/Repo/GitPath.cs diff --git a/src/Recyclarr.Repo/IConfigTemplatesRepo.cs b/src/Recyclarr.Core/Repo/IConfigTemplatesRepo.cs similarity index 100% rename from src/Recyclarr.Repo/IConfigTemplatesRepo.cs rename to src/Recyclarr.Core/Repo/IConfigTemplatesRepo.cs diff --git a/src/Recyclarr.Repo/IMultiRepoUpdater.cs b/src/Recyclarr.Core/Repo/IMultiRepoUpdater.cs similarity index 100% rename from src/Recyclarr.Repo/IMultiRepoUpdater.cs rename to src/Recyclarr.Core/Repo/IMultiRepoUpdater.cs diff --git a/src/Recyclarr.Repo/IRepoMetadataBuilder.cs b/src/Recyclarr.Core/Repo/IRepoMetadataBuilder.cs similarity index 100% rename from src/Recyclarr.Repo/IRepoMetadataBuilder.cs rename to src/Recyclarr.Core/Repo/IRepoMetadataBuilder.cs diff --git a/src/Recyclarr.Repo/IRepoUpdater.cs b/src/Recyclarr.Core/Repo/IRepoUpdater.cs similarity index 100% rename from src/Recyclarr.Repo/IRepoUpdater.cs rename to src/Recyclarr.Core/Repo/IRepoUpdater.cs diff --git a/src/Recyclarr.Repo/ITrashGuidesRepo.cs b/src/Recyclarr.Core/Repo/ITrashGuidesRepo.cs similarity index 100% rename from src/Recyclarr.Repo/ITrashGuidesRepo.cs rename to src/Recyclarr.Core/Repo/ITrashGuidesRepo.cs diff --git a/src/Recyclarr.Repo/IUpdateableRepo.cs b/src/Recyclarr.Core/Repo/IUpdateableRepo.cs similarity index 100% rename from src/Recyclarr.Repo/IUpdateableRepo.cs rename to src/Recyclarr.Core/Repo/IUpdateableRepo.cs diff --git a/src/Recyclarr.Repo/RepoAutofacModule.cs b/src/Recyclarr.Core/Repo/RepoAutofacModule.cs similarity index 100% rename from src/Recyclarr.Repo/RepoAutofacModule.cs rename to src/Recyclarr.Core/Repo/RepoAutofacModule.cs diff --git a/src/Recyclarr.Repo/RepoMetadata.cs b/src/Recyclarr.Core/Repo/RepoMetadata.cs similarity index 100% rename from src/Recyclarr.Repo/RepoMetadata.cs rename to src/Recyclarr.Core/Repo/RepoMetadata.cs diff --git a/src/Recyclarr.Repo/RepoUpdater.cs b/src/Recyclarr.Core/Repo/RepoUpdater.cs similarity index 99% rename from src/Recyclarr.Repo/RepoUpdater.cs rename to src/Recyclarr.Core/Repo/RepoUpdater.cs index 0a131eff..ebd4f28e 100644 --- a/src/Recyclarr.Repo/RepoUpdater.cs +++ b/src/Recyclarr.Core/Repo/RepoUpdater.cs @@ -2,7 +2,6 @@ using System.IO.Abstractions; using Recyclarr.Common.Extensions; using Recyclarr.Settings; using Recyclarr.VersionControl; -using Serilog; namespace Recyclarr.Repo; diff --git a/src/Recyclarr.Repo/TrashGuidesRepo.cs b/src/Recyclarr.Core/Repo/TrashGuidesRepo.cs similarity index 100% rename from src/Recyclarr.Repo/TrashGuidesRepo.cs rename to src/Recyclarr.Core/Repo/TrashGuidesRepo.cs diff --git a/src/Recyclarr.Repo/TrashRepoMetadataBuilder.cs b/src/Recyclarr.Core/Repo/TrashRepoMetadataBuilder.cs similarity index 100% rename from src/Recyclarr.Repo/TrashRepoMetadataBuilder.cs rename to src/Recyclarr.Core/Repo/TrashRepoMetadataBuilder.cs diff --git a/src/Recyclarr.ServarrApi/CustomFormat/CustomFormatApiService.cs b/src/Recyclarr.Core/ServarrApi/CustomFormat/CustomFormatApiService.cs similarity index 100% rename from src/Recyclarr.ServarrApi/CustomFormat/CustomFormatApiService.cs rename to src/Recyclarr.Core/ServarrApi/CustomFormat/CustomFormatApiService.cs diff --git a/src/Recyclarr.ServarrApi/CustomFormat/ICustomFormatApiService.cs b/src/Recyclarr.Core/ServarrApi/CustomFormat/ICustomFormatApiService.cs similarity index 100% rename from src/Recyclarr.ServarrApi/CustomFormat/ICustomFormatApiService.cs rename to src/Recyclarr.Core/ServarrApi/CustomFormat/ICustomFormatApiService.cs diff --git a/src/Recyclarr.ServarrApi/DtoUtil.cs b/src/Recyclarr.Core/ServarrApi/DtoUtil.cs similarity index 100% rename from src/Recyclarr.ServarrApi/DtoUtil.cs rename to src/Recyclarr.Core/ServarrApi/DtoUtil.cs diff --git a/src/Recyclarr.ServarrApi/IServarrRequestBuilder.cs b/src/Recyclarr.Core/ServarrApi/IServarrRequestBuilder.cs similarity index 100% rename from src/Recyclarr.ServarrApi/IServarrRequestBuilder.cs rename to src/Recyclarr.Core/ServarrApi/IServarrRequestBuilder.cs diff --git a/src/Recyclarr.ServarrApi/MediaNaming/IMediaNamingApiService.cs b/src/Recyclarr.Core/ServarrApi/MediaNaming/IMediaNamingApiService.cs similarity index 100% rename from src/Recyclarr.ServarrApi/MediaNaming/IMediaNamingApiService.cs rename to src/Recyclarr.Core/ServarrApi/MediaNaming/IMediaNamingApiService.cs diff --git a/src/Recyclarr.ServarrApi/MediaNaming/MediaNamingApiService.cs b/src/Recyclarr.Core/ServarrApi/MediaNaming/MediaNamingApiService.cs similarity index 100% rename from src/Recyclarr.ServarrApi/MediaNaming/MediaNamingApiService.cs rename to src/Recyclarr.Core/ServarrApi/MediaNaming/MediaNamingApiService.cs diff --git a/src/Recyclarr.ServarrApi/MediaNaming/MediaNamingDto.cs b/src/Recyclarr.Core/ServarrApi/MediaNaming/MediaNamingDto.cs similarity index 100% rename from src/Recyclarr.ServarrApi/MediaNaming/MediaNamingDto.cs rename to src/Recyclarr.Core/ServarrApi/MediaNaming/MediaNamingDto.cs diff --git a/src/Recyclarr.ServarrApi/MediaNaming/MediaNamingDtoExtensions.cs b/src/Recyclarr.Core/ServarrApi/MediaNaming/MediaNamingDtoExtensions.cs similarity index 100% rename from src/Recyclarr.ServarrApi/MediaNaming/MediaNamingDtoExtensions.cs rename to src/Recyclarr.Core/ServarrApi/MediaNaming/MediaNamingDtoExtensions.cs diff --git a/src/Recyclarr.ServarrApi/MediaNaming/RadarrMediaNamingDto.cs b/src/Recyclarr.Core/ServarrApi/MediaNaming/RadarrMediaNamingDto.cs similarity index 100% rename from src/Recyclarr.ServarrApi/MediaNaming/RadarrMediaNamingDto.cs rename to src/Recyclarr.Core/ServarrApi/MediaNaming/RadarrMediaNamingDto.cs diff --git a/src/Recyclarr.ServarrApi/MediaNaming/SonarrMediaNamingDto.cs b/src/Recyclarr.Core/ServarrApi/MediaNaming/SonarrMediaNamingDto.cs similarity index 100% rename from src/Recyclarr.ServarrApi/MediaNaming/SonarrMediaNamingDto.cs rename to src/Recyclarr.Core/ServarrApi/MediaNaming/SonarrMediaNamingDto.cs diff --git a/src/Recyclarr.ServarrApi/QualityDefinition/IQualityDefinitionApiService.cs b/src/Recyclarr.Core/ServarrApi/QualityDefinition/IQualityDefinitionApiService.cs similarity index 100% rename from src/Recyclarr.ServarrApi/QualityDefinition/IQualityDefinitionApiService.cs rename to src/Recyclarr.Core/ServarrApi/QualityDefinition/IQualityDefinitionApiService.cs diff --git a/src/Recyclarr.ServarrApi/QualityDefinition/QualityDefinitionApiService.cs b/src/Recyclarr.Core/ServarrApi/QualityDefinition/QualityDefinitionApiService.cs similarity index 100% rename from src/Recyclarr.ServarrApi/QualityDefinition/QualityDefinitionApiService.cs rename to src/Recyclarr.Core/ServarrApi/QualityDefinition/QualityDefinitionApiService.cs diff --git a/src/Recyclarr.ServarrApi/QualityDefinition/ServiceQualityDefinitionItem.cs b/src/Recyclarr.Core/ServarrApi/QualityDefinition/ServiceQualityDefinitionItem.cs similarity index 100% rename from src/Recyclarr.ServarrApi/QualityDefinition/ServiceQualityDefinitionItem.cs rename to src/Recyclarr.Core/ServarrApi/QualityDefinition/ServiceQualityDefinitionItem.cs diff --git a/src/Recyclarr.ServarrApi/QualityProfile/IQualityProfileApiService.cs b/src/Recyclarr.Core/ServarrApi/QualityProfile/IQualityProfileApiService.cs similarity index 100% rename from src/Recyclarr.ServarrApi/QualityProfile/IQualityProfileApiService.cs rename to src/Recyclarr.Core/ServarrApi/QualityProfile/IQualityProfileApiService.cs diff --git a/src/Recyclarr.ServarrApi/QualityProfile/QualityProfileApiExtensions.cs b/src/Recyclarr.Core/ServarrApi/QualityProfile/QualityProfileApiExtensions.cs similarity index 100% rename from src/Recyclarr.ServarrApi/QualityProfile/QualityProfileApiExtensions.cs rename to src/Recyclarr.Core/ServarrApi/QualityProfile/QualityProfileApiExtensions.cs diff --git a/src/Recyclarr.ServarrApi/QualityProfile/QualityProfileApiService.cs b/src/Recyclarr.Core/ServarrApi/QualityProfile/QualityProfileApiService.cs similarity index 100% rename from src/Recyclarr.ServarrApi/QualityProfile/QualityProfileApiService.cs rename to src/Recyclarr.Core/ServarrApi/QualityProfile/QualityProfileApiService.cs diff --git a/src/Recyclarr.ServarrApi/QualityProfile/QualityProfileDto.cs b/src/Recyclarr.Core/ServarrApi/QualityProfile/QualityProfileDto.cs similarity index 100% rename from src/Recyclarr.ServarrApi/QualityProfile/QualityProfileDto.cs rename to src/Recyclarr.Core/ServarrApi/QualityProfile/QualityProfileDto.cs diff --git a/src/Recyclarr.ServarrApi/ServarrApiAutofacModule.cs b/src/Recyclarr.Core/ServarrApi/ServarrApiAutofacModule.cs similarity index 100% rename from src/Recyclarr.ServarrApi/ServarrApiAutofacModule.cs rename to src/Recyclarr.Core/ServarrApi/ServarrApiAutofacModule.cs diff --git a/src/Recyclarr.ServarrApi/ServarrRequestBuilder.cs b/src/Recyclarr.Core/ServarrApi/ServarrRequestBuilder.cs similarity index 99% rename from src/Recyclarr.ServarrApi/ServarrRequestBuilder.cs rename to src/Recyclarr.Core/ServarrApi/ServarrRequestBuilder.cs index eea0c561..bbdb5d36 100644 --- a/src/Recyclarr.ServarrApi/ServarrRequestBuilder.cs +++ b/src/Recyclarr.Core/ServarrApi/ServarrRequestBuilder.cs @@ -6,7 +6,6 @@ using Recyclarr.Config.Models; using Recyclarr.Http; using Recyclarr.Json; using Recyclarr.Settings; -using Serilog; namespace Recyclarr.ServarrApi; diff --git a/src/Recyclarr.ServarrApi/System/ISystemApiService.cs b/src/Recyclarr.Core/ServarrApi/System/ISystemApiService.cs similarity index 100% rename from src/Recyclarr.ServarrApi/System/ISystemApiService.cs rename to src/Recyclarr.Core/ServarrApi/System/ISystemApiService.cs diff --git a/src/Recyclarr.ServarrApi/System/SystemApiService.cs b/src/Recyclarr.Core/ServarrApi/System/SystemApiService.cs similarity index 100% rename from src/Recyclarr.ServarrApi/System/SystemApiService.cs rename to src/Recyclarr.Core/ServarrApi/System/SystemApiService.cs diff --git a/src/Recyclarr.ServarrApi/System/SystemStatus.cs b/src/Recyclarr.Core/ServarrApi/System/SystemStatus.cs similarity index 100% rename from src/Recyclarr.ServarrApi/System/SystemStatus.cs rename to src/Recyclarr.Core/ServarrApi/System/SystemStatus.cs diff --git a/src/Recyclarr.Settings/IRepositorySettings.cs b/src/Recyclarr.Core/Settings/IRepositorySettings.cs similarity index 100% rename from src/Recyclarr.Settings/IRepositorySettings.cs rename to src/Recyclarr.Core/Settings/IRepositorySettings.cs diff --git a/src/Recyclarr.Settings/ISettings.cs b/src/Recyclarr.Core/Settings/ISettings.cs similarity index 100% rename from src/Recyclarr.Settings/ISettings.cs rename to src/Recyclarr.Core/Settings/ISettings.cs diff --git a/src/Recyclarr.Settings/RecyclarrSettings.cs b/src/Recyclarr.Core/Settings/RecyclarrSettings.cs similarity index 100% rename from src/Recyclarr.Settings/RecyclarrSettings.cs rename to src/Recyclarr.Core/Settings/RecyclarrSettings.cs diff --git a/src/Recyclarr.Settings/Settings.cs b/src/Recyclarr.Core/Settings/Settings.cs similarity index 100% rename from src/Recyclarr.Settings/Settings.cs rename to src/Recyclarr.Core/Settings/Settings.cs diff --git a/src/Recyclarr.Settings/SettingsAutofacModule.cs b/src/Recyclarr.Core/Settings/SettingsAutofacModule.cs similarity index 100% rename from src/Recyclarr.Settings/SettingsAutofacModule.cs rename to src/Recyclarr.Core/Settings/SettingsAutofacModule.cs diff --git a/src/Recyclarr.Settings/SettingsContextualMessages.cs b/src/Recyclarr.Core/Settings/SettingsContextualMessages.cs similarity index 100% rename from src/Recyclarr.Settings/SettingsContextualMessages.cs rename to src/Recyclarr.Core/Settings/SettingsContextualMessages.cs diff --git a/src/Recyclarr.Settings/SettingsExtensions.cs b/src/Recyclarr.Core/Settings/SettingsExtensions.cs similarity index 100% rename from src/Recyclarr.Settings/SettingsExtensions.cs rename to src/Recyclarr.Core/Settings/SettingsExtensions.cs diff --git a/src/Recyclarr.Settings/SettingsLoader.cs b/src/Recyclarr.Core/Settings/SettingsLoader.cs similarity index 100% rename from src/Recyclarr.Settings/SettingsLoader.cs rename to src/Recyclarr.Core/Settings/SettingsLoader.cs diff --git a/src/Recyclarr.Settings/SettingsProvider.cs b/src/Recyclarr.Core/Settings/SettingsProvider.cs similarity index 100% rename from src/Recyclarr.Settings/SettingsProvider.cs rename to src/Recyclarr.Core/Settings/SettingsProvider.cs diff --git a/src/Recyclarr.TrashGuide/ConfigTemplateGuideService.cs b/src/Recyclarr.Core/TrashGuide/ConfigTemplateGuideService.cs similarity index 100% rename from src/Recyclarr.TrashGuide/ConfigTemplateGuideService.cs rename to src/Recyclarr.Core/TrashGuide/ConfigTemplateGuideService.cs diff --git a/src/Recyclarr.TrashGuide/CustomFormat/CustomFormatCategoryItem.cs b/src/Recyclarr.Core/TrashGuide/CustomFormat/CustomFormatCategoryItem.cs similarity index 100% rename from src/Recyclarr.TrashGuide/CustomFormat/CustomFormatCategoryItem.cs rename to src/Recyclarr.Core/TrashGuide/CustomFormat/CustomFormatCategoryItem.cs diff --git a/src/Recyclarr.TrashGuide/CustomFormat/CustomFormatCategoryParser.cs b/src/Recyclarr.Core/TrashGuide/CustomFormat/CustomFormatCategoryParser.cs similarity index 100% rename from src/Recyclarr.TrashGuide/CustomFormat/CustomFormatCategoryParser.cs rename to src/Recyclarr.Core/TrashGuide/CustomFormat/CustomFormatCategoryParser.cs diff --git a/src/Recyclarr.TrashGuide/CustomFormat/CustomFormatData.cs b/src/Recyclarr.Core/TrashGuide/CustomFormat/CustomFormatData.cs similarity index 100% rename from src/Recyclarr.TrashGuide/CustomFormat/CustomFormatData.cs rename to src/Recyclarr.Core/TrashGuide/CustomFormat/CustomFormatData.cs diff --git a/src/Recyclarr.TrashGuide/CustomFormat/CustomFormatGuideService.cs b/src/Recyclarr.Core/TrashGuide/CustomFormat/CustomFormatGuideService.cs similarity index 100% rename from src/Recyclarr.TrashGuide/CustomFormat/CustomFormatGuideService.cs rename to src/Recyclarr.Core/TrashGuide/CustomFormat/CustomFormatGuideService.cs diff --git a/src/Recyclarr.TrashGuide/CustomFormat/CustomFormatLoader.cs b/src/Recyclarr.Core/TrashGuide/CustomFormat/CustomFormatLoader.cs similarity index 100% rename from src/Recyclarr.TrashGuide/CustomFormat/CustomFormatLoader.cs rename to src/Recyclarr.Core/TrashGuide/CustomFormat/CustomFormatLoader.cs diff --git a/src/Recyclarr.TrashGuide/CustomFormat/CustomFormatPaths.cs b/src/Recyclarr.Core/TrashGuide/CustomFormat/CustomFormatPaths.cs similarity index 100% rename from src/Recyclarr.TrashGuide/CustomFormat/CustomFormatPaths.cs rename to src/Recyclarr.Core/TrashGuide/CustomFormat/CustomFormatPaths.cs diff --git a/src/Recyclarr.TrashGuide/CustomFormat/FieldsArrayJsonConverter.cs b/src/Recyclarr.Core/TrashGuide/CustomFormat/FieldsArrayJsonConverter.cs similarity index 100% rename from src/Recyclarr.TrashGuide/CustomFormat/FieldsArrayJsonConverter.cs rename to src/Recyclarr.Core/TrashGuide/CustomFormat/FieldsArrayJsonConverter.cs diff --git a/src/Recyclarr.TrashGuide/CustomFormat/ICustomFormatCategoryParser.cs b/src/Recyclarr.Core/TrashGuide/CustomFormat/ICustomFormatCategoryParser.cs similarity index 100% rename from src/Recyclarr.TrashGuide/CustomFormat/ICustomFormatCategoryParser.cs rename to src/Recyclarr.Core/TrashGuide/CustomFormat/ICustomFormatCategoryParser.cs diff --git a/src/Recyclarr.TrashGuide/CustomFormat/ICustomFormatGuideService.cs b/src/Recyclarr.Core/TrashGuide/CustomFormat/ICustomFormatGuideService.cs similarity index 100% rename from src/Recyclarr.TrashGuide/CustomFormat/ICustomFormatGuideService.cs rename to src/Recyclarr.Core/TrashGuide/CustomFormat/ICustomFormatGuideService.cs diff --git a/src/Recyclarr.TrashGuide/CustomFormat/ICustomFormatLoader.cs b/src/Recyclarr.Core/TrashGuide/CustomFormat/ICustomFormatLoader.cs similarity index 100% rename from src/Recyclarr.TrashGuide/CustomFormat/ICustomFormatLoader.cs rename to src/Recyclarr.Core/TrashGuide/CustomFormat/ICustomFormatLoader.cs diff --git a/src/Recyclarr.TrashGuide/CustomFormat/NondeterministicValueConverter.cs b/src/Recyclarr.Core/TrashGuide/CustomFormat/NondeterministicValueConverter.cs similarity index 100% rename from src/Recyclarr.TrashGuide/CustomFormat/NondeterministicValueConverter.cs rename to src/Recyclarr.Core/TrashGuide/CustomFormat/NondeterministicValueConverter.cs diff --git a/src/Recyclarr.Config/GlobalUsings.cs b/src/Recyclarr.Core/TrashGuide/GlobalUsings.cs similarity index 100% rename from src/Recyclarr.Config/GlobalUsings.cs rename to src/Recyclarr.Core/TrashGuide/GlobalUsings.cs diff --git a/src/Recyclarr.TrashGuide/GuideAutofacModule.cs b/src/Recyclarr.Core/TrashGuide/GuideAutofacModule.cs similarity index 100% rename from src/Recyclarr.TrashGuide/GuideAutofacModule.cs rename to src/Recyclarr.Core/TrashGuide/GuideAutofacModule.cs diff --git a/src/Recyclarr.TrashGuide/IConfigTemplateGuideService.cs b/src/Recyclarr.Core/TrashGuide/IConfigTemplateGuideService.cs similarity index 100% rename from src/Recyclarr.TrashGuide/IConfigTemplateGuideService.cs rename to src/Recyclarr.Core/TrashGuide/IConfigTemplateGuideService.cs diff --git a/src/Recyclarr.TrashGuide/MediaNaming/IMediaNamingGuideService.cs b/src/Recyclarr.Core/TrashGuide/MediaNaming/IMediaNamingGuideService.cs similarity index 100% rename from src/Recyclarr.TrashGuide/MediaNaming/IMediaNamingGuideService.cs rename to src/Recyclarr.Core/TrashGuide/MediaNaming/IMediaNamingGuideService.cs diff --git a/src/Recyclarr.TrashGuide/MediaNaming/MediaNamingGuideService.cs b/src/Recyclarr.Core/TrashGuide/MediaNaming/MediaNamingGuideService.cs similarity index 100% rename from src/Recyclarr.TrashGuide/MediaNaming/MediaNamingGuideService.cs rename to src/Recyclarr.Core/TrashGuide/MediaNaming/MediaNamingGuideService.cs diff --git a/src/Recyclarr.TrashGuide/MediaNaming/RadarrMediaNamingData.cs b/src/Recyclarr.Core/TrashGuide/MediaNaming/RadarrMediaNamingData.cs similarity index 100% rename from src/Recyclarr.TrashGuide/MediaNaming/RadarrMediaNamingData.cs rename to src/Recyclarr.Core/TrashGuide/MediaNaming/RadarrMediaNamingData.cs diff --git a/src/Recyclarr.TrashGuide/MediaNaming/SonarrMediaNamingData.cs b/src/Recyclarr.Core/TrashGuide/MediaNaming/SonarrMediaNamingData.cs similarity index 100% rename from src/Recyclarr.TrashGuide/MediaNaming/SonarrMediaNamingData.cs rename to src/Recyclarr.Core/TrashGuide/MediaNaming/SonarrMediaNamingData.cs diff --git a/src/Recyclarr.TrashGuide/QualitySize/IQualityItemLimitFetcher.cs b/src/Recyclarr.Core/TrashGuide/QualitySize/IQualityItemLimitFetcher.cs similarity index 100% rename from src/Recyclarr.TrashGuide/QualitySize/IQualityItemLimitFetcher.cs rename to src/Recyclarr.Core/TrashGuide/QualitySize/IQualityItemLimitFetcher.cs diff --git a/src/Recyclarr.TrashGuide/QualitySize/IQualitySizeGuideService.cs b/src/Recyclarr.Core/TrashGuide/QualitySize/IQualitySizeGuideService.cs similarity index 100% rename from src/Recyclarr.TrashGuide/QualitySize/IQualitySizeGuideService.cs rename to src/Recyclarr.Core/TrashGuide/QualitySize/IQualitySizeGuideService.cs diff --git a/src/Recyclarr.TrashGuide/QualitySize/QualityItem.cs b/src/Recyclarr.Core/TrashGuide/QualitySize/QualityItem.cs similarity index 100% rename from src/Recyclarr.TrashGuide/QualitySize/QualityItem.cs rename to src/Recyclarr.Core/TrashGuide/QualitySize/QualityItem.cs diff --git a/src/Recyclarr.TrashGuide/QualitySize/QualityItemWithLimits.cs b/src/Recyclarr.Core/TrashGuide/QualitySize/QualityItemWithLimits.cs similarity index 100% rename from src/Recyclarr.TrashGuide/QualitySize/QualityItemWithLimits.cs rename to src/Recyclarr.Core/TrashGuide/QualitySize/QualityItemWithLimits.cs diff --git a/src/Recyclarr.TrashGuide/QualitySize/QualitySizeData.cs b/src/Recyclarr.Core/TrashGuide/QualitySize/QualitySizeData.cs similarity index 100% rename from src/Recyclarr.TrashGuide/QualitySize/QualitySizeData.cs rename to src/Recyclarr.Core/TrashGuide/QualitySize/QualitySizeData.cs diff --git a/src/Recyclarr.TrashGuide/QualitySize/QualitySizeGuideParser.cs b/src/Recyclarr.Core/TrashGuide/QualitySize/QualitySizeGuideParser.cs similarity index 100% rename from src/Recyclarr.TrashGuide/QualitySize/QualitySizeGuideParser.cs rename to src/Recyclarr.Core/TrashGuide/QualitySize/QualitySizeGuideParser.cs diff --git a/src/Recyclarr.TrashGuide/QualitySize/QualitySizeGuideService.cs b/src/Recyclarr.Core/TrashGuide/QualitySize/QualitySizeGuideService.cs similarity index 100% rename from src/Recyclarr.TrashGuide/QualitySize/QualitySizeGuideService.cs rename to src/Recyclarr.Core/TrashGuide/QualitySize/QualitySizeGuideService.cs diff --git a/src/Recyclarr.TrashGuide/QualitySize/QualitySizePaths.cs b/src/Recyclarr.Core/TrashGuide/QualitySize/QualitySizePaths.cs similarity index 100% rename from src/Recyclarr.TrashGuide/QualitySize/QualitySizePaths.cs rename to src/Recyclarr.Core/TrashGuide/QualitySize/QualitySizePaths.cs diff --git a/src/Recyclarr.TrashGuide/SupportedServices.cs b/src/Recyclarr.Core/TrashGuide/SupportedServices.cs similarity index 100% rename from src/Recyclarr.TrashGuide/SupportedServices.cs rename to src/Recyclarr.Core/TrashGuide/SupportedServices.cs diff --git a/src/Recyclarr.VersionControl/GitCmdException.cs b/src/Recyclarr.Core/VersionControl/GitCmdException.cs similarity index 100% rename from src/Recyclarr.VersionControl/GitCmdException.cs rename to src/Recyclarr.Core/VersionControl/GitCmdException.cs diff --git a/src/Recyclarr.VersionControl/GitRepository.cs b/src/Recyclarr.Core/VersionControl/GitRepository.cs similarity index 99% rename from src/Recyclarr.VersionControl/GitRepository.cs rename to src/Recyclarr.Core/VersionControl/GitRepository.cs index 257383a8..ec072ecb 100644 --- a/src/Recyclarr.VersionControl/GitRepository.cs +++ b/src/Recyclarr.Core/VersionControl/GitRepository.cs @@ -2,7 +2,6 @@ using System.Diagnostics.CodeAnalysis; using System.IO.Abstractions; using System.Text; using CliWrap; -using Serilog; namespace Recyclarr.VersionControl; diff --git a/src/Recyclarr.VersionControl/GitRepositoryFactory.cs b/src/Recyclarr.Core/VersionControl/GitRepositoryFactory.cs similarity index 99% rename from src/Recyclarr.VersionControl/GitRepositoryFactory.cs rename to src/Recyclarr.Core/VersionControl/GitRepositoryFactory.cs index a8a818a8..16db521e 100644 --- a/src/Recyclarr.VersionControl/GitRepositoryFactory.cs +++ b/src/Recyclarr.Core/VersionControl/GitRepositoryFactory.cs @@ -1,5 +1,4 @@ using System.IO.Abstractions; -using Serilog; namespace Recyclarr.VersionControl; diff --git a/src/Recyclarr.VersionControl/IGitPath.cs b/src/Recyclarr.Core/VersionControl/IGitPath.cs similarity index 100% rename from src/Recyclarr.VersionControl/IGitPath.cs rename to src/Recyclarr.Core/VersionControl/IGitPath.cs diff --git a/src/Recyclarr.VersionControl/IGitRepository.cs b/src/Recyclarr.Core/VersionControl/IGitRepository.cs similarity index 100% rename from src/Recyclarr.VersionControl/IGitRepository.cs rename to src/Recyclarr.Core/VersionControl/IGitRepository.cs diff --git a/src/Recyclarr.VersionControl/IGitRepositoryFactory.cs b/src/Recyclarr.Core/VersionControl/IGitRepositoryFactory.cs similarity index 100% rename from src/Recyclarr.VersionControl/IGitRepositoryFactory.cs rename to src/Recyclarr.Core/VersionControl/IGitRepositoryFactory.cs diff --git a/src/Recyclarr.VersionControl/VersionControlAutofacModule.cs b/src/Recyclarr.Core/VersionControl/VersionControlAutofacModule.cs similarity index 100% rename from src/Recyclarr.VersionControl/VersionControlAutofacModule.cs rename to src/Recyclarr.Core/VersionControl/VersionControlAutofacModule.cs diff --git a/src/Recyclarr.Yaml/GlobalUsings.cs b/src/Recyclarr.Core/Yaml/GlobalUsings.cs similarity index 100% rename from src/Recyclarr.Yaml/GlobalUsings.cs rename to src/Recyclarr.Core/Yaml/GlobalUsings.cs diff --git a/src/Recyclarr.Yaml/IYamlBehavior.cs b/src/Recyclarr.Core/Yaml/IYamlBehavior.cs similarity index 100% rename from src/Recyclarr.Yaml/IYamlBehavior.cs rename to src/Recyclarr.Core/Yaml/IYamlBehavior.cs diff --git a/src/Recyclarr.Yaml/IYamlSerializerFactory.cs b/src/Recyclarr.Core/Yaml/IYamlSerializerFactory.cs similarity index 100% rename from src/Recyclarr.Yaml/IYamlSerializerFactory.cs rename to src/Recyclarr.Core/Yaml/IYamlSerializerFactory.cs diff --git a/src/Recyclarr.Yaml/UnknownYamlException.cs b/src/Recyclarr.Core/Yaml/UnknownYamlException.cs similarity index 100% rename from src/Recyclarr.Yaml/UnknownYamlException.cs rename to src/Recyclarr.Core/Yaml/UnknownYamlException.cs diff --git a/src/Recyclarr.Yaml/YamlAutofacModule.cs b/src/Recyclarr.Core/Yaml/YamlAutofacModule.cs similarity index 100% rename from src/Recyclarr.Yaml/YamlAutofacModule.cs rename to src/Recyclarr.Core/Yaml/YamlAutofacModule.cs diff --git a/src/Recyclarr.Yaml/YamlDotNet/CannotBeEmptyAttribute.cs b/src/Recyclarr.Core/Yaml/YamlDotNet/CannotBeEmptyAttribute.cs similarity index 100% rename from src/Recyclarr.Yaml/YamlDotNet/CannotBeEmptyAttribute.cs rename to src/Recyclarr.Core/Yaml/YamlDotNet/CannotBeEmptyAttribute.cs diff --git a/src/Recyclarr.Yaml/YamlDotNet/ForceEmptySequences.cs b/src/Recyclarr.Core/Yaml/YamlDotNet/ForceEmptySequences.cs similarity index 100% rename from src/Recyclarr.Yaml/YamlDotNet/ForceEmptySequences.cs rename to src/Recyclarr.Core/Yaml/YamlDotNet/ForceEmptySequences.cs diff --git a/src/Recyclarr.Yaml/YamlDotNet/ReadOnlyCollectionNodeTypeResolver.cs b/src/Recyclarr.Core/Yaml/YamlDotNet/ReadOnlyCollectionNodeTypeResolver.cs similarity index 100% rename from src/Recyclarr.Yaml/YamlDotNet/ReadOnlyCollectionNodeTypeResolver.cs rename to src/Recyclarr.Core/Yaml/YamlDotNet/ReadOnlyCollectionNodeTypeResolver.cs diff --git a/src/Recyclarr.Yaml/YamlDotNet/SyntaxErrorHelper.cs b/src/Recyclarr.Core/Yaml/YamlDotNet/SyntaxErrorHelper.cs similarity index 100% rename from src/Recyclarr.Yaml/YamlDotNet/SyntaxErrorHelper.cs rename to src/Recyclarr.Core/Yaml/YamlDotNet/SyntaxErrorHelper.cs diff --git a/src/Recyclarr.Yaml/YamlDotNet/YamlNullableEnumTypeConverter.cs b/src/Recyclarr.Core/Yaml/YamlDotNet/YamlNullableEnumTypeConverter.cs similarity index 100% rename from src/Recyclarr.Yaml/YamlDotNet/YamlNullableEnumTypeConverter.cs rename to src/Recyclarr.Core/Yaml/YamlDotNet/YamlNullableEnumTypeConverter.cs diff --git a/src/Recyclarr.Yaml/YamlSerializerFactory.cs b/src/Recyclarr.Core/Yaml/YamlSerializerFactory.cs similarity index 100% rename from src/Recyclarr.Yaml/YamlSerializerFactory.cs rename to src/Recyclarr.Core/Yaml/YamlSerializerFactory.cs diff --git a/src/Recyclarr.Gui/Recyclarr.Gui.csproj b/src/Recyclarr.Gui/Recyclarr.Gui.csproj index d8a3adb2..93ad4ceb 100644 --- a/src/Recyclarr.Gui/Recyclarr.Gui.csproj +++ b/src/Recyclarr.Gui/Recyclarr.Gui.csproj @@ -16,6 +16,6 @@ - + diff --git a/src/Recyclarr.Http/Recyclarr.Http.csproj b/src/Recyclarr.Http/Recyclarr.Http.csproj deleted file mode 100644 index d27cc679..00000000 --- a/src/Recyclarr.Http/Recyclarr.Http.csproj +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - diff --git a/src/Recyclarr.Json/Recyclarr.Json.csproj b/src/Recyclarr.Json/Recyclarr.Json.csproj deleted file mode 100644 index 6cbd55fb..00000000 --- a/src/Recyclarr.Json/Recyclarr.Json.csproj +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/src/Recyclarr.Logging/Recyclarr.Logging.csproj b/src/Recyclarr.Logging/Recyclarr.Logging.csproj deleted file mode 100644 index 894b2a89..00000000 --- a/src/Recyclarr.Logging/Recyclarr.Logging.csproj +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - diff --git a/src/Recyclarr.Platform/Recyclarr.Platform.csproj b/src/Recyclarr.Platform/Recyclarr.Platform.csproj deleted file mode 100644 index 5a7697c1..00000000 --- a/src/Recyclarr.Platform/Recyclarr.Platform.csproj +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/src/Recyclarr.Repo/Recyclarr.Repo.csproj b/src/Recyclarr.Repo/Recyclarr.Repo.csproj deleted file mode 100644 index ee978528..00000000 --- a/src/Recyclarr.Repo/Recyclarr.Repo.csproj +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/src/Recyclarr.ServarrApi/Recyclarr.ServarrApi.csproj b/src/Recyclarr.ServarrApi/Recyclarr.ServarrApi.csproj deleted file mode 100644 index 55c5ebd8..00000000 --- a/src/Recyclarr.ServarrApi/Recyclarr.ServarrApi.csproj +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/src/Recyclarr.Settings/Recyclarr.Settings.csproj b/src/Recyclarr.Settings/Recyclarr.Settings.csproj deleted file mode 100644 index 94b4f988..00000000 --- a/src/Recyclarr.Settings/Recyclarr.Settings.csproj +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/src/Recyclarr.TrashGuide/GlobalUsings.cs b/src/Recyclarr.TrashGuide/GlobalUsings.cs deleted file mode 100644 index 1e3063b8..00000000 --- a/src/Recyclarr.TrashGuide/GlobalUsings.cs +++ /dev/null @@ -1,2 +0,0 @@ -global using SuperLinq; -global using Serilog; diff --git a/src/Recyclarr.TrashGuide/Recyclarr.TrashGuide.csproj b/src/Recyclarr.TrashGuide/Recyclarr.TrashGuide.csproj deleted file mode 100644 index f0042cba..00000000 --- a/src/Recyclarr.TrashGuide/Recyclarr.TrashGuide.csproj +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/src/Recyclarr.VersionControl/Recyclarr.VersionControl.csproj b/src/Recyclarr.VersionControl/Recyclarr.VersionControl.csproj deleted file mode 100644 index e1815414..00000000 --- a/src/Recyclarr.VersionControl/Recyclarr.VersionControl.csproj +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/src/Recyclarr.Yaml/Recyclarr.Yaml.csproj b/src/Recyclarr.Yaml/Recyclarr.Yaml.csproj deleted file mode 100644 index 2ba1b0b0..00000000 --- a/src/Recyclarr.Yaml/Recyclarr.Yaml.csproj +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/tests/Recyclarr.Cli.IntegrationTests/BaseCommandSetupIntegrationTest.cs b/tests/Recyclarr.Cli.IntegrationTests/BaseCommandSetupIntegrationTest.cs index 518f16af..4530e648 100644 --- a/tests/Recyclarr.Cli.IntegrationTests/BaseCommandSetupIntegrationTest.cs +++ b/tests/Recyclarr.Cli.IntegrationTests/BaseCommandSetupIntegrationTest.cs @@ -12,7 +12,7 @@ internal class BaseCommandSetupIntegrationTest : CliIntegrationFixture { const int maxFiles = 25; - Fs.AddFile(Paths.AppDataDirectory.File("settings.yml").FullName, new MockFileData( + Fs.AddFile(Paths.AppDataDirectory.File("settings.yml"), new MockFileData( $""" log_janitor: max_files: {maxFiles} diff --git a/tests/Recyclarr.Cli.IntegrationTests/Recyclarr.Cli.IntegrationTests.csproj b/tests/Recyclarr.Cli.IntegrationTests/Recyclarr.Cli.IntegrationTests.csproj index a1144ad6..34d85567 100644 --- a/tests/Recyclarr.Cli.IntegrationTests/Recyclarr.Cli.IntegrationTests.csproj +++ b/tests/Recyclarr.Cli.IntegrationTests/Recyclarr.Cli.IntegrationTests.csproj @@ -1,6 +1,7 @@ + diff --git a/tests/Recyclarr.Cli.TestLibrary/Recyclarr.Cli.TestLibrary.csproj b/tests/Recyclarr.Cli.TestLibrary/Recyclarr.Cli.TestLibrary.csproj index 98407968..f14ee3f4 100644 --- a/tests/Recyclarr.Cli.TestLibrary/Recyclarr.Cli.TestLibrary.csproj +++ b/tests/Recyclarr.Cli.TestLibrary/Recyclarr.Cli.TestLibrary.csproj @@ -1,6 +1,7 @@  + diff --git a/tests/Recyclarr.Cli.Tests/Recyclarr.Cli.Tests.csproj b/tests/Recyclarr.Cli.Tests/Recyclarr.Cli.Tests.csproj index e091788a..f2b4e8de 100644 --- a/tests/Recyclarr.Cli.Tests/Recyclarr.Cli.Tests.csproj +++ b/tests/Recyclarr.Cli.Tests/Recyclarr.Cli.Tests.csproj @@ -1,6 +1,7 @@ + diff --git a/tests/Recyclarr.IntegrationTests/Recyclarr.IntegrationTests.csproj b/tests/Recyclarr.IntegrationTests/Recyclarr.IntegrationTests.csproj index eeea7c74..5417cb0f 100644 --- a/tests/Recyclarr.IntegrationTests/Recyclarr.IntegrationTests.csproj +++ b/tests/Recyclarr.IntegrationTests/Recyclarr.IntegrationTests.csproj @@ -1,9 +1,6 @@ - - - - + diff --git a/tests/Recyclarr.TestLibrary/Recyclarr.TestLibrary.csproj b/tests/Recyclarr.TestLibrary/Recyclarr.TestLibrary.csproj index 90d320e1..098a9cf9 100644 --- a/tests/Recyclarr.TestLibrary/Recyclarr.TestLibrary.csproj +++ b/tests/Recyclarr.TestLibrary/Recyclarr.TestLibrary.csproj @@ -1,6 +1,6 @@ - + diff --git a/tests/Recyclarr.Tests.TestLibrary/Recyclarr.Tests.TestLibrary.csproj b/tests/Recyclarr.Tests.TestLibrary/Recyclarr.Tests.TestLibrary.csproj index b37c6b59..218ffd41 100644 --- a/tests/Recyclarr.Tests.TestLibrary/Recyclarr.Tests.TestLibrary.csproj +++ b/tests/Recyclarr.Tests.TestLibrary/Recyclarr.Tests.TestLibrary.csproj @@ -1,6 +1,5 @@ - - + diff --git a/tests/Recyclarr.Tests/Platform/DefaultAppDataSetupTest.cs b/tests/Recyclarr.Tests/Platform/DefaultAppDataSetupTest.cs index f5bee7aa..70b60bc1 100644 --- a/tests/Recyclarr.Tests/Platform/DefaultAppDataSetupTest.cs +++ b/tests/Recyclarr.Tests/Platform/DefaultAppDataSetupTest.cs @@ -1,5 +1,6 @@ using System.IO.Abstractions; using Recyclarr.Platform; +using IEnvironment = Recyclarr.Platform.IEnvironment; namespace Recyclarr.Tests.Platform; diff --git a/tests/Recyclarr.Tests/Recyclarr.Tests.csproj b/tests/Recyclarr.Tests/Recyclarr.Tests.csproj index 122f056b..287c3f57 100644 --- a/tests/Recyclarr.Tests/Recyclarr.Tests.csproj +++ b/tests/Recyclarr.Tests/Recyclarr.Tests.csproj @@ -1,7 +1,6 @@ - - +