refactor: Rename all projects to have Recyclarr prefix

pull/153/head
Robert Dailey 1 year ago
parent d1fe264eb0
commit 77603b6c93

@ -7,7 +7,7 @@
<option name="USE_EXTERNAL_CONSOLE" value="0" />
<option name="USE_MONO" value="0" />
<option name="RUNTIME_ARGUMENTS" value="" />
<option name="PROJECT_PATH" value="$PROJECT_DIR$/Recyclarr/Recyclarr.csproj" />
<option name="PROJECT_PATH" value="$PROJECT_DIR$/Recyclarr.Cli/Recyclarr.Cli.csproj" />
<option name="PROJECT_EXE_PATH_TRACKING" value="1" />
<option name="PROJECT_ARGUMENTS_TRACKING" value="1" />
<option name="PROJECT_WORKING_DIRECTORY_TRACKING" value="1" />

@ -7,7 +7,7 @@
<option name="USE_EXTERNAL_CONSOLE" value="0" />
<option name="USE_MONO" value="0" />
<option name="RUNTIME_ARGUMENTS" value="" />
<option name="PROJECT_PATH" value="$PROJECT_DIR$/Recyclarr/Recyclarr.csproj" />
<option name="PROJECT_PATH" value="$PROJECT_DIR$/Recyclarr.Cli/Recyclarr.Cli.csproj" />
<option name="PROJECT_EXE_PATH_TRACKING" value="1" />
<option name="PROJECT_ARGUMENTS_TRACKING" value="1" />
<option name="PROJECT_WORKING_DIRECTORY_TRACKING" value="1" />

@ -7,7 +7,7 @@
<option name="USE_EXTERNAL_CONSOLE" value="0" />
<option name="USE_MONO" value="0" />
<option name="RUNTIME_ARGUMENTS" value="" />
<option name="PROJECT_PATH" value="$PROJECT_DIR$/Recyclarr/Recyclarr.csproj" />
<option name="PROJECT_PATH" value="$PROJECT_DIR$/Recyclarr.Cli/Recyclarr.Cli.csproj" />
<option name="PROJECT_EXE_PATH_TRACKING" value="1" />
<option name="PROJECT_ARGUMENTS_TRACKING" value="1" />
<option name="PROJECT_WORKING_DIRECTORY_TRACKING" value="1" />

@ -7,7 +7,7 @@
<option name="USE_EXTERNAL_CONSOLE" value="0" />
<option name="USE_MONO" value="0" />
<option name="RUNTIME_ARGUMENTS" value="" />
<option name="PROJECT_PATH" value="$PROJECT_DIR$/Recyclarr/Recyclarr.csproj" />
<option name="PROJECT_PATH" value="$PROJECT_DIR$/Recyclarr.Cli/Recyclarr.Cli.csproj" />
<option name="PROJECT_EXE_PATH_TRACKING" value="1" />
<option name="PROJECT_ARGUMENTS_TRACKING" value="1" />
<option name="PROJECT_WORKING_DIRECTORY_TRACKING" value="1" />

@ -7,7 +7,7 @@
<option name="USE_EXTERNAL_CONSOLE" value="0" />
<option name="USE_MONO" value="0" />
<option name="RUNTIME_ARGUMENTS" value="" />
<option name="PROJECT_PATH" value="$PROJECT_DIR$/Recyclarr/Recyclarr.csproj" />
<option name="PROJECT_PATH" value="$PROJECT_DIR$/Recyclarr.Cli/Recyclarr.Cli.csproj" />
<option name="PROJECT_EXE_PATH_TRACKING" value="1" />
<option name="PROJECT_ARGUMENTS_TRACKING" value="1" />
<option name="PROJECT_WORKING_DIRECTORY_TRACKING" value="1" />

@ -7,7 +7,7 @@
<option name="USE_EXTERNAL_CONSOLE" value="0" />
<option name="USE_MONO" value="0" />
<option name="RUNTIME_ARGUMENTS" value="" />
<option name="PROJECT_PATH" value="$PROJECT_DIR$/Recyclarr/Recyclarr.csproj" />
<option name="PROJECT_PATH" value="$PROJECT_DIR$/Recyclarr.Cli/Recyclarr.Cli.csproj" />
<option name="PROJECT_EXE_PATH_TRACKING" value="1" />
<option name="PROJECT_ARGUMENTS_TRACKING" value="1" />
<option name="PROJECT_WORKING_DIRECTORY_TRACKING" value="1" />

@ -7,7 +7,7 @@
<option name="USE_EXTERNAL_CONSOLE" value="0" />
<option name="USE_MONO" value="0" />
<option name="RUNTIME_ARGUMENTS" value="" />
<option name="PROJECT_PATH" value="$PROJECT_DIR$/Recyclarr/Recyclarr.csproj" />
<option name="PROJECT_PATH" value="$PROJECT_DIR$/Recyclarr.Cli/Recyclarr.Cli.csproj" />
<option name="PROJECT_EXE_PATH_TRACKING" value="1" />
<option name="PROJECT_ARGUMENTS_TRACKING" value="1" />
<option name="PROJECT_WORKING_DIRECTORY_TRACKING" value="1" />

@ -7,7 +7,7 @@
<option name="USE_EXTERNAL_CONSOLE" value="0" />
<option name="USE_MONO" value="0" />
<option name="RUNTIME_ARGUMENTS" value="" />
<option name="PROJECT_PATH" value="$PROJECT_DIR$/Recyclarr/Recyclarr.csproj" />
<option name="PROJECT_PATH" value="$PROJECT_DIR$/Recyclarr.Cli/Recyclarr.Cli.csproj" />
<option name="PROJECT_EXE_PATH_TRACKING" value="1" />
<option name="PROJECT_ARGUMENTS_TRACKING" value="1" />
<option name="PROJECT_WORKING_DIRECTORY_TRACKING" value="1" />

@ -7,7 +7,7 @@
<option name="USE_EXTERNAL_CONSOLE" value="0" />
<option name="USE_MONO" value="0" />
<option name="RUNTIME_ARGUMENTS" value="" />
<option name="PROJECT_PATH" value="$PROJECT_DIR$/Recyclarr/Recyclarr.csproj" />
<option name="PROJECT_PATH" value="$PROJECT_DIR$/Recyclarr.Cli/Recyclarr.Cli.csproj" />
<option name="PROJECT_EXE_PATH_TRACKING" value="1" />
<option name="PROJECT_ARGUMENTS_TRACKING" value="1" />
<option name="PROJECT_WORKING_DIRECTORY_TRACKING" value="1" />

@ -7,7 +7,7 @@
<option name="USE_EXTERNAL_CONSOLE" value="0" />
<option name="USE_MONO" value="0" />
<option name="RUNTIME_ARGUMENTS" value="" />
<option name="PROJECT_PATH" value="$PROJECT_DIR$/Recyclarr/Recyclarr.csproj" />
<option name="PROJECT_PATH" value="$PROJECT_DIR$/Recyclarr.Cli/Recyclarr.Cli.csproj" />
<option name="PROJECT_EXE_PATH_TRACKING" value="1" />
<option name="PROJECT_ARGUMENTS_TRACKING" value="1" />
<option name="PROJECT_WORKING_DIRECTORY_TRACKING" value="1" />

@ -10,7 +10,7 @@
<option name="USE_EXTERNAL_CONSOLE" value="0" />
<option name="USE_MONO" value="0" />
<option name="RUNTIME_ARGUMENTS" value="" />
<option name="PROJECT_PATH" value="$PROJECT_DIR$/Recyclarr/Recyclarr.csproj" />
<option name="PROJECT_PATH" value="$PROJECT_DIR$/Recyclarr.Cli/Recyclarr.Cli.csproj" />
<option name="PROJECT_EXE_PATH_TRACKING" value="1" />
<option name="PROJECT_ARGUMENTS_TRACKING" value="1" />
<option name="PROJECT_WORKING_DIRECTORY_TRACKING" value="1" />

@ -1,5 +0,0 @@
<Project Sdk="Microsoft.NET.Sdk">
<ItemGroup>
<ProjectReference Include="..\Common\Common.csproj" />
</ItemGroup>
</Project>

@ -37,6 +37,12 @@
<PackageReference Include="GitVersion.MsBuild" PrivateAssets="All" />
</ItemGroup>
<!-- TEST ONLY PROPERTIES -->
<PropertyGroup Condition="$(ProjectName.EndsWith('.Tests')) Or $(ProjectName.EndsWith('TestLibrary'))">
<IsPackable>false</IsPackable>
</PropertyGroup>
<!-- TEST ONLY PACKAGES -->
<ItemGroup Condition="$(ProjectName.EndsWith('.Tests')) Or $(ProjectName.EndsWith('TestLibrary'))">
<PackageReference Include="AutofacContrib.NSubstitute" PrivateAssets="All" />
<PackageReference Include="AutoFixture" PrivateAssets="All" />
@ -58,7 +64,7 @@
<PackageReference Include="TestableIO.System.IO.Abstractions.TestingHelpers" PrivateAssets="All" />
</ItemGroup>
<ItemGroup Condition="$(ProjectName.EndsWith('.Tests')) Or $(ProjectName.EndsWith('.TestLibrary'))">
<ItemGroup Condition="$(ProjectName.EndsWith('.Tests')) Or $(ProjectName.EndsWith('TestLibrary'))">
<EmbeddedResource Include="**\Data\*" />
</ItemGroup>
</Project>

@ -4,17 +4,17 @@ using System.IO.Abstractions.TestingHelpers;
using Autofac;
using Autofac.Features.ResolveAnything;
using CliFx.Infrastructure;
using Common.TestLibrary;
using NUnit.Framework;
using Recyclarr.Command;
using Recyclarr.Cli.Command;
using Recyclarr.Common.TestLibrary;
using Recyclarr.TestLibrary;
using Recyclarr.TrashLib;
using Recyclarr.TrashLib.Repo.VersionControl;
using Recyclarr.TrashLib.Startup;
using Serilog;
using Serilog.Events;
using TestLibrary;
using TrashLib;
using TrashLib.Repo.VersionControl;
using TrashLib.Startup;
namespace Recyclarr.TestLibrary;
namespace Recyclarr.Cli.TestLibrary;
[FixtureLifeCycle(LifeCycle.InstancePerTestCase)]
public abstract class IntegrationFixture : IDisposable

@ -0,0 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<ItemGroup>
<ProjectReference Include="..\Recyclarr.Common.TestLibrary\Recyclarr.Common.TestLibrary.csproj" />
<ProjectReference Include="..\Recyclarr.Cli\Recyclarr.Cli.csproj" />
<ProjectReference Include="..\Recyclarr.TestLibrary\Recyclarr.TestLibrary.csproj" />
</ItemGroup>
</Project>

@ -2,11 +2,11 @@ using System.IO.Abstractions;
using System.IO.Abstractions.TestingHelpers;
using FluentAssertions;
using NUnit.Framework;
using Recyclarr.Command.Setup;
using Recyclarr.TestLibrary;
using TrashLib.Config.Settings;
using Recyclarr.Cli.Command.Setup;
using Recyclarr.Cli.TestLibrary;
using Recyclarr.TrashLib.Config.Settings;
namespace Recyclarr.Tests;
namespace Recyclarr.Cli.Tests;
[TestFixture]
[Parallelizable(ParallelScope.All)]

@ -2,12 +2,12 @@ using System.IO.Abstractions;
using System.IO.Abstractions.Extensions;
using FluentAssertions;
using NUnit.Framework;
using Recyclarr.Command;
using Recyclarr.TestLibrary;
using Recyclarr.Cli.Command;
using Recyclarr.Cli.TestLibrary;
// ReSharper disable MethodHasAsyncOverload
namespace Recyclarr.Tests.Command;
namespace Recyclarr.Cli.Tests.Command;
[TestFixture]
[Parallelizable(ParallelScope.All)]

@ -2,11 +2,11 @@ using Autofac;
using FluentAssertions;
using NSubstitute;
using NUnit.Framework;
using Recyclarr.Command.Helpers;
using Recyclarr.TestLibrary;
using TrashLib.Config.Services;
using Recyclarr.Cli.Command.Helpers;
using Recyclarr.Cli.TestLibrary;
using Recyclarr.TrashLib.Config.Services;
namespace Recyclarr.Tests.Command.Helpers;
namespace Recyclarr.Cli.Tests.Command.Helpers;
[TestFixture]
[Parallelizable(ParallelScope.All)]

@ -1,15 +1,15 @@
using System.IO.Abstractions;
using CliFx.Exceptions;
using CliFx.Infrastructure;
using Common.TestLibrary;
using FluentAssertions;
using NUnit.Framework;
using Recyclarr.Command;
using Recyclarr.TestLibrary;
using TestLibrary.AutoFixture;
using TrashLib.Repo;
using Recyclarr.Cli.Command;
using Recyclarr.Cli.TestLibrary;
using Recyclarr.Common.TestLibrary;
using Recyclarr.TestLibrary.AutoFixture;
using Recyclarr.TrashLib.Repo;
namespace Recyclarr.Tests.Command;
namespace Recyclarr.Cli.Tests.Command;
[TestFixture]
[Parallelizable(ParallelScope.All)]

@ -9,15 +9,15 @@ using CliFx.Infrastructure;
using FluentAssertions;
using NSubstitute;
using NUnit.Framework;
using Recyclarr.Command;
using Recyclarr.TestLibrary;
using Recyclarr.Cli.Command;
using Recyclarr.Cli.TestLibrary;
using Recyclarr.TrashLib;
using Recyclarr.TrashLib.Config.Services;
using Recyclarr.TrashLib.Repo.VersionControl;
using Recyclarr.TrashLib.Startup;
using Serilog;
using TrashLib;
using TrashLib.Config.Services;
using TrashLib.Repo.VersionControl;
using TrashLib.Startup;
namespace Recyclarr.Tests;
namespace Recyclarr.Cli.Tests;
public record ServiceFactoryWrapper(Type Service, Action<ILifetimeScope> Instantiate);

@ -5,12 +5,12 @@ using AutoFixture.NUnit3;
using CliFx.Exceptions;
using FluentAssertions;
using NUnit.Framework;
using Recyclarr.Config;
using TestLibrary.AutoFixture;
using TrashLib;
using TrashLib.Startup;
using Recyclarr.Cli.Config;
using Recyclarr.TestLibrary.AutoFixture;
using Recyclarr.TrashLib;
using Recyclarr.TrashLib.Startup;
namespace Recyclarr.Tests.Config;
namespace Recyclarr.Cli.Tests.Config;
[TestFixture]
[Parallelizable(ParallelScope.All)]

@ -3,24 +3,24 @@ using System.IO.Abstractions.Extensions;
using System.IO.Abstractions.TestingHelpers;
using System.Text;
using Autofac;
using Common;
using Common.Extensions;
using FluentAssertions;
using FluentValidation;
using FluentValidation.Results;
using NSubstitute;
using NUnit.Framework;
using Recyclarr.Config;
using Recyclarr.Cli.Config;
using Recyclarr.Cli.TestLibrary;
using Recyclarr.Common;
using Recyclarr.Common.Extensions;
using Recyclarr.TestLibrary;
using Recyclarr.TestLibrary.AutoFixture;
using Recyclarr.TrashLib.Config.Secrets;
using Recyclarr.TrashLib.Services.Sonarr.Config;
using Recyclarr.TrashLib.TestLibrary;
using Serilog.Sinks.TestCorrelator;
using TestLibrary;
using TestLibrary.AutoFixture;
using TrashLib.Config.Secrets;
using TrashLib.Services.Sonarr.Config;
using TrashLib.TestLibrary;
using YamlDotNet.Core;
namespace Recyclarr.Tests.Config;
namespace Recyclarr.Cli.Tests.Config;
[TestFixture]
[Parallelizable(ParallelScope.All)]

@ -4,11 +4,11 @@ using AutoFixture.NUnit3;
using FluentAssertions;
using MoreLinq.Extensions;
using NUnit.Framework;
using Recyclarr.Logging;
using TestLibrary.AutoFixture;
using TrashLib.TestLibrary;
using Recyclarr.Cli.Logging;
using Recyclarr.TestLibrary.AutoFixture;
using Recyclarr.TrashLib.TestLibrary;
namespace Recyclarr.Tests;
namespace Recyclarr.Cli.Tests;
[TestFixture]
[Parallelizable(ParallelScope.All)]

@ -3,11 +3,11 @@ using CliFx.Infrastructure;
using FluentAssertions;
using NSubstitute;
using NUnit.Framework;
using Recyclarr.Migration;
using Recyclarr.Migration.Steps;
using TrashLib.Startup;
using Recyclarr.Cli.Migration;
using Recyclarr.Cli.Migration.Steps;
using Recyclarr.TrashLib.Startup;
namespace Recyclarr.Tests.Migration;
namespace Recyclarr.Cli.Tests.Migration;
[TestFixture]
[Parallelizable(ParallelScope.All)]

@ -3,12 +3,12 @@ using System.IO.Abstractions.TestingHelpers;
using AutoFixture.NUnit3;
using FluentAssertions;
using NUnit.Framework;
using Recyclarr.Migration.Steps;
using TestLibrary;
using TestLibrary.AutoFixture;
using TrashLib.TestLibrary;
using Recyclarr.Cli.Migration.Steps;
using Recyclarr.TestLibrary;
using Recyclarr.TestLibrary.AutoFixture;
using Recyclarr.TrashLib.TestLibrary;
namespace Recyclarr.Tests.Migration.Steps;
namespace Recyclarr.Cli.Tests.Migration.Steps;
[TestFixture]
[Parallelizable(ParallelScope.All)]

@ -3,10 +3,10 @@ using System.Text.RegularExpressions;
using AutoFixture.NUnit3;
using FluentAssertions;
using NUnit.Framework;
using Recyclarr.Migration.Steps;
using TestLibrary.AutoFixture;
using Recyclarr.Cli.Migration.Steps;
using Recyclarr.TestLibrary.AutoFixture;
namespace Recyclarr.Tests.Migration.Steps;
namespace Recyclarr.Cli.Tests.Migration.Steps;
[TestFixture]
[Parallelizable(ParallelScope.All)]

@ -0,0 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">
<ItemGroup>
<ProjectReference Include="..\Recyclarr.Cli.TestLibrary\Recyclarr.Cli.TestLibrary.csproj" />
<ProjectReference Include="..\Recyclarr.TestLibrary\Recyclarr.TestLibrary.csproj" />
<ProjectReference Include="..\Recyclarr.Cli\Recyclarr.Cli.csproj" />
<ProjectReference Include="..\Recyclarr.TrashLib.TestLibrary\Recyclarr.TrashLib.TestLibrary.csproj" />
</ItemGroup>
</Project>

@ -1,10 +1,10 @@
using System.IO.Abstractions.TestingHelpers;
using FluentAssertions;
using NUnit.Framework;
using Recyclarr.TestLibrary;
using TrashLib.Config.Settings;
using Recyclarr.Cli.TestLibrary;
using Recyclarr.TrashLib.Config.Settings;
namespace Recyclarr.Tests;
namespace Recyclarr.Cli.Tests;
[TestFixture]
[Parallelizable(ParallelScope.All)]

@ -6,15 +6,15 @@ using CliFx.Infrastructure;
using Flurl.Http;
using JetBrains.Annotations;
using MoreLinq.Extensions;
using Recyclarr.Command.Setup;
using Recyclarr.Logging;
using Recyclarr.Cli.Command.Setup;
using Recyclarr.Cli.Logging;
using Recyclarr.TrashLib.Http;
using Recyclarr.TrashLib.Repo.VersionControl;
using Recyclarr.TrashLib.Startup;
using Serilog;
using Serilog.Events;
using TrashLib.Http;
using TrashLib.Repo.VersionControl;
using TrashLib.Startup;
namespace Recyclarr.Command;
namespace Recyclarr.Cli.Command;
public abstract class BaseCommand : ICommand
{

@ -2,13 +2,13 @@ using System.IO.Abstractions;
using Autofac;
using CliFx.Attributes;
using CliFx.Exceptions;
using Common;
using Common.Extensions;
using JetBrains.Annotations;
using Recyclarr.Common;
using Recyclarr.Common.Extensions;
using Recyclarr.TrashLib.Startup;
using Serilog;
using TrashLib.Startup;
namespace Recyclarr.Command;
namespace Recyclarr.Cli.Command;
[Command("create-config", Description = "Create a starter YAML configuration file")]
[UsedImplicitly]

@ -1,11 +1,11 @@
using System.Data.HashFunction.FNV;
using System.IO.Abstractions;
using System.Text;
using TrashLib.Cache;
using TrashLib.Config.Services;
using TrashLib.Startup;
using Recyclarr.TrashLib.Cache;
using Recyclarr.TrashLib.Config.Services;
using Recyclarr.TrashLib.Startup;
namespace Recyclarr.Command.Helpers;
namespace Recyclarr.Cli.Command.Helpers;
public class CacheStoragePath : ICacheStoragePath
{

@ -1,4 +1,4 @@
namespace Recyclarr.Command;
namespace Recyclarr.Cli.Command;
public interface IServiceCommand
{

@ -3,9 +3,9 @@ using Autofac;
using CliFx.Attributes;
using CliFx.Exceptions;
using JetBrains.Annotations;
using Recyclarr.Migration;
using Recyclarr.Cli.Migration;
namespace Recyclarr.Command;
namespace Recyclarr.Cli.Command;
[Command("migrate", Description = "Perform any migration steps that may be needed between versions")]
[UsedImplicitly]

@ -2,16 +2,16 @@ using System.Reactive.Linq;
using Autofac;
using CliFx.Attributes;
using JetBrains.Annotations;
using Recyclarr.Config;
using Recyclarr.Cli.Config;
using Recyclarr.TrashLib.Config.Services;
using Recyclarr.TrashLib.Http;
using Recyclarr.TrashLib.Services.CustomFormat;
using Recyclarr.TrashLib.Services.QualitySize;
using Recyclarr.TrashLib.Services.Radarr;
using Recyclarr.TrashLib.Services.Radarr.Config;
using Serilog;
using TrashLib.Config.Services;
using TrashLib.Http;
using TrashLib.Services.CustomFormat;
using TrashLib.Services.QualitySize;
using TrashLib.Services.Radarr;
using TrashLib.Services.Radarr.Config;
namespace Recyclarr.Command;
namespace Recyclarr.Cli.Command;
[Command("radarr", Description = "Perform operations on a Radarr instance")]
[UsedImplicitly]

@ -1,10 +1,10 @@
using Autofac;
using CliFx.Attributes;
using JetBrains.Annotations;
using Recyclarr.Migration;
using TrashLib.Repo;
using Recyclarr.Cli.Migration;
using Recyclarr.TrashLib.Repo;
namespace Recyclarr.Command;
namespace Recyclarr.Cli.Command;
public abstract class ServiceCommand : BaseCommand, IServiceCommand
{

@ -1,7 +1,7 @@
using Recyclarr.TrashLib.Startup;
using Serilog;
using TrashLib.Startup;
namespace Recyclarr.Command.Setup;
namespace Recyclarr.Cli.Command.Setup;
public class AppPathSetupTask : IBaseCommandSetupTask
{

@ -1,4 +1,4 @@
namespace Recyclarr.Command.Setup;
namespace Recyclarr.Cli.Command.Setup;
public interface IBaseCommandSetupTask
{

@ -1,8 +1,8 @@
using Recyclarr.Logging;
using Recyclarr.Cli.Logging;
using Recyclarr.TrashLib.Config.Settings;
using Serilog;
using TrashLib.Config.Settings;
namespace Recyclarr.Command.Setup;
namespace Recyclarr.Cli.Command.Setup;
public class JanitorCleanupTask : IBaseCommandSetupTask
{

@ -2,18 +2,18 @@ using Autofac;
using CliFx.Attributes;
using CliFx.Exceptions;
using JetBrains.Annotations;
using Recyclarr.Config;
using Recyclarr.Cli.Config;
using Recyclarr.TrashLib.Config.Services;
using Recyclarr.TrashLib.Http;
using Recyclarr.TrashLib.Services.CustomFormat;
using Recyclarr.TrashLib.Services.QualitySize;
using Recyclarr.TrashLib.Services.Sonarr;
using Recyclarr.TrashLib.Services.Sonarr.Config;
using Recyclarr.TrashLib.Services.Sonarr.ReleaseProfile;
using Recyclarr.TrashLib.Services.Sonarr.ReleaseProfile.Guide;
using Serilog;
using TrashLib.Config.Services;
using TrashLib.Http;
using TrashLib.Services.CustomFormat;
using TrashLib.Services.QualitySize;
using TrashLib.Services.Sonarr;
using TrashLib.Services.Sonarr.Config;
using TrashLib.Services.Sonarr.ReleaseProfile;
using TrashLib.Services.Sonarr.ReleaseProfile.Guide;
namespace Recyclarr.Command;
namespace Recyclarr.Cli.Command;
[Command("sonarr", Description = "Perform operations on a Sonarr instance")]
[UsedImplicitly]

@ -4,28 +4,28 @@ using Autofac;
using Autofac.Core.Activators.Reflection;
using Autofac.Extras.Ordering;
using CliFx;
using Common;
using Recyclarr.Command.Helpers;
using Recyclarr.Command.Setup;
using Recyclarr.Config;
using Recyclarr.Logging;
using Recyclarr.Migration;
using TrashLib.Cache;
using TrashLib.Config;
using TrashLib.Config.Services;
using TrashLib.Http;
using TrashLib.Repo;
using TrashLib.Repo.VersionControl;
using TrashLib.Services.Common;
using TrashLib.Services.CustomFormat;
using TrashLib.Services.Radarr;
using TrashLib.Services.Sonarr;
using TrashLib.Services.System;
using TrashLib.Startup;
using Recyclarr.Cli.Command.Helpers;
using Recyclarr.Cli.Command.Setup;
using Recyclarr.Cli.Config;
using Recyclarr.Cli.Logging;
using Recyclarr.Cli.Migration;
using Recyclarr.Common;
using Recyclarr.TrashLib.Cache;
using Recyclarr.TrashLib.Config;
using Recyclarr.TrashLib.Config.Services;
using Recyclarr.TrashLib.Http;
using Recyclarr.TrashLib.Repo;
using Recyclarr.TrashLib.Repo.VersionControl;
using Recyclarr.TrashLib.Services.Common;
using Recyclarr.TrashLib.Services.CustomFormat;
using Recyclarr.TrashLib.Services.Radarr;
using Recyclarr.TrashLib.Services.Sonarr;
using Recyclarr.TrashLib.Services.System;
using Recyclarr.TrashLib.Startup;
using YamlDotNet.Serialization;
using YamlDotNet.Serialization.ObjectFactories;
namespace Recyclarr;
namespace Recyclarr.Cli;
public static class CompositionRoot
{

@ -2,7 +2,7 @@ using System.Runtime.Serialization;
using System.Text;
using FluentValidation.Results;
namespace Recyclarr.Config;
namespace Recyclarr.Cli.Config;
[Serializable]
public class ConfigurationException : Exception

@ -1,9 +1,9 @@
using System.IO.Abstractions;
using CliFx.Exceptions;
using Recyclarr.TrashLib.Startup;
using Serilog;
using TrashLib.Startup;
namespace Recyclarr.Config;
namespace Recyclarr.Cli.Config;
public class ConfigurationFinder : IConfigurationFinder
{

@ -1,16 +1,16 @@
using System.IO.Abstractions;
using FluentValidation;
using Recyclarr.Logging;
using Recyclarr.Cli.Logging;
using Recyclarr.TrashLib.Config;
using Recyclarr.TrashLib.Config.Services;
using Recyclarr.TrashLib.Http;
using Serilog;
using Serilog.Context;
using TrashLib.Config;
using TrashLib.Config.Services;
using TrashLib.Http;
using YamlDotNet.Core;
using YamlDotNet.Core.Events;
using YamlDotNet.Serialization;
namespace Recyclarr.Config;
namespace Recyclarr.Cli.Config;
public class ConfigurationLoader<T> : IConfigurationLoader<T>
where T : ServiceConfiguration

@ -1,4 +1,4 @@
namespace Recyclarr.Config;
namespace Recyclarr.Cli.Config;
public class EmptyYamlException : Exception
{

@ -1,4 +1,4 @@
namespace Recyclarr.Config;
namespace Recyclarr.Cli.Config;
public interface IConfigurationFinder
{

@ -1,6 +1,6 @@
using TrashLib.Config.Services;
using Recyclarr.TrashLib.Config.Services;
namespace Recyclarr.Config;
namespace Recyclarr.Cli.Config;
public interface IConfigurationLoader<T>
where T : IServiceConfiguration

@ -1,4 +1,4 @@
namespace Recyclarr.Logging;
namespace Recyclarr.Cli.Logging;
public interface ILogJanitor
{

@ -1,6 +1,6 @@
using TrashLib.Startup;
using Recyclarr.TrashLib.Startup;
namespace Recyclarr.Logging;
namespace Recyclarr.Cli.Logging;
public class LogJanitor : ILogJanitor
{

@ -1,4 +1,4 @@
namespace Recyclarr.Logging;
namespace Recyclarr.Cli.Logging;
public static class LogProperty
{

@ -1,11 +1,11 @@
using System.IO.Abstractions;
using Recyclarr.TrashLib.Startup;
using Serilog;
using Serilog.Events;
using Serilog.Templates;
using Serilog.Templates.Themes;
using TrashLib.Startup;
namespace Recyclarr.Logging;
namespace Recyclarr.Cli.Logging;
public class LoggerFactory
{

@ -1,4 +1,4 @@
namespace Recyclarr.Migration;
namespace Recyclarr.Cli.Migration;
public interface IMigrationExecutor
{

@ -1,6 +1,6 @@
using CliFx.Infrastructure;
namespace Recyclarr.Migration;
namespace Recyclarr.Cli.Migration;
public interface IMigrationStep
{

@ -1,7 +1,7 @@
using Autofac;
using Recyclarr.Migration.Steps;
using Recyclarr.Cli.Migration.Steps;
namespace Recyclarr.Migration;
namespace Recyclarr.Cli.Migration;
public class MigrationAutofacModule : Module
{

@ -1,4 +1,4 @@
namespace Recyclarr.Migration;
namespace Recyclarr.Cli.Migration;
public class MigrationException : Exception
{

@ -1,7 +1,7 @@
using CliFx.Exceptions;
using CliFx.Infrastructure;
namespace Recyclarr.Migration;
namespace Recyclarr.Cli.Migration;
public class MigrationExecutor : IMigrationExecutor
{

@ -1,10 +1,10 @@
using System.IO.Abstractions;
using CliFx.Infrastructure;
using Common.Extensions;
using JetBrains.Annotations;
using TrashLib.Startup;
using Recyclarr.Common.Extensions;
using Recyclarr.TrashLib.Startup;
namespace Recyclarr.Migration.Steps;
namespace Recyclarr.Cli.Migration.Steps;
/// <remarks>
/// Implemented on 4/30/2022.

@ -2,7 +2,7 @@ using System.IO.Abstractions;
using CliFx.Infrastructure;
using JetBrains.Annotations;
namespace Recyclarr.Migration.Steps;
namespace Recyclarr.Cli.Migration.Steps;
/// <remarks>
/// Implemented on 4/30/2022.

@ -3,7 +3,7 @@ using System.Text;
using Autofac;
using CliFx;
namespace Recyclarr;
namespace Recyclarr.Cli;
internal static class Program
{

@ -25,8 +25,8 @@
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Common\Common.csproj" />
<ProjectReference Include="..\TrashLib\TrashLib.csproj" />
<ProjectReference Include="..\Recyclarr.Common\Recyclarr.Common.csproj" />
<ProjectReference Include="..\Recyclarr.TrashLib\Recyclarr.TrashLib.csproj" />
</ItemGroup>
<ItemGroup>

@ -5,7 +5,7 @@ using System.Reflection;
// ReSharper disable MemberCanBePrivate.Global
// ReSharper disable UnusedMember.Global
namespace Common.TestLibrary;
namespace Recyclarr.Common.TestLibrary;
public static class CommonMockFileSystemExtensions
{

@ -0,0 +1,5 @@
<Project Sdk="Microsoft.NET.Sdk">
<ItemGroup>
<ProjectReference Include="..\Recyclarr.Common\Recyclarr.Common.csproj" />
</ItemGroup>
</Project>

@ -1,8 +1,8 @@
using Common.Extensions;
using FluentAssertions;
using NUnit.Framework;
using Recyclarr.Common.Extensions;
namespace Common.Tests.Extensions;
namespace Recyclarr.Common.Tests.Extensions;
[TestFixture]
[Parallelizable(ParallelScope.All)]

@ -1,12 +1,12 @@
using System.IO.Abstractions;
using System.IO.Abstractions.TestingHelpers;
using System.Text.RegularExpressions;
using Common.Extensions;
using FluentAssertions;
using NUnit.Framework;
using TestLibrary;
using Recyclarr.Common.Extensions;
using Recyclarr.TestLibrary;
namespace Common.Tests.Extensions;
namespace Recyclarr.Common.Tests.Extensions;
[TestFixture]
[Parallelizable(ParallelScope.All)]

@ -1,8 +1,8 @@
using Common.Extensions;
using FluentAssertions;
using NUnit.Framework;
using Recyclarr.Common.Extensions;
namespace Common.Tests.Extensions;
namespace Recyclarr.Common.Tests.Extensions;
[TestFixture]
[Parallelizable(ParallelScope.All)]

@ -8,7 +8,7 @@ using Serilog;
using Serilog.Events;
using Serilog.Sinks.TestCorrelator;
namespace Common.Tests;
namespace Recyclarr.Common.Tests;
[TestFixture]
[Parallelizable(ParallelScope.All)]

@ -1,11 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<IsPackable>false</IsPackable>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\TestLibrary\TestLibrary.csproj" />
<ProjectReference Include="..\Common\Common.csproj" />
<ProjectReference Include="..\Recyclarr.TestLibrary\Recyclarr.TestLibrary.csproj" />
<ProjectReference Include="..\Recyclarr.Common\Recyclarr.Common.csproj" />
</ItemGroup>
<ItemGroup>

@ -1,7 +1,7 @@
using FluentAssertions;
using NUnit.Framework;
namespace Common.Tests;
namespace Recyclarr.Common.Tests;
[TestFixture]
[Parallelizable(ParallelScope.All)]

@ -1,6 +1,6 @@
using Autofac;
namespace Common;
namespace Recyclarr.Common;
public class CommonAutofacModule : Module
{

@ -1,4 +1,4 @@
namespace Common;
namespace Recyclarr.Common;
internal class DefaultEnvironment : IEnvironment
{

@ -1,6 +1,6 @@
using System.Collections;
namespace Common.Extensions;
namespace Recyclarr.Common.Extensions;
public static class CollectionExtensions
{

@ -1,4 +1,4 @@
namespace Common.Extensions;
namespace Recyclarr.Common.Extensions;
public static class DictionaryExtensions
{

@ -2,7 +2,7 @@ using System.IO.Abstractions;
using System.Text.RegularExpressions;
using CliFx.Infrastructure;
namespace Common.Extensions;
namespace Recyclarr.Common.Extensions;
public static class FileSystemExtensions
{

@ -1,6 +1,6 @@
using Newtonsoft.Json.Linq;
namespace Common.Extensions;
namespace Recyclarr.Common.Extensions;
public static class JsonNetExtensions
{

@ -2,7 +2,7 @@ using System.Reactive.Disposables;
using System.Reactive.Linq;
using Serilog;
namespace Common.Extensions;
namespace Recyclarr.Common.Extensions;
public static class RxExtensions
{

@ -2,7 +2,7 @@ using System.Globalization;
// ReSharper disable UnusedMember.Global
namespace Common.Extensions;
namespace Recyclarr.Common.Extensions;
public static class StringExtensions
{

@ -1,6 +1,6 @@
using System.IO.Abstractions;
namespace Common;
namespace Recyclarr.Common;
public class FileUtilities : IFileUtilities
{

@ -1,7 +1,7 @@
using FluentValidation;
using FluentValidation.Results;
namespace Common.FluentValidation;
namespace Recyclarr.Common.FluentValidation;
public static class FluentValidationExtensions
{

@ -1,7 +1,7 @@
using FluentValidation;
using FluentValidation.Validators;
namespace Common.FluentValidation;
namespace Recyclarr.Common.FluentValidation;
internal sealed class NullableChildValidatorAdaptor<T, TProperty> : ChildValidatorAdaptor<T, TProperty>,
IPropertyValidator<T, TProperty?>, IAsyncPropertyValidator<T, TProperty?>

@ -1,4 +1,4 @@
namespace Common;
namespace Recyclarr.Common;
public interface IEnvironment
{

@ -1,4 +1,4 @@
namespace Common;
namespace Recyclarr.Common;
public interface IFileUtilities
{

@ -1,8 +1,8 @@
using System.IO.Abstractions;
using Common.Extensions;
using Recyclarr.Common.Extensions;
using Serilog;
namespace Common;
namespace Recyclarr.Common;
public static class JsonUtils
{

@ -1,6 +1,6 @@
using Flurl.Http.Configuration;
namespace Common.Networking;
namespace Recyclarr.Common.Networking;
public class UntrustedCertClientFactory : DefaultHttpClientFactory
{

@ -3,7 +3,7 @@ using System.Reactive.Subjects;
using System.Text;
using CliFx.Infrastructure;
namespace Common;
namespace Recyclarr.Common;
/// <summary>
/// An ASCII progress bar

@ -1,7 +1,7 @@
using System.Reflection;
using System.Text;
namespace Common;
namespace Recyclarr.Common;
public class ResourceDataReader
{

@ -1,7 +1,7 @@
using System.Collections;
using System.ComponentModel.DataAnnotations;
namespace Common.YamlDotNet;
namespace Recyclarr.Common.YamlDotNet;
[AttributeUsage(AttributeTargets.Property)]
// ReSharper disable once UnusedType.Global

@ -3,7 +3,7 @@ using YamlDotNet.Core;
using YamlDotNet.Core.Events;
using YamlDotNet.Serialization;
namespace Common.YamlDotNet;
namespace Recyclarr.Common.YamlDotNet;
// Borrowed from: https://github.com/aaubry/YamlDotNet/issues/443#issuecomment-544449498
public sealed class ForceEmptySequences : INodeDeserializer

@ -1,7 +1,7 @@
using YamlDotNet.Core.Events;
using YamlDotNet.Serialization;
namespace Common.YamlDotNet;
namespace Recyclarr.Common.YamlDotNet;
// from: https://github.com/aaubry/YamlDotNet/issues/236#issuecomment-632054372
public sealed class ReadOnlyCollectionNodeTypeResolver : INodeTypeResolver

@ -2,7 +2,7 @@ using System.ComponentModel.DataAnnotations;
using YamlDotNet.Core;
using YamlDotNet.Serialization;
namespace Common.YamlDotNet;
namespace Recyclarr.Common.YamlDotNet;
internal class ValidatingDeserializer : INodeDeserializer
{

@ -4,7 +4,7 @@ using YamlDotNet.Serialization.NodeDeserializers;
// ReSharper disable UnusedMember.Global
namespace Common.YamlDotNet;
namespace Recyclarr.Common.YamlDotNet;
public static class YamlDotNetExtensions
{

@ -2,7 +2,7 @@ using YamlDotNet.Core;
using YamlDotNet.Core.Events;
using YamlDotNet.Serialization;
namespace Common.YamlDotNet;
namespace Recyclarr.Common.YamlDotNet;
// A workaround for nullable enums in YamlDotNet taken from:
// https://github.com/aaubry/YamlDotNet/issues/544#issuecomment-778062351

@ -1,8 +1,8 @@
using System.IO.Abstractions;
using Autofac;
using AutofacSerilogIntegration;
using Common;
using TrashLib.Startup;
using Recyclarr.Common;
using Recyclarr.TrashLib.Startup;
namespace Recyclarr.Gui;

@ -7,8 +7,8 @@ using System.IO.Abstractions;
using Autofac.Extensions.DependencyInjection;
using MudBlazor.Services;
using Recyclarr.Gui;
using Recyclarr.TrashLib.Startup;
using Serilog;
using TrashLib.Startup;
var builder = WebApplication.CreateBuilder(args);

@ -15,8 +15,8 @@
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Common\Common.csproj" />
<ProjectReference Include="..\TrashLib\TrashLib.csproj" />
<ProjectReference Include="..\Recyclarr.Common\Recyclarr.Common.csproj" />
<ProjectReference Include="..\Recyclarr.TrashLib\Recyclarr.TrashLib.csproj" />
</ItemGroup>
</Project>

Some files were not shown because too many files have changed in this diff Show More

Loading…
Cancel
Save