Removed Amazon

IsOffsetDeterministicHashCode

.gitignore

@@ -468,3 +468,5 @@ globalStorage/
 [Ll]ib/
 
 Shared/.kanbn
+
+.vscode/Har-Files

.vscode/settings.json

@@ -22,6 +22,7 @@
         "Hmmssfff",
         "jfif",
         "JOSN",
+        "Makernote",
         "mmod",
         "Nicéphore",
         "Niépce",

Metadata/AA.Metadata.csproj

@@ -34,8 +34,8 @@
     </ItemGroup>
     <ItemGroup>
         <PackageReference Include="MetadataExtractor" Version="2.8.1" />
-        <PackageReference Include="System.Text.Json" Version="7.0.3" />
-        <PackageReference Include="Microsoft.Extensions.Hosting" Version="7.0.1" />
+        <PackageReference Include="System.Text.Json" Version="8.0.3" />
+        <PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.0" />
     </ItemGroup>
     <ItemGroup>
         <ProjectReference Include="..\Shared\AA.Shared.csproj" />

Metadata/Models/A_Metadata.cs

@@ -1,9 +1,8 @@
-using MetadataExtractor;
 using System.Collections.ObjectModel;
 using System.Text.Json;
 using View_by_Distance.Metadata.Models.Stateless;
-using View_by_Distance.Metadata.Models.Stateless.Methods;
 using View_by_Distance.Shared.Models;
+using View_by_Distance.Shared.Models.Properties;
 using View_by_Distance.Shared.Models.Stateless.Methods;
 
 namespace View_by_Distance.Metadata.Models;
@@ -17,30 +16,59 @@ public class A_Metadata
     public A_Metadata(MetadataConfiguration metadataConfiguration)
     {
         _MetadataConfiguration = metadataConfiguration;
-        string bResultsFullGroupDirectory = IResult.GetResultsFullGroupDirectory(metadataConfiguration.ResultConfiguration,
+        string aResultsFullGroupDirectory = IResult.GetResultsFullGroupDirectory(metadataConfiguration.ResultConfiguration,
                                                                                  nameof(A_Metadata),
                                                                                  string.Empty,
                                                                                  includeResizeGroup: false,
                                                                                  includeModel: false,
                                                                                  includePredictorModel: false);
-        _FileGroups = IPath.GetKeyValuePairs(metadataConfiguration.ResultConfiguration, bResultsFullGroupDirectory, [metadataConfiguration.ResultConfiguration.ResultSingleton]);
+        _FileGroups = IPath.GetKeyValuePairs(metadataConfiguration.ResultConfiguration, aResultsFullGroupDirectory, [metadataConfiguration.ResultConfiguration.ResultSingleton]);
     }
 
-    private FileInfo GetFileInfo(ResultConfiguration resultConfiguration, FilePath filePath)
+    private (int, FileInfo) GetFileInfo(ResultConfiguration resultConfiguration, FilePath filePath)
     {
         FileInfo result;
         FileInfo fileInfo = new(filePath.FullName);
         (_, int directoryIndex) = IPath.GetDirectoryNameAndIndex(resultConfiguration, filePath);
         DateTime minimumDateTime = fileInfo.CreationTime < fileInfo.LastWriteTime ? fileInfo.CreationTime : fileInfo.LastWriteTime;
-        int minimumYear = minimumDateTime.Year < resultConfiguration.EpicYear ? resultConfiguration.EpicYear : minimumDateTime.Year;
-        result = new(Path.Combine(_FileGroups[minimumYear][_MetadataConfiguration.ResultConfiguration.ResultSingleton][directoryIndex], $"{filePath.NameWithoutExtension}{filePath.ExtensionLowered}.json"));
-        return result;
+        int fileInfoMinimumYear = minimumDateTime.Year < resultConfiguration.EpicYear ? resultConfiguration.EpicYear : minimumDateTime.Year;
+        result = new(Path.Combine(_FileGroups[fileInfoMinimumYear][_MetadataConfiguration.ResultConfiguration.ResultSingleton][directoryIndex], $"{filePath.NameWithoutExtension}{filePath.ExtensionLowered}.json"));
+        return (fileInfoMinimumYear, result);
+    }
+
+    private (int, string) GetJsonFile(ResultConfiguration resultConfiguration, FilePath filePath, ExifDirectory exifDirectory)
+    {
+        string? result;
+        DateTime? dateTime;
+        dateTime = IDate.GetDateTimeOriginal(exifDirectory);
+        dateTime ??= IDate.GetMinimum(exifDirectory);
+        (_, int directoryIndex) = IPath.GetDirectoryNameAndIndex(resultConfiguration, filePath);
+        int exifYear = dateTime.Value.Year < resultConfiguration.EpicYear ? resultConfiguration.EpicYear : dateTime.Value.Year;
+        result = Path.Combine(_FileGroups[exifYear][_MetadataConfiguration.ResultConfiguration.ResultSingleton][directoryIndex], $"{filePath.NameWithoutExtension}{filePath.ExtensionLowered}.json");
+        return (exifYear, result);
+    }
+
+    private static (string, ExifDirectory?) Get(string jsonFile)
+    {
+        ExifDirectory? result;
+        string json = File.ReadAllText(jsonFile);
+        try
+        {
+            result = JsonSerializer.Deserialize(json, ExifDirectorySourceGenerationContext.Default.ExifDirectory);
+            if (result is null)
+                throw new Exception();
+        }
+        catch (Exception)
+        {
+            result = null;
+        }
+        return (json, result);
     }
 
     public (FileInfo, ExifDirectory) GetMetadataCollection(MetadataConfiguration metadataConfiguration, FilePath filePath, DeterministicHashCode deterministicHashCode)
     {
-        ExifDirectory? results;
-        FileInfo fileInfo = GetFileInfo(metadataConfiguration.ResultConfiguration, filePath);
+        ExifDirectory? result;
+        (int fileInfoMinimumYear, FileInfo fileInfo) = GetFileInfo(metadataConfiguration.ResultConfiguration, filePath);
         if (_MetadataConfiguration.ForceMetadataLastWriteTimeToCreationTime && !fileInfo.Exists && File.Exists(Path.ChangeExtension(fileInfo.FullName, ".delete")))
         {
             File.Move(Path.ChangeExtension(fileInfo.FullName, ".delete"), fileInfo.FullName);
@@ -52,9 +80,9 @@ public class A_Metadata
             fileInfo.Refresh();
         }
         if (_MetadataConfiguration.PropertiesChangedForMetadata)
-            results = null;
+            result = null;
         else if (!fileInfo.Exists)
-            results = null;
+            result = null;
         else if (!fileInfo.FullName.EndsWith(".json") && !fileInfo.FullName.EndsWith(".old"))
             throw new ArgumentException("must be a *.json file");
         else
@@ -62,59 +90,83 @@ public class A_Metadata
             string json = File.ReadAllText(fileInfo.FullName);
             try
             {
-                results = JsonSerializer.Deserialize(json, ExifDirectorySourceGenerationContext.Default.ExifDirectory);
-                if (results is null)
+                result = JsonSerializer.Deserialize(json, ExifDirectorySourceGenerationContext.Default.ExifDirectory);
+                if (result is null)
                     throw new Exception();
             }
             catch (Exception)
             {
-                results = null;
+                result = null;
             }
         }
-        if (results is null)
+        if (result is null)
         {
-            System.Drawing.Size? size;
-            try
-            { size = Dimensions.GetDimensions(filePath.FullName); }
-            catch (Exception) { size = null; }
-            IReadOnlyList<MetadataExtractor.Directory> directories = ImageMetadataReader.ReadMetadata(filePath.FullName);
-            results = Exif.Covert(filePath, deterministicHashCode, size, directories);
-            string json = JsonSerializer.Serialize(results, ExifDirectorySourceGenerationContext.Default.ExifDirectory);
+            string json;
+            result = Exif.GetExifDirectory(filePath, deterministicHashCode);
+            (int exifYear, string jsonFile) = GetJsonFile(metadataConfiguration.ResultConfiguration, filePath, result);
+            if (exifYear == fileInfoMinimumYear)
+                json = JsonSerializer.Serialize(result, ExifDirectorySourceGenerationContext.Default.ExifDirectory);
+            else
+            {
+                fileInfo = new(jsonFile);
+                if (!File.Exists(jsonFile))
+                    json = JsonSerializer.Serialize(result, ExifDirectorySourceGenerationContext.Default.ExifDirectory);
+                else
+                {
+                    (string checkJson, ExifDirectory? exifDirectory) = Get(jsonFile);
+                    if (exifDirectory is null)
+                        json = JsonSerializer.Serialize(result, ExifDirectorySourceGenerationContext.Default.ExifDirectory);
+                    else
+                    {
+                        json = checkJson;
+                        result = exifDirectory;
+                    }
+                }
+            }
             if (IPath.WriteAllText(fileInfo.FullName, json, updateDateWhenMatches: false, compareBeforeWrite: true, updateToWhenMatches: null) && _MetadataConfiguration.ForceMetadataLastWriteTimeToCreationTime)
             {
                 File.SetLastWriteTime(fileInfo.FullName, fileInfo.CreationTime);
                 fileInfo.Refresh();
             }
         }
-        return (fileInfo, results);
+        return (fileInfo, result);
     }
 
-    public static Action<string> SetExifDirectoryCollection(IRename rename, MetadataConfiguration metadataConfiguration, A_Metadata metadata, List<(string, FileInfo, ExifDirectory)> exifDirectories, Action tick)
+    public static Action<string> SetExifDirectoryCollection(IRename rename, IRenameConfiguration renameConfiguration, A_Metadata metadata, List<(FilePath, FileInfo, ExifDirectory)> exifDirectories)
     {
         return file =>
         {
-            tick.Invoke();
+            rename.Tick();
             FileInfo fileInfo;
             FilePath? ffmpegFilePath;
             ExifDirectory exifDirectory;
-            ReadOnlyCollection<string> ffmpegFiles;
+            FileHolder fileHolder = new(file);
+            ReadOnlyCollection<string>? ffmpegFiles;
             DeterministicHashCode deterministicHashCode;
-            FilePath filePath = IId.GetFilePath(metadataConfiguration, file);
-            if (filePath.ExtensionLowered is not ".paddedId" and not ".lsv")
+            FilePath filePath = FilePath.Get(renameConfiguration.MetadataConfiguration, fileHolder, index: null);
+            if (!renameConfiguration.SkipIdFiles || filePath.Id is null || !filePath.IsIntelligentIdFormat && filePath.SortOrder is not null)
             {
-                if (filePath.Id is null || (!filePath.IsIdFormat && !filePath.IsPaddedIdFormat))
+                if (filePath.Id is not null)
+                {
+                    ffmpegFiles = null;
+                    deterministicHashCode = new(null, filePath.Id, null);
+                }
+                else
+                {
+                    ffmpegFiles = rename.ConvertAndGetFfmpegFiles(renameConfiguration, filePath);
+                    ffmpegFilePath = ffmpegFiles.Count == 0 ? null : FilePath.Get(renameConfiguration.MetadataConfiguration, new(ffmpegFiles[0]), index: null);
+                    deterministicHashCode = ffmpegFilePath is null ? rename.GetDeterministicHashCode(filePath) : rename.GetDeterministicHashCode(ffmpegFilePath);
+                }
+                (fileInfo, exifDirectory) = metadata.GetMetadataCollection(renameConfiguration.MetadataConfiguration, filePath, deterministicHashCode);
+                lock (exifDirectories)
+                    exifDirectories.Add(new(filePath, fileInfo, exifDirectory));
+                if (ffmpegFiles is not null)
                 {
-                    (ffmpegFiles, ffmpegFilePath) = rename.ConvertAndGetFfmpegFiles(filePath);
-                    if (ffmpegFilePath is not null)
-                        filePath = ffmpegFilePath;
-                    deterministicHashCode = filePath.Id is not null ? deterministicHashCode = new(null, filePath.Id, null) : deterministicHashCode = rename.GetDeterministicHashCode(filePath);
-                    (fileInfo, exifDirectory) = metadata.GetMetadataCollection(metadataConfiguration, filePath, deterministicHashCode);
-                    lock (exifDirectories)
-                        exifDirectories.Add(new(file, fileInfo, exifDirectory));
                     foreach (string ffmpegFile in ffmpegFiles)
                         File.Delete(ffmpegFile);
                 }
             }
+
         };
     }
 

Metadata/Models/Binder/MetadataConfiguration.cs

@@ -9,6 +9,7 @@ public class MetadataConfiguration
 
     public bool? ForceMetadataLastWriteTimeToCreationTime { get; set; }
     public string[]? IgnoreRulesKeyWords { get; set; }
+    public int? IntMinValueLength { get; set; }
     public int? Offset { get; set; }
     public bool? PropertiesChangedForMetadata { get; set; }
 
@@ -22,21 +23,22 @@ public class MetadataConfiguration
     {
         if (configuration?.ForceMetadataLastWriteTimeToCreationTime is null)
         {
+            List<string> paths = [];
             foreach (IConfigurationProvider configurationProvider in configurationRoot.Providers)
             {
                 if (configurationProvider is not Microsoft.Extensions.Configuration.Json.JsonConfigurationProvider jsonConfigurationProvider)
                     continue;
                 if (jsonConfigurationProvider.Source.FileProvider is not Microsoft.Extensions.FileProviders.PhysicalFileProvider physicalFileProvider)
                     continue;
-                if (!physicalFileProvider.Root.Contains("UserSecrets"))
-                    continue;
-                throw new NotSupportedException(physicalFileProvider.Root);
+                paths.Add(physicalFileProvider.Root);
             }
+            throw new NotSupportedException($"Not found!{Environment.NewLine}{string.Join(Environment.NewLine, paths.Distinct())}");
         }
     }
 
     private static void Verify(MetadataConfiguration configuration)
     {
+        if (configuration.IntMinValueLength is null || configuration.IntMinValueLength != int.MinValue.ToString().Length) throw new NotSupportedException(nameof(configuration.IgnoreRulesKeyWords));
         if (configuration.IgnoreRulesKeyWords is null || configuration.IgnoreRulesKeyWords.Length == 0) throw new NullReferenceException(nameof(configuration.IgnoreRulesKeyWords));
     }
 
@@ -45,6 +47,7 @@ public class MetadataConfiguration
         Shared.Models.MetadataConfiguration result;
         if (configuration is null) throw new NullReferenceException(nameof(configuration));
         if (configuration.ForceMetadataLastWriteTimeToCreationTime is null) throw new NullReferenceException(nameof(configuration.ForceMetadataLastWriteTimeToCreationTime));
+        if (configuration.IntMinValueLength is null) throw new NullReferenceException(nameof(configuration.IntMinValueLength));
         if (configuration.IgnoreRulesKeyWords is null) throw new NullReferenceException(nameof(configuration.IgnoreRulesKeyWords));
         if (configuration.Offset is null) throw new NullReferenceException(nameof(configuration.Offset));
         if (configuration.PropertiesChangedForMetadata is null) throw new NullReferenceException(nameof(configuration.PropertiesChangedForMetadata));
@@ -52,6 +55,7 @@ public class MetadataConfiguration
         result = new(resultConfiguration,
                      configuration.ForceMetadataLastWriteTimeToCreationTime.Value,
                      configuration.IgnoreRulesKeyWords,
+                     configuration.IntMinValueLength.Value,
                      configuration.Offset.Value,
                      configuration.PropertiesChangedForMetadata.Value);
         return result;

Metadata/Models/Binder/ResultConfiguration.cs

@@ -29,16 +29,16 @@ public class ResultConfiguration
     {
         if (configuration?.DateGroup is null)
         {
+            List<string> paths = [];
             foreach (IConfigurationProvider configurationProvider in configurationRoot.Providers)
             {
                 if (configurationProvider is not Microsoft.Extensions.Configuration.Json.JsonConfigurationProvider jsonConfigurationProvider)
                     continue;
                 if (jsonConfigurationProvider.Source.FileProvider is not Microsoft.Extensions.FileProviders.PhysicalFileProvider physicalFileProvider)
                     continue;
-                if (!physicalFileProvider.Root.Contains("UserSecrets"))
-                    continue;
-                throw new NotSupportedException(physicalFileProvider.Root);
+                paths.Add(physicalFileProvider.Root);
             }
+            throw new NotSupportedException($"Not found!{Environment.NewLine}{string.Join(Environment.NewLine, paths.Distinct())}");
         }
     }
 

Metadata/Models/Stateless/Base.cs

@@ -0,0 +1,68 @@
+using System.Collections.ObjectModel;
+using View_by_Distance.Shared.Models;
+
+namespace View_by_Distance.Metadata.Models.Stateless.Methods;
+
+internal static class Base
+{
+
+    internal static string? GetMaker(ExifDirectoryBase[]? exifBaseDirectories)
+    {
+        string? result = null;
+        if (exifBaseDirectories is not null)
+        {
+            string value;
+            foreach (ExifDirectoryBase exifDirectoryBase in exifBaseDirectories)
+            {
+                value = exifDirectoryBase?.Make is null ? string.Empty : exifDirectoryBase.Make.ToString().Trim();
+                if (string.IsNullOrEmpty(value))
+                    result = null;
+                else
+                {
+                    result = $"{value[0].ToString().ToUpper()}{value[1..].ToLower()}";
+                    break;
+                }
+            }
+        }
+        return result;
+    }
+
+    internal static string? GetModel(ExifDirectoryBase[]? exifBaseDirectories)
+    {
+        string? result = null;
+        if (exifBaseDirectories is not null)
+        {
+            string value;
+            foreach (ExifDirectoryBase exifDirectoryBase in exifBaseDirectories)
+            {
+                value = exifDirectoryBase?.Model is null ? string.Empty : exifDirectoryBase.Model.ToString().Trim();
+                if (string.IsNullOrEmpty(value))
+                    result = null;
+                else
+                {
+                    result = value;
+                    break;
+                }
+            }
+        }
+        return result;
+    }
+
+    internal static ReadOnlyCollection<string> GetKeywords(ExifDirectoryBase[]? exifBaseDirectories)
+    {
+        List<string> results = [];
+        if (exifBaseDirectories is not null)
+        {
+            string value;
+            foreach (ExifDirectoryBase exifDirectoryBase in exifBaseDirectories)
+            {
+                value = exifDirectoryBase?.WinKeywords is null ? string.Empty : exifDirectoryBase.WinKeywords.ToString().Trim();
+                if (string.IsNullOrEmpty(value))
+                    continue;
+                results.Add(value);
+            }
+        }
+        return new(results);
+    }
+
+}

Metadata/Models/Stateless/Dimensions.cs

@@ -5,10 +5,8 @@ namespace View_by_Distance.Metadata.Models.Stateless.Methods;
 internal static class Dimensions
 {
 
-    const string _ErrorMessage = "Could not recognize image format.";
-
 #pragma warning disable IDE0230
-    private static readonly Dictionary<byte[], Func<BinaryReader, Size>> _ImageFormatDecoders = new()
+    private static readonly Dictionary<byte[], Func<BinaryReader, Size?>> _ImageFormatDecoders = new()
     {
         { new byte[] { 0x42, 0x4D }, DecodeBitmap },
         { new byte[] { 0x47, 0x49, 0x46, 0x38, 0x37, 0x61 }, DecodeGif },
@@ -23,10 +21,9 @@ internal static class Dimensions
     {
         for (int i = 0; i < thatBytes.Length; i += 1)
         {
-            if (thisBytes[i] != thatBytes[i])
-            {
-                return false;
-            }
+            if (thisBytes[i] == thatBytes[i])
+                continue;
+            return false;
         }
         return true;
     }
@@ -35,9 +32,7 @@ internal static class Dimensions
     {
         byte[] bytes = new byte[sizeof(short)];
         for (int i = 0; i < sizeof(short); i += 1)
-        {
             bytes[sizeof(short) - 1 - i] = binaryReader.ReadByte();
-        }
         return BitConverter.ToInt16(bytes, 0);
     }
 
@@ -45,13 +40,11 @@ internal static class Dimensions
     {
         byte[] bytes = new byte[sizeof(int)];
         for (int i = 0; i < sizeof(int); i += 1)
-        {
             bytes[sizeof(int) - 1 - i] = binaryReader.ReadByte();
-        }
         return BitConverter.ToInt32(bytes, 0);
     }
 
-    private static Size DecodeBitmap(BinaryReader binaryReader)
+    private static Size? DecodeBitmap(BinaryReader binaryReader)
     {
         _ = binaryReader.ReadBytes(16);
         int width = binaryReader.ReadInt32();
@@ -59,14 +52,14 @@ internal static class Dimensions
         return new Size(width, height);
     }
 
-    private static Size DecodeGif(BinaryReader binaryReader)
+    private static Size? DecodeGif(BinaryReader binaryReader)
     {
         int width = binaryReader.ReadInt16();
         int height = binaryReader.ReadInt16();
         return new Size(width, height);
     }
 
-    private static Size DecodePng(BinaryReader binaryReader)
+    private static Size? DecodePng(BinaryReader binaryReader)
     {
         _ = binaryReader.ReadBytes(8);
         int width = ReadLittleEndianInt32(binaryReader);
@@ -74,100 +67,60 @@ internal static class Dimensions
         return new Size(width, height);
     }
 
-    private static Size DecodeJfif(BinaryReader binaryReader)
+    private static Size? DecodeJfif(BinaryReader binaryReader)
     {
         while (binaryReader.ReadByte() == 0xff)
         {
             byte marker = binaryReader.ReadByte();
             short chunkLength = ReadLittleEndianInt16(binaryReader);
-
             if (marker == 0xc0)
             {
                 _ = binaryReader.ReadByte();
-
                 int height = ReadLittleEndianInt16(binaryReader);
                 int width = ReadLittleEndianInt16(binaryReader);
                 return new Size(width, height);
             }
-
-            if (chunkLength < 0)
+            if (chunkLength >= 0)
+                _ = binaryReader.ReadBytes(chunkLength - 2);
+            else
             {
                 ushort uChunkLength = (ushort)chunkLength;
                 _ = binaryReader.ReadBytes(uChunkLength - 2);
             }
-            else
-            {
-                _ = binaryReader.ReadBytes(chunkLength - 2);
-            }
         }
-
-        throw new ArgumentException(_ErrorMessage);
+        return null;
     }
 
-    private static Size DecodeWebP(BinaryReader binaryReader)
+    private static Size? DecodeWebP(BinaryReader binaryReader)
     {
         _ = binaryReader.ReadUInt32(); // Size
         _ = binaryReader.ReadBytes(15); // WEBP, VP8 + more
         _ = binaryReader.ReadBytes(3); // SYNC
-
         int width = binaryReader.ReadUInt16() & 0b00_11111111111111; // 14 bits width
         int height = binaryReader.ReadUInt16() & 0b00_11111111111111; // 14 bits height
-
         return new Size(width, height);
     }
 
-    /// <summary>
-    /// Gets the dimensions of an image.
-    /// </summary>
-    /// <param name="path">The path of the image to get the dimensions of.</param>
-    /// <returns>The dimensions of the specified image.</returns>
-    /// <exception cref="ArgumentException">The image was of an unrecognized format.</exception>    
-    internal static Size GetDimensions(BinaryReader binaryReader)
+    internal static Size? GetDimensions(BinaryReader binaryReader)
     {
         int maxMagicBytesLength = _ImageFormatDecoders.Keys.OrderByDescending(x => x.Length).First().Length;
-
         byte[] magicBytes = new byte[maxMagicBytesLength];
-
         for (int i = 0; i < maxMagicBytesLength; i += 1)
         {
             magicBytes[i] = binaryReader.ReadByte();
-
-            foreach (KeyValuePair<byte[], Func<BinaryReader, Size>> kvPair in _ImageFormatDecoders)
+            foreach (KeyValuePair<byte[], Func<BinaryReader, Size?>> kvPair in _ImageFormatDecoders)
             {
                 if (StartsWith(magicBytes, kvPair.Key))
-                {
                     return kvPair.Value(binaryReader);
-                }
             }
         }
-
-        throw new ArgumentException(_ErrorMessage, nameof(binaryReader));
+        return null;
     }
 
-    /// <summary>
-    /// Gets the dimensions of an image.
-    ///internal </summary>
-    /// <param name="path">The path of the image to get the dimensions of.</param>
-    /// <returns>The dimensions of the specified image.</returns>
-    /// <exception cref="ArgumentException">The image was of an unrecognized format.</exception>
-    internal static Size GetDimensions(string path)
+    internal static Size? GetDimensions(string path)
     {
         using BinaryReader binaryReader = new(File.OpenRead(path));
-        try
-        {
-            return GetDimensions(binaryReader);
-        }
-        catch (ArgumentException e)
-        {
-            if (e.Message.StartsWith(_ErrorMessage))
-            {
-                throw new ArgumentException(_ErrorMessage, nameof(path), e);
-            }
-            else
-            {
-                throw;
-            }
-        }
+        return GetDimensions(binaryReader);
     }
 
 }

Metadata/Models/Stateless/Exif.cs

@@ -1,6 +1,8 @@
 using MetadataExtractor;
 using MetadataExtractor.Formats.Exif;
+using MetadataExtractor.Formats.Exif.Makernotes;
 using System.Globalization;
+using View_by_Distance.Metadata.Models.Stateless.Methods;
 
 namespace View_by_Distance.Metadata.Models.Stateless;
 
@@ -23,14 +25,14 @@ internal abstract class Exif
         return result;
     }
 
-    private static Shared.Models.AviDirectory GetAviDirectory(IReadOnlyList<MetadataExtractor.Directory> directories)
+    private static Shared.Models.AviDirectory[] GetAviDirectories(IReadOnlyList<MetadataExtractor.Directory> directories)
     {
-        Shared.Models.AviDirectory result;
-        MetadataExtractor.Formats.Avi.AviDirectory? aviDirectory = directories.OfType<MetadataExtractor.Formats.Avi.AviDirectory>().FirstOrDefault();
-        if (aviDirectory is null)
-            result = new(null, null, null, null);
-        else
+        List<Shared.Models.AviDirectory> results = [];
+        IEnumerable<MetadataExtractor.Formats.Avi.AviDirectory> aviDirectories = directories.OfType<MetadataExtractor.Formats.Avi.AviDirectory>();
+        foreach (MetadataExtractor.Formats.Avi.AviDirectory aviDirectory in aviDirectories)
         {
+            if (aviDirectory.Tags.Count == 0)
+                continue;
             DateTime? dateTimeOriginal;
             string? duration = aviDirectory.GetDescription(MetadataExtractor.Formats.Avi.AviDirectory.TagDuration);
             string? height = aviDirectory.GetDescription(MetadataExtractor.Formats.Avi.AviDirectory.TagHeight);
@@ -39,19 +41,21 @@ internal abstract class Exif
                 dateTimeOriginal = checkDateTime;
             else
                 dateTimeOriginal = GetDateTime(aviDirectory.GetString(MetadataExtractor.Formats.Avi.AviDirectory.TagDateTimeOriginal));
-            result = new(dateTimeOriginal, duration, height, width);
+            if (dateTimeOriginal is null && duration is null && height is null && width is null)
+                continue;
+            results.Add(new(dateTimeOriginal, duration, height, width));
         }
-        return result;
+        return results.ToArray();
     }
 
-    private static Shared.Models.ExifDirectoryBase GetExifDirectoryBase(IReadOnlyList<MetadataExtractor.Directory> directories)
+    private static Shared.Models.ExifDirectoryBase[] GetExifBaseDirectories(IReadOnlyList<MetadataExtractor.Directory> directories)
     {
-        Shared.Models.ExifDirectoryBase result;
-        ExifDirectoryBase? exifDirectoryBase = directories.OfType<ExifDirectoryBase>().FirstOrDefault();
-        if (exifDirectoryBase is null)
-            result = new(null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null);
-        else
+        List<Shared.Models.ExifDirectoryBase> results = [];
+        IEnumerable<ExifDirectoryBase> exifBaseDirectories = directories.OfType<ExifDirectoryBase>();
+        foreach (ExifDirectoryBase exifDirectoryBase in exifBaseDirectories)
         {
+            if (exifDirectoryBase.Tags.Count == 0)
+                continue;
             DateTime? dateTime;
             DateTime checkDateTime;
             DateTime? dateTimeOriginal;
@@ -111,64 +115,113 @@ internal abstract class Exif
                 dateTimeDigitized = checkDateTime;
             else
                 dateTimeDigitized = GetDateTime(exifDirectoryBase.GetString(ExifDirectoryBase.TagDateTimeDigitized));
-            result = new(aperture,
-                         applicationNotes,
-                         artist,
-                         bitsPerSample,
-                         bodySerialNumber,
-                         cameraOwnerName,
-                         compressedAverageBitsPerPixel,
-                         compression,
-                         copyright,
-                         dateTime,
-                         dateTimeDigitized,
-                         dateTimeOriginal,
-                         documentName,
-                         exifVersion,
-                         exposureTime,
-                         fileSource,
-                         imageDescription,
-                         imageHeight,
-                         imageNumber,
-                         imageUniqueId,
-                         imageWidth,
-                         isoSpeed,
-                         lensMake,
-                         lensModel,
-                         lensSerialNumber,
-                         make,
-                         makerNote,
-                         model,
-                         orientation,
-                         orientationValue,
-                         rating,
-                         ratingPercent,
-                         securityClassification,
-                         shutterSpeed,
-                         software,
-                         timeZone,
-                         timeZoneDigitized,
-                         timeZoneOriginal,
-                         userComment,
-                         winAuthor,
-                         winComment,
-                         winKeywords,
-                         winSubject,
-                         winTitle,
-                         xResolution,
-                         yResolution);
+            if (userComment is not null && userComment.Length > 255)
+                userComment = "...";
+            if (aperture is null
+                && applicationNotes is null
+                && artist is null
+                && bitsPerSample is null
+                && bodySerialNumber is null
+                && cameraOwnerName is null
+                && compressedAverageBitsPerPixel is null
+                && compression is null
+                && copyright is null
+                && dateTime is null
+                && dateTimeDigitized is null
+                && dateTimeOriginal is null
+                && documentName is null
+                && exifVersion is null
+                && exposureTime is null
+                && fileSource is null
+                && imageDescription is null
+                && imageHeight is null
+                && imageNumber is null
+                && imageUniqueId is null
+                && imageWidth is null
+                && isoSpeed is null
+                && lensMake is null
+                && lensModel is null
+                && lensSerialNumber is null
+                && make is null
+                && makerNote is null
+                && model is null
+                && orientation is null
+                && orientationValue is null
+                && rating is null
+                && ratingPercent is null
+                && securityClassification is null
+                && shutterSpeed is null
+                && software is null
+                && timeZone is null
+                && timeZoneDigitized is null
+                && timeZoneOriginal is null
+                && userComment is null
+                && winAuthor is null
+                && winComment is null
+                && winKeywords is null
+                && winSubject is null
+                && winTitle is null
+                && xResolution is not null
+                && yResolution is null)
+                continue;
+            results.Add(new(aperture,
+                            applicationNotes,
+                            artist,
+                            bitsPerSample,
+                            bodySerialNumber,
+                            cameraOwnerName,
+                            compressedAverageBitsPerPixel,
+                            compression,
+                            copyright,
+                            dateTime,
+                            dateTimeDigitized,
+                            dateTimeOriginal,
+                            documentName,
+                            exifVersion,
+                            exposureTime,
+                            fileSource,
+                            imageDescription,
+                            imageHeight,
+                            imageNumber,
+                            imageUniqueId,
+                            imageWidth,
+                            isoSpeed,
+                            lensMake,
+                            lensModel,
+                            lensSerialNumber,
+                            make,
+                            makerNote,
+                            model,
+                            orientation,
+                            orientationValue,
+                            rating,
+                            ratingPercent,
+                            securityClassification,
+                            shutterSpeed,
+                            software,
+                            timeZone,
+                            timeZoneDigitized,
+                            timeZoneOriginal,
+                            userComment,
+                            winAuthor,
+                            winComment,
+                            winKeywords,
+                            winSubject,
+                            winTitle,
+                            xResolution,
+                            yResolution));
         }
-        return result;
+        return results.ToArray();
     }
 
-    private static Shared.Models.FileMetadataDirectory GetFileMetadataDirectory(string file, IReadOnlyList<MetadataExtractor.Directory> directories)
+    private static Shared.Models.FileMetadataDirectory[] GetFileMetadataDirectories(string file, IReadOnlyList<MetadataExtractor.Directory> directories)
     {
-        Shared.Models.FileMetadataDirectory result;
-        MetadataExtractor.Formats.FileSystem.FileMetadataDirectory? fileMetadataDirectory = directories.OfType<MetadataExtractor.Formats.FileSystem.FileMetadataDirectory>().FirstOrDefault();
-        if (fileMetadataDirectory is null)
-            result = new(null, null, null);
-        else
+        List<Shared.Models.FileMetadataDirectory> results = [];
+        IEnumerable<MetadataExtractor.Formats.FileSystem.FileMetadataDirectory> fileMetadataDirectories = directories.OfType<MetadataExtractor.Formats.FileSystem.FileMetadataDirectory>();
+        foreach (MetadataExtractor.Formats.FileSystem.FileMetadataDirectory fileMetadataDirectory in fileMetadataDirectories)
         {
+            if (fileMetadataDirectory.Tags.Count == 0)
+                continue;
             DateTime? fileModifiedDate;
             string? fileName = fileMetadataDirectory.GetDescription(MetadataExtractor.Formats.FileSystem.FileMetadataDirectory.TagFileName);
             string? fileSize = fileMetadataDirectory.GetDescription(MetadataExtractor.Formats.FileSystem.FileMetadataDirectory.TagFileSize);
@@ -178,49 +231,38 @@ internal abstract class Exif
                 fileModifiedDate = GetDateTime(fileMetadataDirectory.GetString(MetadataExtractor.Formats.FileSystem.FileMetadataDirectory.TagFileModifiedDate));
             if (fileName is null || !file.EndsWith(fileName))
                 throw new NotSupportedException($"!{file}.EndsWith({fileName})");
-            result = new(fileModifiedDate, fileName, fileSize);
+            if (fileModifiedDate is null && fileName is null && fileSize is null)
+                continue;
+            results.Add(new(fileModifiedDate, fileName, fileSize));
         }
-        return result;
+        return results.ToArray();
     }
 
-    private static Shared.Models.GifHeaderDirectory GetGifHeaderDirectory(IReadOnlyList<MetadataExtractor.Directory> directories)
+    private static Shared.Models.GifHeaderDirectory[] GetGifHeaderDirectories(IReadOnlyList<MetadataExtractor.Directory> directories)
     {
-        Shared.Models.GifHeaderDirectory result;
-        MetadataExtractor.Formats.Gif.GifHeaderDirectory? gifHeaderDirectory = directories.OfType<MetadataExtractor.Formats.Gif.GifHeaderDirectory>().FirstOrDefault();
-        if (gifHeaderDirectory is null)
-            result = new(null, null);
-        else
+        List<Shared.Models.GifHeaderDirectory> results = [];
+        IEnumerable<MetadataExtractor.Formats.Gif.GifHeaderDirectory> gifHeaderDirectories = directories.OfType<MetadataExtractor.Formats.Gif.GifHeaderDirectory>();
+        foreach (MetadataExtractor.Formats.Gif.GifHeaderDirectory gifHeaderDirectory in gifHeaderDirectories)
         {
+            if (gifHeaderDirectory.Tags.Count == 0)
+                continue;
             string? imageHeight = gifHeaderDirectory.GetDescription(MetadataExtractor.Formats.Gif.GifHeaderDirectory.TagImageHeight);
             string? imageWidth = gifHeaderDirectory.GetDescription(MetadataExtractor.Formats.Gif.GifHeaderDirectory.TagImageWidth);
-            result = new(imageHeight, imageWidth);
+            if (imageHeight is null && imageWidth is null)
+                continue;
+            results.Add(new(imageHeight, imageWidth));
         }
-        return result;
+        return results.ToArray();
     }
 
-    private static Shared.Models.PhotoshopDirectory GetPhotoshopDirectory(IReadOnlyList<MetadataExtractor.Directory> directories)
+    private static Shared.Models.GpsDirectory[] GetGpsDirectories(IReadOnlyList<MetadataExtractor.Directory> directories)
     {
-        Shared.Models.PhotoshopDirectory result;
-        MetadataExtractor.Formats.Photoshop.PhotoshopDirectory? PhotoshopDirectory = directories.OfType<MetadataExtractor.Formats.Photoshop.PhotoshopDirectory>().FirstOrDefault();
-        if (PhotoshopDirectory is null)
-            result = new(null, null);
-        else
-        {
-            string? jpegQuality = PhotoshopDirectory.GetDescription(MetadataExtractor.Formats.Photoshop.PhotoshopDirectory.TagJpegQuality);
-            string? url = PhotoshopDirectory.GetDescription(MetadataExtractor.Formats.Photoshop.PhotoshopDirectory.TagUrl);
-            result = new(jpegQuality, url);
-        }
-        return result;
-    }
-
-    private static Shared.Models.GpsDirectory GetGpsDirectory(IReadOnlyList<MetadataExtractor.Directory> directories)
-    {
-        Shared.Models.GpsDirectory result;
-        GpsDirectory? gpsDirectory = directories.OfType<GpsDirectory>().FirstOrDefault();
-        if (gpsDirectory is null)
-            result = new(null, null, null, null, null, null);
-        else
+        List<Shared.Models.GpsDirectory> results = [];
+        IEnumerable<GpsDirectory> gpsDirectories = directories.OfType<GpsDirectory>();
+        foreach (GpsDirectory gpsDirectory in gpsDirectories)
         {
+            if (gpsDirectory.Tags.Count == 0)
+                continue;
             DateTime? timeStamp;
             string? altitude = gpsDirectory.GetDescription(GpsDirectory.TagAltitude);
             string? latitude = gpsDirectory.GetDescription(GpsDirectory.TagLatitude);
@@ -231,136 +273,257 @@ internal abstract class Exif
                 timeStamp = checkDateTime;
             else
                 timeStamp = GetDateTime(gpsDirectory.GetString(GpsDirectory.TagTimeStamp));
-            result = new(altitude,
-                         latitude,
-                         latitudeRef,
-                         longitude,
-                         longitudeRef,
-                         timeStamp);
+            if (altitude is null && latitude is null && latitudeRef is null && longitude is null && longitudeRef is null && timeStamp is null)
+                continue;
+            results.Add(new(altitude,
+                            latitude,
+                            latitudeRef,
+                            longitude,
+                            longitudeRef,
+                            timeStamp));
         }
-        return result;
+        return results.ToArray();
     }
 
-    private static Shared.Models.JpegDirectory GetJpegDirectory(IReadOnlyList<MetadataExtractor.Directory> directories)
+    private static Shared.Models.JpegDirectory[] GetJpegDirectories(IReadOnlyList<MetadataExtractor.Directory> directories)
     {
-        Shared.Models.JpegDirectory result;
-        MetadataExtractor.Formats.Jpeg.JpegDirectory? jpegDirectory = directories.OfType<MetadataExtractor.Formats.Jpeg.JpegDirectory>().FirstOrDefault();
-        if (jpegDirectory is null)
-            result = new(null, null);
-        else
+        List<Shared.Models.JpegDirectory> results = [];
+        IEnumerable<MetadataExtractor.Formats.Jpeg.JpegDirectory> jpegDirectories = directories.OfType<MetadataExtractor.Formats.Jpeg.JpegDirectory>();
+        foreach (MetadataExtractor.Formats.Jpeg.JpegDirectory jpegDirectory in jpegDirectories)
         {
+            if (jpegDirectory.Tags.Count == 0)
+                continue;
             string? imageHeight = jpegDirectory.GetDescription(MetadataExtractor.Formats.Jpeg.JpegDirectory.TagImageHeight);
             string? imageWidth = jpegDirectory.GetDescription(MetadataExtractor.Formats.Jpeg.JpegDirectory.TagImageWidth);
-            result = new(imageHeight, imageWidth);
+            if (imageHeight is null && imageWidth is null)
+                continue;
+            results.Add(new(imageHeight, imageWidth));
         }
-        return result;
+        return results.ToArray();
     }
 
-    private static Shared.Models.PngDirectory GetPngDirectory(IReadOnlyList<MetadataExtractor.Directory> directories)
+    private static Shared.Models.MakernoteDirectory[] GetMakernoteDirectories(IReadOnlyList<MetadataExtractor.Directory> directories)
     {
-        Shared.Models.PngDirectory result;
-        MetadataExtractor.Formats.Png.PngDirectory? pngDirectory = directories.OfType<MetadataExtractor.Formats.Png.PngDirectory>().FirstOrDefault();
-        if (pngDirectory is null)
-            result = new(null, null);
-        else
+        List<Shared.Models.MakernoteDirectory> results = [];
+        IEnumerable<AppleMakernoteDirectory> appleMakernoteDirectories = directories.OfType<AppleMakernoteDirectory>();
+        foreach (AppleMakernoteDirectory appleMakernoteDirectory in appleMakernoteDirectories)
         {
+            if (appleMakernoteDirectory.Tags.Count == 0)
+                continue;
+            string? cameraSerialNumber = null;
+            string? firmwareVersion = null;
+            string? qualityAndFileFormat = null;
+            if (cameraSerialNumber is null && firmwareVersion is null && qualityAndFileFormat is null)
+                continue;
+            results.Add(new(cameraSerialNumber, firmwareVersion, qualityAndFileFormat));
+        }
+        IEnumerable<CanonMakernoteDirectory> canonMakernoteDirectories = directories.OfType<CanonMakernoteDirectory>();
+        foreach (CanonMakernoteDirectory canonMakernoteDirectory in canonMakernoteDirectories)
+        {
+            if (canonMakernoteDirectory.Tags.Count == 0)
+                continue;
+            string? cameraSerialNumber = canonMakernoteDirectory.GetDescription(CanonMakernoteDirectory.TagModelId);
+            string? firmwareVersion = canonMakernoteDirectory.GetDescription(CanonMakernoteDirectory.TagCanonFirmwareVersion);
+            string? qualityAndFileFormat = canonMakernoteDirectory.GetDescription(CanonMakernoteDirectory.CameraSettings.TagQuality);
+            if (cameraSerialNumber is null && firmwareVersion is null && qualityAndFileFormat is null)
+                continue;
+            results.Add(new(cameraSerialNumber, firmwareVersion, qualityAndFileFormat));
+        }
+        IEnumerable<NikonType2MakernoteDirectory> nikonType2MakernoteDirectories = directories.OfType<NikonType2MakernoteDirectory>();
+        foreach (NikonType2MakernoteDirectory nikonType2MakernoteDirectory in nikonType2MakernoteDirectories)
+        {
+            if (nikonType2MakernoteDirectory.Tags.Count == 0)
+                continue;
+            string? cameraSerialNumber = nikonType2MakernoteDirectory.GetDescription(NikonType2MakernoteDirectory.TagCameraSerialNumber);
+            string? firmwareVersion = nikonType2MakernoteDirectory.GetDescription(NikonType2MakernoteDirectory.TagFirmwareVersion);
+            string? qualityAndFileFormat = nikonType2MakernoteDirectory.GetDescription(NikonType2MakernoteDirectory.TagQualityAndFileFormat);
+            if (cameraSerialNumber is null && firmwareVersion is null && qualityAndFileFormat is null)
+                continue;
+            results.Add(new(cameraSerialNumber, firmwareVersion, qualityAndFileFormat));
+        }
+        IEnumerable<OlympusMakernoteDirectory> olympusMakernoteDirectories = directories.OfType<OlympusMakernoteDirectory>();
+        foreach (OlympusMakernoteDirectory olympusMakernoteDirectory in olympusMakernoteDirectories)
+        {
+            if (olympusMakernoteDirectory.Tags.Count == 0)
+                continue;
+            string? cameraSerialNumber = olympusMakernoteDirectory.GetDescription(OlympusMakernoteDirectory.TagSerialNumber1);
+            string? firmwareVersion = olympusMakernoteDirectory.GetDescription(OlympusMakernoteDirectory.TagBodyFirmwareVersion);
+            string? qualityAndFileFormat = olympusMakernoteDirectory.GetDescription(OlympusMakernoteDirectory.TagJpegQuality);
+            if (cameraSerialNumber is null && firmwareVersion is null && qualityAndFileFormat is null)
+                continue;
+            results.Add(new(cameraSerialNumber, firmwareVersion, qualityAndFileFormat));
+        }
+        IEnumerable<PanasonicMakernoteDirectory> panasonicMakernoteDirectories = directories.OfType<PanasonicMakernoteDirectory>();
+        foreach (PanasonicMakernoteDirectory panasonicMakernoteDirectory in panasonicMakernoteDirectories)
+        {
+            if (panasonicMakernoteDirectory.Tags.Count == 0)
+                continue;
+            string? cameraSerialNumber = panasonicMakernoteDirectory.GetDescription(PanasonicMakernoteDirectory.TagInternalSerialNumber);
+            string? firmwareVersion = panasonicMakernoteDirectory.GetDescription(PanasonicMakernoteDirectory.TagFirmwareVersion);
+            string? qualityAndFileFormat = panasonicMakernoteDirectory.GetDescription(PanasonicMakernoteDirectory.TagQualityMode);
+            if (cameraSerialNumber is null && firmwareVersion is null && qualityAndFileFormat is null)
+                continue;
+            results.Add(new(cameraSerialNumber, firmwareVersion, qualityAndFileFormat));
+        }
+        IEnumerable<SamsungType2MakernoteDirectory> samsungType2MakernoteDirectories = directories.OfType<SamsungType2MakernoteDirectory>();
+        foreach (SamsungType2MakernoteDirectory samsungType2MakernoteDirectory in samsungType2MakernoteDirectories)
+        {
+            if (samsungType2MakernoteDirectory.Tags.Count == 0)
+                continue;
+            string? cameraSerialNumber = samsungType2MakernoteDirectory.GetDescription(SamsungType2MakernoteDirectory.TagSerialNumber);
+            string? firmwareVersion = samsungType2MakernoteDirectory.GetDescription(SamsungType2MakernoteDirectory.TagFirmwareName);
+            string? qualityAndFileFormat = null;
+            if (cameraSerialNumber is null && firmwareVersion is null && qualityAndFileFormat is null)
+                continue;
+            results.Add(new(cameraSerialNumber, firmwareVersion, qualityAndFileFormat));
+        }
+        IEnumerable<SonyType6MakernoteDirectory> sonyType6MakernoteDirectories = directories.OfType<SonyType6MakernoteDirectory>();
+        foreach (SonyType6MakernoteDirectory sonyType6MakernoteDirectory in sonyType6MakernoteDirectories)
+        {
+            if (sonyType6MakernoteDirectory.Tags.Count == 0)
+                continue;
+            string? cameraSerialNumber = null;
+            string? firmwareVersion = null;
+            string? qualityAndFileFormat = null;
+            if (cameraSerialNumber is null && firmwareVersion is null && qualityAndFileFormat is null)
+                continue;
+            results.Add(new(cameraSerialNumber, firmwareVersion, qualityAndFileFormat));
+        }
+        return results.ToArray();
+    }
+
+    private static Shared.Models.PhotoshopDirectory[] GetPhotoshopDirectories(IReadOnlyList<MetadataExtractor.Directory> directories)
+    {
+        List<Shared.Models.PhotoshopDirectory> results = [];
+        IEnumerable<MetadataExtractor.Formats.Photoshop.PhotoshopDirectory> photoshopDirectories = directories.OfType<MetadataExtractor.Formats.Photoshop.PhotoshopDirectory>();
+        foreach (MetadataExtractor.Formats.Photoshop.PhotoshopDirectory photoshopDirectory in photoshopDirectories)
+        {
+            if (photoshopDirectory.Tags.Count == 0)
+                continue;
+            string? jpegQuality = photoshopDirectory.GetDescription(MetadataExtractor.Formats.Photoshop.PhotoshopDirectory.TagJpegQuality);
+            string? url = photoshopDirectory.GetDescription(MetadataExtractor.Formats.Photoshop.PhotoshopDirectory.TagUrl);
+            if (jpegQuality is null && url is null)
+                continue;
+            results.Add(new(jpegQuality, url));
+        }
+        return results.ToArray();
+    }
+
+    private static Shared.Models.PngDirectory[] GetPngDirectories(IReadOnlyList<MetadataExtractor.Directory> directories)
+    {
+        List<Shared.Models.PngDirectory> results = [];
+        IEnumerable<MetadataExtractor.Formats.Png.PngDirectory> pngDirectories = directories.OfType<MetadataExtractor.Formats.Png.PngDirectory>();
+        foreach (MetadataExtractor.Formats.Png.PngDirectory pngDirectory in pngDirectories)
+        {
+            if (pngDirectory.Tags.Count == 0)
+                continue;
             string? imageHeight = pngDirectory.GetDescription(MetadataExtractor.Formats.Png.PngDirectory.TagImageHeight);
             string? imageWidth = pngDirectory.GetDescription(MetadataExtractor.Formats.Png.PngDirectory.TagImageWidth);
-            result = new(imageHeight, imageWidth);
+            string? textualData = pngDirectory.GetDescription(MetadataExtractor.Formats.Png.PngDirectory.TagTextualData);
+            if (imageHeight is null && imageWidth is null && textualData is null)
+                continue;
+            results.Add(new(imageHeight, imageWidth, textualData));
         }
-        return result;
+        return results.ToArray();
     }
 
-    private static Shared.Models.QuickTimeMovieHeaderDirectory GetQuickTimeMovieHeaderDirectoryDirectory(IReadOnlyList<MetadataExtractor.Directory> directories)
+    private static Shared.Models.QuickTimeMovieHeaderDirectory[] GetQuickTimeMovieHeaderDirectoryDirectories(IReadOnlyList<MetadataExtractor.Directory> directories)
     {
-        Shared.Models.QuickTimeMovieHeaderDirectory result;
-        MetadataExtractor.Formats.QuickTime.QuickTimeMovieHeaderDirectory? aviDirectory = directories.OfType<MetadataExtractor.Formats.QuickTime.QuickTimeMovieHeaderDirectory>().FirstOrDefault();
-        if (aviDirectory is null)
-            result = new(null);
-        else
+        List<Shared.Models.QuickTimeMovieHeaderDirectory> results = [];
+        IEnumerable<MetadataExtractor.Formats.QuickTime.QuickTimeMovieHeaderDirectory> quickTimeMovieHeaderDirectories = directories.OfType<MetadataExtractor.Formats.QuickTime.QuickTimeMovieHeaderDirectory>();
+        foreach (MetadataExtractor.Formats.QuickTime.QuickTimeMovieHeaderDirectory quickTimeMovieHeaderDirectory in quickTimeMovieHeaderDirectories)
         {
+            if (quickTimeMovieHeaderDirectory.Tags.Count == 0)
+                continue;
             DateTime? created;
-            if (aviDirectory.TryGetDateTime(MetadataExtractor.Formats.QuickTime.QuickTimeMovieHeaderDirectory.TagCreated, out DateTime checkDateTime))
+            if (quickTimeMovieHeaderDirectory.TryGetDateTime(MetadataExtractor.Formats.QuickTime.QuickTimeMovieHeaderDirectory.TagCreated, out DateTime checkDateTime))
                 created = checkDateTime;
             else
-                created = GetDateTime(aviDirectory.GetString(MetadataExtractor.Formats.QuickTime.QuickTimeMovieHeaderDirectory.TagCreated));
-            result = new(created);
+                created = GetDateTime(quickTimeMovieHeaderDirectory.GetString(MetadataExtractor.Formats.QuickTime.QuickTimeMovieHeaderDirectory.TagCreated));
+            if (created is null)
+                continue;
+            results.Add(new(created));
         }
-        return result;
+        return results.ToArray();
     }
 
-    private static Shared.Models.QuickTimeTrackHeaderDirectory GetQuickTimeTrackHeaderDirectoryDirectory(IReadOnlyList<MetadataExtractor.Directory> directories)
+    private static Shared.Models.QuickTimeTrackHeaderDirectory[] GetQuickTimeTrackHeaderDirectoryDirectories(IReadOnlyList<MetadataExtractor.Directory> directories)
     {
-        Shared.Models.QuickTimeTrackHeaderDirectory result;
-        MetadataExtractor.Formats.QuickTime.QuickTimeTrackHeaderDirectory? aviDirectory = directories.OfType<MetadataExtractor.Formats.QuickTime.QuickTimeTrackHeaderDirectory>().FirstOrDefault();
-        if (aviDirectory is null)
-            result = new(null);
-        else
+        List<Shared.Models.QuickTimeTrackHeaderDirectory> results = [];
+        IEnumerable<MetadataExtractor.Formats.QuickTime.QuickTimeTrackHeaderDirectory> quickTimeTrackHeaderDirectories = directories.OfType<MetadataExtractor.Formats.QuickTime.QuickTimeTrackHeaderDirectory>();
+        foreach (MetadataExtractor.Formats.QuickTime.QuickTimeTrackHeaderDirectory quickTimeTrackHeaderDirectory in quickTimeTrackHeaderDirectories)
         {
+            if (quickTimeTrackHeaderDirectory.Tags.Count == 0)
+                continue;
             DateTime? created;
-            if (aviDirectory.TryGetDateTime(MetadataExtractor.Formats.QuickTime.QuickTimeTrackHeaderDirectory.TagCreated, out DateTime checkDateTime))
+            if (quickTimeTrackHeaderDirectory.TryGetDateTime(MetadataExtractor.Formats.QuickTime.QuickTimeTrackHeaderDirectory.TagCreated, out DateTime checkDateTime))
                 created = checkDateTime;
             else
-                created = GetDateTime(aviDirectory.GetString(MetadataExtractor.Formats.QuickTime.QuickTimeTrackHeaderDirectory.TagCreated));
-            result = new(created);
+                created = GetDateTime(quickTimeTrackHeaderDirectory.GetString(MetadataExtractor.Formats.QuickTime.QuickTimeTrackHeaderDirectory.TagCreated));
+            if (created is null)
+                continue;
+            results.Add(new(created));
         }
-        return result;
+        return results.ToArray();
     }
 
-    private static Shared.Models.WebPDirectory GetWebPDirectory(IReadOnlyList<MetadataExtractor.Directory> directories)
+    private static Shared.Models.WebPDirectory[] GetWebPDirectories(IReadOnlyList<MetadataExtractor.Directory> directories)
     {
-        Shared.Models.WebPDirectory result;
-        MetadataExtractor.Formats.WebP.WebPDirectory? WebPDirectory = directories.OfType<MetadataExtractor.Formats.WebP.WebPDirectory>().FirstOrDefault();
-        if (WebPDirectory is null)
-            result = new(null, null);
-        else
+        List<Shared.Models.WebPDirectory> results = [];
+        IEnumerable<MetadataExtractor.Formats.WebP.WebPDirectory> webPDirectories = directories.OfType<MetadataExtractor.Formats.WebP.WebPDirectory>();
+        foreach (MetadataExtractor.Formats.WebP.WebPDirectory webPDirectory in webPDirectories)
         {
-            string? imageHeight = WebPDirectory.GetDescription(MetadataExtractor.Formats.WebP.WebPDirectory.TagImageHeight);
-            string? imageWidth = WebPDirectory.GetDescription(MetadataExtractor.Formats.WebP.WebPDirectory.TagImageWidth);
-            result = new(imageHeight, imageWidth);
+            if (webPDirectory.Tags.Count == 0)
+                continue;
+            string? imageHeight = webPDirectory.GetDescription(MetadataExtractor.Formats.WebP.WebPDirectory.TagImageHeight);
+            string? imageWidth = webPDirectory.GetDescription(MetadataExtractor.Formats.WebP.WebPDirectory.TagImageWidth);
+            if (imageHeight is null && imageWidth is null)
+                continue;
+            results.Add(new(imageHeight, imageWidth));
         }
+        return results.ToArray();
+    }
+
+    private static Shared.Models.ExifDirectory Covert(Shared.Models.FilePath filePath, Shared.Models.DeterministicHashCode deterministicHashCode, System.Drawing.Size? size, IReadOnlyList<MetadataExtractor.Directory> directories)
+    {
+        Shared.Models.ExifDirectory result;
+        Shared.Models.AviDirectory[] aviDirectories = GetAviDirectories(directories);
+        Shared.Models.GpsDirectory[] gpsDirectories = GetGpsDirectories(directories);
+        Shared.Models.PngDirectory[] pngDirectories = GetPngDirectories(directories);
+        Shared.Models.JpegDirectory[] jpegDirectories = GetJpegDirectories(directories);
+        Shared.Models.WebPDirectory[] webPDirectories = GetWebPDirectories(directories);
+        Shared.Models.ExifDirectoryBase[] exifBaseDirectories = GetExifBaseDirectories(directories);
+        Shared.Models.GifHeaderDirectory[] gifHeaderDirectories = GetGifHeaderDirectories(directories);
+        Shared.Models.MakernoteDirectory[] MakernoteDirectories = GetMakernoteDirectories(directories);
+        Shared.Models.PhotoshopDirectory[] photoshopDirectories = GetPhotoshopDirectories(directories);
+        Shared.Models.FileMetadataDirectory[] fileMetadataDirectories = GetFileMetadataDirectories(filePath.FullName, directories);
+        Shared.Models.QuickTimeMovieHeaderDirectory[] quickTimeMovieHeaderDirectories = GetQuickTimeMovieHeaderDirectoryDirectories(directories);
+        Shared.Models.QuickTimeTrackHeaderDirectory[] quickTimeTrackHeaderDirectories = GetQuickTimeTrackHeaderDirectoryDirectories(directories);
+        result = new(aviDirectories,
+                     exifBaseDirectories,
+                     fileMetadataDirectories,
+                     gifHeaderDirectories,
+                     gpsDirectories,
+                     size?.Height,
+                     deterministicHashCode.Id ?? filePath.Id,
+                     jpegDirectories,
+                     MakernoteDirectories,
+                     filePath.Name,
+                     photoshopDirectories,
+                     pngDirectories,
+                     quickTimeMovieHeaderDirectories,
+                     quickTimeTrackHeaderDirectories,
+                     webPDirectories,
+                     size?.Width);
         return result;
     }
 
-    internal static Shared.Models.ExifDirectory Covert(Shared.Models.FilePath filePath, Shared.Models.DeterministicHashCode deterministicHashCode, System.Drawing.Size? size, IReadOnlyList<MetadataExtractor.Directory> directories)
+    internal static Shared.Models.ExifDirectory GetExifDirectory(Shared.Models.FilePath filePath, Shared.Models.DeterministicHashCode deterministicHashCode)
     {
-        Shared.Models.ExifDirectory results;
-        Shared.Models.AviDirectory aviDirectory = GetAviDirectory(directories);
-        Shared.Models.GpsDirectory gpsDirectory = GetGpsDirectory(directories);
-        Shared.Models.PngDirectory pngDirectory = GetPngDirectory(directories);
-        Shared.Models.JpegDirectory jpegDirectory = GetJpegDirectory(directories);
-        Shared.Models.WebPDirectory webPDirectory = GetWebPDirectory(directories);
-        Shared.Models.ExifDirectoryBase exifDirectoryBase = GetExifDirectoryBase(directories);
-        Shared.Models.GifHeaderDirectory gifHeaderDirectory = GetGifHeaderDirectory(directories);
-        Shared.Models.PhotoshopDirectory photoshopDirectory = GetPhotoshopDirectory(directories);
-        Shared.Models.FileMetadataDirectory fileMetadataDirectory = GetFileMetadataDirectory(filePath.FullName, directories);
-        Shared.Models.QuickTimeMovieHeaderDirectory quickTimeMovieHeaderDirectory = GetQuickTimeMovieHeaderDirectoryDirectory(directories);
-        Shared.Models.QuickTimeTrackHeaderDirectory quickTimeTrackHeaderDirectory = GetQuickTimeTrackHeaderDirectoryDirectory(directories);
-        results = new(aviDirectory,
-                      exifDirectoryBase,
-                      fileMetadataDirectory,
-                      gifHeaderDirectory,
-                      gpsDirectory,
-                      size?.Height,
-                      deterministicHashCode.Id ?? filePath.Id,
-                      jpegDirectory,
-                      filePath.Name,
-                      photoshopDirectory,
-                      pngDirectory,
-                      quickTimeMovieHeaderDirectory,
-                      quickTimeTrackHeaderDirectory,
-                      webPDirectory,
-                      size?.Width);
-        return results;
-    }
-
-    internal static string GetMaker(Shared.Models.ExifDirectoryBase exifDirectoryBase)
-    {
-        string result;
-        if (string.IsNullOrEmpty(exifDirectoryBase.Make))
-            result = "Unknown";
-        else
-            result = $"{exifDirectoryBase.Make[0].ToString().ToUpper()}{exifDirectoryBase.Make[1..]}".Trim();
+        Shared.Models.ExifDirectory? result;
+        System.Drawing.Size? size = Dimensions.GetDimensions(filePath.FullName);
+        IReadOnlyList<MetadataExtractor.Directory> directories = ImageMetadataReader.ReadMetadata(filePath.FullName);
+        result = Covert(filePath, deterministicHashCode, size, directories);
         return result;
     }
 

Metadata/Models/Stateless/Face.cs

@@ -0,0 +1,42 @@
+using View_by_Distance.Shared.Models;
+
+namespace View_by_Distance.Metadata.Models.Stateless.Methods;
+
+internal static class Face
+{
+
+    internal static string? GetFaceEncoding(PngDirectory[]? pngDirectories)
+    {
+        string? result = null;
+        if (pngDirectories is not null)
+        {
+            const string comment = "Comment:";
+            foreach (PngDirectory pngDirectory in pngDirectories)
+            {
+                if (pngDirectory.TextualData is null || !pngDirectory.TextualData.StartsWith(comment))
+                    continue;
+                result = pngDirectory.TextualData[comment.Length..];
+                break;
+            }
+        }
+        return result;
+    }
+
+    internal static string? GetOutputResolution(PngDirectory[]? pngDirectories)
+    {
+        string? result = null;
+        if (pngDirectories is not null)
+        {
+            const string artist = "Artist:";
+            foreach (PngDirectory pngDirectory in pngDirectories)
+            {
+                if (pngDirectory.TextualData is null || !pngDirectory.TextualData.StartsWith(artist))
+                    continue;
+                result = pngDirectory.TextualData[artist.Length..];
+                break;
+            }
+        }
+        return result;
+    }
+
+}

Metadata/Models/Stateless/GPS.cs

@@ -1,4 +1,6 @@
+using MetadataExtractor;
 using View_by_Distance.Metadata.Models.Stateless.Methods;
+using View_by_Distance.Shared.Models;
 
 namespace View_by_Distance.Metadata.Models.Stateless;
 
@@ -85,34 +87,36 @@ internal abstract class GPS
         return result;
     }
 
-    // internal static GeoLocation? GeoLocation(ReadOnlyDictionary<string, MetadataExtractorDirectory> metadataExtractorDirectories)
-    // {
-    //     GeoLocation? result;
-    //     if (!metadataExtractorDirectories.TryGetValue("GPS", out MetadataExtractorDirectory? metadataExtractorDirectory))
-    //         result = null;
-    //     else
-    //     {
-    //         MetadataExtractorTag? metadataExtractorTag;
-    //         if (!metadataExtractorDirectory.Tags.TryGetValue((int)Shared.Models.Stateless.IExif.Tags.GPSLatitude, out metadataExtractorTag) || string.IsNullOrEmpty(metadataExtractorTag.Description))
-    //             result = null;
-    //         else
-    //         {
-    //             string latitudeDMS = metadataExtractorTag.Description;
-    //             double latitude = ParseValueFromDmsString(latitudeDMS);
-    //             if (!metadataExtractorDirectory.Tags.TryGetValue((int)Shared.Models.Stateless.IExif.Tags.GPSLongitude, out metadataExtractorTag) || string.IsNullOrEmpty(metadataExtractorTag.Description))
-    //                 result = null;
-    //             else
-    //             {
-    //                 string longitudeDMS = metadataExtractorTag.Description;
-    //                 double longitude = ParseValueFromDmsString(longitudeDMS);
-    //                 result = new(latitude, longitude);
-    //                 string dms = result.ToDmsString();
-    //                 if ($"{latitudeDMS}, {longitudeDMS}" != dms)
-    //                     result = null;
-    //             }
-    //         }
-    //     }
-    //     return result;
-    // }
+    internal static GeoLocation? GeoLocation(GpsDirectory[]? gpsDirectories)
+    {
+        GeoLocation? result = null;
+        if (gpsDirectories is not null)
+        {
+            foreach (GpsDirectory gpsDirectory in gpsDirectories)
+            {
+                if (string.IsNullOrEmpty(gpsDirectory?.Latitude))
+                    result = null;
+                else
+                {
+                    string latitudeDMS = gpsDirectory.Latitude;
+                    double latitude = ParseValueFromDmsString(latitudeDMS);
+                    if (string.IsNullOrEmpty(gpsDirectory.Longitude))
+                        result = null;
+                    else
+                    {
+                        string longitudeDMS = gpsDirectory.Longitude;
+                        double longitude = ParseValueFromDmsString(longitudeDMS);
+                        result = new(latitude, longitude);
+                        string dms = result.ToDmsString();
+                        if ($"{latitudeDMS}, {longitudeDMS}" != dms)
+                            result = null;
+                    }
+                }
+                if (result is not null)
+                    break;
+            }
+        }
+        return result;
+    }
 
 }

Metadata/Models/Stateless/Methods/IMetadata.cs

@@ -1,3 +1,7 @@
+using MetadataExtractor;
+using System.Collections.ObjectModel;
+using View_by_Distance.Shared.Models;
+
 namespace View_by_Distance.Metadata.Models.Stateless.Methods;
 
 public interface IMetadata
@@ -11,10 +15,40 @@ public interface IMetadata
         Meters
     }
 
-    string TestStatic_GetMaker(Shared.Models.ExifDirectoryBase exifDirectoryBase) =>
-        GetMaker(exifDirectoryBase);
-    static string GetMaker(Shared.Models.ExifDirectoryBase exifDirectoryBase) =>
-        Exif.GetMaker(exifDirectoryBase);
+    ExifDirectory TestStatic_GetExifDirectory(FilePath filePath, DeterministicHashCode deterministicHashCode) =>
+        GetExifDirectory(filePath, deterministicHashCode);
+    static ExifDirectory GetExifDirectory(FilePath filePath, DeterministicHashCode deterministicHashCode) =>
+        Exif.GetExifDirectory(filePath, deterministicHashCode);
+
+    string? TestStatic_GetMaker(ExifDirectory? exifDirectory) =>
+        GetMaker(exifDirectory);
+    static string? GetMaker(ExifDirectory? exifDirectory) =>
+        Base.GetMaker(exifDirectory?.ExifBaseDirectories);
+
+    string? TestStatic_GetModel(ExifDirectory? exifDirectory) =>
+        GetModel(exifDirectory);
+    static string? GetModel(ExifDirectory? exifDirectory) =>
+        Base.GetModel(exifDirectory?.ExifBaseDirectories);
+
+    ReadOnlyCollection<string> TestStatic_GetKeywords(ExifDirectory? exifDirectory) =>
+        GetKeywords(exifDirectory);
+    static ReadOnlyCollection<string> GetKeywords(ExifDirectory? exifDirectory) =>
+        Base.GetKeywords(exifDirectory?.ExifBaseDirectories);
+
+    string? TestStatic_GetOutputResolution(ExifDirectory? exifDirectory) =>
+        GetOutputResolution(exifDirectory);
+    static string? GetOutputResolution(ExifDirectory? exifDirectory) =>
+        Face.GetOutputResolution(exifDirectory?.PngDirectories);
+
+    string? TestStatic_GetFaceEncoding(ExifDirectory? exifDirectory) =>
+        GetFaceEncoding(exifDirectory);
+    static string? GetFaceEncoding(ExifDirectory? exifDirectory) =>
+        Face.GetFaceEncoding(exifDirectory?.PngDirectories);
+
+    GeoLocation? TestStatic_GeoLocation(ExifDirectory? exifDirectory) =>
+        GeoLocation(exifDirectory);
+    static GeoLocation? GeoLocation(ExifDirectory? exifDirectory) =>
+        GPS.GeoLocation(exifDirectory?.GpsDirectories);
 
     double? TestStatic_GetDistance(double originLatitude, double originLongitude, double destinationLatitude, double destinationLongitude, int decimalPlaces = 1, DistanceUnit distanceUnit = DistanceUnit.Miles) =>
         GetDistance(originLatitude, originLongitude, destinationLatitude, destinationLongitude, decimalPlaces, distanceUnit);

Rename/AA.Rename.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
@@ -34,11 +34,11 @@
     <SupportedPlatform Include="browser" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="CliWrap" Version="3.6.4" />
-    <PackageReference Include="runtime.win-x64.Microsoft.DotNet.ILCompiler" Version="8.0.0-rc.2.23479.6" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="7.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="7.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Hosting" Version="7.0.1" />
+    <PackageReference Include="CliWrap" Version="3.6.6" />
+    <PackageReference Include="runtime.win-x64.Microsoft.DotNet.ILCompiler" Version="8.0.4" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="8.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.0" />
     <PackageReference Include="ShellProgressBar" Version="5.2.0" />
   </ItemGroup>
   <ItemGroup>

Rename/Models/Binder/AppSettings.cs

@@ -21,16 +21,16 @@ public class AppSettings
     {
         if (appSettings?.Company is null)
         {
+            List<string> paths = [];
             foreach (IConfigurationProvider configurationProvider in configurationRoot.Providers)
             {
                 if (configurationProvider is not Microsoft.Extensions.Configuration.Json.JsonConfigurationProvider jsonConfigurationProvider)
                     continue;
                 if (jsonConfigurationProvider.Source.FileProvider is not Microsoft.Extensions.FileProviders.PhysicalFileProvider physicalFileProvider)
                     continue;
-                if (!physicalFileProvider.Root.Contains("UserSecrets"))
-                    continue;
-                throw new NotSupportedException(physicalFileProvider.Root);
+                paths.Add(physicalFileProvider.Root);
             }
+            throw new NotSupportedException($"Not found!{Environment.NewLine}{string.Join(Environment.NewLine, paths.Distinct())}");
         }
     }
 

Rename/Models/Binder/RenameConfiguration.cs

@@ -7,8 +7,13 @@ namespace View_by_Distance.Rename.Models.Binder;
 public class RenameConfiguration
 {
 
+    public string? DefaultMaker { get; set; }
+    public bool? ForceNewId { get; set; }
     public string[]? IgnoreExtensions { get; set; }
+    public string? RelativePropertyCollectionFile { get; set; }
+    public bool? SkipIdFiles { get; set; }
     public string[]? ValidImageFormatExtensions { get; set; }
+    public string[]? ValidVideoFormatExtensions { get; set; }
 
     public override string ToString()
     {
@@ -18,18 +23,18 @@ public class RenameConfiguration
 
     private static void PreVerify(IConfigurationRoot configurationRoot, RenameConfiguration? configuration)
     {
-        if (configuration?.IgnoreExtensions is null)
+        if (configuration?.DefaultMaker is null)
         {
+            List<string> paths = [];
             foreach (IConfigurationProvider configurationProvider in configurationRoot.Providers)
             {
                 if (configurationProvider is not Microsoft.Extensions.Configuration.Json.JsonConfigurationProvider jsonConfigurationProvider)
                     continue;
                 if (jsonConfigurationProvider.Source.FileProvider is not Microsoft.Extensions.FileProviders.PhysicalFileProvider physicalFileProvider)
                     continue;
-                if (!physicalFileProvider.Root.Contains("UserSecrets"))
-                    continue;
-                throw new NotSupportedException(physicalFileProvider.Root);
+                paths.Add(physicalFileProvider.Root);
             }
+            throw new NotSupportedException($"Not found!{Environment.NewLine}{string.Join(Environment.NewLine, paths.Distinct())}");
         }
     }
 
@@ -37,18 +42,29 @@ public class RenameConfiguration
     {
         if (configuration.IgnoreExtensions is null || configuration.IgnoreExtensions.Length == 0) throw new NullReferenceException(nameof(configuration.IgnoreExtensions));
         if (configuration.ValidImageFormatExtensions is null || configuration.ValidImageFormatExtensions.Length == 0) throw new NullReferenceException(nameof(configuration.ValidImageFormatExtensions));
+        if (configuration.ValidVideoFormatExtensions is null || configuration.ValidVideoFormatExtensions.Length == 0) throw new NullReferenceException(nameof(configuration.ValidVideoFormatExtensions));
     }
 
     private static Models.RenameConfiguration Get(RenameConfiguration? configuration, Shared.Models.MetadataConfiguration metadataConfiguration)
     {
         Models.RenameConfiguration result;
         if (configuration is null) throw new NullReferenceException(nameof(configuration));
+        if (configuration.DefaultMaker is null) throw new NullReferenceException(nameof(configuration.DefaultMaker));
+        if (configuration.ForceNewId is null) throw new NullReferenceException(nameof(configuration.ForceNewId));
         if (configuration.IgnoreExtensions is null) throw new NullReferenceException(nameof(configuration.IgnoreExtensions));
+        if (configuration.RelativePropertyCollectionFile is null) throw new NullReferenceException(nameof(configuration.RelativePropertyCollectionFile));
+        if (configuration.SkipIdFiles is null) throw new NullReferenceException(nameof(configuration.SkipIdFiles));
         if (configuration.ValidImageFormatExtensions is null) throw new NullReferenceException(nameof(configuration.ValidImageFormatExtensions));
+        if (configuration.ValidVideoFormatExtensions is null) throw new NullReferenceException(nameof(configuration.ValidVideoFormatExtensions));
         Verify(configuration);
         result = new(metadataConfiguration,
+                     configuration.DefaultMaker,
+                     configuration.ForceNewId.Value,
                      configuration.IgnoreExtensions,
-                     configuration.ValidImageFormatExtensions);
+                     configuration.RelativePropertyCollectionFile,
+                     configuration.SkipIdFiles.Value,
+                     configuration.ValidImageFormatExtensions,
+                     configuration.ValidVideoFormatExtensions);
         return result;
     }
 

Rename/Models/Identifier.cs

@@ -0,0 +1,27 @@
+using System.Text.Json;
+using System.Text.Json.Serialization;
+
+namespace View_by_Distance.Rename.Models;
+
+internal record Identifier(int Id, string PaddedId)
+{
+
+    public override string ToString()
+    {
+        string result = JsonSerializer.Serialize(this, IdentifierSourceGenerationContext.Default.Identifier);
+        return result;
+    }
+
+}
+
+[JsonSourceGenerationOptions(WriteIndented = true)]
+[JsonSerializable(typeof(Identifier))]
+internal partial class IdentifierSourceGenerationContext : JsonSerializerContext
+{
+}
+
+[JsonSourceGenerationOptions(WriteIndented = true)]
+[JsonSerializable(typeof(Identifier[]))]
+internal partial class IdentifierCollectionSourceGenerationContext : JsonSerializerContext
+{
+}

Rename/Models/RenameConfiguration.cs

@@ -5,8 +5,13 @@ using System.Text.Json.Serialization;
 namespace View_by_Distance.Rename.Models;
 
 public record RenameConfiguration(Shared.Models.MetadataConfiguration MetadataConfiguration,
+                                  string DefaultMaker,
+                                  bool ForceNewId,
                                   string[] IgnoreExtensions,
-                                  string[] ValidImageFormatExtensions)
+                                  string RelativePropertyCollectionFile,
+                                  bool SkipIdFiles,
+                                  string[] ValidImageFormatExtensions,
+                                  string[] ValidVideoFormatExtensions) : Shared.Models.Properties.IRenameConfiguration
 {
 
     public override string ToString()

Rename/Rename.cs

@@ -3,25 +3,27 @@ using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.Logging;
 using ShellProgressBar;
 using System.Collections.ObjectModel;
+using System.Data;
 using System.Drawing;
 using System.Drawing.Imaging;
 using System.Runtime.InteropServices;
+using System.Text.Json;
 using View_by_Distance.Metadata.Models;
 using View_by_Distance.Metadata.Models.Stateless.Methods;
 using View_by_Distance.Rename.Models;
 using View_by_Distance.Shared.Models;
+using View_by_Distance.Shared.Models.Properties;
 using View_by_Distance.Shared.Models.Stateless.Methods;
 
 namespace View_by_Distance.Rename;
 
-public class Rename : IRename
+public partial class Rename : IRename
 {
 
-    private record ToDo(string? Directory, FileHolder FileHolder, string File, bool JsonFile);
-    private record Record(DateTime DateTime, ExifDirectory ExifDirectory, string File, string JsonFile);
+    private record ToDo(string? Directory, FilePath FilePath, string File, bool JsonFile);
+    private record Record(DateTime DateTime, ExifDirectory ExifDirectory, FilePath FilePath, bool HasDateTimeOriginal, bool HasIgnoreKeyword, string JsonFile);
 
-    private readonly AppSettings _AppSettings;
-    private readonly RenameConfiguration _RenameConfiguration;
+    private ProgressBar? _ProgressBar;
 
     public Rename(List<string> args, ILogger<Program>? logger, IConfigurationRoot configurationRoot, AppSettings appSettings, bool isSilent, IConsole console)
     {
@@ -31,55 +33,48 @@ public class Rename : IRename
             throw new NullReferenceException(nameof(args));
         if (console is null)
             throw new NullReferenceException(nameof(console));
-        _AppSettings = appSettings;
+        IRename rename = this;
         long ticks = DateTime.Now.Ticks;
         ResultConfiguration resultConfiguration = Metadata.Models.Binder.ResultConfiguration.Get(configurationRoot, appSettings.RequireRootDirectoryExists);
         MetadataConfiguration metadataConfiguration = Metadata.Models.Binder.MetadataConfiguration.Get(configurationRoot, resultConfiguration);
         RenameConfiguration renameConfiguration = Models.Binder.RenameConfiguration.Get(configurationRoot, metadataConfiguration);
-        _RenameConfiguration = renameConfiguration;
-        DirectoryInfo directoryInfo = new(Path.GetFullPath(resultConfiguration.RootDirectory));
-        logger?.LogInformation("{RootDirectory}", directoryInfo.FullName);
-        ReadOnlyCollection<Record> exifDirectories = GetExifDirectoryCollection(directoryInfo);
-        ReadOnlyCollection<ToDo> toDoCollection = GetToDoCollection(logger, ticks, exifDirectories);
-        ReadOnlyCollection<string> lines = RenameFilesInDirectories(toDoCollection);
-        if (lines.Count != 0)
-        {
-            File.WriteAllLines($"D:/Tmp/Phares/{DateTime.Now.Ticks}.tsv", lines);
-            _ = IPath.DeleteEmptyDirectories(directoryInfo.FullName);
-        }
+        RenameWork(logger, appSettings, rename, ticks, renameConfiguration);
     }
 
-    (ReadOnlyCollection<string>, FilePath?) IRename.ConvertAndGetFfmpegFiles(FilePath filePath)
+    void IRename.Tick() =>
+        _ProgressBar?.Tick();
+
+    ReadOnlyCollection<string> IRename.ConvertAndGetFfmpegFiles(IRenameConfiguration renameConfiguration, FilePath filePath)
     {
         List<string> results = [];
-        FilePath? result;
-        bool isIgnoreExtension;
-        bool isValidImageFormatExtension = _RenameConfiguration.ValidImageFormatExtensions.Contains(filePath.ExtensionLowered);
-        isIgnoreExtension = isValidImageFormatExtension && _RenameConfiguration.IgnoreExtensions.Contains(filePath.ExtensionLowered);
-        if (!isIgnoreExtension && isValidImageFormatExtension)
-            result = null;
-        else
+        bool isValidVideoFormatExtensions = renameConfiguration.ValidVideoFormatExtensions.Contains(filePath.ExtensionLowered);
+        if (isValidVideoFormatExtensions)
         {
-            CommandTask<CommandResult> commandTask = Cli.Wrap("ffmpeg.exe")
-                // .WithArguments(new[] { "-ss", "00:00:00", "-t", "00:00:00", "-i", files[i], "-qScale:v", "2", "-r", "0.01", $"{fileHolder.Name}-%4d.jpg" })
-                .WithArguments(new[] { "-i", filePath.FullName, "-vFrames", "1", $"{filePath.Name}-%4d.jpg" })
-                .WithWorkingDirectory(filePath.DirectoryName)
-                .ExecuteAsync();
-            commandTask.Task.Wait();
-            results.AddRange(Directory.GetFiles(filePath.DirectoryName, $"{filePath.Name}-*.jpg", SearchOption.TopDirectoryOnly));
-            if (results.Count == 0)
-                throw new Exception();
-            result = IId.GetFilePath(_RenameConfiguration.MetadataConfiguration, results[0]);
-            if (!result.Name.EndsWith("-0001.jpg"))
-                throw new Exception();
-            isValidImageFormatExtension = _RenameConfiguration.ValidImageFormatExtensions.Contains(result.ExtensionLowered);
-            isIgnoreExtension = isValidImageFormatExtension && _RenameConfiguration.IgnoreExtensions.Contains(result.ExtensionLowered);
-            if (isIgnoreExtension || !isValidImageFormatExtension)
-                throw new Exception();
-            if (result.DirectoryName is null)
-                throw new NullReferenceException(nameof(result.DirectoryName));
+            bool check;
+            try
+            {
+                CommandTask<CommandResult> commandTask = Cli.Wrap("ffmpeg.exe")
+                    .WithArguments(new[] { "-i", filePath.FullName, "-vf", "select=eq(n\\,0)", "-q:v", "1", $"{filePath.Name}-%4d.jpg" })
+                    .WithWorkingDirectory(filePath.DirectoryName)
+                    .ExecuteAsync();
+                commandTask.Task.Wait();
+                check = true;
+            }
+            catch (Exception)
+            {
+                check = false;
+            }
+            if (check)
+            {
+                results.AddRange(Directory.GetFiles(filePath.DirectoryName, $"{filePath.Name}-*.jpg", SearchOption.TopDirectoryOnly));
+                if (results.Count == 0)
+                    throw new Exception();
+                File.SetCreationTime(results[0], new(filePath.CreationTicks));
+                File.SetLastWriteTime(results[0], new(filePath.LastWriteTicks));
+                Thread.Sleep(100);
+            }
         }
-        return new(new(results), result);
+        return new(results);
     }
 
 #pragma warning disable CA1416
@@ -117,120 +112,197 @@ public class Rename : IRename
 
 #pragma warning restore CA1416
 
-    private void GetExifDirectoryCollection(IRename rename, List<(string, FileInfo, ExifDirectory)> exifDirectories, IEnumerable<string> files, A_Metadata metadata)
+    private static void RenameUrl(FilePath filePath)
     {
-        FileInfo fileInfo;
-        FilePath filePath;
-        FilePath? ffmpegFilePath;
-        ExifDirectory exifDirectory;
-        ReadOnlyCollection<string> ffmpegFiles;
-        DeterministicHashCode deterministicHashCode;
-        foreach (string file in files)
+        string[] lines = File.ReadAllLines(filePath.FullName);
+        if (lines.Length == 1)
         {
-            filePath = IId.GetFilePath(_RenameConfiguration.MetadataConfiguration, file);
-            if (filePath.ExtensionLowered is ".paddedId" or ".lsv")
-                continue;
-            if (files.Contains($"{filePath.FullName}.paddedId"))
-                continue;
-            if (filePath.Id is not null && (filePath.IsIdFormat || filePath.IsPaddedIdFormat))
-                continue;
-            (ffmpegFiles, ffmpegFilePath) = rename.ConvertAndGetFfmpegFiles(filePath);
-            if (ffmpegFilePath is not null)
-                filePath = ffmpegFilePath;
-            if (filePath.Id is not null)
-                deterministicHashCode = new(null, filePath.Id, null);
-            else
-                deterministicHashCode = rename.GetDeterministicHashCode(filePath);
-            (fileInfo, exifDirectory) = metadata.GetMetadataCollection(_RenameConfiguration.MetadataConfiguration, filePath, deterministicHashCode);
-            exifDirectories.Add(new(file, fileInfo, exifDirectory));
-            foreach (string ffmpegFile in ffmpegFiles)
-                File.Delete(ffmpegFile);
+            FileHolder fileHolder = new(lines[0]);
+            if (fileHolder.Exists)
+            {
+                string checkFile;
+                checkFile = IId.GetIgnoreFullPath(filePath, fileHolder);
+                if (lines[0] == checkFile || lines[0].Length != checkFile.Length)
+                    throw new NotSupportedException();
+                File.Move(lines[0], checkFile);
+            }
+            File.Delete(filePath.FullName);
         }
     }
 
-    private static ReadOnlyCollection<Record> GetExifDirectoryCollection(List<(string, FileInfo, ExifDirectory)> exifDirectories)
+    private static List<(FilePath, FileInfo, ExifDirectory)> GetExifDirectoryCollection(IRename rename, RenameConfiguration renameConfiguration, IEnumerable<string> files, A_Metadata metadata)
+    {
+        List<(FilePath, FileInfo, ExifDirectory)> results = [];
+        int index = -1;
+        FileInfo fileInfo;
+        FilePath filePath;
+        FileHolder fileHolder;
+        FilePath? ffmpegFilePath;
+        ExifDirectory exifDirectory;
+        ReadOnlyCollection<string>? ffmpegFiles;
+        DeterministicHashCode deterministicHashCode;
+        foreach (string file in files)
+        {
+            index += 1;
+            rename.Tick();
+            fileHolder = new(file);
+            if (renameConfiguration.IgnoreExtensions.Contains(fileHolder.ExtensionLowered))
+                continue;
+            filePath = FilePath.Get(renameConfiguration.MetadataConfiguration, fileHolder, index);
+            if (filePath.ExtensionLowered == ".url" && filePath.Id is not null)
+            {
+                RenameUrl(filePath);
+                continue;
+            }
+            if (renameConfiguration.SkipIdFiles && filePath.Id is not null && (filePath.IsIntelligentIdFormat || filePath.SortOrder is not null))
+                continue;
+            if (!renameConfiguration.ForceNewId && filePath.Id is not null)
+            {
+                ffmpegFiles = null;
+                deterministicHashCode = new(null, filePath.Id, null);
+            }
+            else
+            {
+                ffmpegFiles = rename.ConvertAndGetFfmpegFiles(renameConfiguration, filePath);
+                ffmpegFilePath = ffmpegFiles.Count == 0 ? null : FilePath.Get(renameConfiguration.MetadataConfiguration, new(ffmpegFiles[0]), index);
+                deterministicHashCode = ffmpegFilePath is null ? rename.GetDeterministicHashCode(filePath) : rename.GetDeterministicHashCode(ffmpegFilePath);
+            }
+            (fileInfo, exifDirectory) = metadata.GetMetadataCollection(renameConfiguration.MetadataConfiguration, filePath, deterministicHashCode);
+            results.Add(new(filePath, fileInfo, exifDirectory));
+            if (ffmpegFiles is not null)
+            {
+                foreach (string ffmpegFile in ffmpegFiles)
+                    File.Delete(ffmpegFile);
+            }
+        }
+        return results;
+    }
+
+    private static ReadOnlyCollection<Record> GetExifDirectoryCollection(MetadataConfiguration metadataConfiguration, List<(FilePath, FileInfo, ExifDirectory)> exifDirectories)
     {
         List<Record> results = [];
         DateTime? dateTime;
-        foreach ((string file, FileInfo fileInfo, ExifDirectory exifDirectory) in exifDirectories)
+        bool hasIgnoreKeyword;
+        bool hasDateTimeOriginal;
+        ReadOnlyCollection<string> keywords;
+        foreach ((FilePath filePath, FileInfo fileInfo, ExifDirectory exifDirectory) in exifDirectories)
         {
             dateTime = IDate.GetDateTimeOriginal(exifDirectory);
+            hasDateTimeOriginal = dateTime is not null;
             dateTime ??= IDate.GetMinimum(exifDirectory);
-            results.Add(new(dateTime.Value, exifDirectory, file, fileInfo.FullName));
+            keywords = IMetadata.GetKeywords(exifDirectory);
+            hasIgnoreKeyword = metadataConfiguration.IgnoreRulesKeyWords.Any(l => keywords.Contains(l));
+            results.Add(new(dateTime.Value, exifDirectory, filePath, hasDateTimeOriginal, hasIgnoreKeyword, fileInfo.FullName));
         }
         return new(results);
     }
 
-    private ReadOnlyCollection<Record> GetExifDirectoryCollection(DirectoryInfo directoryInfo)
+    private ReadOnlyCollection<Record> GetExifDirectoryCollection(IRename rename, AppSettings appSettings, RenameConfiguration renameConfiguration, DirectoryInfo directoryInfo)
     {
         ReadOnlyCollection<Record> results;
-        IRename rename = this;
-        List<(string, FileInfo, ExifDirectory)> exifDirectories = [];
-        int appSettingsMaxDegreeOfParallelism = _AppSettings.MaxDegreeOfParallelism;
-        IEnumerable<string> files = Directory.EnumerateFiles(directoryInfo.FullName, "*", SearchOption.AllDirectories);
-        A_Metadata metadata = new(_RenameConfiguration.MetadataConfiguration);
+        List<(FilePath, FileInfo, ExifDirectory)> exifDirectories = [];
+        A_Metadata metadata = new(renameConfiguration.MetadataConfiguration);
+        int appSettingsMaxDegreeOfParallelism = appSettings.MaxDegreeOfParallelism;
+        IEnumerable<string> files = appSettingsMaxDegreeOfParallelism == 1 ? Directory.GetFiles(directoryInfo.FullName, "*", SearchOption.AllDirectories) : Directory.EnumerateFiles(directoryInfo.FullName, "*", SearchOption.AllDirectories);
+        int filesCount = appSettingsMaxDegreeOfParallelism == 1 ? files.Count() : 123000;
+        _ProgressBar = new(filesCount, "EnumerateFiles load", new ProgressBarOptions() { ProgressCharacter = '─', ProgressBarOnBottom = true, DisableBottomPercentage = true });
         if (appSettingsMaxDegreeOfParallelism == 1)
-            GetExifDirectoryCollection(rename, exifDirectories, files, metadata);
+            exifDirectories.AddRange(GetExifDirectoryCollection(rename, renameConfiguration, files, metadata));
         else
         {
             ParallelOptions parallelOptions = new() { MaxDegreeOfParallelism = appSettingsMaxDegreeOfParallelism };
-            ProgressBar progressBar = new(123000, "EnumerateFiles load", new ProgressBarOptions() { ProgressCharacter = '─', ProgressBarOnBottom = true, DisableBottomPercentage = true });
-            files.AsParallel().ForAll(A_Metadata.SetExifDirectoryCollection(rename, _RenameConfiguration.MetadataConfiguration, metadata, exifDirectories, () => progressBar.Tick()));
-            if (progressBar.CurrentTick != exifDirectories.Count)
+            files.AsParallel().ForAll(A_Metadata.SetExifDirectoryCollection(rename, renameConfiguration, metadata, exifDirectories));
+            if (_ProgressBar.CurrentTick != exifDirectories.Count)
                 throw new NotSupportedException();
         }
-        results = GetExifDirectoryCollection(exifDirectories);
+        _ProgressBar.Dispose();
+        results = GetExifDirectoryCollection(renameConfiguration.MetadataConfiguration, exifDirectories);
         return results;
     }
 
-    private static void VerifyIntMinValueLength(ReadOnlyCollection<Record> exifDirectories, int intMinValueLength)
+    private static void VerifyIntMinValueLength(MetadataConfiguration metadataConfiguration, ReadOnlyCollection<Record> exifDirectories)
     {
-        foreach ((DateTime _, ExifDirectory exifDirectory, string _, string _) in exifDirectories)
+        foreach ((DateTime _, ExifDirectory exifDirectory, FilePath _, bool _, bool _, string _) in exifDirectories)
         {
             if (exifDirectory.Id is null)
                 continue;
-            if (intMinValueLength < exifDirectory.Id.Value.ToString().Length)
+            if (metadataConfiguration.IntMinValueLength < exifDirectory.Id.Value.ToString().Length)
                 throw new NotSupportedException();
         }
     }
 
-    private ReadOnlyCollection<ToDo> GetToDoCollection(ILogger<Program>? logger, long ticks, ReadOnlyCollection<Record> exifDirectories)
+    private static string? GetCheckDirectory(RenameConfiguration renameConfiguration, Record record, FilePath filePath, ReadOnlyCollection<int> ids, bool multipleDirectoriesWithFiles)
+    {
+        string? result;
+        if (filePath.DirectoryName is null)
+            throw new NullReferenceException(nameof(filePath.DirectoryName));
+        string year = record.DateTime.Year.ToString();
+        string checkDirectoryName = Path.GetFileName(filePath.DirectoryName);
+        if (multipleDirectoriesWithFiles && !checkDirectoryName.Contains(year))
+            result = null;
+        else
+        {
+            string? maker = IMetadata.GetMaker(record.ExifDirectory);
+            (int seasonValue, string seasonName) = IDate.GetSeason(record.DateTime.DayOfYear);
+            string splat = filePath.DirectoryName[^3..][1] == '!' ? filePath.DirectoryName[^3..] : string.Empty;
+            string makerSplit = string.IsNullOrEmpty(maker) ? string.IsNullOrEmpty(renameConfiguration.DefaultMaker) ? string.Empty : renameConfiguration.DefaultMaker : $" {maker.Split(' ')[0]}";
+            string directoryName = $"{year}.{seasonValue} {seasonName}{makerSplit}{splat}";
+            result = Path.Combine(renameConfiguration.MetadataConfiguration.ResultConfiguration.RootDirectory, record.ExifDirectory.Id is null || !ids.Contains(record.ExifDirectory.Id.Value) ? "_ Destination _" : "_ Exists _", record.HasDateTimeOriginal ? "Has" : "Not", directoryName);
+        }
+        return result;
+    }
+
+    private static ReadOnlyCollection<ToDo> GetToDoCollection(RenameConfiguration renameConfiguration, Identifier[]? identifiers, ReadOnlyCollection<Record> records)
     {
         List<ToDo> results = [];
-        int season;
-        string maker;
         Record record;
         string jsonFile;
         string paddedId;
         string checkFile;
-        string seasonName;
+        FilePath filePath;
         string directoryName;
         FileHolder fileHolder;
         string? checkDirectory;
         const string jpg = ".jpg";
         string checkFileExtension;
+        bool multipleDirectoriesWithFiles;
         List<string> distinct = [];
+        bool? directoryCheck = null;
         const string jpeg = ".jpeg";
         string jsonFileSubDirectory;
-        int intMinValueLength = int.MinValue.ToString().Length;
-        VerifyIntMinValueLength(exifDirectories, intMinValueLength);
-        ReadOnlyCollection<Record> records = new((from l in exifDirectories orderby l.DateTime select l).ToArray());
-        for (int i = 0; i < records.Count; i++)
+        foreach (string directory in Directory.GetDirectories(renameConfiguration.MetadataConfiguration.ResultConfiguration.RootDirectory, "*", SearchOption.TopDirectoryOnly))
         {
-            record = records[i];
+            foreach (string _ in Directory.EnumerateFiles(directory, "*", SearchOption.AllDirectories))
+            {
+                if (directoryCheck is null)
+                    directoryCheck = false;
+                else if (directoryCheck.Value)
+                    directoryCheck = true;
+                break;
+            }
+            if (directoryCheck is not null && directoryCheck.Value)
+                break;
+        }
+        VerifyIntMinValueLength(renameConfiguration.MetadataConfiguration, records);
+        multipleDirectoriesWithFiles = directoryCheck is not null && directoryCheck.Value;
+        ReadOnlyCollection<Record> collection = new((from l in records orderby l.DateTime select l).ToArray());
+        ResultConfiguration resultConfiguration = renameConfiguration.MetadataConfiguration.ResultConfiguration;
+        ReadOnlyCollection<int> ids = identifiers is null ? new([]) : new((from l in identifiers select l.Id).ToArray());
+        for (int i = 0; i < collection.Count; i++)
+        {
+            record = collection[i];
             if (record.ExifDirectory.Id is null)
                 continue;
-            fileHolder = new(record.File);
-            if (fileHolder.DirectoryName is null)
+            if (record.FilePath.DirectoryName is null)
                 continue;
-            maker = IMetadata.GetMaker(record.ExifDirectory.ExifDirectoryBase);
-            (season, seasonName) = IDate.GetSeason(record.DateTime.DayOfYear);
-            checkFileExtension = fileHolder.ExtensionLowered == jpeg ? jpg : fileHolder.ExtensionLowered;
-            checkDirectory = Path.Combine(fileHolder.DirectoryName, $"{record.DateTime.Year}.{season} {seasonName}{maker}");
+            checkDirectory = GetCheckDirectory(renameConfiguration, record, record.FilePath, ids, multipleDirectoriesWithFiles);
+            if (string.IsNullOrEmpty(checkDirectory))
+                continue;
+            checkFileExtension = record.FilePath.ExtensionLowered == jpeg ? jpg : record.FilePath.ExtensionLowered;
+            paddedId = IId.GetPaddedId(renameConfiguration.MetadataConfiguration, record.ExifDirectory.Id.Value, record.HasIgnoreKeyword, i);
             jsonFileSubDirectory = Path.GetDirectoryName(Path.GetDirectoryName(record.JsonFile)) ?? throw new Exception();
-            paddedId = IId.GetPaddedId(intMinValueLength, _RenameConfiguration.MetadataConfiguration.Offset + i, record.ExifDirectory.Id.Value);
             checkFile = Path.Combine(checkDirectory, $"{paddedId}{checkFileExtension}");
-            if (checkFile == fileHolder.FullName)
+            if (checkFile == record.FilePath.FullName)
                 continue;
             if (File.Exists(checkFile))
             {
@@ -238,14 +310,18 @@ public class Rename : IRename
                 if (File.Exists(checkFile))
                     continue;
             }
-            (directoryName, _) = IPath.GetDirectoryNameAndIndex(_RenameConfiguration.MetadataConfiguration.ResultConfiguration, record.ExifDirectory.Id.Value);
+            (directoryName, _) = IPath.GetDirectoryNameAndIndex(resultConfiguration, record.ExifDirectory.Id.Value);
             jsonFile = Path.Combine(jsonFileSubDirectory, directoryName, $"{record.ExifDirectory.Id.Value}{checkFileExtension}.json");
             if (record.JsonFile != jsonFile)
-                results.Add(new(null, new(record.JsonFile), jsonFile, JsonFile: true));
+            {
+                fileHolder = new(record.JsonFile);
+                filePath = FilePath.Get(renameConfiguration.MetadataConfiguration, fileHolder, index: null);
+                results.Add(new(null, filePath, jsonFile, JsonFile: true));
+            }
             if (distinct.Contains(checkFile))
                 continue;
             distinct.Add(checkFile);
-            results.Add(new(checkDirectory, fileHolder, checkFile, JsonFile: false));
+            results.Add(new(checkDirectory, record.FilePath, checkFile, JsonFile: false));
         }
         return new(results);
     }
@@ -267,13 +343,15 @@ public class Rename : IRename
     {
         List<string> results = [];
         VerifyDirectories(toDoCollection);
+        _ProgressBar = new(toDoCollection.Count, "Move Files", new ProgressBarOptions() { ProgressCharacter = '─', ProgressBarOnBottom = true, DisableBottomPercentage = true });
         foreach (ToDo toDo in toDoCollection)
         {
+            _ProgressBar.Tick();
             if (toDo.JsonFile)
             {
                 if (File.Exists(toDo.File))
                     File.Delete(toDo.File);
-                File.Move(toDo.FileHolder.FullName, toDo.File);
+                File.Move(toDo.FilePath.FullName, toDo.File);
             }
             else if (toDo.Directory is null)
                 throw new NotSupportedException();
@@ -281,11 +359,51 @@ public class Rename : IRename
             {
                 if (File.Exists(toDo.File))
                     File.Delete(toDo.File);
-                File.Move(toDo.FileHolder.FullName, toDo.File);
-                results.Add($"{toDo.FileHolder.FullName}\t{toDo.File}");
+                try
+                { File.Move(toDo.FilePath.FullName, toDo.File); }
+                catch (Exception)
+                { continue; }
+                results.Add($"{toDo.FilePath.FullName}\t{toDo.File}");
             }
         }
+        _ProgressBar.Dispose();
         return new(results);
     }
 
+    private static void SaveIdentifiersToDisk(long ticks, RenameConfiguration renameConfiguration, string aMetadataCollectionDirectory, ReadOnlyCollection<Record> records)
+    {
+        string paddedId;
+        List<Identifier> identifiers = [];
+        foreach (Record record in records)
+        {
+            if (record.ExifDirectory.Id is null)
+                continue;
+            paddedId = IId.GetPaddedId(renameConfiguration.MetadataConfiguration, record.ExifDirectory.Id.Value, record.FilePath.IsIgnore, index: null);
+            identifiers.Add(new(record.ExifDirectory.Id.Value, paddedId));
+        }
+        string json = JsonSerializer.Serialize(identifiers.OrderBy(l => l.PaddedId).ToArray(), IdentifierCollectionSourceGenerationContext.Default.IdentifierArray);
+        _ = IPath.WriteAllText(Path.Combine(aMetadataCollectionDirectory, $"{ticks}.json"), json, updateDateWhenMatches: false, compareBeforeWrite: true, updateToWhenMatches: null);
+    }
+
+    private void RenameWork(ILogger<Program>? logger, AppSettings appSettings, IRename rename, long ticks, RenameConfiguration renameConfiguration)
+    {
+        string aMetadataCollectionDirectory = IResult.GetResultsDateGroupDirectory(renameConfiguration.MetadataConfiguration.ResultConfiguration, nameof(A_Metadata), renameConfiguration.MetadataConfiguration.ResultConfiguration.ResultCollection);
+        string? propertyCollectionFile = string.IsNullOrEmpty(renameConfiguration.RelativePropertyCollectionFile) ? null : Path.GetFullPath(Path.Combine(aMetadataCollectionDirectory, renameConfiguration.RelativePropertyCollectionFile));
+        string? json = !File.Exists(propertyCollectionFile) ? null : File.ReadAllText(propertyCollectionFile);
+        Identifier[]? identifiers = json is null ? null : JsonSerializer.Deserialize(json, IdentifierCollectionSourceGenerationContext.Default.IdentifierArray);
+        if (identifiers is null && !string.IsNullOrEmpty(renameConfiguration.RelativePropertyCollectionFile))
+            throw new Exception($"Invalid {nameof(renameConfiguration.RelativePropertyCollectionFile)}");
+        DirectoryInfo directoryInfo = new(Path.GetFullPath(renameConfiguration.MetadataConfiguration.ResultConfiguration.RootDirectory));
+        logger?.LogInformation("{Ticks} {RootDirectory}", ticks, directoryInfo.FullName);
+        ReadOnlyCollection<Record> records = GetExifDirectoryCollection(rename, appSettings, renameConfiguration, directoryInfo);
+        SaveIdentifiersToDisk(ticks, renameConfiguration, aMetadataCollectionDirectory, records);
+        ReadOnlyCollection<ToDo> toDoCollection = GetToDoCollection(renameConfiguration, identifiers, records);
+        ReadOnlyCollection<string> lines = RenameFilesInDirectories(toDoCollection);
+        if (lines.Count != 0)
+        {
+            File.WriteAllLines($"D:/Tmp/Phares/{DateTime.Now.Ticks}.tsv", lines);
+            _ = IPath.DeleteEmptyDirectories(directoryInfo.FullName);
+        }
+    }
+
 }

Shared/AA.Shared.csproj

@@ -32,7 +32,7 @@
         <SupportedPlatform Include="browser" />
     </ItemGroup>
     <ItemGroup>
-        <PackageReference Include="System.Drawing.Common" Version="7.0.0" />
-        <PackageReference Include="System.Text.Json" Version="7.0.3" />
+        <PackageReference Include="System.Drawing.Common" Version="8.0.4" />
+        <PackageReference Include="System.Text.Json" Version="8.0.3" />
     </ItemGroup>
 </Project>

Shared/Models/ExifDirectory.cs

@@ -3,20 +3,21 @@ using System.Text.Json.Serialization;
 
 namespace View_by_Distance.Shared.Models;
 
-public record ExifDirectory(AviDirectory AviDirectory,
-                            ExifDirectoryBase ExifDirectoryBase,
-                            FileMetadataDirectory FileMetadataDirectory,
-                            GifHeaderDirectory GifHeaderDirectory,
-                            GpsDirectory GpsDirectory,
+public record ExifDirectory(AviDirectory[] AviDirectories,
+                            ExifDirectoryBase[] ExifBaseDirectories,
+                            FileMetadataDirectory[] FileMetadataDirectories,
+                            GifHeaderDirectory[] GifHeaderDirectories,
+                            GpsDirectory[] GpsDirectories,
                             int? Height,
                             int? Id,
-                            JpegDirectory JpegDirectory,
+                            JpegDirectory[] JpegDirectories,
+                            MakernoteDirectory[] MakernoteDirectories,
                             string OriginalFileName,
-                            PhotoshopDirectory PhotoshopDirectory,
-                            PngDirectory PngDirectory,
-                            QuickTimeMovieHeaderDirectory QuickTimeMovieHeaderDirectory,
-                            QuickTimeTrackHeaderDirectory QuickTimeTrackHeaderDirectory,
-                            WebPDirectory WebPDirectory,
+                            PhotoshopDirectory[] PhotoshopDirectories,
+                            PngDirectory[] PngDirectories,
+                            QuickTimeMovieHeaderDirectory[] QuickTimeMovieHeaderDirectories,
+                            QuickTimeTrackHeaderDirectory[] QuickTimeTrackHeaderDirectories,
+                            WebPDirectory[] WebPDirectories,
                             int? Width)
 {
 
@@ -28,7 +29,7 @@ public record ExifDirectory(AviDirectory AviDirectory,
 
 }
 
-[JsonSourceGenerationOptions(WriteIndented = true)]
+[JsonSourceGenerationOptions(WriteIndented = true, DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull)]
 [JsonSerializable(typeof(ExifDirectory))]
 public partial class ExifDirectorySourceGenerationContext : JsonSerializerContext
 {

Shared/Models/FileHolder.cs

@@ -45,7 +45,6 @@ public class FileHolder
     {
         if (fileInfo.Exists)
         {
-            _CreationTime = fileInfo.CreationTime;
             _CreationTime = fileInfo.CreationTime;
             _LastWriteTime = fileInfo.LastWriteTime;
             _Length = fileInfo.Length;

Shared/Models/FilePath.cs

@@ -1,16 +1,22 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
+using View_by_Distance.Shared.Models.Stateless.Methods;
 
 namespace View_by_Distance.Shared.Models;
 
-public record FilePath(string DirectoryName,
+public record FilePath(long CreationTicks,
+                       string DirectoryName,
                        string ExtensionLowered,
+                       string FileNameFirstSegment,
                        string FullName,
                        int? Id,
-                       bool IsIdFormat,
-                       bool IsPaddedIdFormat,
+                       bool? IsIgnore,
+                       bool IsIntelligentIdFormat,
+                       long LastWriteTicks,
+                       long Length,
                        string Name,
-                       string NameWithoutExtension)
+                       string NameWithoutExtension,
+                       int? SortOrder)
 {
 
     public override string ToString()
@@ -19,6 +25,63 @@ public record FilePath(string DirectoryName,
         return result;
     }
 
+    public static FilePath Get(MetadataConfiguration metadataConfiguration, FileHolder fileHolder, int? index)
+    {
+        if (fileHolder.CreationTime is null)
+            fileHolder = new(fileHolder.FullName);
+        if (fileHolder.CreationTime is null)
+            throw new NullReferenceException(nameof(fileHolder.CreationTime));
+        if (fileHolder.LastWriteTime is null)
+            throw new NullReferenceException(nameof(fileHolder.LastWriteTime));
+        if (fileHolder.Length is null)
+            throw new NullReferenceException(nameof(fileHolder.Length));
+        FilePath result;
+        int? id;
+        int? sortOder;
+        string fileNameFirstSegment = fileHolder.Name.Split('.')[0];
+        int sortOrderOnlyLengthIndex = metadataConfiguration.Offset.ToString().Length;
+        string fileDirectoryName = fileHolder.DirectoryName ?? throw new NullReferenceException();
+        bool isIntelligentIdFormat = IId.NameWithoutExtensionIsIntelligentIdFormat(metadataConfiguration, fileNameFirstSegment);
+        bool isPaddedIntelligentIdFormat = IId.NameWithoutExtensionIsPaddedIntelligentIdFormat(metadataConfiguration, sortOrderOnlyLengthIndex, fileNameFirstSegment);
+        bool fileNameFirstSegmentIsIdFormat = !isPaddedIntelligentIdFormat && !isIntelligentIdFormat && IId.NameWithoutExtensionIsIdFormat(metadataConfiguration, fileHolder);
+        bool? isIgnore = !isIntelligentIdFormat && !isPaddedIntelligentIdFormat ? null : fileNameFirstSegment[^1] is '2' or '8';
+        if (!fileNameFirstSegmentIsIdFormat && !isIntelligentIdFormat && !isPaddedIntelligentIdFormat)
+            (id, sortOder) = (null, null);
+        else if (isIntelligentIdFormat)
+            (id, sortOder) = (IId.GetId(metadataConfiguration, fileNameFirstSegment), null);
+        else if (isPaddedIntelligentIdFormat)
+        {
+            if (!int.TryParse(fileNameFirstSegment[..sortOrderOnlyLengthIndex], out int absoluteValueOfSortOrder))
+                (id, sortOder) = (null, null);
+            else
+                (id, sortOder) = (IId.GetId(metadataConfiguration, fileNameFirstSegment[sortOrderOnlyLengthIndex..]), absoluteValueOfSortOrder);
+        }
+        else if (fileNameFirstSegmentIsIdFormat)
+        {
+            if (index is null)
+                throw new NullReferenceException(nameof(index));
+            if (!int.TryParse(fileNameFirstSegment, out int valueOfFileNameFirstSegment))
+                throw new NotSupportedException();
+            (id, sortOder) = (valueOfFileNameFirstSegment, metadataConfiguration.Offset + index);
+        }
+        else
+            throw new NotSupportedException();
+        result = new(fileHolder.CreationTime.Value.Ticks,
+                     fileDirectoryName,
+                     fileHolder.ExtensionLowered,
+                     fileNameFirstSegment,
+                     fileHolder.FullName,
+                     id,
+                     isIgnore,
+                     isIntelligentIdFormat,
+                     fileHolder.LastWriteTime.Value.Ticks,
+                     fileHolder.Length.Value,
+                     fileHolder.Name,
+                     fileHolder.NameWithoutExtension,
+                     sortOder);
+        return result;
+    }
+
 }
 
 [JsonSourceGenerationOptions(WriteIndented = true)]

Shared/Models/MakernoteDirectory.cs

@@ -0,0 +1,23 @@
+using System.Text.Json;
+using System.Text.Json.Serialization;
+
+namespace View_by_Distance.Shared.Models;
+
+public record MakernoteDirectory(string? CameraSerialNumber,
+                                 string? FirmwareVersion,
+                                 string? QualityAndFileFormat)
+{
+
+    public override string ToString()
+    {
+        string result = JsonSerializer.Serialize(this, MakernoteDirectorySourceGenerationContext.Default.MakernoteDirectory);
+        return result;
+    }
+
+}
+
+[JsonSourceGenerationOptions(WriteIndented = true)]
+[JsonSerializable(typeof(MakernoteDirectory))]
+public partial class MakernoteDirectorySourceGenerationContext : JsonSerializerContext
+{
+}

Shared/Models/MappingFromFilter.cs

@@ -0,0 +1,25 @@
+using System.Text.Json;
+using System.Text.Json.Serialization;
+
+namespace View_by_Distance.Shared.Models;
+
+public record MappingFromFilter(bool? IsFocusModel,
+                                bool? IsFocusPerson,
+                                bool? IsFocusRelativePath,
+                                bool? InSkipCollection,
+                                bool? IsUsed)
+{
+
+    public override string ToString()
+    {
+        string result = JsonSerializer.Serialize(this, MappingFromFilterGenerationContext.Default.MappingFromFilter);
+        return result;
+    }
+
+}
+
+[JsonSourceGenerationOptions(WriteIndented = true)]
+[JsonSerializable(typeof(MappingFromFilter))]
+public partial class MappingFromFilterGenerationContext : JsonSerializerContext
+{
+}

Shared/Models/MetadataConfiguration.cs

@@ -6,6 +6,7 @@ namespace View_by_Distance.Shared.Models;
 public record MetadataConfiguration(ResultConfiguration ResultConfiguration,
                                     bool ForceMetadataLastWriteTimeToCreationTime,
                                     string[] IgnoreRulesKeyWords,
+                                    int IntMinValueLength,
                                     int Offset,
                                     bool PropertiesChangedForMetadata)
 {

Shared/Models/PngDirectory.cs

@@ -4,7 +4,8 @@ using System.Text.Json.Serialization;
 namespace View_by_Distance.Shared.Models;
 
 public record PngDirectory(string? ImageHeight,
-                           string? ImageWidth)
+                           string? ImageWidth,
+                           string? TextualData)
 {
 
     public override string ToString()

Shared/Models/Properties/IRenameConfiguration.cs

@@ -0,0 +1,12 @@
+namespace View_by_Distance.Shared.Models.Properties;
+
+public interface IRenameConfiguration
+{
+
+    public MetadataConfiguration MetadataConfiguration { init; get; }
+    public string[] IgnoreExtensions { init; get; }
+    public bool SkipIdFiles { init; get; }
+    public string[] ValidImageFormatExtensions { init; get; }
+    public string[] ValidVideoFormatExtensions { init; get; }
+
+}

Shared/Models/Stateless/Id.cs

@@ -1,3 +1,4 @@
+using System.Text;
 using View_by_Distance.Shared.Models.Stateless.Methods;
 
 namespace View_by_Distance.Shared.Models.Stateless;
@@ -5,71 +6,76 @@ namespace View_by_Distance.Shared.Models.Stateless;
 internal abstract class Id
 {
 
-    internal static bool NameWithoutExtensionIsIdFormat(string fileNameWithoutExtension)
+    internal static bool NameWithoutExtensionIsIdFormat(MetadataConfiguration metadataConfiguration, string fileNameFirstSegment)
     {
         bool result;
-        int intMinValueLength = int.MinValue.ToString().Length;
-        if (fileNameWithoutExtension.Length < 5 || fileNameWithoutExtension.Length > intMinValueLength)
+        if (fileNameFirstSegment.Length < 5 || fileNameFirstSegment.Length > metadataConfiguration.IntMinValueLength)
             result = false;
         else
         {
-            bool skipOneAllAreNumbers = fileNameWithoutExtension[1..].All(l => char.IsNumber(l));
-            result = (skipOneAllAreNumbers && fileNameWithoutExtension[0] == '-') || (skipOneAllAreNumbers && char.IsNumber(fileNameWithoutExtension[0]));
+            bool skipOneAllAreNumbers = fileNameFirstSegment[1..].All(char.IsNumber);
+            result = (skipOneAllAreNumbers && fileNameFirstSegment[0] == '-') || (skipOneAllAreNumbers && char.IsNumber(fileNameFirstSegment[0]));
         }
         return result;
     }
 
-    internal static FilePath GetFilePath(FilePath filePath, string file)
+    internal static int GetId(MetadataConfiguration metadataConfiguration, string intelligentId)
     {
-        FilePath result;
-        string fileName = Path.GetFileName(file);
-        string fileExtensionLowered = Path.GetExtension(file).ToLower();
-        result = new(filePath.DirectoryName, fileExtensionLowered, file, filePath.Id, filePath.IsIdFormat, filePath.IsPaddedIdFormat, fileName, filePath.NameWithoutExtension);
+        int result;
+        StringBuilder results = new();
+        if (metadataConfiguration.IntMinValueLength < (metadataConfiguration.ResultConfiguration.ResultAllInOneSubdirectoryLength + 2))
+            throw new NotSupportedException();
+        for (int i = intelligentId.Length - (metadataConfiguration.ResultConfiguration.ResultAllInOneSubdirectoryLength + 2); i > -1; i--)
+            _ = results.Append(intelligentId[i]);
+        _ = results.Append(intelligentId[^3]).Append(intelligentId[^2]);
+        result = int.Parse(results.ToString());
+        if (intelligentId[^1] is '1' or '2')
+            result *= -1;
+        else if (intelligentId[^1] is not '9' and not '8')
+            throw new NotSupportedException();
         return result;
     }
 
-    internal static FilePath GetFilePath(MetadataConfiguration metadataConfiguration, string file)
+    internal static string GetIntelligentId(MetadataConfiguration metadataConfiguration, long id, bool? ignore)
     {
-        FilePath result;
-        int? id;
-        short? multiplier;
-        char negativeMarker;
-        int absoluteValueOfId;
-        string fileName = Path.GetFileName(file);
-        string fileExtensionLowered = Path.GetExtension(file).ToLower();
-        string fileNameWithoutExtension = Path.GetFileNameWithoutExtension(file);
-        string fileDirectoryName = Path.GetDirectoryName(file) ?? throw new NullReferenceException();
-        short sortOrderOnlyLengthIndex = IId.GetSortOrderOnlyLengthIndex(metadataConfiguration.Offset);
-        bool nameWithoutExtensionIsIdFormat = IId.NameWithoutExtensionIsIdFormat(fileNameWithoutExtension);
-        bool nameWithoutExtensionIsPaddedIdFormat = IId.NameWithoutExtensionIsPaddedIdFormat(fileNameWithoutExtension, sortOrderOnlyLengthIndex);
-        if (!nameWithoutExtensionIsIdFormat && !nameWithoutExtensionIsPaddedIdFormat)
-            id = null;
-        else if (nameWithoutExtensionIsIdFormat)
+        string result;
+        StringBuilder stringBuilder = new();
+        if (metadataConfiguration.IntMinValueLength < (metadataConfiguration.ResultConfiguration.ResultAllInOneSubdirectoryLength + 2))
+            throw new NotSupportedException();
+        int key;
+        string value;
+        List<char> resultAllInOneSubdirectoryChars = [];
+        if (id > -1)
         {
-            if (!int.TryParse(fileNameWithoutExtension, out absoluteValueOfId))
-                id = null;
-            else
-                id = absoluteValueOfId;
+            key = ignore is not null && ignore.Value ? 8 : 9;
+            value = id.ToString().PadLeft(metadataConfiguration.IntMinValueLength, '0');
         }
         else
         {
-            negativeMarker = fileNameWithoutExtension[sortOrderOnlyLengthIndex - 2];
-            if (negativeMarker == '7')
-                multiplier = 1;
-            else if (negativeMarker == '3')
-                multiplier = -1;
-            else
-                multiplier = null;
-            if (!int.TryParse(fileNameWithoutExtension[sortOrderOnlyLengthIndex..], out absoluteValueOfId))
-                id = null;
-            else
-            {
-                id = absoluteValueOfId * multiplier;
-                if (id is null || !fileNameWithoutExtension.EndsWith(id.Value.ToString()[1..]))
-                    id = null;
-            }
+            key = ignore is not null && ignore.Value ? 2 : 1;
+            value = id.ToString()[1..].PadLeft(metadataConfiguration.IntMinValueLength, '0');
+        }
+        for (int i = value.Length - metadataConfiguration.ResultConfiguration.ResultAllInOneSubdirectoryLength - 1; i > -1; i--)
+            _ = stringBuilder.Append(value[i]);
+        for (int i = value.Length - metadataConfiguration.ResultConfiguration.ResultAllInOneSubdirectoryLength; i < value.Length; i++)
+            resultAllInOneSubdirectoryChars.Add(value[i]);
+        result = $"{stringBuilder}{string.Join(string.Empty, resultAllInOneSubdirectoryChars)}{key}";
+        return result;
+    }
+
+    internal static string GetPaddedId(MetadataConfiguration metadataConfiguration, int id, bool? ignore, int? index)
+    {
+        string result;
+        if (metadataConfiguration.Offset < 0)
+            result = Guid.NewGuid().ToString();
+        else
+        {
+            string intelligentId = GetIntelligentId(metadataConfiguration, id, ignore);
+            int check = GetId(metadataConfiguration, intelligentId);
+            if (check != id)
+                throw new NotSupportedException();
+            result = index is null || metadataConfiguration.Offset == IId.DeterministicHashCode ? intelligentId : $"{metadataConfiguration.Offset + index}{intelligentId}";
         }
-        result = new(fileDirectoryName, fileExtensionLowered, file, id, nameWithoutExtensionIsIdFormat, nameWithoutExtensionIsPaddedIdFormat, fileName, fileNameWithoutExtension);
         return result;
     }
 

Shared/Models/Stateless/Methods/IId.cs

@@ -3,43 +3,55 @@ namespace View_by_Distance.Shared.Models.Stateless.Methods;
 public interface IId
 {
 
-    bool TestStatic_NameWithoutExtensionIsIdFormat(string fileNameWithoutExtension) =>
-        NameWithoutExtensionIsIdFormat(fileNameWithoutExtension);
-    static bool NameWithoutExtensionIsIdFormat(string fileNameWithoutExtension) =>
-        Id.NameWithoutExtensionIsIdFormat(fileNameWithoutExtension);
+    const int DeterministicHashCode = 9876543;
 
-    bool TestStatic_NameWithoutExtensionIsIdFormat(FileHolder fileHolder) =>
-        NameWithoutExtensionIsIdFormat(fileHolder);
-    static bool NameWithoutExtensionIsIdFormat(FileHolder fileHolder) =>
-        NameWithoutExtensionIsIdFormat(fileHolder.NameWithoutExtension);
+    static bool IsOffsetDeterministicHashCode(MetadataConfiguration metadataConfiguration) =>
+        metadataConfiguration.Offset == DeterministicHashCode;
 
-    string TestStatic_GetPaddedId(int intMinValueLength, int index, int id) =>
-        GetPaddedId(intMinValueLength, index, id);
-    static string GetPaddedId(int intMinValueLength, int index, int id) =>
-        id > -1 ? $"{index}070{id.ToString().PadLeft(intMinValueLength, '0')}" : $"{index}030{id.ToString()[1..].PadLeft(intMinValueLength, '0')}";
+    string TestStatic_GetIntelligentId(MetadataConfiguration metadataConfiguration, long id, bool ignore) =>
+        GetIntelligentId(metadataConfiguration, id, ignore);
+    static string GetIntelligentId(MetadataConfiguration metadataConfiguration, long id, bool ignore) =>
+        Id.GetIntelligentId(metadataConfiguration, id, ignore);
 
-    bool TestStatic_NameWithoutExtensionIsPaddedIdFormat(string fileNameWithoutExtension, short sortOrderOnlyLengthIndex) =>
-        NameWithoutExtensionIsPaddedIdFormat(fileNameWithoutExtension, sortOrderOnlyLengthIndex);
-    static bool NameWithoutExtensionIsPaddedIdFormat(string fileNameWithoutExtension, short sortOrderOnlyLengthIndex) =>
-        fileNameWithoutExtension.Length > sortOrderOnlyLengthIndex
-        && fileNameWithoutExtension[sortOrderOnlyLengthIndex] == '0'
-        && fileNameWithoutExtension[sortOrderOnlyLengthIndex - 3] == '0'
-        && fileNameWithoutExtension.All(l => char.IsNumber(l));
+    int TestStatic_GetId(MetadataConfiguration metadataConfiguration, string intelligentId) =>
+        GetId(metadataConfiguration, intelligentId);
+    static int GetId(MetadataConfiguration metadataConfiguration, string intelligentId) =>
+        Id.GetId(metadataConfiguration, intelligentId);
 
-    short TestStatic_GetSortOrderOnlyLengthIndex(int offset) =>
-        GetSortOrderOnlyLengthIndex(offset);
-    static short GetSortOrderOnlyLengthIndex(int offset) =>
-       (short)(offset.ToString().Length + 3);
+    string TestStatic_GetPaddedId(MetadataConfiguration metadataConfiguration, int id, bool? ignore, int? index) =>
+        GetPaddedId(metadataConfiguration, id, ignore, index);
+    static string GetPaddedId(MetadataConfiguration metadataConfiguration, int id, bool? ignore, int? index) =>
+        Id.GetPaddedId(metadataConfiguration, id, ignore, index);
 
-    FilePath TestStatic_GetFilePath(FilePath filePath, string file) =>
-        GetFilePath(filePath, file);
-    static FilePath GetFilePath(FilePath filePath, string file) =>
-        Id.GetFilePath(filePath, file);
+    string TestStatic_GetIgnoreFullPath(FilePath filePath, FileHolder fileHolder) =>
+        GetIgnoreFullPath(filePath, fileHolder);
+    static string GetIgnoreFullPath(FilePath filePath, FileHolder fileHolder) =>
+        fileHolder.DirectoryName is null ?
+            throw new NotSupportedException() :
+            filePath.Id > -1 ?
+                fileHolder.NameWithoutExtension[^1] == '9' ?
+                    Path.Combine(fileHolder.DirectoryName, $"{fileHolder.NameWithoutExtension[..^1]}8{fileHolder.ExtensionLowered}") :
+                    throw new NotSupportedException("High") :
+                fileHolder.NameWithoutExtension[^1] == '1' ?
+                    Path.Combine(fileHolder.DirectoryName, $"{fileHolder.NameWithoutExtension[..^1]}2{fileHolder.ExtensionLowered}") :
+                    throw new NotSupportedException("Low");
 
-    FilePath TestStatic_GetFilePath(MetadataConfiguration metadataConfiguration, string file) =>
-        GetFilePath(metadataConfiguration, file);
-    static FilePath GetFilePath(MetadataConfiguration metadataConfiguration, string file) =>
-        Id.GetFilePath(metadataConfiguration, file);
+    bool TestStatic_NameWithoutExtensionIsIntelligentIdFormat(MetadataConfiguration metadataConfiguration, string fileNameFirstSegment) =>
+        NameWithoutExtensionIsIntelligentIdFormat(metadataConfiguration, fileNameFirstSegment);
+    static bool NameWithoutExtensionIsIntelligentIdFormat(MetadataConfiguration metadataConfiguration, string fileNameFirstSegment) =>
+        fileNameFirstSegment.Length - 1 == metadataConfiguration.IntMinValueLength && fileNameFirstSegment[^1] is '1' or '2' or '8' or '9' && fileNameFirstSegment.All(char.IsNumber);
+
+    bool TestStatic_NameWithoutExtensionIsPaddedIntelligentIdFormat(MetadataConfiguration metadataConfiguration, int sortOrderOnlyLengthIndex, string fileNameFirstSegment) =>
+        NameWithoutExtensionIsPaddedIntelligentIdFormat(metadataConfiguration, sortOrderOnlyLengthIndex, fileNameFirstSegment);
+    static bool NameWithoutExtensionIsPaddedIntelligentIdFormat(MetadataConfiguration metadataConfiguration, int sortOrderOnlyLengthIndex, string fileNameFirstSegment) =>
+        fileNameFirstSegment.Length == metadataConfiguration.IntMinValueLength + sortOrderOnlyLengthIndex + 1
+        && fileNameFirstSegment[^1] is '1' or '2' or '8' or '9'
+        && fileNameFirstSegment.All(char.IsNumber);
+
+    bool TestStatic_NameWithoutExtensionIsIdFormat(MetadataConfiguration metadataConfiguration, FileHolder fileHolder) =>
+        NameWithoutExtensionIsIdFormat(metadataConfiguration, fileHolder);
+    static bool NameWithoutExtensionIsIdFormat(MetadataConfiguration metadataConfiguration, FileHolder fileHolder) =>
+        Id.NameWithoutExtensionIsIdFormat(metadataConfiguration, fileHolder.NameWithoutExtension.Split('.')[0]);
 
     int TestStatic_GetDeterministicHashCode(byte[] value) =>
         GetDeterministicHashCode(value);

Shared/Models/Stateless/Methods/IPath.cs

@@ -76,9 +76,9 @@ public interface IPath
     static (string, int) GetDirectoryNameAndIndex(ResultConfiguration resultConfiguration, int id) =>
         XPath.GetDirectoryNameAndIndex(resultConfiguration, id);
 
-    ReadOnlyDictionary<int, ReadOnlyDictionary<string, string[]>> TestStatic_GetKeyValuePairs(ResultConfiguration resultConfiguration, string? resultsFullGroupDirectory, string[]? directories) =>
-        GetKeyValuePairs(resultConfiguration, resultsFullGroupDirectory, directories);
-    static ReadOnlyDictionary<int, ReadOnlyDictionary<string, string[]>> GetKeyValuePairs(ResultConfiguration resultConfiguration, string? resultsFullGroupDirectory, string[]? directories) =>
-        XPath.GetKeyValuePairs(resultConfiguration, resultsFullGroupDirectory, directories);
+    ReadOnlyDictionary<int, ReadOnlyDictionary<string, string[]>> TestStatic_GetKeyValuePairs(ResultConfiguration resultConfiguration, string? resultsFullGroupDirectory, string[]? jsonGroups) =>
+        GetKeyValuePairs(resultConfiguration, resultsFullGroupDirectory, jsonGroups);
+    static ReadOnlyDictionary<int, ReadOnlyDictionary<string, string[]>> GetKeyValuePairs(ResultConfiguration resultConfiguration, string? resultsFullGroupDirectory, string[]? jsonGroups) =>
+        XPath.GetKeyValuePairs(resultConfiguration, resultsFullGroupDirectory, jsonGroups);
 
 }

Shared/Models/Stateless/Methods/IRename.cs

@@ -1,11 +1,13 @@
 using System.Collections.ObjectModel;
+using View_by_Distance.Shared.Models.Properties;
 
 namespace View_by_Distance.Shared.Models.Stateless.Methods;
 
 public interface IRename
 {
 
-    (ReadOnlyCollection<string>, FilePath?) ConvertAndGetFfmpegFiles(FilePath filePath);
+    ReadOnlyCollection<string> ConvertAndGetFfmpegFiles(IRenameConfiguration renameConfiguration, FilePath filePath);
     DeterministicHashCode GetDeterministicHashCode(FilePath filePath);
+    void Tick();
 
 }

Shared/Models/Stateless/XDate.cs

@@ -54,14 +54,34 @@ internal abstract class XDate
     {
         DateTime? result;
         List<DateTime> results = [];
-        if (exifDirectory.ExifDirectoryBase.DateTimeOriginal is not null)
-            results.Add(exifDirectory.ExifDirectoryBase.DateTimeOriginal.Value);
-        if (exifDirectory.AviDirectory.DateTimeOriginal is not null)
-            results.Add(exifDirectory.AviDirectory.DateTimeOriginal.Value);
-        if (exifDirectory.QuickTimeMovieHeaderDirectory.Created is not null)
-            results.Add(exifDirectory.QuickTimeMovieHeaderDirectory.Created.Value);
-        if (exifDirectory.QuickTimeTrackHeaderDirectory.Created is not null)
-            results.Add(exifDirectory.QuickTimeTrackHeaderDirectory.Created.Value);
+        foreach (ExifDirectoryBase exifDirectoryBase in exifDirectory.ExifBaseDirectories)
+        {
+            if (exifDirectoryBase.DateTimeOriginal is not null)
+                results.Add(exifDirectoryBase.DateTimeOriginal.Value);
+        }
+        foreach (AviDirectory aviDirectory in exifDirectory.AviDirectories)
+        {
+            if (aviDirectory.DateTimeOriginal is not null)
+                results.Add(aviDirectory.DateTimeOriginal.Value);
+        }
+        foreach (QuickTimeMovieHeaderDirectory quickTimeMovieHeaderDirectory in exifDirectory.QuickTimeMovieHeaderDirectories)
+        {
+            if (quickTimeMovieHeaderDirectory.Created is not null)
+            {
+                if (quickTimeMovieHeaderDirectory.Created.Value.Year == 1904 && quickTimeMovieHeaderDirectory.Created.Value.Month == 1 && quickTimeMovieHeaderDirectory.Created.Value.Day == 1)
+                    continue;
+                results.Add(quickTimeMovieHeaderDirectory.Created.Value);
+            }
+        }
+        foreach (QuickTimeTrackHeaderDirectory quickTimeTrackHeaderDirectory in exifDirectory.QuickTimeTrackHeaderDirectories)
+        {
+            if (quickTimeTrackHeaderDirectory.Created is not null)
+            {
+                if ((quickTimeTrackHeaderDirectory.Created.Value.Year is 1904 or 1970) && quickTimeTrackHeaderDirectory.Created.Value.Month == 1 && quickTimeTrackHeaderDirectory.Created.Value.Day == 1)
+                    continue;
+                results.Add(quickTimeTrackHeaderDirectory.Created.Value);
+            }
+        }
         result = results.Count == 0 ? null : results.Min();
         return result;
     }
@@ -121,27 +141,56 @@ internal abstract class XDate
     {
         DateTime result;
         List<DateTime> results = [];
-        if (exifDirectory.ExifDirectoryBase.DateTimeOriginal is not null)
-            results.Add(exifDirectory.ExifDirectoryBase.DateTimeOriginal.Value);
-        if (exifDirectory.AviDirectory.DateTimeOriginal is not null)
-            results.Add(exifDirectory.AviDirectory.DateTimeOriginal.Value);
-        if (exifDirectory.QuickTimeMovieHeaderDirectory.Created is not null)
-            results.Add(exifDirectory.QuickTimeMovieHeaderDirectory.Created.Value);
-        if (exifDirectory.QuickTimeTrackHeaderDirectory.Created is not null)
-            results.Add(exifDirectory.QuickTimeTrackHeaderDirectory.Created.Value);
+        foreach (ExifDirectoryBase exifDirectoryBase in exifDirectory.ExifBaseDirectories)
+        {
+            if (exifDirectoryBase.DateTimeOriginal is not null)
+                results.Add(exifDirectoryBase.DateTimeOriginal.Value);
+        }
+        foreach (AviDirectory aviDirectory in exifDirectory.AviDirectories)
+        {
+            if (aviDirectory.DateTimeOriginal is not null)
+                results.Add(aviDirectory.DateTimeOriginal.Value);
+        }
+        foreach (QuickTimeMovieHeaderDirectory quickTimeMovieHeaderDirectory in exifDirectory.QuickTimeMovieHeaderDirectories)
+        {
+            if (quickTimeMovieHeaderDirectory.Created is not null)
+            {
+                if (quickTimeMovieHeaderDirectory.Created.Value.Year == 1904 && quickTimeMovieHeaderDirectory.Created.Value.Month == 1 && quickTimeMovieHeaderDirectory.Created.Value.Day == 1)
+                    continue;
+                results.Add(quickTimeMovieHeaderDirectory.Created.Value);
+            }
+        }
+        foreach (QuickTimeTrackHeaderDirectory quickTimeTrackHeaderDirectory in exifDirectory.QuickTimeTrackHeaderDirectories)
+        {
+            if (quickTimeTrackHeaderDirectory.Created is not null)
+            {
+                if ((quickTimeTrackHeaderDirectory.Created.Value.Year is 1904 or 1970) && quickTimeTrackHeaderDirectory.Created.Value.Month == 1 && quickTimeTrackHeaderDirectory.Created.Value.Day == 1)
+                    continue;
+                results.Add(quickTimeTrackHeaderDirectory.Created.Value);
+            }
+        }
         if (results.Count == 0)
         {
             string fileNameWithoutExtension = Path.GetFileNameWithoutExtension(exifDirectory.OriginalFileName);
             DateTime? dateTime = GetDateTimeFromName(fileNameWithoutExtension);
             if (dateTime is not null)
                 results.Add(dateTime.Value);
-            if (exifDirectory.ExifDirectoryBase.DateTime is not null)
-                results.Add(exifDirectory.ExifDirectoryBase.DateTime.Value);
-            if (exifDirectory.ExifDirectoryBase.DateTimeDigitized is not null)
-                results.Add(exifDirectory.ExifDirectoryBase.DateTimeDigitized.Value);
+            foreach (ExifDirectoryBase exifDirectoryBase in exifDirectory.ExifBaseDirectories)
+            {
+                if (exifDirectoryBase.DateTime is not null)
+                    results.Add(exifDirectoryBase.DateTime.Value);
+                if (exifDirectoryBase.DateTimeDigitized is not null)
+                    results.Add(exifDirectoryBase.DateTimeDigitized.Value);
+            }
+        }
+        if (results.Count == 0)
+        {
+            foreach (FileMetadataDirectory fileMetadataDirectory in exifDirectory.FileMetadataDirectories)
+            {
+                if (fileMetadataDirectory.FileModifiedDate is not null)
+                    results.Add(fileMetadataDirectory.FileModifiedDate.Value);
+            }
         }
-        if (results.Count == 0 && exifDirectory.FileMetadataDirectory.FileModifiedDate is not null)
-            results.Add(exifDirectory.FileMetadataDirectory.FileModifiedDate.Value);
         result = results.Count == 0 ? DateTime.MinValue : results.Min();
         return result;
     }

Shared/Models/Stateless/XPath.cs

@@ -324,7 +324,7 @@ internal abstract class XPath
         return new(results);
     }
 
-    internal static ReadOnlyDictionary<int, ReadOnlyDictionary<string, string[]>> GetKeyValuePairs(ResultConfiguration resultConfiguration, string? resultsFullGroupDirectory, string[]? directories)
+    internal static ReadOnlyDictionary<int, ReadOnlyDictionary<string, string[]>> GetKeyValuePairs(ResultConfiguration resultConfiguration, string? resultsFullGroupDirectory, string[]? jsonGroups)
     {
         Dictionary<int, Dictionary<string, string[]>> results = [];
         string directory;
@@ -339,16 +339,16 @@ internal abstract class XPath
             results.Add(year, []);
             if (!results.TryGetValue(year, out keyValuePairs))
                 throw new NullReferenceException(nameof(keyValuePairs));
-            if (directories is not null)
+            if (jsonGroups is not null)
             {
-                foreach (string key in directories)
+                foreach (string jsonGroup in jsonGroups)
                 {
                     if (resultsFullGroupDirectory is null)
                         continue;
                     collection.Clear();
                     for (int i = 0; i < plusOne; i++)
                     {
-                        if (string.IsNullOrEmpty(key))
+                        if (string.IsNullOrEmpty(jsonGroup))
                         {
                             if (i == converted)
                                 checkDirectory = Path.GetFullPath(Path.Combine(resultsFullGroupDirectory, new('-', resultConfiguration.ResultAllInOneSubdirectoryLength)));
@@ -357,7 +357,7 @@ internal abstract class XPath
                         }
                         else
                         {
-                            directory = Path.Combine(resultsFullGroupDirectory, key, year.ToString());
+                            directory = Path.Combine(resultsFullGroupDirectory, jsonGroup);
                             if (i == converted)
                                 checkDirectory = Path.GetFullPath(Path.Combine(directory, new('-', resultConfiguration.ResultAllInOneSubdirectoryLength)));
                             else
@@ -367,8 +367,8 @@ internal abstract class XPath
                             _ = Directory.CreateDirectory(checkDirectory);
                         collection.Add(checkDirectory);
                     }
-                    if (!string.IsNullOrEmpty(key))
-                        keyValuePairs.Add(key, collection.ToArray());
+                    if (!string.IsNullOrEmpty(jsonGroup))
+                        keyValuePairs.Add(jsonGroup, collection.ToArray());
                     else
                         keyValuePairs.Add(year.ToString(), collection.ToArray());
                 }

Shared/Models/Stateless/XResult.cs

@@ -25,13 +25,13 @@ internal abstract class XResult
         return result;
     }
 
-    private static void VerifyDirectories(ResultConfiguration resultConfiguration, string dateGroupDirectory, string key)
+    private static void VerifyDirectories(ResultConfiguration resultConfiguration, string dateGroupDirectory, string jsonGroup)
     {
         string checkDirectory;
         int currentYear = DateTime.Now.Year;
         for (int i = resultConfiguration.EpicYear; i < currentYear + 1; i++)
         {
-            checkDirectory = Path.Combine(dateGroupDirectory, key, i.ToString());
+            checkDirectory = Path.Combine(dateGroupDirectory, jsonGroup, i.ToString());
             if (!Directory.Exists(checkDirectory))
                 _ = Directory.CreateDirectory(checkDirectory);
         }