Merge pull request #1 from vonhoff/v1.0.2

vonhoff · web-flow · commit ed78ccfcdf7e · 2023-10-21T13:46:05.000+02:00
Bug fixes, updated packages.
diff --git a/Animation2Tilemap.Test/CommandLineOptions/HeightOptionTests.cs b/Animation2Tilemap.Test/CommandLineOptions/HeightOptionTests.cs
@@ -1,5 +1,4 @@
 ﻿using System.CommandLine;
-using Xunit;
 using Animation2Tilemap.CommandLineOptions;
 
 namespace Animation2Tilemap.Test.CommandLineOptions;
diff --git a/Animation2Tilemap.Test/CommandLineOptions/OutputOptionTests.cs b/Animation2Tilemap.Test/CommandLineOptions/OutputOptionTests.cs
@@ -1,5 +1,5 @@
-﻿using Animation2Tilemap.CommandLineOptions;
-using System.CommandLine;
+﻿using System.CommandLine;
+using Animation2Tilemap.CommandLineOptions;
 
 namespace Animation2Tilemap.Test.CommandLineOptions;
 
diff --git a/Animation2Tilemap.Test/Common/NaturalStringComparerTests.cs b/Animation2Tilemap.Test/Common/NaturalStringComparerTests.cs
@@ -1,6 +1,4 @@
-﻿#pragma warning disable S4144
-
-using Animation2Tilemap.Common;
+﻿using Animation2Tilemap.Common;
 
 namespace Animation2Tilemap.Test.Common;
 
diff --git a/Animation2Tilemap.Test/Services/ConfirmationDialogServiceTests.cs b/Animation2Tilemap.Test/Services/ConfirmationDialogServiceTests.cs
@@ -5,12 +5,7 @@ namespace Animation2Tilemap.Test.Services;
 
 public class ConfirmationDialogServiceTests
 {
-    private readonly IConfirmationDialogService _confirmationDialogService;
-
-    public ConfirmationDialogServiceTests()
-    {
-        _confirmationDialogService = new ConfirmationDialogService();
-    }
+    private readonly IConfirmationDialogService _confirmationDialogService = new ConfirmationDialogService();
 
     [Theory]
     [InlineData("Y", true, true)]
diff --git a/Animation2Tilemap.Test/Services/ImageAlignmentServiceTests.cs b/Animation2Tilemap.Test/Services/ImageAlignmentServiceTests.cs
@@ -1,5 +1,4 @@
-﻿using Animation2Tilemap.Enums;
-using Animation2Tilemap.Services;
+﻿using Animation2Tilemap.Services;
 using Animation2Tilemap.Test.TestHelpers;
 using Serilog;
 using SixLabors.ImageSharp;
diff --git a/Animation2Tilemap.Test/Services/ImageHashServiceTests.cs b/Animation2Tilemap.Test/Services/ImageHashServiceTests.cs
@@ -7,12 +7,7 @@ namespace Animation2Tilemap.Test.Services;
 
 public class ImageHashServiceTests
 {
-    private readonly IImageHashService _imageHashService;
-
-    public ImageHashServiceTests()
-    {
-        _imageHashService = new ImageHashService();
-    }
+    private readonly IImageHashService _imageHashService = new ImageHashService();
 
     [Fact]
     public void Compute_ShouldReturnSameHash_GivenIdenticalImages()
diff --git a/Animation2Tilemap.Test/Services/TilemapDataServiceTests.cs b/Animation2Tilemap.Test/Services/TilemapDataServiceTests.cs
@@ -7,22 +7,12 @@ namespace Animation2Tilemap.Test.Services;
 
 public class TilemapDataServiceTests
 {
-    private readonly ITilemapDataService _tilemapDataService;
-    private readonly string _base64WithZlib;
-    private readonly string _base64WithGzip;
-    private readonly string _base64;
-    private readonly string _csvData;
-    private readonly uint[] _tilemapData;
-
-    public TilemapDataServiceTests()
-    {
-        _tilemapDataService = new TilemapDataService();
-        _base64 = TestResourcesHelper.ImportText("Base64.txt");
-        _base64WithZlib = TestResourcesHelper.ImportText("Base64Zlib.txt");
-        _base64WithGzip = TestResourcesHelper.ImportText("Base64Gzip.txt");
-        _csvData = TestResourcesHelper.ImportText("TilemapData.csv");
-        _tilemapData = TestResourcesHelper.ImportArrayFromJson<uint>("Tilemap.json");
-    }
+    private readonly ITilemapDataService _tilemapDataService = new TilemapDataService();
+    private readonly string _base64WithZlib = TestResourcesHelper.ImportText("Base64Zlib.txt");
+    private readonly string _base64WithGzip = TestResourcesHelper.ImportText("Base64Gzip.txt");
+    private readonly string _base64 = TestResourcesHelper.ImportText("Base64.txt");
+    private readonly string _csvData = TestResourcesHelper.ImportText("TilemapData.csv");
+    private readonly uint[] _tilemapData = TestResourcesHelper.ImportArrayFromJson<uint>("Tilemap.json");
 
     [Fact]
     public void ParseData_ShouldHaveCorrectResult_WithoutCompression()
@@ -55,10 +45,10 @@ public void ParseData_ShouldHaveCorrectResult_WhenUsingGzip()
     }
 
     [Fact]
-    public void ParseData_ShouldHaveCorrectResult_WhenUsingCSV()
+    public void ParseData_ShouldHaveCorrectResult_WhenUsingCsv()
     {
         // Act
-        var tilemapData = _tilemapDataService.ParseData(_csvData, TileLayerFormat.CSV);
+        var tilemapData = _tilemapDataService.ParseData(_csvData, TileLayerFormat.Csv);
 
         // Assert
         Assert.Equal(_tilemapData, tilemapData);
@@ -98,11 +88,11 @@ public void SerializeData_ShouldHaveCorrectResult_WhenUsingGzip()
     }
 
     [Fact]
-    public void SerializeData_ShouldHaveCorrectResult_WhenUsingCSV()
+    public void SerializeData_ShouldHaveCorrectResult_WhenUsingCsv()
     {
         // Act
-        var serialized = _tilemapDataService.SerializeData(_tilemapData, TileLayerFormat.CSV);
-        var tilemapData = _tilemapDataService.ParseData(serialized, TileLayerFormat.CSV);
+        var serialized = _tilemapDataService.SerializeData(_tilemapData, TileLayerFormat.Csv);
+        var tilemapData = _tilemapDataService.ParseData(serialized, TileLayerFormat.Csv);
 
         // Assert
         Assert.Equal(_tilemapData, tilemapData);
diff --git a/Animation2Tilemap.Test/Services/XmlSerializerServiceTests.cs b/Animation2Tilemap.Test/Services/XmlSerializerServiceTests.cs
@@ -5,24 +5,19 @@ namespace Animation2Tilemap.Test.Services;
 
 public class XmlSerializerServiceTests
 {
-    private readonly XmlSerializerService _xmlSerializerService;
-    private readonly Person _person;
+    private readonly XmlSerializerService _xmlSerializerService = new();
 
-    public XmlSerializerServiceTests()
+    private readonly Person _person = new()
     {
-        _xmlSerializerService = new XmlSerializerService();
-        _person = new Person
+        Name = "Alice",
+        Age = 25,
+        Address = new Address
         {
-            Name = "Alice",
-            Age = 25,
-            Address = new Address
-            {
-                Street = "Main Street",
-                City = "New York",
-                ZipCode = "10001"
-            }
-        };
-    }
+            Street = "Main Street",
+            City = "New York",
+            ZipCode = "10001"
+        }
+    };
 
     [Fact]
     public void Serialize_ShouldReturnValidXmlString_WhenObjectIsNotNull()
diff --git a/Animation2Tilemap.Test/TestHelpers/TestResourcesHelper.cs b/Animation2Tilemap.Test/TestHelpers/TestResourcesHelper.cs
@@ -5,13 +5,17 @@ namespace Animation2Tilemap.Test.TestHelpers;
 
 public static class TestResourcesHelper
 {
-    public static void ExportArrayToJson<T>(T[] array, string fileName) where T : struct
+    public static string GetPath(string location)
     {
         var callerClassName = new StackFrame(1).GetMethod()!.DeclaringType!.Name;
-        var filePath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "..", "..", "..", "Resources", callerClassName, fileName);
-        Directory.CreateDirectory(Path.GetDirectoryName(filePath)!);
-        using var fs = new FileStream(filePath, FileMode.Create);
-        JsonSerializer.SerializeAsync(fs, array);
+        var resourceFolder = Path.Combine("Resources", callerClassName);
+        var path = Path.Combine(resourceFolder, location);
+        if (File.Exists(path) || Directory.Exists(path))
+        {
+            return path;
+        }
+
+        throw new FileNotFoundException($"The file or folder {location} does not exist in the resource folder for {callerClassName}.");
     }
 
     public static T[] ImportArrayFromJson<T>(string jsonFile) where T : struct
@@ -23,17 +27,7 @@ public static T[] ImportArrayFromJson<T>(string jsonFile) where T : struct
             throw new FileNotFoundException($"The file {filePath} does not exist.");
         }
         using var fs = new FileStream(filePath, FileMode.Open);
-        var array = JsonSerializer.DeserializeAsync<T[]>(fs).Result;
-        return array!;
-    }
-
-    public static void ExportText(string text, string fileName)
-    {
-        var callerClassName = new StackFrame(1).GetMethod()!.DeclaringType!.Name;
-        var filePath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "..", "..", "..", "Resources", callerClassName, fileName);
-        Directory.CreateDirectory(Path.GetDirectoryName(filePath)!);
-        using var sw = new StreamWriter(filePath);
-        sw.Write(text);
+        return JsonSerializer.Deserialize<T[]>(fs) ?? Array.Empty<T>();
     }
 
     public static string ImportText(string fileName)
@@ -47,17 +41,4 @@ public static string ImportText(string fileName)
         using var sr = new StreamReader(filePath);
         return sr.ReadToEnd();
     }
-
-    public static string GetPath(string location)
-    {
-        var callerClassName = new StackFrame(1).GetMethod()!.DeclaringType!.Name;
-        var resourceFolder = Path.Combine("Resources", callerClassName);
-        var path = Path.Combine(resourceFolder, location);
-        if (File.Exists(path) || Directory.Exists(path))
-        {
-            return path;
-        }
-
-        throw new FileNotFoundException($"The file or folder {location} does not exist in the resource folder for {callerClassName}.");
-    }
 }
diff --git a/Animation2Tilemap/Animation2Tilemap.csproj b/Animation2Tilemap/Animation2Tilemap.csproj
@@ -19,9 +19,9 @@
 	</ItemGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0-preview.3.23174.8" />
-		<PackageReference Include="Serilog.Sinks.Console" Version="4.1.1-dev-00910" />
-		<PackageReference Include="SixLabors.ImageSharp" Version="3.0.1" />
+		<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
+		<PackageReference Include="Serilog.Sinks.Console" Version="4.1.0" />
+		<PackageReference Include="SixLabors.ImageSharp" Version="3.0.2" />
 		<PackageReference Include="System.CommandLine" Version="2.0.0-beta4.22272.1" />
 	</ItemGroup>
 
diff --git a/Animation2Tilemap/CommandLineOptions/Binding/ApplicationOptionsBinder.cs b/Animation2Tilemap/CommandLineOptions/Binding/ApplicationOptionsBinder.cs
@@ -63,7 +63,7 @@ protected override ApplicationOptions GetBoundValue(BindingContext bindingContex
             "base64" => TileLayerFormat.Base64Uncompressed,
             "zlib" => TileLayerFormat.Base64ZLib,
             "gzip" => TileLayerFormat.Base64GZip,
-            "csv" => TileLayerFormat.CSV,
+            "csv" => TileLayerFormat.Csv,
             _ => throw new IndexOutOfRangeException("Invalid tile layer format.")
         };
 
diff --git a/Animation2Tilemap/Entities/TilesetTileImage.cs b/Animation2Tilemap/Entities/TilesetTileImage.cs
@@ -9,10 +9,35 @@ public TilesetTileImage(Image<Rgba32> data, uint hash)
     }
 
     public Image<Rgba32> Data { get; }
+
     public uint Hash { get; }
 
+    public static bool operator !=(TilesetTileImage left, TilesetTileImage right)
+    {
+        return !(left == right);
+    }
+
+    public static bool operator ==(TilesetTileImage left, TilesetTileImage right)
+    {
+        return left.Equals(right);
+    }
+
     public bool Equals(TilesetTileImage other)
     {
         return other.Hash == Hash;
     }
+
+    public override bool Equals(object? obj)
+    {
+        if (obj is TilesetTileImage other)
+        {
+            return Equals(other);
+        }
+        return false;
+    }
+
+    public override int GetHashCode()
+    {
+        return Hash.GetHashCode();
+    }
 }
diff --git a/Animation2Tilemap/Enums/TileLayerFormat.cs b/Animation2Tilemap/Enums/TileLayerFormat.cs
@@ -5,5 +5,5 @@ public enum TileLayerFormat
     Base64Uncompressed,
     Base64GZip,
     Base64ZLib,
-    CSV
+    Csv
 }
diff --git a/Animation2Tilemap/Program.cs b/Animation2Tilemap/Program.cs
@@ -4,13 +4,14 @@
 using System.Text;
 using Animation2Tilemap.CommandLineOptions;
 using Animation2Tilemap.CommandLineOptions.Binding;
+using Animation2Tilemap.CommandLineOptions.Contracts;
 
 namespace Animation2Tilemap;
 
 public static class Program
 {
     private const string Description = """
-        Animation2Tilemap is a command-line tool that generates tilesets and tilemaps from animated or non-animated images. 
+        Animation2Tilemap is a command-line tool that generates tilesets and tilemaps from animated or non-animated images.
         See: https://github.com/vonhoff/Animation2Tilemap for more information.
         """;
 
@@ -45,16 +46,16 @@ public static async Task Main(string[] args)
 
     private static ApplicationOptionsBinder BuildApplicationOptionsBinder(Command rootCommand)
     {
-        var frameDurationOption = new FrameDurationOption();
-        var inputOption = new InputOption();
-        var outputOption = new OutputOption();
-        var heightOption = new HeightOption();
-        var widthOption = new WidthOption();
-        var marginOption = new MarginOption();
-        var spacingOption = new SpacingOption();
-        var transparentColorOption = new TransparentColorOption();
-        var tileLayerFormatOption = new TileLayerFormatOption();
-        var verboseOption = new VerboseOption();
+        ICommandLineOption<int> frameDurationOption = new FrameDurationOption();
+        ICommandLineOption<string> inputOption = new InputOption();
+        ICommandLineOption<string> outputOption = new OutputOption();
+        ICommandLineOption<int> heightOption = new HeightOption();
+        ICommandLineOption<int> widthOption = new WidthOption();
+        ICommandLineOption<int> marginOption = new MarginOption();
+        ICommandLineOption<int> spacingOption = new SpacingOption();
+        ICommandLineOption<string> transparentColorOption = new TransparentColorOption();
+        ICommandLineOption<string> tileLayerFormatOption = new TileLayerFormatOption();
+        ICommandLineOption<bool> verboseOption = new VerboseOption();
 
         return new ApplicationOptionsBinder(
             frameDurationOption.Register(rootCommand),
diff --git a/Animation2Tilemap/Services/ConfirmationDialogService.cs b/Animation2Tilemap/Services/ConfirmationDialogService.cs
@@ -21,25 +21,25 @@ public bool Confirm(string message, bool defaultOption)
                 isValidInput = true;
             }
             else switch (input)
-            {
-                case "Y":
-                {
-                    response = true;
-                    isValidInput = true;
-                    break;
-                }
-                case "N":
                 {
-                    response = false;
-                    isValidInput = true;
-                    break;
+                    case "Y":
+                    {
+                        response = true;
+                        isValidInput = true;
+                        break;
+                    }
+                    case "N":
+                    {
+                        response = false;
+                        isValidInput = true;
+                        break;
+                    }
+                    default:
+                    {
+                        Console.WriteLine("Invalid input. Please enter Y or N.");
+                        break;
+                    }
                 }
-                default:
-                {
-                    Console.WriteLine("Invalid input. Please enter Y or N.");
-                    break;
-                }
-            }
         }
 
         return response;
diff --git a/Animation2Tilemap/Services/NamePatternService.cs b/Animation2Tilemap/Services/NamePatternService.cs
@@ -53,9 +53,9 @@ private static Dictionary<string, int> CountPatterns(IEnumerable<string> names,
         var patternCount = new Dictionary<string, int>();
         foreach (var pattern in from name in names from Match match in regex.Matches(name) select match.Value)
         {
-            if (patternCount.ContainsKey(pattern))
+            if (patternCount.TryGetValue(pattern, out var count))
             {
-                patternCount[pattern]++;
+                patternCount[pattern] = count + 1;
             }
             else
             {
diff --git a/Animation2Tilemap/Services/TilemapDataService.cs b/Animation2Tilemap/Services/TilemapDataService.cs

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`using System.CommandLine;`
`2`		`-using Xunit;`
`3`	`2`	`using Animation2Tilemap.CommandLineOptions;`
`4`	`3`
`5`	`4`	`namespace Animation2Tilemap.Test.CommandLineOptions;`