Cleanup and refactor

vonhoff · Mar 24, 2024 · 63c6df1 · 63c6df1
1 parent 39fb3f1
commit 63c6df1
Show file tree

Hide file tree

Showing 46 changed files with 178 additions and 204 deletions.
diff --git a/Animation2Tilemap.Console.Test/CommandLineOptions/FrameDurationOptionTests.cs b/Animation2Tilemap.Console.Test/CommandLineOptions/FrameDurationOptionTests.cs
@@ -1,5 +1,5 @@
-using System.CommandLine;
-using Animation2Tilemap.Console.CommandLineOptions;
+using Animation2Tilemap.Console.CommandLineOptions;
+using System.CommandLine;
 
 namespace Animation2Tilemap.Console.Test.CommandLineOptions;
 

diff --git a/Animation2Tilemap.Console.Test/CommandLineOptions/HeightOptionTests.cs b/Animation2Tilemap.Console.Test/CommandLineOptions/HeightOptionTests.cs
@@ -1,5 +1,5 @@
-using System.CommandLine;
-using Animation2Tilemap.Console.CommandLineOptions;
+using Animation2Tilemap.Console.CommandLineOptions;
+using System.CommandLine;
 
 namespace Animation2Tilemap.Console.Test.CommandLineOptions;
 

diff --git a/Animation2Tilemap.Console.Test/CommandLineOptions/InputOptionTests.cs b/Animation2Tilemap.Console.Test/CommandLineOptions/InputOptionTests.cs
@@ -1,5 +1,5 @@
-using System.CommandLine;
-using Animation2Tilemap.Console.CommandLineOptions;
+using Animation2Tilemap.Console.CommandLineOptions;
+using System.CommandLine;
 
 namespace Animation2Tilemap.Console.Test.CommandLineOptions;
 

diff --git a/Animation2Tilemap.Console.Test/CommandLineOptions/MarginOptionTests.cs b/Animation2Tilemap.Console.Test/CommandLineOptions/MarginOptionTests.cs
@@ -1,5 +1,5 @@
-using System.CommandLine;
-using Animation2Tilemap.Console.CommandLineOptions;
+using Animation2Tilemap.Console.CommandLineOptions;
+using System.CommandLine;
 
 namespace Animation2Tilemap.Console.Test.CommandLineOptions;
 

diff --git a/Animation2Tilemap.Console.Test/CommandLineOptions/OutputOptionTests.cs b/Animation2Tilemap.Console.Test/CommandLineOptions/OutputOptionTests.cs
@@ -1,5 +1,5 @@
-using System.CommandLine;
-using Animation2Tilemap.Console.CommandLineOptions;
+using Animation2Tilemap.Console.CommandLineOptions;
+using System.CommandLine;
 
 namespace Animation2Tilemap.Console.Test.CommandLineOptions;
 

diff --git a/Animation2Tilemap.Console.Test/CommandLineOptions/SpacingOptionTests.cs b/Animation2Tilemap.Console.Test/CommandLineOptions/SpacingOptionTests.cs
@@ -1,5 +1,5 @@
-using System.CommandLine;
-using Animation2Tilemap.Console.CommandLineOptions;
+using Animation2Tilemap.Console.CommandLineOptions;
+using System.CommandLine;
 
 namespace Animation2Tilemap.Console.Test.CommandLineOptions;
 

diff --git a/Animation2Tilemap.Console.Test/CommandLineOptions/TileLayerFormatOptionTests.cs b/Animation2Tilemap.Console.Test/CommandLineOptions/TileLayerFormatOptionTests.cs
@@ -1,5 +1,5 @@
-using System.CommandLine;
-using Animation2Tilemap.Console.CommandLineOptions;
+using Animation2Tilemap.Console.CommandLineOptions;
+using System.CommandLine;
 
 namespace Animation2Tilemap.Console.Test.CommandLineOptions;
 

diff --git a/Animation2Tilemap.Console.Test/CommandLineOptions/TransparentColorOptionTests.cs b/Animation2Tilemap.Console.Test/CommandLineOptions/TransparentColorOptionTests.cs
@@ -1,5 +1,5 @@
-using System.CommandLine;
-using Animation2Tilemap.Console.CommandLineOptions;
+using Animation2Tilemap.Console.CommandLineOptions;
+using System.CommandLine;
 
 namespace Animation2Tilemap.Console.Test.CommandLineOptions;
 

diff --git a/Animation2Tilemap.Console.Test/CommandLineOptions/VerboseOptionTests.cs b/Animation2Tilemap.Console.Test/CommandLineOptions/VerboseOptionTests.cs
@@ -1,5 +1,5 @@
-using System.CommandLine;
-using Animation2Tilemap.Console.CommandLineOptions;
+using Animation2Tilemap.Console.CommandLineOptions;
+using System.CommandLine;
 
 namespace Animation2Tilemap.Console.Test.CommandLineOptions;
 

diff --git a/Animation2Tilemap.Console.Test/CommandLineOptions/WidthOptionTests.cs b/Animation2Tilemap.Console.Test/CommandLineOptions/WidthOptionTests.cs
@@ -1,5 +1,5 @@
-using System.CommandLine;
-using Animation2Tilemap.Console.CommandLineOptions;
+using Animation2Tilemap.Console.CommandLineOptions;
+using System.CommandLine;
 
 namespace Animation2Tilemap.Console.Test.CommandLineOptions;
 

diff --git a/Animation2Tilemap.Console/CommandLineOptions/Binding/ApplicationOptionsBinder.cs b/Animation2Tilemap.Console/CommandLineOptions/Binding/ApplicationOptionsBinder.cs
@@ -1,10 +1,10 @@
-using System.CommandLine;
-using System.CommandLine.Binding;
-using Animation2Tilemap.Console.CommandLineOptions.Contracts;
+using Animation2Tilemap.Console.CommandLineOptions.Contracts;
 using Animation2Tilemap.Core;
 using Animation2Tilemap.Core.Enums;
 using SixLabors.ImageSharp;
 using SixLabors.ImageSharp.PixelFormats;
+using System.CommandLine;
+using System.CommandLine.Binding;
 
 namespace Animation2Tilemap.Console.CommandLineOptions.Binding;
 

diff --git a/Animation2Tilemap.Console/CommandLineOptions/FrameDurationOption.cs b/Animation2Tilemap.Console/CommandLineOptions/FrameDurationOption.cs
@@ -1,5 +1,5 @@
-using System.CommandLine;
-using Animation2Tilemap.Console.CommandLineOptions.Contracts;
+using Animation2Tilemap.Console.CommandLineOptions.Contracts;
+using System.CommandLine;
 
 namespace Animation2Tilemap.Console.CommandLineOptions;
 

diff --git a/Animation2Tilemap.Console/CommandLineOptions/HeightOption.cs b/Animation2Tilemap.Console/CommandLineOptions/HeightOption.cs
@@ -1,5 +1,5 @@
-using System.CommandLine;
-using Animation2Tilemap.Console.CommandLineOptions.Contracts;
+using Animation2Tilemap.Console.CommandLineOptions.Contracts;
+using System.CommandLine;
 
 namespace Animation2Tilemap.Console.CommandLineOptions;
 

diff --git a/Animation2Tilemap.Console/CommandLineOptions/InputOption.cs b/Animation2Tilemap.Console/CommandLineOptions/InputOption.cs
@@ -1,5 +1,5 @@
-using System.CommandLine;
-using Animation2Tilemap.Console.CommandLineOptions.Contracts;
+using Animation2Tilemap.Console.CommandLineOptions.Contracts;
+using System.CommandLine;
 
 namespace Animation2Tilemap.Console.CommandLineOptions;
 

diff --git a/Animation2Tilemap.Console/CommandLineOptions/MarginOption.cs b/Animation2Tilemap.Console/CommandLineOptions/MarginOption.cs
@@ -1,5 +1,5 @@
-using System.CommandLine;
-using Animation2Tilemap.Console.CommandLineOptions.Contracts;
+using Animation2Tilemap.Console.CommandLineOptions.Contracts;
+using System.CommandLine;
 
 namespace Animation2Tilemap.Console.CommandLineOptions;
 

diff --git a/Animation2Tilemap.Console/CommandLineOptions/OutputOption.cs b/Animation2Tilemap.Console/CommandLineOptions/OutputOption.cs
@@ -1,5 +1,5 @@
-using System.CommandLine;
-using Animation2Tilemap.Console.CommandLineOptions.Contracts;
+using Animation2Tilemap.Console.CommandLineOptions.Contracts;
+using System.CommandLine;
 
 namespace Animation2Tilemap.Console.CommandLineOptions;
 

diff --git a/Animation2Tilemap.Console/CommandLineOptions/SpacingOption.cs b/Animation2Tilemap.Console/CommandLineOptions/SpacingOption.cs
@@ -1,5 +1,5 @@
-using System.CommandLine;
-using Animation2Tilemap.Console.CommandLineOptions.Contracts;
+using Animation2Tilemap.Console.CommandLineOptions.Contracts;
+using System.CommandLine;
 
 namespace Animation2Tilemap.Console.CommandLineOptions;
 

diff --git a/Animation2Tilemap.Console/CommandLineOptions/TileLayerFormatOption.cs b/Animation2Tilemap.Console/CommandLineOptions/TileLayerFormatOption.cs
@@ -1,5 +1,5 @@
-using System.CommandLine;
-using Animation2Tilemap.Console.CommandLineOptions.Contracts;
+using Animation2Tilemap.Console.CommandLineOptions.Contracts;
+using System.CommandLine;
 
 namespace Animation2Tilemap.Console.CommandLineOptions;
 

diff --git a/Animation2Tilemap.Console/CommandLineOptions/TransparentColorOption.cs b/Animation2Tilemap.Console/CommandLineOptions/TransparentColorOption.cs
@@ -1,6 +1,6 @@
-using System.CommandLine;
+using Animation2Tilemap.Console.CommandLineOptions.Contracts;
+using System.CommandLine;
 using System.Text.RegularExpressions;
-using Animation2Tilemap.Console.CommandLineOptions.Contracts;
 
 namespace Animation2Tilemap.Console.CommandLineOptions;
 

diff --git a/Animation2Tilemap.Console/CommandLineOptions/VerboseOption.cs b/Animation2Tilemap.Console/CommandLineOptions/VerboseOption.cs
@@ -1,5 +1,5 @@
-using System.CommandLine;
-using Animation2Tilemap.Console.CommandLineOptions.Contracts;
+using Animation2Tilemap.Console.CommandLineOptions.Contracts;
+using System.CommandLine;
 
 namespace Animation2Tilemap.Console.CommandLineOptions;
 

diff --git a/Animation2Tilemap.Console/CommandLineOptions/WidthOption.cs b/Animation2Tilemap.Console/CommandLineOptions/WidthOption.cs
@@ -1,5 +1,5 @@
-using System.CommandLine;
-using Animation2Tilemap.Console.CommandLineOptions.Contracts;
+using Animation2Tilemap.Console.CommandLineOptions.Contracts;
+using System.CommandLine;
 
 namespace Animation2Tilemap.Console.CommandLineOptions;
 

diff --git a/Animation2Tilemap.Console/Program.cs b/Animation2Tilemap.Console/Program.cs
@@ -1,10 +1,10 @@
-using System.CommandLine;
+using Animation2Tilemap.Console.CommandLineOptions;
+using Animation2Tilemap.Console.CommandLineOptions.Binding;
+using Animation2Tilemap.Console.CommandLineOptions.Contracts;
+using System.CommandLine;
 using System.CommandLine.Builder;
 using System.CommandLine.Parsing;
 using System.Text;
-using Animation2Tilemap.Console.CommandLineOptions;
-using Animation2Tilemap.Console.CommandLineOptions.Binding;
-using Animation2Tilemap.Console.CommandLineOptions.Contracts;
 
 namespace Animation2Tilemap.Console;
 

diff --git a/Animation2Tilemap.Console/Services/ConfirmationDialogService.cs b/Animation2Tilemap.Console/Services/ConfirmationDialogService.cs
@@ -25,22 +25,22 @@ public bool Confirm(string message, bool defaultOption)
                 switch (input)
                 {
                     case "Y":
-                    {
-                        response = true;
-                        isValidInput = true;
-                        break;
-                    }
+                        {
+                            response = true;
+                            isValidInput = true;
+                            break;
+                        }
                     case "N":
-                    {
-                        response = false;
-                        isValidInput = true;
-                        break;
-                    }
+                        {
+                            response = false;
+                            isValidInput = true;
+                            break;
+                        }
                     default:
-                    {
-                        System.Console.WriteLine("Invalid input. Please enter Y or N.");
-                        break;
-                    }
+                        {
+                            System.Console.WriteLine("Invalid input. Please enter Y or N.");
+                            break;
+                        }
                 }
             }
         }

diff --git a/Animation2Tilemap.Console/Startup.cs b/Animation2Tilemap.Console/Startup.cs
@@ -13,14 +13,14 @@ namespace Animation2Tilemap.Console;
 
 public class Startup(ApplicationOptions applicationOptions)
 {
-    public CoreApplication BuildApplication()
+    public Application BuildApplication()
     {
         var services = new ServiceCollection();
         ConfigureLogging(services);
         ConfigureServices(services);
 
         var serviceProvider = services.BuildServiceProvider();
-        return serviceProvider.GetRequiredService<CoreApplication>();
+        return serviceProvider.GetRequiredService<Application>();
     }
 
     private void ConfigureLogging(IServiceCollection services)
@@ -46,6 +46,6 @@ private void ConfigureServices(IServiceCollection services)
         services.AddSingleton<ITilesetFactory, TilesetFactory>();
         services.AddSingleton<ITilemapFactory, TilemapFactory>();
         services.AddSingleton<ITilesetImageFactory, TilesetImageFactory>();
-        services.AddSingleton<CoreApplication>();
+        services.AddSingleton<Application>();
     }
 }
diff --git a/Animation2Tilemap.Core.Test/Common/NaturalStringComparerTests.cs b/Animation2Tilemap.Core.Test/Common/NaturalStringComparerTests.cs
@@ -1,6 +1,6 @@
 using Animation2Tilemap.Core.Common;
 
-namespace Animation2Tilemap.Test.Common;
+namespace Animation2Tilemap.Core.Test.Common;
 
 public class NaturalStringComparerTests
 {

diff --git a/Animation2Tilemap.Core.Test/Services/ImageAlignmentServiceTests.cs b/Animation2Tilemap.Core.Test/Services/ImageAlignmentServiceTests.cs
@@ -1,12 +1,11 @@
-using Animation2Tilemap.Core;
-using Animation2Tilemap.Core.Services;
-using Animation2Tilemap.Test.TestHelpers;
+using Animation2Tilemap.Core.Services;
+using Animation2Tilemap.Core.Test.TestHelpers;
 using Serilog;
 using SixLabors.ImageSharp;
 using SixLabors.ImageSharp.PixelFormats;
 using Xunit.Abstractions;
 
-namespace Animation2Tilemap.Test.Services;
+namespace Animation2Tilemap.Core.Test.Services;
 
 public class ImageAlignmentServiceTests
 {

diff --git a/Animation2Tilemap.Core.Test/Services/ImageHashServiceTests.cs b/Animation2Tilemap.Core.Test/Services/ImageHashServiceTests.cs
@@ -2,7 +2,7 @@
 using SixLabors.ImageSharp;
 using SixLabors.ImageSharp.PixelFormats;
 
-namespace Animation2Tilemap.Test.Services;
+namespace Animation2Tilemap.Core.Test.Services;
 
 public class ImageHashServiceTests
 {

diff --git a/Animation2Tilemap.Core.Test/Services/ImageLoaderServiceTests.cs b/Animation2Tilemap.Core.Test/Services/ImageLoaderServiceTests.cs
@@ -1,21 +1,22 @@
-using Animation2Tilemap.Core;
-using Animation2Tilemap.Core.Services;
+using Animation2Tilemap.Core.Services;
 using Animation2Tilemap.Core.Services.Contracts;
-using Animation2Tilemap.Test.TestHelpers;
+using Animation2Tilemap.Core.Test.TestHelpers;
 using Moq;
 using Serilog;
 using Serilog.Core;
 using Xunit.Abstractions;
 
-namespace Animation2Tilemap.Test.Services;
+namespace Animation2Tilemap.Core.Test.Services;
 
 public class ImageLoaderServiceTests(ITestOutputHelper testOutputHelper)
 {
     private readonly Mock<IConfirmationDialogService> _confirmationDialogServiceMock = new();
+
     private readonly Logger _logger = new LoggerConfiguration()
         .MinimumLevel.Verbose()
         .WriteTo.Sink(new TestOutputHelperSink(testOutputHelper))
         .CreateLogger();
+
     private readonly Mock<INamePatternService> _namePatternServiceMock = new();
 
     [Fact]

diff --git a/Animation2Tilemap.Core.Test/Services/NamePatternServiceTests.cs b/Animation2Tilemap.Core.Test/Services/NamePatternServiceTests.cs
@@ -1,9 +1,9 @@
 using Animation2Tilemap.Core.Services;
-using Animation2Tilemap.Test.TestHelpers;
+using Animation2Tilemap.Core.Test.TestHelpers;
 using Serilog;
 using Xunit.Abstractions;
 
-namespace Animation2Tilemap.Test.Services;
+namespace Animation2Tilemap.Core.Test.Services;
 
 public class NamePatternServiceTests
 {

diff --git a/Animation2Tilemap.Core.Test/Services/TilemapDataServiceTests.cs b/Animation2Tilemap.Core.Test/Services/TilemapDataServiceTests.cs
@@ -1,8 +1,8 @@
 using Animation2Tilemap.Core.Enums;
 using Animation2Tilemap.Core.Services;
-using Animation2Tilemap.Test.TestHelpers;
+using Animation2Tilemap.Core.Test.TestHelpers;
 
-namespace Animation2Tilemap.Test.Services;
+namespace Animation2Tilemap.Core.Test.Services;
 
 public class TilemapDataServiceTests
 {

diff --git a/Animation2Tilemap.Core.Test/Services/XmlSerializerServiceTests.cs b/Animation2Tilemap.Core.Test/Services/XmlSerializerServiceTests.cs
@@ -1,7 +1,7 @@
 using System.Xml.Serialization;
 using Animation2Tilemap.Core.Services;
 
-namespace Animation2Tilemap.Test.Services;
+namespace Animation2Tilemap.Core.Test.Services;
 
 public class XmlSerializerServiceTests
 {
@@ -16,6 +16,7 @@ public class XmlSerializerServiceTests
             ZipCode = "10001"
         }
     };
+
     private readonly XmlSerializerService _xmlSerializerService = new();
 
     [Fact]

diff --git a/Animation2Tilemap.Core.Test/TestHelpers/TestOutputHelperSink.cs b/Animation2Tilemap.Core.Test/TestHelpers/TestOutputHelperSink.cs
@@ -3,7 +3,7 @@
 using Serilog.Formatting.Display;
 using Xunit.Abstractions;
 
-namespace Animation2Tilemap.Test.TestHelpers;
+namespace Animation2Tilemap.Core.Test.TestHelpers;
 
 public class TestOutputHelperSink(ITestOutputHelper output) : ILogEventSink
 {

diff --git a/Animation2Tilemap.Core.Test/TestHelpers/TestResourcesHelper.cs b/Animation2Tilemap.Core.Test/TestHelpers/TestResourcesHelper.cs
@@ -1,7 +1,7 @@
 using System.Diagnostics;
 using System.Text.Json;
 
-namespace Animation2Tilemap.Test.TestHelpers;
+namespace Animation2Tilemap.Core.Test.TestHelpers;
 
 public static class TestResourcesHelper
 {