From d8a7a4262529d9bd6577484b8f7e953d6cac44b0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mihnea=20R=C4=83dulescu?= <>
Date: Mon, 19 Aug 2024 20:50:17 +0300
Subject: [PATCH] Excluded macOS metadata folder from normalization
---
Directory.Build.props | 2 +-
ImageNormalizer.Test/ImageNormalizer.Test.csproj | 4 ++--
ImageNormalizer/FileSystemInfo/ImageDirectoryInfo.cs | 5 +++++
ImageNormalizer/ImageNormalizer.csproj | 2 +-
4 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/Directory.Build.props b/Directory.Build.props
index 77f6870..50ed65d 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -5,7 +5,7 @@
disable
enable
Copyright © Mihnea Rădulescu 2023 - 2024
- 1.2024.06.25
+ 1.2024.08.19
$(AssemblyVersion)
embedded
diff --git a/ImageNormalizer.Test/ImageNormalizer.Test.csproj b/ImageNormalizer.Test/ImageNormalizer.Test.csproj
index 9d6c7ec..c992dbe 100644
--- a/ImageNormalizer.Test/ImageNormalizer.Test.csproj
+++ b/ImageNormalizer.Test/ImageNormalizer.Test.csproj
@@ -40,8 +40,8 @@
-
-
+
+
runtime; build; native; contentfiles; analyzers; buildtransitive
all
diff --git a/ImageNormalizer/FileSystemInfo/ImageDirectoryInfo.cs b/ImageNormalizer/FileSystemInfo/ImageDirectoryInfo.cs
index 634daad..69b40ec 100644
--- a/ImageNormalizer/FileSystemInfo/ImageDirectoryInfo.cs
+++ b/ImageNormalizer/FileSystemInfo/ImageDirectoryInfo.cs
@@ -101,6 +101,8 @@ public void NormalizeFileSystemInfo()
}
#region Private
+
+ private static readonly HashSet ExcludedDirectories = [ "__MACOSX" ];
private readonly IImageFileExtensionService _imageFileExtensionService;
private readonly IImageNormalizerService _imageNormalizerService;
@@ -120,6 +122,7 @@ private void AddFiles(IReadOnlyList 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 files)
private void AddSubDirectories(IReadOnlyList 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
index 9a647bb..74d69e1 100644
--- a/ImageNormalizer/ImageNormalizer.csproj
+++ b/ImageNormalizer/ImageNormalizer.csproj
@@ -15,7 +15,7 @@
-
+