Excluded macOS metadata folder from normalization

mihnea-radulescu · Aug 19, 2024 · d8a7a42 · d8a7a42
1 parent 0ed5ef2
commit d8a7a42
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 4 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -5,7 +5,7 @@
 		<ImplicitUsings>disable</ImplicitUsings>
 		<Nullable>enable</Nullable>
 		<Copyright>Copyright © Mihnea Rădulescu 2023 - 2024</Copyright>
-		<AssemblyVersion>1.2024.06.25</AssemblyVersion>
+		<AssemblyVersion>1.2024.08.19</AssemblyVersion>
 		<Version>$(AssemblyVersion)</Version>
 		<DebugType>embedded</DebugType>
 	</PropertyGroup>

diff --git a/ImageNormalizer.Test/ImageNormalizer.Test.csproj b/ImageNormalizer.Test/ImageNormalizer.Test.csproj
@@ -40,8 +40,8 @@
 	<ItemGroup>
 		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
 		<PackageReference Include="NSubstitute" Version="5.1.0" />
-		<PackageReference Include="xunit" Version="2.8.1" />
-		<PackageReference Include="xunit.runner.visualstudio" Version="2.8.1">
+		<PackageReference Include="xunit" Version="2.9.0" />
+		<PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 			<PrivateAssets>all</PrivateAssets>
 		</PackageReference>

diff --git a/ImageNormalizer/FileSystemInfo/ImageDirectoryInfo.cs b/ImageNormalizer/FileSystemInfo/ImageDirectoryInfo.cs
@@ -101,6 +101,8 @@ public void NormalizeFileSystemInfo()
 	}
 
 	#region Private
+
+	private static readonly HashSet<string> ExcludedDirectories = [ "__MACOSX" ];
 
 	private readonly IImageFileExtensionService _imageFileExtensionService;
 	private readonly IImageNormalizerService _imageNormalizerService;
@@ -120,6 +122,7 @@ private void AddFiles(IReadOnlyList<string> files)
 		var imageFiles = files
 			.Where(aFile => _imageFileExtensionService.ImageFileExtensions.Contains(
 								Path.GetExtension(aFile)))
+			.OrderBy(aFile => aFile)
 			.Select(aFile => new ImageFileInfo(
 				_imageNormalizerService,
 				new Arguments(
@@ -140,6 +143,8 @@ private void AddFiles(IReadOnlyList<string> files)
 	private void AddSubDirectories(IReadOnlyList<string> subDirectories)
 	{
 		var imageSubDirectories = subDirectories
+			.Where(aDirectory => !ExcludedDirectories.Contains(aDirectory))
+			.OrderBy(aDirectory => aDirectory)
 			.Select(aDirectory => new ImageDirectoryInfo(
 				_imageFileExtensionService,
 				_imageNormalizerService,

diff --git a/ImageNormalizer/ImageNormalizer.csproj b/ImageNormalizer/ImageNormalizer.csproj
@@ -15,7 +15,7 @@
 
 	<ItemGroup>
 		<PackageReference Include="Cocona" Version="2.2.0" />
-		<PackageReference Include="SixLabors.ImageSharp" Version="3.1.4" />
+		<PackageReference Include="SixLabors.ImageSharp" Version="3.1.5" />
 	</ItemGroup>
 
 </Project>