From f06a2c829a4ecf5ad7cdb3109f66155044a36072 Mon Sep 17 00:00:00 2001 From: Robert Dailey Date: Fri, 23 Jun 2023 14:46:56 -0500 Subject: [PATCH] refactor: Move Cache code files to Cli project --- .../Cache/CacheAutofacModule.cs | 2 +- .../Cache/CacheException.cs | 2 +- .../Cache/CacheObjectNameAttribute.cs | 2 +- .../Cache/CachePersister.cs | 2 +- .../Cache/CustomFormatCache.cs | 2 +- .../Cache/ICachePersister.cs | 2 +- .../Cache/IServiceCache.cs | 2 +- .../Cache/ServiceCache.cs | 2 +- src/Recyclarr.Cli/CompositionRoot.cs | 2 ++ .../Pipelines/CustomFormat/CustomFormatAutofacModule.cs | 2 +- .../Pipelines/CustomFormat/CustomFormatSyncPipeline.cs | 2 +- .../PipelinePhases/CustomFormatTransactionPhase.cs | 2 +- src/Recyclarr.TrashLib/TrashLibAutofacModule.cs | 2 -- .../Cache/CachePersisterTest.cs | 4 ++-- .../Cache/ServiceCacheTest.cs | 4 ++-- .../PipelinePhases/CustomFormatTransactionPhaseTest.cs | 2 +- 16 files changed, 18 insertions(+), 18 deletions(-) rename src/{Recyclarr.TrashLib => Recyclarr.Cli}/Cache/CacheAutofacModule.cs (88%) rename src/{Recyclarr.TrashLib => Recyclarr.Cli}/Cache/CacheException.cs (89%) rename src/{Recyclarr.TrashLib => Recyclarr.Cli}/Cache/CacheObjectNameAttribute.cs (85%) rename src/{Recyclarr.TrashLib => Recyclarr.Cli}/Cache/CachePersister.cs (97%) rename src/{Recyclarr.TrashLib => Recyclarr.Cli}/Cache/CustomFormatCache.cs (97%) rename src/{Recyclarr.TrashLib => Recyclarr.Cli}/Cache/ICachePersister.cs (85%) rename src/{Recyclarr.TrashLib => Recyclarr.Cli}/Cache/IServiceCache.cs (85%) rename src/{Recyclarr.TrashLib => Recyclarr.Cli}/Cache/ServiceCache.cs (98%) rename src/tests/{Recyclarr.TrashLib.Tests => Recyclarr.Cli.Tests}/Cache/CachePersisterTest.cs (98%) rename src/tests/{Recyclarr.TrashLib.Tests => Recyclarr.Cli.Tests}/Cache/ServiceCacheTest.cs (98%) diff --git a/src/Recyclarr.TrashLib/Cache/CacheAutofacModule.cs b/src/Recyclarr.Cli/Cache/CacheAutofacModule.cs similarity index 88% rename from src/Recyclarr.TrashLib/Cache/CacheAutofacModule.cs rename to src/Recyclarr.Cli/Cache/CacheAutofacModule.cs index b4046fc6..5b90af31 100644 --- a/src/Recyclarr.TrashLib/Cache/CacheAutofacModule.cs +++ b/src/Recyclarr.Cli/Cache/CacheAutofacModule.cs @@ -1,6 +1,6 @@ using Autofac; -namespace Recyclarr.TrashLib.Cache; +namespace Recyclarr.Cli.Cache; public class CacheAutofacModule : Module { diff --git a/src/Recyclarr.TrashLib/Cache/CacheException.cs b/src/Recyclarr.Cli/Cache/CacheException.cs similarity index 89% rename from src/Recyclarr.TrashLib/Cache/CacheException.cs rename to src/Recyclarr.Cli/Cache/CacheException.cs index 4381aa32..c9aede4a 100644 --- a/src/Recyclarr.TrashLib/Cache/CacheException.cs +++ b/src/Recyclarr.Cli/Cache/CacheException.cs @@ -1,6 +1,6 @@ using System.Runtime.Serialization; -namespace Recyclarr.TrashLib.Cache; +namespace Recyclarr.Cli.Cache; [Serializable] public class CacheException : Exception diff --git a/src/Recyclarr.TrashLib/Cache/CacheObjectNameAttribute.cs b/src/Recyclarr.Cli/Cache/CacheObjectNameAttribute.cs similarity index 85% rename from src/Recyclarr.TrashLib/Cache/CacheObjectNameAttribute.cs rename to src/Recyclarr.Cli/Cache/CacheObjectNameAttribute.cs index 1e2d739f..96dec0be 100644 --- a/src/Recyclarr.TrashLib/Cache/CacheObjectNameAttribute.cs +++ b/src/Recyclarr.Cli/Cache/CacheObjectNameAttribute.cs @@ -1,4 +1,4 @@ -namespace Recyclarr.TrashLib.Cache; +namespace Recyclarr.Cli.Cache; [AttributeUsage(AttributeTargets.Class)] public sealed class CacheObjectNameAttribute : Attribute diff --git a/src/Recyclarr.TrashLib/Cache/CachePersister.cs b/src/Recyclarr.Cli/Cache/CachePersister.cs similarity index 97% rename from src/Recyclarr.TrashLib/Cache/CachePersister.cs rename to src/Recyclarr.Cli/Cache/CachePersister.cs index 95c272f1..4bda7c67 100644 --- a/src/Recyclarr.TrashLib/Cache/CachePersister.cs +++ b/src/Recyclarr.Cli/Cache/CachePersister.cs @@ -1,6 +1,6 @@ using Recyclarr.TrashLib.Config.Services; -namespace Recyclarr.TrashLib.Cache; +namespace Recyclarr.Cli.Cache; public class CachePersister : ICachePersister { diff --git a/src/Recyclarr.TrashLib/Cache/CustomFormatCache.cs b/src/Recyclarr.Cli/Cache/CustomFormatCache.cs similarity index 97% rename from src/Recyclarr.TrashLib/Cache/CustomFormatCache.cs rename to src/Recyclarr.Cli/Cache/CustomFormatCache.cs index 72d8067b..3aa63024 100644 --- a/src/Recyclarr.TrashLib/Cache/CustomFormatCache.cs +++ b/src/Recyclarr.Cli/Cache/CustomFormatCache.cs @@ -1,6 +1,6 @@ using Recyclarr.TrashLib.Models; -namespace Recyclarr.TrashLib.Cache; +namespace Recyclarr.Cli.Cache; [CacheObjectName("custom-format-cache")] public record CustomFormatCache diff --git a/src/Recyclarr.TrashLib/Cache/ICachePersister.cs b/src/Recyclarr.Cli/Cache/ICachePersister.cs similarity index 85% rename from src/Recyclarr.TrashLib/Cache/ICachePersister.cs rename to src/Recyclarr.Cli/Cache/ICachePersister.cs index 5aaacf6f..c1630ae7 100644 --- a/src/Recyclarr.TrashLib/Cache/ICachePersister.cs +++ b/src/Recyclarr.Cli/Cache/ICachePersister.cs @@ -1,6 +1,6 @@ using Recyclarr.TrashLib.Config.Services; -namespace Recyclarr.TrashLib.Cache; +namespace Recyclarr.Cli.Cache; public interface ICachePersister { diff --git a/src/Recyclarr.TrashLib/Cache/IServiceCache.cs b/src/Recyclarr.Cli/Cache/IServiceCache.cs similarity index 85% rename from src/Recyclarr.TrashLib/Cache/IServiceCache.cs rename to src/Recyclarr.Cli/Cache/IServiceCache.cs index 84c55d18..a5e0b137 100644 --- a/src/Recyclarr.TrashLib/Cache/IServiceCache.cs +++ b/src/Recyclarr.Cli/Cache/IServiceCache.cs @@ -1,6 +1,6 @@ using Recyclarr.TrashLib.Config.Services; -namespace Recyclarr.TrashLib.Cache; +namespace Recyclarr.Cli.Cache; public interface IServiceCache { diff --git a/src/Recyclarr.TrashLib/Cache/ServiceCache.cs b/src/Recyclarr.Cli/Cache/ServiceCache.cs similarity index 98% rename from src/Recyclarr.TrashLib/Cache/ServiceCache.cs rename to src/Recyclarr.Cli/Cache/ServiceCache.cs index b4ffa60b..87697d30 100644 --- a/src/Recyclarr.TrashLib/Cache/ServiceCache.cs +++ b/src/Recyclarr.Cli/Cache/ServiceCache.cs @@ -7,7 +7,7 @@ using Recyclarr.Common.Extensions; using Recyclarr.TrashLib.Config.Services; using Recyclarr.TrashLib.Interfaces; -namespace Recyclarr.TrashLib.Cache; +namespace Recyclarr.Cli.Cache; public partial class ServiceCache : IServiceCache { diff --git a/src/Recyclarr.Cli/CompositionRoot.cs b/src/Recyclarr.Cli/CompositionRoot.cs index 6b3e6027..46d5294c 100644 --- a/src/Recyclarr.Cli/CompositionRoot.cs +++ b/src/Recyclarr.Cli/CompositionRoot.cs @@ -5,6 +5,7 @@ using Autofac.Extras.Ordering; using AutoMapper.Contrib.Autofac.DependencyInjection; using AutoMapper.EquivalencyExpression; using FluentValidation; +using Recyclarr.Cli.Cache; using Recyclarr.Cli.Console.Helpers; using Recyclarr.Cli.Console.Setup; using Recyclarr.Cli.Logging; @@ -36,6 +37,7 @@ public static class CompositionRoot builder.RegisterModule(); builder.RegisterModule(); builder.RegisterModule(); + builder.RegisterModule(); builder.RegisterType().As(); builder.RegisterType().As(); diff --git a/src/Recyclarr.Cli/Pipelines/CustomFormat/CustomFormatAutofacModule.cs b/src/Recyclarr.Cli/Pipelines/CustomFormat/CustomFormatAutofacModule.cs index 84acfcba..b58407f5 100644 --- a/src/Recyclarr.Cli/Pipelines/CustomFormat/CustomFormatAutofacModule.cs +++ b/src/Recyclarr.Cli/Pipelines/CustomFormat/CustomFormatAutofacModule.cs @@ -1,10 +1,10 @@ using Autofac; using Autofac.Extras.AggregateService; +using Recyclarr.Cli.Cache; using Recyclarr.Cli.Pipelines.CustomFormat.Api; using Recyclarr.Cli.Pipelines.CustomFormat.Guide; using Recyclarr.Cli.Pipelines.CustomFormat.Models; using Recyclarr.Cli.Pipelines.CustomFormat.PipelinePhases; -using Recyclarr.TrashLib.Cache; namespace Recyclarr.Cli.Pipelines.CustomFormat; diff --git a/src/Recyclarr.Cli/Pipelines/CustomFormat/CustomFormatSyncPipeline.cs b/src/Recyclarr.Cli/Pipelines/CustomFormat/CustomFormatSyncPipeline.cs index f51cbf08..ed327c6f 100644 --- a/src/Recyclarr.Cli/Pipelines/CustomFormat/CustomFormatSyncPipeline.cs +++ b/src/Recyclarr.Cli/Pipelines/CustomFormat/CustomFormatSyncPipeline.cs @@ -1,9 +1,9 @@ using System.Collections.ObjectModel; +using Recyclarr.Cli.Cache; using Recyclarr.Cli.Console.Settings; using Recyclarr.Cli.Pipelines.CustomFormat.Models; using Recyclarr.Cli.Pipelines.CustomFormat.PipelinePhases; using Recyclarr.Common.Extensions; -using Recyclarr.TrashLib.Cache; using Recyclarr.TrashLib.Config.Services; using Recyclarr.TrashLib.Models; diff --git a/src/Recyclarr.Cli/Pipelines/CustomFormat/PipelinePhases/CustomFormatTransactionPhase.cs b/src/Recyclarr.Cli/Pipelines/CustomFormat/PipelinePhases/CustomFormatTransactionPhase.cs index 28218a1d..ab01c7dc 100644 --- a/src/Recyclarr.Cli/Pipelines/CustomFormat/PipelinePhases/CustomFormatTransactionPhase.cs +++ b/src/Recyclarr.Cli/Pipelines/CustomFormat/PipelinePhases/CustomFormatTransactionPhase.cs @@ -1,7 +1,7 @@ using System.Diagnostics.CodeAnalysis; +using Recyclarr.Cli.Cache; using Recyclarr.Cli.Pipelines.CustomFormat.Models; using Recyclarr.Common.Extensions; -using Recyclarr.TrashLib.Cache; using Recyclarr.TrashLib.Config.Services; using Recyclarr.TrashLib.Models; diff --git a/src/Recyclarr.TrashLib/TrashLibAutofacModule.cs b/src/Recyclarr.TrashLib/TrashLibAutofacModule.cs index e1caab80..a6afa266 100644 --- a/src/Recyclarr.TrashLib/TrashLibAutofacModule.cs +++ b/src/Recyclarr.TrashLib/TrashLibAutofacModule.cs @@ -3,7 +3,6 @@ using Autofac.Extras.Ordering; using Recyclarr.Common; using Recyclarr.Common.FluentValidation; using Recyclarr.TrashLib.ApiServices; -using Recyclarr.TrashLib.Cache; using Recyclarr.TrashLib.Compatibility; using Recyclarr.TrashLib.Config; using Recyclarr.TrashLib.Http; @@ -31,7 +30,6 @@ public class TrashLibAutofacModule : Module builder.RegisterModule(); builder.RegisterModule(); builder.RegisterType().As(); - builder.RegisterModule(); builder.RegisterType().As().SingleInstance(); } diff --git a/src/tests/Recyclarr.TrashLib.Tests/Cache/CachePersisterTest.cs b/src/tests/Recyclarr.Cli.Tests/Cache/CachePersisterTest.cs similarity index 98% rename from src/tests/Recyclarr.TrashLib.Tests/Cache/CachePersisterTest.cs rename to src/tests/Recyclarr.Cli.Tests/Cache/CachePersisterTest.cs index 499ec8e3..8f9e71ff 100644 --- a/src/tests/Recyclarr.TrashLib.Tests/Cache/CachePersisterTest.cs +++ b/src/tests/Recyclarr.Cli.Tests/Cache/CachePersisterTest.cs @@ -1,10 +1,10 @@ using System.Collections.ObjectModel; -using Recyclarr.TrashLib.Cache; +using Recyclarr.Cli.Cache; using Recyclarr.TrashLib.Config.Services; using Recyclarr.TrashLib.Models; using Recyclarr.TrashLib.TestLibrary; -namespace Recyclarr.TrashLib.Tests.Cache; +namespace Recyclarr.Cli.Tests.Cache; [TestFixture] [Parallelizable(ParallelScope.All)] diff --git a/src/tests/Recyclarr.TrashLib.Tests/Cache/ServiceCacheTest.cs b/src/tests/Recyclarr.Cli.Tests/Cache/ServiceCacheTest.cs similarity index 98% rename from src/tests/Recyclarr.TrashLib.Tests/Cache/ServiceCacheTest.cs rename to src/tests/Recyclarr.Cli.Tests/Cache/ServiceCacheTest.cs index 1ad566ec..460e1eee 100644 --- a/src/tests/Recyclarr.TrashLib.Tests/Cache/ServiceCacheTest.cs +++ b/src/tests/Recyclarr.Cli.Tests/Cache/ServiceCacheTest.cs @@ -1,9 +1,9 @@ using System.Collections.ObjectModel; -using Recyclarr.TrashLib.Cache; +using Recyclarr.Cli.Cache; using Recyclarr.TrashLib.Config.Services; using Recyclarr.TrashLib.Interfaces; -namespace Recyclarr.TrashLib.Tests.Cache; +namespace Recyclarr.Cli.Tests.Cache; [TestFixture] [Parallelizable(ParallelScope.All)] diff --git a/src/tests/Recyclarr.Cli.Tests/Pipelines/CustomFormat/PipelinePhases/CustomFormatTransactionPhaseTest.cs b/src/tests/Recyclarr.Cli.Tests/Pipelines/CustomFormat/PipelinePhases/CustomFormatTransactionPhaseTest.cs index f5c024f0..c0e77565 100644 --- a/src/tests/Recyclarr.Cli.Tests/Pipelines/CustomFormat/PipelinePhases/CustomFormatTransactionPhaseTest.cs +++ b/src/tests/Recyclarr.Cli.Tests/Pipelines/CustomFormat/PipelinePhases/CustomFormatTransactionPhaseTest.cs @@ -1,8 +1,8 @@ +using Recyclarr.Cli.Cache; using Recyclarr.Cli.Pipelines.CustomFormat; using Recyclarr.Cli.Pipelines.CustomFormat.Models; using Recyclarr.Cli.Pipelines.CustomFormat.PipelinePhases; using Recyclarr.Cli.TestLibrary; -using Recyclarr.TrashLib.Cache; using Recyclarr.TrashLib.Models; using Recyclarr.TrashLib.TestLibrary;