Not tested

Video Merge as 4, 5, and 6

.gitignore

@@ -470,4 +470,7 @@ globalStorage/
 Shared/.kanbn
 
 .Immich/immich-assets.json
+Tests/.vscode/.UserSecrets/*
 Instance/.vscode/.UserSecrets/*
+Drag-Drop-Set-Property-Item/.vscode/.UserSecrets/*
+TestsWithFaceRecognitionDotNet/.vscode/.UserSecrets/*

.vscode/mklink.md

@@ -13,3 +13,19 @@ mklink /J "D:\1-Images-A\Images-4083e56a-Results\A2)People\4083e56a\{}\!" "D:\1-
 ```bash
 mklink /J "L:\Git\View-by-Distance-MKLink-Console\.Immich" "D:\1-Images-A\Images-c9dbce3b-Results\F)Immich\c9dbce3b\{}"
 ```
+
+```bash 1740946894364 = 638765436943640000 = 2025-0.Winter = Sun Mar 02 2025 13:21:33 GMT-0700 (Mountain Standard Time)
+mklink /J "V:\Tmp\Phares\Pictures-Results" "V:\6-Other-Large-Z\Current-Results-Test"
+mklink /J "V:\1-Images-A\Images-0b793904-Results" "V:\6-Other-Large-Z\Current-Results"
+```
+
+```bash 1742827407172 = 638784242071720000 = 2025-1.Spring = Mon Mar 24 2025 07:43:26 GMT-0700 (Mountain Standard Time)
+mkdir "L:\Git\View-by-Distance-MKLink-Console\Instance\.vscode"
+mklink /J "L:\Git\View-by-Distance-MKLink-Console\Instance\.vscode\.UserSecrets" "C:\Users\mikep\AppData\Roaming\Microsoft\UserSecrets\2999dda1-5329-4d9f-9d68-cccfabe0e47f"
+mkdir "L:\Git\View-by-Distance-MKLink-Console\Tests\.vscode"
+mklink /J "L:\Git\View-by-Distance-MKLink-Console\Tests\.vscode\.UserSecrets" "C:\Users\mikep\AppData\Roaming\Microsoft\UserSecrets\e8c3d25d-9715-4b35-9010-1cdc74840190"
+mkdir "L:\Git\View-by-Distance-MKLink-Console\TestsWithFaceRecognitionDotNet\.vscode"
+mklink /J "L:\Git\View-by-Distance-MKLink-Console\TestsWithFaceRecognitionDotNet\.vscode\.UserSecrets" "C:\Users\mikep\AppData\Roaming\Microsoft\UserSecrets\ecbdc76d-6037-4046-86a4-1a7626a3d342"
+mkdir "L:\Git\View-by-Distance-MKLink-Console\Drag-Drop-Set-Property-Item\.vscode"
+mklink /J "L:\Git\View-by-Distance-MKLink-Console\Drag-Drop-Set-Property-Item\.vscode\.UserSecrets" "C:\Users\mikep\AppData\Roaming\Microsoft\UserSecrets\c64a15ed-0ba3-4378-8f80-0c19d0531747"
+```

.vscode/tasks.json

@@ -72,11 +72,7 @@
                 "build",
                 "${workspaceFolder}/Instance/Instance.csproj",
                 "/property:GenerateFullPaths=true",
-                "/consoleloggerparameters:NoSummary",
-                "/property:WarningLevel=0",
-                "--verbosity",
-                "quiet",
-                "--no-restore"
+                "/consoleloggerparameters:NoSummary"
             ],
             "problemMatcher": "$msCompile"
         },
@@ -88,11 +84,7 @@
                 "build",
                 "${workspaceFolder}/Shared/View-by-Distance.Shared.csproj",
                 "/property:GenerateFullPaths=true",
-                "/consoleloggerparameters:NoSummary",
-                "/property:WarningLevel=0",
-                "--verbosity",
-                "quiet",
-                "--no-restore"
+                "/consoleloggerparameters:NoSummary"
             ],
             "problemMatcher": "$msCompile"
         },
@@ -104,13 +96,59 @@
                 "build",
                 "${workspaceFolder}/Metadata/Metadata.csproj",
                 "/property:GenerateFullPaths=true",
-                "/consoleloggerparameters:NoSummary",
-                "/property:WarningLevel=0",
-                "--verbosity",
-                "quiet",
-                "--no-restore"
+                "/consoleloggerparameters:NoSummary"
             ],
             "problemMatcher": "$msCompile"
+        },
+        {
+            "label": "buildTests",
+            "command": "dotnet",
+            "type": "process",
+            "args": [
+                "build",
+                "${workspaceFolder}/Tests/Tests.csproj",
+                "/property:GenerateFullPaths=true",
+                "/consoleloggerparameters:NoSummary"
+            ],
+            "problemMatcher": "$msCompile"
+        },
+        {
+            "label": "buildTestsWithFaceRecognitionDotNet",
+            "command": "dotnet",
+            "type": "process",
+            "args": [
+                "build",
+                "${workspaceFolder}/TestsWithFaceRecognitionDotNet/TestsWithFaceRecognitionDotNet.csproj",
+                "/property:GenerateFullPaths=true",
+                "/consoleloggerparameters:NoSummary"
+            ],
+            "problemMatcher": "$msCompile"
+        },
+        {
+            "label": "buildCopyDistinct",
+            "command": "dotnet",
+            "type": "process",
+            "args": [
+                "build",
+                "${workspaceFolder}/Copy-Distinct/Copy-Distinct.csproj",
+                "/property:GenerateFullPaths=true",
+                "/consoleloggerparameters:NoSummary"
+            ],
+            "problemMatcher": "$msCompile"
+        },
+        {
+            "label": "File-Folder-Helper AOT s X Day-Helper-2025-03-20",
+            "type": "shell",
+            "command": "L:/DevOps/Mesa_FI/File-Folder-Helper/bin/Release/net8.0/win-x64/publish/File-Folder-Helper.exe",
+            "args": [
+                "s",
+                "X",
+                "L:/Git/View-by-Distance-MKLink-Console",
+                "Day-Helper-2025-03-20",
+                "false",
+                "4"
+            ],
+            "problemMatcher": []
         }
     ]
 }

BlurHash/BlurHash.csproj

@@ -34,7 +34,7 @@
     </ItemGroup>
     <ItemGroup>
         <PackageReference Include="System.Drawing.Common" Version="8.0.10" />
-        <PackageReference Include="System.Text.Json" Version="9.0.0" />
+        <PackageReference Include="System.Text.Json" Version="9.0.2" />
     </ItemGroup>
     <ItemGroup>
         <ProjectReference Include="..\Shared\View-by-Distance.Shared.csproj" />

BlurHash/Models/BlurHasher.cs

@@ -11,20 +11,28 @@ public class C2_BlurHasher : IBlurHasher
 {
 
     private readonly IPropertyConfiguration _PropertyConfiguration;
-    private readonly Dictionary<string, ReadOnlyCollection<string>> _FileGroups;
+    private readonly ReadOnlyDictionary<byte, ReadOnlyCollection<string>>[] _ResultContentFileGroups;
+    private readonly ReadOnlyDictionary<byte, ReadOnlyCollection<string>>[] _ResultSingletonFileGroups;
 
     public C2_BlurHasher(IPropertyConfiguration propertyConfiguration)
     {
-        _FileGroups = [];
         _PropertyConfiguration = propertyConfiguration;
+        _ResultContentFileGroups = [new(new Dictionary<byte, ReadOnlyCollection<string>>())];
+        _ResultSingletonFileGroups = [new(new Dictionary<byte, ReadOnlyCollection<string>>())];
     }
 
     public void Update(string resultsFullGroupDirectory)
     {
-        _FileGroups.Clear();
-        ReadOnlyDictionary<string, ReadOnlyCollection<string>> keyValuePairs = Shared.Models.Stateless.Methods.IPath.GetKeyValuePairs(_PropertyConfiguration, resultsFullGroupDirectory, [_PropertyConfiguration.ResultContent, _PropertyConfiguration.ResultSingleton]);
-        foreach (KeyValuePair<string, ReadOnlyCollection<string>> keyValuePair in keyValuePairs)
-            _FileGroups.Add(keyValuePair.Key, keyValuePair.Value);
+        ReadOnlyDictionary<string, ReadOnlyDictionary<byte, ReadOnlyCollection<string>>> keyValuePairs = Shared.Models.Stateless.Methods.IPath.GetKeyValuePairs(_PropertyConfiguration, resultsFullGroupDirectory, [_PropertyConfiguration.ResultContent, _PropertyConfiguration.ResultSingleton]);
+        foreach (KeyValuePair<string, ReadOnlyDictionary<byte, ReadOnlyCollection<string>>> keyValuePair in keyValuePairs)
+        {
+            if (keyValuePair.Key == _PropertyConfiguration.ResultContent)
+                _ResultContentFileGroups[0] = keyValuePair.Value;
+            else if (keyValuePair.Key == _PropertyConfiguration.ResultSingleton)
+                _ResultSingletonFileGroups[0] = keyValuePair.Value;
+            else
+                throw new Exception();
+        }
     }
 
     string IBlurHasher.Encode(FileHolder fileHolder)
@@ -40,20 +48,39 @@ public class C2_BlurHasher : IBlurHasher
         return result;
     }
 
+    private static void MoveIf(string fileName, CombinedEnumAndIndex cei, string directory, string fullFileName)
+    {
+        string[] segments = directory.Split(cei.Combined);
+        string? checkDirectory = segments.Length == 1 ?
+            Path.Combine(segments[0], $"{cei.Combined[2..]}") :
+                segments.Length == 2 ?
+                    $"{segments[0]}{cei.Combined[2..]}{segments[1]}" :
+                        null;
+        if (checkDirectory is not null && Directory.Exists(checkDirectory))
+        {
+            string checkFile = Path.Combine(checkDirectory, fileName);
+            if (File.Exists(checkFile))
+                File.Move(checkFile, fullFileName);
+        }
+    }
+
     string IBlurHasher.GetFile(FilePath filePath)
     {
         string result;
-        if (_FileGroups.Count == 0)
+        if (_ResultSingletonFileGroups[0].Count == 0)
             throw new Exception("Call Update first!");
-        (_, int directoryIndex) = Shared.Models.Stateless.Methods.IPath.GetDirectoryNameAndIndex(_PropertyConfiguration, filePath);
-        result = Path.Combine(_FileGroups[_PropertyConfiguration.ResultSingleton][directoryIndex], $"{filePath.Name}.csv");
+        string fileName = $"{filePath.Name}.csv";
+        CombinedEnumAndIndex cei = Shared.Models.Stateless.Methods.IPath.GetCombinedEnumAndIndex(_PropertyConfiguration, filePath);
+        string directory = _ResultSingletonFileGroups[0][cei.Enum][cei.Index];
+        result = Path.Combine(directory, fileName);
+        MoveIf(fileName, cei, directory, result);
         return result;
     }
 
     string IBlurHasher.EncodeAndSave(FilePath filePath, FileHolder fileHolder)
     {
         string result;
-        if (_FileGroups.Count == 0)
+        if (_ResultSingletonFileGroups[0].Count == 0)
             throw new Exception("Call Update first!");
         int actualByte;
         string extension = ".png";
@@ -70,15 +97,18 @@ public class C2_BlurHasher : IBlurHasher
         byte[] blurHashBytes = Encoding.UTF8.GetBytes(result);
         string joined = string.Join(string.Empty, blurHashBytes.Select(l => l.ToString("000")));
         string fileNameWithoutExtension = $"{componentsX}x{componentsY}-{outputWidth}x{outputHeight}-{joined}";
+        string fileName = $"{fileNameWithoutExtension}{extension}";
         string contents = string.Concat(result, Environment.NewLine, fileNameWithoutExtension, Environment.NewLine, extension);
         _ = Shared.Models.Stateless.Methods.IPath.WriteAllText(file, contents, updateDateWhenMatches: false, compareBeforeWrite: true, updateToWhenMatches: null);
-        (_, int directoryIndex) = Shared.Models.Stateless.Methods.IPath.GetDirectoryNameAndIndex(_PropertyConfiguration, filePath);
-        file = Path.Combine(_FileGroups[_PropertyConfiguration.ResultContent][directoryIndex], $"{fileNameWithoutExtension}{extension}");
-        if (!File.Exists(file))
+        CombinedEnumAndIndex cei = Shared.Models.Stateless.Methods.IPath.GetCombinedEnumAndIndex(_PropertyConfiguration, filePath);
+        string directory = _ResultContentFileGroups[0][cei.Enum][cei.Index];
+        string fullFileName = Path.Combine(directory, fileName);
+        MoveIf(fileName, cei, directory, fullFileName);
+        if (!File.Exists(fullFileName))
         {
             try
             {
-                using FileStream fileStream = new(file, FileMode.CreateNew);
+                using FileStream fileStream = new(fullFileName, FileMode.CreateNew);
                 actualImage.Save(fileStream, System.Drawing.Imaging.ImageFormat.Png);
                 _ = fileStream.Seek(0, SeekOrigin.Begin);
                 actualByte = fileStream.ReadByte();

Compare/Compare.cs

@@ -160,7 +160,7 @@ public class Compare
         }
         if (_IsEnvironment.Development && propertyConfiguration.PopulatePropertyId)
             throw new Exception("Copy keyValuePairs-####.json file");
-        (int j, int f, int t, Shared.Models.Container[] containers) = Shared.Models.Stateless.Methods.IContainer.GetContainers(propertyConfiguration, propertyLogic);
+        (int j, int f, int t, Shared.Models.Container[] containers) = Container.Models.Stateless.Methods.IContainer.GetContainers(propertyConfiguration, propertyLogic);
         if (propertyLogic.ExceptionsDirectories.Any())
             throw new Exception();
         if (propertyConfiguration.PopulatePropertyId && Shared.Models.Stateless.Methods.IProperty.Any(containers))
@@ -242,6 +242,53 @@ public class Compare
             _ = Directory.CreateDirectory(currentYearDirectory);
     }
 
+    private static void Verify(Models.Configuration configuration)
+    {
+        if (configuration.Spelling is null || !configuration.Spelling.Any())
+            throw new NullReferenceException(nameof(configuration.Spelling));
+    }
+
+    private A_Property GetPropertyLogic(bool reverse, string outputExtension, Map.Models.MapLogic mapLogic)
+    {
+        A_Property result;
+        if (_Configuration?.PropertyConfiguration is null)
+            throw new NullReferenceException(nameof(_Configuration.PropertyConfiguration));
+        result = new(_AppSettings.MaxDegreeOfParallelism, _Configuration.PropertyConfiguration, outputExtension, reverse);
+        string fromPrepareForOld = "34720-637858334555170379.tsv";
+        string fromPrepareForOldFile = Path.Combine(_Configuration.PropertyConfiguration.RootDirectory, fromPrepareForOld);
+        if (File.Exists(fromPrepareForOldFile))
+        {
+            string[] lines;
+            string[] columns;
+            List<string> debug = new();
+            long ticks = DateTime.Now.Ticks;
+            lines = File.ReadAllLines(fromPrepareForOldFile);
+            string resultsDirectory = $"{_Configuration.PropertyConfiguration.RootDirectory}-Results";
+            int[]? zeros = (from l in mapLogic.IndicesFromNew where l.Value.Any() select l.Value[0]).ToArray();
+            lines = (from l in mapLogic.IndicesFromNew select string.Concat(l.Key, '\t', string.Join('\t', l.Value))).ToArray();
+            if (!Directory.Exists(resultsDirectory))
+                _ = Directory.CreateDirectory(resultsDirectory);
+            File.WriteAllLines(Path.Combine(resultsDirectory, $"{ticks}.tsv"), lines);
+            string json = JsonSerializer.Serialize(mapLogic.IndicesFromNew, new JsonSerializerOptions { WriteIndented = true });
+            File.WriteAllText(Path.Combine(resultsDirectory, $"{ticks}.json"), json);
+            foreach (string line in lines)
+            {
+                columns = line.Split('\t');
+                // select $"{l.Index}\t{l.PropertyId}\t{l.RegexResult}\t{new DateTime(l.Ticks):yyyy-MM-dd_HH-mm-ss}\t{l.PropertyTicks}\t{l.RelativeDirectory}\t{l.FileName}"
+                if (columns.Length != 7)
+                    continue;
+                if (!int.TryParse(columns[1], out int propertyId))
+                    continue;
+                if (!zeros.Contains(propertyId))
+                    debug.Add(line);
+                else
+                    debug.Add(propertyId.ToString());
+            }
+            File.WriteAllLines(Path.Combine(resultsDirectory, $"{ticks}-{fromPrepareForOld}"), debug);
+        }
+        return result;
+    }
+
     private string GetRename(string renameA)
     {
         string result;
@@ -376,12 +423,6 @@ public class Compare
         return result;
     }
 
-    private static void Verify(Models.Configuration configuration)
-    {
-        if (configuration.Spelling is null || !configuration.Spelling.Any())
-            throw new NullReferenceException(nameof(configuration.Spelling));
-    }
-
     private long LogDelta(long ticks, string? methodName)
     {
         long result;
@@ -391,121 +432,6 @@ public class Compare
         return result;
     }
 
-    private A_Property GetPropertyLogic(bool reverse, string outputExtension, Map.Models.MapLogic mapLogic)
-    {
-        A_Property result;
-        if (_Configuration?.PropertyConfiguration is null)
-            throw new NullReferenceException(nameof(_Configuration.PropertyConfiguration));
-        result = new(_AppSettings.MaxDegreeOfParallelism, _Configuration.PropertyConfiguration, outputExtension, reverse);
-        string fromPrepareForOld = "34720-637858334555170379.tsv";
-        string fromPrepareForOldFile = Path.Combine(_Configuration.PropertyConfiguration.RootDirectory, fromPrepareForOld);
-        if (File.Exists(fromPrepareForOldFile))
-        {
-            string[] lines;
-            string[] columns;
-            List<string> debug = new();
-            long ticks = DateTime.Now.Ticks;
-            lines = File.ReadAllLines(fromPrepareForOldFile);
-            string resultsDirectory = $"{_Configuration.PropertyConfiguration.RootDirectory}-Results";
-            int[]? zeros = (from l in mapLogic.IndicesFromNew where l.Value.Any() select l.Value[0]).ToArray();
-            lines = (from l in mapLogic.IndicesFromNew select string.Concat(l.Key, '\t', string.Join('\t', l.Value))).ToArray();
-            if (!Directory.Exists(resultsDirectory))
-                _ = Directory.CreateDirectory(resultsDirectory);
-            File.WriteAllLines(Path.Combine(resultsDirectory, $"{ticks}.tsv"), lines);
-            string json = JsonSerializer.Serialize(mapLogic.IndicesFromNew, new JsonSerializerOptions { WriteIndented = true });
-            File.WriteAllText(Path.Combine(resultsDirectory, $"{ticks}.json"), json);
-            foreach (string line in lines)
-            {
-                columns = line.Split('\t');
-                // select $"{l.Index}\t{l.PropertyId}\t{l.RegexResult}\t{new DateTime(l.Ticks):yyyy-MM-dd_HH-mm-ss}\t{l.PropertyTicks}\t{l.RelativeDirectory}\t{l.FileName}"
-                if (columns.Length != 7)
-                    continue;
-                if (!int.TryParse(columns[1], out int propertyId))
-                    continue;
-                if (!zeros.Contains(propertyId))
-                    debug.Add(line);
-                else
-                    debug.Add(propertyId.ToString());
-            }
-            File.WriteAllLines(Path.Combine(resultsDirectory, $"{ticks}-{fromPrepareForOld}"), debug);
-        }
-        return result;
-    }
-
-    private void SaveDiffFilesOrSaveLogAndMoveFiles(Property.Models.Configuration configuration)
-    {
-        if (_Configuration?.PropertyConfiguration is null)
-            throw new NullReferenceException(nameof(_Configuration.PropertyConfiguration));
-        string aPropertySingletonDirectory = Property.Models.Stateless.IResult.GetResultsDateGroupDirectory(configuration, nameof(A_Property), "{}");
-        _Logger?.LogInformation(aPropertySingletonDirectory);
-        _Logger?.LogInformation("to");
-        _Logger?.LogInformation(_Configuration.DiffPropertyDirectory);
-        for (int y = 0; y < int.MaxValue; y++)
-        {
-            _Logger?.LogInformation("Press \"Y\" key to continue or close console if compare not needed");
-            if (Console.ReadKey().Key == ConsoleKey.Y)
-                break;
-        }
-        _Logger?.LogInformation(". . .");
-        int loadLessThan = 7;
-        string diffRootDirectory;
-        ConsoleKey? consoleKey = null;
-        List<PropertyCompare.Models.PropertyCompare>? duplicates = null;
-        PropertyCompare.Models.PropertyCompare[] diffPropertyCompareCollection;
-        if (string.IsNullOrEmpty(_Configuration.DiffPropertyDirectory))
-            diffRootDirectory = string.Empty;
-        else
-        {
-            if (!_Configuration.DiffPropertyDirectory.EndsWith("{}"))
-                throw new Exception("Invalid directory should end with {}!");
-            diffRootDirectory = Shared.Models.Stateless.Methods.IProperty.GetDiffRootDirectory(_Configuration.DiffPropertyDirectory);
-        }
-        PropertyCompare.Models.PropertyCompareLogic propertyCompareLogic = new(_AppSettings.MaxDegreeOfParallelism, _Configuration.PropertyConfiguration, _SpellingFindReplace, diffRootDirectory);
-        if (string.IsNullOrEmpty(_Configuration.DiffPropertyDirectory) || !Directory.Exists(_Configuration.DiffPropertyDirectory))
-            diffPropertyCompareCollection = Array.Empty<PropertyCompare.Models.PropertyCompare>();
-        else
-        {
-            diffPropertyCompareCollection = propertyCompareLogic.Get(_Configuration.DiffPropertyDirectory, loadLessThan, duplicates, deleteExtension: false);
-            if (!diffPropertyCompareCollection.Any())
-                throw new Exception("Invalid directory!");
-        }
-        string aPropertyCollectionDirectory = Property.Models.Stateless.IResult.GetResultsDateGroupDirectory(configuration, nameof(A_Property), "[{}]");
-        PropertyCompare.Models.PropertyCompare[] propertyCompareCollection = propertyCompareLogic.Get(aPropertySingletonDirectory, loadLessThan, duplicates, deleteExtension: false);
-        {
-            long ticks = DateTime.Now.Ticks;
-            string[] lines = (from l in propertyCompareCollection select l.GetSelect()).ToArray();
-            File.WriteAllLines(Path.Join(aPropertyCollectionDirectory, $". . . Ids - {ticks}.txt"), lines);
-            string json = JsonSerializer.Serialize(propertyCompareCollection, new JsonSerializerOptions { WriteIndented = true });
-            File.WriteAllText(Path.Join(aPropertyCollectionDirectory, $". . . Ids - {ticks}.nosj"), json);
-        }
-        for (int x = 0; x < int.MaxValue; x++)
-        {
-            _Logger?.LogInformation($"Press \"D\" key to {nameof(PropertyCompare.Models.PropertyCompareLogic.SaveDiffFiles)}");
-            _Logger?.LogInformation($"Press \"M\" key to {nameof(PropertyCompare.Models.PropertyCompareLogic.SaveLogAndMoveFiles)}");
-            _Logger?.LogInformation("Press \"End\" key when ready to skip");
-            consoleKey = Console.ReadKey().Key;
-            if (consoleKey is ConsoleKey.D or ConsoleKey.M or ConsoleKey.End)
-                break;
-        }
-        _Logger?.LogInformation(". . .");
-        if (consoleKey.HasValue && consoleKey.Value == ConsoleKey.D)
-            propertyCompareLogic.SaveDiffFiles(aPropertyCollectionDirectory, loadLessThan, propertyCompareCollection, diffPropertyCompareCollection);
-        else if (consoleKey.HasValue && consoleKey.Value == ConsoleKey.M)
-        {
-            for (int x = 0; x < int.MaxValue; x++)
-            {
-                _Logger?.LogInformation($"Press \"0 - {loadLessThan}\" key when ready to continue");
-                _Logger?.LogInformation("Press \"End\" key when ready to skip");
-                consoleKey = Console.ReadKey().Key;
-                if (consoleKey.Value is ConsoleKey.D0 or ConsoleKey.D1 or ConsoleKey.D2 or ConsoleKey.D3 or ConsoleKey.D4 or ConsoleKey.D5 or ConsoleKey.D6 or ConsoleKey.End)
-                    break;
-            }
-            _Logger?.LogInformation(". . .");
-            int i = int.Parse(consoleKey.Value.ToString()[1..]);
-            propertyCompareLogic.SaveLogAndMoveFiles(aPropertyCollectionDirectory, loadLessThan, propertyCompareCollection, diffPropertyCompareCollection, i);
-        }
-    }
-
     private void ChangeExtensionFromDeleteToJson(string aPropertySingletonDirectory)
     {
         string searchPattern = "*.delete";
@@ -524,227 +450,6 @@ public class Compare
         }
     }
 
-    private bool PossiblyRename(List<string> topDirectories, List<(int g, string sourceDirectory, string[] sourceDirectoryFiles)> groupCollection)
-    {
-        bool result = false;
-        string replaceFile;
-        string replaceDirectory;
-        int remainingDirectories = 0;
-        IEnumerable<(string Find, string Replace)>? found;
-        foreach ((int g, string sourceDirectory, string[] sourceDirectoryFiles) in groupCollection)
-        {
-            if (!topDirectories.Any())
-                continue;
-            found = from l in _RenameFindReplace where sourceDirectory == l.Find select l;
-            if (!found.Any())
-                continue;
-            if (!result)
-                result = true;
-            replaceDirectory = found.First().Replace;
-            if (!Directory.Exists(replaceDirectory))
-                Directory.Move(sourceDirectory, replaceDirectory);
-            else
-            {
-                if (Directory.EnumerateDirectories(sourceDirectory).Any())
-                    remainingDirectories += 1;
-                else
-                {
-                    foreach (string sourceDirectoryFile in sourceDirectoryFiles)
-                    {
-                        replaceFile = Path.Combine(replaceDirectory, Path.GetFileName(sourceDirectoryFile));
-                        if (File.Exists(replaceFile))
-                        {
-                            if (replaceFile.EndsWith(".jpg", ignoreCase: true, CultureInfo.CurrentCulture))
-                                replaceFile = Path.Combine(replaceDirectory, Path.ChangeExtension(sourceDirectoryFile, ".jpeg"));
-                            else if (replaceFile.EndsWith(".jpeg", ignoreCase: true, CultureInfo.CurrentCulture))
-                                replaceFile = Path.Combine(replaceDirectory, Path.ChangeExtension(sourceDirectoryFile, ".jpg"));
-                        }
-                        if (File.Exists(replaceFile))
-                            continue;
-                        File.Move(sourceDirectoryFile, replaceFile);
-                    }
-                }
-            }
-        }
-        return result;
-    }
-
-    private bool PossiblyRenameB(List<string> topDirectories, List<(int g, string sourceDirectory, string[] sourceDirectoryFiles)> groupCollection)
-    {
-        bool result = false;
-        string replaceFile;
-        string replaceDirectory;
-        IEnumerable<(string Find, string Replace)>? found;
-        foreach ((int g, string sourceDirectory, string[] sourceDirectoryFiles) in groupCollection)
-        {
-            if (!topDirectories.Any())
-                continue;
-            found = from l in _RenameBFindReplace where sourceDirectory == l.Find select l;
-            if (!found.Any())
-                continue;
-            if (!result)
-                result = true;
-            replaceDirectory = found.First().Replace;
-            if (!Directory.Exists(replaceDirectory))
-                _ = Directory.CreateDirectory(replaceDirectory);
-            foreach (string sourceDirectoryFile in sourceDirectoryFiles)
-            {
-                replaceFile = Path.Combine(replaceDirectory, Path.GetFileName(sourceDirectoryFile));
-                if (File.Exists(replaceFile))
-                {
-                    if (replaceFile.EndsWith(".jpg", ignoreCase: true, CultureInfo.CurrentCulture))
-                        replaceFile = Path.Combine(replaceDirectory, Path.ChangeExtension(sourceDirectoryFile, ".jpeg"));
-                    else if (replaceFile.EndsWith(".jpeg", ignoreCase: true, CultureInfo.CurrentCulture))
-                        replaceFile = Path.Combine(replaceDirectory, Path.ChangeExtension(sourceDirectoryFile, ".jpg"));
-                }
-                if (File.Exists(replaceFile))
-                    continue;
-                File.Move(sourceDirectoryFile, replaceFile);
-            }
-        }
-        return result;
-    }
-
-    private bool PossiblyRenameC(List<string> topDirectories, List<(int g, string sourceDirectory, string[] sourceDirectoryFiles)> groupCollection)
-    {
-        bool result = false;
-        string replaceFile;
-        string replaceDirectory;
-        IEnumerable<(string Find, string Replace)>? found;
-        foreach ((int g, string sourceDirectory, string[] sourceDirectoryFiles) in groupCollection)
-        {
-            if (!topDirectories.Any())
-                continue;
-            found = from l in _RenameCFindReplace where sourceDirectory == l.Find select l;
-            if (!found.Any())
-                continue;
-            if (!result)
-                result = true;
-            replaceDirectory = found.First().Replace;
-            if (!Directory.Exists(replaceDirectory))
-                _ = Directory.CreateDirectory(replaceDirectory);
-            foreach (string sourceDirectoryFile in sourceDirectoryFiles)
-            {
-                replaceFile = Path.Combine(replaceDirectory, Path.GetFileName(sourceDirectoryFile));
-                if (File.Exists(replaceFile))
-                {
-                    if (replaceFile.EndsWith(".jpg", ignoreCase: true, CultureInfo.CurrentCulture))
-                        replaceFile = Path.Combine(replaceDirectory, Path.ChangeExtension(sourceDirectoryFile, ".jpeg"));
-                    else if (replaceFile.EndsWith(".jpeg", ignoreCase: true, CultureInfo.CurrentCulture))
-                        replaceFile = Path.Combine(replaceDirectory, Path.ChangeExtension(sourceDirectoryFile, ".jpg"));
-                }
-                if (File.Exists(replaceFile))
-                    continue;
-                File.Move(sourceDirectoryFile, replaceFile);
-            }
-        }
-        return result;
-    }
-
-    private bool PossiblyCorrect(List<string> topDirectories, List<(int g, string sourceDirectory, string[] sourceDirectoryFiles)> groupCollection)
-    {
-        if (_Configuration?.PropertyConfiguration is null)
-            throw new NullReferenceException(nameof(_Configuration.PropertyConfiguration));
-        bool result = false;
-        string corrected;
-        string correctedMoveTo;
-        string? correctedDirectory;
-        string filteredSourceDirectoryFile;
-        string[] filteredSourceDirectoryFiles;
-        (string Find, string Replace) findReplace;
-        IEnumerable<(string Find, string Replace)>? found;
-        foreach ((int g, string sourceDirectory, string[] sourceDirectoryFiles) in groupCollection)
-        {
-            if (!topDirectories.Any())
-                continue;
-            filteredSourceDirectoryFiles = (from l in sourceDirectoryFiles where !_Configuration.PropertyConfiguration.IgnoreExtensions.Contains(Path.GetExtension(l)) select l).ToArray();
-            if (!filteredSourceDirectoryFiles.Any())
-                continue;
-            for (int i = 0; i < filteredSourceDirectoryFiles.Length; i++)
-            {
-                found = null;
-                for (int z = 0; z < int.MaxValue; z++)
-                {
-                    filteredSourceDirectoryFile = filteredSourceDirectoryFiles[i];
-                    found = from l in _SpellingFindReplace where filteredSourceDirectoryFile.Contains(l.Find) select l;
-                    if (!found.Any())
-                        break;
-                    findReplace = found.First();
-                    corrected = filteredSourceDirectoryFile.Replace(findReplace.Find, findReplace.Replace);
-                    correctedDirectory = Path.GetDirectoryName(corrected);
-                    if (string.IsNullOrEmpty(correctedDirectory))
-                        break;
-                    correctedMoveTo = Path.Combine(correctedDirectory, Path.GetFileName(corrected));
-                    if (File.Exists(correctedMoveTo))
-                        break;
-                    if (!Directory.Exists(correctedDirectory))
-                        _ = Directory.CreateDirectory(correctedDirectory);
-                    if (!result)
-                        result = true;
-                    File.Move(filteredSourceDirectoryFile, correctedMoveTo);
-                    filteredSourceDirectoryFiles[i] = corrected;
-                }
-            }
-        }
-        return result;
-    }
-
-    private List<string> GetMissingVerifyToSeasonCollection(List<string> _, List<(int g, string sourceDirectory, string[] sourceDirectoryFiles)> groupCollection)
-    {
-        if (_Configuration?.PropertyConfiguration is null)
-            throw new NullReferenceException(nameof(_Configuration.PropertyConfiguration));
-        List<string> results = new();
-        string check;
-        foreach ((int _, string sourceDirectory, string[] _) in groupCollection)
-        {
-            if (sourceDirectory == _Configuration.PropertyConfiguration.RootDirectory)
-                continue;
-            check = sourceDirectory[(_Configuration.PropertyConfiguration.RootDirectory.Length + 1)..];
-            if (check[0] is '=' || check.StartsWith("zzz ="))
-            {
-                if (!_Configuration.PropertyConfiguration.VerifyToSeason.Contains(check))
-                    results.Add(check);
-            }
-        }
-        return results;
-    }
-
-    private void CreateWindowsShortcuts((long Ticks, string FilteredSourceDirectoryFile, string PropertyDirectory, int PropertyId)[] collection, bool keepAll)
-    {
-        int z = 0;
-        string fileName;
-        WindowsShortcut windowsShortcut;
-        foreach ((long ticks, string filteredSourceDirectoryFile, string propertyDirectory, int propertyId) in collection)
-        {
-            z += 1;
-            if (z % 1000 == 0)
-                _Log.Debug($"{z}) Loop {propertyDirectory}");
-            if (!keepAll)
-            {
-                fileName = Path.Combine(propertyDirectory, $"{propertyId}.lnk");
-                if (File.Exists(fileName))
-                    continue;
-            }
-            else
-            {
-                fileName = string.Empty;
-                for (short c = 65; c < short.MaxValue; c++)
-                {
-                    if (c > 95)
-                        break;
-                    fileName = Path.Combine(propertyDirectory, $"{(char)c}", $"{propertyId}.lnk");
-                    if (File.Exists(fileName))
-                        continue;
-                }
-            }
-            if (string.IsNullOrEmpty(fileName))
-                continue;
-            windowsShortcut = new() { Path = filteredSourceDirectoryFile };
-            windowsShortcut.Save(fileName);
-            windowsShortcut.Dispose();
-        }
-    }
-
     private void ThirdPassToMove(Property.Models.Configuration configuration, Map.Models.MapLogic mapLogic, A_Property propertyLogic, Shared.Models.Container[] containers, string aPropertyContentCollectionDirectory)
     {
         if (_Configuration?.PropertyConfiguration is null)
@@ -865,4 +570,299 @@ public class Compare
             CreateWindowsShortcuts(collection, keepAll);
     }
 
+    private void CreateWindowsShortcuts((long Ticks, string FilteredSourceDirectoryFile, string PropertyDirectory, int PropertyId)[] collection, bool keepAll)
+    {
+        int z = 0;
+        string fileName;
+        WindowsShortcut windowsShortcut;
+        foreach ((long ticks, string filteredSourceDirectoryFile, string propertyDirectory, int propertyId) in collection)
+        {
+            z += 1;
+            if (z % 1000 == 0)
+                _Log.Debug($"{z}) Loop {propertyDirectory}");
+            if (!keepAll)
+            {
+                fileName = Path.Combine(propertyDirectory, $"{propertyId}.lnk");
+                if (File.Exists(fileName))
+                    continue;
+            }
+            else
+            {
+                fileName = string.Empty;
+                for (short c = 65; c < short.MaxValue; c++)
+                {
+                    if (c > 95)
+                        break;
+                    fileName = Path.Combine(propertyDirectory, $"{(char)c}", $"{propertyId}.lnk");
+                    if (File.Exists(fileName))
+                        continue;
+                }
+            }
+            if (string.IsNullOrEmpty(fileName))
+                continue;
+            windowsShortcut = new() { Path = filteredSourceDirectoryFile };
+            windowsShortcut.Save(fileName);
+            windowsShortcut.Dispose();
+        }
+    }
+
+    private void SaveDiffFilesOrSaveLogAndMoveFiles(Property.Models.Configuration configuration)
+    {
+        if (_Configuration?.PropertyConfiguration is null)
+            throw new NullReferenceException(nameof(_Configuration.PropertyConfiguration));
+        string aPropertySingletonDirectory = Property.Models.Stateless.IResult.GetResultsDateGroupDirectory(configuration, nameof(A_Property), "{}");
+        _Logger?.LogInformation(aPropertySingletonDirectory);
+        _Logger?.LogInformation("to");
+        _Logger?.LogInformation(_Configuration.DiffPropertyDirectory);
+        for (int y = 0; y < int.MaxValue; y++)
+        {
+            _Logger?.LogInformation("Press \"Y\" key to continue or close console if compare not needed");
+            if (Console.ReadKey().Key == ConsoleKey.Y)
+                break;
+        }
+        _Logger?.LogInformation(". . .");
+        int loadLessThan = 7;
+        string diffRootDirectory;
+        ConsoleKey? consoleKey = null;
+        List<PropertyCompare.Models.PropertyCompare>? duplicates = null;
+        PropertyCompare.Models.PropertyCompare[] diffPropertyCompareCollection;
+        if (string.IsNullOrEmpty(_Configuration.DiffPropertyDirectory))
+            diffRootDirectory = string.Empty;
+        else
+        {
+            if (!_Configuration.DiffPropertyDirectory.EndsWith("{}"))
+                throw new Exception("Invalid directory should end with {}!");
+            diffRootDirectory = Shared.Models.Stateless.Methods.IProperty.GetDiffRootDirectory(_Configuration.DiffPropertyDirectory);
+        }
+        PropertyCompare.Models.PropertyCompareLogic propertyCompareLogic = new(_AppSettings.MaxDegreeOfParallelism, _Configuration.PropertyConfiguration, _SpellingFindReplace, diffRootDirectory);
+        if (string.IsNullOrEmpty(_Configuration.DiffPropertyDirectory) || !Directory.Exists(_Configuration.DiffPropertyDirectory))
+            diffPropertyCompareCollection = Array.Empty<PropertyCompare.Models.PropertyCompare>();
+        else
+        {
+            diffPropertyCompareCollection = propertyCompareLogic.Get(_Configuration.DiffPropertyDirectory, loadLessThan, duplicates, deleteExtension: false);
+            if (!diffPropertyCompareCollection.Any())
+                throw new Exception("Invalid directory!");
+        }
+        string aPropertyCollectionDirectory = Property.Models.Stateless.IResult.GetResultsDateGroupDirectory(configuration, nameof(A_Property), "[{}]");
+        PropertyCompare.Models.PropertyCompare[] propertyCompareCollection = propertyCompareLogic.Get(aPropertySingletonDirectory, loadLessThan, duplicates, deleteExtension: false);
+        {
+            long ticks = DateTime.Now.Ticks;
+            string[] lines = (from l in propertyCompareCollection select l.GetSelect()).ToArray();
+            File.WriteAllLines(Path.Join(aPropertyCollectionDirectory, $". . . Ids - {ticks}.txt"), lines);
+            string json = JsonSerializer.Serialize(propertyCompareCollection, new JsonSerializerOptions { WriteIndented = true });
+            File.WriteAllText(Path.Join(aPropertyCollectionDirectory, $". . . Ids - {ticks}.nosj"), json);
+        }
+        for (int x = 0; x < int.MaxValue; x++)
+        {
+            _Logger?.LogInformation($"Press \"D\" key to {nameof(PropertyCompare.Models.PropertyCompareLogic.SaveDiffFiles)}");
+            _Logger?.LogInformation($"Press \"M\" key to {nameof(PropertyCompare.Models.PropertyCompareLogic.SaveLogAndMoveFiles)}");
+            _Logger?.LogInformation("Press \"End\" key when ready to skip");
+            consoleKey = Console.ReadKey().Key;
+            if (consoleKey is ConsoleKey.D or ConsoleKey.M or ConsoleKey.End)
+                break;
+        }
+        _Logger?.LogInformation(". . .");
+        if (consoleKey.HasValue && consoleKey.Value == ConsoleKey.D)
+            propertyCompareLogic.SaveDiffFiles(aPropertyCollectionDirectory, loadLessThan, propertyCompareCollection, diffPropertyCompareCollection);
+        else if (consoleKey.HasValue && consoleKey.Value == ConsoleKey.M)
+        {
+            for (int x = 0; x < int.MaxValue; x++)
+            {
+                _Logger?.LogInformation($"Press \"0 - {loadLessThan}\" key when ready to continue");
+                _Logger?.LogInformation("Press \"End\" key when ready to skip");
+                consoleKey = Console.ReadKey().Key;
+                if (consoleKey.Value is ConsoleKey.D0 or ConsoleKey.D1 or ConsoleKey.D2 or ConsoleKey.D3 or ConsoleKey.D4 or ConsoleKey.D5 or ConsoleKey.D6 or ConsoleKey.End)
+                    break;
+            }
+            _Logger?.LogInformation(". . .");
+            int i = int.Parse(consoleKey.Value.ToString()[1..]);
+            propertyCompareLogic.SaveLogAndMoveFiles(aPropertyCollectionDirectory, loadLessThan, propertyCompareCollection, diffPropertyCompareCollection, i);
+        }
+    }
+
+    private bool PossiblyRename(List<string> topDirectories, List<(int g, string sourceDirectory, string[] sourceDirectoryFiles)> groupCollection)
+    {
+        bool result = false;
+        string replaceFile;
+        string replaceDirectory;
+        int remainingDirectories = 0;
+        IEnumerable<(string Find, string Replace)>? found;
+        foreach ((int g, string sourceDirectory, string[] sourceDirectoryFiles) in groupCollection)
+        {
+            if (!topDirectories.Any())
+                continue;
+            found = from l in _RenameFindReplace where sourceDirectory == l.Find select l;
+            if (!found.Any())
+                continue;
+            if (!result)
+                result = true;
+            replaceDirectory = found.First().Replace;
+            if (!Directory.Exists(replaceDirectory))
+                Directory.Move(sourceDirectory, replaceDirectory);
+            else
+            {
+                if (Directory.EnumerateDirectories(sourceDirectory).Any())
+                    remainingDirectories += 1;
+                else
+                {
+                    foreach (string sourceDirectoryFile in sourceDirectoryFiles)
+                    {
+                        replaceFile = Path.Combine(replaceDirectory, Path.GetFileName(sourceDirectoryFile));
+                        if (File.Exists(replaceFile))
+                        {
+                            if (replaceFile.EndsWith(".jpg", ignoreCase: true, CultureInfo.CurrentCulture))
+                                replaceFile = Path.Combine(replaceDirectory, Path.ChangeExtension(sourceDirectoryFile, ".jpeg"));
+                            else if (replaceFile.EndsWith(".jpeg", ignoreCase: true, CultureInfo.CurrentCulture))
+                                replaceFile = Path.Combine(replaceDirectory, Path.ChangeExtension(sourceDirectoryFile, ".jpg"));
+                        }
+                        if (File.Exists(replaceFile))
+                            continue;
+                        File.Move(sourceDirectoryFile, replaceFile);
+                    }
+                }
+            }
+        }
+        return result;
+    }
+
+    private bool PossiblyCorrect(List<string> topDirectories, List<(int g, string sourceDirectory, string[] sourceDirectoryFiles)> groupCollection)
+    {
+        if (_Configuration?.PropertyConfiguration is null)
+            throw new NullReferenceException(nameof(_Configuration.PropertyConfiguration));
+        bool result = false;
+        string corrected;
+        string correctedMoveTo;
+        string? correctedDirectory;
+        string filteredSourceDirectoryFile;
+        string[] filteredSourceDirectoryFiles;
+        (string Find, string Replace) findReplace;
+        IEnumerable<(string Find, string Replace)>? found;
+        foreach ((int g, string sourceDirectory, string[] sourceDirectoryFiles) in groupCollection)
+        {
+            if (!topDirectories.Any())
+                continue;
+            filteredSourceDirectoryFiles = (from l in sourceDirectoryFiles where !_Configuration.PropertyConfiguration.IgnoreExtensions.Contains(Path.GetExtension(l)) select l).ToArray();
+            if (!filteredSourceDirectoryFiles.Any())
+                continue;
+            for (int i = 0; i < filteredSourceDirectoryFiles.Length; i++)
+            {
+                found = null;
+                for (int z = 0; z < int.MaxValue; z++)
+                {
+                    filteredSourceDirectoryFile = filteredSourceDirectoryFiles[i];
+                    found = from l in _SpellingFindReplace where filteredSourceDirectoryFile.Contains(l.Find) select l;
+                    if (!found.Any())
+                        break;
+                    findReplace = found.First();
+                    corrected = filteredSourceDirectoryFile.Replace(findReplace.Find, findReplace.Replace);
+                    correctedDirectory = Path.GetDirectoryName(corrected);
+                    if (string.IsNullOrEmpty(correctedDirectory))
+                        break;
+                    correctedMoveTo = Path.Combine(correctedDirectory, Path.GetFileName(corrected));
+                    if (File.Exists(correctedMoveTo))
+                        break;
+                    if (!Directory.Exists(correctedDirectory))
+                        _ = Directory.CreateDirectory(correctedDirectory);
+                    if (!result)
+                        result = true;
+                    File.Move(filteredSourceDirectoryFile, correctedMoveTo);
+                    filteredSourceDirectoryFiles[i] = corrected;
+                }
+            }
+        }
+        return result;
+    }
+
+    private bool PossiblyRenameB(List<string> topDirectories, List<(int g, string sourceDirectory, string[] sourceDirectoryFiles)> groupCollection)
+    {
+        bool result = false;
+        string replaceFile;
+        string replaceDirectory;
+        IEnumerable<(string Find, string Replace)>? found;
+        foreach ((int g, string sourceDirectory, string[] sourceDirectoryFiles) in groupCollection)
+        {
+            if (!topDirectories.Any())
+                continue;
+            found = from l in _RenameBFindReplace where sourceDirectory == l.Find select l;
+            if (!found.Any())
+                continue;
+            if (!result)
+                result = true;
+            replaceDirectory = found.First().Replace;
+            if (!Directory.Exists(replaceDirectory))
+                _ = Directory.CreateDirectory(replaceDirectory);
+            foreach (string sourceDirectoryFile in sourceDirectoryFiles)
+            {
+                replaceFile = Path.Combine(replaceDirectory, Path.GetFileName(sourceDirectoryFile));
+                if (File.Exists(replaceFile))
+                {
+                    if (replaceFile.EndsWith(".jpg", ignoreCase: true, CultureInfo.CurrentCulture))
+                        replaceFile = Path.Combine(replaceDirectory, Path.ChangeExtension(sourceDirectoryFile, ".jpeg"));
+                    else if (replaceFile.EndsWith(".jpeg", ignoreCase: true, CultureInfo.CurrentCulture))
+                        replaceFile = Path.Combine(replaceDirectory, Path.ChangeExtension(sourceDirectoryFile, ".jpg"));
+                }
+                if (File.Exists(replaceFile))
+                    continue;
+                File.Move(sourceDirectoryFile, replaceFile);
+            }
+        }
+        return result;
+    }
+
+    private bool PossiblyRenameC(List<string> topDirectories, List<(int g, string sourceDirectory, string[] sourceDirectoryFiles)> groupCollection)
+    {
+        bool result = false;
+        string replaceFile;
+        string replaceDirectory;
+        IEnumerable<(string Find, string Replace)>? found;
+        foreach ((int g, string sourceDirectory, string[] sourceDirectoryFiles) in groupCollection)
+        {
+            if (!topDirectories.Any())
+                continue;
+            found = from l in _RenameCFindReplace where sourceDirectory == l.Find select l;
+            if (!found.Any())
+                continue;
+            if (!result)
+                result = true;
+            replaceDirectory = found.First().Replace;
+            if (!Directory.Exists(replaceDirectory))
+                _ = Directory.CreateDirectory(replaceDirectory);
+            foreach (string sourceDirectoryFile in sourceDirectoryFiles)
+            {
+                replaceFile = Path.Combine(replaceDirectory, Path.GetFileName(sourceDirectoryFile));
+                if (File.Exists(replaceFile))
+                {
+                    if (replaceFile.EndsWith(".jpg", ignoreCase: true, CultureInfo.CurrentCulture))
+                        replaceFile = Path.Combine(replaceDirectory, Path.ChangeExtension(sourceDirectoryFile, ".jpeg"));
+                    else if (replaceFile.EndsWith(".jpeg", ignoreCase: true, CultureInfo.CurrentCulture))
+                        replaceFile = Path.Combine(replaceDirectory, Path.ChangeExtension(sourceDirectoryFile, ".jpg"));
+                }
+                if (File.Exists(replaceFile))
+                    continue;
+                File.Move(sourceDirectoryFile, replaceFile);
+            }
+        }
+        return result;
+    }
+
+    private List<string> GetMissingVerifyToSeasonCollection(List<string> _, List<(int g, string sourceDirectory, string[] sourceDirectoryFiles)> groupCollection)
+    {
+        if (_Configuration?.PropertyConfiguration is null)
+            throw new NullReferenceException(nameof(_Configuration.PropertyConfiguration));
+        List<string> results = new();
+        string check;
+        foreach ((int _, string sourceDirectory, string[] _) in groupCollection)
+        {
+            if (sourceDirectory == _Configuration.PropertyConfiguration.RootDirectory)
+                continue;
+            check = sourceDirectory[(_Configuration.PropertyConfiguration.RootDirectory.Length + 1)..];
+            if (check[0] is '=' || check.StartsWith("zzz ="))
+            {
+                if (!_Configuration.PropertyConfiguration.VerifyToSeason.Contains(check))
+                    results.Add(check);
+            }
+        }
+        return results;
+    }
+
 }

Compare/Compare.csproj

@@ -33,14 +33,14 @@
         <SupportedPlatform Include="browser" />
     </ItemGroup>
     <ItemGroup>
-        <PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.0" />
-        <PackageReference Include="Microsoft.AspNetCore.Cryptography.KeyDerivation" Version="9.0.0" />
-        <PackageReference Include="Microsoft.Extensions.Identity.Core" Version="9.0.0" />
-        <PackageReference Include="Microsoft.Extensions.Options" Version="9.0.0" />
+        <PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.2" />
+        <PackageReference Include="Microsoft.AspNetCore.Cryptography.KeyDerivation" Version="9.0.2" />
+        <PackageReference Include="Microsoft.Extensions.Identity.Core" Version="9.0.2" />
+        <PackageReference Include="Microsoft.Extensions.Options" Version="9.0.2" />
         <PackageReference Include="ShellProgressBar" Version="5.2.0" />
         <PackageReference Include="WindowsShortcutFactory" Version="1.2.0" />
         <PackageReference Include="System.Drawing.Common" Version="8.0.10" />
-        <PackageReference Include="System.Text.Json" Version="9.0.0" />
+        <PackageReference Include="System.Text.Json" Version="9.0.2" />
     </ItemGroup>
     <ItemGroup>
         <ProjectReference Include="..\Map\Map.csproj" />

Container/.vscode/format-report.json

@@ -0,0 +1 @@
+[]

Container/.vscode/settings.json

@@ -0,0 +1,8 @@
+{
+    "cSpell.words": [
+        "dlib",
+        "Exif",
+        "nosj",
+        "Serilog"
+    ]
+}

Container/Container.csproj

@@ -0,0 +1,51 @@
+<Project Sdk="Microsoft.NET.Sdk">
+    <PropertyGroup>
+        <ImplicitUsings>enable</ImplicitUsings>
+        <Nullable>enable</Nullable>
+        <OutputType>library</OutputType>
+        <RuntimeIdentifiers>win-x64;linux-x64</RuntimeIdentifiers>
+        <TargetFramework>net9.0</TargetFramework>
+    </PropertyGroup>
+    <PropertyGroup>
+        <PackageId>Phares.View.by.Distance.Container</PackageId>
+        <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
+        <Version>9.0.100.1</Version>
+        <Authors>Mike Phares</Authors>
+        <Company>Phares</Company>
+        <IncludeSymbols>true</IncludeSymbols>
+        <SymbolPackageFormat>snupkg</SymbolPackageFormat>
+    </PropertyGroup>
+    <PropertyGroup>
+        <IsWindows Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Windows)))' == 'true'">
+            true
+        </IsWindows>
+        <IsOSX Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::OSX)))' == 'true'">
+            true
+        </IsOSX>
+        <IsLinux Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Linux)))' == 'true'">
+            true
+        </IsLinux>
+    </PropertyGroup>
+    <PropertyGroup Condition="'$(IsWindows)'=='true'">
+        <DefineConstants>Windows</DefineConstants>
+    </PropertyGroup>
+    <PropertyGroup Condition="'$(IsOSX)'=='true'">
+        <DefineConstants>OSX</DefineConstants>
+    </PropertyGroup>
+    <PropertyGroup Condition="'$(IsLinux)'=='true'">
+        <DefineConstants>Linux</DefineConstants>
+    </PropertyGroup>
+    <ItemGroup Condition="'$(RuntimeIdentifier)' == 'browser-wasm'">
+        <SupportedPlatform Include="browser" />
+    </ItemGroup>
+    <ItemGroup>
+        <PackageReference Include="MetadataExtractor" Version="2.8.1" />
+        <PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.2" />
+        <PackageReference Include="ShellProgressBar" Version="5.2.0" />
+        <PackageReference Include="System.Drawing.Common" Version="8.0.10" />
+        <PackageReference Include="System.Text.Json" Version="9.0.2" />
+    </ItemGroup>
+    <ItemGroup>
+        <ProjectReference Include="..\Shared\View-by-Distance.Shared.csproj" />
+    </ItemGroup>
+</Project>

Container/Models/Container.cs

@@ -1,7 +1,8 @@
 using System.Collections.ObjectModel;
 using System.Text.Json;
+using View_by_Distance.Shared.Models;
 
-namespace View_by_Distance.Shared.Models;
+namespace View_by_Distance.Container.Models;
 
 public record Container(string SourceDirectory, ReadOnlyCollection<Item> Items)
 {

Container/Models/Stateless/Methods/Container.cs

@@ -0,0 +1,501 @@
+using System.Collections.ObjectModel;
+using System.Text.Json;
+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.Container.Models.Stateless.Methods;
+
+internal abstract class Container
+{
+
+    private record FilePair(bool IsUnique,
+                            List<FilePath> Collection,
+                            FilePath FilePath,
+                            Item Item);
+
+    internal static ReadOnlyCollection<Item> GetValidImageItems(IPropertyConfiguration propertyConfiguration, Models.Container container)
+    {
+        List<Item> results = [];
+        foreach (Item item in container.Items)
+        {
+            if (!item.IsValidImageFormatExtension || propertyConfiguration.IgnoreExtensions.Contains(item.FilePath.ExtensionLowered))
+                continue;
+            results.Add(item);
+        }
+        return container.Items.Count == results.Count ? container.Items : results.AsReadOnly();
+    }
+
+    internal static DateTime[] GetContainerDateTimes(ReadOnlyCollection<Item> items)
+    {
+        DateTime[] results;
+        long containerMinimumTicks = (from l in items select l.FilePath.LastWriteTicks).Min();
+        long containerMaximumTicks = (from l in items select l.FilePath.LastWriteTicks).Max();
+        results = [new(containerMinimumTicks), new(containerMaximumTicks)];
+        return results;
+    }
+
+    internal static List<int> GetFilteredDistinctIds(IPropertyConfiguration propertyConfiguration, ReadOnlyCollection<Models.Container> readOnlyContainers)
+    {
+        List<int> results = [];
+        ReadOnlyCollection<Item> filteredItems;
+        foreach (Models.Container container in readOnlyContainers)
+        {
+            if (container.Items.Count == 0)
+                continue;
+            filteredItems = GetValidImageItems(propertyConfiguration, container);
+            if (filteredItems.Count == 0)
+                continue;
+            foreach (Item item in filteredItems)
+            {
+                if (item.Property?.Id is null || item.ResizedFileHolder is null)
+                    continue;
+                if (results.Contains(item.Property.Id.Value))
+                    continue;
+                results.Add(item.Property.Id.Value);
+            }
+        }
+        return results;
+    }
+
+    internal static (int, Models.Container[]) GetContainers(IPropertyConfiguration propertyConfiguration, ReadOnlyDictionary<int, Identifier>? splatNineIdentifiers, string _)
+    {
+        int count;
+        Models.Container[] results;
+        bool useIgnoreExtensions = true;
+        const bool useCeilingAverage = true;
+        const string fileSearchFilter = "*";
+        IDlibDotNet dlibDotNet = GetDlibDotNet();
+        const string directorySearchFilter = "*";
+        ReadOnlyDictionary<int, ExifDirectory>? exifDirectoriesById = null;
+        ReadOnlyDictionary<int, ReadOnlyCollection<FilePath>>? keyValuePairs = null;
+        ReadOnlyCollection<string[]> filesCollection = IDirectory.GetFilesCollection(propertyConfiguration.RootDirectory, directorySearchFilter, fileSearchFilter, useCeilingAverage);
+        ReadOnlyCollection<ReadOnlyCollection<FilePath>> filePathsCollection = IDirectory.GetFilePathCollections(propertyConfiguration, filesCollection, useIgnoreExtensions);
+        (count, results) = GetContainers(dlibDotNet, propertyConfiguration, propertyConfiguration.RootDirectory, keyValuePairs, splatNineIdentifiers, filePathsCollection, exifDirectoriesById, directorySearchFilter);
+        return (count, results);
+    }
+
+    private static IDlibDotNet GetDlibDotNet() =>
+        throw new NotImplementedException();
+
+    private static (int, Models.Container[]) GetContainers(IDlibDotNet dlibDotNet, IPropertyConfiguration propertyConfiguration, string filesCollectionDirectory, ReadOnlyDictionary<int, ReadOnlyCollection<FilePath>>? keyValuePairs, ReadOnlyDictionary<int, Identifier>? splatNineIdentifiers, ReadOnlyCollection<ReadOnlyCollection<FilePath>> filePathsCollection, ReadOnlyDictionary<int, ExifDirectory>? exifDirectoriesById, string directorySearchFilter)
+    {
+        List<Models.Container> results = [];
+        string directory;
+        List<Item>? items;
+        Models.Container container;
+        List<string> directories = [];
+        Dictionary<string, List<Item>> directoryToItems = [];
+        foreach (ReadOnlyCollection<FilePath> filePaths in filePathsCollection)
+        {
+            if (filePaths.Count == 0)
+                continue;
+            directory = filePaths[0].DirectoryFullPath;
+            if (directory is null)
+                continue;
+            if (!directories.Contains(directory))
+                directories.Add(directory);
+            if (!directoryToItems.TryGetValue(directory, out items))
+            {
+                directoryToItems.Add(directory, []);
+                if (!directoryToItems.TryGetValue(directory, out items))
+                    throw new Exception();
+            }
+        }
+        (string aResultsFullGroupDirectory, _) = dlibDotNet.GetResultsFullGroupDirectories();
+        string aPropertySingletonDirectory = Path.Combine(aResultsFullGroupDirectory, propertyConfiguration.ResultSingleton);
+        if (!Directory.Exists(aPropertySingletonDirectory))
+            _ = Directory.CreateDirectory(aPropertySingletonDirectory);
+        List<FilePair> filePairs = GetFilePairs(dlibDotNet, propertyConfiguration, aPropertySingletonDirectory, filesCollectionDirectory, keyValuePairs, splatNineIdentifiers, filePathsCollection, exifDirectoriesById, directorySearchFilter);
+        foreach (FilePair filePair in filePairs)
+        {
+            if (!directoryToItems.TryGetValue(filePair.FilePath.DirectoryFullPath, out items))
+            {
+                directoryToItems.Add(filePair.FilePath.DirectoryFullPath, []);
+                if (!directoryToItems.TryGetValue(filePair.FilePath.DirectoryFullPath, out items))
+                    throw new Exception();
+            }
+            items.Add(filePair.Item);
+        }
+        foreach (KeyValuePair<string, List<Item>> keyValuePair in directoryToItems)
+        {
+            if (keyValuePair.Value.Count == 0)
+                continue;
+            container = new(keyValuePair.Key, new(keyValuePair.Value));
+            results.Add(container);
+        }
+        return (filePairs.Count, results.ToArray());
+    }
+
+    private static List<FilePair> GetFilePairs(IDlibDotNet dlibDotNet, IPropertyConfiguration propertyConfiguration, string aPropertySingletonDirectory, string filesCollectionDirectory, ReadOnlyDictionary<int, ReadOnlyCollection<FilePath>>? keyValuePairs, ReadOnlyDictionary<int, Identifier>? splatNineIdentifiers, ReadOnlyCollection<ReadOnlyCollection<FilePath>> filePathsCollection, ReadOnlyDictionary<int, ExifDirectory>? exifDirectoriesById, string directorySearchFilter)
+    {
+        List<FilePair> results = [];
+        const string extension = ".json";
+        ReadOnlyCollection<Shared.Models.FilePair> filePairs;
+        string jsonGroupDirectory = aPropertySingletonDirectory;
+        int maxDegreeOfParallelism = Environment.ProcessorCount;
+        int filesCollectionDirectoryLength = filesCollectionDirectory.Length;
+        ParallelOptions parallelOptions = new() { MaxDegreeOfParallelism = maxDegreeOfParallelism };
+        filePairs = IFilePair.GetFilePairs(propertyConfiguration, directorySearchFilter, extension, jsonGroupDirectory, filePathsCollection);
+        _ = Parallel.For(0, filePairs.Count, parallelOptions, (i, state) =>
+            ParallelFor(dlibDotNet, propertyConfiguration, jsonGroupDirectory, extension, keyValuePairs, splatNineIdentifiers, filesCollectionDirectoryLength, exifDirectoriesById, filePairs[i], results));
+        return results;
+    }
+
+    private static void ParallelFor(IDlibDotNet dlibDotNet, IPropertyConfiguration propertyConfiguration, string jsonGroupDirectory, string extension, ReadOnlyDictionary<int, ReadOnlyCollection<FilePath>>? keyValuePairs, ReadOnlyDictionary<int, Identifier>? splatNineIdentifiers, int rootDirectoryLength, ReadOnlyDictionary<int, ExifDirectory>? __, Shared.Models.FilePair filePair, List<FilePair> results)
+    {
+        dlibDotNet?.Tick();
+        bool abandoned = false;
+        FileHolder sourceDirectoryFileHolder;
+        Property? property = GetProperty(filePair);
+        bool? fileSizeChanged = property is not null ? property.FileSize != filePair.FilePath.Length : null;
+        bool isValidImageFormatExtension = propertyConfiguration.ValidImageFormatExtensions.Contains(filePair.FilePath.ExtensionLowered);
+        bool? shouldIgnore = property is null || property.Keywords is null ? null : propertyConfiguration.IgnoreRulesKeyWords.Any(l => property.Keywords.Contains(l));
+        bool? isArchive = filePair.FilePath.Id is null || splatNineIdentifiers is null ? null : splatNineIdentifiers.TryGetValue(filePair.FilePath.Id.Value, out Identifier? identifier);
+        if (property is not null && filePair.FilePath.Id is not null && filePair.FilePath.HasIgnoreKeyword is not null && filePair.FilePath.HasDateTimeOriginal is not null)
+        {
+            char? change;
+            ReadOnlyCollection<FilePath>? filePaths = null;
+            char hasIgnoreKeyword = IId.GetHasIgnoreKeyword(filePair.FilePath).ToString()[0];
+            char hasDateTimeOriginal = IId.GetHasDateTimeOriginal(propertyConfiguration, filePair.FilePath).ToString()[0];
+            char missingDateTimeOriginal = IId.GetMissingDateTimeOriginal(propertyConfiguration, filePair.FilePath).ToString()[0];
+            if (shouldIgnore is not null && shouldIgnore.Value)
+            {
+                if (filePair.FilePath.FileNameFirstSegment[^1] == hasIgnoreKeyword)
+                    change = null;
+                else
+                {
+                    change = hasIgnoreKeyword;
+                    if (keyValuePairs is null || !keyValuePairs.TryGetValue(filePair.FilePath.Id.Value, out filePaths) || filePaths is null)
+                        throw new NotSupportedException($"Rename File! <{filePair.FilePath.FileNameFirstSegment}>");
+                }
+            }
+            else if ((shouldIgnore is null || !shouldIgnore.Value) && property.DateTimeOriginal is null)
+            {
+                if (filePair.FilePath.FileNameFirstSegment[^1] == missingDateTimeOriginal)
+                    change = null;
+                else
+                {
+                    change = missingDateTimeOriginal;
+                    if (keyValuePairs is null || !keyValuePairs.TryGetValue(filePair.FilePath.Id.Value, out filePaths) || filePaths is null)
+                        throw new NotSupportedException($"Rename File! <{filePair.FilePath.FileNameFirstSegment}>");
+                }
+            }
+            else if (filePair.FilePath.FileNameFirstSegment[^1] != hasDateTimeOriginal)
+            {
+                change = hasDateTimeOriginal;
+                if (keyValuePairs is null || !keyValuePairs.TryGetValue(filePair.FilePath.Id.Value, out filePaths) || filePaths is null)
+                    throw new NotSupportedException($"Rename File! <{filePair.FilePath.FileNameFirstSegment}>");
+            }
+            else
+                change = null;
+            if (filePaths is not null && change is not null)
+                RenameFile(filePair, filePair.FilePath, change.Value, filePaths);
+        }
+        string relativePath = Shared.Models.Stateless.Methods.IPath.GetRelativePath(filePair.FilePath.FullName, rootDirectoryLength, forceExtensionToLower: true);
+        bool? lastWriteTimeChanged = property is not null ? propertyConfiguration.PropertiesChangedForProperty || property.LastWriteTime.Ticks != filePair.FilePath.LastWriteTicks : null;
+        if (filePair.Match is not null)
+            sourceDirectoryFileHolder = IFileHolder.Get(filePair.Match);
+        else if (!filePair.IsUnique)
+            sourceDirectoryFileHolder = IFileHolder.Get(Path.GetFullPath(string.Concat(jsonGroupDirectory, relativePath, extension)));
+        else
+        {
+            string fileName = Path.GetFileName(filePair.FilePath.FullName);
+            CombinedEnumAndIndex cei = Shared.Models.Stateless.Methods.IPath.GetCombinedEnumAndIndex(propertyConfiguration, filePair.FilePath);
+            string directory = Path.Combine(jsonGroupDirectory, cei.Combined);
+            string jsonFileName = $"{fileName}{extension}";
+            string fullFileName = Path.Combine(directory, jsonFileName);
+            MoveIf(jsonFileName, cei, directory, fullFileName);
+            sourceDirectoryFileHolder = IFileHolder.Get(fullFileName);
+        }
+        if (sourceDirectoryFileHolder.CreationTime is not null && sourceDirectoryFileHolder.LastWriteTime is not null && filePair.FilePath.LastWriteTicks != sourceDirectoryFileHolder.CreationTime.Value.Ticks)
+        {
+            File.SetCreationTime(sourceDirectoryFileHolder.FullName, new(filePair.FilePath.LastWriteTicks));
+            File.SetLastWriteTime(sourceDirectoryFileHolder.FullName, sourceDirectoryFileHolder.LastWriteTime.Value);
+        }
+        Item item = Item.Get(filePair.FilePath, sourceDirectoryFileHolder, relativePath, isArchive, filePair.IsNotUniqueAndNeedsReview, filePair.IsUnique, isValidImageFormatExtension, property, abandoned, fileSizeChanged, lastWriteTimeChanged);
+        lock (results)
+            results.Add(new(filePair.IsUnique, filePair.Collection, filePair.FilePath, item));
+    }
+
+    private static Property? GetProperty(Shared.Models.FilePair filePair)
+    {
+        Property? result;
+        if (filePair.Match is null)
+            result = null;
+        else
+        {
+            string json = File.ReadAllText(filePair.Match.FullName);
+            if (string.IsNullOrEmpty(json))
+                result = null;
+            else
+                result = JsonSerializer.Deserialize(json, PropertyGenerationContext.Default.Property);
+        }
+        return result;
+    }
+
+    private static void RenameFile(Shared.Models.FilePair filePair, FilePath filePath, char change, ReadOnlyCollection<FilePath> filePaths)
+    {
+        string checkFile;
+        if (filePath.DirectoryFullPath.Contains("Results") && filePath.DirectoryFullPath.Contains("Resize"))
+            File.Delete(filePath.FullName);
+        if (filePair.Match is not null)
+        {
+            string fileNameWithoutExtensionSecond = Path.GetFileNameWithoutExtension(filePair.Match.NameWithoutExtension);
+            string extensionSecond = Path.GetExtension(filePair.Match.Name);
+            checkFile = Path.Combine(filePair.Match.DirectoryFullPath, $"{fileNameWithoutExtensionSecond[..^1]}{change}{extensionSecond}{filePair.Match.ExtensionLowered}");
+            if (!File.Exists(checkFile))
+                File.Move(filePair.Match.FullName, checkFile);
+        }
+        foreach (FilePath f in filePaths)
+        {
+            checkFile = Path.Combine(f.DirectoryFullPath, $"{f.NameWithoutExtension[..^1]}{change}{f.ExtensionLowered}");
+            if (File.Exists(checkFile))
+                continue;
+            File.Move(f.FullName, checkFile);
+        }
+    }
+
+    private static void MoveIf(string fileName, CombinedEnumAndIndex cei, string directory, string fullFileName)
+    {
+        string[] segments = directory.Split(cei.Combined);
+        string? checkDirectory = segments.Length == 1 ?
+            Path.Combine(segments[0], $"{cei.Combined[2..]}") :
+                segments.Length == 2 ?
+                    $"{segments[0]}{cei.Combined[2..]}{segments[1]}" :
+                        null;
+        if (checkDirectory is not null && Directory.Exists(checkDirectory))
+        {
+            string checkFile = Path.Combine(checkDirectory, fileName);
+            if (File.Exists(checkFile))
+                File.Move(checkFile, fullFileName);
+        }
+    }
+
+    internal static List<string> GetFilteredDistinctFileNameFirstSegments(IPropertyConfiguration propertyConfiguration, ReadOnlyCollection<Models.Container> readOnlyContainers)
+    {
+        List<string> results = [];
+        ReadOnlyCollection<Item> filteredItems;
+        foreach (Models.Container container in readOnlyContainers)
+        {
+            if (container.Items.Count == 0)
+                continue;
+            filteredItems = GetValidImageItems(propertyConfiguration, container);
+            if (filteredItems.Count == 0)
+                continue;
+            foreach (Item item in filteredItems)
+            {
+                if (item.Property?.Id is null || item.ResizedFileHolder is null)
+                    continue;
+                if (results.Contains(item.FilePath.FileNameFirstSegment))
+                    continue;
+                results.Add(item.FilePath.FileNameFirstSegment);
+            }
+        }
+        return results;
+    }
+
+    internal static ReadOnlyCollection<Item> GetValidImageItems(IPropertyConfiguration propertyConfiguration, ReadOnlyCollection<Models.Container> containers, bool distinctItems, bool filterItems)
+    {
+        List<Item> results = [];
+        List<int> distinct = [];
+        ReadOnlyCollection<Item> filteredItems;
+        foreach (Models.Container container in containers)
+        {
+            if (container.Items.Count == 0)
+                continue;
+            if (!filterItems)
+                filteredItems = container.Items;
+            else
+            {
+                filteredItems = GetValidImageItems(propertyConfiguration, container);
+                if (filteredItems.Count == 0)
+                    continue;
+            }
+            foreach (Item item in filteredItems)
+            {
+                if (item.Property?.Id is null || item.ResizedFileHolder is null)
+                    continue;
+                if (distinctItems)
+                {
+                    if (distinct.Contains(item.Property.Id.Value))
+                        continue;
+                    distinct.Add(item.Property.Id.Value);
+                }
+                results.Add(item);
+            }
+        }
+        return results.AsReadOnly();
+    }
+
+    internal static ReadOnlyCollection<Models.Container> GetContainers(IDlibDotNet dlibDotNet, IPropertyConfiguration propertyConfiguration, string facesFileNameExtension, string facesHiddenFileNameExtension, string eDistanceContentDirectory, string filesCollectionDirectory, ReadOnlyDictionary<int, ReadOnlyCollection<FilePath>>? keyValuePairs, ReadOnlyDictionary<int, Identifier>? splatNineIdentifiers, ReadOnlyCollection<ReadOnlyCollection<FilePath>> filePathsCollection, ReadOnlyDictionary<int, ExifDirectory> exifDirectoriesById)
+    {
+        Models.Container[] results;
+        const string directorySearchFilter = "*";
+        (_, results) = GetContainers(dlibDotNet, propertyConfiguration, filesCollectionDirectory, keyValuePairs, splatNineIdentifiers, filePathsCollection, exifDirectoriesById, directorySearchFilter);
+        if (keyValuePairs is not null)
+            DoGetFilePairsForRemaining(dlibDotNet, propertyConfiguration, facesFileNameExtension, facesHiddenFileNameExtension, eDistanceContentDirectory, filePathsCollection, directorySearchFilter);
+        return results.AsReadOnly();
+    }
+
+    private static void DoGetFilePairsForRemaining(IDlibDotNet dlibDotNet, IPropertyConfiguration propertyConfiguration, string facesFileNameExtension, string facesHiddenFileNameExtension, string eDistanceContentDirectory, ReadOnlyCollection<ReadOnlyCollection<FilePath>> filePathsCollection, string directorySearchFilter)
+    {
+        const string extension = ".json";
+        (_, string bResultsFullGroupDirectory) = dlibDotNet.GetResultsFullGroupDirectories();
+        ReadOnlyDictionary<int, List<FilePath>> fileNamesToFiles = FilePath.GetFilesKeyValuePairs(filePathsCollection);
+        string bMetaSingletonDirectory = Path.Combine(bResultsFullGroupDirectory, propertyConfiguration.ResultSingleton);
+        if (!Directory.Exists(bMetaSingletonDirectory))
+            _ = Directory.CreateDirectory(bMetaSingletonDirectory);
+        _ = IFilePair.GetFilePairs(propertyConfiguration, directorySearchFilter, extension, bMetaSingletonDirectory, filePathsCollection, fileNamesToFiles);
+        (string cResultsFullGroupDirectory, _, string dResultsFullGroupDirectory, _) = dlibDotNet.GetResultsFullGroupDirectories("Original");
+        string cResizeSingletonDirectory = Path.Combine(cResultsFullGroupDirectory, propertyConfiguration.ResultSingleton);
+        if (!Directory.Exists(cResizeSingletonDirectory))
+            _ = Directory.CreateDirectory(cResizeSingletonDirectory);
+        _ = IFilePair.GetFilePairs(propertyConfiguration, directorySearchFilter, extension, cResizeSingletonDirectory, filePathsCollection, fileNamesToFiles);
+        string dFaceCollectionDirectory = Path.Combine(dResultsFullGroupDirectory, propertyConfiguration.ResultCollection);
+        if (!Directory.Exists(dFaceCollectionDirectory))
+            _ = Directory.CreateDirectory(dFaceCollectionDirectory);
+        _ = IFilePair.GetFilePairs(propertyConfiguration, directorySearchFilter, extension, dFaceCollectionDirectory, filePathsCollection, fileNamesToFiles);
+        string dFaceContentDirectory = Path.Combine(dResultsFullGroupDirectory, propertyConfiguration.ResultContent);
+        if (!Directory.Exists(dFaceContentDirectory))
+            _ = Directory.CreateDirectory(dFaceContentDirectory);
+        AnyMovedFace(propertyConfiguration, facesFileNameExtension, facesHiddenFileNameExtension, fileNamesToFiles, dFaceContentDirectory);
+        AnyMovedDistance(propertyConfiguration, facesFileNameExtension, fileNamesToFiles, eDistanceContentDirectory);
+    }
+
+    private static void AnyMovedFace(IPropertyConfiguration propertyConfiguration, string extension, string hiddenExtension, IReadOnlyDictionary<int, List<FilePath>> fileNamesToFiles, string jsonGroupDirectory)
+    {
+        string directory;
+        string checkFile;
+        string directoryName;
+        List<string> files = [];
+        string[] fileNameSegments;
+        List<string> directories = [];
+        files.AddRange(Directory.GetFiles(jsonGroupDirectory, $"*{extension}", SearchOption.AllDirectories));
+        files.AddRange(Directory.GetFiles(jsonGroupDirectory, $"*{hiddenExtension}", SearchOption.AllDirectories));
+        foreach (string file in files)
+        {
+            directory = Path.GetDirectoryName(file) ?? throw new Exception();
+            if (!directories.Contains(directory))
+                directories.Add(directory);
+            directoryName = Path.GetFileName(directory);
+            fileNameSegments = Path.GetFileName(file).Split('.');
+            if (fileNameSegments[0] != directoryName)
+            {
+                fileNameSegments[0] = string.Empty;
+                checkFile = Path.Combine(directory, $"{directoryName}{string.Join('.', fileNameSegments)}");
+                if (!File.Exists(checkFile))
+                    File.Move(file, checkFile);
+                else
+                {
+                    if (new FileInfo(file).LastWriteTime > new FileInfo(checkFile).LastWriteTime)
+                        File.Delete(file);
+                    else
+                        File.Move(file, checkFile, true);
+                }
+            }
+        }
+        if (directories.Count > 0)
+            AnyMovedFace(propertyConfiguration, fileNamesToFiles, directories);
+    }
+
+    private static void AnyMovedFace(IPropertyConfiguration propertyConfiguration, IReadOnlyDictionary<int, List<FilePath>> fileNamesToFiles, List<string> directories)
+    {
+        bool result = false;
+        string checkFile;
+        FilePath filePath;
+        string subDirectory;
+        string directoryName;
+        string checkDirectory;
+        FileHolder fileHolder;
+        string directoryNameWith;
+        List<FilePath>? collection;
+        List<string> directoryNames = [];
+        foreach (string directory in directories)
+        {
+            fileHolder = IFileHolder.Get(Path.GetFileName(directory));
+            filePath = FilePath.Get(propertyConfiguration, fileHolder, index: null);
+            if (filePath.Id is null)
+                continue;
+            if (!fileNamesToFiles.TryGetValue(filePath.Id.Value, out collection))
+                throw new Exception();
+            directoryNames.Clear();
+            foreach (FilePath f in collection)
+                directoryNames.Add(Path.GetFileName(f.DirectoryFullPath) ?? throw new Exception());
+            if (directoryNames.Count == 0 || directoryNames.Distinct().Count() != 1)
+                continue;
+            directoryName = Path.GetFileName(Path.GetDirectoryName(directory)) ?? throw new Exception();
+            if (directoryName != directoryNames[0])
+            {
+                subDirectory = Path.GetDirectoryName(Path.GetDirectoryName(directory)) ?? throw new Exception();
+                checkDirectory = Path.Combine(subDirectory, directoryNames[0]);
+                if (!Directory.Exists(checkDirectory))
+                    _ = Directory.CreateDirectory(checkDirectory);
+                directoryNameWith = collection.Count > 1 ? directoryName : $"{collection[0].NameWithoutExtension}";
+                checkFile = Path.Combine(checkDirectory, directoryNameWith);
+                if (!result)
+                    result = true;
+                if (!Directory.Exists(checkFile))
+                    Directory.Move(directory, checkFile);
+                else
+                {
+                    if (new DirectoryInfo(directory).LastWriteTime > new DirectoryInfo(checkFile).LastWriteTime)
+                        Directory.Delete(directory, recursive: true);
+                    else
+                    {
+                        Directory.Delete(checkFile, recursive: true);
+                        Directory.Move(directory, checkFile);
+                    }
+                }
+            }
+        }
+    }
+
+    private static void AnyMovedDistance(IPropertyConfiguration propertyConfiguration, string extension, IReadOnlyDictionary<int, List<FilePath>> fileNamesToFiles, string jsonGroupDirectory)
+    {
+        bool result = false;
+        string checkFile;
+        string directory;
+        FilePath filePath;
+        FileHolder fileHolder;
+        string[] fileNameSegments;
+        List<FilePath>? collection;
+        List<string> fileNames = [];
+        string[] files = Directory.GetFiles(jsonGroupDirectory, $"*{extension}", SearchOption.AllDirectories);
+        foreach (string file in files)
+        {
+            fileHolder = IFileHolder.Get(file);
+            if (!fileHolder.Exists)
+                continue;
+            filePath = FilePath.Get(propertyConfiguration, fileHolder, index: null);
+            if (filePath.Id is null)
+                continue;
+            fileNameSegments = filePath.Name.Split('.');
+            if (!fileNamesToFiles.TryGetValue(filePath.Id.Value, out collection))
+                continue;
+            fileNames.Clear();
+            foreach (FilePath f in collection)
+                fileNames.Add(f.NameWithoutExtension ?? throw new Exception());
+            if (fileNames.Count == 0 || fileNames.Distinct().Count() != 1)
+                continue;
+            if (filePath.FileNameFirstSegment != fileNames[0])
+            {
+                fileNameSegments[0] = string.Empty;
+                directory = Path.GetDirectoryName(file) ?? throw new Exception();
+                checkFile = Path.Combine(directory, $"{fileNames[0]}{string.Join('.', fileNameSegments)}");
+                if (!result)
+                    result = true;
+                if (!File.Exists(checkFile))
+                    File.Move(file, checkFile);
+                else
+                {
+                    if (new FileInfo(file).LastWriteTime > new FileInfo(checkFile).LastWriteTime)
+                        File.Delete(file);
+                    else
+                        File.Move(file, checkFile, true);
+                }
+            }
+        }
+    }
+
+}

Container/Models/Stateless/Methods/IContainer.cs

@@ -0,0 +1,59 @@
+using System.Collections.ObjectModel;
+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.Container.Models.Stateless.Methods;
+
+public interface IContainer
+{
+
+    public static (int, Models.Container[]) GetContainers(IPropertyConfiguration propertyConfiguration, ReadOnlyDictionary<int, Identifier>? splatNineIdentifiers, string aPropertySingletonDirectory) =>
+        Container.GetContainers(propertyConfiguration, splatNineIdentifiers, aPropertySingletonDirectory);
+
+    public static DateTime[] GetContainerDateTimes(ReadOnlyCollection<Item> items) =>
+        Container.GetContainerDateTimes(items);
+
+    public static ReadOnlyCollection<Item> GetValidImageItems(IPropertyConfiguration propertyConfiguration, Models.Container container) =>
+       Container.GetValidImageItems(propertyConfiguration, container);
+
+    public static (int, Models.Container[]) GetContainers(IPropertyConfiguration propertyConfiguration, string aPropertySingletonDirectory) =>
+        GetContainers(propertyConfiguration, null, aPropertySingletonDirectory);
+
+    public static List<int> GetFilteredDistinctIds(IPropertyConfiguration propertyConfiguration, ReadOnlyCollection<Models.Container> readOnlyContainers) =>
+        Container.GetFilteredDistinctIds(propertyConfiguration, readOnlyContainers);
+
+    public static List<string> GetFilteredDistinctFileNameFirstSegments(IPropertyConfiguration propertyConfiguration, ReadOnlyCollection<Models.Container> readOnlyContainers) =>
+        Container.GetFilteredDistinctFileNameFirstSegments(propertyConfiguration, readOnlyContainers);
+
+    public static ReadOnlyCollection<Item> GetValidImageItems(IPropertyConfiguration propertyConfiguration, ReadOnlyCollection<Models.Container> containers, bool distinctItems, bool filterItems) =>
+        Container.GetValidImageItems(propertyConfiguration, containers, distinctItems, filterItems);
+
+    public static ReadOnlyCollection<Models.Container> GetContainers(IDlibDotNet dlibDotNet, IPropertyConfiguration propertyConfiguration, string facesFileNameExtension, string facesHiddenFileNameExtension, string eDistanceContentDirectory, string filesCollectionDirectory, ReadOnlyDictionary<int, ReadOnlyCollection<FilePath>>? keyValuePairs, ReadOnlyDictionary<int, Identifier>? splatNineIdentifiers, ReadOnlyCollection<ReadOnlyCollection<FilePath>> filePathsCollection, ReadOnlyDictionary<int, ExifDirectory> exifDirectoriesById) =>
+        Container.GetContainers(dlibDotNet, propertyConfiguration, facesFileNameExtension, facesHiddenFileNameExtension, eDistanceContentDirectory, filesCollectionDirectory, keyValuePairs, splatNineIdentifiers, filePathsCollection, exifDirectoriesById);
+
+    internal DateTime[] TestStatic_GetContainerDateTimes(ReadOnlyCollection<Item> items) =>
+        GetContainerDateTimes(items);
+
+    internal ReadOnlyCollection<Item> TestStatic_GetValidImageItems(IPropertyConfiguration propertyConfiguration, Models.Container container) =>
+        GetValidImageItems(propertyConfiguration, container);
+
+    internal (int, Models.Container[]) TestStatic_GetContainers(IPropertyConfiguration propertyConfiguration, string aPropertySingletonDirectory) =>
+            GetContainers(propertyConfiguration, aPropertySingletonDirectory);
+
+    internal List<int> TestStatic_GetFilteredDistinctIds(IPropertyConfiguration propertyConfiguration, ReadOnlyCollection<Models.Container> readOnlyContainers) =>
+            GetFilteredDistinctIds(propertyConfiguration, readOnlyContainers);
+
+    internal List<string> TestStatic_GetFilteredDistinctFileNameFirstSegments(IPropertyConfiguration propertyConfiguration, ReadOnlyCollection<Models.Container> readOnlyContainers) =>
+            GetFilteredDistinctFileNameFirstSegments(propertyConfiguration, readOnlyContainers);
+
+    internal ReadOnlyCollection<Item> TestStatic_GetValidImageItems(IPropertyConfiguration propertyConfiguration, ReadOnlyCollection<Models.Container> containers, bool distinctItems, bool filterItems) =>
+        GetValidImageItems(propertyConfiguration, containers, distinctItems, filterItems);
+
+    internal (int, Models.Container[]) TestStatic_GetContainers(IPropertyConfiguration propertyConfiguration, ReadOnlyDictionary<int, Identifier>? splatNineIdentifiers, string aPropertySingletonDirectory) =>
+            GetContainers(propertyConfiguration, splatNineIdentifiers, aPropertySingletonDirectory);
+
+    internal ReadOnlyCollection<Models.Container> TestStatic_GetContainers(IDlibDotNet dlibDotNet, IPropertyConfiguration propertyConfiguration, string facesFileNameExtension, string facesHiddenFileNameExtension, string eDistanceContentDirectory, string filesCollectionDirectory, ReadOnlyDictionary<int, ReadOnlyCollection<FilePath>>? keyValuePairs, ReadOnlyDictionary<int, Identifier>? splatNineIdentifiers, ReadOnlyCollection<ReadOnlyCollection<FilePath>> filePathsCollection, ReadOnlyDictionary<int, ExifDirectory> exifDirectoriesById) =>
+            GetContainers(dlibDotNet, propertyConfiguration, facesFileNameExtension, facesHiddenFileNameExtension, eDistanceContentDirectory, filesCollectionDirectory, keyValuePairs, splatNineIdentifiers, filePathsCollection, exifDirectoriesById);
+
+}

Copy-Distinct/Copy-Distinct.csproj

@@ -35,9 +35,9 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Humanizer.Core" Version="2.14.1" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="9.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="9.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="9.0.2" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="9.0.2" />
+    <PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.2" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Property\Property.csproj" />

Copy-Distinct/CopyDistinct.cs

@@ -1,4 +1,4 @@
-using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.Logging;
 using Phares.Shared;
 using ShellProgressBar;
@@ -19,7 +19,7 @@ public class CopyDistinct
     private readonly IsEnvironment _IsEnvironment;
     private readonly IConfigurationRoot _ConfigurationRoot;
     private readonly Property.Models.Configuration _PropertyConfiguration;
-    private readonly ReadOnlyDictionary<string, ReadOnlyCollection<string>> _FileGroups;
+    private readonly ReadOnlyDictionary<byte, ReadOnlyCollection<string>> _FileGroups;
 
     public CopyDistinct(List<string> args, ILogger<Program> logger, IsEnvironment isEnvironment, IConfigurationRoot configurationRoot, AppSettings appSettings, string workingDirectory, bool isSilent, IConsole console)
     {
@@ -37,7 +37,9 @@ public class CopyDistinct
         _Configuration = configuration;
         logger?.LogInformation(propertyConfiguration.RootDirectory);
         (bool move, ReadOnlyCollection<string[]> filesCollection, bool anyLenFiles, bool moveBack) = Verify();
-        _FileGroups = Shared.Models.Stateless.Methods.IPath.GetKeyValuePairs(propertyConfiguration, appSettings.CopyTo, [appSettings.ResultDirectoryKey]);
+        ReadOnlyDictionary<string, ReadOnlyDictionary<byte, ReadOnlyCollection<string>>> keyValuePairs =
+            Shared.Models.Stateless.Methods.IPath.GetKeyValuePairs(propertyConfiguration, appSettings.CopyTo, [appSettings.ResultDirectoryKey]);
+        _FileGroups = keyValuePairs[appSettings.ResultDirectoryKey];
         List<string> lines = CopyDistinctFilesInDirectories(logger, move, filesCollection, anyLenFiles, moveBack);
         if (lines.Count != 0)
             File.WriteAllLines($"D:/Tmp/Phares/{DateTime.Now.Ticks}.tsv", lines);
@@ -93,72 +95,6 @@ public class CopyDistinct
         return (move, new(filesCollection), anyLenFiles, moveBack);
     }
 
-    private static (string[], List<(FilePath, string)>) GetMoveBackToDoCollection(Property.Models.Configuration propertyConfiguration, ReadOnlyCollection<string[]> filesCollection)
-    {
-        List<(FilePath, string)> results = [];
-        string key;
-        string? value;
-        string fileName;
-        FilePath filePath;
-        string? directory;
-        FileHolder fileHolder;
-        string destinationFile;
-        List<string> distinctFound = [];
-        List<string> distinctNeeded = [];
-        List<string> distinctDirectories = [];
-        Dictionary<string, string> nameToPath = [];
-        for (int i = 1; i < 3; i++)
-        {
-            foreach (string[] files in filesCollection)
-            {
-                foreach (string file in files.Reverse())
-                {
-                    fileName = Path.GetFileName(file);
-                    if (fileName.EndsWith("len"))
-                    {
-                        key = fileName[..^3];
-                        destinationFile = file[..^3];
-                        if (nameToPath.ContainsKey(key))
-                            continue;
-                        nameToPath.Add(key, destinationFile);
-                    }
-                    else
-                    {
-                        if (!distinctNeeded.Contains(file))
-                            distinctNeeded.Add(file);
-                        if (!nameToPath.ContainsKey(fileName))
-                            continue;
-                        if (distinctFound.Contains(file))
-                            continue;
-                        distinctFound.Add(file);
-                    }
-                }
-            }
-        }
-        foreach (string[] files in filesCollection)
-        {
-            foreach (string file in files)
-            {
-                // if (distinctNeeded.Count != distinctFound.Count)
-                //     continue;
-                fileName = Path.GetFileName(file);
-                if (fileName.EndsWith("len"))
-                    continue;
-                if (!nameToPath.TryGetValue(fileName, out value))
-                    continue;
-                directory = Path.GetDirectoryName(value);
-                if (string.IsNullOrEmpty(directory))
-                    continue;
-                fileHolder = Shared.Models.Stateless.Methods.IFileHolder.Get(file);
-                filePath = FilePath.Get(propertyConfiguration, fileHolder, index: null);
-                results.Add(new(filePath, value));
-                if (!distinctDirectories.Contains(directory))
-                    distinctDirectories.Add(directory);
-            }
-        }
-        return (distinctDirectories.ToArray(), results);
-    }
-
     private List<string> CopyDistinctFilesInDirectories(ILogger<Program>? logger, bool move, ReadOnlyCollection<string[]> filesCollection, bool anyLenFiles, bool moveBack)
     {
         List<string> results = [];
@@ -229,4 +165,70 @@ public class CopyDistinct
         return results;
     }
 
+    private static (string[], List<(FilePath, string)>) GetMoveBackToDoCollection(Property.Models.Configuration propertyConfiguration, ReadOnlyCollection<string[]> filesCollection)
+    {
+        List<(FilePath, string)> results = [];
+        string key;
+        string? value;
+        string fileName;
+        FilePath filePath;
+        string? directory;
+        FileHolder fileHolder;
+        string destinationFile;
+        List<string> distinctFound = [];
+        List<string> distinctNeeded = [];
+        List<string> distinctDirectories = [];
+        Dictionary<string, string> nameToPath = [];
+        for (int i = 1; i < 3; i++)
+        {
+            foreach (string[] files in filesCollection)
+            {
+                foreach (string file in files.Reverse())
+                {
+                    fileName = Path.GetFileName(file);
+                    if (fileName.EndsWith("len"))
+                    {
+                        key = fileName[..^3];
+                        destinationFile = file[..^3];
+                        if (nameToPath.ContainsKey(key))
+                            continue;
+                        nameToPath.Add(key, destinationFile);
+                    }
+                    else
+                    {
+                        if (!distinctNeeded.Contains(file))
+                            distinctNeeded.Add(file);
+                        if (!nameToPath.ContainsKey(fileName))
+                            continue;
+                        if (distinctFound.Contains(file))
+                            continue;
+                        distinctFound.Add(file);
+                    }
+                }
+            }
+        }
+        foreach (string[] files in filesCollection)
+        {
+            foreach (string file in files)
+            {
+                // if (distinctNeeded.Count != distinctFound.Count)
+                //     continue;
+                fileName = Path.GetFileName(file);
+                if (fileName.EndsWith("len"))
+                    continue;
+                if (!nameToPath.TryGetValue(fileName, out value))
+                    continue;
+                directory = Path.GetDirectoryName(value);
+                if (string.IsNullOrEmpty(directory))
+                    continue;
+                fileHolder = Shared.Models.Stateless.Methods.IFileHolder.Get(file);
+                filePath = FilePath.Get(propertyConfiguration, fileHolder, index: null);
+                results.Add(new(filePath, value));
+                if (!distinctDirectories.Contains(directory))
+                    distinctDirectories.Add(directory);
+            }
+        }
+        return (distinctDirectories.ToArray(), results);
+    }
+
 }

Date-Group/Date-Group.csproj

@@ -34,15 +34,15 @@
         <SupportedPlatform Include="browser" />
     </ItemGroup>
     <ItemGroup>
-        <PackageReference Include="Microsoft.AspNetCore.Cryptography.KeyDerivation" Version="9.0.0" />
-        <PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.0" />
-        <PackageReference Include="Microsoft.Extensions.Identity.Core" Version="9.0.0" />
-        <PackageReference Include="Microsoft.Extensions.Options" Version="9.0.0" />
+        <PackageReference Include="Microsoft.AspNetCore.Cryptography.KeyDerivation" Version="9.0.2" />
+        <PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.2" />
+        <PackageReference Include="Microsoft.Extensions.Identity.Core" Version="9.0.2" />
+        <PackageReference Include="Microsoft.Extensions.Options" Version="9.0.2" />
         <PackageReference Include="MetadataExtractor" Version="2.8.1" />
         <PackageReference Include="ShellProgressBar" Version="5.2.0" />
         <PackageReference Include="WindowsShortcutFactory" Version="1.2.0" />
         <PackageReference Include="System.Drawing.Common" Version="8.0.10" />
-        <PackageReference Include="System.Text.Json" Version="9.0.0" />
+        <PackageReference Include="System.Text.Json" Version="9.0.2" />
     </ItemGroup>
     <ItemGroup>
         <ProjectReference Include="..\Shared\View-by-Distance.Shared.csproj" />

Date-Group/DateGroup.cs

@@ -57,11 +57,11 @@ public class DateGroup
         string aPropertySingletonDirectory = Path.Combine(aResultsFullGroupDirectory, "{}");
         if (!Directory.Exists(aPropertySingletonDirectory))
             _ = Directory.CreateDirectory(aPropertySingletonDirectory);
-        (int t, Container[] containers) = Shared.Models.Stateless.Methods.IContainer.GetContainers(propertyConfiguration, aPropertySingletonDirectory);
+        (int t, Container.Models.Container[] containers) = Container.Models.Stateless.Methods.IContainer.GetContainers(propertyConfiguration, aPropertySingletonDirectory);
         A_Property propertyLogic = GetPropertyLogic(reverse, aResultsFullGroupDirectory, aResultsFullGroupDirectory);
         if (propertyLogic.ExceptionsDirectories.Count != 0)
             throw new Exception();
-        if (propertyConfiguration.PopulatePropertyId && (configuration.ByCreateDateShortcut || configuration.ByHash) && Shared.Models.Stateless.Methods.IProperty.Any(containers))
+        if (propertyConfiguration.PopulatePropertyId && (configuration.ByCreateDateShortcut || configuration.ByHash) && Property.Models.Stateless.IProperty.Any(containers))
         {
             propertyLogic.SavePropertyParallelWork(ticks, metadata, t, containers);
             if (propertyLogic.ExceptionsDirectories.Count != 0)
@@ -251,11 +251,11 @@ public class DateGroup
                     if (topDirectoryName.Length > 1)
                         _ = destinationDirectoryName.Append(topDirectoryName);
                     if (_Configuration.BySeason)
-                        directoryNames.AddRange(new string[] { $"{destinationDirectoryName} {year} {seasonName}" });
+                        directoryNames.AddRange([$"{destinationDirectoryName} {year} {seasonName}"]);
                     else if (_Configuration.ByDay)
-                        directoryNames.AddRange(new string[] { $"{destinationDirectoryName} {year}", $"{weekOfYear}) {year}-{day}" });
+                        directoryNames.AddRange([$"{destinationDirectoryName} {year}", $"{weekOfYear}) {year}-{day}"]);
                     else if (_Configuration.ByWeek)
-                        directoryNames.AddRange(new string[] { $"{destinationDirectoryName} {year}", $"{weekOfYear}) {year} {month}" });
+                        directoryNames.AddRange([$"{destinationDirectoryName} {year}", $"{weekOfYear}) {year} {month}"]);
                     else
                         throw new Exception();
                 }
@@ -302,7 +302,7 @@ public class DateGroup
         return result;
     }
 
-    private static Item[] GetFilterItems(Container container)
+    private static Item[] GetFilterItems(Container.Models.Container container)
     {
         List<Item> results = [];
         foreach (Item item in container.Items)
@@ -313,7 +313,7 @@ public class DateGroup
         return results.ToArray();
     }
 
-    private (Item Item, long LastWriteTimeTicks, long MinimumDateTimeTicks, string[] Destination)[] GetFileMoveCollectionAll(Property.Models.Configuration configuration, string destinationRoot, Container[] containers)
+    private (Item Item, long LastWriteTimeTicks, long MinimumDateTimeTicks, string[] Destination)[] GetFileMoveCollectionAll(Property.Models.Configuration configuration, string destinationRoot, Container.Models.Container[] containers)
     {
         (Item Item, long LastWriteTimeTicks, long MinimumDateTimeTicks, string[] Destination)[] results;
         Item[] filteredItems;
@@ -322,7 +322,7 @@ public class DateGroup
         string destinationDirectory;
         List<(Item Item, long LastWriteTimeTicks, long MinimumDateTimeTicks, string[] Destination)> fileMoveCollection = [];
         List<(Item Item, long LastWriteTimeTicks, long MinimumDateTimeTicks, string[] Destination)> fileMoveCollectionDirectory;
-        foreach (Container container in containers)
+        foreach (Container.Models.Container container in containers)
         {
             if (container.Items.Count == 0)
                 continue;
@@ -352,7 +352,7 @@ public class DateGroup
         return results;
     }
 
-    private void MoveFiles(Property.Models.Configuration configuration, string destinationRoot, Container[] containers)
+    private void MoveFiles(Property.Models.Configuration configuration, string destinationRoot, Container.Models.Container[] containers)
     {
         string checkDirectory;
         bool hasDuplicate;
@@ -453,7 +453,7 @@ public class DateGroup
             _ = Shared.Models.Stateless.Methods.IPath.DeleteEmptyDirectories(configuration.RootDirectory);
     }
 
-    private static void CreateDateShortcut(Property.Models.Configuration configuration, Container[] containers)
+    private static void CreateDateShortcut(Property.Models.Configuration configuration, Container.Models.Container[] containers)
     {
         string path;
         string fileName;
@@ -468,17 +468,17 @@ public class DateGroup
         WindowsShortcut windowsShortcut;
         TimeSpan threeStandardDeviationHigh;
         string aPropertyContentDirectory = Property.Models.Stateless.IResult.GetResultsDateGroupDirectory(configuration, nameof(A_Property), "()");
-        foreach (Container container in containers)
+        foreach (Container.Models.Container container in containers)
         {
             if (container.Items.Count == 0)
                 continue;
             selectedTotal = 0;
-            threeStandardDeviationHigh = Shared.Models.Stateless.Methods.IProperty.GetThreeStandardDeviationHigh(minimum, container);
+            threeStandardDeviationHigh = Property.Models.Stateless.IProperty.GetThreeStandardDeviationHigh(minimum, container);
             if (threeStandardDeviationHigh.TotalHours > maximumHours)
                 threeStandardDeviationHigh = new(maximumHours, 0, 0);
             for (int i = 0; i < container.Items.Count; i++)
             {
-                (i, dateTimes, selectedItems) = Shared.Models.Stateless.Methods.IProperty.Get(container, threeStandardDeviationHigh, i);
+                (i, dateTimes, selectedItems) = Property.Models.Stateless.IProperty.Get(container, threeStandardDeviationHigh, i);
                 selectedTotal += selectedItems.Count;
                 foreach (Item item in selectedItems)
                 {

Delete-By-Distinct/Delete-By-Distinct.csproj

@@ -34,14 +34,14 @@
         <SupportedPlatform Include="browser" />
     </ItemGroup>
     <ItemGroup>
-        <PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.0" />
-        <PackageReference Include="Microsoft.AspNetCore.Cryptography.KeyDerivation" Version="9.0.0" />
-        <PackageReference Include="Microsoft.Extensions.Identity.Core" Version="9.0.0" />
-        <PackageReference Include="Microsoft.Extensions.Options" Version="9.0.0" />
+        <PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.2" />
+        <PackageReference Include="Microsoft.AspNetCore.Cryptography.KeyDerivation" Version="9.0.2" />
+        <PackageReference Include="Microsoft.Extensions.Identity.Core" Version="9.0.2" />
+        <PackageReference Include="Microsoft.Extensions.Options" Version="9.0.2" />
         <PackageReference Include="ShellProgressBar" Version="5.2.0" />
         <PackageReference Include="WindowsShortcutFactory" Version="1.2.0" />
         <PackageReference Include="System.Drawing.Common" Version="8.0.10" />
-        <PackageReference Include="System.Text.Json" Version="9.0.0" />
+        <PackageReference Include="System.Text.Json" Version="9.0.2" />
     </ItemGroup>
     <ItemGroup>
         <ProjectReference Include="..\Property\Property.csproj" />

Delete-By-Relative/Delete-By-Relative.csproj

@@ -34,14 +34,14 @@
         <SupportedPlatform Include="browser" />
     </ItemGroup>
     <ItemGroup>
-        <PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.0" />
-        <PackageReference Include="Microsoft.AspNetCore.Cryptography.KeyDerivation" Version="9.0.0" />
-        <PackageReference Include="Microsoft.Extensions.Identity.Core" Version="9.0.0" />
-        <PackageReference Include="Microsoft.Extensions.Options" Version="9.0.0" />
+        <PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.2" />
+        <PackageReference Include="Microsoft.AspNetCore.Cryptography.KeyDerivation" Version="9.0.2" />
+        <PackageReference Include="Microsoft.Extensions.Identity.Core" Version="9.0.2" />
+        <PackageReference Include="Microsoft.Extensions.Options" Version="9.0.2" />
         <PackageReference Include="ShellProgressBar" Version="5.2.0" />
         <PackageReference Include="WindowsShortcutFactory" Version="1.2.0" />
         <PackageReference Include="System.Drawing.Common" Version="8.0.10" />
-        <PackageReference Include="System.Text.Json" Version="9.0.0" />
+        <PackageReference Include="System.Text.Json" Version="9.0.2" />
     </ItemGroup>
     <ItemGroup>
         <ProjectReference Include="..\Property\Property.csproj" />

Distance/Distance.csproj

@@ -36,7 +36,7 @@
         <PackageReference Include="Humanizer.Core" Version="2.14.1" />
         <PackageReference Include="MetadataExtractor" Version="2.8.1" />
         <PackageReference Include="ShellProgressBar" Version="5.2.0" />
-        <PackageReference Include="System.Text.Json" Version="9.0.0" />
+        <PackageReference Include="System.Text.Json" Version="9.0.2" />
     </ItemGroup>
     <ItemGroup>
         <ProjectReference Include="..\FaceRecognitionDotNet\FaceRecognitionDotNet.csproj" />

Distance/Models/_E_Distance.cs

@@ -358,7 +358,7 @@ public partial class E_Distance : IDistance
             }
             results.Add(keyValuePair.Key, new(keyValuePairs));
         }
-        return new(results);
+        return results.AsReadOnly();
     }
 
     public static List<LocationContainer> GetPreFilterLocationContainer(int maxDegreeOfParallelism, Configuration configuration, string focusDirectory, string focusModel, int? skipPersonWithMoreThen, long ticks, MapLogic mapLogic, long[] jLinkResolvedPersonKeys, ReadOnlyDictionary<int, ReadOnlyDictionary<int, LocationContainer>> mapped, List<LocationContainer> available)
@@ -509,7 +509,7 @@ public partial class E_Distance : IDistance
             faceDistanceContainer = new(face, faceDistance);
             collection.Add(faceDistanceContainer);
         }
-        results = new(collection.ToArray());
+        results = collection.AsReadOnly();
         return results;
     }
 
@@ -568,7 +568,7 @@ public partial class E_Distance : IDistance
             foreach (KeyValuePair<int, LocationContainer> keyValue in keyValuePair.Value)
                 results.Add(keyValue.Value);
         }
-        return new(results);
+        return results.AsReadOnly();
     }
 
     public static ReadOnlyCollection<LocationContainer> GetMatrixLocationContainers(IDlibDotNet dlibDotNet, Configuration mapConfiguration, long ticks, MapLogic mapLogic, ReadOnlyDictionary<int, ReadOnlyDictionary<int, LocationContainer>> mappedWithEncoding, List<LocationContainer> preFiltered, DistanceLimits distanceLimits, List<LocationContainer> postFiltered)
@@ -624,7 +624,7 @@ public partial class E_Distance : IDistance
             results = ISortingContainer.Sort(results);
         else
             results = ISortingContainer.SortUsingDaysDelta(results);
-        return new(results);
+        return results.AsReadOnly();
     }
 
     private static ReadOnlyCollection<RelationContainer> GetRelationCollections(IDistanceLimits distanceLimits, int faceDistancePermyriad, int locationContainerDistanceTake, float distanceTolerance, List<Record> records)
@@ -672,7 +672,7 @@ public partial class E_Distance : IDistance
             mappedRelations = (from l in mappedRelations orderby l.DistancePermyriad select l).Take(locationContainerDistanceTake).ToList();
             results.Add(new(fileHolder, new(mappedRelations)));
         }
-        return new(results);
+        return results.AsReadOnly();
     }
 
     ReadOnlyCollection<RelationContainer> IDistance.GetRelationContainers(IDistanceLimits distanceLimits, int faceDistancePermyriad, int locationContainerDistanceTake, float locationContainerDistanceTolerance, ReadOnlyCollection<LocationContainer> locationContainers)

Drag-Drop-Explorer/Drag-Drop-Explorer.csproj

@@ -26,9 +26,9 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Humanizer.Core" Version="2.14.1" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="9.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="9.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="9.0.2" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="9.0.2" />
+    <PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.2" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Shared\View-by-Distance.Shared.csproj" />

Drag-Drop-Explorer/Program.cs

@@ -6,10 +6,8 @@ public class Program
     ///  The main entry point for the application.
     /// </summary>
     [STAThread]
-    private static void Main()
-    {
+    private static void Main() =>
         // ApplicationConfiguration.Initialize();
         Application.Run(new DragDropExplorer());
-    }
 
 }

Drag-Drop-Move/Drag-Drop-Move.csproj

@@ -26,9 +26,9 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Humanizer.Core" Version="2.14.1" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="9.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="9.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="9.0.2" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="9.0.2" />
+    <PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.2" />
     <PackageReference Include="WindowsShortcutFactory" Version="1.2.0" />
   </ItemGroup>
   <ItemGroup>

Drag-Drop-Move/Program.cs

@@ -6,10 +6,8 @@ public class Program
     ///  The main entry point for the application.
     /// </summary>
     [STAThread]
-    private static void Main()
-    {
+    private static void Main() =>
         // ApplicationConfiguration.Initialize();
         Application.Run(new DragDropMove());
-    }
 
 }

Drag-Drop-Search/Drag-Drop-Search.csproj

@@ -27,13 +27,14 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Humanizer.Core" Version="2.14.1" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="9.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="9.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="9.0.2" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="9.0.2" />
+    <PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.2" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\FaceRecognitionDotNet\FaceRecognitionDotNet.csproj" />
     <ProjectReference Include="..\Metadata\Metadata.csproj" />
+    <ProjectReference Include="..\Container\Container.csproj" />
     <ProjectReference Include="..\Property\Property.csproj" />
     <ProjectReference Include="..\Resize\Resize.csproj" />
     <ProjectReference Include="..\Shared\View-by-Distance.Shared.csproj" />

Drag-Drop-Search/DragDropSearch.cs

@@ -107,9 +107,9 @@ public partial class DragDropSearch : Form
 
     private void LoadData()
     {
-        Container[] containers;
+        Container.Models.Container[] containers;
         string aPropertySingletonDirectory = Property.Models.Stateless.IResult.GetResultsDateGroupDirectory(_Configuration.PropertyConfiguration, nameof(A_Property), "{}");
-        (_, containers) = IContainer.GetContainers(_Configuration.PropertyConfiguration, aPropertySingletonDirectory);
+        (_, containers) = View_by_Distance.Container.Models.Stateless.Methods.IContainer.GetContainers(_Configuration.PropertyConfiguration, aPropertySingletonDirectory);
         List<Item> collection = Program.GetItemCollection(_Configuration, containers);
         foreach (Item item in collection)
         {

Drag-Drop-Search/Program.cs

@@ -8,13 +8,11 @@ public class Program
     ///  The main entry point for the application.
     /// </summary>
     [STAThread]
-    private static void Main()
-    {
+    private static void Main() =>
         // ApplicationConfiguration.Initialize();
         Application.Run(new DragDropSearch());
-    }
 
-    private static Item[] GetFilterItems(Models.Configuration configuration, Container container)
+    private static Item[] GetFilterItems(Models.Configuration configuration, Container.Models.Container container)
     {
         List<Item> results = [];
         foreach (Item item in container.Items)
@@ -26,11 +24,11 @@ public class Program
         return results.ToArray();
     }
 
-    public static List<Item> GetItemCollection(Models.Configuration configuration, Container[] containers)
+    public static List<Item> GetItemCollection(Models.Configuration configuration, Container.Models.Container[] containers)
     {
         List<Item> results = [];
         Item[] filteredItems;
-        foreach (Container container in containers)
+        foreach (Container.Models.Container container in containers)
         {
             if (container.Items.Count == 0)
                 continue;

Drag-Drop-Set-Property-Item/Drag-Drop-Set-Property-Item.csproj

@@ -27,9 +27,9 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Humanizer.Core" Version="2.14.1" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="9.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="9.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="9.0.2" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="9.0.2" />
+    <PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.2" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Metadata\Metadata.csproj" />

Drag-Drop-Set-Property-Item/Program.cs

@@ -6,10 +6,8 @@ public class Program
     ///  The main entry point for the application.
     /// </summary>
     [STAThread]
-    private static void Main()
-    {
+    private static void Main() =>
         // ApplicationConfiguration.Initialize();
         Application.Run(new DragDropSetPropertyItem());
-    }
 
 }

Duplicate-Search/Duplicate-Search.csproj

@@ -33,14 +33,14 @@
         <SupportedPlatform Include="browser" />
     </ItemGroup>
     <ItemGroup>
-        <PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.0" />
-        <PackageReference Include="Microsoft.AspNetCore.Cryptography.KeyDerivation" Version="9.0.0" />
-        <PackageReference Include="Microsoft.Extensions.Identity.Core" Version="9.0.0" />
-        <PackageReference Include="Microsoft.Extensions.Options" Version="9.0.0" />
+        <PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.2" />
+        <PackageReference Include="Microsoft.AspNetCore.Cryptography.KeyDerivation" Version="9.0.2" />
+        <PackageReference Include="Microsoft.Extensions.Identity.Core" Version="9.0.2" />
+        <PackageReference Include="Microsoft.Extensions.Options" Version="9.0.2" />
         <PackageReference Include="ShellProgressBar" Version="5.2.0" />
         <PackageReference Include="WindowsShortcutFactory" Version="1.2.0" />
         <PackageReference Include="System.Drawing.Common" Version="8.0.10" />
-        <PackageReference Include="System.Text.Json" Version="9.0.0" />
+        <PackageReference Include="System.Text.Json" Version="9.0.2" />
     </ItemGroup>
     <ItemGroup>
         <ProjectReference Include="..\Property\Property.csproj" />

Duplicate-Search/DuplicateSearch.cs

@@ -30,7 +30,7 @@ public class DuplicateSearch
         else
         {
             Configuration.Verify(configuration, requireExist: false);
-            Container[] containers = GetContainers(ticks, configuration);
+            Container.Models.Container[] containers = GetContainers(ticks, configuration);
             string argZero = args.Count > 0 ? Path.GetFullPath(args[0]) : Path.GetFullPath(configuration.RootDirectory);
             bool argZeroIsConfigurationRootDirectory = configuration.RootDirectory == argZero;
             string destinationRoot = Property.Models.Stateless.IResult.GetResultsGroupDirectory(configuration, "Z) Moved");
@@ -125,10 +125,10 @@ public class DuplicateSearch
         }
     }
 
-    private static Container[] GetContainers(long ticks, Configuration configuration)
+    private static Container.Models.Container[] GetContainers(long ticks, Configuration configuration)
     {
         int f;
-        Container[] containers;
+        Container.Models.Container[] containers;
         int totalSeconds = (int)Math.Floor(new TimeSpan(DateTime.Now.Ticks - ticks).TotalSeconds);
         string message = $") Building Container(s) - {totalSeconds} total second(s)";
         ProgressBarOptions options = new() { ProgressCharacter = '─', ProgressBarOnBottom = true, DisableBottomPercentage = true };
@@ -136,12 +136,12 @@ public class DuplicateSearch
         {
             progressBar.Tick();
             string aPropertySingletonDirectory = Property.Models.Stateless.IResult.GetResultsDateGroupDirectory(configuration, nameof(A_Property), "{}");
-            (f, containers) = Shared.Models.Stateless.Methods.IContainer.GetContainers(configuration, aPropertySingletonDirectory);
+            (f, containers) = Container.Models.Stateless.Methods.IContainer.GetContainers(configuration, aPropertySingletonDirectory);
         }
         return containers;
     }
 
-    private static Dictionary<int, List<MappingFromItem?>> GetIdToCollection(string argZero, Configuration configuration, bool argZeroIsConfigurationRootDirectory, Container[] containers, string destinationRoot, List<int> preloadIds)
+    private static Dictionary<int, List<MappingFromItem?>> GetIdToCollection(string argZero, Configuration configuration, bool argZeroIsConfigurationRootDirectory, Container.Models.Container[] containers, string destinationRoot, List<int> preloadIds)
     {
         Dictionary<int, List<MappingFromItem?>> results = [];
         string directory;
@@ -157,16 +157,16 @@ public class DuplicateSearch
             foreach (int id in preloadIds)
                 results.Add(id, [null]);
         }
-        foreach (Container container in containers)
+        foreach (Container.Models.Container container in containers)
         {
             if (container.Items.Count == 0)
                 continue;
             if (!argZeroIsConfigurationRootDirectory && !container.SourceDirectory.StartsWith(argZero))
                 continue;
-            validImageItems = Shared.Models.Stateless.Methods.IContainer.GetValidImageItems(configuration, container);
+            validImageItems = Container.Models.Stateless.Methods.IContainer.GetValidImageItems(configuration, container);
             if (validImageItems.Count == 0)
                 continue;
-            containerDateTimes = Shared.Models.Stateless.Methods.IContainer.GetContainerDateTimes(validImageItems);
+            containerDateTimes = Container.Models.Stateless.Methods.IContainer.GetContainerDateTimes(validImageItems);
             foreach (Item item in validImageItems)
             {
                 if (item.Property?.Id is null)

Face/Face.csproj

@@ -33,7 +33,7 @@
         <SupportedPlatform Include="browser" />
     </ItemGroup>
     <ItemGroup>
-        <PackageReference Include="System.Text.Json" Version="9.0.0" />
+        <PackageReference Include="System.Text.Json" Version="9.0.2" />
     </ItemGroup>
     <ItemGroup>
         <ProjectReference Include="..\FaceRecognitionDotNet\FaceRecognitionDotNet.csproj" />

Face/Models/_D_Face.cs

@@ -46,7 +46,8 @@ public class D_Face : IFaceD
     private readonly EncoderParameters _HiddenEncoderParameters;
     private readonly IPropertyConfiguration _PropertyConfiguration;
     private readonly JsonSerializerOptions _WriteIndentedAndWhenWritingNull;
-    private readonly Dictionary<string, ReadOnlyCollection<string>> _FileGroups;
+    private readonly ReadOnlyDictionary<byte, ReadOnlyCollection<string>>[] _ResultContentFileGroups;
+    private readonly ReadOnlyDictionary<byte, ReadOnlyCollection<string>>[] _ResultCollectionFileGroups;
 
     public D_Face(
         string argZero,
@@ -69,7 +70,6 @@ public class D_Face : IFaceD
         float[] rectangleIntersectMinimums)
     {
         _ArgZero = argZero;
-        _FileGroups = [];
         _ImageCodecInfo = imageCodecInfo;
         _EncoderParameters = encoderParameters;
         _FileNameExtension = filenameExtension;
@@ -84,6 +84,8 @@ public class D_Face : IFaceD
         _RectangleIntersectMinimum = rectangleIntersectMinimums.Min();
         _FaceDistanceHiddenImageFactor = faceDistanceHiddenImageFactor;
         _ForceFaceLastWriteTimeToCreationTime = forceFaceLastWriteTimeToCreationTime;
+        _ResultContentFileGroups = [new(new Dictionary<byte, ReadOnlyCollection<string>>())];
+        _ResultCollectionFileGroups = [new(new Dictionary<byte, ReadOnlyCollection<string>>())];
         (Model model, PredictorModel predictorModel, ModelParameter modelParameter) = GetModel(modelDirectory, modelName, predictorModelName);
         _Model = model;
         _PredictorModel = predictorModel;
@@ -93,6 +95,73 @@ public class D_Face : IFaceD
         _WriteIndentedAndWhenWritingNull = new JsonSerializerOptions { WriteIndented = true, DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull };
     }
 
+    void IFaceD.ReSaveFace(ExifDirectory exifDirectory, FilePath filePath, Shared.Models.Face face, bool mappedFile)
+    {
+        FileInfo fileInfo = new(filePath.FullName);
+        if (fileInfo.Exists)
+        {
+            string? json;
+            short type = 2;
+            string? model;
+            string? maker;
+            string checkFile = $"{filePath.FullName}.exif";
+            const int artist = MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagArtist;
+            // const int author = MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagWinAuthor; // 40093
+            if (mappedFile)
+            {
+                json = IMetadata.GetOutputResolution(exifDirectory);
+                if (json is not null && json.Contains(nameof(DateTime)))
+                    return;
+                (maker, model) = Get(json);
+            }
+            else
+            {
+                maker = IMetadata.GetMaker(exifDirectory);
+                model = IMetadata.GetModel(exifDirectory);
+                ExifDirectory? faceExifDirectory = IMetadata.GetExifDirectory(filePath);
+                json = IMetadata.GetOutputResolution(faceExifDirectory);
+                if (json is not null && json.Contains(nameof(DateTime)))
+                    return;
+            }
+            MetadataExtractor.GeoLocation? geoLocation = IMetadata.GeoLocation(exifDirectory);
+            FaceFile faceFile = new(face.Mapping?.MappingFromLocation?.AreaPermyriad,
+                                    face.Mapping?.MappingFromLocation?.ConfidencePercent,
+                                    geoLocation?.ToDmsString(),
+                                    face.DateTime,
+                                    null,
+                                    face.FaceParts,
+                                    face.Location,
+                                    maker,
+                                    null,
+                                    model,
+                                    face.OutputResolution);
+            string faceFileJson = JsonSerializer.Serialize(faceFile, FaceFileGenerationContext.Default.FaceFile);
+            ConstructorInfo? constructorInfo = typeof(PropertyItem).GetConstructor(BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.Public, null, [], null) ?? throw new Exception();
+            PropertyItem? propertyItem = Property.Models.Stateless.IProperty.GetPropertyItem(constructorInfo, artist, type, faceFileJson);
+#pragma warning disable CA1416
+            Bitmap bitmap = new(fileInfo.FullName);
+            bitmap.SetPropertyItem(propertyItem);
+            bitmap.Save(checkFile);
+            bitmap.Dispose();
+#pragma warning restore CA1416
+            File.SetLastWriteTime(checkFile, fileInfo.LastWriteTime);
+            File.Delete(fileInfo.FullName);
+            File.Move(checkFile, fileInfo.FullName);
+        }
+    }
+
+    private static (string?, string?) Get(string? json)
+    {
+        string? model;
+        string? maker;
+        FaceFile? faceFile = json is null ? null : JsonSerializer.Deserialize(json, FaceFileGenerationContext.Default.FaceFile);
+        if (faceFile is null || faceFile.Location is null)
+            (maker, model) = (null, null);
+        else
+            (maker, model) = (faceFile.Maker, faceFile.Model);
+        return (maker, model);
+    }
+
     public override string ToString()
     {
         string result = JsonSerializer.Serialize(this, new JsonSerializerOptions() { WriteIndented = true });
@@ -101,136 +170,174 @@ public class D_Face : IFaceD
 
     public void Update(string dResultsFullGroupDirectory)
     {
-        _FileGroups.Clear();
-        ReadOnlyDictionary<string, ReadOnlyCollection<string>> keyValuePairs = Shared.Models.Stateless.Methods.IPath.GetKeyValuePairs(_PropertyConfiguration, dResultsFullGroupDirectory, [_PropertyConfiguration.ResultCollection, _PropertyConfiguration.ResultContent]);
-        foreach (KeyValuePair<string, ReadOnlyCollection<string>> keyValuePair in keyValuePairs)
-            _FileGroups.Add(keyValuePair.Key, keyValuePair.Value);
+        ReadOnlyDictionary<string, ReadOnlyDictionary<byte, ReadOnlyCollection<string>>> keyValuePairs = Shared.Models.Stateless.Methods.IPath.GetKeyValuePairs(_PropertyConfiguration, dResultsFullGroupDirectory, [_PropertyConfiguration.ResultCollection, _PropertyConfiguration.ResultContent]);
+        foreach (KeyValuePair<string, ReadOnlyDictionary<byte, ReadOnlyCollection<string>>> keyValuePair in keyValuePairs)
+        {
+            if (keyValuePair.Key == _PropertyConfiguration.ResultContent)
+                _ResultContentFileGroups[0] = keyValuePair.Value;
+            else if (keyValuePair.Key == _PropertyConfiguration.ResultCollection)
+                _ResultCollectionFileGroups[0] = keyValuePair.Value;
+            else
+                throw new Exception();
+        }
     }
 
-    private static (Model model, PredictorModel predictorModel, ModelParameter modelParameter) GetModel(string modelDirectory, string modelName, string predictorModelName)
+    public List<(Shared.Models.Face, FileHolder?, string, bool)> SaveFaces(FilePath filePath, List<Tuple<string, DateTime>> subFileTuples, List<string> parseExceptions, MappingFromItem mappingFromItem, ExifDirectory exifDirectory, List<Shared.Models.Face> faces)
     {
-        (Model, PredictorModel, ModelParameter) result;
-        Array array;
-        Model? model = null;
-        array = Enum.GetValues<Model>();
-        PredictorModel? predictorModel = null;
-        foreach (Model check in array)
+        List<(Shared.Models.Face, FileHolder?, string, bool Save)> results = [];
+        bool save;
+        FileInfo fileInfo;
+        FileHolder fileHolder;
+        string deterministicHashCodeKey;
+        string fileName = mappingFromItem.FilePath.NameWithoutExtension;
+        string[] changesFrom = [nameof(A_Property), nameof(B_Metadata), nameof(C_Resize)];
+        List<DateTime> dateTimes = (from l in subFileTuples where changesFrom.Contains(l.Item1) select l.Item2).ToList();
+        CombinedEnumAndIndex cei = Shared.Models.Stateless.Methods.IPath.GetCombinedEnumAndIndex(_PropertyConfiguration, filePath);
+        string directory = _ResultContentFileGroups[0][cei.Enum][cei.Index];
+        DirectoryInfo directoryInfo = new(Path.Combine(directory, fileName));
+        MoveIf(fileName, cei, directory, directoryInfo);
+        foreach (Shared.Models.Face face in faces)
         {
-            if (modelName.Contains(check.ToString()))
+            save = false;
+            if (face.FaceEncoding is null || face.Location is null || face.OutputResolution is null)
             {
-                model = check;
-                break;
+                results.Add(new(face, null, string.Empty, save));
+                continue;
             }
+            deterministicHashCodeKey = Shared.Models.Stateless.Methods.IMapping.GetDeterministicHashCodeKey(filePath, face.Location, Shared.Models.Stateless.ILocation.Digits, face.OutputResolution);
+            fileInfo = new FileInfo(Path.Combine(directoryInfo.FullName, $"{deterministicHashCodeKey}{mappingFromItem.FilePath.ExtensionLowered}{_FileNameExtension}"));
+            fileHolder = FileHolder.Get(fileInfo);
+            if (!directoryInfo.Exists)
+                save = true;
+            else if (_OverrideForFaceImages)
+                save = true;
+            else if (!fileHolder.Exists)
+                save = true;
+            else if (_CheckDFaceAndUpWriteDates && dateTimes.Count > 0 && dateTimes.Max() > fileInfo.LastWriteTime)
+                save = true;
+            results.Add(new(face, fileHolder, Path.Combine(directoryInfo.FullName, $"{deterministicHashCodeKey}{mappingFromItem.FilePath.ExtensionLowered}{_HiddenFileNameExtension}"), save));
         }
-        if (model is null)
-            throw new Exception("Destination directory must have Model name!");
-        model = model.Value;
-        array = Enum.GetValues<PredictorModel>();
-        foreach (PredictorModel check in array)
+        if (results.Any(l => l.Save))
         {
-            if (predictorModelName.Contains(check.ToString()))
-            {
-                predictorModel = check;
-                break;
-            }
+            if (!directoryInfo.Exists)
+                _ = Directory.CreateDirectory(directoryInfo.FullName);
+            SaveFaces(mappingFromItem.ResizedFileHolder, exifDirectory, results);
         }
-        if (predictorModel is null)
-            throw new Exception("Destination directory must have Predictor Model name!");
-        predictorModel = predictorModel.Value;
-        ModelParameter modelParameter = new()
-        {
-            CnnFaceDetectorModel = File.ReadAllBytes(Path.Combine(modelDirectory, "mmod_human_face_detector.dat")),
-            FaceRecognitionModel = File.ReadAllBytes(Path.Combine(modelDirectory, "dlib_face_recognition_resnet_model_v1.dat")),
-            PosePredictor5FaceLandmarksModel = File.ReadAllBytes(Path.Combine(modelDirectory, "shape_predictor_5_face_landmarks.dat")),
-            PosePredictor68FaceLandmarksModel = File.ReadAllBytes(Path.Combine(modelDirectory, "shape_predictor_68_face_landmarks.dat"))
-        };
-        result = new(model.Value, predictorModel.Value, modelParameter);
-        return result;
+        return results;
     }
 
-#pragma warning disable CA1416
-
-    private void SaveFaces(FileHolder resizedFileHolder, ExifDirectory exifDirectory, List<(Shared.Models.Face, FileHolder?, string, bool)> collection)
+    private static void MoveIf(string fileName, CombinedEnumAndIndex cei, string directory, FileInfo fileInfo)
     {
-        int width;
-        int height;
-        Bitmap bitmap;
-        short type = 2;
-        FaceFile faceFile;
-        Graphics graphics;
-        Location? location;
-        Rectangle rectangle;
-        string faceFileJson;
-        string faceEncodingJson;
-        PropertyItem? propertyItem;
-        string? maker = IMetadata.GetMaker(exifDirectory);
-        string? model = IMetadata.GetModel(exifDirectory);
-        using Bitmap source = new(resizedFileHolder.FullName);
-        MetadataExtractor.GeoLocation? geoLocation = IMetadata.GeoLocation(exifDirectory);
-        const int artist = MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagArtist; // 315
-        const int userComment = MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagUserComment;
-        foreach ((Shared.Models.Face face, FileHolder? fileHolder, string fileName, bool save) in collection)
+        string[] segments = directory.Split(cei.Combined);
+        string? checkDirectory = segments.Length == 1 ?
+            Path.Combine(segments[0], $"{cei.Combined[2..]}") :
+                segments.Length == 2 ?
+                    $"{segments[0]}{cei.Combined[2..]}{segments[1]}" :
+                        null;
+        if (checkDirectory is not null && Directory.Exists(checkDirectory))
         {
-            if (!save)
-                continue;
-            if (fileHolder is null)
-                continue;
-            if (face.FaceEncoding is null || face?.Location is null || face?.OutputResolution is null)
-                continue;
-            if (_OverrideForFaceImages && fileHolder.Exists)
+            string checkFile = Path.Combine(checkDirectory, fileName);
+            if (File.Exists(checkFile))
             {
-                IFaceD dFace = this;
-                FilePath filePath = FilePath.Get(_PropertyConfiguration, fileHolder, index: null);
-                dFace.ReSaveFace(exifDirectory, filePath, face, mappedFile: false);
-                continue;
+                File.Move(checkFile, fileInfo.FullName);
+                fileInfo.Refresh();
             }
-            location = Shared.Models.Stateless.Methods.ILocation.GetLocation(face.Location, Shared.Models.Stateless.ILocation.Digits, Shared.Models.Stateless.ILocation.Factor, source.Height, source.Width, collection.Count);
-            if (location is null)
-                continue;
-            width = location.Right - location.Left;
-            height = location.Bottom - location.Top;
-            faceEncodingJson = JsonSerializer.Serialize(face.FaceEncoding);
-            rectangle = new Rectangle(location.Left, location.Top, width, height);
-            faceFile = new(face.Mapping?.MappingFromLocation?.AreaPermyriad,
-                           face.Mapping?.MappingFromLocation?.ConfidencePercent,
-                           geoLocation?.ToDmsString(),
-                           face.DateTime,
-                           null,
-                           face.FaceParts,
-                           face.Location,
-                           maker,
-                           null,
-                           model,
-                           face.OutputResolution);
-            faceFileJson = JsonSerializer.Serialize(faceFile, FaceFileGenerationContext.Default.FaceFile);
-            using (bitmap = new(width, height))
-            {
-                using (graphics = Graphics.FromImage(bitmap))
-                    graphics.DrawImage(source, new Rectangle(0, 0, width, height), rectangle, GraphicsUnit.Pixel);
-                propertyItem = Property.Models.Stateless.IProperty.GetPropertyItem(_ConstructorInfo, artist, type, faceFileJson);
-                bitmap.SetPropertyItem(propertyItem);
-                propertyItem = Property.Models.Stateless.IProperty.GetPropertyItem(_ConstructorInfo, userComment, type, faceEncodingJson);
-                bitmap.SetPropertyItem(propertyItem);
-                bitmap.Save(fileHolder.FullName, _ImageCodecInfo, _EncoderParameters);
-            }
-            if (File.Exists(fileName))
-                File.Delete(fileName);
-            location = Shared.Models.Stateless.Methods.ILocation.GetLocation(_FaceDistanceHiddenImageFactor, face.Location, Shared.Models.Stateless.ILocation.Digits, Shared.Models.Stateless.ILocation.Factor, source.Height, source.Width, collection.Count);
-            if (location is null)
-                continue;
-            width = location.Right - location.Left;
-            height = location.Bottom - location.Top;
-            rectangle = new Rectangle(location.Left, location.Top, width, height);
-            using (bitmap = new(width, height))
-            {
-                using (graphics = Graphics.FromImage(bitmap))
-                    graphics.DrawImage(source, new Rectangle(0, 0, width, height), rectangle, GraphicsUnit.Pixel);
-                bitmap.Save(fileName, _HiddenImageCodecInfo, _HiddenEncoderParameters);
-            }
-            File.SetAttributes(fileName, FileAttributes.Hidden);
         }
     }
 
+    private static void MoveIf(string fileName, CombinedEnumAndIndex cei, string directory, DirectoryInfo directoryInfo)
+    {
+        string[] segments = directory.Split(cei.Combined);
+        string? checkDirectory = segments.Length == 1 ?
+            Path.Combine(segments[0], $"{cei.Combined[2..]}") :
+                segments.Length == 2 ?
+                    $"{segments[0]}{cei.Combined[2..]}{segments[1]}" :
+                        null;
+        if (checkDirectory is not null && Directory.Exists(checkDirectory))
+        {
+            string checkFile = Path.Combine(checkDirectory, fileName);
+            if (Directory.Exists(checkFile))
+            {
+                Directory.Move(checkFile, directoryInfo.FullName);
+                directoryInfo.Refresh();
+            }
+        }
+    }
+
+    public List<Shared.Models.Face> GetFaces(string outputResolution, string cResultsFullGroupDirectory, FilePath filePath, List<Tuple<string, DateTime>> subFileTuples, List<string> parseExceptions, Shared.Models.Property property, MappingFromItem mappingFromItem, Dictionary<string, int[]> outputResolutionToResize, List<MappingFromPhotoPrism>? mappingFromPhotoPrismCollection)
+    {
+        List<Shared.Models.Face>? results;
+        string? json;
+        List<Location> locations;
+        string[] changesFrom = [nameof(A_Property), nameof(B_Metadata), nameof(C_Resize)];
+        List<DateTime> dateTimes = (from l in subFileTuples where changesFrom.Contains(l.Item1) select l.Item2).ToList();
+        string fileName = $"{mappingFromItem.FilePath.NameWithoutExtension}{mappingFromItem.FilePath.ExtensionLowered}.json";
+        CombinedEnumAndIndex cei = Shared.Models.Stateless.Methods.IPath.GetCombinedEnumAndIndex(_PropertyConfiguration, filePath);
+        string directory = _ResultCollectionFileGroups[0][cei.Enum][cei.Index];
+        FileInfo fileInfo = new(Path.Combine(directory, fileName));
+        MoveIf(fileName, cei, directory, fileInfo);
+        if (_ForceFaceLastWriteTimeToCreationTime && !fileInfo.Exists && File.Exists(Path.ChangeExtension(fileInfo.FullName, ".delete")))
+        {
+            File.Move(Path.ChangeExtension(fileInfo.FullName, ".delete"), fileInfo.FullName);
+            fileInfo.Refresh();
+        }
+        if (_ForceFaceLastWriteTimeToCreationTime && fileInfo.Exists && fileInfo.LastWriteTime != fileInfo.CreationTime)
+        {
+            File.SetLastWriteTime(fileInfo.FullName, fileInfo.CreationTime);
+            fileInfo.Refresh();
+        }
+        if (_PropertiesChangedForFaces)
+            results = null;
+        else if (!fileInfo.Exists)
+            results = null;
+        else if (_CheckDFaceAndUpWriteDates && dateTimes.Count > 0 && dateTimes.Max() > fileInfo.LastWriteTime)
+            results = null;
+        else
+        {
+            json = Shared.Models.Stateless.Methods.IFace.GetJson(fileInfo.FullName);
+            try
+            {
+                results = JsonSerializer.Deserialize<List<Shared.Models.Face>>(json);
+                if (results is null)
+                    throw new NullReferenceException(nameof(results));
+                subFileTuples.Add(new Tuple<string, DateTime>(nameof(D_Face), fileInfo.LastWriteTime));
+            }
+            catch (Exception)
+            {
+                results = null;
+                parseExceptions.Add(nameof(D_Face));
+            }
+        }
+        if (!_LoadPhotoPrismLocations || mappingFromPhotoPrismCollection is null || results is null)
+            locations = [];
+        else
+            locations = Shared.Models.Stateless.Methods.ILocation.GetLocations(results, mappingFromPhotoPrismCollection, _RectangleIntersectMinimum);
+        if (results is null || locations.Count > 0)
+        {
+            results = GetFaces(outputResolution, cResultsFullGroupDirectory, property, mappingFromItem, outputResolutionToResize, locations);
+            if (results.Count == 0)
+                File.Move(mappingFromItem.ResizedFileHolder.FullName, $"{mappingFromItem.ResizedFileHolder.FullName}.err");
+            else
+            {
+                bool updateDateWhenMatches = dateTimes.Count > 0 && fileInfo.Exists && dateTimes.Max() > fileInfo.LastWriteTime;
+                DateTime? dateTime = !updateDateWhenMatches ? null : dateTimes.Max();
+                json = JsonSerializer.Serialize(results, _WriteIndentedAndWhenWritingNull);
+                if (Shared.Models.Stateless.Methods.IPath.WriteAllText(fileInfo.FullName, json, updateDateWhenMatches, compareBeforeWrite: true, updateToWhenMatches: dateTime))
+                {
+                    if (!_ForceFaceLastWriteTimeToCreationTime)
+                        subFileTuples.Add(new Tuple<string, DateTime>(nameof(D_Face), DateTime.Now));
+                    else
+                    {
+                        File.SetLastWriteTime(fileInfo.FullName, fileInfo.CreationTime);
+                        fileInfo.Refresh();
+                        subFileTuples.Add(new Tuple<string, DateTime>(nameof(D_Face), fileInfo.CreationTime));
+                    }
+                }
+            }
+        }
+        return results;
+    }
+
     private List<Shared.Models.Face> GetFaces(string outputResolution, string cResultsFullGroupDirectory, Shared.Models.Property property, MappingFromItem mappingFromItem, Dictionary<string, int[]> outputResolutionToResize, List<Location> locations)
     {
         if (_PropertyConfiguration.NumberOfJitters is null)
@@ -293,188 +400,128 @@ public class D_Face : IFaceD
         return results;
     }
 
-#pragma warning restore CA1416
-
-    public List<Shared.Models.Face> GetFaces(string outputResolution, string cResultsFullGroupDirectory, FilePath filePath, List<Tuple<string, DateTime>> subFileTuples, List<string> parseExceptions, Shared.Models.Property property, MappingFromItem mappingFromItem, Dictionary<string, int[]> outputResolutionToResize, List<MappingFromPhotoPrism>? mappingFromPhotoPrismCollection)
+    private static (Model model, PredictorModel predictorModel, ModelParameter modelParameter) GetModel(string modelDirectory, string modelName, string predictorModelName)
     {
-        List<Shared.Models.Face>? results;
-        string? json;
-        List<Location> locations;
-        string[] changesFrom = [nameof(A_Property), nameof(B_Metadata), nameof(C_Resize)];
-        List<DateTime> dateTimes = (from l in subFileTuples where changesFrom.Contains(l.Item1) select l.Item2).ToList();
-        (_, int directoryIndex) = Shared.Models.Stateless.Methods.IPath.GetDirectoryNameAndIndex(_PropertyConfiguration, filePath);
-        FileInfo fileInfo = new(Path.Combine(_FileGroups[_PropertyConfiguration.ResultCollection][directoryIndex], $"{mappingFromItem.FilePath.NameWithoutExtension}{mappingFromItem.FilePath.ExtensionLowered}.json"));
-        if (_ForceFaceLastWriteTimeToCreationTime && !fileInfo.Exists && File.Exists(Path.ChangeExtension(fileInfo.FullName, ".delete")))
+        (Model, PredictorModel, ModelParameter) result;
+        Array array;
+        Model? model = null;
+        array = Enum.GetValues<Model>();
+        PredictorModel? predictorModel = null;
+        foreach (Model check in array)
         {
-            File.Move(Path.ChangeExtension(fileInfo.FullName, ".delete"), fileInfo.FullName);
-            fileInfo.Refresh();
-        }
-        if (_ForceFaceLastWriteTimeToCreationTime && fileInfo.Exists && fileInfo.LastWriteTime != fileInfo.CreationTime)
-        {
-            File.SetLastWriteTime(fileInfo.FullName, fileInfo.CreationTime);
-            fileInfo.Refresh();
-        }
-        if (_PropertiesChangedForFaces)
-            results = null;
-        else if (!fileInfo.Exists)
-            results = null;
-        else if (_CheckDFaceAndUpWriteDates && dateTimes.Count > 0 && dateTimes.Max() > fileInfo.LastWriteTime)
-            results = null;
-        else
-        {
-            json = Shared.Models.Stateless.Methods.IFace.GetJson(fileInfo.FullName);
-            try
+            if (modelName.Contains(check.ToString()))
             {
-                results = JsonSerializer.Deserialize<List<Shared.Models.Face>>(json);
-                if (results is null)
-                    throw new NullReferenceException(nameof(results));
-                subFileTuples.Add(new Tuple<string, DateTime>(nameof(D_Face), fileInfo.LastWriteTime));
-            }
-            catch (Exception)
-            {
-                results = null;
-                parseExceptions.Add(nameof(D_Face));
+                model = check;
+                break;
             }
         }
-        if (!_LoadPhotoPrismLocations || mappingFromPhotoPrismCollection is null || results is null)
-            locations = [];
-        else
-            locations = Shared.Models.Stateless.Methods.ILocation.GetLocations(results, mappingFromPhotoPrismCollection, _RectangleIntersectMinimum);
-        if (results is null || locations.Count > 0)
+        if (model is null)
+            throw new Exception("Destination directory must have Model name!");
+        model = model.Value;
+        array = Enum.GetValues<PredictorModel>();
+        foreach (PredictorModel check in array)
         {
-            results = GetFaces(outputResolution, cResultsFullGroupDirectory, property, mappingFromItem, outputResolutionToResize, locations);
-            if (results.Count == 0)
-                File.Move(mappingFromItem.ResizedFileHolder.FullName, $"{mappingFromItem.ResizedFileHolder.FullName}.err");
-            else
+            if (predictorModelName.Contains(check.ToString()))
             {
-                bool updateDateWhenMatches = dateTimes.Count > 0 && fileInfo.Exists && dateTimes.Max() > fileInfo.LastWriteTime;
-                DateTime? dateTime = !updateDateWhenMatches ? null : dateTimes.Max();
-                json = JsonSerializer.Serialize(results, _WriteIndentedAndWhenWritingNull);
-                if (Shared.Models.Stateless.Methods.IPath.WriteAllText(fileInfo.FullName, json, updateDateWhenMatches, compareBeforeWrite: true, updateToWhenMatches: dateTime))
-                {
-                    if (!_ForceFaceLastWriteTimeToCreationTime)
-                        subFileTuples.Add(new Tuple<string, DateTime>(nameof(D_Face), DateTime.Now));
-                    else
-                    {
-                        File.SetLastWriteTime(fileInfo.FullName, fileInfo.CreationTime);
-                        fileInfo.Refresh();
-                        subFileTuples.Add(new Tuple<string, DateTime>(nameof(D_Face), fileInfo.CreationTime));
-                    }
-                }
+                predictorModel = check;
+                break;
             }
         }
-        return results;
+        if (predictorModel is null)
+            throw new Exception("Destination directory must have Predictor Model name!");
+        predictorModel = predictorModel.Value;
+        ModelParameter modelParameter = new()
+        {
+            CnnFaceDetectorModel = File.ReadAllBytes(Path.Combine(modelDirectory, "mmod_human_face_detector.dat")),
+            FaceRecognitionModel = File.ReadAllBytes(Path.Combine(modelDirectory, "dlib_face_recognition_resnet_model_v1.dat")),
+            PosePredictor5FaceLandmarksModel = File.ReadAllBytes(Path.Combine(modelDirectory, "shape_predictor_5_face_landmarks.dat")),
+            PosePredictor68FaceLandmarksModel = File.ReadAllBytes(Path.Combine(modelDirectory, "shape_predictor_68_face_landmarks.dat"))
+        };
+        result = new(model.Value, predictorModel.Value, modelParameter);
+        return result;
     }
 
-    public List<(Shared.Models.Face, FileHolder?, string, bool)> SaveFaces(FilePath filePath, List<Tuple<string, DateTime>> subFileTuples, List<string> parseExceptions, MappingFromItem mappingFromItem, ExifDirectory exifDirectory, List<Shared.Models.Face> faces)
+    private void SaveFaces(FileHolder resizedFileHolder, ExifDirectory exifDirectory, List<(Shared.Models.Face, FileHolder?, string, bool)> collection)
     {
-        List<(Shared.Models.Face, FileHolder?, string, bool Save)> results = [];
-        bool save;
-        FileInfo fileInfo;
-        FileHolder fileHolder;
-        string deterministicHashCodeKey;
-        string[] changesFrom = [nameof(A_Property), nameof(B_Metadata), nameof(C_Resize)];
-        List<DateTime> dateTimes = (from l in subFileTuples where changesFrom.Contains(l.Item1) select l.Item2).ToList();
-        (_, int directoryIndex) = Shared.Models.Stateless.Methods.IPath.GetDirectoryNameAndIndex(_PropertyConfiguration, filePath);
-        string directory = Path.Combine(_FileGroups[_PropertyConfiguration.ResultContent][directoryIndex], mappingFromItem.FilePath.NameWithoutExtension);
-        bool directoryExists = Directory.Exists(directory);
-        foreach (Shared.Models.Face face in faces)
+        int width;
+        int height;
+        Bitmap bitmap;
+        short type = 2;
+        FaceFile faceFile;
+        Graphics graphics;
+        Location? location;
+        Rectangle rectangle;
+        string faceFileJson;
+        string faceEncodingJson;
+        PropertyItem? propertyItem;
+        string? maker = IMetadata.GetMaker(exifDirectory);
+        string? model = IMetadata.GetModel(exifDirectory);
+#pragma warning disable CA1416
+        using Bitmap source = new(resizedFileHolder.FullName);
+        MetadataExtractor.GeoLocation? geoLocation = IMetadata.GeoLocation(exifDirectory);
+        const int artist = MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagArtist; // 315
+        const int userComment = MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagUserComment;
+        foreach ((Shared.Models.Face face, FileHolder? fileHolder, string fileName, bool save) in collection)
         {
-            save = false;
-            if (face.FaceEncoding is null || face.Location is null || face.OutputResolution is null)
+            if (!save)
+                continue;
+            if (fileHolder is null)
+                continue;
+            if (face.FaceEncoding is null || face?.Location is null || face?.OutputResolution is null)
+                continue;
+            if (_OverrideForFaceImages && fileHolder.Exists)
             {
-                results.Add(new(face, null, string.Empty, save));
+                IFaceD dFace = this;
+                FilePath filePath = FilePath.Get(_PropertyConfiguration, fileHolder, index: null);
+                dFace.ReSaveFace(exifDirectory, filePath, face, mappedFile: false);
                 continue;
             }
-            deterministicHashCodeKey = Shared.Models.Stateless.Methods.IMapping.GetDeterministicHashCodeKey(filePath, face.Location, Shared.Models.Stateless.ILocation.Digits, face.OutputResolution);
-            fileInfo = new FileInfo(Path.Combine(directory, $"{deterministicHashCodeKey}{mappingFromItem.FilePath.ExtensionLowered}{_FileNameExtension}"));
-            fileHolder = FileHolder.Get(fileInfo);
-            if (!directoryExists)
-                save = true;
-            else if (_OverrideForFaceImages)
-                save = true;
-            else if (!fileHolder.Exists)
-                save = true;
-            else if (_CheckDFaceAndUpWriteDates && dateTimes.Count > 0 && dateTimes.Max() > fileInfo.LastWriteTime)
-                save = true;
-            results.Add(new(face, fileHolder, Path.Combine(directory, $"{deterministicHashCodeKey}{mappingFromItem.FilePath.ExtensionLowered}{_HiddenFileNameExtension}"), save));
-        }
-        if (results.Any(l => l.Save))
-        {
-            if (!directoryExists)
-                _ = Directory.CreateDirectory(directory);
-            SaveFaces(mappingFromItem.ResizedFileHolder, exifDirectory, results);
-        }
-        return results;
-    }
-
-#pragma warning disable CA1416
-
-    private static (string?, string?) Get(string? json)
-    {
-        string? model;
-        string? maker;
-        FaceFile? faceFile = json is null ? null : JsonSerializer.Deserialize(json, FaceFileGenerationContext.Default.FaceFile);
-        if (faceFile is null || faceFile.Location is null)
-            (maker, model) = (null, null);
-        else
-            (maker, model) = (faceFile.Maker, faceFile.Model);
-        return (maker, model);
-    }
-
-    void IFaceD.ReSaveFace(ExifDirectory exifDirectory, FilePath filePath, Shared.Models.Face face, bool mappedFile)
-    {
-        FileInfo fileInfo = new(filePath.FullName);
-        if (fileInfo.Exists)
-        {
-            string? json;
-            short type = 2;
-            string? model;
-            string? maker;
-            string checkFile = $"{filePath.FullName}.exif";
-            const int artist = MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagArtist;
-            // const int author = MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagWinAuthor; // 40093
-            if (mappedFile)
+            location = Shared.Models.Stateless.Methods.ILocation.GetLocation(face.Location, Shared.Models.Stateless.ILocation.Digits, Shared.Models.Stateless.ILocation.Factor, source.Height, source.Width, collection.Count);
+            if (location is null)
+                continue;
+            width = location.Right - location.Left;
+            height = location.Bottom - location.Top;
+            faceEncodingJson = JsonSerializer.Serialize(face.FaceEncoding);
+            rectangle = new Rectangle(location.Left, location.Top, width, height);
+            faceFile = new(face.Mapping?.MappingFromLocation?.AreaPermyriad,
+                           face.Mapping?.MappingFromLocation?.ConfidencePercent,
+                           geoLocation?.ToDmsString(),
+                           face.DateTime,
+                           null,
+                           face.FaceParts,
+                           face.Location,
+                           maker,
+                           null,
+                           model,
+                           face.OutputResolution);
+            faceFileJson = JsonSerializer.Serialize(faceFile, FaceFileGenerationContext.Default.FaceFile);
+            using (bitmap = new(width, height))
             {
-                json = IMetadata.GetOutputResolution(exifDirectory);
-                if (json is not null && json.Contains(nameof(DateTime)))
-                    return;
-                (maker, model) = Get(json);
+                using (graphics = Graphics.FromImage(bitmap))
+                    graphics.DrawImage(source, new Rectangle(0, 0, width, height), rectangle, GraphicsUnit.Pixel);
+                propertyItem = Property.Models.Stateless.IProperty.GetPropertyItem(_ConstructorInfo, artist, type, faceFileJson);
+                bitmap.SetPropertyItem(propertyItem);
+                propertyItem = Property.Models.Stateless.IProperty.GetPropertyItem(_ConstructorInfo, userComment, type, faceEncodingJson);
+                bitmap.SetPropertyItem(propertyItem);
+                bitmap.Save(fileHolder.FullName, _ImageCodecInfo, _EncoderParameters);
             }
-            else
+            if (File.Exists(fileName))
+                File.Delete(fileName);
+            location = Shared.Models.Stateless.Methods.ILocation.GetLocation(_FaceDistanceHiddenImageFactor, face.Location, Shared.Models.Stateless.ILocation.Digits, Shared.Models.Stateless.ILocation.Factor, source.Height, source.Width, collection.Count);
+            if (location is null)
+                continue;
+            width = location.Right - location.Left;
+            height = location.Bottom - location.Top;
+            rectangle = new Rectangle(location.Left, location.Top, width, height);
+            using (bitmap = new(width, height))
             {
-                maker = IMetadata.GetMaker(exifDirectory);
-                model = IMetadata.GetModel(exifDirectory);
-                ExifDirectory? faceExifDirectory = IMetadata.GetExifDirectory(filePath);
-                json = IMetadata.GetOutputResolution(faceExifDirectory);
-                if (json is not null && json.Contains(nameof(DateTime)))
-                    return;
+                using (graphics = Graphics.FromImage(bitmap))
+                    graphics.DrawImage(source, new Rectangle(0, 0, width, height), rectangle, GraphicsUnit.Pixel);
+                bitmap.Save(fileName, _HiddenImageCodecInfo, _HiddenEncoderParameters);
             }
-            MetadataExtractor.GeoLocation? geoLocation = IMetadata.GeoLocation(exifDirectory);
-            FaceFile faceFile = new(face.Mapping?.MappingFromLocation?.AreaPermyriad,
-                                    face.Mapping?.MappingFromLocation?.ConfidencePercent,
-                                    geoLocation?.ToDmsString(),
-                                    face.DateTime,
-                                    null,
-                                    face.FaceParts,
-                                    face.Location,
-                                    maker,
-                                    null,
-                                    model,
-                                    face.OutputResolution);
-            string faceFileJson = JsonSerializer.Serialize(faceFile, FaceFileGenerationContext.Default.FaceFile);
-            ConstructorInfo? constructorInfo = typeof(PropertyItem).GetConstructor(BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.Public, null, [], null) ?? throw new Exception();
-            PropertyItem? propertyItem = Property.Models.Stateless.IProperty.GetPropertyItem(constructorInfo, artist, type, faceFileJson);
-            Bitmap bitmap = new(fileInfo.FullName);
-            bitmap.SetPropertyItem(propertyItem);
-            bitmap.Save(checkFile);
-            bitmap.Dispose();
-            File.SetLastWriteTime(checkFile, fileInfo.LastWriteTime);
-            File.Delete(fileInfo.FullName);
-            File.Move(checkFile, fileInfo.FullName);
-        }
-    }
-
 #pragma warning restore CA1416
+            File.SetAttributes(fileName, FileAttributes.Hidden);
+        }
+    }
 
 }

FaceParts/FaceParts.csproj

@@ -33,7 +33,7 @@
         <SupportedPlatform Include="browser" />
     </ItemGroup>
     <ItemGroup>
-        <PackageReference Include="System.Text.Json" Version="9.0.0" />
+        <PackageReference Include="System.Text.Json" Version="9.0.2" />
     </ItemGroup>
     <ItemGroup>
         <ProjectReference Include="..\FaceRecognitionDotNet\FaceRecognitionDotNet.csproj" />

FaceParts/Models/_D2_FaceParts.cs

@@ -32,17 +32,17 @@ public class D2_FaceParts
     private readonly bool _OverrideForFaceLandmarkImages;
     private readonly EncoderParameters _EncoderParameters;
     private readonly IPropertyConfiguration _PropertyConfiguration;
-    private readonly Dictionary<string, ReadOnlyCollection<string>> _FileGroups;
+    private readonly ReadOnlyDictionary<byte, ReadOnlyCollection<string>>[] _ResultContentFileGroups;
 
     public D2_FaceParts(IPropertyConfiguration propertyConfiguration, ImageCodecInfo imageCodecInfo, EncoderParameters encoderParameters, string filenameExtension, bool checkDFaceAndUpWriteDates, bool overrideForFaceLandmarkImages)
     {
-        _FileGroups = [];
         _ImageCodecInfo = imageCodecInfo;
         _EncoderParameters = encoderParameters;
         _FileNameExtension = filenameExtension;
         _PropertyConfiguration = propertyConfiguration;
         _CheckDFaceAndUpWriteDates = checkDFaceAndUpWriteDates;
         _OverrideForFaceLandmarkImages = overrideForFaceLandmarkImages;
+        _ResultContentFileGroups = [new(new Dictionary<byte, ReadOnlyCollection<string>>())];
         ConstructorInfo? constructorInfo = typeof(PropertyItem).GetConstructor(BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.Public, null, [], null) ?? throw new Exception();
         _ConstructorInfo = constructorInfo;
     }
@@ -55,32 +55,241 @@ public class D2_FaceParts
 
     public void Update(string dResultsFullGroupDirectory)
     {
-        _FileGroups.Clear();
-        ReadOnlyDictionary<string, ReadOnlyCollection<string>> keyValuePairs = Shared.Models.Stateless.Methods.IPath.GetKeyValuePairs(_PropertyConfiguration, dResultsFullGroupDirectory, [_PropertyConfiguration.ResultContent]);
-        foreach (KeyValuePair<string, ReadOnlyCollection<string>> keyValuePair in keyValuePairs)
-            _FileGroups.Add(keyValuePair.Key, keyValuePair.Value);
-    }
-
-    private static void GetPointBounds(PointF[] points, out float xMinimum, out float xMaximum, out float yMinimum, out float yMaximum)
-    {
-        xMinimum = points[0].X;
-        xMaximum = xMinimum;
-        yMinimum = points[0].Y;
-        yMaximum = yMinimum;
-        foreach (PointF point in points)
+        ReadOnlyDictionary<string, ReadOnlyDictionary<byte, ReadOnlyCollection<string>>> keyValuePairs = Shared.Models.Stateless.Methods.IPath.GetKeyValuePairs(_PropertyConfiguration, dResultsFullGroupDirectory, [_PropertyConfiguration.ResultContent]);
+        foreach (KeyValuePair<string, ReadOnlyDictionary<byte, ReadOnlyCollection<string>>> keyValuePair in keyValuePairs)
         {
-            if (xMinimum > point.X)
-                xMinimum = point.X;
-            if (xMaximum < point.X)
-                xMaximum = point.X;
-            if (yMinimum > point.Y)
-                yMinimum = point.Y;
-            if (yMaximum < point.Y)
-                yMaximum = point.Y;
+            if (keyValuePair.Key == _PropertyConfiguration.ResultContent)
+                _ResultContentFileGroups[0] = keyValuePair.Value;
+            else
+                throw new Exception();
         }
     }
 
+    public void SaveFaceLandmarkImages(string d2ResultsFullGroupDirectory, MappingFromItem mappingFromItem, ExifDirectory exifDirectory, List<Shared.Models.Face> faces)
+    {
+        bool any = false;
+        foreach (Shared.Models.Face face in faces)
+        {
+            if (face.Location is null || face.FaceEncoding is null || face.FaceParts is null || face.FaceParts.Count == 0)
+                continue;
+            if (!any)
+                any = true;
+        }
+        if (any)
+            SaveAllFaceParts(d2ResultsFullGroupDirectory, mappingFromItem, exifDirectory, faces);
+    }
+
+    private void SaveAllFaceParts(string d2ResultsFullGroupDirectory, MappingFromItem mappingFromItem, ExifDirectory exifDirectory, List<Shared.Models.Face> faces)
+    {
+        int x;
+        int y;
+        Brush brush;
+        int pointSize;
+        bool any = false;
+        FaceFile faceFile;
+        bool? isDefaultName;
+        List<long> personKeys = [];
+        List<FaceFile> faceFiles = [];
+        StringBuilder stringBuilder = new();
+        MappingFromPerson? mappingFromPerson;
+        string? maker = IMetadata.GetMaker(exifDirectory);
+        string? model = IMetadata.GetModel(exifDirectory);
+        MetadataExtractor.GeoLocation? geoLocation = IMetadata.GeoLocation(exifDirectory);
 #pragma warning disable CA1416
+        using Image image = Image.FromFile(mappingFromItem.ResizedFileHolder.FullName);
+        using Graphics graphics = Graphics.FromImage(image);
+        foreach (Shared.Models.Face face in faces)
+        {
+            if (face.Location is null || face.FaceEncoding is null || face.FaceParts is null || face.FaceParts.Count == 0)
+                continue;
+            if (!any && face.Mapping?.MappingFromPerson is null)
+                any = true;
+            mappingFromPerson = face.Mapping?.MappingFromPerson;
+            brush = mappingFromPerson is null ? Brushes.Red : Brushes.GreenYellow;
+            isDefaultName = mappingFromPerson is null ? null : Shared.Models.Stateless.Methods.IPerson.IsDefaultName(mappingFromPerson);
+            if (mappingFromPerson is not null && isDefaultName is not null && !isDefaultName.Value)
+                personKeys.Add(mappingFromPerson.PersonKey);
+            faceFile = new(face.Mapping?.MappingFromLocation?.AreaPermyriad,
+                           face.Mapping?.MappingFromLocation?.ConfidencePercent,
+                           geoLocation?.ToDmsString(),
+                           face.DateTime,
+                           face.FaceEncoding,
+                           face.FaceParts,
+                           face.Location,
+                           maker,
+                           mappingFromPerson,
+                           model,
+                           face.OutputResolution);
+            faceFiles.Add(faceFile);
+            pointSize = GetPointSize(face.FaceParts, defaultPointSize: 2);
+            foreach ((FacePart facePart, FacePoint[] facePoints) in face.FaceParts)
+            {
+                foreach (FacePoint facePoint in facePoints)
+                    graphics.FillEllipse(brush, facePoint.X - pointSize, facePoint.Y - pointSize, pointSize * 2, pointSize * 2);
+                if (facePart == FacePart.Chin)
+                    continue;
+                if (facePoints.Length < 3)
+                    continue;
+                x = (int)(from l in facePoints select l.X).Average();
+                y = (int)(from l in facePoints select l.Y).Average();
+                graphics.FillEllipse(Brushes.Purple, x - pointSize, y - pointSize, pointSize * 2, pointSize * 2);
+            }
+        }
+        _ = graphics.Save();
+#pragma warning restore CA1416
+        string directory = GetSeasonDirectory(d2ResultsFullGroupDirectory, mappingFromItem, any);
+        SaveImage(mappingFromItem, directory, image, faceFiles);
+    }
+
+    private int GetPointSize(Dictionary<FacePart, FacePoint[]> faceParts, int defaultPointSize)
+    {
+        int result;
+        FacePoint[]? facePoints;
+        if (faceParts.TryGetValue(FacePart.LeftEye, out facePoints))
+            result = (int)Math.Ceiling((facePoints.Max(l => l.X) - facePoints.Min(l => l.X)) * .05);
+        else
+        {
+            if (faceParts.TryGetValue(FacePart.RightEye, out facePoints))
+                result = (int)Math.Ceiling((facePoints.Max(l => l.X) - facePoints.Min(l => l.X)) * .05);
+            else
+                result = defaultPointSize;
+        }
+        return result;
+    }
+
+    private string GetSeasonDirectory(string d2ResultsFullGroupDirectory, MappingFromItem mappingFromItem, bool any)
+    {
+        string result;
+        string minimumDateYear = mappingFromItem.MinimumDateTime.ToString("yyyy");
+        DateTime dateTime = mappingFromItem.DateTimeOriginal is null ? mappingFromItem.MinimumDateTime : mappingFromItem.DateTimeOriginal.Value;
+        (int season, string seasonName) = Shared.Models.Stateless.Methods.IProperty.GetSeason(dateTime.DayOfYear);
+        string year = mappingFromItem.DateTimeOriginal is null ? $"{minimumDateYear[1..]}{minimumDateYear[0]}" : mappingFromItem.DateTimeOriginal.Value.ToString("yyyy");
+        string directory = Path.Combine(d2ResultsFullGroupDirectory, $"[{_PropertyConfiguration.ResultContent}]", $"{year}.{season} {seasonName}");
+        result = any ? Path.Combine(directory, "---") : Path.Combine(directory, "Complete");
+        if (!Directory.Exists(result))
+            _ = Directory.CreateDirectory(result);
+        return result;
+    }
+
+    private void SaveImage(MappingFromItem mappingFromItem, string directory, Image image, List<FaceFile> faceFiles)
+    {
+        short type = 2;
+        string faceFileJson;
+        PropertyItem? propertyItem;
+        const int artist = MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagArtist; // 315
+        string fileName = Path.Combine(directory, $"{mappingFromItem.FilePath.Name}{_FileNameExtension}");
+        try
+        {
+#pragma warning disable CA1416
+            foreach (int propertyId in image.PropertyIdList)
+            {
+                if (propertyId == MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagOrientation)
+                    continue;
+                image.RemovePropertyItem(propertyId);
+            }
+            faceFileJson = JsonSerializer.Serialize(faceFiles.ToArray(), FaceFileCollectionGenerationContext.Default.FaceFileArray);
+            propertyItem = IProperty.GetPropertyItem(_ConstructorInfo, artist, type, faceFileJson);
+            image.SetPropertyItem(propertyItem);
+            image.Save(fileName, _ImageCodecInfo, _EncoderParameters);
+#pragma warning restore CA1416
+        }
+        catch (Exception ex)
+        {
+            if (ex is not null && !string.IsNullOrEmpty(fileName) && File.Exists(fileName))
+                File.Delete(fileName);
+            faceFileJson = JsonSerializer.Serialize(faceFiles.ToArray(), FaceFileCollectionGenerationContext.Default.FaceFileArray);
+            if (!string.IsNullOrEmpty(faceFileJson))
+                File.WriteAllText($"{fileName}.json", faceFileJson);
+        }
+    }
+
+    public void SaveFaceLandmarkImages(Configuration configuration, string d2ResultsFullGroupDirectory, FilePath filePath, List<Tuple<string, DateTime>> subFileTuples, List<string> parseExceptions, MappingFromItem mappingFromItem, ExifDirectory exifDirectory, List<Shared.Models.Face> faces, bool saveRotated)
+    {
+        FileInfo fileInfo;
+        bool check = false;
+        FileInfo rotatedFileInfo;
+        DateTime? dateTime = null;
+        long ticks = DateTime.Now.Ticks;
+        string deterministicHashCodeKey;
+        bool updateDateWhenMatches = false;
+        List<(Shared.Models.Face, string, string)> collection = [];
+        string fileName = mappingFromItem.FilePath.NameWithoutExtension;
+        string[] changesFrom = [nameof(A_Property), nameof(B_Metadata), nameof(C_Resize), nameof(D_Face)];
+        List<DateTime> dateTimes = (from l in subFileTuples where changesFrom.Contains(l.Item1) select l.Item2).ToList();
+        CombinedEnumAndIndex cei = Shared.Models.Stateless.Methods.IPath.GetCombinedEnumAndIndex(_PropertyConfiguration, filePath);
+        string directory = _ResultContentFileGroups[0][cei.Enum][cei.Index];
+        DirectoryInfo directoryInfo = new(Path.Combine(directory, mappingFromItem.FilePath.NameWithoutExtension));
+        MoveIf(fileName, cei, directory, directoryInfo);
+        foreach (Shared.Models.Face face in faces)
+        {
+            if (face.FaceEncoding is null || face.Location is null || face.OutputResolution is null)
+            {
+                collection.Add(new(face, string.Empty, string.Empty));
+                continue;
+            }
+            deterministicHashCodeKey = Shared.Models.Stateless.Methods.IMapping.GetDeterministicHashCodeKey(filePath, face.Location, Shared.Models.Stateless.ILocation.Digits, face.OutputResolution);
+            fileInfo = new FileInfo(Path.Combine(directoryInfo.FullName, $"{deterministicHashCodeKey}{mappingFromItem.FilePath.ExtensionLowered}{_FileNameExtension}"));
+            if (string.IsNullOrEmpty(fileInfo.DirectoryName))
+                continue;
+            rotatedFileInfo = new FileInfo(Path.Combine(fileInfo.DirectoryName, $"{deterministicHashCodeKey} - R{mappingFromItem.FilePath.ExtensionLowered}{_FileNameExtension}"));
+            collection.Add(new(face, fileInfo.FullName, rotatedFileInfo.FullName));
+            if (check)
+                continue;
+            else if (!directoryInfo.Exists)
+                check = true;
+            else if (_OverrideForFaceLandmarkImages)
+                check = true;
+            else if (!fileInfo.Exists)
+                check = true;
+            else if (saveRotated && !rotatedFileInfo.Exists)
+                check = true;
+            else if (_CheckDFaceAndUpWriteDates && dateTimes.Count != 0 && dateTimes.Max() > fileInfo.LastWriteTime)
+                check = true;
+            if (check && !updateDateWhenMatches)
+            {
+                updateDateWhenMatches = dateTimes.Count != 0 && fileInfo.Exists && dateTimes.Max() > fileInfo.LastWriteTime;
+                dateTime = !updateDateWhenMatches ? null : dateTimes.Max();
+            }
+        }
+        if (check)
+        {
+            if (!directoryInfo.Exists)
+                _ = Directory.CreateDirectory(directoryInfo.FullName);
+            SaveFaceParts(mappingFromItem, exifDirectory, collection);
+            if (saveRotated)
+                SaveRotated(mappingFromItem, collection);
+        }
+    }
+
+    private static void MoveIf(string fileName, CombinedEnumAndIndex cei, string directory, DirectoryInfo directoryInfo)
+    {
+        string[] segments = directory.Split(cei.Combined);
+        string? checkDirectory = segments.Length == 1 ?
+            Path.Combine(segments[0], $"{cei.Combined[2..]}") :
+                segments.Length == 2 ?
+                    $"{segments[0]}{cei.Combined[2..]}{segments[1]}" :
+                        null;
+        if (checkDirectory is not null && Directory.Exists(checkDirectory))
+        {
+            string checkFile = Path.Combine(checkDirectory, fileName);
+            if (Directory.Exists(checkFile))
+            {
+                Directory.Move(checkFile, directoryInfo.FullName);
+                directoryInfo.Refresh();
+            }
+        }
+    }
+
+    private static Bitmap RotateBitmap(Image image, float angle)
+    {
+        Bitmap result;
+#pragma warning disable CA1416
+        Bitmap bitmap = new(image);
+        result = RotateBitmap(bitmap, angle);
+        bitmap?.Dispose();
+#pragma warning restore CA1416
+        return result;
+    }
 
     private static Bitmap RotateBitmap(Bitmap bitmap, float angle)
     {
@@ -92,6 +301,7 @@ public class D2_FaceParts
 #elif Windows
         // Make save Matrix to represent rotation
         // by this angle.
+#pragma warning disable CA1416
         Matrix rotate_at_origin = new();
         rotate_at_origin.Rotate(angle);
 
@@ -138,301 +348,28 @@ public class D2_FaceParts
             int y = (hgt - bitmap.Height) / 2;
             gr.DrawImage(bitmap, x, y);
         }
+#pragma warning restore CA1416
 #endif
         // Return the result bitmap.
         return result;
     }
 
-    private static Bitmap RotateBitmap(Image image, float angle)
+    private static void GetPointBounds(PointF[] points, out float xMinimum, out float xMaximum, out float yMinimum, out float yMaximum)
     {
-        Bitmap result;
-        Bitmap bitmap = new(image);
-        result = RotateBitmap(bitmap, angle);
-        bitmap?.Dispose();
-        return result;
-    }
-
-    private void SaveRotated(MappingFromItem mappingFromItem, List<(Shared.Models.Face, string, string)> collection)
-    {
-        double? α;
-        Bitmap rotated;
-        foreach ((Shared.Models.Face face, string _, string rotatedFileName) in collection)
+        xMinimum = points[0].X;
+        xMaximum = xMinimum;
+        yMinimum = points[0].Y;
+        yMaximum = yMinimum;
+        foreach (PointF point in points)
         {
-            if (face.FaceParts is null)
-                continue;
-            (_, α) = Shared.Models.Stateless.Methods.IFace.GetEyeα(face.FaceParts);
-            if (α is null)
-                continue;
-            using Image image = Image.FromFile(mappingFromItem.ResizedFileHolder.FullName);
-            rotated = RotateBitmap(image, (float)α.Value);
-            if (rotated is not null)
-            {
-                rotated.Save(rotatedFileName, _ImageCodecInfo, _EncoderParameters);
-                rotated.Dispose();
-            }
-        }
-    }
-
-    private string GetSeasonDirectory(string d2ResultsFullGroupDirectory, MappingFromItem mappingFromItem, bool any)
-    {
-        string result;
-        string minimumDateYear = mappingFromItem.MinimumDateTime.ToString("yyyy");
-        DateTime dateTime = mappingFromItem.DateTimeOriginal is null ? mappingFromItem.MinimumDateTime : mappingFromItem.DateTimeOriginal.Value;
-        (int season, string seasonName) = Shared.Models.Stateless.Methods.IProperty.GetSeason(dateTime.DayOfYear);
-        string year = mappingFromItem.DateTimeOriginal is null ? $"{minimumDateYear[1..]}{minimumDateYear[0]}" : mappingFromItem.DateTimeOriginal.Value.ToString("yyyy");
-        string directory = Path.Combine(d2ResultsFullGroupDirectory, $"[{_PropertyConfiguration.ResultContent}]", $"{year}.{season} {seasonName}");
-        result = any ? Path.Combine(directory, "---") : Path.Combine(directory, "Complete");
-        if (!Directory.Exists(result))
-            _ = Directory.CreateDirectory(result);
-        return result;
-    }
-
-    private void SaveImage(MappingFromItem mappingFromItem, string directory, Image image, List<FaceFile> faceFiles)
-    {
-        short type = 2;
-        string faceFileJson;
-        PropertyItem? propertyItem;
-        const int artist = MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagArtist; // 315
-        string fileName = Path.Combine(directory, $"{mappingFromItem.FilePath.Name}{_FileNameExtension}");
-        try
-        {
-            foreach (int propertyId in image.PropertyIdList)
-            {
-                if (propertyId == MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagOrientation)
-                    continue;
-                image.RemovePropertyItem(propertyId);
-            }
-            faceFileJson = JsonSerializer.Serialize(faceFiles.ToArray(), FaceFileCollectionGenerationContext.Default.FaceFileArray);
-            propertyItem = IProperty.GetPropertyItem(_ConstructorInfo, artist, type, faceFileJson);
-            image.SetPropertyItem(propertyItem);
-            image.Save(fileName, _ImageCodecInfo, _EncoderParameters);
-        }
-        catch (Exception ex)
-        {
-            if (ex is not null && !string.IsNullOrEmpty(fileName) && File.Exists(fileName))
-                File.Delete(fileName);
-            faceFileJson = JsonSerializer.Serialize(faceFiles.ToArray(), FaceFileCollectionGenerationContext.Default.FaceFileArray);
-            if (!string.IsNullOrEmpty(faceFileJson))
-                File.WriteAllText($"{fileName}.json", faceFileJson);
-        }
-    }
-
-    private void SaveAllFaceParts(string d2ResultsFullGroupDirectory, MappingFromItem mappingFromItem, ExifDirectory exifDirectory, List<Shared.Models.Face> faces)
-    {
-        int x;
-        int y;
-        Brush brush;
-        int pointSize;
-        bool any = false;
-        FaceFile faceFile;
-        bool? isDefaultName;
-        List<long> personKeys = [];
-        List<FaceFile> faceFiles = [];
-        StringBuilder stringBuilder = new();
-        MappingFromPerson? mappingFromPerson;
-        string? maker = IMetadata.GetMaker(exifDirectory);
-        string? model = IMetadata.GetModel(exifDirectory);
-        MetadataExtractor.GeoLocation? geoLocation = IMetadata.GeoLocation(exifDirectory);
-        using Image image = Image.FromFile(mappingFromItem.ResizedFileHolder.FullName);
-        using Graphics graphics = Graphics.FromImage(image);
-        foreach (Shared.Models.Face face in faces)
-        {
-            if (face.Location is null || face.FaceEncoding is null || face.FaceParts is null || face.FaceParts.Count == 0)
-                continue;
-            if (!any && face.Mapping?.MappingFromPerson is null)
-                any = true;
-            mappingFromPerson = face.Mapping?.MappingFromPerson;
-            brush = mappingFromPerson is null ? Brushes.Red : Brushes.GreenYellow;
-            isDefaultName = mappingFromPerson is null ? null : Shared.Models.Stateless.Methods.IPerson.IsDefaultName(mappingFromPerson);
-            if (mappingFromPerson is not null && isDefaultName is not null && !isDefaultName.Value)
-                personKeys.Add(mappingFromPerson.PersonKey);
-            faceFile = new(face.Mapping?.MappingFromLocation?.AreaPermyriad,
-                           face.Mapping?.MappingFromLocation?.ConfidencePercent,
-                           geoLocation?.ToDmsString(),
-                           face.DateTime,
-                           face.FaceEncoding,
-                           face.FaceParts,
-                           face.Location,
-                           maker,
-                           mappingFromPerson,
-                           model,
-                           face.OutputResolution);
-            faceFiles.Add(faceFile);
-            pointSize = GetPointSize(face.FaceParts, defaultPointSize: 2);
-            foreach ((FacePart facePart, FacePoint[] facePoints) in face.FaceParts)
-            {
-                foreach (FacePoint facePoint in facePoints)
-                    graphics.FillEllipse(brush, facePoint.X - pointSize, facePoint.Y - pointSize, pointSize * 2, pointSize * 2);
-                if (facePart == FacePart.Chin)
-                    continue;
-                if (facePoints.Length < 3)
-                    continue;
-                x = (int)(from l in facePoints select l.X).Average();
-                y = (int)(from l in facePoints select l.Y).Average();
-                graphics.FillEllipse(Brushes.Purple, x - pointSize, y - pointSize, pointSize * 2, pointSize * 2);
-            }
-        }
-        _ = graphics.Save();
-        string directory = GetSeasonDirectory(d2ResultsFullGroupDirectory, mappingFromItem, any);
-        SaveImage(mappingFromItem, directory, image, faceFiles);
-    }
-
-    private void SaveImage(string fileName, Image image, FaceFile faceFile)
-    {
-        short type = 2;
-        string faceFileJson;
-        PropertyItem? propertyItem;
-        const int artist = MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagArtist; // 315
-        try
-        {
-            foreach (int propertyId in image.PropertyIdList)
-            {
-                if (propertyId == MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagOrientation)
-                    continue;
-                image.RemovePropertyItem(propertyId);
-            }
-            faceFileJson = JsonSerializer.Serialize(faceFile, FaceFileGenerationContext.Default.FaceFile);
-            propertyItem = IProperty.GetPropertyItem(_ConstructorInfo, artist, type, faceFileJson);
-            image.SetPropertyItem(propertyItem);
-            image.Save(fileName, _ImageCodecInfo, _EncoderParameters);
-        }
-        catch (Exception ex)
-        {
-            if (ex is not null && !string.IsNullOrEmpty(fileName) && File.Exists(fileName))
-                File.Delete(fileName);
-            faceFileJson = JsonSerializer.Serialize(faceFile, FaceFileGenerationContext.Default.FaceFile);
-            if (!string.IsNullOrEmpty(faceFileJson))
-                File.WriteAllText($"{fileName}.json", faceFileJson);
-        }
-    }
-
-    private void SaveFaceParts(MappingFromItem mappingFromItem, ExifDirectory exifDirectory, List<(Shared.Models.Face, string, string)> collection)
-    {
-        int x;
-        int y;
-        Brush brush;
-        int pointSize;
-        FaceFile faceFile;
-        MappingFromPerson? mappingFromPerson;
-        string? maker = IMetadata.GetMaker(exifDirectory);
-        string? model = IMetadata.GetModel(exifDirectory);
-        MetadataExtractor.GeoLocation? geoLocation = IMetadata.GeoLocation(exifDirectory);
-        foreach ((Shared.Models.Face face, string fileName, string _) in collection)
-        {
-            try
-            {
-                if (face.Location is null || face.FaceEncoding is null || face.FaceParts is null || face.FaceParts.Count == 0)
-                    continue;
-                using Image image = Image.FromFile(mappingFromItem.ResizedFileHolder.FullName);
-                mappingFromPerson = face.Mapping?.MappingFromPerson;
-                brush = mappingFromPerson is null ? Brushes.Red : Brushes.GreenYellow;
-                faceFile = new(face.Mapping?.MappingFromLocation?.AreaPermyriad,
-                               face.Mapping?.MappingFromLocation?.ConfidencePercent,
-                               geoLocation?.ToDmsString(),
-                               face.DateTime,
-                               face.FaceEncoding,
-                               face.FaceParts,
-                               face.Location,
-                               maker,
-                               mappingFromPerson,
-                               model,
-                               face.OutputResolution);
-                using Graphics graphics = Graphics.FromImage(image);
-                pointSize = GetPointSize(face.FaceParts, defaultPointSize: 2);
-                foreach ((FacePart facePart, FacePoint[] facePoints) in face.FaceParts)
-                {
-                    foreach (FacePoint facePoint in facePoints)
-                        graphics.FillEllipse(brush, facePoint.X - pointSize, facePoint.Y - pointSize, pointSize * 2, pointSize * 2);
-                    if (facePart == FacePart.Chin)
-                        continue;
-                    if (facePoints.Length < 3)
-                        continue;
-                    x = (int)(from l in facePoints select l.X).Average();
-                    y = (int)(from l in facePoints select l.Y).Average();
-                    graphics.FillEllipse(Brushes.Purple, x - pointSize, y - pointSize, pointSize * 2, pointSize * 2);
-                }
-                _ = graphics.Save();
-                SaveImage(fileName, image, faceFile);
-            }
-            catch (Exception)
-            {
-                if (File.Exists(fileName))
-                    File.Delete(fileName);
-            }
-        }
-    }
-
-    private int GetPointSize(Dictionary<FacePart, FacePoint[]> faceParts, int defaultPointSize)
-    {
-        int result;
-        FacePoint[]? facePoints;
-        if (faceParts.TryGetValue(FacePart.LeftEye, out facePoints))
-            result = (int)Math.Ceiling((facePoints.Max(l => l.X) - facePoints.Min(l => l.X)) * .05);
-        else
-        {
-            if (faceParts.TryGetValue(FacePart.RightEye, out facePoints))
-                result = (int)Math.Ceiling((facePoints.Max(l => l.X) - facePoints.Min(l => l.X)) * .05);
-            else
-                result = defaultPointSize;
-        }
-        return result;
-    }
-
-#pragma warning restore CA1416
-
-    public void SaveFaceLandmarkImages(Configuration configuration, string d2ResultsFullGroupDirectory, FilePath filePath, List<Tuple<string, DateTime>> subFileTuples, List<string> parseExceptions, MappingFromItem mappingFromItem, ExifDirectory exifDirectory, List<Shared.Models.Face> faces, bool saveRotated)
-    {
-        FileInfo fileInfo;
-        bool check = false;
-        FileInfo rotatedFileInfo;
-        DateTime? dateTime = null;
-        long ticks = DateTime.Now.Ticks;
-        string deterministicHashCodeKey;
-        bool updateDateWhenMatches = false;
-        List<(Shared.Models.Face, string, string)> collection = [];
-        string[] changesFrom = [nameof(A_Property), nameof(B_Metadata), nameof(C_Resize), nameof(D_Face)];
-        List<DateTime> dateTimes = (from l in subFileTuples where changesFrom.Contains(l.Item1) select l.Item2).ToList();
-        (_, int directoryIndex) = Shared.Models.Stateless.Methods.IPath.GetDirectoryNameAndIndex(_PropertyConfiguration, filePath);
-        string directory = Path.Combine(_FileGroups[_PropertyConfiguration.ResultContent][directoryIndex], mappingFromItem.FilePath.NameWithoutExtension);
-        bool directoryExists = Directory.Exists(directory);
-        foreach (Shared.Models.Face face in faces)
-        {
-            if (face.FaceEncoding is null || face.Location is null || face.OutputResolution is null)
-            {
-                collection.Add(new(face, string.Empty, string.Empty));
-                continue;
-            }
-            deterministicHashCodeKey = Shared.Models.Stateless.Methods.IMapping.GetDeterministicHashCodeKey(filePath, face.Location, Shared.Models.Stateless.ILocation.Digits, face.OutputResolution);
-            fileInfo = new FileInfo(Path.Combine(directory, $"{deterministicHashCodeKey}{mappingFromItem.FilePath.ExtensionLowered}{_FileNameExtension}"));
-            if (string.IsNullOrEmpty(fileInfo.DirectoryName))
-                continue;
-            rotatedFileInfo = new FileInfo(Path.Combine(fileInfo.DirectoryName, $"{deterministicHashCodeKey} - R{mappingFromItem.FilePath.ExtensionLowered}{_FileNameExtension}"));
-            collection.Add(new(face, fileInfo.FullName, rotatedFileInfo.FullName));
-            if (check)
-                continue;
-            else if (!directoryExists)
-                check = true;
-            else if (_OverrideForFaceLandmarkImages)
-                check = true;
-            else if (!fileInfo.Exists)
-                check = true;
-            else if (saveRotated && !rotatedFileInfo.Exists)
-                check = true;
-            else if (_CheckDFaceAndUpWriteDates && dateTimes.Count != 0 && dateTimes.Max() > fileInfo.LastWriteTime)
-                check = true;
-            if (check && !updateDateWhenMatches)
-            {
-                updateDateWhenMatches = dateTimes.Count != 0 && fileInfo.Exists && dateTimes.Max() > fileInfo.LastWriteTime;
-                dateTime = !updateDateWhenMatches ? null : dateTimes.Max();
-            }
-        }
-        if (check)
-        {
-            if (!directoryExists)
-                _ = Directory.CreateDirectory(directory);
-            SaveFaceParts(mappingFromItem, exifDirectory, collection);
-            if (saveRotated)
-                SaveRotated(mappingFromItem, collection);
+            if (xMinimum > point.X)
+                xMinimum = point.X;
+            if (xMaximum < point.X)
+                xMaximum = point.X;
+            if (yMinimum > point.Y)
+                yMinimum = point.Y;
+            if (yMaximum < point.Y)
+                yMaximum = point.Y;
         }
     }
 
@@ -469,18 +406,116 @@ public class D2_FaceParts
         return results;
     }
 
-    public void SaveFaceLandmarkImages(string d2ResultsFullGroupDirectory, MappingFromItem mappingFromItem, ExifDirectory exifDirectory, List<Shared.Models.Face> faces)
+    private void SaveImage(string fileName, Image image, FaceFile faceFile)
     {
-        bool any = false;
-        foreach (Shared.Models.Face face in faces)
+        short type = 2;
+        string faceFileJson;
+        PropertyItem? propertyItem;
+        const int artist = MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagArtist; // 315
+        try
         {
-            if (face.Location is null || face.FaceEncoding is null || face.FaceParts is null || face.FaceParts.Count == 0)
-                continue;
-            if (!any)
-                any = true;
+#pragma warning disable CA1416
+            foreach (int propertyId in image.PropertyIdList)
+            {
+                if (propertyId == MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagOrientation)
+                    continue;
+                image.RemovePropertyItem(propertyId);
+            }
+            faceFileJson = JsonSerializer.Serialize(faceFile, FaceFileGenerationContext.Default.FaceFile);
+            propertyItem = IProperty.GetPropertyItem(_ConstructorInfo, artist, type, faceFileJson);
+            image.SetPropertyItem(propertyItem);
+            image.Save(fileName, _ImageCodecInfo, _EncoderParameters);
+#pragma warning restore CA1416
+        }
+        catch (Exception ex)
+        {
+            if (ex is not null && !string.IsNullOrEmpty(fileName) && File.Exists(fileName))
+                File.Delete(fileName);
+            faceFileJson = JsonSerializer.Serialize(faceFile, FaceFileGenerationContext.Default.FaceFile);
+            if (!string.IsNullOrEmpty(faceFileJson))
+                File.WriteAllText($"{fileName}.json", faceFileJson);
+        }
+    }
+
+    private void SaveRotated(MappingFromItem mappingFromItem, List<(Shared.Models.Face, string, string)> collection)
+    {
+        double? α;
+        Bitmap rotated;
+        foreach ((Shared.Models.Face face, string _, string rotatedFileName) in collection)
+        {
+#pragma warning disable CA1416
+            if (face.FaceParts is null)
+                continue;
+            (_, α) = Shared.Models.Stateless.Methods.IFace.GetEyeα(face.FaceParts);
+            if (α is null)
+                continue;
+            using Image image = Image.FromFile(mappingFromItem.ResizedFileHolder.FullName);
+            rotated = RotateBitmap(image, (float)α.Value);
+            if (rotated is not null)
+            {
+                rotated.Save(rotatedFileName, _ImageCodecInfo, _EncoderParameters);
+                rotated.Dispose();
+            }
+#pragma warning restore CA1416
+        }
+    }
+
+    private void SaveFaceParts(MappingFromItem mappingFromItem, ExifDirectory exifDirectory, List<(Shared.Models.Face, string, string)> collection)
+    {
+        int x;
+        int y;
+        Brush brush;
+        int pointSize;
+        FaceFile faceFile;
+        MappingFromPerson? mappingFromPerson;
+        string? maker = IMetadata.GetMaker(exifDirectory);
+        string? model = IMetadata.GetModel(exifDirectory);
+        MetadataExtractor.GeoLocation? geoLocation = IMetadata.GeoLocation(exifDirectory);
+        foreach ((Shared.Models.Face face, string fileName, string _) in collection)
+        {
+            try
+            {
+#pragma warning disable CA1416
+                if (face.Location is null || face.FaceEncoding is null || face.FaceParts is null || face.FaceParts.Count == 0)
+                    continue;
+                using Image image = Image.FromFile(mappingFromItem.ResizedFileHolder.FullName);
+                mappingFromPerson = face.Mapping?.MappingFromPerson;
+                brush = mappingFromPerson is null ? Brushes.Red : Brushes.GreenYellow;
+                faceFile = new(face.Mapping?.MappingFromLocation?.AreaPermyriad,
+                               face.Mapping?.MappingFromLocation?.ConfidencePercent,
+                               geoLocation?.ToDmsString(),
+                               face.DateTime,
+                               face.FaceEncoding,
+                               face.FaceParts,
+                               face.Location,
+                               maker,
+                               mappingFromPerson,
+                               model,
+                               face.OutputResolution);
+                using Graphics graphics = Graphics.FromImage(image);
+                pointSize = GetPointSize(face.FaceParts, defaultPointSize: 2);
+                foreach ((FacePart facePart, FacePoint[] facePoints) in face.FaceParts)
+                {
+                    foreach (FacePoint facePoint in facePoints)
+                        graphics.FillEllipse(brush, facePoint.X - pointSize, facePoint.Y - pointSize, pointSize * 2, pointSize * 2);
+                    if (facePart == FacePart.Chin)
+                        continue;
+                    if (facePoints.Length < 3)
+                        continue;
+                    x = (int)(from l in facePoints select l.X).Average();
+                    y = (int)(from l in facePoints select l.Y).Average();
+                    graphics.FillEllipse(Brushes.Purple, x - pointSize, y - pointSize, pointSize * 2, pointSize * 2);
+                }
+                _ = graphics.Save();
+                SaveImage(fileName, image, faceFile);
+#pragma warning restore CA1416
+            }
+            catch (Exception)
+            {
+                if (File.Exists(fileName))
+                    File.Delete(fileName);
+            }
         }
-        if (any)
-            SaveAllFaceParts(d2ResultsFullGroupDirectory, mappingFromItem, exifDirectory, faces);
     }
 
 }

Instance/Instance.csproj

@@ -34,12 +34,12 @@
         <SupportedPlatform Include="browser" />
     </ItemGroup>
     <ItemGroup>
-        <PackageReference Include="Microsoft.AspNetCore.Cryptography.KeyDerivation" Version="9.0.0" />
-        <PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.0" />
-        <PackageReference Include="Microsoft.Extensions.Identity.Core" Version="9.0.0" />
-        <PackageReference Include="Microsoft.Extensions.Options" Version="9.0.0" />
+        <PackageReference Include="Microsoft.AspNetCore.Cryptography.KeyDerivation" Version="9.0.2" />
+        <PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.2" />
+        <PackageReference Include="Microsoft.Extensions.Identity.Core" Version="9.0.2" />
+        <PackageReference Include="Microsoft.Extensions.Options" Version="9.0.2" />
         <PackageReference Include="System.Drawing.Common" Version="8.0.10" />
-        <PackageReference Include="System.Text.Json" Version="9.0.0" />
+        <PackageReference Include="System.Text.Json" Version="9.0.2" />
         <PackageReference Include="MetadataExtractor" Version="2.8.1" />
         <PackageReference Include="ShellProgressBar" Version="5.2.0" />
         <PackageReference Include="WindowsShortcutFactory" Version="1.2.0" />
@@ -51,6 +51,7 @@
         <ProjectReference Include="..\FaceParts\FaceParts.csproj" />
         <ProjectReference Include="..\FaceRecognitionDotNet\FaceRecognitionDotNet.csproj" />
         <ProjectReference Include="..\Map\Map.csproj" />
+        <ProjectReference Include="..\Container\Container.csproj" />
         <ProjectReference Include="..\Metadata\Metadata.csproj" />
         <ProjectReference Include="..\PhotoPrism\PhotoPrism.csproj" />
         <ProjectReference Include="..\Property-Compare\Property-Compare.csproj" />

Instance/Models/Binder/Place.cs

@@ -54,7 +54,7 @@ public class Place
                 results.Add(Get(place));
             }
         }
-        return new(results);
+        return results.AsReadOnly();
     }
 
 }

Instance/Models/_F_Random.cs

@@ -63,7 +63,7 @@ internal class F_Random
                 relativePaths.Add(immichAsset.Path.Split(immichOwnerId)[1]);
             }
         }
-        return new(results);
+        return results.AsReadOnly();
     }
 
     private static Dictionary<string, ImmichAsset> GetImmichAssets(string immichAssetsFile)

Map/Map.csproj

@@ -37,10 +37,12 @@
         <PackageReference Include="MetadataExtractor" Version="2.8.1" />
         <PackageReference Include="ShellProgressBar" Version="5.2.0" />
         <PackageReference Include="WindowsShortcutFactory" Version="1.2.0" />
-        <PackageReference Include="System.Text.Json" Version="9.0.0" />
+        <PackageReference Include="System.Text.Json" Version="9.0.2" />
     </ItemGroup>
     <ItemGroup>
         <ProjectReference Include="..\Shared\View-by-Distance.Shared.csproj" />
+        <ProjectReference Include="..\Container\Container.csproj" />
+        <ProjectReference Include="..\Property\Property.csproj" />
         <ProjectReference Include="..\Metadata\Metadata.csproj" />
     </ItemGroup>
 </Project>

Map/Models/Stateless/DistanceLogic.cs

@@ -22,62 +22,190 @@ internal abstract class DistanceLogic
     internal record TicksDirectory(DateTime AlternateDirectoryDateTime,
                                    string Directory,
                                    DateTime DirectoryDateTime,
-                                   string DirectoryName,
                                    bool? IsLocationContainerDebugDirectory,
                                    float? TotalDays);
 
-    private static void MoveTo(string actionDirectory, TicksDirectory ticksDirectory, string directory, string personKeyFormatted, string yearDirectoryName, string alphaDirectoryName, string[] files, string[] facesFileNames)
-    {
-        string checkFile;
-        string actionDirectoryName = Path.GetFileName(actionDirectory);
-        string checkDirectory = actionDirectoryName.StartsWith("y", StringComparison.CurrentCultureIgnoreCase) ? Path.Combine(ticksDirectory.Directory, personKeyFormatted, yearDirectoryName, alphaDirectoryName) : Path.Combine(directory, actionDirectoryName);
-        if (!Directory.Exists(checkDirectory))
-            _ = Directory.CreateDirectory(checkDirectory);
-        foreach (string file in files)
-        {
-            if (facesFileNames.Contains(file))
-            {
-                checkFile = Path.Combine(checkDirectory, Path.GetFileName(file));
-                if (File.Exists(checkFile))
-                    continue;
-                File.Move(file, checkFile);
-                continue;
-            }
-            File.Delete(file);
-        }
-    }
-
-    private static void MoveFiles(string personKeyFormatted, string personKeyDirectory, string newestPersonKeyFormatted, string newestPersonKeyDirectory)
+    internal static List<Record> DeleteEmptyDirectoriesAndGetCollection(Shared.Models.Properties.IPropertyConfiguration propertyConfiguration, Configuration configuration, long ticks, string eDistanceContentDirectory, ReadOnlyDictionary<string, string> personKeyFormattedToNewestPersonKeyFormatted, ReadOnlyCollection<string> personKeyFormattedCollection)
     {
+        List<Record> results = [];
+        bool check;
+        string message;
         string[] files;
-        string checkFile;
+        bool? isDefault;
+        int? linksCount;
+        int totalSeconds;
+        DateTime dateTime;
+        TimeSpan timeSpan;
+        int directoryNumber;
+        List<Record> records;
         string? checkDirectory;
-        string[] directories = Directory.GetDirectories(personKeyDirectory, "*", SearchOption.TopDirectoryOnly);
-        foreach (string directory in directories)
+        ProgressBar progressBar;
+        string[] yearDirectories;
+        string personKeyFormatted;
+        List<string> distinct = [];
+        string? personFirstInitial;
+        bool isReservedDirectoryName;
+        string[] personNameDirectories;
+        string? newestPersonKeyFormatted;
+        string? personDisplayDirectoryName;
+        string[] personNameLinkDirectories;
+        string? personFirstInitialDirectory;
+        List<TicksDirectory> ticksDirectories;
+        string[] personKeyFormattedDirectories;
+        string manualCopyHumanized = nameof(Shared.Models.Stateless.IMapLogic.ManualCopy).Humanize(LetterCasing.Title);
+        string forceSingleImageHumanized = nameof(Shared.Models.Stateless.IMapLogic.ForceSingleImage).Humanize(LetterCasing.Title);
+        ProgressBarOptions options = new() { ProgressCharacter = '─', ProgressBarOnBottom = true, DisableBottomPercentage = true };
+        for (int i = 1; i < 6; i++)
         {
-            checkDirectory = Path.Combine(newestPersonKeyDirectory, Path.GetFileName(directory));
-            if (!Directory.Exists(checkDirectory))
-                Directory.Move(directory, checkDirectory);
-            else
+            check = false;
+            results.Clear();
+            distinct.Clear();
+            directoryNumber = 0;
+            ticksDirectories = UpdateDateVerifyAndGetTicksDirectories(configuration, eDistanceContentDirectory);
+            totalSeconds = (int)Math.Floor(new TimeSpan(DateTime.Now.Ticks - ticks).TotalSeconds);
+            message = $"{i}) {ticksDirectories.Count:000} compile from and clean ticks Director(ies) - B - {totalSeconds} total second(s)";
+            progressBar = new(ticksDirectories.Count, message, options);
+            foreach (TicksDirectory ticksDirectory in ticksDirectories)
             {
-                files = Directory.GetFiles(directory, "*", SearchOption.AllDirectories);
-                foreach (string file in files)
+                progressBar.Tick();
+                personKeyFormattedDirectories = Directory.GetDirectories(ticksDirectory.Directory, "*", SearchOption.TopDirectoryOnly);
+                foreach (string personKeyFormattedDirectory in personKeyFormattedDirectories)
                 {
-                    if (file.Split(personKeyFormatted).Length != 2 || file.Contains(newestPersonKeyFormatted))
-                        continue;
-                    checkFile = file.Replace(personKeyFormatted, newestPersonKeyFormatted);
-                    checkDirectory = Path.GetDirectoryName(checkFile);
-                    if (checkDirectory is null)
-                        continue;
-                    if (File.Exists(checkFile))
-                        continue;
-                    if (!Directory.Exists(checkDirectory))
-                        _ = Directory.CreateDirectory(checkDirectory);
-                    File.Move(file, checkFile);
+                    personKeyFormatted = Path.GetFileName(personKeyFormattedDirectory);
+                    isReservedDirectoryName = personKeyFormatted.StartsWith(nameof(Shared.Models.Stateless.IMapLogic.Sorting)) || personKeyFormatted.StartsWith(nameof(Shared.Models.Stateless.IMapLogic.Mapping)) || personKeyFormatted.StartsWith(nameof(Shared.Models.Stateless.IMapLogic.ManualCopy));
+                    if (!isReservedDirectoryName && personKeyFormatted.StartsWith(nameof(Shared.Models.Stateless.IMapLogic.Individually)))
+                    {
+                        Individually(configuration, ticksDirectory, personKeyFormattedDirectory);
+                        throw new Exception($"B) Move personKey directories up one from {nameof(Shared.Models.Stateless.IMapLogic.Sorting)} and delete {nameof(Shared.Models.Stateless.IMapLogic.Sorting)} directory!");
+                    }
+                    _ = personKeyFormattedToNewestPersonKeyFormatted.TryGetValue(personKeyFormatted, out newestPersonKeyFormatted);
+                    if (personKeyFormattedToNewestPersonKeyFormatted.Count > 0 && newestPersonKeyFormatted is null)
+                    {
+                        timeSpan = new TimeSpan(DateTime.Now.Ticks - ticksDirectory.DirectoryDateTime.Ticks);
+                        if (timeSpan.TotalDays > 6)
+                            throw new Exception($"{configuration.MappingDefaultName} <{ticksDirectory.DirectoryDateTime}> are only allowed within x days!");
+                    }
+                    yearDirectories = Directory.GetDirectories(personKeyFormattedDirectory, "*", SearchOption.TopDirectoryOnly);
+                    foreach (string yearDirectory in yearDirectories)
+                    {
+                        if (check && !Directory.Exists(yearDirectory))
+                            continue;
+                        if (ticksDirectory.IsLocationContainerDebugDirectory is null || !ticksDirectory.IsLocationContainerDebugDirectory.Value)
+                            linksCount = null;
+                        else
+                            linksCount = GetLinksCount(yearDirectory);
+                        personNameDirectories = Directory.GetDirectories(yearDirectory, "*", SearchOption.TopDirectoryOnly);
+                        if (personNameDirectories.Length > 1)
+                            throw new NotSupportedException("Try deleting *.lnk files!");
+                        foreach (string personNameDirectory in personNameDirectories)
+                        {
+                            directoryNumber++;
+                            personDisplayDirectoryName = Path.GetFileName(personNameDirectory);
+                            isDefault = IPerson.IsDefaultName(personDisplayDirectoryName) && IPersonBirthday.IsCounterPersonYear(personKeyFormatted[..4]);
+                            if (isDefault.Value && personDisplayDirectoryName.Length == 1)
+                            {
+                                if (personKeyFormatted.Length != configuration.PersonBirthdayFormat.Length || !DateTime.TryParseExact(personKeyFormatted, configuration.PersonBirthdayFormat, CultureInfo.InvariantCulture, DateTimeStyles.None, out dateTime))
+                                    continue;
+                                checkDirectory = Path.Combine(yearDirectory, $"X+{dateTime.Ticks}");
+                                if (Directory.Exists(checkDirectory))
+                                {
+                                    Directory.Delete(yearDirectory, recursive: true);
+                                    continue;
+                                }
+                                Directory.Move(personNameDirectory, checkDirectory);
+                                if (!check)
+                                    check = true;
+                                continue;
+                            }
+                            if (isDefault.Value && (ticksDirectory.DirectoryDateTime.Hour != 0 || ticksDirectory.DirectoryDateTime.Minute != 0 || ticksDirectory.DirectoryDateTime.Second != 0))
+                            {
+                                checkDirectory = Path.GetDirectoryName(ticksDirectory.Directory);
+                                if (checkDirectory is null)
+                                    continue;
+                                checkDirectory = Path.Combine(checkDirectory, ticksDirectory.AlternateDirectoryDateTime.Ticks.ToString());
+                                if (!Directory.Exists(checkDirectory))
+                                    _ = Directory.CreateDirectory(checkDirectory);
+                                checkDirectory = Path.Combine(checkDirectory, personKeyFormatted);
+                                if (!Directory.Exists(checkDirectory))
+                                {
+                                    Directory.Move(personKeyFormattedDirectory, checkDirectory);
+                                    if (!check)
+                                        check = true;
+                                    break;
+                                }
+                            }
+                            files = Directory.GetFiles(personNameDirectory, "*", SearchOption.TopDirectoryOnly);
+                            if (isReservedDirectoryName && files.Length > 0)
+                                throw new Exception($"Move personKey directories up one from {nameof(Shared.Models.Stateless.IMapLogic.Sorting)} and delete {nameof(Shared.Models.Stateless.IMapLogic.Sorting)} directory!");
+                            if (personKeyFormatted == manualCopyHumanized && files.Length > 0)
+                                throw new Exception($"Move personKey directories up one from {manualCopyHumanized} and delete {manualCopyHumanized} directory!");
+                            if (personKeyFormatted == forceSingleImageHumanized && files.Length > 0)
+                                throw new Exception($"Move personKey directories up one from {forceSingleImageHumanized} and delete {forceSingleImageHumanized} directory!");
+                            if (!isDefault.Value)
+                            {
+                                if (personKeyFormattedToNewestPersonKeyFormatted.Count > 0 && newestPersonKeyFormatted is null)
+                                    files = RenameBirth(files);
+                                else if (newestPersonKeyFormatted is not null && personKeyFormatted != newestPersonKeyFormatted)
+                                {
+                                    if (!check)
+                                        check = true;
+                                    MovedToNewestPersonKeyFormatted(personKeyFormatted, newestPersonKeyFormatted, ticksDirectory, personKeyFormattedDirectory);
+                                    continue;
+                                }
+                            }
+                            if (personKeyFormatted.Length != configuration.PersonBirthdayFormat.Length)
+                                continue;
+                            if (personDisplayDirectoryName.Length == 1 || isDefault.Value || !personKeyFormattedCollection.Contains(personKeyFormatted))
+                                personFirstInitialDirectory = personNameDirectory;
+                            else
+                            {
+                                personFirstInitial = personDisplayDirectoryName[..1];
+                                if (personFirstInitial.All(char.IsDigit))
+                                {
+                                    foreach (string file in files)
+                                        File.Delete(file);
+                                    files = Directory.GetFiles(personNameDirectory, "*", SearchOption.AllDirectories);
+                                    foreach (string file in files)
+                                        File.Delete(file);
+                                    _ = IPath.DeleteEmptyDirectories(personNameDirectory);
+                                    continue;
+                                }
+                                personFirstInitialDirectory = Path.Combine(yearDirectory, personFirstInitial.ToString());
+                                if (Directory.Exists(personFirstInitialDirectory))
+                                    throw new Exception("Forgot to ...");
+                                Directory.Move(personNameDirectory, personFirstInitialDirectory);
+                                files = Directory.GetFiles(personFirstInitialDirectory, "*", SearchOption.TopDirectoryOnly);
+                            }
+                            records = GetRecords(propertyConfiguration, configuration, ticksDirectory, isDefault, files, directoryNumber, personKeyFormatted, linksCount, distinct, personDisplayDirectoryName);
+                            if (records.Count > 0)
+                                results.AddRange(records);
+                            personNameLinkDirectories = Directory.GetDirectories(personFirstInitialDirectory, "*", SearchOption.TopDirectoryOnly);
+                            foreach (string personNameLinkDirectory in personNameLinkDirectories)
+                            {
+                                files = Directory.GetFiles(personNameLinkDirectory, "*", SearchOption.TopDirectoryOnly);
+                                foreach (string file in files)
+                                {
+                                    if (!file.EndsWith(".lnk"))
+                                        continue;
+                                    File.Delete(file);
+                                }
+                                _ = IPath.DeleteEmptyDirectories(personNameLinkDirectory);
+                            }
+                            _ = IPath.DeleteEmptyDirectories(personFirstInitialDirectory);
+                        }
+                        _ = IPath.DeleteEmptyDirectories(yearDirectory);
+                    }
+                    _ = IPath.DeleteEmptyDirectories(personKeyFormattedDirectory);
                 }
+                _ = IPath.DeleteEmptyDirectories(ticksDirectory.Directory);
+                _ = IPath.DeleteEmptyDirectories(ticksDirectory.Directory);
             }
+            progressBar.Dispose();
+            if (check)
+                continue;
+            break;
         }
-        _ = IPath.DeleteEmptyDirectories(personKeyDirectory);
+        return results;
     }
 
     private static List<TicksDirectory> UpdateDateVerifyAndGetTicksDirectories(Configuration configuration, string eDistanceContentDirectory)
@@ -86,53 +214,55 @@ internal abstract class DistanceLogic
         float? totalDays;
         long? next = null;
         string? checkDirectory;
-        string ticksDirectoryName;
         DateTime directoryDateTime;
         DirectoryInfo directoryInfo;
+        TicksDirectory ticksDirectory;
         long? lastDirectoryTicks = null;
         DateTime dateTime = DateTime.Now;
         DateTime alternateDirectoryDateTime;
+        string ticksDirectoryNameFirstSegment;
         bool? isLocationContainerDebugDirectory;
         long month = dateTime.AddMonths(1).Ticks - dateTime.Ticks;
         for (int i = 1; i < 5; i++)
             _ = IPath.DeleteEmptyDirectories(eDistanceContentDirectory);
         if (!Directory.Exists(eDistanceContentDirectory))
             _ = Directory.CreateDirectory(eDistanceContentDirectory);
-        string[] ticksDirectories = Directory.GetDirectories(eDistanceContentDirectory, "*", SearchOption.TopDirectoryOnly);
-        foreach (string ticksDirectory in ticksDirectories)
+        string[] ticksFullPaths = Directory.GetDirectories(eDistanceContentDirectory, "*", SearchOption.TopDirectoryOnly);
+        foreach (string ticksFullPath in ticksFullPaths)
         {
-            ticksDirectoryName = Path.GetFileName(ticksDirectory);
-            if (ticksDirectoryName.Length < 3)
+            ticksDirectoryNameFirstSegment = Path.GetFileName(ticksFullPath).Split('.')[0];
+            if (ticksDirectoryNameFirstSegment.Length < 3)
                 continue;
-            if (!long.TryParse(ticksDirectoryName, out long directoryTicks))
+            if (!long.TryParse(ticksDirectoryNameFirstSegment, out long directoryTicks))
                 throw new NotSupportedException();
             if (next is null)
                 next = new DateTime(directoryTicks).Ticks;
             else
             {
                 next += month;
-                checkDirectory = Path.GetDirectoryName(ticksDirectory);
+                checkDirectory = Path.GetDirectoryName(ticksFullPath);
                 if (string.IsNullOrEmpty(checkDirectory))
                 {
                     if (string.IsNullOrEmpty(checkDirectory))
                         continue;
                     checkDirectory = Path.Combine(checkDirectory, next.Value.ToString());
-                    if (ticksDirectory == checkDirectory || !checkDirectory.EndsWith(configuration.LocationContainerDirectoryPattern))
+                    if (ticksFullPath == checkDirectory || !checkDirectory.EndsWith(configuration.LocationContainerDirectoryPattern))
                         continue;
-                    Directory.Move(ticksDirectory, checkDirectory);
+                    Directory.Move(ticksFullPath, checkDirectory);
                     continue;
                 }
             }
-            directoryInfo = new(ticksDirectory);
+            directoryInfo = new(ticksFullPath);
             directoryDateTime = new DateTime(directoryTicks);
             if (directoryInfo.CreationTime.Ticks != directoryTicks)
-                Directory.SetCreationTime(ticksDirectory, new DateTime(directoryTicks));
+                Directory.SetCreationTime(ticksFullPath, new DateTime(directoryTicks));
             if (directoryInfo.LastWriteTime.Ticks != directoryTicks)
-                Directory.SetLastWriteTime(ticksDirectory, new DateTime(directoryTicks));
+                Directory.SetLastWriteTime(ticksFullPath, new DateTime(directoryTicks));
             alternateDirectoryDateTime = new DateTime(directoryDateTime.Year, directoryDateTime.Month, directoryDateTime.Day).AddMonths(1);
-            isLocationContainerDebugDirectory = configuration.LocationContainerDebugDirectory is null ? null : ticksDirectoryName.EndsWith(configuration.LocationContainerDebugDirectory);
+            isLocationContainerDebugDirectory = configuration.LocationContainerDebugDirectory is null ? null : ticksDirectoryNameFirstSegment.EndsWith(configuration.LocationContainerDebugDirectory);
             totalDays = lastDirectoryTicks is null || new TimeSpan(dateTime.Ticks - directoryTicks).TotalDays < 1 ? null : (float)new TimeSpan(directoryTicks - lastDirectoryTicks.Value).TotalDays;
-            results.Add(new(alternateDirectoryDateTime, ticksDirectory, new(directoryTicks), ticksDirectoryName, isLocationContainerDebugDirectory, totalDays));
+            ticksDirectory = new(alternateDirectoryDateTime, ticksFullPath, new(directoryTicks), isLocationContainerDebugDirectory, totalDays);
+            results.Add(ticksDirectory);
             if (directoryDateTime.Hour == 0 && directoryDateTime.Minute == 0 && directoryDateTime.Second == 0)
                 continue;
             lastDirectoryTicks = directoryTicks;
@@ -216,38 +346,42 @@ internal abstract class DistanceLogic
         }
     }
 
-    private static List<Record> GetRecords(Shared.Models.Properties.IPropertyConfiguration propertyConfiguration, Configuration configuration, bool? isDefault, string[] files, int directoryNumber, string personKeyFormatted, int? linksCount, List<string> distinct, string? personDisplayDirectoryName)
+    private static void MoveTo(string actionDirectory, TicksDirectory ticksDirectory, string directory, string personKeyFormatted, string yearDirectoryName, string alphaDirectoryName, string[] files, string[] facesFileNames)
     {
-        List<Record> results = [];
-        string fileName;
         string checkFile;
-        FilePath filePath;
-        FileHolder fileHolder;
-        int? wholePercentages;
+        string actionDirectoryName = Path.GetFileName(actionDirectory);
+        string checkDirectory = actionDirectoryName.StartsWith("y", StringComparison.CurrentCultureIgnoreCase) ? Path.Combine(ticksDirectory.Directory, personKeyFormatted, yearDirectoryName, alphaDirectoryName) : Path.Combine(directory, actionDirectoryName);
+        if (!Directory.Exists(checkDirectory))
+            _ = Directory.CreateDirectory(checkDirectory);
         foreach (string file in files)
         {
-            if (file.EndsWith(".lnk"))
-                continue;
-            fileHolder = IFileHolder.Get(file);
-            filePath = FilePath.Get(propertyConfiguration, fileHolder, index: null);
-            if (filePath.Id is null)
-                continue;
-            wholePercentages = IMapping.GetWholePercentages(configuration.FacesFileNameExtension, filePath);
-            if (wholePercentages is null)
-                continue;
-            fileName = Path.GetFileName(file);
-            if (distinct.Contains(fileName))
+            if (facesFileNames.Contains(file))
             {
-                checkFile = $"{file}.dup";
+                checkFile = Path.Combine(checkDirectory, Path.GetFileName(file));
                 if (File.Exists(checkFile))
                     continue;
                 File.Move(file, checkFile);
                 continue;
             }
-            distinct.Add(fileName);
-            results.Add(new(directoryNumber, isDefault, linksCount, filePath, personDisplayDirectoryName, personKeyFormatted));
+            File.Delete(file);
         }
-        return results;
+    }
+
+    private static int? GetLinksCount(string yearDirectory)
+    {
+        int? result;
+        string[] yearDirectoryNameSegments = Path.GetFileName(yearDirectory).Split('-');
+        if (yearDirectoryNameSegments.Length != 3)
+            result = null;
+        else
+        {
+            string lastSegment = yearDirectoryNameSegments[^1];
+            if (lastSegment.Length != 3 || !lastSegment.All(l => l == lastSegment[0]))
+                result = null;
+            else
+                result = lastSegment[0] - 65;
+        }
+        return result;
     }
 
     private static string[] RenameBirth(string[] files)
@@ -282,219 +416,117 @@ internal abstract class DistanceLogic
             Directory.Move(personKeyDirectory, newestPersonKeyDirectory);
     }
 
-    private static int? GetLinksCount(string yearDirectory)
+    private static void MoveFiles(string personKeyFormatted, string personKeyDirectory, string newestPersonKeyFormatted, string newestPersonKeyDirectory)
     {
-        int? result;
-        string[] yearDirectoryNameSegments = Path.GetFileName(yearDirectory).Split('-');
-        if (yearDirectoryNameSegments.Length != 3)
-            result = null;
-        else
+        string[] files;
+        string checkFile;
+        string? checkDirectory;
+        string[] directories = Directory.GetDirectories(personKeyDirectory, "*", SearchOption.TopDirectoryOnly);
+        foreach (string directory in directories)
         {
-            string lastSegment = yearDirectoryNameSegments[^1];
-            if (lastSegment.Length != 3 || !lastSegment.All(l => l == lastSegment[0]))
-                result = null;
+            checkDirectory = Path.Combine(newestPersonKeyDirectory, Path.GetFileName(directory));
+            if (!Directory.Exists(checkDirectory))
+                Directory.Move(directory, checkDirectory);
             else
-                result = lastSegment[0] - 65;
+            {
+                files = Directory.GetFiles(directory, "*", SearchOption.AllDirectories);
+                foreach (string file in files)
+                {
+                    if (file.Split(personKeyFormatted).Length != 2 || file.Contains(newestPersonKeyFormatted))
+                        continue;
+                    checkFile = file.Replace(personKeyFormatted, newestPersonKeyFormatted);
+                    checkDirectory = Path.GetDirectoryName(checkFile);
+                    if (checkDirectory is null)
+                        continue;
+                    if (File.Exists(checkFile))
+                        continue;
+                    if (!Directory.Exists(checkDirectory))
+                        _ = Directory.CreateDirectory(checkDirectory);
+                    File.Move(file, checkFile);
+                }
+            }
         }
-        return result;
+        _ = IPath.DeleteEmptyDirectories(personKeyDirectory);
     }
 
-    internal static List<Record> DeleteEmptyDirectoriesAndGetCollection(Shared.Models.Properties.IPropertyConfiguration propertyConfiguration, Configuration configuration, long ticks, string eDistanceContentDirectory, ReadOnlyDictionary<string, string> personKeyFormattedToNewestPersonKeyFormatted, ReadOnlyCollection<string> personKeyFormattedCollection)
+    private static List<Record> GetRecords(Shared.Models.Properties.IPropertyConfiguration propertyConfiguration, Configuration configuration, TicksDirectory ticksDirectory, bool? isDefault, string[] files, int directoryNumber, string personKeyFormatted, int? linksCount, List<string> distinct, string? personDisplayDirectoryName)
     {
         List<Record> results = [];
-        bool check;
-        string message;
-        string[] files;
-        bool? isDefault;
-        int? linksCount;
-        int totalSeconds;
-        DateTime dateTime;
-        TimeSpan timeSpan;
-        int directoryNumber;
-        string? checkDirectory;
-        ProgressBar progressBar;
-        string[] yearDirectories;
-        string personKeyFormatted;
-        List<string> distinct = [];
-        string? personFirstInitial;
-        bool isReservedDirectoryName;
-        string[] personNameDirectories;
-        string? newestPersonKeyFormatted;
-        string? personDisplayDirectoryName;
-        string[] personNameLinkDirectories;
-        string? personFirstInitialDirectory;
-        List<TicksDirectory> ticksDirectories;
-        string[] personKeyFormattedDirectories;
-        string manualCopyHumanized = nameof(Shared.Models.Stateless.IMapLogic.ManualCopy).Humanize(LetterCasing.Title);
-        string forceSingleImageHumanized = nameof(Shared.Models.Stateless.IMapLogic.ForceSingleImage).Humanize(LetterCasing.Title);
-        ProgressBarOptions options = new() { ProgressCharacter = '─', ProgressBarOnBottom = true, DisableBottomPercentage = true };
-        for (int i = 1; i < 6; i++)
+        string @enum;
+        Record record;
+        string fileName;
+        string checkFile;
+        FilePath filePath;
+        FileHolder fileHolder;
+        int? wholePercentages;
+        foreach (string file in files)
         {
-            check = false;
-            results.Clear();
-            distinct.Clear();
-            directoryNumber = 0;
-            ticksDirectories = UpdateDateVerifyAndGetTicksDirectories(configuration, eDistanceContentDirectory);
-            totalSeconds = (int)Math.Floor(new TimeSpan(DateTime.Now.Ticks - ticks).TotalSeconds);
-            message = $"{i}) {ticksDirectories.Count:000} compile from and clean ticks Director(ies) - B - {totalSeconds} total second(s)";
-            progressBar = new(ticksDirectories.Count, message, options);
-            foreach (TicksDirectory ticksDirectory in ticksDirectories)
-            {
-                if (i == 1)
-                    progressBar.Tick();
-                personKeyFormattedDirectories = Directory.GetDirectories(ticksDirectory.Directory, "*", SearchOption.TopDirectoryOnly);
-                foreach (string personKeyFormattedDirectory in personKeyFormattedDirectories)
-                {
-                    personKeyFormatted = Path.GetFileName(personKeyFormattedDirectory);
-                    isReservedDirectoryName = personKeyFormatted.StartsWith(nameof(Shared.Models.Stateless.IMapLogic.Sorting)) || personKeyFormatted.StartsWith(nameof(Shared.Models.Stateless.IMapLogic.Mapping)) || personKeyFormatted.StartsWith(nameof(Shared.Models.Stateless.IMapLogic.ManualCopy));
-                    if (!isReservedDirectoryName && personKeyFormatted.StartsWith(nameof(Shared.Models.Stateless.IMapLogic.Individually)))
-                    {
-                        Individually(configuration, ticksDirectory, personKeyFormattedDirectory);
-                        throw new Exception($"B) Move personKey directories up one from {nameof(Shared.Models.Stateless.IMapLogic.Sorting)} and delete {nameof(Shared.Models.Stateless.IMapLogic.Sorting)} directory!");
-                    }
-                    _ = personKeyFormattedToNewestPersonKeyFormatted.TryGetValue(personKeyFormatted, out newestPersonKeyFormatted);
-                    if (personKeyFormattedToNewestPersonKeyFormatted.Count > 0 && newestPersonKeyFormatted is null)
-                    {
-                        timeSpan = new TimeSpan(DateTime.Now.Ticks - ticksDirectory.DirectoryDateTime.Ticks);
-                        if (timeSpan.TotalDays > 6)
-                            throw new Exception($"{configuration.MappingDefaultName} <{ticksDirectory.DirectoryDateTime}> are only allowed within x days!");
-                    }
-                    yearDirectories = Directory.GetDirectories(personKeyFormattedDirectory, "*", SearchOption.TopDirectoryOnly);
-                    foreach (string yearDirectory in yearDirectories)
-                    {
-                        if (check && !Directory.Exists(yearDirectory))
-                            continue;
-                        if (ticksDirectory.IsLocationContainerDebugDirectory is null || !ticksDirectory.IsLocationContainerDebugDirectory.Value)
-                            linksCount = null;
-                        else
-                            linksCount = GetLinksCount(yearDirectory);
-                        if (ticksDirectory.DirectoryName != configuration.LocationContainerDebugDirectory)
-                        {
-                            files = Directory.GetFiles(yearDirectory, "*", SearchOption.TopDirectoryOnly);
-                            foreach (string file in files)
-                                File.Delete(file);
-                        }
-                        if (ticksDirectory.DirectoryName == configuration.LocationContainerDebugDirectory)
-                        {
-                            isDefault = null;
-                            personDisplayDirectoryName = null;
-                            files = Directory.GetFiles(yearDirectory, "*", SearchOption.TopDirectoryOnly);
-                            results.AddRange(GetRecords(propertyConfiguration, configuration, isDefault, files, directoryNumber, personKeyFormatted, linksCount, distinct, personDisplayDirectoryName));
-                            files = Directory.GetFiles(yearDirectory, "*.lnk", SearchOption.AllDirectories);
-                            foreach (string file in files)
-                                File.Delete(file);
-                            continue;
-                        }
-                        personNameDirectories = Directory.GetDirectories(yearDirectory, "*", SearchOption.TopDirectoryOnly);
-                        if (personNameDirectories.Length > 1)
-                            throw new NotSupportedException("Try deleting *.lnk files!");
-                        foreach (string personNameDirectory in personNameDirectories)
-                        {
-                            directoryNumber++;
-                            personDisplayDirectoryName = Path.GetFileName(personNameDirectory);
-                            isDefault = IPerson.IsDefaultName(personDisplayDirectoryName) && IPersonBirthday.IsCounterPersonYear(personKeyFormatted[..4]);
-                            if (isDefault.Value && personDisplayDirectoryName.Length == 1)
-                            {
-                                if (personKeyFormatted.Length != configuration.PersonBirthdayFormat.Length || !DateTime.TryParseExact(personKeyFormatted, configuration.PersonBirthdayFormat, CultureInfo.InvariantCulture, DateTimeStyles.None, out dateTime))
-                                    continue;
-                                checkDirectory = Path.Combine(yearDirectory, $"X+{dateTime.Ticks}");
-                                if (Directory.Exists(checkDirectory))
-                                {
-                                    Directory.Delete(yearDirectory, recursive: true);
-                                    continue;
-                                }
-                                Directory.Move(personNameDirectory, checkDirectory);
-                                if (!check)
-                                    check = true;
-                                continue;
-                            }
-                            if (isDefault.Value && (ticksDirectory.DirectoryDateTime.Hour != 0 || ticksDirectory.DirectoryDateTime.Minute != 0 || ticksDirectory.DirectoryDateTime.Second != 0))
-                            {
-                                checkDirectory = Path.GetDirectoryName(ticksDirectory.Directory);
-                                if (checkDirectory is null)
-                                    continue;
-                                checkDirectory = Path.Combine(checkDirectory, ticksDirectory.AlternateDirectoryDateTime.Ticks.ToString());
-                                if (!Directory.Exists(checkDirectory))
-                                    _ = Directory.CreateDirectory(checkDirectory);
-                                checkDirectory = Path.Combine(checkDirectory, personKeyFormatted);
-                                if (!Directory.Exists(checkDirectory))
-                                {
-                                    Directory.Move(personKeyFormattedDirectory, checkDirectory);
-                                    if (!check)
-                                        check = true;
-                                    break;
-                                }
-                            }
-                            files = Directory.GetFiles(personNameDirectory, "*", SearchOption.TopDirectoryOnly);
-                            if (isReservedDirectoryName && files.Length > 0)
-                                throw new Exception($"Move personKey directories up one from {nameof(Shared.Models.Stateless.IMapLogic.Sorting)} and delete {nameof(Shared.Models.Stateless.IMapLogic.Sorting)} directory!");
-                            if (personKeyFormatted == manualCopyHumanized && files.Length > 0)
-                                throw new Exception($"Move personKey directories up one from {manualCopyHumanized} and delete {manualCopyHumanized} directory!");
-                            if (personKeyFormatted == forceSingleImageHumanized && files.Length > 0)
-                                throw new Exception($"Move personKey directories up one from {forceSingleImageHumanized} and delete {forceSingleImageHumanized} directory!");
-                            if (!isDefault.Value)
-                            {
-                                if (personKeyFormattedToNewestPersonKeyFormatted.Count > 0 && newestPersonKeyFormatted is null)
-                                    files = RenameBirth(files);
-                                else if (newestPersonKeyFormatted is not null && personKeyFormatted != newestPersonKeyFormatted)
-                                {
-                                    if (!check)
-                                        check = true;
-                                    MovedToNewestPersonKeyFormatted(personKeyFormatted, newestPersonKeyFormatted, ticksDirectory, personKeyFormattedDirectory);
-                                    continue;
-                                }
-                            }
-                            if (personKeyFormatted.Length != configuration.PersonBirthdayFormat.Length)
-                                continue;
-                            if (personDisplayDirectoryName.Length == 1 || isDefault.Value || !personKeyFormattedCollection.Contains(personKeyFormatted))
-                                personFirstInitialDirectory = personNameDirectory;
-                            else
-                            {
-                                personFirstInitial = personDisplayDirectoryName[..1];
-                                if (personFirstInitial.All(char.IsDigit))
-                                {
-                                    foreach (string file in files)
-                                        File.Delete(file);
-                                    files = Directory.GetFiles(personNameDirectory, "*", SearchOption.AllDirectories);
-                                    foreach (string file in files)
-                                        File.Delete(file);
-                                    _ = IPath.DeleteEmptyDirectories(personNameDirectory);
-                                    continue;
-                                }
-                                personFirstInitialDirectory = Path.Combine(yearDirectory, personFirstInitial.ToString());
-                                if (Directory.Exists(personFirstInitialDirectory))
-                                    throw new Exception("Forgot to ...");
-                                Directory.Move(personNameDirectory, personFirstInitialDirectory);
-                                files = Directory.GetFiles(personFirstInitialDirectory, "*", SearchOption.TopDirectoryOnly);
-                            }
-                            results.AddRange(GetRecords(propertyConfiguration, configuration, isDefault, files, directoryNumber, personKeyFormatted, linksCount, distinct, personDisplayDirectoryName));
-                            personNameLinkDirectories = Directory.GetDirectories(personFirstInitialDirectory, "*", SearchOption.TopDirectoryOnly);
-                            foreach (string personNameLinkDirectory in personNameLinkDirectories)
-                            {
-                                files = Directory.GetFiles(personNameLinkDirectory, "*", SearchOption.TopDirectoryOnly);
-                                foreach (string file in files)
-                                {
-                                    if (!file.EndsWith(".lnk"))
-                                        continue;
-                                    File.Delete(file);
-                                }
-                                _ = IPath.DeleteEmptyDirectories(personNameLinkDirectory);
-                            }
-                            _ = IPath.DeleteEmptyDirectories(personFirstInitialDirectory);
-                        }
-                        _ = IPath.DeleteEmptyDirectories(yearDirectory);
-                    }
-                    _ = IPath.DeleteEmptyDirectories(personKeyFormattedDirectory);
-                }
-                _ = IPath.DeleteEmptyDirectories(ticksDirectory.Directory);
-                _ = IPath.DeleteEmptyDirectories(ticksDirectory.Directory);
-            }
-            progressBar.Dispose();
-            if (check)
+            if (file.EndsWith(".lnk"))
                 continue;
-            break;
+            fileHolder = IFileHolder.Get(file);
+            filePath = FilePath.Get(propertyConfiguration, fileHolder, index: null);
+            if (filePath.Id is null)
+                continue;
+            wholePercentages = IMapping.GetWholePercentages(configuration.FacesFileNameExtension, filePath);
+            if (wholePercentages is null)
+                continue;
+            fileName = Path.GetFileName(file);
+            if (distinct.Contains(fileName))
+            {
+                checkFile = $"{file}.dup";
+                if (File.Exists(checkFile))
+                    continue;
+                File.Move(file, checkFile);
+                continue;
+            }
+            if (file.StartsWith(ticksDirectory.Directory))
+            {
+                @enum = IPath.GetEnum(filePath).ToString();
+                if (!ticksDirectory.Directory.EndsWith(@enum))
+                {
+                    checkFile = GetCheckFile(ticksDirectory, @enum, fileName, file);
+                    fileHolder = IFileHolder.Get(checkFile);
+                    filePath = FilePath.Get(propertyConfiguration, fileHolder, index: null);
+                    if (filePath.Id is null)
+                        continue;
+                }
+            }
+            distinct.Add(fileName);
+            record = new(DirectoryNumber: directoryNumber,
+                         IsDefault: isDefault,
+                         LinksCount: linksCount,
+                         MappedFaceFilePath: filePath,
+                         PersonDisplayDirectoryName: personDisplayDirectoryName,
+                         PersonKeyFormatted: personKeyFormatted);
+            results.Add(record);
         }
         return results;
     }
 
+    private static string GetCheckFile(TicksDirectory ticksDirectory, string @enum, string fileName, string file)
+    {
+        string result;
+        string checkDirectory;
+        string directory = file;
+        List<string> collection = [];
+        for (int i = 0; i < file.Length; i++)
+        {
+            directory = Path.GetDirectoryName(directory) ?? throw new Exception();
+            if (directory == ticksDirectory.Directory)
+                break;
+            collection.Add(Path.GetFileName(directory));
+        }
+        collection.Reverse();
+        checkDirectory = $"{ticksDirectory.Directory}.{@enum}";
+        foreach (string directoryName in collection)
+            checkDirectory = Path.Combine(checkDirectory, directoryName);
+        if (!Directory.Exists(checkDirectory))
+            _ = Directory.CreateDirectory(checkDirectory);
+        result = Path.Combine(checkDirectory, fileName);
+        if (File.Exists(result))
+            throw new Exception($"File <{fileName}> already exists!");
+        File.Move(file, result);
+        return result;
+    }
+
 }

Map/Models/Stateless/FaceFileLogic.cs

@@ -87,7 +87,7 @@ internal abstract class FaceFileLogic
         Dictionary<int, ReadOnlyDictionary<int, LocationContainer>> results = [];
         foreach (KeyValuePair<int, Dictionary<int, LocationContainer>> keyValuePair in keyValuePairs)
             results.Add(keyValuePair.Key, new(keyValuePair.Value));
-        return new(results);
+        return results.AsReadOnly();
     }
 
     internal static ReadOnlyDictionary<int, ReadOnlyDictionary<int, LocationContainer>> GetMapped(int maxDegreeOfParallelism, Property.Models.Configuration propertyConfiguration, Configuration configuration, long ticks, ReadOnlyCollection<PersonContainer> personContainers, string a2PeopleSingletonDirectory, string eDistanceContentDirectory)

Map/Models/Stateless/Methods/IMapLogic.cs

@@ -7,69 +7,93 @@ namespace View_by_Distance.Map.Models.Stateless.Methods;
 public interface IMapLogic
 {
 
-    ReadOnlyDictionary<int, List<long>> TestStatic_GetIdToPersonKeys(ReadOnlyDictionary<long, List<int>> personKeyToIds) =>
-        GetIdToPersonKeys(personKeyToIds);
-    static ReadOnlyDictionary<int, List<long>> GetIdToPersonKeys(ReadOnlyDictionary<long, List<int>> personKeyToIds) =>
-        MapLogic.GetIdToPersonKeys(personKeyToIds);
+    static string Get(bool saveIndividually, string forceSingleImageHumanized, int by, bool isDefaultName) =>
+        $"{by switch
+        {
+            Shared.Models.Stateless.IMapLogic.Mapping => nameof(Shared.Models.Stateless.IMapLogic.Mapping),
+            Shared.Models.Stateless.IMapLogic.Sorting => saveIndividually ?
+                nameof(Shared.Models.Stateless.IMapLogic.Individually) :
+                nameof(Shared.Models.Stateless.IMapLogic.Sorting),
+            Shared.Models.Stateless.IMapLogic.ForceSingleImage => forceSingleImageHumanized,
+            _ => throw new NotImplementedException()
+        }}{(!isDefaultName ? "-A" : "-Z")}";
 
-    ReadOnlyCollection<Face> TestStatic_GetFaces(ReadOnlyCollection<Item> items) =>
-         GetFaces(items);
-    static ReadOnlyCollection<Face> GetFaces(ReadOnlyCollection<Item> items) =>
-        MapLogic.GetFaces(items);
-
-    Mapping[] TestStatic_GetSelectedMappingCollection(ReadOnlyCollection<Item> items) =>
-        GetSelectedMappingCollection(items);
-    static Mapping[] GetSelectedMappingCollection(ReadOnlyCollection<Item> items) =>
+    public static Mapping[] GetSelectedMappingCollection(ReadOnlyCollection<Item> items) =>
         MapLogic.GetSelectedMappingCollection(items);
 
-    Mapping[] TestStatic_GetSelectedMappingCollection(ReadOnlyCollection<Face> faces) =>
-        GetSelectedMappingCollection(faces);
-    static Mapping[] GetSelectedMappingCollection(ReadOnlyCollection<Face> faces) =>
+    public static Mapping[] GetSelectedMappingCollection(ReadOnlyCollection<Face> faces) =>
         MapLogic.GetSelectedMappingCollection(faces);
 
-    ReadOnlyDictionary<int, ReadOnlyDictionary<int, Mapping>> TestStatic_GetIdToWholePercentagesToFace(ReadOnlyCollection<Mapping> distinctValidImageMappingCollection) =>
-        GetIdToWholePercentagesToFace(distinctValidImageMappingCollection);
-    static ReadOnlyDictionary<int, ReadOnlyDictionary<int, Mapping>> GetIdToWholePercentagesToFace(ReadOnlyCollection<Mapping> distinctValidImageMappingCollection) =>
-        MapLogic.GetIdToWholePercentagesToFace(distinctValidImageMappingCollection);
-
-    List<(string, long)> TestStatic_GetJLinkDirectories(string genealogicalDataCommunicationFile, string[] jLinks, string personBirthdayFormat, char[] personCharacters, string a2PeopleSingletonDirectory, string a2PeopleContentDirectory) =>
-         GetJLinkDirectories(genealogicalDataCommunicationFile, jLinks, personBirthdayFormat, personCharacters, a2PeopleSingletonDirectory, a2PeopleContentDirectory);
-    static List<(string, long)> GetJLinkDirectories(string genealogicalDataCommunicationFile, string[] jLinks, string personBirthdayFormat, char[] personCharacters, string a2PeopleSingletonDirectory, string a2PeopleContentDirectory) =>
-        MapLogic.GetJLinkDirectories(genealogicalDataCommunicationFile, jLinks, personBirthdayFormat, personCharacters, a2PeopleSingletonDirectory, a2PeopleContentDirectory);
-
-    void TestStatic_SetCreationTime(MappingFromItem mappingFromItem, ReadOnlyCollection<LocationContainer> locationContainers) =>
-        SetCreationTime(mappingFromItem, locationContainers);
-    static void SetCreationTime(MappingFromItem mappingFromItem, ReadOnlyCollection<LocationContainer> locationContainers) =>
-        DecadeLogic.SetCreationTime(mappingFromItem, locationContainers);
-
-    void TestStatic_MoveToDecade(Property.Models.Configuration propertyConfiguration, MappingFromItem mappingFromItem, ReadOnlyCollection<LocationContainer> locationContainers) =>
-        MoveToDecade(propertyConfiguration, mappingFromItem, locationContainers);
-    static void MoveToDecade(Property.Models.Configuration propertyConfiguration, MappingFromItem mappingFromItem, ReadOnlyCollection<LocationContainer> locationContainers) =>
-        DecadeLogic.MoveToDecade(propertyConfiguration, mappingFromItem, locationContainers);
-
-    bool? TestStatic_CanReMap(long[] jLinkResolvedPersonKeys, ReadOnlyDictionary<int, ReadOnlyCollection<PersonContainer>>? wholePercentagesToPersonContainers, MappingFromLocation mappingFromLocation) =>
-        CanReMap(jLinkResolvedPersonKeys, wholePercentagesToPersonContainers, mappingFromLocation);
-    static bool? CanReMap(long[] jLinkResolvedPersonKeys, ReadOnlyDictionary<int, ReadOnlyCollection<PersonContainer>>? wholePercentagesToPersonContainers, MappingFromLocation mappingFromLocation) =>
-        MapLogic.CanReMap(jLinkResolvedPersonKeys, wholePercentagesToPersonContainers, mappingFromLocation.WholePercentages);
-
-    bool? TestStatic_CanReMap(long[] jLinkResolvedPersonKeys, ReadOnlyDictionary<int, ReadOnlyCollection<PersonContainer>>? wholePercentagesToPersonContainers, int wholePercentages) =>
-        CanReMap(jLinkResolvedPersonKeys, wholePercentagesToPersonContainers, wholePercentages);
-    static bool? CanReMap(long[] jLinkResolvedPersonKeys, ReadOnlyDictionary<int, ReadOnlyCollection<PersonContainer>>? wholePercentagesToPersonContainers, int wholePercentages) =>
+    public static bool? CanReMap(long[] jLinkResolvedPersonKeys, ReadOnlyDictionary<int, ReadOnlyCollection<PersonContainer>>? wholePercentagesToPersonContainers, int wholePercentages) =>
         MapLogic.CanReMap(jLinkResolvedPersonKeys, wholePercentagesToPersonContainers, wholePercentages);
 
-    string TestStatic_GetDecade(MappingFromItem mappingFromItem) =>
-        GetDecade(mappingFromItem);
-    static string GetDecade(MappingFromItem mappingFromItem) =>
+    public static bool? CanReMap(long[] jLinkResolvedPersonKeys, ReadOnlyDictionary<int, ReadOnlyCollection<PersonContainer>>? wholePercentagesToPersonContainers, MappingFromLocation mappingFromLocation) =>
+        MapLogic.CanReMap(jLinkResolvedPersonKeys, wholePercentagesToPersonContainers, mappingFromLocation.WholePercentages);
+
+    public static string GetDecade(MappingFromItem mappingFromItem) =>
         DecadeLogic.GetDecade(mappingFromItem, null);
 
-    ReadOnlyDictionary<int, ReadOnlyDictionary<int, LocationContainer>> TestStatic_GetMappedFiles(int maxDegreeOfParallelism, Property.Models.Configuration propertyConfiguration, Configuration configuration, long ticks, ReadOnlyCollection<PersonContainer> personContainers, string a2PeopleSingletonDirectory, string eDistanceContentDirectory) =>
-        GetMapped(maxDegreeOfParallelism, propertyConfiguration, configuration, ticks, personContainers, a2PeopleSingletonDirectory, eDistanceContentDirectory);
-    static ReadOnlyDictionary<int, ReadOnlyDictionary<int, LocationContainer>> GetMapped(int maxDegreeOfParallelism, Property.Models.Configuration propertyConfiguration, Configuration configuration, long ticks, ReadOnlyCollection<PersonContainer> personContainers, string a2PeopleSingletonDirectory, string eDistanceContentDirectory) =>
-        FaceFileLogic.GetMapped(maxDegreeOfParallelism, propertyConfiguration, configuration, ticks, personContainers, a2PeopleSingletonDirectory, eDistanceContentDirectory);
+    public static ReadOnlyCollection<Face> GetFaces(ReadOnlyCollection<Item> items) =>
+        MapLogic.GetFaces(items);
 
-    List<LocationContainer> TestStatic_GetAvailable(int maxDegreeOfParallelism, Configuration configuration, IFaceD dFace, long ticks, ReadOnlyCollection<FilePath> filePaths) =>
-        GetAvailable(maxDegreeOfParallelism, configuration, dFace, ticks, filePaths);
-    static List<LocationContainer> GetAvailable(int maxDegreeOfParallelism, Configuration configuration, IFaceD dFace, long ticks, ReadOnlyCollection<FilePath> filePaths) =>
+    public static ReadOnlyDictionary<int, List<long>> GetIdToPersonKeys(ReadOnlyDictionary<long, List<int>> personKeyToIds) =>
+        MapLogic.GetIdToPersonKeys(personKeyToIds);
+
+    public static void SetCreationTime(MappingFromItem mappingFromItem, ReadOnlyCollection<LocationContainer> locationContainers) =>
+        DecadeLogic.SetCreationTime(mappingFromItem, locationContainers);
+
+    public static ReadOnlyDictionary<int, ReadOnlyDictionary<int, Mapping>> GetIdToWholePercentagesToFace(ReadOnlyCollection<Mapping> distinctValidImageMappingCollection) =>
+        MapLogic.GetIdToWholePercentagesToFace(distinctValidImageMappingCollection);
+
+    public static List<LocationContainer> GetAvailable(int maxDegreeOfParallelism, Configuration configuration, IFaceD dFace, long ticks, ReadOnlyCollection<FilePath> filePaths) =>
         FaceFileLogic.GetAvailable(maxDegreeOfParallelism, configuration, dFace, ticks, filePaths);
 
+    public static void MoveToDecade(Property.Models.Configuration propertyConfiguration, MappingFromItem mappingFromItem, ReadOnlyCollection<LocationContainer> locationContainers) =>
+        DecadeLogic.MoveToDecade(propertyConfiguration, mappingFromItem, locationContainers);
+
+    public static List<(string, long)> GetJLinkDirectories(string genealogicalDataCommunicationFile, string[] jLinks, string personBirthdayFormat, char[] personCharacters, string a2PeopleSingletonDirectory, string a2PeopleContentDirectory) =>
+        MapLogic.GetJLinkDirectories(genealogicalDataCommunicationFile, jLinks, personBirthdayFormat, personCharacters, a2PeopleSingletonDirectory, a2PeopleContentDirectory);
+
+    public static ReadOnlyDictionary<int, ReadOnlyDictionary<int, LocationContainer>> GetMapped(int maxDegreeOfParallelism, Property.Models.Configuration propertyConfiguration, Configuration configuration, long ticks, ReadOnlyCollection<PersonContainer> personContainers, string a2PeopleSingletonDirectory, string eDistanceContentDirectory) =>
+        FaceFileLogic.GetMapped(maxDegreeOfParallelism, propertyConfiguration, configuration, ticks, personContainers, a2PeopleSingletonDirectory, eDistanceContentDirectory);
+
+    internal string TestStatic_GetDecade(MappingFromItem mappingFromItem) =>
+        GetDecade(mappingFromItem);
+
+    internal ReadOnlyCollection<Face> TestStatic_GetFaces(ReadOnlyCollection<Item> items) =>
+         GetFaces(items);
+
+    internal Mapping[] TestStatic_GetSelectedMappingCollection(ReadOnlyCollection<Item> items) =>
+        GetSelectedMappingCollection(items);
+
+    internal Mapping[] TestStatic_GetSelectedMappingCollection(ReadOnlyCollection<Face> faces) =>
+        GetSelectedMappingCollection(faces);
+
+    internal ReadOnlyDictionary<int, List<long>> TestStatic_GetIdToPersonKeys(ReadOnlyDictionary<long, List<int>> personKeyToIds) =>
+        GetIdToPersonKeys(personKeyToIds);
+
+    internal void TestStatic_SetCreationTime(MappingFromItem mappingFromItem, ReadOnlyCollection<LocationContainer> locationContainers) =>
+        SetCreationTime(mappingFromItem, locationContainers);
+
+    internal ReadOnlyDictionary<int, ReadOnlyDictionary<int, Mapping>> TestStatic_GetIdToWholePercentagesToFace(ReadOnlyCollection<Mapping> distinctValidImageMappingCollection) =>
+        GetIdToWholePercentagesToFace(distinctValidImageMappingCollection);
+
+    internal List<LocationContainer> TestStatic_GetAvailable(int maxDegreeOfParallelism, Configuration configuration, IFaceD dFace, long ticks, ReadOnlyCollection<FilePath> filePaths) =>
+        GetAvailable(maxDegreeOfParallelism, configuration, dFace, ticks, filePaths);
+
+    internal void TestStatic_MoveToDecade(Property.Models.Configuration propertyConfiguration, MappingFromItem mappingFromItem, ReadOnlyCollection<LocationContainer> locationContainers) =>
+        MoveToDecade(propertyConfiguration, mappingFromItem, locationContainers);
+
+    internal bool? TestStatic_CanReMap(long[] jLinkResolvedPersonKeys, ReadOnlyDictionary<int, ReadOnlyCollection<PersonContainer>>? wholePercentagesToPersonContainers, int wholePercentages) =>
+        CanReMap(jLinkResolvedPersonKeys, wholePercentagesToPersonContainers, wholePercentages);
+
+    internal bool? TestStatic_CanReMap(long[] jLinkResolvedPersonKeys, ReadOnlyDictionary<int, ReadOnlyCollection<PersonContainer>>? wholePercentagesToPersonContainers, MappingFromLocation mappingFromLocation) =>
+        CanReMap(jLinkResolvedPersonKeys, wholePercentagesToPersonContainers, mappingFromLocation);
+
+    internal List<(string, long)> TestStatic_GetJLinkDirectories(string genealogicalDataCommunicationFile, string[] jLinks, string personBirthdayFormat, char[] personCharacters, string a2PeopleSingletonDirectory, string a2PeopleContentDirectory) =>
+         GetJLinkDirectories(genealogicalDataCommunicationFile, jLinks, personBirthdayFormat, personCharacters, a2PeopleSingletonDirectory, a2PeopleContentDirectory);
+
+    internal ReadOnlyDictionary<int, ReadOnlyDictionary<int, LocationContainer>> TestStatic_GetMappedFiles(int maxDegreeOfParallelism, Property.Models.Configuration propertyConfiguration, Configuration configuration, long ticks, ReadOnlyCollection<PersonContainer> personContainers, string a2PeopleSingletonDirectory, string eDistanceContentDirectory) =>
+        GetMapped(maxDegreeOfParallelism, propertyConfiguration, configuration, ticks, personContainers, a2PeopleSingletonDirectory, eDistanceContentDirectory);
+
 }

Map/Models/Stateless/RelationLogic.cs

@@ -8,36 +8,48 @@ namespace View_by_Distance.Map.Models.Stateless;
 internal abstract class RelationLogic
 {
 
-    internal record Group(string Key, long PersonKey, ReadOnlyCollection<LocationContainer> RelationContainersCollection);
+    internal record Group(string Key,
+                          long PersonKey,
+                          ReadOnlyCollection<LocationContainer> RelationContainersCollection);
 
-    private static Dictionary<long, Dictionary<int, List<LocationContainer>>> GetPersonKeyTo(Configuration configuration, List<LocationContainer> locationContainers)
+    internal static void SaveMappedRelations(Configuration configuration, Shared.Models.Methods.IDistance distance, string a2PeopleContentDirectory, string eDistanceContentDirectory, long ticks, List<LocationContainer> locationContainers, ReadOnlyDictionary<string, PersonContainer> readOnlyPersonKeyFormattedToPersonContainer, ReadOnlyDictionary<long, List<PersonContainer>> readOnlyPersonKeyToPersonContainerCollection)
     {
-        List<LocationContainer>? collection;
-        Dictionary<int, List<LocationContainer>>? yearTo;
-        Dictionary<long, Dictionary<int, List<LocationContainer>>> personKeyTo = [];
-        foreach (LocationContainer locationContainer in locationContainers)
+        int take;
+        string directory;
+        bool isCounterPersonYear;
+        string personKeyFormatted;
+        string? displayDirectoryName;
+        Uri uri = new(eDistanceContentDirectory);
+        ReadOnlyDictionary<string, string> movedFiles;
+        ReadOnlyCollection<RelationContainer> relationContainers;
+        ReadOnlyCollection<Group> groups = GetGroups(configuration, locationContainers);
+        int totalSeconds = (int)Math.Floor(new TimeSpan(DateTime.Now.Ticks - ticks).TotalSeconds);
+        string message = $") Save Mapped Relations - {totalSeconds} total second(s)";
+        ProgressBarOptions options = new() { ProgressCharacter = '─', ProgressBarOnBottom = true, DisableBottomPercentage = true };
+        using ProgressBar progressBar = new(groups.Count, message, options);
+        foreach (Group group in groups)
         {
-            if (locationContainer.PersonKey is null)
+            if (configuration.LocationContainerDistanceTolerance is null)
+                break;
+            progressBar.Tick();
+            if (group.RelationContainersCollection.Count == 0)
                 continue;
-            if (!locationContainer.FromDistanceContent)
-                continue;
-            if (!locationContainer.FilePath.FullName.Contains(configuration.LocationContainerDirectoryPattern))
-                continue;
-            if (!personKeyTo.TryGetValue(locationContainer.PersonKey.Value, out yearTo))
-            {
-                personKeyTo.Add(locationContainer.PersonKey.Value, []);
-                if (!personKeyTo.TryGetValue(locationContainer.PersonKey.Value, out yearTo))
-                    throw new Exception();
-            }
-            if (!yearTo.TryGetValue(locationContainer.CreationDateOnly.Year, out collection))
-            {
-                yearTo.Add(locationContainer.CreationDateOnly.Year, []);
-                if (!yearTo.TryGetValue(locationContainer.CreationDateOnly.Year, out collection))
-                    throw new Exception();
-            }
-            collection.Add(locationContainer);
+            take = GetTake(configuration.LocationContainerDistanceTake, group.RelationContainersCollection.Count);
+            isCounterPersonYear = IPersonBirthday.IsCounterPersonYear(new DateTime(group.PersonKey).Year);
+            personKeyFormatted = IPersonBirthday.GetFormatted(configuration.PersonBirthdayFormat, group.PersonKey);
+            displayDirectoryName = GetDisplayDirectoryName(readOnlyPersonKeyToPersonContainerCollection, readOnlyPersonKeyFormattedToPersonContainer, group.PersonKey, personKeyFormatted);
+            directory = Path.Combine(a2PeopleContentDirectory, $"{ticks}-{configuration.LocationContainerDistanceTolerance.Value}", personKeyFormatted, group.Key);
+            if (!Directory.Exists(directory))
+                _ = Directory.CreateDirectory(directory);
+            WriteVsCodeFiles(eDistanceContentDirectory, displayDirectoryName, directory);
+            relationContainers = distance.GetRelationContainers(configuration.DistanceLimits, configuration.FaceDistancePermyriad, configuration.LocationContainerDistanceTake, configuration.LocationContainerDistanceTolerance.Value, group.RelationContainersCollection);
+            movedFiles = GetMoveFiles(configuration, group.Key, take, isCounterPersonYear, displayDirectoryName, relationContainers);
+            WriteFile(take, group.PersonKey, isCounterPersonYear, personKeyFormatted, displayDirectoryName, directory, ticks, uri, relationContainers, movedFiles);
         }
-        return personKeyTo;
+        if (string.IsNullOrEmpty(configuration.LocationContainerDebugDirectory))
+            _ = IPath.DeleteEmptyDirectories(eDistanceContentDirectory);
+        else
+            AddDisplayDirectoryNames(configuration, eDistanceContentDirectory, readOnlyPersonKeyFormattedToPersonContainer, readOnlyPersonKeyToPersonContainerCollection, groups);
     }
 
     private static ReadOnlyCollection<Group> GetGroups(Configuration configuration, List<LocationContainer> locationContainers)
@@ -82,12 +94,127 @@ internal abstract class RelationLogic
                 locationContainer = collection[0];
                 if (locationContainer.PersonKey is null)
                     continue;
-                results.Add(new(key, locationContainer.PersonKey.Value, new(collection)));
+                results.Add(new(key, locationContainer.PersonKey.Value, collection.AsReadOnly()));
                 collection = [];
                 years.Clear();
             }
         }
-        return new(results);
+        return results.AsReadOnly();
+    }
+
+    private static Dictionary<long, Dictionary<int, List<LocationContainer>>> GetPersonKeyTo(Configuration configuration, List<LocationContainer> locationContainers)
+    {
+        List<LocationContainer>? collection;
+        Dictionary<int, List<LocationContainer>>? yearTo;
+        Dictionary<long, Dictionary<int, List<LocationContainer>>> personKeyTo = [];
+        foreach (LocationContainer locationContainer in locationContainers)
+        {
+            if (locationContainer.PersonKey is null)
+                continue;
+            if (!locationContainer.FromDistanceContent)
+                continue;
+            if (!locationContainer.FilePath.FullName.Contains(configuration.LocationContainerDirectoryPattern))
+                continue;
+            if (!personKeyTo.TryGetValue(locationContainer.PersonKey.Value, out yearTo))
+            {
+                personKeyTo.Add(locationContainer.PersonKey.Value, []);
+                if (!personKeyTo.TryGetValue(locationContainer.PersonKey.Value, out yearTo))
+                    throw new Exception();
+            }
+            if (!yearTo.TryGetValue(locationContainer.CreationDateOnly.Year, out collection))
+            {
+                yearTo.Add(locationContainer.CreationDateOnly.Year, []);
+                if (!yearTo.TryGetValue(locationContainer.CreationDateOnly.Year, out collection))
+                    throw new Exception();
+            }
+            collection.Add(locationContainer);
+        }
+        return personKeyTo;
+    }
+
+    private static int GetTake(int locationContainerDistanceTake, int count)
+    {
+        int result = locationContainerDistanceTake;
+        int subtract = (int)(locationContainerDistanceTake * .05);
+        if (subtract < 1)
+            subtract = 1;
+        if (count > 9000)
+            result -= subtract;
+        if (count > 8000)
+            result -= subtract;
+        if (count > 7000)
+            result -= subtract;
+        if (count > 6000)
+            result -= subtract;
+        if (count > 5000)
+            result -= subtract;
+        if (count > 4000)
+            result -= subtract;
+        if (count > 3000)
+            result -= subtract;
+        if (count > 2000)
+            result -= subtract;
+        if (count > 1000)
+            result -= subtract;
+        if (result < 3)
+            result = 3;
+        return result;
+    }
+
+    private static string? GetDisplayDirectoryName(ReadOnlyDictionary<long, List<PersonContainer>> readOnlyPersonKeyToPersonContainerCollection, ReadOnlyDictionary<string, PersonContainer> readOnlyPersonKeyFormattedToPersonContainer, long personKey, string personKeyFormatted)
+    {
+        string? result;
+        PersonContainer? personContainer;
+        List<PersonContainer>? collection;
+        _ = readOnlyPersonKeyToPersonContainerCollection.TryGetValue(personKey, out collection);
+        if (collection is not null)
+            result = collection[0].DisplayDirectoryName;
+        else
+        {
+            if (!readOnlyPersonKeyFormattedToPersonContainer.TryGetValue(personKeyFormatted, out personContainer))
+                result = null;
+            else
+                result = personContainer.DisplayDirectoryName;
+        }
+        return result;
+    }
+
+    private static void WriteVsCodeFiles(string eDistanceContentDirectory, string? displayDirectoryName, string directory)
+    {
+        string json;
+        string vsCodeDirectory = Path.Combine(directory, ".vscode");
+        if (!Directory.Exists(vsCodeDirectory))
+            _ = Directory.CreateDirectory(vsCodeDirectory);
+        if (displayDirectoryName is not null)
+            File.WriteAllText(Path.Combine(directory, $"_ {displayDirectoryName}.txt"), string.Empty);
+        json = /*lang=json*/ """{ "[markdown]": { "editor.wordWrap": "off" }, "foam.links.hover.enable": false, "foam.graph.style": { "background": "#202020", "node": { "note": "#f2cb1d", "distance": "green", "image": "orange", "placeholder": "white", } } }""";
+        _ = IPath.WriteAllText(Path.Combine(vsCodeDirectory, "settings.json"), json, updateDateWhenMatches: false, compareBeforeWrite: true, updateToWhenMatches: null);
+        json = string.Concat("{ \"version\": \"2.0.0\", \"tasks\": [ { \"label\": \"MKLink\", \"type\": \"shell\", \"command\": \"New-Item\", \"args\": [ \"-ItemType\", \"Junction\", \"-Path\", \"'", directory.Replace('\\', '/'), "/()'\", \"-Target\", \"'", eDistanceContentDirectory.Replace('\\', '/'), "'\" ], \"problemMatcher\": [] } ] }");
+        _ = IPath.WriteAllText(Path.Combine(vsCodeDirectory, "tasks.json"), json, updateDateWhenMatches: false, compareBeforeWrite: true, updateToWhenMatches: null);
+    }
+
+    private static ReadOnlyDictionary<string, string> GetMoveFiles(Configuration configuration, string key, int take, bool isCounterPersonYear, string? displayDirectoryName, ReadOnlyCollection<RelationContainer> relationContainers)
+    {
+        ReadOnlyDictionary<string, string> results;
+        List<List<string>> linked = [];
+        for (int i = 0; i < 25; i++)
+            linked.Add([]);
+        foreach ((FileHolder fileHolder, ReadOnlyCollection<Relation> relations) in relationContainers)
+        {
+            foreach (Relation relation in relations.Take(take))
+            {
+                for (int i = 0; i < 25; i++)
+                {
+                    if (!linked[i].Contains(relation.File))
+                    {
+                        linked[i].Add(relation.File);
+                        break;
+                    }
+                }
+            }
+        }
+        results = MoveFiles(configuration, key, isCounterPersonYear, displayDirectoryName, relationContainers, linked);
+        return results;
     }
 
     private static ReadOnlyDictionary<string, string> MoveFiles(Configuration configuration, string key, bool isCounterPersonYear, string? displayDirectoryName, ReadOnlyCollection<RelationContainer> relationContainers, List<List<string>> linked)
@@ -202,92 +329,7 @@ internal abstract class RelationLogic
                     _ = Directory.CreateDirectory(checkDirectory);
             }
         }
-        return new(results);
-    }
-
-    private static string? GetDisplayDirectoryName(ReadOnlyDictionary<long, List<PersonContainer>> readOnlyPersonKeyToPersonContainerCollection, ReadOnlyDictionary<string, PersonContainer> readOnlyPersonKeyFormattedToPersonContainer, long personKey, string personKeyFormatted)
-    {
-        string? result;
-        PersonContainer? personContainer;
-        List<PersonContainer>? collection;
-        _ = readOnlyPersonKeyToPersonContainerCollection.TryGetValue(personKey, out collection);
-        if (collection is not null)
-            result = collection[0].DisplayDirectoryName;
-        else
-        {
-            if (!readOnlyPersonKeyFormattedToPersonContainer.TryGetValue(personKeyFormatted, out personContainer))
-                result = null;
-            else
-                result = personContainer.DisplayDirectoryName;
-        }
-        return result;
-    }
-
-    private static int GetTake(int locationContainerDistanceTake, int count)
-    {
-        int result = locationContainerDistanceTake;
-        int subtract = (int)(locationContainerDistanceTake * .05);
-        if (subtract < 1)
-            subtract = 1;
-        if (count > 9000)
-            result -= subtract;
-        if (count > 8000)
-            result -= subtract;
-        if (count > 7000)
-            result -= subtract;
-        if (count > 6000)
-            result -= subtract;
-        if (count > 5000)
-            result -= subtract;
-        if (count > 4000)
-            result -= subtract;
-        if (count > 3000)
-            result -= subtract;
-        if (count > 2000)
-            result -= subtract;
-        if (count > 1000)
-            result -= subtract;
-        if (result < 3)
-            result = 3;
-        return result;
-    }
-
-    private static void WriteVsCodeFiles(string eDistanceContentDirectory, string? displayDirectoryName, string directory)
-    {
-        string json;
-        string vsCodeDirectory = Path.Combine(directory, ".vscode");
-        if (!Directory.Exists(vsCodeDirectory))
-            _ = Directory.CreateDirectory(vsCodeDirectory);
-        if (displayDirectoryName is not null)
-            File.WriteAllText(Path.Combine(directory, $"_ {displayDirectoryName}.txt"), string.Empty);
-        json = /*lang=json*/ """{ "[markdown]": { "editor.wordWrap": "off" }, "foam.links.hover.enable": false, "foam.graph.style": { "background": "#202020", "node": { "note": "#f2cb1d", "distance": "green", "image": "orange", "placeholder": "white", } } }""";
-        _ = IPath.WriteAllText(Path.Combine(vsCodeDirectory, "settings.json"), json, updateDateWhenMatches: false, compareBeforeWrite: true, updateToWhenMatches: null);
-        json = string.Concat("{ \"version\": \"2.0.0\", \"tasks\": [ { \"label\": \"MKLink\", \"type\": \"shell\", \"command\": \"New-Item\", \"args\": [ \"-ItemType\", \"Junction\", \"-Path\", \"'", directory.Replace('\\', '/'), "/()'\", \"-Target\", \"'", eDistanceContentDirectory.Replace('\\', '/'), "'\" ], \"problemMatcher\": [] } ] }");
-        _ = IPath.WriteAllText(Path.Combine(vsCodeDirectory, "tasks.json"), json, updateDateWhenMatches: false, compareBeforeWrite: true, updateToWhenMatches: null);
-    }
-
-    private static ReadOnlyDictionary<string, string> GetMoveFiles(Configuration configuration, string key, int take, bool isCounterPersonYear, string? displayDirectoryName, ReadOnlyCollection<RelationContainer> relationContainers)
-    {
-        ReadOnlyDictionary<string, string> results;
-        List<List<string>> linked = [];
-        for (int i = 0; i < 25; i++)
-            linked.Add([]);
-        foreach ((FileHolder fileHolder, ReadOnlyCollection<Relation> relations) in relationContainers)
-        {
-            foreach (Relation relation in relations.Take(take))
-            {
-                for (int i = 0; i < 25; i++)
-                {
-                    if (!linked[i].Contains(relation.File))
-                    {
-                        linked[i].Add(relation.File);
-                        break;
-                    }
-                }
-            }
-        }
-        results = MoveFiles(configuration, key, isCounterPersonYear, displayDirectoryName, relationContainers, linked);
-        return results;
+        return results.AsReadOnly();
     }
 
     private static void WriteFile(int take, long personKey, bool isCounterPersonYear, string personKeyFormatted, string? displayDirectoryName, string directory, long ticks, Uri uri, ReadOnlyCollection<RelationContainer> relationContainers, ReadOnlyDictionary<string, string> movedFiles)
@@ -398,44 +440,4 @@ internal abstract class RelationLogic
         }
     }
 
-    internal static void SaveMappedRelations(Configuration configuration, Shared.Models.Methods.IDistance distance, string a2PeopleContentDirectory, string eDistanceContentDirectory, long ticks, List<LocationContainer> locationContainers, ReadOnlyDictionary<string, PersonContainer> readOnlyPersonKeyFormattedToPersonContainer, ReadOnlyDictionary<long, List<PersonContainer>> readOnlyPersonKeyToPersonContainerCollection)
-    {
-        int take;
-        string directory;
-        bool isCounterPersonYear;
-        string personKeyFormatted;
-        string? displayDirectoryName;
-        Uri uri = new(eDistanceContentDirectory);
-        ReadOnlyDictionary<string, string> movedFiles;
-        ReadOnlyCollection<RelationContainer> relationContainers;
-        ReadOnlyCollection<Group> groups = GetGroups(configuration, locationContainers);
-        int totalSeconds = (int)Math.Floor(new TimeSpan(DateTime.Now.Ticks - ticks).TotalSeconds);
-        string message = $") Save Mapped Relations - {totalSeconds} total second(s)";
-        ProgressBarOptions options = new() { ProgressCharacter = '─', ProgressBarOnBottom = true, DisableBottomPercentage = true };
-        using ProgressBar progressBar = new(groups.Count, message, options);
-        foreach (Group group in groups)
-        {
-            if (configuration.LocationContainerDistanceTolerance is null)
-                break;
-            progressBar.Tick();
-            if (group.RelationContainersCollection.Count == 0)
-                continue;
-            take = GetTake(configuration.LocationContainerDistanceTake, group.RelationContainersCollection.Count);
-            isCounterPersonYear = IPersonBirthday.IsCounterPersonYear(new DateTime(group.PersonKey).Year);
-            personKeyFormatted = IPersonBirthday.GetFormatted(configuration.PersonBirthdayFormat, group.PersonKey);
-            displayDirectoryName = GetDisplayDirectoryName(readOnlyPersonKeyToPersonContainerCollection, readOnlyPersonKeyFormattedToPersonContainer, group.PersonKey, personKeyFormatted);
-            directory = Path.Combine(a2PeopleContentDirectory, $"{ticks}-{configuration.LocationContainerDistanceTolerance.Value}", personKeyFormatted, group.Key);
-            if (!Directory.Exists(directory))
-                _ = Directory.CreateDirectory(directory);
-            WriteVsCodeFiles(eDistanceContentDirectory, displayDirectoryName, directory);
-            relationContainers = distance.GetRelationContainers(configuration.DistanceLimits, configuration.FaceDistancePermyriad, configuration.LocationContainerDistanceTake, configuration.LocationContainerDistanceTolerance.Value, group.RelationContainersCollection);
-            movedFiles = GetMoveFiles(configuration, group.Key, take, isCounterPersonYear, displayDirectoryName, relationContainers);
-            WriteFile(take, group.PersonKey, isCounterPersonYear, personKeyFormatted, displayDirectoryName, directory, ticks, uri, relationContainers, movedFiles);
-        }
-        if (string.IsNullOrEmpty(configuration.LocationContainerDebugDirectory))
-            _ = IPath.DeleteEmptyDirectories(eDistanceContentDirectory);
-        else
-            AddDisplayDirectoryNames(configuration, eDistanceContentDirectory, readOnlyPersonKeyFormattedToPersonContainer, readOnlyPersonKeyToPersonContainerCollection, groups);
-    }
-
 }

Metadata-Query/Metadata-Query.csproj

@@ -35,10 +35,10 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Humanizer.Core" Version="2.14.1" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="9.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="9.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.0" />
-    <PackageReference Include="System.Text.Json" Version="9.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="9.0.2" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="9.0.2" />
+    <PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.2" />
+    <PackageReference Include="System.Text.Json" Version="9.0.2" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Property\Property.csproj" />

Metadata/Metadata.csproj

@@ -34,10 +34,10 @@
     </ItemGroup>
     <ItemGroup>
         <PackageReference Include="MetadataExtractor" Version="2.8.1" />
-        <PackageReference Include="System.Text.Json" Version="9.0.0" />
+        <PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.2" />
+        <PackageReference Include="System.Text.Json" Version="9.0.2" />
     </ItemGroup>
     <ItemGroup>
-        <ProjectReference Include="..\Property\Property.csproj" />
         <ProjectReference Include="..\Shared\View-by-Distance.Shared.csproj" />
     </ItemGroup>
 </Project>

Metadata/Models/B_Metadata.cs

@@ -4,6 +4,7 @@ using System.Text.Json;
 using View_by_Distance.Shared.Models;
 using View_by_Distance.Shared.Models.Methods;
 using View_by_Distance.Shared.Models.Properties;
+using View_by_Distance.Shared.Models.Stateless.Methods;
 
 namespace View_by_Distance.Metadata.Models;
 
@@ -13,33 +14,103 @@ namespace View_by_Distance.Metadata.Models;
 public class B_Metadata : IMetadata<MetadataExtractor.Directory>
 {
 
+    public string DateGroupDirectory { get; init; }
+    public ReadOnlyCollection<FilePath> Collection { get; private set; }
+    public ReadOnlyDictionary<int, List<FilePath>> SingletonById { get; private set; }
+    public ReadOnlyDictionary<int, ExifDirectory> ExifDirectoriesById { get; private set; }
+
+    // First
+    // Set DateGroupDirectory
+    // Create a directories for Singleton
+    // Populate Collection
+    // Populate Singleton
+    // Populate existing ExifDirectories
+    // Run similar for resize
+    // Second
+    // Populate needed ExifDirectories Dictionary can't be init only
+
     private readonly bool _PropertiesChangedForMetadata;
     private readonly IPropertyConfiguration _PropertyConfiguration;
     private readonly bool _ForceMetadataLastWriteTimeToCreationTime;
     private readonly JsonSerializerOptions _WriteIndentedJsonSerializerOptions;
-    private readonly ReadOnlyDictionary<string, ReadOnlyCollection<string>> _FileGroups;
+    private readonly ReadOnlyDictionary<byte, ReadOnlyCollection<string>>[] _ResultSingletonFileGroups;
 
-    public B_Metadata(IPropertyConfiguration propertyConfiguration)
-    {
-        _PropertiesChangedForMetadata = false;
-        _PropertyConfiguration = propertyConfiguration;
-        _ForceMetadataLastWriteTimeToCreationTime = false;
-        _WriteIndentedJsonSerializerOptions = new JsonSerializerOptions { WriteIndented = true };
-        _FileGroups = Shared.Models.Stateless.Methods.IPath.GetKeyValuePairs(propertyConfiguration, null, [propertyConfiguration.ResultSingleton]);
-    }
-
-    public B_Metadata(IPropertyConfiguration propertyConfiguration, bool forceMetadataLastWriteTimeToCreationTime, bool propertiesChangedForMetadata, string bResultsFullGroupDirectory)
+    public B_Metadata(IDlibDotNet dlibDotNet, IPropertyConfiguration propertyConfiguration, bool forceMetadataLastWriteTimeToCreationTime, bool propertiesChangedForMetadata, long ticks, string bResultsFullGroupDirectory)
     {
         _PropertyConfiguration = propertyConfiguration;
         _PropertiesChangedForMetadata = propertiesChangedForMetadata;
         _ForceMetadataLastWriteTimeToCreationTime = forceMetadataLastWriteTimeToCreationTime;
+        _ResultSingletonFileGroups = [new(new Dictionary<byte, ReadOnlyCollection<string>>())];
         _WriteIndentedJsonSerializerOptions = new JsonSerializerOptions { WriteIndented = true };
-        _FileGroups = Shared.Models.Stateless.Methods.IPath.GetKeyValuePairs(propertyConfiguration, bResultsFullGroupDirectory, [propertyConfiguration.ResultSingleton]);
+        ReadOnlyDictionary<string, ReadOnlyDictionary<byte, ReadOnlyCollection<string>>> keyValuePairs = Shared.Models.Stateless.Methods.IPath.GetKeyValuePairs(propertyConfiguration, bResultsFullGroupDirectory, [propertyConfiguration.ResultSingleton]);
+        foreach (KeyValuePair<string, ReadOnlyDictionary<byte, ReadOnlyCollection<string>>> keyValuePair in keyValuePairs)
+        {
+            if (keyValuePair.Key == _PropertyConfiguration.ResultSingleton)
+                _ResultSingletonFileGroups[0] = keyValuePair.Value;
+            else
+                throw new Exception();
+        }
+        List<ExifDirectory> results = [];
+        string jsonGroupDirectory;
+        const string extension = ".json";
+        const string fileSearchFilter = "*";
+        string filesCollectionRootDirectory;
+        const string directorySearchFilter = "*";
+        int maxDegreeOfParallelism = Environment.ProcessorCount;
+        filesCollectionRootDirectory = propertyConfiguration.RootDirectory;
+        Dictionary<int, ExifDirectory> exifDirectoriesById = [];
+        ParallelOptions parallelOptions = new() { MaxDegreeOfParallelism = maxDegreeOfParallelism };
+        string jsonGroupSingletonDirectory = Path.Combine(bResultsFullGroupDirectory, propertyConfiguration.ResultSingleton);
+        string jsonGroupCollectionDirectory = Path.Combine(bResultsFullGroupDirectory, propertyConfiguration.ResultCollection);
+        ReadOnlyCollection<string> directories = new([jsonGroupSingletonDirectory, jsonGroupCollectionDirectory]);
+        Shared.Models.Stateless.Methods.IPath.CreateDirectories(directories);
+        ReadOnlyCollection<ReadOnlyCollection<FilePath>> filePathsCollection = IDirectory.GetFilePathCollections(propertyConfiguration, directorySearchFilter, fileSearchFilter, filesCollectionRootDirectory, useIgnoreExtensions: true, useCeilingAverage: false);
+        ReadOnlyDictionary<int, List<FilePath>> fileNamesToFiles = FilePath.GetFilesKeyValuePairs(filePathsCollection);
+        ReadOnlyCollection<FilePair> filePairs = IFilePair.GetFilePairs(propertyConfiguration, directorySearchFilter, extension, jsonGroupSingletonDirectory, filePathsCollection, fileNamesToFiles);
+        string message = $") Preloading ExifDirectory Dictionary - {(int)Math.Floor(new TimeSpan(DateTime.Now.Ticks - ticks).TotalSeconds)} total second(s)";
+        dlibDotNet.ConstructProgressBar(filePairs.Count, message);
+        _ = Parallel.For(0, filePairs.Count, parallelOptions, (i, state) => ParallelFor(dlibDotNet, filePairs[i], results));
+        jsonGroupDirectory = Path.Combine(bResultsFullGroupDirectory, propertyConfiguration.ResultCollection);
+        foreach (ExifDirectory exifDirectory in results)
+        {
+            if (exifDirectory.FilePath.Id is null || exifDirectoriesById.ContainsKey(exifDirectory.FilePath.Id.Value))
+                continue;
+            exifDirectoriesById.Add(exifDirectory.FilePath.Id.Value, exifDirectory);
+        }
+        ExifDirectoriesById = new(exifDirectoriesById);
+        DateGroupDirectory = bResultsFullGroupDirectory;
+        SingletonById = fileNamesToFiles;
+        filesCollectionRootDirectory = jsonGroupCollectionDirectory;
+        ReadOnlyCollection<ReadOnlyCollection<FilePath>> filePathsSingletonCollection = IDirectory.GetFilePathCollections(propertyConfiguration, directorySearchFilter, fileSearchFilter, filesCollectionRootDirectory,
+        useIgnoreExtensions: false, useCeilingAverage: false);
+        Collection = filePathsSingletonCollection[0];
     }
 
-    public override string ToString()
+    private void ParallelFor(IDlibDotNet dlibDotNet, FilePair filePair, List<ExifDirectory> results)
     {
-        string result = JsonSerializer.Serialize(this, _WriteIndentedJsonSerializerOptions);
+        dlibDotNet?.Tick();
+        if (filePair.FilePath.Id is null)
+            return;
+        ExifDirectory? exifDirectory = GetExifDirectory(filePair);
+        if (exifDirectory is null)
+            return;
+        lock (results)
+            results.Add(exifDirectory);
+    }
+
+    private static ExifDirectory? GetExifDirectory(FilePair filePair)
+    {
+        ExifDirectory? result;
+        if (filePair.Match is null)
+            result = null;
+        else
+        {
+            string json = File.ReadAllText(filePair.Match.FullName);
+            if (string.IsNullOrEmpty(json))
+                result = null;
+            else
+                result = JsonSerializer.Deserialize(json, ExifDirectorySourceGenerationContext.Default.ExifDirectory);
+        }
         return result;
     }
 
@@ -47,8 +118,11 @@ public class B_Metadata : IMetadata<MetadataExtractor.Directory>
     {
         ExifDirectory? result = null;
         List<DateTime> dateTimes = (from l in subFileTuples where changesFrom.Contains(l.Item1) select l.Item2).ToList();
-        (_, int directoryIndex) = Shared.Models.Stateless.Methods.IPath.GetDirectoryNameAndIndex(_PropertyConfiguration, filePath);
-        FileInfo fileInfo = new(Path.Combine(_FileGroups[_PropertyConfiguration.ResultSingleton][directoryIndex], $"{mappingFromItem.FilePath.NameWithoutExtension}{mappingFromItem.FilePath.ExtensionLowered}.json"));
+        CombinedEnumAndIndex cei = Shared.Models.Stateless.Methods.IPath.GetCombinedEnumAndIndex(_PropertyConfiguration, filePath);
+        string fileName = $"{mappingFromItem.FilePath.NameWithoutExtension}{mappingFromItem.FilePath.ExtensionLowered}.json";
+        string directory = _ResultSingletonFileGroups[0][cei.Enum][cei.Index];
+        FileInfo fileInfo = new(Path.Combine(directory, fileName));
+        MoveIf(fileName, cei, directory, fileInfo);
         if (_ForceMetadataLastWriteTimeToCreationTime && !fileInfo.Exists && File.Exists(Path.ChangeExtension(fileInfo.FullName, ".delete")))
         {
             File.Move(Path.ChangeExtension(fileInfo.FullName, ".delete"), fileInfo.FullName);
@@ -104,13 +178,32 @@ public class B_Metadata : IMetadata<MetadataExtractor.Directory>
         return result;
     }
 
+    private static void MoveIf(string fileName, CombinedEnumAndIndex cei, string directory, FileInfo fileInfo)
+    {
+        string[] segments = directory.Split(cei.Combined);
+        string? checkDirectory = segments.Length == 1 ?
+            Path.Combine(segments[0], $"{cei.Combined[2..]}") :
+                segments.Length == 2 ?
+                    $"{segments[0]}{cei.Combined[2..]}{segments[1]}" :
+                        null;
+        if (checkDirectory is not null && System.IO.Directory.Exists(checkDirectory))
+        {
+            string checkFile = Path.Combine(checkDirectory, fileName);
+            if (File.Exists(checkFile))
+            {
+                File.Move(checkFile, fileInfo.FullName);
+                fileInfo.Refresh();
+            }
+        }
+    }
+
     (DateTime?, DateTime?[]) IMetadata<MetadataExtractor.Directory>.GetDateTimes(FilePath filePath, IReadOnlyList<MetadataExtractor.Directory> directories)
     {
         List<DateTime?> results = [];
         DateTime? result = null;
         DateTime? dateTime;
         DateTime checkDateTime;
-        string dateTimeFormat = Property.Models.Stateless.IProperty.DateTimeFormat();
+        string dateTimeFormat = Stateless.Methods.IMetadata.DateTimeFormat();
         MetadataExtractor.Formats.Exif.ExifDirectoryBase? exifDirectoryBase = directories.OfType<MetadataExtractor.Formats.Exif.ExifDirectoryBase>().FirstOrDefault();
         results.Add(new DateTime(filePath.CreationTicks));
         results.Add(new DateTime(filePath.LastWriteTicks));
@@ -120,7 +213,7 @@ public class B_Metadata : IMetadata<MetadataExtractor.Directory>
                 results.Add(checkDateTime);
             else
             {
-                dateTime = Property.Models.Stateless.IProperty.GetDateTime(dateTimeFormat, exifDirectoryBase.GetString(MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagDateTime));
+                dateTime = Stateless.Methods.IMetadata.GetDateTime(dateTimeFormat, exifDirectoryBase.GetString(MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagDateTime));
                 if (dateTime is not null)
                     results.Add(dateTime.Value);
             }
@@ -128,7 +221,7 @@ public class B_Metadata : IMetadata<MetadataExtractor.Directory>
                 results.Add(checkDateTime);
             else
             {
-                dateTime = Property.Models.Stateless.IProperty.GetDateTime(dateTimeFormat, exifDirectoryBase.GetString(MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagDateTimeDigitized));
+                dateTime = Stateless.Methods.IMetadata.GetDateTime(dateTimeFormat, exifDirectoryBase.GetString(MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagDateTimeDigitized));
                 if (dateTime is not null)
                     results.Add(dateTime.Value);
             }
@@ -139,7 +232,7 @@ public class B_Metadata : IMetadata<MetadataExtractor.Directory>
             }
             else
             {
-                dateTime = Property.Models.Stateless.IProperty.GetDateTime(dateTimeFormat, exifDirectoryBase.GetString(MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagDateTimeOriginal));
+                dateTime = Stateless.Methods.IMetadata.GetDateTime(dateTimeFormat, exifDirectoryBase.GetString(MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagDateTimeOriginal));
                 if (dateTime is not null)
                 {
                     result ??= dateTime.Value;
@@ -157,7 +250,7 @@ public class B_Metadata : IMetadata<MetadataExtractor.Directory>
             }
             else
             {
-                dateTime = Property.Models.Stateless.IProperty.GetDateTime(dateTimeFormat, aviDirectory.GetString(MetadataExtractor.Formats.Avi.AviDirectory.TagDateTimeOriginal));
+                dateTime = Stateless.Methods.IMetadata.GetDateTime(dateTimeFormat, aviDirectory.GetString(MetadataExtractor.Formats.Avi.AviDirectory.TagDateTimeOriginal));
                 if (dateTime is not null)
                 {
                     result ??= dateTime.Value;
@@ -175,7 +268,7 @@ public class B_Metadata : IMetadata<MetadataExtractor.Directory>
             }
             else
             {
-                dateTime = Property.Models.Stateless.IProperty.GetDateTime(dateTimeFormat, quickTimeMovieHeaderDirectory.GetString(MetadataExtractor.Formats.QuickTime.QuickTimeMovieHeaderDirectory.TagCreated));
+                dateTime = Stateless.Methods.IMetadata.GetDateTime(dateTimeFormat, quickTimeMovieHeaderDirectory.GetString(MetadataExtractor.Formats.QuickTime.QuickTimeMovieHeaderDirectory.TagCreated));
                 if (dateTime is not null)
                 {
                     result ??= dateTime.Value;
@@ -193,7 +286,7 @@ public class B_Metadata : IMetadata<MetadataExtractor.Directory>
             }
             else
             {
-                dateTime = Property.Models.Stateless.IProperty.GetDateTime(dateTimeFormat, quickTimeTrackHeaderDirectory.GetString(MetadataExtractor.Formats.QuickTime.QuickTimeTrackHeaderDirectory.TagCreated));
+                dateTime = Stateless.Methods.IMetadata.GetDateTime(dateTimeFormat, quickTimeTrackHeaderDirectory.GetString(MetadataExtractor.Formats.QuickTime.QuickTimeTrackHeaderDirectory.TagCreated));
                 if (dateTime is not null)
                 {
                     result ??= dateTime.Value;

Metadata/Models/Stateless/Base.cs

@@ -1,3 +1,4 @@
+using System.Globalization;
 using View_by_Distance.Shared.Models;
 
 namespace View_by_Distance.Metadata.Models.Stateless.Methods;
@@ -47,4 +48,23 @@ internal static class Base
         return result;
     }
 
+#pragma warning restore CA1416
+
+    internal static DateTime? GetDateTime(string dateTimeFormat, string? value)
+    {
+        DateTime? result;
+        string alternateFormat = "ddd MMM dd HH:mm:ss yyyy";
+        if (value is not null && DateTime.TryParse(value, out DateTime dateTime))
+            result = dateTime;
+        else if (value is not null && value.Length == dateTimeFormat.Length && DateTime.TryParseExact(value, dateTimeFormat, CultureInfo.InvariantCulture, DateTimeStyles.None, out dateTime))
+            result = dateTime;
+        else if (value is not null && value.Length == alternateFormat.Length && DateTime.TryParseExact(value, alternateFormat, CultureInfo.InvariantCulture, DateTimeStyles.None, out dateTime))
+            result = dateTime;
+        else
+            result = null;
+        return result;
+    }
+
+#pragma warning disable CA1416
+
 }

Metadata/Models/Stateless/Exif.cs

@@ -484,7 +484,7 @@ internal abstract class Exif
         return results.ToArray();
     }
 
-    private static Shared.Models.ExifDirectory Covert(Shared.Models.FilePath filePath, System.Drawing.Size? size, IReadOnlyList<MetadataExtractor.Directory> directories)
+    private static Shared.Models.ExifDirectory Covert(Shared.Models.FilePath filePath, IReadOnlyList<MetadataExtractor.Directory> directories, System.Drawing.Size? size)
     {
         Shared.Models.ExifDirectory result;
         Shared.Models.AviDirectory[] aviDirectories = GetAviDirectories(directories);
@@ -520,13 +520,13 @@ internal abstract class Exif
     internal static Shared.Models.ExifDirectory GetExifDirectory(Shared.Models.FilePath filePath)
     {
         Shared.Models.ExifDirectory result;
+        IReadOnlyList<MetadataExtractor.Directory> directories = ImageMetadataReader.ReadMetadata(filePath.FullName);
         System.Drawing.Size? size;
         try
         { size = Dimensions.GetDimensions(filePath.FullName); }
         catch (Exception)
         { size = null; }
-        IReadOnlyList<MetadataExtractor.Directory> directories = ImageMetadataReader.ReadMetadata(filePath.FullName);
-        result = Covert(filePath, size, directories);
+        result = Covert(filePath, directories, size);
         return result;
     }
 

Metadata/Models/Stateless/Methods/IMetadata.cs

@@ -64,4 +64,14 @@ public interface IMetadata
     // static Dictionary<string, MetadataExtractorDirectory> GetMetadataCollection(FileInfo fileInfo, List<Tuple<string, DateTime>> subFileTuples, List<string> parseExceptions) =>
     //     Metadata.GetMetadataCollection(fileInfo, subFileTuples, parseExceptions);
 
+    string TestStatic_DateTimeFormat() =>
+        DateTimeFormat();
+    static string DateTimeFormat() =>
+        "yyyy:MM:dd HH:mm:ss";
+
+    DateTime? TestStatic_GetDateTime(string dateTimeFormat, string? value) =>
+        GetDateTime(dateTimeFormat, value);
+    static DateTime? GetDateTime(string dateTimeFormat, string? value) =>
+        Base.GetDateTime(dateTimeFormat, value);
+
 }

Mirror-Length/Mirror-Length.csproj

@@ -35,10 +35,10 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Humanizer.Core" Version="2.14.1" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="9.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="9.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.0" />
-    <PackageReference Include="System.Text.Json" Version="9.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="9.0.2" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="9.0.2" />
+    <PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.2" />
+    <PackageReference Include="System.Text.Json" Version="9.0.2" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Property\Property.csproj" />

Mirror-Length/MirrorLength.cs

@@ -193,6 +193,7 @@ public class MirrorLength
     {
         string message = nameof(MirrorLength);
         List<(string, string, int)> collectionForMarkDown;
+        logger?.LogDebug("{method}", nameof(MirrorLengthFilesInDirectories));
         bool inPlaceSave = _PropertyConfiguration.RootDirectory.First() == _AppSettings.Destination;
         if (!inPlaceSave)
             collectionForMarkDown = [];

Move-By-Id/Move-By-Id.csproj

@@ -35,9 +35,9 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Humanizer.Core" Version="2.14.1" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="9.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="9.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="9.0.2" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="9.0.2" />
+    <PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.2" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Property\Property.csproj" />

Offset-Date-Time-Original/Offset-Date-Time-Original.csproj

@@ -35,10 +35,10 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Humanizer.Core" Version="2.14.1" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="9.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="9.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.0" />
-    <PackageReference Include="System.Text.Json" Version="9.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="9.0.2" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="9.0.2" />
+    <PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.2" />
+    <PackageReference Include="System.Text.Json" Version="9.0.2" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Property\Property.csproj" />

PhotoPrism/PhotoPrism.csproj

@@ -37,7 +37,7 @@
         <PackageReference Include="MetadataExtractor" Version="2.8.1" />
         <PackageReference Include="ShellProgressBar" Version="5.2.0" />
         <PackageReference Include="WindowsShortcutFactory" Version="1.2.0" />
-        <PackageReference Include="System.Text.Json" Version="9.0.0" />
+        <PackageReference Include="System.Text.Json" Version="9.0.2" />
     </ItemGroup>
     <ItemGroup>
         <ProjectReference Include="..\Shared\View-by-Distance.Shared.csproj" />

PrepareForOld/PrepareForOld.csproj

@@ -33,14 +33,14 @@
         <SupportedPlatform Include="browser" />
     </ItemGroup>
     <ItemGroup>
-        <PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.0" />
+        <PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.2" />
         <PackageReference Include="ShellProgressBar" Version="5.2.0" />
         <PackageReference Include="System.Drawing.Common" Version="8.0.10" />
-        <PackageReference Include="System.Text.Json" Version="9.0.0" />
+        <PackageReference Include="System.Text.Json" Version="9.0.2" />
         <PackageReference Include="MetadataExtractor" Version="2.8.1" />
-        <PackageReference Include="Microsoft.AspNetCore.Cryptography.KeyDerivation" Version="9.0.0" />
-        <PackageReference Include="Microsoft.Extensions.Identity.Core" Version="9.0.0" />
-        <PackageReference Include="Microsoft.Extensions.Options" Version="9.0.0" />
+        <PackageReference Include="Microsoft.AspNetCore.Cryptography.KeyDerivation" Version="9.0.2" />
+        <PackageReference Include="Microsoft.Extensions.Identity.Core" Version="9.0.2" />
+        <PackageReference Include="Microsoft.Extensions.Options" Version="9.0.2" />
     </ItemGroup>
     <ItemGroup>
         <ProjectReference Include="..\Shared\View-by-Distance.Shared.csproj" />

Property-Compare/Property-Compare.csproj

@@ -35,7 +35,7 @@
     <ItemGroup>
         <PackageReference Include="ShellProgressBar" Version="5.2.0" />
         <PackageReference Include="System.Drawing.Common" Version="8.0.10" />
-        <PackageReference Include="System.Text.Json" Version="9.0.0" />
+        <PackageReference Include="System.Text.Json" Version="9.0.2" />
     </ItemGroup>
     <ItemGroup>
         <ProjectReference Include="..\Shared\View-by-Distance.Shared.csproj" />

Property/Models/A_Property.cs

@@ -22,19 +22,27 @@ public class A_Property
     private readonly Configuration _Configuration;
     private readonly List<string> _AngleBracketCollection;
     private readonly IPropertyConfiguration _PropertyConfiguration;
-    private readonly ReadOnlyDictionary<string, ReadOnlyCollection<string>> _FileGroups;
+    private readonly ReadOnlyDictionary<byte, ReadOnlyCollection<string>>[] _ResultSingletonFileGroups;
 
     public A_Property(int maxDegreeOfParallelism, Configuration propertyConfiguration, string outputExtension, bool reverse, string aResultsFullGroupDirectory)
     {
         Reverse = reverse;
         _ExceptionsDirectories = [];
+        _AngleBracketCollection = [];
         _OutputExtension = outputExtension;
         _ASCIIEncoding = new ASCIIEncoding();
         _Configuration = propertyConfiguration;
-        _AngleBracketCollection = [];
         _PropertyConfiguration = propertyConfiguration;
         _MaxDegreeOfParallelism = maxDegreeOfParallelism;
-        _FileGroups = Shared.Models.Stateless.Methods.IPath.GetKeyValuePairs(propertyConfiguration, aResultsFullGroupDirectory, [propertyConfiguration.ResultSingleton]);
+        _ResultSingletonFileGroups = [new(new Dictionary<byte, ReadOnlyCollection<string>>())];
+        ReadOnlyDictionary<string, ReadOnlyDictionary<byte, ReadOnlyCollection<string>>> keyValuePairs = Shared.Models.Stateless.Methods.IPath.GetKeyValuePairs(propertyConfiguration, aResultsFullGroupDirectory, [propertyConfiguration.ResultSingleton]);
+        foreach (KeyValuePair<string, ReadOnlyDictionary<byte, ReadOnlyCollection<string>>> keyValuePair in keyValuePairs)
+        {
+            if (keyValuePair.Key == _PropertyConfiguration.ResultSingleton)
+                _ResultSingletonFileGroups[0] = keyValuePair.Value;
+            else
+                throw new Exception();
+        }
     }
 
     public override string ToString()
@@ -43,6 +51,113 @@ public class A_Property
         return result;
     }
 
+    public void SetAngleBracketCollection(string aResultsFullGroupDirectory, string sourceDirectory, bool anyNullOrNoIsUniqueFileName = true)
+    {
+        _AngleBracketCollection.Clear();
+        if (!anyNullOrNoIsUniqueFileName)
+            _AngleBracketCollection.AddRange([Path.Combine(aResultsFullGroupDirectory, "<>")]);
+        else
+            _AngleBracketCollection.AddRange(IResult.GetDirectoryInfoCollection(_PropertyConfiguration,
+                                                                                sourceDirectory,
+                                                                                aResultsFullGroupDirectory,
+                                                                                contentDescription: string.Empty,
+                                                                                singletonDescription: "Properties for each image",
+                                                                                collectionDescription: string.Empty,
+                                                                                converted: false));
+    }
+
+    public void SavePropertyParallelWork(long ticks, Shared.Models.Methods.IMetadata<MetadataExtractor.Directory> metadata, int t, Container.Models.Container[] containers)
+    {
+        int total = 0;
+        string message;
+        int totalSeconds;
+        bool anyNullOrNoIsUniqueFileName;
+        List<Exception> exceptions = [];
+        Container.Models.Container container;
+        int containersLength = containers.Length;
+        const string outputResolution = "Original";
+        List<Tuple<string, DateTime>> sourceDirectoryChanges = [];
+        string propertyRoot = IResult.GetResultsGroupDirectory(_PropertyConfiguration, nameof(A_Property));
+        for (int i = 0; i < containers.Length; i++)
+        {
+            container = containers[i];
+            if (container.Items.Count == 0)
+                continue;
+            sourceDirectoryChanges.Clear();
+            if (container.Items.Count == 0)
+                continue;
+            anyNullOrNoIsUniqueFileName = container.Items.Any(l => !l.IsUniqueFileName);
+            SetAngleBracketCollection(container.SourceDirectory, anyNullOrNoIsUniqueFileName);
+            totalSeconds = (int)Math.Truncate(new TimeSpan(DateTime.Now.Ticks - ticks).TotalSeconds);
+            message = $"{i + 1:000} [{container.Items.Count:000}] / {containersLength:000} - {total} / {t} total - {totalSeconds} total second(s) - {outputResolution} - {container.SourceDirectory}";
+            SavePropertyParallelWork(_MaxDegreeOfParallelism, metadata, exceptions, sourceDirectoryChanges, container, container.Items, message);
+            if (exceptions.Count == container.Items.Count)
+                throw new Exception(string.Concat("All in [", container.SourceDirectory, "]failed!"));
+            if (exceptions.Count != 0)
+                _ExceptionsDirectories.Add(container.SourceDirectory);
+            total += container.Items.Count;
+        }
+    }
+
+    private void SetAngleBracketCollection(string sourceDirectory, bool anyNullOrNoIsUniqueFileName)
+    {
+        _AngleBracketCollection.Clear();
+        string aResultsFullGroupDirectory = IResult.GetResultsFullGroupDirectory(_PropertyConfiguration,
+                                                                                 nameof(A_Property),
+                                                                                 string.Empty,
+                                                                                 includeResizeGroup: false,
+                                                                                 includeModel: false,
+                                                                                 includePredictorModel: false);
+        SetAngleBracketCollection(aResultsFullGroupDirectory, sourceDirectory, anyNullOrNoIsUniqueFileName);
+    }
+
+    private void SavePropertyParallelWork(int maxDegreeOfParallelism, Shared.Models.Methods.IMetadata<MetadataExtractor.Directory> metadata, List<Exception> exceptions, List<Tuple<string, DateTime>> sourceDirectoryChanges, Container.Models.Container container, ReadOnlyCollection<Item> items, string message)
+    {
+        List<Tuple<string, DateTime>> sourceDirectoryFileTuples = [];
+        ParallelOptions parallelOptions = new() { MaxDegreeOfParallelism = maxDegreeOfParallelism };
+        ProgressBarOptions options = new() { ProgressCharacter = '─', ProgressBarOnBottom = true, DisableBottomPercentage = true };
+        using ProgressBar progressBar = new(items.Count, message, options);
+        _ = Parallel.For(0, items.Count, parallelOptions, (i, state) =>
+           {
+               try
+               {
+                   long ticks = DateTime.Now.Ticks;
+                   DateTime dateTime = DateTime.Now;
+                   List<Tuple<string, DateTime>> collection;
+                   SavePropertyParallelForWork(metadata, container.SourceDirectory, sourceDirectoryChanges, sourceDirectoryFileTuples, items[i]);
+                   if (i == 0 || sourceDirectoryChanges.Count != 0)
+                       progressBar.Tick();
+                   lock (sourceDirectoryFileTuples)
+                       collection = (from l in sourceDirectoryFileTuples where l.Item2 > dateTime select l).ToList();
+                   lock (sourceDirectoryChanges)
+                       sourceDirectoryChanges.AddRange(collection);
+               }
+               catch (Exception ex)
+               {
+                   lock (exceptions)
+                       exceptions.Add(ex);
+               }
+           });
+    }
+
+    private void SavePropertyParallelForWork(Shared.Models.Methods.IMetadata<MetadataExtractor.Directory> metadata, string sourceDirectory, List<Tuple<string, DateTime>> sourceDirectoryFileTuples, List<Tuple<string, DateTime>> sourceDirectoryChanges, Item item)
+    {
+        Shared.Models.Property property;
+        List<string> parseExceptions = [];
+        bool isIgnoreExtension = item.IsValidImageFormatExtension && _PropertyConfiguration.IgnoreExtensions.Contains(item.FilePath.ExtensionLowered);
+        string filteredSourceDirectoryFileExtensionLowered = Path.Combine(sourceDirectory, $"{item.FilePath.NameWithoutExtension}{item.FilePath.ExtensionLowered}");
+        if (item.IsValidImageFormatExtension && item.FilePath.FullName.Length == filteredSourceDirectoryFileExtensionLowered.Length && item.FilePath.FullName != filteredSourceDirectoryFileExtensionLowered)
+            File.Move(item.FilePath.FullName, filteredSourceDirectoryFileExtensionLowered);
+        if (item.FileSizeChanged is null || item.FileSizeChanged.Value || item.LastWriteTimeChanged is null || item.LastWriteTimeChanged.Value || item.Property is null)
+        {
+            property = GetImageProperty(metadata, item, sourceDirectoryFileTuples, parseExceptions, isIgnoreExtension);
+            lock (sourceDirectoryChanges)
+                sourceDirectoryChanges.Add(new Tuple<string, DateTime>(nameof(A_Property), DateTime.Now));
+            lock (item)
+                item.Update(property);
+        }
+    }
+
     private Shared.Models.Property GetImageProperty(Shared.Models.Methods.IMetadata<MetadataExtractor.Directory> metadata, Item item, List<Tuple<string, DateTime>> sourceDirectoryFileTuples, List<string> parseExceptions, bool isIgnoreExtension)
     {
         Shared.Models.Property? result;
@@ -57,8 +172,11 @@ public class A_Property
             fileInfo = new(Path.Combine(angleBracket.Replace("<>", _PropertyConfiguration.ResultSingleton), $"{item.FilePath.NameWithoutExtension}{item.FilePath.ExtensionLowered}.json"));
         else
         {
-            (_, int directoryIndex) = Shared.Models.Stateless.Methods.IPath.GetDirectoryNameAndIndex(_PropertyConfiguration, item.FilePath);
-            fileInfo = new(Path.Combine(_FileGroups[_PropertyConfiguration.ResultSingleton][directoryIndex], $"{item.FilePath.NameWithoutExtension}{item.FilePath.ExtensionLowered}.json"));
+            string fileName = $"{item.FilePath.NameWithoutExtension}{item.FilePath.ExtensionLowered}.json";
+            CombinedEnumAndIndex cei = Shared.Models.Stateless.Methods.IPath.GetCombinedEnumAndIndex(_PropertyConfiguration, item.FilePath);
+            string directory = _ResultSingletonFileGroups[0][cei.Enum][cei.Index];
+            fileInfo = new(Path.Combine(directory, fileName));
+            MoveIf(fileName, cei, directory, fileInfo);
         }
         List<DateTime> dateTimes = (from l in sourceDirectoryFileTuples where l is not null && changesFrom.Contains(l.Item1) select l.Item2).ToList();
         if (_Configuration.ForcePropertyLastWriteTimeToCreationTime && !fileInfo.Exists && File.Exists(Path.ChangeExtension(fileInfo.FullName, ".delete")))
@@ -164,110 +282,22 @@ public class A_Property
         return result;
     }
 
-    public void SetAngleBracketCollection(string aResultsFullGroupDirectory, string sourceDirectory, bool anyNullOrNoIsUniqueFileName = true)
+    private static void MoveIf(string fileName, CombinedEnumAndIndex cei, string directory, FileInfo fileInfo)
     {
-        _AngleBracketCollection.Clear();
-        if (!anyNullOrNoIsUniqueFileName)
-            _AngleBracketCollection.AddRange(new[] { Path.Combine(aResultsFullGroupDirectory, "<>") });
-        else
-            _AngleBracketCollection.AddRange(IResult.GetDirectoryInfoCollection(_PropertyConfiguration,
-                                                                               sourceDirectory,
-                                                                               aResultsFullGroupDirectory,
-                                                                               contentDescription: string.Empty,
-                                                                               singletonDescription: "Properties for each image",
-                                                                               collectionDescription: string.Empty,
-                                                                               converted: false));
-    }
-
-    private void SavePropertyParallelForWork(Shared.Models.Methods.IMetadata<MetadataExtractor.Directory> metadata, string sourceDirectory, List<Tuple<string, DateTime>> sourceDirectoryFileTuples, List<Tuple<string, DateTime>> sourceDirectoryChanges, Item item)
-    {
-        Shared.Models.Property property;
-        List<string> parseExceptions = [];
-        bool isIgnoreExtension = item.IsValidImageFormatExtension && _PropertyConfiguration.IgnoreExtensions.Contains(item.FilePath.ExtensionLowered);
-        string filteredSourceDirectoryFileExtensionLowered = Path.Combine(sourceDirectory, $"{item.FilePath.NameWithoutExtension}{item.FilePath.ExtensionLowered}");
-        if (item.IsValidImageFormatExtension && item.FilePath.FullName.Length == filteredSourceDirectoryFileExtensionLowered.Length && item.FilePath.FullName != filteredSourceDirectoryFileExtensionLowered)
-            File.Move(item.FilePath.FullName, filteredSourceDirectoryFileExtensionLowered);
-        if (item.FileSizeChanged is null || item.FileSizeChanged.Value || item.LastWriteTimeChanged is null || item.LastWriteTimeChanged.Value || item.Property is null)
+        string[] segments = directory.Split(cei.Combined);
+        string? checkDirectory = segments.Length == 1 ?
+            Path.Combine(segments[0], $"{cei.Combined[2..]}") :
+                segments.Length == 2 ?
+                    $"{segments[0]}{cei.Combined[2..]}{segments[1]}" :
+                        null;
+        if (checkDirectory is not null && Directory.Exists(checkDirectory))
         {
-            property = GetImageProperty(metadata, item, sourceDirectoryFileTuples, parseExceptions, isIgnoreExtension);
-            lock (sourceDirectoryChanges)
-                sourceDirectoryChanges.Add(new Tuple<string, DateTime>(nameof(A_Property), DateTime.Now));
-            lock (item)
-                item.Update(property);
-        }
-    }
-
-    private void SetAngleBracketCollection(string sourceDirectory, bool anyNullOrNoIsUniqueFileName)
-    {
-        _AngleBracketCollection.Clear();
-        string aResultsFullGroupDirectory = IResult.GetResultsFullGroupDirectory(_PropertyConfiguration,
-                                                                                 nameof(A_Property),
-                                                                                 string.Empty,
-                                                                                 includeResizeGroup: false,
-                                                                                 includeModel: false,
-                                                                                 includePredictorModel: false);
-        SetAngleBracketCollection(aResultsFullGroupDirectory, sourceDirectory, anyNullOrNoIsUniqueFileName);
-    }
-
-    private void SavePropertyParallelWork(int maxDegreeOfParallelism, Shared.Models.Methods.IMetadata<MetadataExtractor.Directory> metadata, List<Exception> exceptions, List<Tuple<string, DateTime>> sourceDirectoryChanges, Container container, ReadOnlyCollection<Item> items, string message)
-    {
-        List<Tuple<string, DateTime>> sourceDirectoryFileTuples = [];
-        ParallelOptions parallelOptions = new() { MaxDegreeOfParallelism = maxDegreeOfParallelism };
-        ProgressBarOptions options = new() { ProgressCharacter = '─', ProgressBarOnBottom = true, DisableBottomPercentage = true };
-        using ProgressBar progressBar = new(items.Count, message, options);
-        _ = Parallel.For(0, items.Count, parallelOptions, (i, state) =>
-           {
-               try
-               {
-                   long ticks = DateTime.Now.Ticks;
-                   DateTime dateTime = DateTime.Now;
-                   List<Tuple<string, DateTime>> collection;
-                   SavePropertyParallelForWork(metadata, container.SourceDirectory, sourceDirectoryChanges, sourceDirectoryFileTuples, items[i]);
-                   if (i == 0 || sourceDirectoryChanges.Count != 0)
-                       progressBar.Tick();
-                   lock (sourceDirectoryFileTuples)
-                       collection = (from l in sourceDirectoryFileTuples where l.Item2 > dateTime select l).ToList();
-                   lock (sourceDirectoryChanges)
-                       sourceDirectoryChanges.AddRange(collection);
-               }
-               catch (Exception ex)
-               {
-                   lock (exceptions)
-                       exceptions.Add(ex);
-               }
-           });
-    }
-
-    public void SavePropertyParallelWork(long ticks, Shared.Models.Methods.IMetadata<MetadataExtractor.Directory> metadata, int t, Container[] containers)
-    {
-        int total = 0;
-        string message;
-        int totalSeconds;
-        Container container;
-        bool anyNullOrNoIsUniqueFileName;
-        List<Exception> exceptions = [];
-        int containersLength = containers.Length;
-        const string outputResolution = "Original";
-        List<Tuple<string, DateTime>> sourceDirectoryChanges = [];
-        string propertyRoot = IResult.GetResultsGroupDirectory(_PropertyConfiguration, nameof(A_Property));
-        for (int i = 0; i < containers.Length; i++)
-        {
-            container = containers[i];
-            if (container.Items.Count == 0)
-                continue;
-            sourceDirectoryChanges.Clear();
-            if (container.Items.Count == 0)
-                continue;
-            anyNullOrNoIsUniqueFileName = container.Items.Any(l => !l.IsUniqueFileName);
-            SetAngleBracketCollection(container.SourceDirectory, anyNullOrNoIsUniqueFileName);
-            totalSeconds = (int)Math.Truncate(new TimeSpan(DateTime.Now.Ticks - ticks).TotalSeconds);
-            message = $"{i + 1:000} [{container.Items.Count:000}] / {containersLength:000} - {total} / {t} total - {totalSeconds} total second(s) - {outputResolution} - {container.SourceDirectory}";
-            SavePropertyParallelWork(_MaxDegreeOfParallelism, metadata, exceptions, sourceDirectoryChanges, container, container.Items, message);
-            if (exceptions.Count == container.Items.Count)
-                throw new Exception(string.Concat("All in [", container.SourceDirectory, "]failed!"));
-            if (exceptions.Count != 0)
-                _ExceptionsDirectories.Add(container.SourceDirectory);
-            total += container.Items.Count;
+            string checkFile = Path.Combine(checkDirectory, fileName);
+            if (File.Exists(checkFile))
+            {
+                File.Move(checkFile, fileInfo.FullName);
+                fileInfo.Refresh();
+            }
         }
     }
 

Property/Models/Stateless/IProperty.cs

@@ -10,49 +10,80 @@ namespace View_by_Distance.Property.Models.Stateless;
 public interface IProperty
 {
 
-    string TestStatic_DateTimeFormat() =>
-        DateTimeFormat();
-    static string DateTimeFormat() =>
-        "yyyy:MM:dd HH:mm:ss";
+    const string DateTimeFormat = "yyyy:MM:dd HH:mm:ss";
 
-    byte[] TestStatic_GetBytes(string value) =>
-       GetBytes(value);
-    static byte[] GetBytes(string value) =>
-        Property.GetBytes(value);
-
-    DateTime? TestStatic_GetDateTime(string dateTimeFormat, string? value) =>
-        GetDateTime(dateTimeFormat, value);
-    static DateTime? GetDateTime(string dateTimeFormat, string? value) =>
-        Property.GetDateTime(dateTimeFormat, value);
-
-    PropertyItem TestStatic_GetPropertyItem(ConstructorInfo constructorInfo, int id, short type, string value) =>
-       GetPropertyItem(constructorInfo, id, type, value);
-    static PropertyItem GetPropertyItem(ConstructorInfo constructorInfo, int id, short type, string value) =>
-        Property.GetPropertyItem(constructorInfo, id, type, value);
-
-    (string?, DateTime[], Shared.Models.Property) TestStatic_GetProperty(bool populateId, IMetadata<MetadataExtractor.Directory>? metadata, FilePath filePath, Shared.Models.Property? property, bool isIgnoreExtension, bool isValidImageFormatExtension, int? id, ASCIIEncoding asciiEncoding) =>
-        GetProperty(populateId, metadata, filePath, property, isIgnoreExtension, isValidImageFormatExtension, id, asciiEncoding);
-    static (string?, DateTime[], Shared.Models.Property) GetProperty(bool populateId, IMetadata<MetadataExtractor.Directory>? metadata, FilePath filePath, Shared.Models.Property? property, bool isIgnoreExtension, bool isValidImageFormatExtension, int? id, ASCIIEncoding asciiEncoding) =>
-        Property.GetProperty(populateId, metadata, filePath, property, isIgnoreExtension, isValidImageFormatExtension, id, asciiEncoding);
-
-    (DateTime?, DateTime[], int?, string?) TestStatic_Get(IPropertyConfiguration propertyConfiguration, bool populateId, FileHolder fileHolder, bool isIgnoreExtension, bool isValidImageFormatExtension, ASCIIEncoding asciiEncoding) =>
-        Get(propertyConfiguration, populateId, fileHolder, isIgnoreExtension, isValidImageFormatExtension, asciiEncoding);
-    static (DateTime?, DateTime[], int?, string?) Get(IPropertyConfiguration propertyConfiguration, bool populateId, FileHolder fileHolder, bool isIgnoreExtension, bool isValidImageFormatExtension, ASCIIEncoding asciiEncoding) =>
-        Property.Get(populateId, null, FilePath.Get(propertyConfiguration, fileHolder, index: null), isIgnoreExtension, isValidImageFormatExtension, asciiEncoding);
-
-    (DateTime?, DateTime[], int?, string?) TestStatic_Get(bool populateId, FilePath filePath, bool isIgnoreExtension, bool isValidImageFormatExtension, ASCIIEncoding asciiEncoding) =>
-        Get(populateId, filePath, isIgnoreExtension, isValidImageFormatExtension, asciiEncoding);
-    static (DateTime?, DateTime[], int?, string?) Get(bool populateId, FilePath filePath, bool isIgnoreExtension, bool isValidImageFormatExtension, ASCIIEncoding asciiEncoding) =>
-        Property.Get(populateId, null, filePath, isIgnoreExtension, isValidImageFormatExtension, asciiEncoding);
-
-    (DateTime?, DateTime[], int?, string?) TestStatic_Get(bool populateId, IMetadata<MetadataExtractor.Directory>? metadata, FilePath filePath, bool isIgnoreExtension, bool isValidImageFormatExtension, ASCIIEncoding asciiEncoding) =>
-        Get(populateId, metadata, filePath, isIgnoreExtension, isValidImageFormatExtension, asciiEncoding);
+    // public
     static (DateTime?, DateTime[], int?, string?) Get(bool populateId, IMetadata<MetadataExtractor.Directory>? metadata, FilePath filePath, bool isIgnoreExtension, bool isValidImageFormatExtension, ASCIIEncoding asciiEncoding) =>
         Property.Get(populateId, metadata, filePath, isIgnoreExtension, isValidImageFormatExtension, asciiEncoding);
 
-    (DateTime?, DateTime[], int?, string?) TestStatic_Get(IPropertyConfiguration propertyConfiguration, bool populateId, IMetadata<MetadataExtractor.Directory>? metadata, FileHolder fileHolder, bool isIgnoreExtension, bool isValidImageFormatExtension, ASCIIEncoding asciiEncoding) =>
-        Get(propertyConfiguration, populateId, metadata, fileHolder, isIgnoreExtension, isValidImageFormatExtension, asciiEncoding);
-    static (DateTime?, DateTime[], int?, string?) Get(IPropertyConfiguration propertyConfiguration, bool populateId, IMetadata<MetadataExtractor.Directory>? metadata, FileHolder fileHolder, bool isIgnoreExtension, bool isValidImageFormatExtension, ASCIIEncoding asciiEncoding) =>
+    // public
+    static (DateTime?, DateTime[], int?, string?) Get(IPropertyConfiguration propertyConfiguration, bool populateId, FileHolder fileHolder, bool isIgnoreExtension, bool isValidImageFormatExtension, ASCIIEncoding asciiEncoding) =>
+        Property.Get(populateId, null, FilePath.Get(propertyConfiguration, fileHolder, index: null), isIgnoreExtension, isValidImageFormatExtension, asciiEncoding);
+
+    public static byte[] GetBytes(string value) =>
+        Property.GetBytes(value);
+
+    public static DateTime? GetDateTime(string dateTimeFormat, string? value) =>
+        Property.GetDateTime(dateTimeFormat, value);
+
+    public static double GetStandardDeviation(List<long> values, double average) =>
+        Property.GetStandardDeviation(values, average);
+
+    public static bool Any(Container.Models.Container[] propertyHolderCollections) =>
+        Property.Any(propertyHolderCollections);
+
+    public static TimeSpan GetThreeStandardDeviationHigh(int minimum, Container.Models.Container container) =>
+        Property.GetThreeStandardDeviationHigh(minimum, container);
+
+    public static PropertyItem GetPropertyItem(ConstructorInfo constructorInfo, int id, short type, string value) =>
+        Property.GetPropertyItem(constructorInfo, id, type, value);
+
+    public static (int, List<DateTime>, List<Item>) Get(Container.Models.Container container, TimeSpan threeStandardDeviationHigh, int i) =>
+        Property.Get(container, threeStandardDeviationHigh, i);
+
+    public static (DateTime?, DateTime[], int?, string?) Get(bool populateId, FilePath filePath, bool isIgnoreExtension, bool isValidImageFormatExtension, ASCIIEncoding asciiEncoding) =>
+        Property.Get(populateId, null, filePath, isIgnoreExtension, isValidImageFormatExtension, asciiEncoding);
+
+    public static (DateTime?, DateTime[], int?, string?) Get(IPropertyConfiguration propertyConfiguration, bool populateId, IMetadata<MetadataExtractor.Directory>? metadata, FileHolder fileHolder, bool isIgnoreExtension, bool isValidImageFormatExtension, ASCIIEncoding asciiEncoding) =>
         Property.Get(populateId, metadata, FilePath.Get(propertyConfiguration, fileHolder, index: null), isIgnoreExtension, isValidImageFormatExtension, asciiEncoding);
 
+    public static (string?, DateTime[], Shared.Models.Property) GetProperty(bool populateId, IMetadata<MetadataExtractor.Directory>? metadata, FilePath filePath, Shared.Models.Property? property, bool isIgnoreExtension, bool isValidImageFormatExtension, int? id, ASCIIEncoding asciiEncoding) =>
+        Property.GetProperty(populateId, metadata, filePath, property, isIgnoreExtension, isValidImageFormatExtension, id, asciiEncoding);
+
+    internal byte[] TestStatic_GetBytes(string value) =>
+       GetBytes(value);
+
+    internal DateTime? TestStatic_GetDateTime(string dateTimeFormat, string? value) =>
+        GetDateTime(dateTimeFormat, value);
+
+    internal double TestStatic_GetStandardDeviation(List<long> values, double average) =>
+        GetStandardDeviation(values, average);
+
+    internal bool TestStatic_Any(Container.Models.Container[] propertyHolderCollections) =>
+        Any(propertyHolderCollections);
+
+    internal TimeSpan TestStatic_GetThreeStandardDeviationHigh(int minimum, Container.Models.Container container) =>
+        GetThreeStandardDeviationHigh(minimum, container);
+
+    internal PropertyItem TestStatic_GetPropertyItem(ConstructorInfo constructorInfo, int id, short type, string value) =>
+       GetPropertyItem(constructorInfo, id, type, value);
+
+    internal (int, List<DateTime>, List<Item>) TestStatic_Get(Container.Models.Container container, TimeSpan threeStandardDeviationHigh, int i) =>
+        Get(container, threeStandardDeviationHigh, i);
+
+    internal (DateTime?, DateTime[], int?, string?) TestStatic_Get(bool populateId, FilePath filePath, bool isIgnoreExtension, bool isValidImageFormatExtension, ASCIIEncoding asciiEncoding) =>
+        Get(populateId, filePath, isIgnoreExtension, isValidImageFormatExtension, asciiEncoding);
+
+    internal (DateTime?, DateTime[], int?, string?) TestStatic_Get(IPropertyConfiguration propertyConfiguration, bool populateId, FileHolder fileHolder, bool isIgnoreExtension, bool isValidImageFormatExtension, ASCIIEncoding asciiEncoding) =>
+        Get(propertyConfiguration, populateId, fileHolder, isIgnoreExtension, isValidImageFormatExtension, asciiEncoding);
+
+    internal (DateTime?, DateTime[], int?, string?) TestStatic_Get(bool populateId, IMetadata<MetadataExtractor.Directory>? metadata, FilePath filePath, bool isIgnoreExtension, bool isValidImageFormatExtension, ASCIIEncoding asciiEncoding) =>
+        Get(populateId, metadata, filePath, isIgnoreExtension, isValidImageFormatExtension, asciiEncoding);
+
+    internal (DateTime?, DateTime[], int?, string?) TestStatic_Get(IPropertyConfiguration propertyConfiguration, bool populateId, IMetadata<MetadataExtractor.Directory>? metadata, FileHolder fileHolder, bool isIgnoreExtension, bool isValidImageFormatExtension, ASCIIEncoding asciiEncoding) =>
+        Get(propertyConfiguration, populateId, metadata, fileHolder, isIgnoreExtension, isValidImageFormatExtension, asciiEncoding);
+
+    internal (string?, DateTime[], Shared.Models.Property) TestStatic_GetProperty(bool populateId, IMetadata<MetadataExtractor.Directory>? metadata, FilePath filePath, Shared.Models.Property? property, bool isIgnoreExtension, bool isValidImageFormatExtension, int? id, ASCIIEncoding asciiEncoding) =>
+        GetProperty(populateId, metadata, filePath, property, isIgnoreExtension, isValidImageFormatExtension, id, asciiEncoding);
+
 }

Property/Models/Stateless/IResult.cs

@@ -3,44 +3,52 @@ namespace View_by_Distance.Property.Models.Stateless;
 public interface IResult
 {
 
-    string TestStatic_GetRelativePath(Shared.Models.Properties.IPropertyConfiguration propertyConfiguration, string path) =>
-        GetRelativePath(propertyConfiguration, path);
-    static string GetRelativePath(Shared.Models.Properties.IPropertyConfiguration propertyConfiguration, string path) =>
+    public static string GetRelativePath(Shared.Models.Properties.IPropertyConfiguration propertyConfiguration, string path) =>
         Result.GetRelativePath(propertyConfiguration, path);
 
-    string TestStatic_GetResultsGroupDirectory(Shared.Models.Properties.IPropertyConfiguration propertyConfiguration, string description, bool create) =>
-        GetResultsGroupDirectory(propertyConfiguration, description, create);
-    static string GetResultsGroupDirectory(Shared.Models.Properties.IPropertyConfiguration propertyConfiguration, string description, bool create) =>
-        Result.GetResultsGroupDirectory(propertyConfiguration, description, create);
-
-    string TestStatic_GetResultsGroupDirectory(Shared.Models.Properties.IPropertyConfiguration propertyConfiguration, string description) =>
-        GetResultsGroupDirectory(propertyConfiguration, description);
-    static string GetResultsGroupDirectory(Shared.Models.Properties.IPropertyConfiguration propertyConfiguration, string description) =>
+    public static string GetResultsGroupDirectory(Shared.Models.Properties.IPropertyConfiguration propertyConfiguration, string description) =>
         Result.GetResultsGroupDirectory(propertyConfiguration, description, create: true);
 
-    string TestStatic_GetResultsDateGroupDirectory(Shared.Models.Properties.IPropertyConfiguration propertyConfiguration, string description) =>
-        GetResultsDateGroupDirectory(propertyConfiguration, description);
-    static string GetResultsDateGroupDirectory(Shared.Models.Properties.IPropertyConfiguration propertyConfiguration, string description) =>
+    public static string GetResultsDateGroupDirectory(Shared.Models.Properties.IPropertyConfiguration propertyConfiguration, string description) =>
         Result.GetResultsDateGroupDirectory(propertyConfiguration, description);
 
-    string TestStatic_GetResultsDateGroupDirectory(Shared.Models.Properties.IPropertyConfiguration propertyConfiguration, string description, string jsonGroup) =>
-        GetResultsDateGroupDirectory(propertyConfiguration, description, jsonGroup);
-    static string GetResultsDateGroupDirectory(Shared.Models.Properties.IPropertyConfiguration propertyConfiguration, string description, string jsonGroup) =>
+    public static string GetResultsGroupDirectory(Shared.Models.Properties.IPropertyConfiguration propertyConfiguration, string description, bool create) =>
+        Result.GetResultsGroupDirectory(propertyConfiguration, description, create);
+
+    public static string GetResultsDateGroupDirectory(Shared.Models.Properties.IPropertyConfiguration propertyConfiguration, string description, string jsonGroup) =>
         Result.GetResultsDateGroupDirectory(propertyConfiguration, description, jsonGroup);
 
-    List<string> TestStatic_GetDirectoryInfoCollection(Shared.Models.Properties.IPropertyConfiguration propertyConfiguration, string sourceDirectory, string dateGroupDirectory, string contentDescription, string singletonDescription, string collectionDescription, bool converted) =>
-        GetDirectoryInfoCollection(propertyConfiguration, sourceDirectory, dateGroupDirectory, contentDescription, singletonDescription, collectionDescription, converted);
-    static List<string> GetDirectoryInfoCollection(Shared.Models.Properties.IPropertyConfiguration propertyConfiguration, string sourceDirectory, string dateGroupDirectory, string contentDescription, string singletonDescription, string collectionDescription, bool converted) =>
-        Result.GetDirectoryInfoCollection(propertyConfiguration, sourceDirectory, dateGroupDirectory, contentDescription, singletonDescription, collectionDescription, converted);
-
-    string TestStatic_GetResultsFullGroupDirectory(Shared.Models.Properties.IPropertyConfiguration propertyConfiguration, string description, string outputResolution, bool includeResizeGroup, bool includeModel, bool includePredictorModel) =>
-        GetResultsFullGroupDirectory(propertyConfiguration, description, outputResolution, includeResizeGroup, includeModel, includePredictorModel);
-    static string GetResultsFullGroupDirectory(Shared.Models.Properties.IPropertyConfiguration propertyConfiguration, string description, string outputResolution, bool includeResizeGroup, bool includeModel, bool includePredictorModel) =>
+    public static string GetResultsFullGroupDirectory(Shared.Models.Properties.IPropertyConfiguration propertyConfiguration, string description, string outputResolution, bool includeResizeGroup, bool includeModel, bool includePredictorModel) =>
         Result.GetResultsFullGroupDirectory(propertyConfiguration, description, outputResolution, includeResizeGroup, includeModel, includePredictorModel);
 
-    List<string> TestStatic_GetDirectoryInfoCollection(Shared.Models.Properties.IPropertyConfiguration propertyConfiguration, string sourceDirectory, string description, string outputResolution, bool includeResizeGroup, bool includeModel, bool includePredictorModel, string contentDescription, string singletonDescription, string collectionDescription) =>
-        GetDirectoryInfoCollection(propertyConfiguration, sourceDirectory, description, outputResolution, includeResizeGroup, includeModel, includePredictorModel, contentDescription, singletonDescription, collectionDescription);
-    static List<string> GetDirectoryInfoCollection(Shared.Models.Properties.IPropertyConfiguration propertyConfiguration, string sourceDirectory, string description, string outputResolution, bool includeResizeGroup, bool includeModel, bool includePredictorModel, string contentDescription, string singletonDescription, string collectionDescription) =>
+    public static List<string> GetDirectoryInfoCollection(Shared.Models.Properties.IPropertyConfiguration propertyConfiguration, string sourceDirectory, string dateGroupDirectory, string contentDescription, string singletonDescription, string collectionDescription, bool converted) =>
+        Result.GetDirectoryInfoCollection(propertyConfiguration, sourceDirectory, dateGroupDirectory, contentDescription, singletonDescription, collectionDescription, converted);
+
+    public static List<string> GetDirectoryInfoCollection(Shared.Models.Properties.IPropertyConfiguration propertyConfiguration, string sourceDirectory, string description, string outputResolution, bool includeResizeGroup, bool includeModel, bool includePredictorModel, string contentDescription, string singletonDescription, string collectionDescription) =>
         Result.GetDirectoryInfoCollection(propertyConfiguration, sourceDirectory, description, outputResolution, includeResizeGroup, includeModel, includePredictorModel, contentDescription, singletonDescription, collectionDescription);
 
+    internal string TestStatic_GetRelativePath(Shared.Models.Properties.IPropertyConfiguration propertyConfiguration, string path) =>
+        GetRelativePath(propertyConfiguration, path);
+
+    internal string TestStatic_GetResultsGroupDirectory(Shared.Models.Properties.IPropertyConfiguration propertyConfiguration, string description) =>
+        GetResultsGroupDirectory(propertyConfiguration, description);
+
+    internal string TestStatic_GetResultsDateGroupDirectory(Shared.Models.Properties.IPropertyConfiguration propertyConfiguration, string description) =>
+        GetResultsDateGroupDirectory(propertyConfiguration, description);
+
+    internal string TestStatic_GetResultsGroupDirectory(Shared.Models.Properties.IPropertyConfiguration propertyConfiguration, string description, bool create) =>
+        GetResultsGroupDirectory(propertyConfiguration, description, create);
+
+    internal string TestStatic_GetResultsDateGroupDirectory(Shared.Models.Properties.IPropertyConfiguration propertyConfiguration, string description, string jsonGroup) =>
+        GetResultsDateGroupDirectory(propertyConfiguration, description, jsonGroup);
+
+    internal string TestStatic_GetResultsFullGroupDirectory(Shared.Models.Properties.IPropertyConfiguration propertyConfiguration, string description, string outputResolution, bool includeResizeGroup, bool includeModel, bool includePredictorModel) =>
+        GetResultsFullGroupDirectory(propertyConfiguration, description, outputResolution, includeResizeGroup, includeModel, includePredictorModel);
+
+    internal List<string> TestStatic_GetDirectoryInfoCollection(Shared.Models.Properties.IPropertyConfiguration propertyConfiguration, string sourceDirectory, string dateGroupDirectory, string contentDescription, string singletonDescription, string collectionDescription, bool converted) =>
+        GetDirectoryInfoCollection(propertyConfiguration, sourceDirectory, dateGroupDirectory, contentDescription, singletonDescription, collectionDescription, converted);
+
+    internal List<string> TestStatic_GetDirectoryInfoCollection(Shared.Models.Properties.IPropertyConfiguration propertyConfiguration, string sourceDirectory, string description, string outputResolution, bool includeResizeGroup, bool includeModel, bool includePredictorModel, string contentDescription, string singletonDescription, string collectionDescription) =>
+        GetDirectoryInfoCollection(propertyConfiguration, sourceDirectory, description, outputResolution, includeResizeGroup, includeModel, includePredictorModel, contentDescription, singletonDescription, collectionDescription);
+
 }

Property/Models/Stateless/Property.cs

@@ -14,56 +14,53 @@ namespace View_by_Distance.Property.Models.Stateless;
 internal partial class Property
 {
 
-    [GeneratedRegex(@"\D+")]
-    private static partial Regex Digit();
-
-    private static List<DateTime> GetDateTimes(DateTime dateTimeFromName, DateTime?[] dateTimes)
+    internal static TimeSpan GetThreeStandardDeviationHigh(int minimum, Container.Models.Container container)
     {
-        List<DateTime> results = [dateTimeFromName];
-        foreach (DateTime? dateTime in dateTimes)
+        TimeSpan result;
+        DateTime? minimumDateTime;
+        List<long> ticksCollection = [];
+        foreach (Item item in container.Items)
         {
-            if (dateTime is null)
+            if (item.Property is null)
                 continue;
-            results.Add(dateTime.Value);
+            minimumDateTime = Shared.Models.Stateless.Methods.IProperty.GetMinimumDateTime(item.Property);
+            if (minimumDateTime is null)
+                continue;
+            ticksCollection.Add(minimumDateTime.Value.Ticks);
         }
-        return results;
+        long threeStandardDeviationHigh;
+        long min;
+        if (ticksCollection.Count == 0)
+            min = 0;
+        else
+            min = ticksCollection.Min();
+        if (ticksCollection.Count < minimum)
+            threeStandardDeviationHigh = long.MaxValue;
+        else
+            threeStandardDeviationHigh = GetThreeStandardDeviationHigh(ref ticksCollection, min);
+        result = new TimeSpan(threeStandardDeviationHigh - min);
+        return result;
     }
 
-    private static List<DateTime> GetDateTimes(DateTime?[] dateTimes, DateTime?[] metadataDateTimes)
+    private static long GetThreeStandardDeviationHigh(ref List<long> ticksCollection, long min)
     {
-        List<DateTime> results = [];
-        foreach (DateTime? dateTime in metadataDateTimes)
-        {
-            if (dateTime is null || results.Contains(dateTime.Value))
-                continue;
-            results.Add(dateTime.Value);
-        }
-        foreach (DateTime? dateTime in dateTimes)
-        {
-            if (dateTime is null || results.Contains(dateTime.Value))
-                continue;
-            results.Add(dateTime.Value);
-        }
-        return results;
+        long result;
+        ticksCollection = (from l in ticksCollection select l - min).ToList();
+        double sum = ticksCollection.Sum();
+        double average = sum / ticksCollection.Count;
+        double standardDeviation = GetStandardDeviation(ticksCollection, average);
+        result = (long)Math.Ceiling(average + min + (standardDeviation * 3));
+        return result;
     }
 
-    private static List<DateTime> GetDateTimes(FilePath filePath, DateTime?[] dateTimes)
+    internal static double GetStandardDeviation(List<long> values, double average)
     {
-        List<DateTime> results = [];
-        string[] digits = Digit().Split(filePath.FullName);
-        foreach (string digit in digits)
-        {
-            if (digit.Length != 4 || digit[..2] is not "19" and not "20" || !int.TryParse(digit, out int year))
-                continue;
-            results.Add(new(year, 1, 1));
-        }
-        foreach (DateTime? dateTime in dateTimes)
-        {
-            if (dateTime is null)
-                continue;
-            results.Add(dateTime.Value);
-        }
-        return results;
+        double result = 0;
+        if (values.Count == 0)
+            throw new Exception("Collection must have at least one value!");
+        double sum = values.Sum(l => (l - average) * (l - average));
+        result = Math.Sqrt(sum / values.Count);
+        return result;
     }
 
     internal static byte[] GetBytes(string value)
@@ -111,12 +108,12 @@ internal partial class Property
             format = dateFormat[1];
             length = dateFormat[0].Length + dateFormat[1].Length;
             for (int i = dateFormat[0].Length; i < length; i++)
-                _ = value.Append(filePath.NameWithoutExtension[i]);
+                _ = value.Append(filePath.FileNameFirstSegment[i]);
             if (value.Length != format.Length)
                 continue;
             if (DateTime.TryParseExact(value.ToString(), format, CultureInfo.InvariantCulture, DateTimeStyles.None, out DateTime checkDateTime))
             {
-                if (filePath.NameWithoutExtension.Length < ticksExample.Length || !long.TryParse(filePath.NameWithoutExtension[^ticksExample.Length..], out long ticks))
+                if (filePath.NameWithoutExtension.Length < ticksExample.Length || !long.TryParse(filePath.FileNameFirstSegment[^ticksExample.Length..], out long ticks))
                     result = checkDateTime;
                 else
                     result = new DateTime(ticks);
@@ -126,22 +123,40 @@ internal partial class Property
         return result;
     }
 
-    private static List<DateTime> GetDateTimes(DateTime?[] metadataDateTimes)
+    internal static bool Any(Container.Models.Container[] containers)
     {
-        List<DateTime> results = [];
-        foreach (DateTime? dateTime in metadataDateTimes)
+        bool result = false;
+        foreach (Container.Models.Container container in containers)
         {
-            if (dateTime is null || results.Contains(dateTime.Value))
+            if (container.Items.Count == 0)
                 continue;
-            results.Add(dateTime.Value);
+            if ((from l in container.Items where l.Any() select true).Any())
+            {
+                result = true;
+                break;
+            }
         }
-        return results;
+        return result;
     }
 
-#pragma warning disable CA1416
+    internal static DateTime? GetDateTime(string dateTimeFormat, string? value)
+    {
+        DateTime? result;
+        string alternateFormat = "ddd MMM dd HH:mm:ss yyyy";
+        if (value is not null && DateTime.TryParse(value, out DateTime dateTime))
+            result = dateTime;
+        else if (value is not null && value.Length == dateTimeFormat.Length && DateTime.TryParseExact(value, dateTimeFormat, CultureInfo.InvariantCulture, DateTimeStyles.None, out dateTime))
+            result = dateTime;
+        else if (value is not null && value.Length == alternateFormat.Length && DateTime.TryParseExact(value, alternateFormat, CultureInfo.InvariantCulture, DateTimeStyles.None, out dateTime))
+            result = dateTime;
+        else
+            result = null;
+        return result;
+    }
 
     internal static PropertyItem GetPropertyItem(ConstructorInfo constructorInfo, int id, short type, string value)
     {
+#pragma warning disable CA1416
         PropertyItem result = (PropertyItem)constructorInfo.Invoke(null);
         int length;
         byte[] bytes;
@@ -161,27 +176,65 @@ internal partial class Property
         result.Len = length;
         result.Type = type;
         result.Value = bytes;
-        return result;
-    }
-
 #pragma warning restore CA1416
-
-    internal static DateTime? GetDateTime(string dateTimeFormat, string? value)
-    {
-        DateTime? result;
-        string alternateFormat = "ddd MMM dd HH:mm:ss yyyy";
-        if (value is not null && DateTime.TryParse(value, out DateTime dateTime))
-            result = dateTime;
-        else if (value is not null && value.Length == dateTimeFormat.Length && DateTime.TryParseExact(value, dateTimeFormat, CultureInfo.InvariantCulture, DateTimeStyles.None, out dateTime))
-            result = dateTime;
-        else if (value is not null && value.Length == alternateFormat.Length && DateTime.TryParseExact(value, alternateFormat, CultureInfo.InvariantCulture, DateTimeStyles.None, out dateTime))
-            result = dateTime;
-        else
-            result = null;
         return result;
     }
 
-#pragma warning disable CA1416
+    internal static (int, List<DateTime>, List<Item>) Get(Container.Models.Container container, TimeSpan threeStandardDeviationHigh, int i)
+    {
+        List<Item> results = [];
+        int j = i;
+        long? ticks;
+        TimeSpan timeSpan;
+        Item item;
+        DateTime? minimumDateTime;
+        Item nextItem;
+        DateTime? nextMinimumDateTime;
+        List<DateTime> dateTimes = [];
+        for (; j < container.Items.Count; j++)
+        {
+            ticks = null;
+            item = container.Items[j];
+            if (item.Property is null)
+                continue;
+            minimumDateTime = Shared.Models.Stateless.Methods.IProperty.GetMinimumDateTime(item.Property);
+            if (minimumDateTime is null)
+                continue;
+            for (int k = j + 1; k < container.Items.Count; k++)
+            {
+                nextItem = container.Items[k];
+                if (nextItem.Property is null)
+                    continue;
+                nextMinimumDateTime = Shared.Models.Stateless.Methods.IProperty.GetMinimumDateTime(nextItem.Property);
+                if (nextMinimumDateTime is null)
+                    continue;
+                ticks = nextMinimumDateTime.Value.Ticks;
+                break;
+            }
+            results.Add(item);
+            dateTimes.Add(minimumDateTime.Value);
+            if (ticks.HasValue)
+            {
+                timeSpan = new(ticks.Value - minimumDateTime.Value.Ticks);
+                if (timeSpan > threeStandardDeviationHigh)
+                    break;
+            }
+        }
+        return new(j, dateTimes, results);
+    }
+
+    internal static (DateTime?, DateTime[], int?, string?) Get(bool populateId, IMetadata<MetadataExtractor.Directory>? metadata, FilePath filePath, bool isIgnoreExtension, bool isValidImageFormatExtension, ASCIIEncoding asciiEncoding)
+    {
+        int? id = null;
+        string? message;
+        DateTime[] dateTimes;
+        Shared.Models.Property? property = null;
+        if (isIgnoreExtension || !isValidImageFormatExtension)
+            (message, dateTimes, property) = (null, [], null);
+        else
+            (message, dateTimes, property) = GetProperty(populateId, metadata, filePath, property, isIgnoreExtension, isValidImageFormatExtension, id, asciiEncoding);
+        return new(property?.DateTimeOriginal, dateTimes, property?.Id, message);
+    }
 
     internal static (string?, DateTime[], Shared.Models.Property) GetProperty(bool populateId, IMetadata<MetadataExtractor.Directory>? metadata, FilePath filePath, Shared.Models.Property? property, bool isIgnoreExtension, bool isValidImageFormatExtension, int? id, ASCIIEncoding asciiEncoding)
     {
@@ -225,6 +278,7 @@ internal partial class Property
         {
             try
             {
+#pragma warning disable CA1416
                 using Image image = Image.FromFile(filePath.FullName);
                 width = image.Width;
                 height = image.Height;
@@ -240,7 +294,7 @@ internal partial class Property
                     bitmap.UnlockBits(bitmapData);
                     id ??= Shared.Models.Stateless.Methods.IId.GetDeterministicHashCode(bytes);
                 }
-                dateTimeFormat = IProperty.DateTimeFormat();
+                dateTimeFormat = IProperty.DateTimeFormat;
                 if (image.PropertyIdList.Contains(MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagDateTime))
                 {
                     propertyItem = image.GetPropertyItem(MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagDateTime);
@@ -318,6 +372,7 @@ internal partial class Property
                             keywords = Encoding.Unicode.GetString(propertyItem.Value).Trim('\0', ' ').Split(';');
                     }
                 }
+#pragma warning restore CA1416
                 message = null;
                 dateTimes = [new(filePath.LastWriteTicks), new(filePath.CreationTicks), dateTime, dateTimeDigitized, dateTimeOriginal, gpsDateStamp];
             }
@@ -351,19 +406,68 @@ internal partial class Property
         return (message, dateTimesByLogic.ToArray(), result);
     }
 
-#pragma warning restore CA1416
-
-    internal static (DateTime?, DateTime[], int?, string?) Get(bool populateId, IMetadata<MetadataExtractor.Directory>? metadata, FilePath filePath, bool isIgnoreExtension, bool isValidImageFormatExtension, ASCIIEncoding asciiEncoding)
+    private static List<DateTime> GetDateTimes(DateTime?[] metadataDateTimes)
     {
-        int? id = null;
-        string? message;
-        DateTime[] dateTimes;
-        Shared.Models.Property? property = null;
-        if (isIgnoreExtension || !isValidImageFormatExtension)
-            (message, dateTimes, property) = (null, [], null);
-        else
-            (message, dateTimes, property) = GetProperty(populateId, metadata, filePath, property, isIgnoreExtension, isValidImageFormatExtension, id, asciiEncoding);
-        return new(property?.DateTimeOriginal, dateTimes, property?.Id, message);
+        List<DateTime> results = [];
+        foreach (DateTime? dateTime in metadataDateTimes)
+        {
+            if (dateTime is null || results.Contains(dateTime.Value))
+                continue;
+            results.Add(dateTime.Value);
+        }
+        return results;
     }
 
+    private static List<DateTime> GetDateTimes(FilePath filePath, DateTime?[] dateTimes)
+    {
+        List<DateTime> results = [];
+        string[] digits = Digit().Split(filePath.FullName);
+        foreach (string digit in digits)
+        {
+            if (digit.Length != 4 || digit[..2] is not "19" and not "20" || !int.TryParse(digit, out int year))
+                continue;
+            results.Add(new(year, 1, 1));
+        }
+        foreach (DateTime? dateTime in dateTimes)
+        {
+            if (dateTime is null)
+                continue;
+            results.Add(dateTime.Value);
+        }
+        return results;
+    }
+
+    private static List<DateTime> GetDateTimes(DateTime dateTimeFromName, DateTime?[] dateTimes)
+    {
+        List<DateTime> results = [dateTimeFromName];
+        foreach (DateTime? dateTime in dateTimes)
+        {
+            if (dateTime is null)
+                continue;
+            results.Add(dateTime.Value);
+        }
+        return results;
+    }
+
+    private static List<DateTime> GetDateTimes(DateTime?[] dateTimes, DateTime?[] metadataDateTimes)
+    {
+        List<DateTime> results = [];
+        foreach (DateTime? dateTime in metadataDateTimes)
+        {
+            if (dateTime is null || results.Contains(dateTime.Value))
+                continue;
+            results.Add(dateTime.Value);
+        }
+        foreach (DateTime? dateTime in dateTimes)
+        {
+            if (dateTime is null || results.Contains(dateTime.Value))
+                continue;
+            results.Add(dateTime.Value);
+        }
+        return results;
+    }
+
+    [GeneratedRegex(@"\D+")]
+    private static partial Regex Digit();
+
 }

Property/Models/Stateless/Result.cs

@@ -5,13 +5,8 @@ namespace View_by_Distance.Property.Models.Stateless;
 internal class Result
 {
 
-    internal static string GetResultsDateGroupDirectory(Shared.Models.Properties.IPropertyConfiguration propertyConfiguration, string description, string jsonGroup)
-    {
-        string result = Path.Combine(GetResultsDateGroupDirectory(propertyConfiguration, description), jsonGroup);
-        if (!Directory.Exists(result))
-            _ = Directory.CreateDirectory(result);
-        return result;
-    }
+    internal static string GetRelativePath(Shared.Models.Properties.IPropertyConfiguration propertyConfiguration, string path) =>
+        Shared.Models.Stateless.Methods.IPath.GetRelativePath(path, propertyConfiguration.RootDirectory.Length);
 
     internal static string GetResultsDateGroupDirectory(Shared.Models.Properties.IPropertyConfiguration propertyConfiguration, string description)
     {
@@ -21,12 +16,66 @@ internal class Result
         return result;
     }
 
-    internal static string GetRelativePath(Shared.Models.Properties.IPropertyConfiguration propertyConfiguration, string path)
+    internal static string GetResultsGroupDirectory(Shared.Models.Properties.IPropertyConfiguration propertyConfiguration, string description, bool create)
     {
-        string result = Shared.Models.Stateless.Methods.IPath.GetRelativePath(path, propertyConfiguration.RootDirectory.Length);
+        string result = Path.Combine($"{propertyConfiguration.RootDirectory}-Results", description.Replace('_', ')'));
+        if (create && !Directory.Exists(result))
+            _ = Directory.CreateDirectory(result);
         return result;
     }
 
+    internal static string GetResultsDateGroupDirectory(Shared.Models.Properties.IPropertyConfiguration propertyConfiguration, string description, string jsonGroup)
+    {
+        string result = Path.Combine(GetResultsDateGroupDirectory(propertyConfiguration, description), jsonGroup);
+        if (!Directory.Exists(result))
+            _ = Directory.CreateDirectory(result);
+        return result;
+    }
+
+    internal static string GetResultsFullGroupDirectory(Shared.Models.Properties.IPropertyConfiguration propertyConfiguration, string description, string outputResolution, bool includeResizeGroup, bool includeModel, bool includePredictorModel)
+    {
+        string result = GetResultsDateGroupDirectory(propertyConfiguration, description);
+        if (includeResizeGroup)
+            result = Path.Combine(result, outputResolution);
+        if (includeModel && includePredictorModel)
+        {
+            string modelName;
+            string predictorModelName;
+            if (propertyConfiguration.ModelName is null)
+                modelName = Model.Hog.ToString();
+            else
+                modelName = propertyConfiguration.ModelName;
+            if (propertyConfiguration.PredictorModelName is null)
+                predictorModelName = PredictorModel.Large.ToString();
+            else
+                predictorModelName = propertyConfiguration.PredictorModelName;
+            string dateGroupDirectory = string.Concat(outputResolution.Replace(" ", string.Empty), "-", modelName, "-", predictorModelName, "-", propertyConfiguration.NumberOfJitters, "-", propertyConfiguration.NumberOfTimesToUpsample);
+            result = Path.Combine(result, dateGroupDirectory);
+        }
+        else if (includeModel)
+            throw new Exception();
+        else if (includePredictorModel)
+            throw new Exception();
+        if (!Directory.Exists(result))
+            _ = Directory.CreateDirectory(result);
+        return result;
+    }
+
+    internal static List<string> GetDirectoryInfoCollection(Shared.Models.Properties.IPropertyConfiguration propertyConfiguration, string sourceDirectory, string dateGroupDirectory, string contentDescription, string singletonDescription, string collectionDescription, bool converted)
+    {
+        List<string> results = [];
+        string sourceDirectorySegment = GetRelativePath(propertyConfiguration, sourceDirectory);
+        string result = string.Concat(Path.Combine(dateGroupDirectory, "<>"), sourceDirectorySegment);
+        if (!string.IsNullOrEmpty(contentDescription))
+            CheckContent(propertyConfiguration, dateGroupDirectory, contentDescription, result);
+        if (!string.IsNullOrEmpty(singletonDescription))
+            CheckSingleton(propertyConfiguration, dateGroupDirectory, singletonDescription, converted, result);
+        if (!string.IsNullOrEmpty(collectionDescription))
+            CheckCollection(propertyConfiguration, dateGroupDirectory, collectionDescription, converted, result);
+        results.Add(result);
+        return results;
+    }
+
     private static void CheckContent(Shared.Models.Properties.IPropertyConfiguration propertyConfiguration, string dateGroupDirectory, string contentDescription, string result)
     {
         string checkDirectory;
@@ -74,58 +123,6 @@ internal class Result
             _ = Directory.CreateDirectory(checkDirectory);
     }
 
-    internal static string GetResultsFullGroupDirectory(Shared.Models.Properties.IPropertyConfiguration propertyConfiguration, string description, string outputResolution, bool includeResizeGroup, bool includeModel, bool includePredictorModel)
-    {
-        string result = GetResultsDateGroupDirectory(propertyConfiguration, description);
-        if (includeResizeGroup)
-            result = Path.Combine(result, outputResolution);
-        if (includeModel && includePredictorModel)
-        {
-            string modelName;
-            string predictorModelName;
-            if (propertyConfiguration.ModelName is null)
-                modelName = Model.Hog.ToString();
-            else
-                modelName = propertyConfiguration.ModelName;
-            if (propertyConfiguration.PredictorModelName is null)
-                predictorModelName = PredictorModel.Large.ToString();
-            else
-                predictorModelName = propertyConfiguration.PredictorModelName;
-            string dateGroupDirectory = string.Concat(outputResolution.Replace(" ", string.Empty), "-", modelName, "-", predictorModelName, "-", propertyConfiguration.NumberOfJitters, "-", propertyConfiguration.NumberOfTimesToUpsample);
-            result = Path.Combine(result, dateGroupDirectory);
-        }
-        else if (includeModel)
-            throw new Exception();
-        else if (includePredictorModel)
-            throw new Exception();
-        if (!Directory.Exists(result))
-            _ = Directory.CreateDirectory(result);
-        return result;
-    }
-
-    internal static List<string> GetDirectoryInfoCollection(Shared.Models.Properties.IPropertyConfiguration propertyConfiguration, string sourceDirectory, string dateGroupDirectory, string contentDescription, string singletonDescription, string collectionDescription, bool converted)
-    {
-        List<string> results = [];
-        string sourceDirectorySegment = GetRelativePath(propertyConfiguration, sourceDirectory);
-        string result = string.Concat(Path.Combine(dateGroupDirectory, "<>"), sourceDirectorySegment);
-        if (!string.IsNullOrEmpty(contentDescription))
-            CheckContent(propertyConfiguration, dateGroupDirectory, contentDescription, result);
-        if (!string.IsNullOrEmpty(singletonDescription))
-            CheckSingleton(propertyConfiguration, dateGroupDirectory, singletonDescription, converted, result);
-        if (!string.IsNullOrEmpty(collectionDescription))
-            CheckCollection(propertyConfiguration, dateGroupDirectory, collectionDescription, converted, result);
-        results.Add(result);
-        return results;
-    }
-
-    internal static string GetResultsGroupDirectory(Shared.Models.Properties.IPropertyConfiguration propertyConfiguration, string description, bool create)
-    {
-        string result = Path.Combine($"{propertyConfiguration.RootDirectory}-Results", description.Replace('_', ')'));
-        if (create && !Directory.Exists(result))
-            _ = Directory.CreateDirectory(result);
-        return result;
-    }
-
     internal static List<string> GetDirectoryInfoCollection(Shared.Models.Properties.IPropertyConfiguration propertyConfiguration, string sourceDirectory, string description, string outputResolution, bool includeResizeGroup, bool includeModel, bool includePredictorModel, string contentDescription, string singletonDescription, string collectionDescription)
     {
         List<string> results;

Property/Property.csproj

@@ -40,12 +40,13 @@
     </ItemGroup>
     <ItemGroup>
         <PackageReference Include="MetadataExtractor" Version="2.8.1" />
-        <PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.0" />
+        <PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.2" />
         <PackageReference Include="ShellProgressBar" Version="5.2.0" />
         <PackageReference Include="System.Drawing.Common" Version="8.0.10" />
-        <PackageReference Include="System.Text.Json" Version="9.0.0" />
+        <PackageReference Include="System.Text.Json" Version="9.0.2" />
     </ItemGroup>
     <ItemGroup>
+        <ProjectReference Include="..\Container\Container.csproj" />
         <ProjectReference Include="..\Shared\View-by-Distance.Shared.csproj" />
     </ItemGroup>
 </Project>

Rename/Rename.cs

@@ -251,7 +251,7 @@ public class Rename
                 catch (Exception) { continue; }
                 CommandTask<CommandResult> result = 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", files[i], "-vframes", "1", $"{fileHolder.Name}-%4d.jpg" })
+                    .WithArguments(["-i", files[i], "-vframes", "1", $"{fileHolder.Name}-%4d.jpg"])
                     .WithWorkingDirectory(fileHolder.DirectoryFullPath)
                     .ExecuteAsync();
                 result.Task.Wait();

Rename/Rename.csproj

@@ -34,11 +34,11 @@
     <SupportedPlatform Include="browser" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="CliWrap" Version="3.7.0" />
+    <PackageReference Include="CliWrap" Version="3.8.1" />
     <PackageReference Include="Humanizer.Core" Version="2.14.1" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="9.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="9.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="9.0.2" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="9.0.2" />
+    <PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.2" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Metadata\Metadata.csproj" />

Resize/Models/_C_Resize.cs

@@ -40,11 +40,10 @@ public class C_Resize
     private readonly bool _ForceResizeLastWriteTimeToCreationTime;
     private readonly IPropertyConfiguration _PropertyConfiguration;
     private readonly JsonSerializerOptions _WriteIndentedJsonSerializerOptions;
-    private readonly Dictionary<string, ReadOnlyCollection<string>> _FileGroups;
+    private readonly ReadOnlyDictionary<byte, ReadOnlyCollection<string>>[] _ResultSingletonFileGroups;
 
     public C_Resize(IPropertyConfiguration propertyConfiguration, bool forceResizeLastWriteTimeToCreationTime, bool overrideForResizeImages, bool propertiesChangedForResize, string[] validResolutions, ImageCodecInfo imageCodecInfo, EncoderParameters encoderParameters, string filenameExtension)
     {
-        _FileGroups = [];
         _Original = "Original";
         _TempResolutionWidth = 3;
         _TempResolutionHeight = 4;
@@ -61,56 +60,31 @@ public class C_Resize
         _OverrideForResizeImages = overrideForResizeImages;
         _PropertiesChangedForResize = propertiesChangedForResize;
         _ForceResizeLastWriteTimeToCreationTime = forceResizeLastWriteTimeToCreationTime;
+        _ResultSingletonFileGroups = [new(new Dictionary<byte, ReadOnlyCollection<string>>())];
         _WriteIndentedJsonSerializerOptions = new JsonSerializerOptions { WriteIndented = true };
         ConstructorInfo? constructorInfo = typeof(PropertyItem).GetConstructor(BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.Public, null, [], null) ?? throw new Exception();
         _ConstructorInfo = constructorInfo;
     }
 
-    public override string ToString()
+    public static byte[] GetBitmapData(Bitmap bitmap)
     {
-        string result = JsonSerializer.Serialize(this, new JsonSerializerOptions() { WriteIndented = true });
-        return result;
-    }
-
-    public void Update(string cResultsFullGroupDirectory)
-    {
-        _FileGroups.Clear();
-        ReadOnlyDictionary<string, ReadOnlyCollection<string>> keyValuePairs = Shared.Models.Stateless.Methods.IPath.GetKeyValuePairs(_PropertyConfiguration, cResultsFullGroupDirectory, [_PropertyConfiguration.ResultSingleton]);
-        foreach (KeyValuePair<string, ReadOnlyCollection<string>> keyValuePair in keyValuePairs)
-            _FileGroups.Add(keyValuePair.Key, keyValuePair.Value);
-    }
-
-    public void SetAngleBracketCollection(string cResultsFullGroupDirectory, string sourceDirectory)
-    {
-        AngleBracketCollection.Clear();
-        AngleBracketCollection.AddRange(IResult.GetDirectoryInfoCollection(_PropertyConfiguration,
-                                                                           sourceDirectory,
-                                                                           cResultsFullGroupDirectory,
-                                                                           contentDescription: "Resized image",
-                                                                           singletonDescription: "Resize dimensions for each resolution",
-                                                                           collectionDescription: string.Empty,
-                                                                           converted: true));
-    }
-
+        byte[] results;
 #pragma warning disable CA1416
-
-    public static (ImageCodecInfo imageCodecInfo, EncoderParameters encoderParameters, string filenameExtension) GetJpegLowQuality()
-    {
-        (ImageCodecInfo, EncoderParameters, string) result;
-        ImageFormat imageFormat = ImageFormat.Jpeg;
-        ImageCodecInfo[] imageCodecInfoCollection = ImageCodecInfo.GetImageEncoders();
-        ImageCodecInfo imageCodecInfo = (from l in imageCodecInfoCollection where l.FormatID == imageFormat.Guid select l).First();
-        EncoderParameters encoderParameters = new(1);
-        encoderParameters.Param[0] = new EncoderParameter(System.Drawing.Imaging.Encoder.Quality, 75L);
-        if (string.IsNullOrEmpty(imageCodecInfo.FilenameExtension))
-            throw new NullReferenceException(nameof(imageCodecInfo.FilenameExtension));
-        result = new(imageCodecInfo, encoderParameters, imageCodecInfo.FilenameExtension.Split(';')[0].ToLower()[1..]);
-        return result;
+        Rectangle rectangle = new(0, 0, bitmap.Width, bitmap.Height);
+        BitmapData bitmapData = bitmap.LockBits(rectangle, ImageLockMode.ReadOnly, bitmap.PixelFormat);
+        IntPtr intPtr = bitmapData.Scan0;
+        int length = bitmapData.Stride * bitmap.Height;
+        results = new byte[length];
+        Marshal.Copy(intPtr, results, 0, length);
+        bitmap.UnlockBits(bitmapData);
+#pragma warning restore CA1416
+        return results;
     }
 
     public static (ImageCodecInfo imageCodecInfo, EncoderParameters encoderParameters, string filenameExtension) GetPngLowQuality()
     {
         (ImageCodecInfo, EncoderParameters, string) result;
+#pragma warning disable CA1416
         ImageFormat imageFormat = ImageFormat.Png;
         ImageCodecInfo[] imageCodecInfoCollection = ImageCodecInfo.GetImageEncoders();
         ImageCodecInfo imageCodecInfo = (from l in imageCodecInfoCollection where l.FormatID == imageFormat.Guid select l).First();
@@ -119,12 +93,30 @@ public class C_Resize
         if (string.IsNullOrEmpty(imageCodecInfo.FilenameExtension))
             throw new NullReferenceException(nameof(imageCodecInfo.FilenameExtension));
         result = new(imageCodecInfo, encoderParameters, imageCodecInfo.FilenameExtension.Split(';')[0].ToLower()[1..]);
+#pragma warning restore CA1416
+        return result;
+    }
+
+    public static (ImageCodecInfo imageCodecInfo, EncoderParameters encoderParameters, string filenameExtension) GetJpegLowQuality()
+    {
+        (ImageCodecInfo, EncoderParameters, string) result;
+#pragma warning disable CA1416
+        ImageFormat imageFormat = ImageFormat.Jpeg;
+        ImageCodecInfo[] imageCodecInfoCollection = ImageCodecInfo.GetImageEncoders();
+        ImageCodecInfo imageCodecInfo = (from l in imageCodecInfoCollection where l.FormatID == imageFormat.Guid select l).First();
+        EncoderParameters encoderParameters = new(1);
+        encoderParameters.Param[0] = new EncoderParameter(System.Drawing.Imaging.Encoder.Quality, 75L);
+        if (string.IsNullOrEmpty(imageCodecInfo.FilenameExtension))
+            throw new NullReferenceException(nameof(imageCodecInfo.FilenameExtension));
+        result = new(imageCodecInfo, encoderParameters, imageCodecInfo.FilenameExtension.Split(';')[0].ToLower()[1..]);
+#pragma warning restore CA1416
         return result;
     }
 
     public static (ImageCodecInfo imageCodecInfo, EncoderParameters encoderParameters, string filenameExtension) GetTuple(string outputExtension, int outputQuality)
     {
         (ImageCodecInfo, EncoderParameters, string) result;
+#pragma warning disable CA1416
         ImageFormat imageFormat = outputExtension switch
         {
             ".gif" => ImageFormat.Gif,
@@ -146,279 +138,12 @@ public class C_Resize
         if (string.IsNullOrEmpty(imageCodecInfo.FilenameExtension))
             throw new NullReferenceException(nameof(imageCodecInfo.FilenameExtension));
         result = new(imageCodecInfo, encoderParameters, imageCodecInfo.FilenameExtension.Split(';')[0].ToLower()[1..]);
+#pragma warning restore CA1416
         return result;
     }
 
-    public static byte[] GetBitmapData(Bitmap bitmap)
-    {
-        byte[] results;
-        Rectangle rectangle = new(0, 0, bitmap.Width, bitmap.Height);
-        BitmapData bitmapData = bitmap.LockBits(rectangle, ImageLockMode.ReadOnly, bitmap.PixelFormat);
-        IntPtr intPtr = bitmapData.Scan0;
-        int length = bitmapData.Stride * bitmap.Height;
-        results = new byte[length];
-        Marshal.Copy(intPtr, results, 0, length);
-        bitmap.UnlockBits(bitmapData);
-        return results;
-    }
-
-    private void CopyPropertyItems(byte[] bytes, PropertyItem[] propertyItems, Bitmap bitmap)
-    {
-        bool hasId = false;
-        int id = MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagDateTimeDigitized;
-        int imageWidth = MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagImageWidth;
-        int imageHeight = MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagImageHeight;
-        int orientation = MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagOrientation;
-        foreach (PropertyItem propertyItem in propertyItems)
-        {
-            if (propertyItem.Id == id)
-                hasId = true;
-            else if (propertyItem.Id == imageWidth)
-                continue;
-            else if (propertyItem.Id == imageHeight)
-                continue;
-            else if (propertyItem.Id == orientation)
-                continue;
-            bitmap.SetPropertyItem(propertyItem);
-        }
-        if (!hasId)
-        {
-            PropertyItem propertyItem = (PropertyItem)_ConstructorInfo.Invoke(null);
-            propertyItem.Id = id;
-            propertyItem.Len = bytes.Length;
-            propertyItem.Type = 2;
-            propertyItem.Value = bytes;
-            bitmap.SetPropertyItem(propertyItem);
-        }
-    }
-
-    private void SaveResizedSubfile3(MappingFromItem mappingFromItem, int[] resize, byte[] bytes)
-    {
-        Bitmap bitmap;
-        int outputResolutionWidth = resize[_OutputResolutionWidthIndex];
-        using Bitmap temp = new(mappingFromItem.FilePath.FullName, useIcm: false);
-        int outputResolutionHeight = resize[_OutputResolutionHeightIndex];
-        PropertyItem[] propertyItems = temp.PropertyItems;
-        int outputResolutionOrientation = resize[_OutputResolutionOrientationIndex];
-        bitmap = new(temp, outputResolutionWidth, outputResolutionHeight);
-        switch (outputResolutionOrientation) // exif 274
-        {
-            case 0:
-                break;
-            case 1:
-                break; // 1 = Horizontal (normal)
-            case 2:
-                bitmap.RotateFlip(RotateFlipType.RotateNoneFlipX);
-                break; // 2 = Mirror horizontal
-            case 3:
-                bitmap.RotateFlip(RotateFlipType.Rotate180FlipNone);
-                break; // 3 = Rotate 180
-            case 4:
-                bitmap.RotateFlip(RotateFlipType.RotateNoneFlipY);
-                break; // 4 = Mirror vertical
-            case 5:
-                bitmap.RotateFlip(RotateFlipType.Rotate270FlipX);
-                break; // 5 = Mirror horizontal and rotate 270 CW
-            case 6:
-                bitmap.RotateFlip(RotateFlipType.Rotate90FlipNone);
-                break; // 6 = Rotate 90 CW
-            case 7:
-                bitmap.RotateFlip(RotateFlipType.Rotate90FlipX);
-                break; // 7 = Mirror horizontal and rotate 90 CW
-            case 8:
-                bitmap.RotateFlip(RotateFlipType.Rotate270FlipNone);
-                break; // 8 = Rotate 270 CW
-            default:
-                break;
-        }
-        CopyPropertyItems(bytes, propertyItems, bitmap);
-        bitmap.Save(mappingFromItem.ResizedFileHolder.FullName, _ImageCodecInfo, _EncoderParameters);
-        bitmap.Dispose();
-    }
-
-    private void SaveResizedSubfile5(MappingFromItem mappingFromItem, int[] resize, byte[] bytes)
-    {
-        Bitmap bitmap;
-        using Bitmap temp = new(mappingFromItem.FilePath.FullName, useIcm: false);
-        PropertyItem[] propertyItems = temp.PropertyItems;
-        int tempResolutionWidth = resize[_TempResolutionWidth];
-        int tempResolutionHeight = resize[_TempResolutionHeight];
-        int outputResolutionWidth = resize[_OutputResolutionWidthIndex];
-        int outputResolutionHeight = resize[_OutputResolutionHeightIndex];
-        int outputResolutionOrientation = resize[_OutputResolutionOrientationIndex];
-        bitmap = new(temp, tempResolutionWidth, tempResolutionHeight);
-        switch (outputResolutionOrientation) // exif 274
-        {
-            case 0:
-                break;
-            case 1:
-                break; // 1 = Horizontal (normal)
-            case 2:
-                bitmap.RotateFlip(RotateFlipType.RotateNoneFlipX);
-                break; // 2 = Mirror horizontal
-            case 3:
-                bitmap.RotateFlip(RotateFlipType.Rotate180FlipNone);
-                break; // 3 = Rotate 180
-            case 4:
-                bitmap.RotateFlip(RotateFlipType.RotateNoneFlipY);
-                break; // 4 = Mirror vertical
-            case 5:
-                bitmap.RotateFlip(RotateFlipType.Rotate270FlipX);
-                break; // 5 = Mirror horizontal and rotate 270 CW
-            case 6:
-                bitmap.RotateFlip(RotateFlipType.Rotate90FlipNone);
-                break; // 6 = Rotate 90 CW
-            case 7:
-                bitmap.RotateFlip(RotateFlipType.Rotate90FlipX);
-                break; // 7 = Mirror horizontal and rotate 90 CW
-            case 8:
-                bitmap.RotateFlip(RotateFlipType.Rotate270FlipNone);
-                break; // 8 = Rotate 270 CW
-            default:
-                break;
-        }
-        Bitmap preRotated;
-        Rectangle rectangle;
-        if (tempResolutionHeight < tempResolutionWidth)
-            rectangle = new Rectangle((int)((tempResolutionWidth - outputResolutionWidth) * .5), 0, outputResolutionWidth, outputResolutionHeight);
-        else
-            rectangle = new Rectangle(0, (int)((tempResolutionHeight - outputResolutionHeight) * .5), outputResolutionWidth, outputResolutionHeight);
-        using (preRotated = new Bitmap(outputResolutionWidth, outputResolutionHeight))
-        {
-            using (Graphics graphics = Graphics.FromImage(preRotated))
-                graphics.DrawImage(bitmap, new Rectangle(0, 0, outputResolutionWidth, outputResolutionHeight), rectangle, GraphicsUnit.Pixel);
-            CopyPropertyItems(bytes, propertyItems, bitmap);
-            bitmap.Save(mappingFromItem.ResizedFileHolder.FullName, _ImageCodecInfo, _EncoderParameters);
-        }
-        bitmap.Dispose();
-    }
-
-#pragma warning restore CA1416
-
-    private void SaveResizedSubfile(Shared.Models.Property property, MappingFromItem mappingFromItem, int[] resize)
-    {
-        string dateTimeFormat = IProperty.DateTimeFormat();
-        DateTime dateTime = property.DateTimeOriginal is not null ? property.DateTimeOriginal.Value : Shared.Models.Stateless.Methods.IProperty.GetMinimumDateTime(property);
-        string dateTimeValue = dateTime.ToString(dateTimeFormat);
-        byte[] bytes = _ASCIIEncoding.GetBytes(dateTimeValue);
-        if (_ASCIIEncoding.GetString(bytes, 0, bytes.Length) != dateTimeValue)
-            throw new Exception();
-        if (resize.Length == 3)
-            SaveResizedSubfile3(mappingFromItem, resize, bytes);
-        else if (resize.Length == 5)
-            SaveResizedSubfile5(mappingFromItem, resize, bytes);
-        else
-            throw new Exception();
-    }
-
-    public void SaveResizedSubfile(Configuration configuration, string outputResolution, string cResultsFullGroupDirectory, List<Tuple<string, DateTime>> subFileTuples, Item item, Shared.Models.Property property, MappingFromItem mappingFromItem, Dictionary<string, int[]> outputResolutionToResize)
-    {
-        if (mappingFromItem.ResizedFileHolder is null)
-            throw new NullReferenceException(nameof(mappingFromItem.ResizedFileHolder));
-#pragma warning disable CA1854
-        if (!outputResolutionToResize.ContainsKey(_Original))
-            throw new Exception();
-        if (!outputResolutionToResize.ContainsKey(outputResolution))
-            throw new Exception();
-#pragma warning restore CA1854
-        FileInfo fileInfo = new(mappingFromItem.ResizedFileHolder.FullName);
-        bool check = false;
-        int[] resize = outputResolutionToResize[outputResolution];
-        int outputResolutionWidth = resize[_OutputResolutionWidthIndex];
-        int outputResolutionHeight = resize[_OutputResolutionHeightIndex];
-        int outputResolutionOrientation = resize[_OutputResolutionOrientationIndex];
-        int[] originalCollection = outputResolutionToResize[_Original];
-        string[] changesFrom = [nameof(A_Property), nameof(B_Metadata), nameof(C_Resize)];
-        List<DateTime> dateTimes = (from l in subFileTuples where changesFrom.Contains(l.Item1) select l.Item2).ToList();
-        if (_OverrideForResizeImages)
-            check = true;
-        else if (!fileInfo.Exists)
-            check = true;
-        if (outputResolutionWidth == originalCollection[_OutputResolutionWidthIndex] && outputResolutionHeight == originalCollection[_OutputResolutionHeightIndex] && outputResolutionOrientation == originalCollection[_OutputResolutionOrientationIndex])
-        {
-            if (!check && dateTimes.Count != 0 && dateTimes.Max() > fileInfo.CreationTime.AddDays(1))
-                check = true;
-            if (check)
-            {
-                // if (fileInfo.Exists)
-                //     File.Delete(fileInfo.FullName);
-                // File.Copy(mappingFromItem.FilePath.FullName, fileInfo.FullName);
-                // item.SetResizedFileHolder(_FileNameExtension, Shared.Models.Stateless.Methods.IFileHolder.Refresh(mappingFromItem.ResizedFileHolder));
-                // subFileTuples.Add(new Tuple<string, DateTime>(nameof(C_Resize), DateTime.Now));
-            }
-        }
-        else
-        {
-            if (!check && dateTimes.Count != 0 && dateTimes.Max() > fileInfo.LastWriteTime)
-                check = true;
-            if (check)
-            {
-                SaveResizedSubfile(property, mappingFromItem, resize);
-                item.SetResizedFileHolder(_FileNameExtension, Shared.Models.Stateless.Methods.IFileHolder.Refresh(mappingFromItem.ResizedFileHolder));
-                subFileTuples.Add(new Tuple<string, DateTime>(nameof(C_Resize), DateTime.Now));
-            }
-        }
-    }
-
-    private static int[] GetCollection(string outputResolution)
-    {
-        List<int> results = [];
-        string[] segments = outputResolution.Split('x');
-        results.Add(int.Parse(segments[0]));
-        results.Add(int.Parse(segments[1]));
-        return results.ToArray();
-    }
-
-    private Dictionary<string, int[]> GetImageResizes(Shared.Models.Property property)
-    {
-        Dictionary<string, int[]> results = [];
-        int[] desired;
-        int checkWidth;
-        int checkHeight;
-        int desiredWidth;
-        int desiredHeight;
-        int orientation = property.Orientation is null || string.IsNullOrEmpty(property.Orientation) || !int.TryParse(property.Orientation, out int propertyOrientation) ? 0 : propertyOrientation;
-        if (property is null || property.Width is null || property.Height is null)
-            throw new NotSupportedException();
-        checkWidth = property.Width.Value;
-        checkHeight = property.Height.Value;
-        if (!_ValidResolutions.Contains(_Original))
-            results.Add(_Original, [checkWidth, checkHeight, orientation]);
-        foreach (string validResolution in _ValidResolutions)
-        {
-            if (validResolution == _Original)
-            {
-                desiredWidth = checkWidth;
-                desiredHeight = checkHeight;
-            }
-            else
-            {
-                desired = GetCollection(validResolution);
-                desiredWidth = desired[0];
-                desiredHeight = desired[1];
-            }
-            if (checkWidth <= desiredWidth && checkHeight <= desiredHeight)
-                results.Add(validResolution, [checkWidth, checkHeight, orientation]);
-            else
-            {
-                if (desiredWidth != desiredHeight)
-                {
-                    if (checkWidth * desiredHeight > desiredWidth * checkHeight)
-                        results.Add(validResolution, [desiredWidth, Convert.ToInt32(desiredWidth * checkHeight / (double)checkWidth), orientation]);
-                    else
-                        results.Add(validResolution, [Convert.ToInt32(desiredHeight * checkWidth / (double)checkHeight), desiredHeight, orientation]);
-                }
-                else
-                {
-                    if (checkWidth * desiredHeight <= desiredWidth * checkHeight)
-                        results.Add(validResolution, [desiredWidth, desiredHeight, orientation, desiredWidth, Convert.ToInt32(desiredWidth * checkHeight / (double)checkWidth)]);
-                    else
-                        results.Add(validResolution, [desiredWidth, desiredHeight, orientation, Convert.ToInt32(desiredHeight * checkWidth / (double)checkHeight), desiredHeight]);
-                }
-            }
-        }
-        return results;
-    }
+    public FileHolder GetResizedFileHolder(string cResultsFullGroupDirectory, Item item, bool outputResolutionHasNumber, int id) =>
+        GetResizedFileHolder(cResultsFullGroupDirectory, item.FilePath, outputResolutionHasNumber, $"{id}{item.FilePath.ExtensionLowered}");
 
     private FileHolder GetResizedFileHolder(string cResultsFullGroupDirectory, FilePath filePath, bool outputResolutionHasNumber, string fileName)
     {
@@ -427,26 +152,56 @@ public class C_Resize
             result = Shared.Models.Stateless.Methods.IFileHolder.Get(Path.Combine(AngleBracketCollection[0].Replace("<>", _PropertyConfiguration.ResultContent), fileName));
         else
         {
-            (string directoryName, _) = Shared.Models.Stateless.Methods.IPath.GetDirectoryNameAndIndex(_PropertyConfiguration, filePath);
-            result = Shared.Models.Stateless.Methods.IFileHolder.Get(Path.Combine(cResultsFullGroupDirectory, _PropertyConfiguration.ResultContent, directoryName, fileName));
+            CombinedEnumAndIndex cei = Shared.Models.Stateless.Methods.IPath.GetCombinedEnumAndIndex(_PropertyConfiguration, filePath);
+            result = Shared.Models.Stateless.Methods.IFileHolder.Get(Path.Combine(cResultsFullGroupDirectory, _PropertyConfiguration.ResultContent, cei.Combined, fileName));
         }
         return result;
     }
 
+    public override string ToString()
+    {
+        string result = JsonSerializer.Serialize(this, new JsonSerializerOptions() { WriteIndented = true });
+        return result;
+    }
+
+    public void Update(string cResultsFullGroupDirectory)
+    {
+        ReadOnlyDictionary<string, ReadOnlyDictionary<byte, ReadOnlyCollection<string>>> keyValuePairs = Shared.Models.Stateless.Methods.IPath.GetKeyValuePairs(_PropertyConfiguration, cResultsFullGroupDirectory, [_PropertyConfiguration.ResultSingleton]);
+        foreach (KeyValuePair<string, ReadOnlyDictionary<byte, ReadOnlyCollection<string>>> keyValuePair in keyValuePairs)
+        {
+            if (keyValuePair.Key == _PropertyConfiguration.ResultSingleton)
+                _ResultSingletonFileGroups[0] = keyValuePair.Value;
+            else
+                throw new Exception();
+        }
+    }
+
+    public void SetAngleBracketCollection(string cResultsFullGroupDirectory, string sourceDirectory)
+    {
+        AngleBracketCollection.Clear();
+        AngleBracketCollection.AddRange(IResult.GetDirectoryInfoCollection(_PropertyConfiguration,
+                                                                           sourceDirectory,
+                                                                           cResultsFullGroupDirectory,
+                                                                           contentDescription: "Resized image",
+                                                                           singletonDescription: "Resize dimensions for each resolution",
+                                                                           collectionDescription: string.Empty,
+                                                                           converted: true));
+    }
+
     public FileHolder GetResizedFileHolder(string cResultsFullGroupDirectory, Item item, bool outputResolutionHasNumber) =>
         GetResizedFileHolder(cResultsFullGroupDirectory, item.FilePath, outputResolutionHasNumber, item.FilePath.Name);
 
-    public FileHolder GetResizedFileHolder(string cResultsFullGroupDirectory, Item item, bool outputResolutionHasNumber, int id) =>
-        GetResizedFileHolder(cResultsFullGroupDirectory, item.FilePath, outputResolutionHasNumber, $"{id}{item.FilePath.ExtensionLowered}");
-
     public Dictionary<string, int[]> GetResizeKeyValuePairs(Configuration configuration, string cResultsFullGroupDirectory, FilePath filePath, List<Tuple<string, DateTime>> subFileTuples, List<string> parseExceptions, Shared.Models.Property property, MappingFromItem mappingFromItem)
     {
         Dictionary<string, int[]>? results;
         string json;
         string[] changesFrom = [nameof(A_Property), nameof(B_Metadata)];
         List<DateTime> dateTimes = (from l in subFileTuples where changesFrom.Contains(l.Item1) select l.Item2).ToList();
-        (_, int directoryIndex) = Shared.Models.Stateless.Methods.IPath.GetDirectoryNameAndIndex(_PropertyConfiguration, filePath);
-        FileInfo fileInfo = new(Path.Combine(_FileGroups[_PropertyConfiguration.ResultSingleton][directoryIndex], $"{mappingFromItem.FilePath.NameWithoutExtension}{mappingFromItem.FilePath.ExtensionLowered}.json"));
+        CombinedEnumAndIndex cei = Shared.Models.Stateless.Methods.IPath.GetCombinedEnumAndIndex(_PropertyConfiguration, filePath);
+        string fileName = $"{mappingFromItem.FilePath.NameWithoutExtension}{mappingFromItem.FilePath.ExtensionLowered}.json";
+        string directory = _ResultSingletonFileGroups[0][cei.Enum][cei.Index];
+        FileInfo fileInfo = new(Path.Combine(directory, fileName));
+        MoveIf(fileName, cei, directory, fileInfo);
         if (_ForceResizeLastWriteTimeToCreationTime && !fileInfo.Exists && File.Exists(Path.ChangeExtension(fileInfo.FullName, ".delete")))
         {
             File.Move(Path.ChangeExtension(fileInfo.FullName, ".delete"), fileInfo.FullName);
@@ -502,4 +257,285 @@ public class C_Resize
         return results;
     }
 
+    private static void MoveIf(string fileName, CombinedEnumAndIndex cei, string directory, FileInfo fileInfo)
+    {
+        string[] segments = directory.Split(cei.Combined);
+        string? checkDirectory = segments.Length == 1 ?
+            Path.Combine(segments[0], $"{cei.Combined[2..]}") :
+                segments.Length == 2 ?
+                    $"{segments[0]}{cei.Combined[2..]}{segments[1]}" :
+                        null;
+        if (checkDirectory is not null && Directory.Exists(checkDirectory))
+        {
+            string checkFile = Path.Combine(checkDirectory, fileName);
+            if (File.Exists(checkFile))
+            {
+                File.Move(checkFile, fileInfo.FullName);
+                fileInfo.Refresh();
+            }
+        }
+    }
+
+    private Dictionary<string, int[]> GetImageResizes(Shared.Models.Property property)
+    {
+        Dictionary<string, int[]> results = [];
+        int[] desired;
+        int checkWidth;
+        int checkHeight;
+        int desiredWidth;
+        int desiredHeight;
+        int orientation = property.Orientation is null || string.IsNullOrEmpty(property.Orientation) || !int.TryParse(property.Orientation, out int propertyOrientation) ? 0 : propertyOrientation;
+        if (property is null || property.Width is null || property.Height is null)
+            throw new NotSupportedException();
+        checkWidth = property.Width.Value;
+        checkHeight = property.Height.Value;
+        if (!_ValidResolutions.Contains(_Original))
+            results.Add(_Original, [checkWidth, checkHeight, orientation]);
+        foreach (string validResolution in _ValidResolutions)
+        {
+            if (validResolution == _Original)
+            {
+                desiredWidth = checkWidth;
+                desiredHeight = checkHeight;
+            }
+            else
+            {
+                desired = GetCollection(validResolution);
+                desiredWidth = desired[0];
+                desiredHeight = desired[1];
+            }
+            if (checkWidth <= desiredWidth && checkHeight <= desiredHeight)
+                results.Add(validResolution, [checkWidth, checkHeight, orientation]);
+            else
+            {
+                if (desiredWidth != desiredHeight)
+                {
+                    if (checkWidth * desiredHeight > desiredWidth * checkHeight)
+                        results.Add(validResolution, [desiredWidth, Convert.ToInt32(desiredWidth * checkHeight / (double)checkWidth), orientation]);
+                    else
+                        results.Add(validResolution, [Convert.ToInt32(desiredHeight * checkWidth / (double)checkHeight), desiredHeight, orientation]);
+                }
+                else
+                {
+                    if (checkWidth * desiredHeight <= desiredWidth * checkHeight)
+                        results.Add(validResolution, [desiredWidth, desiredHeight, orientation, desiredWidth, Convert.ToInt32(desiredWidth * checkHeight / (double)checkWidth)]);
+                    else
+                        results.Add(validResolution, [desiredWidth, desiredHeight, orientation, Convert.ToInt32(desiredHeight * checkWidth / (double)checkHeight), desiredHeight]);
+                }
+            }
+        }
+        return results;
+    }
+
+    private static int[] GetCollection(string outputResolution)
+    {
+        List<int> results = [];
+        string[] segments = outputResolution.Split('x');
+        results.Add(int.Parse(segments[0]));
+        results.Add(int.Parse(segments[1]));
+        return results.ToArray();
+    }
+
+    public void SaveResizedSubfile(Configuration configuration, string outputResolution, string cResultsFullGroupDirectory, List<Tuple<string, DateTime>> subFileTuples, Item item, Shared.Models.Property property, MappingFromItem mappingFromItem, Dictionary<string, int[]> outputResolutionToResize)
+    {
+        if (mappingFromItem.ResizedFileHolder is null)
+            throw new NullReferenceException(nameof(mappingFromItem.ResizedFileHolder));
+#pragma warning disable CA1854
+        if (!outputResolutionToResize.ContainsKey(_Original))
+            throw new Exception();
+        if (!outputResolutionToResize.ContainsKey(outputResolution))
+            throw new Exception();
+#pragma warning restore CA1854
+        FileInfo fileInfo = new(mappingFromItem.ResizedFileHolder.FullName);
+        bool check = false;
+        int[] resize = outputResolutionToResize[outputResolution];
+        int outputResolutionWidth = resize[_OutputResolutionWidthIndex];
+        int outputResolutionHeight = resize[_OutputResolutionHeightIndex];
+        int outputResolutionOrientation = resize[_OutputResolutionOrientationIndex];
+        int[] originalCollection = outputResolutionToResize[_Original];
+        string[] changesFrom = [nameof(A_Property), nameof(B_Metadata), nameof(C_Resize)];
+        List<DateTime> dateTimes = (from l in subFileTuples where changesFrom.Contains(l.Item1) select l.Item2).ToList();
+        if (_OverrideForResizeImages)
+            check = true;
+        else if (!fileInfo.Exists)
+            check = true;
+        if (outputResolutionWidth == originalCollection[_OutputResolutionWidthIndex] && outputResolutionHeight == originalCollection[_OutputResolutionHeightIndex] && outputResolutionOrientation == originalCollection[_OutputResolutionOrientationIndex])
+        {
+            if (!check && dateTimes.Count != 0 && dateTimes.Max() > fileInfo.CreationTime.AddDays(1))
+                check = true;
+            if (check)
+            {
+                // if (fileInfo.Exists)
+                //     File.Delete(fileInfo.FullName);
+                // File.Copy(mappingFromItem.FilePath.FullName, fileInfo.FullName);
+                // item.SetResizedFileHolder(_FileNameExtension, Shared.Models.Stateless.Methods.IFileHolder.Refresh(mappingFromItem.ResizedFileHolder));
+                // subFileTuples.Add(new Tuple<string, DateTime>(nameof(C_Resize), DateTime.Now));
+            }
+        }
+        else
+        {
+            if (!check && dateTimes.Count != 0 && dateTimes.Max() > fileInfo.LastWriteTime)
+                check = true;
+            if (check)
+            {
+                SaveResizedSubfile(property, mappingFromItem, resize);
+                item.SetResizedFileHolder(_FileNameExtension, Shared.Models.Stateless.Methods.IFileHolder.Refresh(mappingFromItem.ResizedFileHolder));
+                subFileTuples.Add(new Tuple<string, DateTime>(nameof(C_Resize), DateTime.Now));
+            }
+        }
+    }
+
+    private void SaveResizedSubfile(Shared.Models.Property property, MappingFromItem mappingFromItem, int[] resize)
+    {
+        string dateTimeFormat = IProperty.DateTimeFormat;
+        DateTime dateTime = property.DateTimeOriginal is not null ? property.DateTimeOriginal.Value : Shared.Models.Stateless.Methods.IProperty.GetMinimumDateTime(property);
+        string dateTimeValue = dateTime.ToString(dateTimeFormat);
+        byte[] bytes = _ASCIIEncoding.GetBytes(dateTimeValue);
+        if (_ASCIIEncoding.GetString(bytes, 0, bytes.Length) != dateTimeValue)
+            throw new Exception();
+        if (resize.Length == 3)
+            SaveResizedSubfile3(mappingFromItem, resize, bytes);
+        else if (resize.Length == 5)
+            SaveResizedSubfile5(mappingFromItem, resize, bytes);
+        else
+            throw new Exception();
+    }
+
+    private void SaveResizedSubfile3(MappingFromItem mappingFromItem, int[] resize, byte[] bytes)
+    {
+        Bitmap bitmap;
+#pragma warning disable CA1416
+        int outputResolutionWidth = resize[_OutputResolutionWidthIndex];
+        using Bitmap temp = new(mappingFromItem.FilePath.FullName, useIcm: false);
+        int outputResolutionHeight = resize[_OutputResolutionHeightIndex];
+        PropertyItem[] propertyItems = temp.PropertyItems;
+        int outputResolutionOrientation = resize[_OutputResolutionOrientationIndex];
+        bitmap = new(temp, outputResolutionWidth, outputResolutionHeight);
+        switch (outputResolutionOrientation) // exif 274
+        {
+            case 0:
+                break;
+            case 1:
+                break; // 1 = Horizontal (normal)
+            case 2:
+                bitmap.RotateFlip(RotateFlipType.RotateNoneFlipX);
+                break; // 2 = Mirror horizontal
+            case 3:
+                bitmap.RotateFlip(RotateFlipType.Rotate180FlipNone);
+                break; // 3 = Rotate 180
+            case 4:
+                bitmap.RotateFlip(RotateFlipType.RotateNoneFlipY);
+                break; // 4 = Mirror vertical
+            case 5:
+                bitmap.RotateFlip(RotateFlipType.Rotate270FlipX);
+                break; // 5 = Mirror horizontal and rotate 270 CW
+            case 6:
+                bitmap.RotateFlip(RotateFlipType.Rotate90FlipNone);
+                break; // 6 = Rotate 90 CW
+            case 7:
+                bitmap.RotateFlip(RotateFlipType.Rotate90FlipX);
+                break; // 7 = Mirror horizontal and rotate 90 CW
+            case 8:
+                bitmap.RotateFlip(RotateFlipType.Rotate270FlipNone);
+                break; // 8 = Rotate 270 CW
+            default:
+                break;
+        }
+        CopyPropertyItems(bytes, propertyItems, bitmap);
+        bitmap.Save(mappingFromItem.ResizedFileHolder.FullName, _ImageCodecInfo, _EncoderParameters);
+        bitmap.Dispose();
+#pragma warning restore CA1416
+    }
+
+    private void CopyPropertyItems(byte[] bytes, PropertyItem[] propertyItems, Bitmap bitmap)
+    {
+        bool hasId = false;
+        int id = MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagDateTimeDigitized;
+        int imageWidth = MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagImageWidth;
+        int imageHeight = MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagImageHeight;
+        int orientation = MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagOrientation;
+#pragma warning disable CA1416
+        foreach (PropertyItem propertyItem in propertyItems)
+        {
+            if (propertyItem.Id == id)
+                hasId = true;
+            else if (propertyItem.Id == imageWidth)
+                continue;
+            else if (propertyItem.Id == imageHeight)
+                continue;
+            else if (propertyItem.Id == orientation)
+                continue;
+            bitmap.SetPropertyItem(propertyItem);
+        }
+        if (!hasId)
+        {
+            PropertyItem propertyItem = (PropertyItem)_ConstructorInfo.Invoke(null);
+            propertyItem.Id = id;
+            propertyItem.Len = bytes.Length;
+            propertyItem.Type = 2;
+            propertyItem.Value = bytes;
+            bitmap.SetPropertyItem(propertyItem);
+        }
+#pragma warning restore CA1416
+    }
+
+    private void SaveResizedSubfile5(MappingFromItem mappingFromItem, int[] resize, byte[] bytes)
+    {
+        Bitmap bitmap;
+#pragma warning disable CA1416
+        using Bitmap temp = new(mappingFromItem.FilePath.FullName, useIcm: false);
+        PropertyItem[] propertyItems = temp.PropertyItems;
+        int tempResolutionWidth = resize[_TempResolutionWidth];
+        int tempResolutionHeight = resize[_TempResolutionHeight];
+        int outputResolutionWidth = resize[_OutputResolutionWidthIndex];
+        int outputResolutionHeight = resize[_OutputResolutionHeightIndex];
+        int outputResolutionOrientation = resize[_OutputResolutionOrientationIndex];
+        bitmap = new(temp, tempResolutionWidth, tempResolutionHeight);
+        switch (outputResolutionOrientation) // exif 274
+        {
+            case 0:
+                break;
+            case 1:
+                break; // 1 = Horizontal (normal)
+            case 2:
+                bitmap.RotateFlip(RotateFlipType.RotateNoneFlipX);
+                break; // 2 = Mirror horizontal
+            case 3:
+                bitmap.RotateFlip(RotateFlipType.Rotate180FlipNone);
+                break; // 3 = Rotate 180
+            case 4:
+                bitmap.RotateFlip(RotateFlipType.RotateNoneFlipY);
+                break; // 4 = Mirror vertical
+            case 5:
+                bitmap.RotateFlip(RotateFlipType.Rotate270FlipX);
+                break; // 5 = Mirror horizontal and rotate 270 CW
+            case 6:
+                bitmap.RotateFlip(RotateFlipType.Rotate90FlipNone);
+                break; // 6 = Rotate 90 CW
+            case 7:
+                bitmap.RotateFlip(RotateFlipType.Rotate90FlipX);
+                break; // 7 = Mirror horizontal and rotate 90 CW
+            case 8:
+                bitmap.RotateFlip(RotateFlipType.Rotate270FlipNone);
+                break; // 8 = Rotate 270 CW
+            default:
+                break;
+        }
+        Bitmap preRotated;
+        Rectangle rectangle;
+        if (tempResolutionHeight < tempResolutionWidth)
+            rectangle = new Rectangle((int)((tempResolutionWidth - outputResolutionWidth) * .5), 0, outputResolutionWidth, outputResolutionHeight);
+        else
+            rectangle = new Rectangle(0, (int)((tempResolutionHeight - outputResolutionHeight) * .5), outputResolutionWidth, outputResolutionHeight);
+        using (preRotated = new Bitmap(outputResolutionWidth, outputResolutionHeight))
+        {
+            using (Graphics graphics = Graphics.FromImage(preRotated))
+                graphics.DrawImage(bitmap, new Rectangle(0, 0, outputResolutionWidth, outputResolutionHeight), rectangle, GraphicsUnit.Pixel);
+            CopyPropertyItems(bytes, propertyItems, bitmap);
+            bitmap.Save(mappingFromItem.ResizedFileHolder.FullName, _ImageCodecInfo, _EncoderParameters);
+        }
+        bitmap.Dispose();
+#pragma warning restore CA1416
+    }
+
 }

Resize/Resize.csproj

@@ -35,7 +35,7 @@
     <ItemGroup>
         <PackageReference Include="MetadataExtractor" Version="2.8.1" />
         <PackageReference Include="System.Drawing.Common" Version="8.0.10" />
-        <PackageReference Include="System.Text.Json" Version="9.0.0" />
+        <PackageReference Include="System.Text.Json" Version="9.0.2" />
     </ItemGroup>
     <ItemGroup>
         <ProjectReference Include="..\Shared\View-by-Distance.Shared.csproj" />

Set-Created-Date/Set-Created-Date.csproj

@@ -35,9 +35,9 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Humanizer.Core" Version="2.14.1" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="9.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="9.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="9.0.2" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="9.0.2" />
+    <PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.2" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Metadata\Metadata.csproj" />

Set-Created-Date/SetCreatedDate.cs

@@ -22,7 +22,7 @@ public class SetCreatedDate
     private readonly IsEnvironment _IsEnvironment;
     private readonly IConfigurationRoot _ConfigurationRoot;
     private readonly Property.Models.Configuration _PropertyConfiguration;
-    private readonly ReadOnlyDictionary<string, ReadOnlyCollection<string>> _FileGroups;
+    private readonly ReadOnlyDictionary<string, ReadOnlyDictionary<byte, ReadOnlyCollection<string>>> _FileGroups;
 
     public SetCreatedDate(List<string> args, ILogger<Program> logger, IsEnvironment isEnvironment, IConfigurationRoot configurationRoot, AppSettings appSettings, string workingDirectory, bool isSilent, IConsole console)
     {

Shared/Models/C_Resize.cs

@@ -0,0 +1,34 @@
+using System.Collections.ObjectModel;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+
+namespace View_by_Distance.Shared.Models;
+
+public record C_ResizeX(ReadOnlyDictionary<int, List<FilePath>> Amazon,
+                       ReadOnlyDictionary<int, List<FilePath>> Content,
+                       string OutputResolutionDirectory,
+                       ReadOnlyDictionary<int, ReadOnlyDictionary<string, int[]>> OutputResolutionToResize,
+                       ReadOnlyDictionary<int, List<FilePath>> Singleton)
+{
+
+    public override string ToString()
+    {
+        string result = JsonSerializer.Serialize(this, C_ResizeXSourceGenerationContext.Default.C_ResizeX);
+        return result;
+    }
+
+    // If first
+    // Set OutputResolutionDirectory
+    // Create a directories for Amazon, Content and Singleton
+    // Populate Amazon
+    // Populate Content
+    // Populate Singleton
+    // Populate existing OutputResolutionToResize
+
+}
+
+[JsonSourceGenerationOptions(WriteIndented = true)]
+[JsonSerializable(typeof(C_ResizeX))]
+public partial class C_ResizeXSourceGenerationContext : JsonSerializerContext
+{
+}

Shared/Models/CombinedEnumAndIndex.cs

@@ -0,0 +1,23 @@
+using System.Text.Json;
+using System.Text.Json.Serialization;
+
+namespace View_by_Distance.Shared.Models;
+
+public record CombinedEnumAndIndex(string Combined,
+                                   byte Enum,
+                                   int Index)
+{
+
+    public override string ToString()
+    {
+        string result = JsonSerializer.Serialize(this, CombinedEnumAndIndexSourceGenerationContext.Default.CombinedEnumAndIndex);
+        return result;
+    }
+
+}
+
+[JsonSourceGenerationOptions(WriteIndented = true)]
+[JsonSerializable(typeof(CombinedEnumAndIndex))]
+internal partial class CombinedEnumAndIndexSourceGenerationContext : JsonSerializerContext
+{
+}

Shared/Models/D2_FaceParts.cs

@@ -0,0 +1,24 @@
+using System.Text.Json;
+using System.Text.Json.Serialization;
+
+namespace View_by_Distance.Shared.Models;
+
+public record D2_FacePartsX(Dictionary<int, List<FilePath>> Amazon,
+                           List<FilePath> Collection,
+                           Dictionary<int, List<FilePath>> Content,
+                           string OutputResolutionWithDirectory)
+{
+
+    public override string ToString()
+    {
+        string result = JsonSerializer.Serialize(this, D2_FacePartsXSourceGenerationContext.Default.D2_FacePartsX);
+        return result;
+    }
+
+}
+
+[JsonSourceGenerationOptions(WriteIndented = true)]
+[JsonSerializable(typeof(D2_FacePartsX))]
+public partial class D2_FacePartsXSourceGenerationContext : JsonSerializerContext
+{
+}

Shared/Models/D_Face.cs

@@ -0,0 +1,24 @@
+using System.Text.Json;
+using System.Text.Json.Serialization;
+
+namespace View_by_Distance.Shared.Models;
+
+public record D_FaceX(Dictionary<int, List<FilePath>> Amazon,
+                     Dictionary<int, List<FilePath>> Content,
+                     Dictionary<int, List<FilePath>> Collection,
+                     string OutputResolutionWithDirectory)
+{
+
+    public override string ToString()
+    {
+        string result = JsonSerializer.Serialize(this, D_FaceXSourceGenerationContext.Default.D_FaceX);
+        return result;
+    }
+
+}
+
+[JsonSourceGenerationOptions(WriteIndented = true)]
+[JsonSerializable(typeof(D_FaceX))]
+public partial class D_FaceXSourceGenerationContext : JsonSerializerContext
+{
+}

Shared/Models/Datum.cs

@@ -4,7 +4,7 @@ namespace View_by_Distance.Shared.Models;
 
 public record Datum(
     [property: JsonPropertyName("accessRuleIds")] IReadOnlyList<object> AccessRuleIds,
-    [property: JsonPropertyName("childAssetTypeInfo")] IReadOnlyList<object> ChildAssetTypeInfo,
+    [property: JsonPropertyName("childAssetTyceinfo")] IReadOnlyList<object> ChildAssetTyceinfo,
     [property: JsonPropertyName("contentProperties")] ContentProperties ContentProperties,
     [property: JsonPropertyName("createdBy")] string CreatedBy,
     [property: JsonPropertyName("createdDate")] DateTime CreatedDate,

Shared/Models/FilePair.cs

@@ -3,11 +3,11 @@ using System.Text.Json.Serialization;
 
 namespace View_by_Distance.Shared.Models;
 
-internal record FilePair(string Path,
-                         bool IsUnique,
-                         bool? IsNotUniqueAndNeedsReview,
-                         List<string> Collection,
-                         string? Match)
+public record FilePair(FilePath FilePath,
+                       bool IsUnique,
+                       bool? IsNotUniqueAndNeedsReview,
+                       List<FilePath> Collection,
+                       FilePath? Match)
 {
 
     public override string ToString()
@@ -20,6 +20,6 @@ internal record FilePair(string Path,
 
 [JsonSourceGenerationOptions(WriteIndented = true)]
 [JsonSerializable(typeof(FilePair))]
-internal partial class FilePairSourceGenerationContext : JsonSerializerContext
+public partial class FilePairSourceGenerationContext : JsonSerializerContext
 {
 }

Shared/Models/FilePath.cs

@@ -1,3 +1,4 @@
+using System.Collections.ObjectModel;
 using System.Text.Json;
 using System.Text.Json.Serialization;
 using View_by_Distance.Shared.Models.Stateless.Methods;
@@ -20,12 +21,6 @@ public record FilePath(long CreationTicks,
                        int? SortOrder)
 {
 
-    public override string ToString()
-    {
-        string result = JsonSerializer.Serialize(this, FilePathSourceGenerationContext.Default.FilePath);
-        return result;
-    }
-
     public static FilePath Get(Properties.IPropertyConfiguration propertyConfiguration, FileHolder fileHolder, int? index)
     {
         if (fileHolder.CreationTime is null)
@@ -83,6 +78,61 @@ public record FilePath(long CreationTicks,
         return result;
     }
 
+    public static ReadOnlyDictionary<int, List<FilePath>> GetFilesKeyValuePairs(ReadOnlyCollection<ReadOnlyCollection<FilePath>> filePathsCollection)
+    {
+        Dictionary<int, List<FilePath>> results = [];
+        List<FilePath>? collection;
+        foreach (ReadOnlyCollection<FilePath> filePaths in filePathsCollection)
+        {
+            foreach (FilePath filePath in filePaths)
+            {
+                if (filePath.Id is null)
+                    continue;
+                if (!results.TryGetValue(filePath.Id.Value, out collection))
+                {
+                    results.Add(filePath.Id.Value, []);
+                    if (!results.TryGetValue(filePath.Id.Value, out collection))
+                        throw new Exception();
+                }
+                collection.Add(filePath);
+            }
+        }
+        return new(results);
+    }
+
+    public static ReadOnlyDictionary<int, ReadOnlyCollection<FilePath>> GetKeyValuePairs(ReadOnlyCollection<ReadOnlyCollection<FilePath>> filePathsCollection)
+    {
+        Dictionary<int, ReadOnlyCollection<FilePath>> results = [];
+        List<FilePath>? collection;
+        Dictionary<int, List<FilePath>> keyValuePairs = [];
+        foreach (ReadOnlyCollection<FilePath> filePaths in filePathsCollection)
+        {
+            if (filePaths.Count == 0)
+                continue;
+            foreach (FilePath filePath in filePaths)
+            {
+                if (filePath.Id is null)
+                    continue;
+                if (!keyValuePairs.TryGetValue(filePath.Id.Value, out collection))
+                {
+                    keyValuePairs.Add(filePath.Id.Value, []);
+                    if (!keyValuePairs.TryGetValue(filePath.Id.Value, out collection))
+                        throw new Exception();
+                }
+                collection.Add(filePath);
+            }
+        }
+        foreach (KeyValuePair<int, List<FilePath>> keyValuePair in keyValuePairs)
+            results.Add(keyValuePair.Key, new(keyValuePair.Value));
+        return results.AsReadOnly();
+    }
+
+    public override string ToString()
+    {
+        string result = JsonSerializer.Serialize(this, FilePathSourceGenerationContext.Default.FilePath);
+        return result;
+    }
+
 }
 
 [JsonSourceGenerationOptions(WriteIndented = true)]

Shared/Models/Methods/IContainer.cs

@@ -1,8 +0,0 @@
-namespace View_by_Distance.Shared.Models.Methods;
-
-public interface IContainer : Stateless.Methods.IContainer
-{ // ...
-
-    //
-
-}

Shared/Models/Stateless/Methods/Container.cs

@@ -1,282 +0,0 @@
-using System.Collections.ObjectModel;
-using System.Text.Json;
-
-namespace View_by_Distance.Shared.Models.Stateless.Methods;
-
-internal abstract class Container
-{
-
-    private record FilePair(bool IsUnique, List<string> Collection, FilePath FilePath, Models.Item Item) { }
-
-    internal static DateTime[] GetContainerDateTimes(ReadOnlyCollection<Models.Item> items)
-    {
-        DateTime[] results;
-        long containerMinimumTicks = (from l in items select l.FilePath.LastWriteTicks).Min();
-        long containerMaximumTicks = (from l in items select l.FilePath.LastWriteTicks).Max();
-        results = [new(containerMinimumTicks), new(containerMaximumTicks)];
-        return results;
-    }
-
-    internal static ReadOnlyCollection<Models.Item> GetValidImageItems(Properties.IPropertyConfiguration propertyConfiguration, Models.Container container)
-    {
-        List<Models.Item> results = [];
-        foreach (Models.Item item in container.Items)
-        {
-            if (!item.IsValidImageFormatExtension || propertyConfiguration.IgnoreExtensions.Contains(item.FilePath.ExtensionLowered))
-                continue;
-            results.Add(item);
-        }
-        return container.Items.Count == results.Count ? container.Items : new(results);
-    }
-
-    private static List<Models.FilePair> GetFilePairs(Properties.IPropertyConfiguration propertyConfiguration, string directorySearchFilter, string extension, string aPropertySingletonDirectory, ReadOnlyCollection<ReadOnlyCollection<FilePath>> filePathsCollection)
-    {
-        int renamed;
-        const bool useCeilingAverage = true;
-        List<Models.FilePair>? filePairs = null;
-        ReadOnlyCollection<string[]>? jsonFilesCollection = null;
-        IReadOnlyDictionary<string, List<string>>? compareFileNamesToFiles = null;
-        IReadOnlyDictionary<string, List<string>> fileNamesToFiles = XDirectory.GetFilesKeyValuePairs(filePathsCollection);
-        for (int i = 0; i < short.MaxValue; i++)
-        {
-            renamed = 0;
-            jsonFilesCollection = IDirectory.GetFilesCollection(aPropertySingletonDirectory, directorySearchFilter, extension, useCeilingAverage);
-            compareFileNamesToFiles = XDirectory.GetFilesKeyValuePairs(jsonFilesCollection);
-            renamed += XDirectory.LookForAbandoned(jsonFilesCollection, fileNamesToFiles, extension);
-            filePairs = XDirectory.GetFiles(propertyConfiguration, filePathsCollection, fileNamesToFiles, extension, compareFileNamesToFiles);
-            renamed += XDirectory.MaybeMove(propertyConfiguration, filePairs, aPropertySingletonDirectory, extension);
-            if (renamed == 0)
-                break;
-            if (i > 10)
-                throw new NotImplementedException();
-        }
-        if (filePairs is null || jsonFilesCollection is null || compareFileNamesToFiles is null)
-            throw new NullReferenceException(nameof(filePairs));
-        return filePairs;
-    }
-
-    private static Models.Property? GetProperty(Models.FilePair filePair)
-    {
-        Models.Property? result;
-        if (filePair.Match is null)
-            result = null;
-        else
-        {
-            string json = File.ReadAllText(filePair.Match);
-            if (string.IsNullOrEmpty(json))
-                result = null;
-            else
-                result = JsonSerializer.Deserialize(json, PropertyGenerationContext.Default.Property);
-        }
-        return result;
-    }
-
-    private static void ParallelFor(IDlibDotNet? dlibDotNet, Properties.IPropertyConfiguration propertyConfiguration, string aPropertySingletonDirectory, string extension, int rootDirectoryLength, ReadOnlyDictionary<int, Identifier>? splatNineIdentifiers, Models.FilePair filePair, List<FilePair> results)
-    {
-        dlibDotNet?.Tick();
-        bool abandoned = false;
-        Models.FileHolder sourceDirectoryFileHolder;
-        Models.Property? property = GetProperty(filePair);
-        Models.FileHolder imageFileHolder = IFileHolder.Get(filePair.Path);
-        FilePath filePath = FilePath.Get(propertyConfiguration, imageFileHolder, index: null);
-        bool? fileSizeChanged = property is not null ? property.FileSize != filePath.Length : null;
-        bool isValidImageFormatExtension = propertyConfiguration.ValidImageFormatExtensions.Contains(filePath.ExtensionLowered);
-        bool? shouldIgnore = property is null || property.Keywords is null ? null : propertyConfiguration.IgnoreRulesKeyWords.Any(l => property.Keywords.Contains(l));
-        bool? isArchive = filePath.Id is null || splatNineIdentifiers is null ? null : splatNineIdentifiers.TryGetValue(filePath.Id.Value, out Identifier? identifier);
-        if (shouldIgnore is not null)
-        {
-            if (shouldIgnore.Value)
-            {
-                FileInfo fileInfo = new(filePath.FullName);
-                if (!fileInfo.Attributes.HasFlag(FileAttributes.Hidden))
-                    File.SetAttributes(imageFileHolder.FullName, FileAttributes.Hidden);
-            }
-            if (filePath.HasIgnoreKeyword is not null && filePath.HasIgnoreKeyword.Value != shouldIgnore.Value)
-            {
-                if (filePath.DirectoryFullPath.Contains("Results") && filePath.DirectoryFullPath.Contains("Resize"))
-                    File.Delete(filePath.FullName);
-                else
-                    throw new NotSupportedException($"Rename File! <{filePath.FileNameFirstSegment}>");
-            }
-        }
-        string relativePath = IPath.GetRelativePath(filePair.Path, rootDirectoryLength, forceExtensionToLower: true);
-        bool? lastWriteTimeChanged = property is not null ? propertyConfiguration.PropertiesChangedForProperty || property.LastWriteTime.Ticks != filePath.LastWriteTicks : null;
-        if (filePair.Match is not null)
-            sourceDirectoryFileHolder = IFileHolder.Get(filePair.Match);
-        else if (!filePair.IsUnique)
-            sourceDirectoryFileHolder = IFileHolder.Get(Path.GetFullPath(string.Concat(aPropertySingletonDirectory, relativePath, extension)));
-        else
-        {
-            string fileName = Path.GetFileName(filePair.Path);
-            (string directoryName, _) = IPath.GetDirectoryNameAndIndex(propertyConfiguration, filePath);
-            sourceDirectoryFileHolder = IFileHolder.Get(Path.Combine(aPropertySingletonDirectory, directoryName, $"{fileName}{extension}"));
-        }
-        if (sourceDirectoryFileHolder.CreationTime is not null && sourceDirectoryFileHolder.LastWriteTime is not null && filePath.LastWriteTicks != sourceDirectoryFileHolder.CreationTime.Value.Ticks)
-        {
-            File.SetCreationTime(sourceDirectoryFileHolder.FullName, new(filePath.LastWriteTicks));
-            File.SetLastWriteTime(sourceDirectoryFileHolder.FullName, sourceDirectoryFileHolder.LastWriteTime.Value);
-        }
-        Models.Item item = Models.Item.Get(filePath, sourceDirectoryFileHolder, relativePath, isArchive, filePair.IsNotUniqueAndNeedsReview, filePair.IsUnique, isValidImageFormatExtension, property, abandoned, fileSizeChanged, lastWriteTimeChanged);
-        lock (results)
-            results.Add(new(filePair.IsUnique, filePair.Collection, filePath, item));
-    }
-
-    private static List<FilePair> GetFilePairs(IDlibDotNet? dlibDotNet, Properties.IPropertyConfiguration propertyConfiguration, string aPropertySingletonDirectory, string filesCollectionDirectory, ReadOnlyDictionary<int, Identifier>? splatNineIdentifiers, ReadOnlyCollection<ReadOnlyCollection<FilePath>> filePathsCollection, string directorySearchFilter)
-    {
-        List<FilePair> results = [];
-        const string extension = ".json";
-        int maxDegreeOfParallelism = Environment.ProcessorCount;
-        int filesCollectionDirectoryLength = filesCollectionDirectory.Length;
-        ParallelOptions parallelOptions = new() { MaxDegreeOfParallelism = maxDegreeOfParallelism };
-        List<Models.FilePair> filePairs = GetFilePairs(propertyConfiguration, directorySearchFilter, extension, aPropertySingletonDirectory, filePathsCollection);
-        _ = Parallel.For(0, filePairs.Count, parallelOptions, (i, state) => ParallelFor(dlibDotNet, propertyConfiguration, aPropertySingletonDirectory, extension, filesCollectionDirectoryLength, splatNineIdentifiers, filePairs[i], results));
-        return results;
-    }
-
-    private static (int, Models.Container[]) GetContainers(IDlibDotNet? dlibDotNet, Properties.IPropertyConfiguration propertyConfiguration, string aPropertySingletonDirectory, string filesCollectionDirectory, ReadOnlyDictionary<int, Identifier>? splatNineIdentifiers, ReadOnlyCollection<ReadOnlyCollection<FilePath>> filePathsCollection, string directorySearchFilter)
-    {
-        List<Models.Container> results = [];
-        string directory;
-        List<Models.Item>? items;
-        Models.Container container;
-        List<string> directories = [];
-        Dictionary<string, List<Models.Item>> directoryToItems = [];
-        foreach (ReadOnlyCollection<FilePath> filePaths in filePathsCollection)
-        {
-            if (filePaths.Count == 0)
-                continue;
-            directory = filePaths[0].DirectoryFullPath;
-            if (directory is null)
-                continue;
-            if (!directories.Contains(directory))
-                directories.Add(directory);
-            if (!directoryToItems.TryGetValue(directory, out items))
-            {
-                directoryToItems.Add(directory, []);
-                if (!directoryToItems.TryGetValue(directory, out items))
-                    throw new Exception();
-            }
-        }
-        List<FilePair> filePairs = GetFilePairs(dlibDotNet, propertyConfiguration, aPropertySingletonDirectory, filesCollectionDirectory, splatNineIdentifiers, filePathsCollection, directorySearchFilter);
-        foreach (FilePair filePair in filePairs)
-        {
-            if (!directoryToItems.TryGetValue(filePair.FilePath.DirectoryFullPath, out items))
-            {
-                directoryToItems.Add(filePair.FilePath.DirectoryFullPath, []);
-                if (!directoryToItems.TryGetValue(filePair.FilePath.DirectoryFullPath, out items))
-                    throw new Exception();
-            }
-            items.Add(filePair.Item);
-        }
-        foreach (KeyValuePair<string, List<Models.Item>> keyValuePair in directoryToItems)
-        {
-            if (keyValuePair.Value.Count == 0)
-                continue;
-            container = new(keyValuePair.Key, new(keyValuePair.Value));
-            results.Add(container);
-        }
-        return (filePairs.Count, results.ToArray());
-    }
-
-    internal static ReadOnlyCollection<Models.Container> GetContainers(IDlibDotNet dlibDotNet, Properties.IPropertyConfiguration propertyConfiguration, string aPropertySingletonDirectory, string filesCollectionDirectory, ReadOnlyDictionary<int, Identifier>? splatNineIdentifiers, ReadOnlyCollection<ReadOnlyCollection<FilePath>> filePathsCollection)
-    {
-        Models.Container[] results;
-        const string directorySearchFilter = "*";
-        (_, results) = GetContainers(dlibDotNet, propertyConfiguration, aPropertySingletonDirectory, filesCollectionDirectory, splatNineIdentifiers, filePathsCollection, directorySearchFilter);
-        return new(results);
-    }
-
-    internal static (int, Models.Container[]) GetContainers(Properties.IPropertyConfiguration propertyConfiguration, ReadOnlyDictionary<int, Identifier>? splatNineIdentifiers, string aPropertySingletonDirectory)
-    {
-        int count;
-        Models.Container[] results;
-        IDlibDotNet? dlibDotNet = null;
-        const bool useCeilingAverage = true;
-        const string fileSearchFilter = "*";
-        const string directorySearchFilter = "*";
-        ReadOnlyCollection<string[]> filesCollection = IDirectory.GetFilesCollection(propertyConfiguration.RootDirectory, directorySearchFilter, fileSearchFilter, useCeilingAverage);
-        ReadOnlyCollection<ReadOnlyCollection<FilePath>> filePathsCollection = IDirectory.GetFilePathCollections(propertyConfiguration, filesCollection);
-        (count, results) = GetContainers(dlibDotNet, propertyConfiguration, aPropertySingletonDirectory, propertyConfiguration.RootDirectory, splatNineIdentifiers, filePathsCollection, directorySearchFilter);
-        return (count, results);
-    }
-
-    internal static List<int> GetFilteredDistinctIds(Properties.IPropertyConfiguration propertyConfiguration, ReadOnlyCollection<Models.Container> readOnlyContainers)
-    {
-        List<int> results = [];
-        ReadOnlyCollection<Models.Item> filteredItems;
-        foreach (Models.Container container in readOnlyContainers)
-        {
-            if (container.Items.Count == 0)
-                continue;
-            filteredItems = GetValidImageItems(propertyConfiguration, container);
-            if (filteredItems.Count == 0)
-                continue;
-            foreach (Models.Item item in filteredItems)
-            {
-                if (item.Property?.Id is null || item.ResizedFileHolder is null)
-                    continue;
-                if (results.Contains(item.Property.Id.Value))
-                    continue;
-                results.Add(item.Property.Id.Value);
-            }
-        }
-        return results;
-    }
-
-    internal static List<string> GetFilteredDistinctFileNameFirstSegments(Properties.IPropertyConfiguration propertyConfiguration, ReadOnlyCollection<Models.Container> readOnlyContainers)
-    {
-        List<string> results = [];
-        ReadOnlyCollection<Models.Item> filteredItems;
-        foreach (Models.Container container in readOnlyContainers)
-        {
-            if (container.Items.Count == 0)
-                continue;
-            filteredItems = GetValidImageItems(propertyConfiguration, container);
-            if (filteredItems.Count == 0)
-                continue;
-            foreach (Models.Item item in filteredItems)
-            {
-                if (item.Property?.Id is null || item.ResizedFileHolder is null)
-                    continue;
-                if (results.Contains(item.FilePath.FileNameFirstSegment))
-                    continue;
-                results.Add(item.FilePath.FileNameFirstSegment);
-            }
-        }
-        return results;
-    }
-
-    internal static ReadOnlyCollection<Models.Item> GetValidImageItems(Properties.IPropertyConfiguration propertyConfiguration, ReadOnlyCollection<Models.Container> containers, bool distinctItems, bool filterItems)
-    {
-        List<Models.Item> results = [];
-        List<int> distinct = [];
-        ReadOnlyCollection<Models.Item> filteredItems;
-        foreach (Models.Container container in containers)
-        {
-            if (container.Items.Count == 0)
-                continue;
-            if (!filterItems)
-                filteredItems = container.Items;
-            else
-            {
-                filteredItems = GetValidImageItems(propertyConfiguration, container);
-                if (filteredItems.Count == 0)
-                    continue;
-            }
-            foreach (Models.Item item in filteredItems)
-            {
-                if (item.Property?.Id is null || item.ResizedFileHolder is null)
-                    continue;
-                if (distinctItems)
-                {
-                    if (distinct.Contains(item.Property.Id.Value))
-                        continue;
-                    distinct.Add(item.Property.Id.Value);
-                }
-                results.Add(item);
-            }
-        }
-        return new(results);
-    }
-
-}

Shared/Models/Stateless/Methods/FilePair.cs

@@ -0,0 +1,151 @@
+using System.Collections.ObjectModel;
+using View_by_Distance.Shared.Models.Properties;
+
+namespace View_by_Distance.Shared.Models.Stateless.Methods;
+
+internal abstract class FilePair
+{
+
+    internal static ReadOnlyCollection<Models.FilePair> GetFilePairs(IPropertyConfiguration propertyConfiguration, string directorySearchFilter, string extension, string jsonGroupDirectory, ReadOnlyCollection<ReadOnlyCollection<FilePath>> filePathsCollection)
+    {
+        ReadOnlyCollection<Models.FilePair> results;
+        ReadOnlyDictionary<int, List<FilePath>> fileNamesToFiles = FilePath.GetFilesKeyValuePairs(filePathsCollection);
+        results = GetFilePairs(propertyConfiguration, directorySearchFilter, extension, jsonGroupDirectory, filePathsCollection, fileNamesToFiles);
+        return results;
+    }
+
+    internal static ReadOnlyCollection<Models.FilePair> GetFilePairs(IPropertyConfiguration propertyConfiguration, string directorySearchFilter, string extension, string jsonGroupDirectory, ReadOnlyCollection<ReadOnlyCollection<FilePath>> filePathsCollection, ReadOnlyDictionary<int, List<FilePath>> fileNamesToFiles)
+    {
+        List<Models.FilePair>? results = null;
+        int renamed;
+        const bool useCeilingAverage = true;
+        ReadOnlyCollection<string[]>? jsonFilesCollection = null;
+        IReadOnlyDictionary<int, List<FilePath>>? compareFileNamesToFiles = null;
+        for (int i = 0; i < fileNamesToFiles.Count; i++)
+        {
+            renamed = 0;
+            jsonFilesCollection = XDirectory.GetFilesCollection(jsonGroupDirectory, directorySearchFilter, extension, useCeilingAverage);
+            renamed += LookForAbandoned(propertyConfiguration, jsonFilesCollection, fileNamesToFiles, extension);
+            if (renamed > 0)
+                continue;
+            compareFileNamesToFiles = GetKeyValuePairs(propertyConfiguration, jsonFilesCollection);
+            results = XDirectory.GetFiles(propertyConfiguration, filePathsCollection, fileNamesToFiles, compareFileNamesToFiles);
+            renamed += XDirectory.MaybeMove(propertyConfiguration, results, jsonGroupDirectory, extension);
+            if (renamed == 0)
+                break;
+            if (i > 10)
+                throw new NotImplementedException();
+        }
+        if (results is null || jsonFilesCollection is null || compareFileNamesToFiles is null)
+            throw new NullReferenceException(nameof(results));
+        return results.AsReadOnly();
+    }
+
+    private static int LookForAbandoned(IPropertyConfiguration propertyConfiguration, ReadOnlyCollection<string[]> jsonFilesCollection, IReadOnlyDictionary<int, List<FilePath>> fileNamesToFiles, string extension)
+    {
+        int result;
+        bool check;
+        bool moved = false;
+        List<string> renameCollection = [];
+        foreach (string[] files in jsonFilesCollection)
+        {
+            if (files.Length == 0)
+                continue;
+            check = AnyMoved(propertyConfiguration, fileNamesToFiles, extension, renameCollection, files);
+            if (!moved && check)
+                moved = true;
+        }
+        if (renameCollection.Count > 0)
+            XDirectory.MoveFiles(renameCollection, "{}", "{abd}");
+        result = renameCollection.Count;
+        if (moved && result == 0)
+            result = 1;
+        return result;
+    }
+
+    private static bool AnyMoved(IPropertyConfiguration propertyConfiguration, IReadOnlyDictionary<int, List<FilePath>> fileNamesToFiles, string extension, List<string> renameCollection, string[] files)
+    {
+        bool result = false;
+        string checkFile;
+        string directory;
+        FilePath filePath;
+        string fileNameWith;
+        string checkDirectory;
+        string directoryName;
+        List<FilePath>? collection;
+        Models.FileHolder fileHolder;
+        List<string> directoryNames = [];
+        foreach (string file in files)
+        {
+            if (!file.EndsWith(extension))
+                throw new Exception();
+            fileHolder = IFileHolder.Get(file);
+            if (!fileHolder.Exists)
+                continue;
+            filePath = FilePath.Get(propertyConfiguration, fileHolder, index: null);
+            if (filePath.Id is null)
+                continue;
+            if (!fileNamesToFiles.TryGetValue(filePath.Id.Value, out collection))
+                renameCollection.Add(file);
+            else
+            {
+                directoryNames.Clear();
+                directoryName = Path.GetFileName(filePath.DirectoryFullPath) ?? throw new Exception();
+                foreach (FilePath f in collection)
+                    directoryNames.Add(Path.GetFileName(f.DirectoryFullPath) ?? throw new Exception());
+                if (directoryNames.Count == 0 || directoryNames.Distinct().Count() != 1)
+                    continue;
+                if (directoryName != directoryNames[0])
+                {
+                    directory = Path.GetDirectoryName(filePath.DirectoryFullPath) ?? throw new Exception();
+                    checkDirectory = Path.Combine(directory, directoryNames[0]);
+                    if (!Directory.Exists(checkDirectory))
+                        _ = Directory.CreateDirectory(checkDirectory);
+                    fileNameWith = collection.Count > 1 ? filePath.Name : $"{collection[0].Name}{extension}";
+                    checkFile = Path.Combine(checkDirectory, fileNameWith);
+                    if (!result)
+                        result = true;
+                    if (!File.Exists(checkFile))
+                        File.Move(file, checkFile);
+                    else
+                    {
+                        if (new FileInfo(file).LastWriteTime > new FileInfo(checkFile).LastWriteTime)
+                            File.Delete(file);
+                        else
+                            File.Move(file, checkFile, true);
+                    }
+                }
+            }
+        }
+        return result;
+    }
+
+    private static ReadOnlyDictionary<int, List<FilePath>> GetKeyValuePairs(IPropertyConfiguration propertyConfiguration, ReadOnlyCollection<string[]> filesCollection)
+    {
+        Dictionary<int, List<FilePath>> results = [];
+        List<FilePath>? collection;
+        FilePath filePath;
+        Models.FileHolder fileHolder;
+        foreach (string[] files in filesCollection)
+        {
+            foreach (string file in files)
+            {
+                fileHolder = IFileHolder.Get(file);
+                if (!fileHolder.Exists)
+                    continue;
+                filePath = FilePath.Get(propertyConfiguration, fileHolder, index: null);
+                if (filePath.Id is null)
+                    continue;
+                if (!results.TryGetValue(filePath.Id.Value, out collection))
+                {
+                    results.Add(filePath.Id.Value, []);
+                    if (!results.TryGetValue(filePath.Id.Value, out collection))
+                        throw new Exception();
+                }
+                collection.Add(filePath);
+            }
+        }
+        return new(results);
+    }
+
+}

Shared/Models/Stateless/Methods/IContainer.cs

@@ -1,48 +0,0 @@
-using System.Collections.ObjectModel;
-
-namespace View_by_Distance.Shared.Models.Stateless.Methods;
-
-public interface IContainer
-{
-
-    DateTime[] TestStatic_GetContainerDateTimes(ReadOnlyCollection<Models.Item> items) =>
-        GetContainerDateTimes(items);
-    static DateTime[] GetContainerDateTimes(ReadOnlyCollection<Models.Item> items) =>
-        Container.GetContainerDateTimes(items);
-
-    ReadOnlyCollection<Models.Item> TestStatic_GetValidImageItems(Properties.IPropertyConfiguration propertyConfiguration, Models.Container container) =>
-        GetValidImageItems(propertyConfiguration, container);
-    static ReadOnlyCollection<Models.Item> GetValidImageItems(Properties.IPropertyConfiguration propertyConfiguration, Models.Container container) =>
-       Container.GetValidImageItems(propertyConfiguration, container);
-
-    (int, Models.Container[]) TestStatic_GetContainers(Properties.IPropertyConfiguration propertyConfiguration, string aPropertySingletonDirectory) =>
-            GetContainers(propertyConfiguration, aPropertySingletonDirectory);
-    static (int, Models.Container[]) GetContainers(Properties.IPropertyConfiguration propertyConfiguration, string aPropertySingletonDirectory) =>
-        GetContainers(propertyConfiguration, null, aPropertySingletonDirectory);
-
-    (int, Models.Container[]) TestStatic_GetContainers(Properties.IPropertyConfiguration propertyConfiguration, ReadOnlyDictionary<int, Identifier>? splatNineIdentifiers, string aPropertySingletonDirectory) =>
-            GetContainers(propertyConfiguration, splatNineIdentifiers, aPropertySingletonDirectory);
-    static (int, Models.Container[]) GetContainers(Properties.IPropertyConfiguration propertyConfiguration, ReadOnlyDictionary<int, Identifier>? splatNineIdentifiers, string aPropertySingletonDirectory) =>
-        Container.GetContainers(propertyConfiguration, splatNineIdentifiers, aPropertySingletonDirectory);
-
-    ReadOnlyCollection<Models.Container> TestStatic_GetContainers(IDlibDotNet dlibDotNet, Properties.IPropertyConfiguration propertyConfiguration, string aPropertySingletonDirectory, string filesCollectionDirectory, ReadOnlyDictionary<int, Identifier>? splatNineIdentifiers, ReadOnlyCollection<ReadOnlyCollection<FilePath>> filePathsCollection) =>
-            GetContainers(dlibDotNet, propertyConfiguration, aPropertySingletonDirectory, filesCollectionDirectory, splatNineIdentifiers, filePathsCollection);
-    static ReadOnlyCollection<Models.Container> GetContainers(IDlibDotNet dlibDotNet, Properties.IPropertyConfiguration propertyConfiguration, string aPropertySingletonDirectory, string filesCollectionDirectory, ReadOnlyDictionary<int, Identifier>? splatNineIdentifiers, ReadOnlyCollection<ReadOnlyCollection<FilePath>> filePathsCollection) =>
-        Container.GetContainers(dlibDotNet, propertyConfiguration, aPropertySingletonDirectory, filesCollectionDirectory, splatNineIdentifiers, filePathsCollection);
-
-    List<int> TestStatic_GetFilteredDistinctIds(Properties.IPropertyConfiguration propertyConfiguration, ReadOnlyCollection<Models.Container> readOnlyContainers) =>
-            GetFilteredDistinctIds(propertyConfiguration, readOnlyContainers);
-    static List<int> GetFilteredDistinctIds(Properties.IPropertyConfiguration propertyConfiguration, ReadOnlyCollection<Models.Container> readOnlyContainers) =>
-        Container.GetFilteredDistinctIds(propertyConfiguration, readOnlyContainers);
-
-    List<string> TestStatic_GetFilteredDistinctFileNameFirstSegments(Properties.IPropertyConfiguration propertyConfiguration, ReadOnlyCollection<Models.Container> readOnlyContainers) =>
-            GetFilteredDistinctFileNameFirstSegments(propertyConfiguration, readOnlyContainers);
-    static List<string> GetFilteredDistinctFileNameFirstSegments(Properties.IPropertyConfiguration propertyConfiguration, ReadOnlyCollection<Models.Container> readOnlyContainers) =>
-        Container.GetFilteredDistinctFileNameFirstSegments(propertyConfiguration, readOnlyContainers);
-
-    ReadOnlyCollection<Models.Item> TestStatic_GetValidImageItems(Properties.IPropertyConfiguration propertyConfiguration, ReadOnlyCollection<Models.Container> containers, bool distinctItems, bool filterItems) =>
-        GetValidImageItems(propertyConfiguration, containers, distinctItems, filterItems);
-    static ReadOnlyCollection<Models.Item> GetValidImageItems(Properties.IPropertyConfiguration propertyConfiguration, ReadOnlyCollection<Models.Container> containers, bool distinctItems, bool filterItems) =>
-        Container.GetValidImageItems(propertyConfiguration, containers, distinctItems, filterItems);
-
-}

Shared/Models/Stateless/Methods/IDate.cs

@@ -0,0 +1,30 @@
+namespace View_by_Distance.Shared.Models.Stateless.Methods;
+
+public interface IDate
+{
+
+    public static DateTime GetMinimum(ExifDirectory exifDirectory) =>
+        XDate.GetMinimum(exifDirectory);
+
+    public static (int Season, string seasonName) GetSeason(int dayOfYear) =>
+        XDate.GetSeason(dayOfYear);
+
+    public static DateTime? GetDateTimeOriginal(ExifDirectory exifDirectory) =>
+        XDate.GetDateTimeOriginal(exifDirectory);
+
+    public static (bool?, string[]) IsWrongYear(DirectoryInfo directoryInfo, FilePath filePath, ExifDirectory exifDirectory) =>
+        XDate.IsWrongYear(directoryInfo, filePath, exifDirectory);
+
+    internal DateTime TestStatic_GetMinimum(ExifDirectory exifDirectory) =>
+        GetMinimum(exifDirectory);
+
+    internal (int Season, string seasonName) TestStatic_GetSeason(int dayOfYear) =>
+        GetSeason(dayOfYear);
+
+    internal DateTime? TestStatic_GetDateTimeOriginal(ExifDirectory exifDirectory) =>
+        GetDateTimeOriginal(exifDirectory);
+
+    internal (bool?, string[]) TestStatic_IsWrongYear(DirectoryInfo directoryInfo, FilePath filePath, ExifDirectory exifDirectory) =>
+        IsWrongYear(directoryInfo, filePath, exifDirectory);
+
+}

Shared/Models/Stateless/Methods/IDirectory.cs

@@ -5,49 +5,70 @@ namespace View_by_Distance.Shared.Models.Stateless.Methods;
 public interface IDirectory
 {
 
-    char TestStatic_GetDirectory(string fileName) =>
-        GetDirectory(fileName);
-    static char GetDirectory(string fileName) =>
-        fileName.Split('-').Length > 2 ? '-' : fileName.Split('.')[0][^1];
-
-    int TestStatic_GetDirectory(char directory) =>
-        GetDirectory(directory);
-    static int GetDirectory(char directory) =>
+    public static int GetDirectory(char directory) =>
         directory == '-' ? 10 : int.TryParse(directory.ToString(), out int value) ? value : 11;
 
-    ReadOnlyCollection<string[]> TestStatic_GetFilesCollection(string directory, string directorySearchFilter, string fileSearchFilter, bool useCeilingAverage) =>
-        GetFilesCollection(directory, directorySearchFilter, fileSearchFilter, useCeilingAverage);
-    static ReadOnlyCollection<string[]> GetFilesCollection(string directory, string directorySearchFilter, string fileSearchFilter, bool useCeilingAverage) =>
-        XDirectory.GetFilesCollection(directory, directorySearchFilter, fileSearchFilter, useCeilingAverage);
+    public static char GetDirectory(string fileName) =>
+        fileName.Split('-').Length > 2 ? '-' : fileName.Split('.')[0][^1];
 
-    ReadOnlyCollection<ReadOnlyCollection<FilePath>> TestStatic_GetFilePathCollections(Properties.IPropertyConfiguration propertyConfiguration, string directorySearchFilter, string fileSearchFilter, string directory, bool useCeilingAverage) =>
-        GetFilePathCollections(propertyConfiguration, directorySearchFilter, fileSearchFilter, directory, useCeilingAverage);
-    static ReadOnlyCollection<ReadOnlyCollection<FilePath>> GetFilePathCollections(Properties.IPropertyConfiguration propertyConfiguration, string directorySearchFilter, string fileSearchFilter, string directory, bool useCeilingAverage) =>
-        XDirectory.GetFilePathCollections(propertyConfiguration, directorySearchFilter, fileSearchFilter, directory, useCeilingAverage);
-
-    void TestStatic_MoveFiles(List<string> files, string find, string replace) =>
-        MoveFiles(files, find, replace);
-    static void MoveFiles(List<string> files, string find, string replace) =>
+    public static void MoveFiles(List<string> files, string find, string replace) =>
         XDirectory.MoveFiles(files, find, replace);
 
-    (string[], List<(FilePath, string)>) TestStatic_GetToDoCollection(Properties.IPropertyConfiguration propertyConfiguration, ReadOnlyCollection<ReadOnlyCollection<FilePath>> filePathsCollection, IReadOnlyDictionary<string, ReadOnlyCollection<string>> fileGroups, Action? tick) =>
-        GetToDoCollection(propertyConfiguration, filePathsCollection, fileGroups, tick);
-    static (string[], List<(FilePath, string)>) GetToDoCollection(Properties.IPropertyConfiguration propertyConfiguration, ReadOnlyCollection<ReadOnlyCollection<FilePath>> filePathsCollection, IReadOnlyDictionary<string, ReadOnlyCollection<string>> fileGroups, Action? tick) =>
-        XDirectory.GetToDoCollection(propertyConfiguration, copyDuplicates: false, ifCanUseId: true, filePathsCollection, fileGroups, tick);
-
-    (string[], List<(FilePath, string)>) TestStatic_GetToDoCollection(Properties.IPropertyConfiguration propertyConfiguration, bool copyDuplicates, bool ifCanUseId, ReadOnlyCollection<ReadOnlyCollection<FilePath>> filePathsCollection, IReadOnlyDictionary<string, ReadOnlyCollection<string>> fileGroups, Action? tick) =>
-        GetToDoCollection(propertyConfiguration, copyDuplicates, ifCanUseId, filePathsCollection, fileGroups, tick);
-    static (string[], List<(FilePath, string)>) GetToDoCollection(Properties.IPropertyConfiguration propertyConfiguration, bool copyDuplicates, bool ifCanUseId, ReadOnlyCollection<ReadOnlyCollection<FilePath>> filePathsCollection, IReadOnlyDictionary<string, ReadOnlyCollection<string>> fileGroups, Action? tick) =>
-        XDirectory.GetToDoCollection(propertyConfiguration, copyDuplicates, ifCanUseId, filePathsCollection, fileGroups, tick);
-
-    List<string> TestStatic_CopyOrMove(List<(FilePath, string)> toDoCollection, bool move, bool moveBack, Action? tick) =>
-        CopyOrMove(toDoCollection, move, moveBack, tick);
-    static List<string> CopyOrMove(List<(FilePath, string)> toDoCollection, bool move, bool moveBack, Action? tick) =>
+    public static List<string> CopyOrMove(List<(FilePath, string)> toDoCollection, bool move, bool moveBack, Action? tick) =>
         XDirectory.CopyOrMove(toDoCollection, move, moveBack, tick);
 
-    ReadOnlyCollection<ReadOnlyCollection<FilePath>> TestStatic_GetFilePathCollections(Properties.IPropertyConfiguration propertyConfiguration, ReadOnlyCollection<string[]> filesCollection) =>
-        GetFilePathCollections(propertyConfiguration, filesCollection);
-    static ReadOnlyCollection<ReadOnlyCollection<FilePath>> GetFilePathCollections(Properties.IPropertyConfiguration propertyConfiguration, ReadOnlyCollection<string[]> filesCollection) =>
-        XDirectory.GetFilePathCollections(propertyConfiguration, filesCollection);
+    public static ReadOnlyCollection<string[]> GetFilesCollection(string directory, string directorySearchFilter, string fileSearchFilter, bool useCeilingAverage) =>
+        XDirectory.GetFilesCollection(directory, directorySearchFilter, fileSearchFilter, useCeilingAverage);
+
+    public static int MaybeMove(Properties.IPropertyConfiguration propertyConfiguration, List<Models.FilePair> filePairs, string jsonGroupDirectory, string extension) =>
+        XDirectory.MaybeMove(propertyConfiguration, filePairs, jsonGroupDirectory, extension);
+
+    public static ReadOnlyCollection<ReadOnlyCollection<FilePath>> GetFilePathCollections(Properties.IPropertyConfiguration propertyConfiguration, ReadOnlyCollection<string[]> filesCollection, bool useIgnoreExtensions) =>
+        XDirectory.GetFilePathCollections(propertyConfiguration, filesCollection, useIgnoreExtensions);
+
+    public static ReadOnlyCollection<ReadOnlyCollection<FilePath>> GetFilePathCollections(Properties.IPropertyConfiguration propertyConfiguration, string directorySearchFilter, string fileSearchFilter, string directory, bool useIgnoreExtensions, bool useCeilingAverage) =>
+        XDirectory.GetFilePathCollections(propertyConfiguration, directorySearchFilter, fileSearchFilter, directory, useIgnoreExtensions, useCeilingAverage);
+
+    public static List<Models.FilePair> GetFiles(Properties.IPropertyConfiguration propertyConfiguration, ReadOnlyCollection<ReadOnlyCollection<FilePath>> filePathsCollection, IReadOnlyDictionary<int, List<FilePath>> fileNamesToFiles, IReadOnlyDictionary<int, List<FilePath>> compareFileNamesToFiles) =>
+        XDirectory.GetFiles(propertyConfiguration, filePathsCollection, fileNamesToFiles, compareFileNamesToFiles);
+
+    public static (string[], List<(FilePath, string)>) GetToDoCollection(Properties.IPropertyConfiguration propertyConfiguration, bool copyDuplicates, bool ifCanUseId, ReadOnlyCollection<ReadOnlyCollection<FilePath>> filePathsCollection, ReadOnlyDictionary<byte, ReadOnlyCollection<string>> fileGroups, Action? tick) =>
+        XDirectory.GetToDoCollection(propertyConfiguration, copyDuplicates, ifCanUseId, filePathsCollection, fileGroups, null, tick);
+
+    public static (string[], List<(FilePath, string)>) GetToDoCollection(Properties.IPropertyConfiguration propertyConfiguration, ReadOnlyCollection<ReadOnlyCollection<FilePath>> filePathsCollection, ReadOnlyDictionary<byte, ReadOnlyCollection<string>> fileGroups, Dictionary<int, ExifDirectory> exifDirectoriesById, Action? tick) =>
+        XDirectory.GetToDoCollection(propertyConfiguration, copyDuplicates: false, ifCanUseId: true, filePathsCollection, fileGroups, exifDirectoriesById, tick);
+
+    internal int TestStatic_GetDirectory(char directory) =>
+        GetDirectory(directory);
+
+    internal char TestStatic_GetDirectory(string fileName) =>
+        GetDirectory(fileName);
+
+    internal void TestStatic_MoveFiles(List<string> files, string find, string replace) =>
+        MoveFiles(files, find, replace);
+
+    internal List<string> TestStatic_CopyOrMove(List<(FilePath, string)> toDoCollection, bool move, bool moveBack, Action? tick) =>
+        CopyOrMove(toDoCollection, move, moveBack, tick);
+
+    internal ReadOnlyCollection<string[]> TestStatic_GetFilesCollection(string directory, string directorySearchFilter, string fileSearchFilter, bool useCeilingAverage) =>
+        GetFilesCollection(directory, directorySearchFilter, fileSearchFilter, useCeilingAverage);
+
+    internal int TestStatic_MaybeMove(Properties.IPropertyConfiguration propertyConfiguration, List<Models.FilePair> filePairs, string jsonGroupDirectory, string extension) =>
+        MaybeMove(propertyConfiguration, filePairs, jsonGroupDirectory, extension);
+
+    internal ReadOnlyCollection<ReadOnlyCollection<FilePath>> TestStatic_GetFilePathCollections(Properties.IPropertyConfiguration propertyConfiguration, ReadOnlyCollection<string[]> filesCollection, bool useIgnoreExtensions) =>
+        GetFilePathCollections(propertyConfiguration, filesCollection, useIgnoreExtensions);
+
+    internal ReadOnlyCollection<ReadOnlyCollection<FilePath>> TestStatic_GetFilePathCollections(Properties.IPropertyConfiguration propertyConfiguration, string directorySearchFilter, string fileSearchFilter, string directory, bool useIgnoreExtensions, bool useCeilingAverage) =>
+        GetFilePathCollections(propertyConfiguration, directorySearchFilter, fileSearchFilter, directory, useIgnoreExtensions, useCeilingAverage);
+
+    internal List<Models.FilePair> TestStatic_GetFiles(Properties.IPropertyConfiguration propertyConfiguration, ReadOnlyCollection<ReadOnlyCollection<FilePath>> filePathsCollection, IReadOnlyDictionary<int, List<FilePath>> fileNamesToFiles, IReadOnlyDictionary<int, List<FilePath>> compareFileNamesToFiles) =>
+        GetFiles(propertyConfiguration, filePathsCollection, fileNamesToFiles, compareFileNamesToFiles);
+
+    internal (string[], List<(FilePath, string)>) TestStatic_GetToDoCollection(Properties.IPropertyConfiguration propertyConfiguration, bool copyDuplicates, bool ifCanUseId, ReadOnlyCollection<ReadOnlyCollection<FilePath>> filePathsCollection, ReadOnlyDictionary<byte, ReadOnlyCollection<string>> fileGroups, Action? tick) =>
+        GetToDoCollection(propertyConfiguration, copyDuplicates, ifCanUseId, filePathsCollection, fileGroups, tick);
+
+    internal (string[], List<(FilePath, string)>) TestStatic_GetToDoCollection(Properties.IPropertyConfiguration propertyConfiguration, ReadOnlyCollection<ReadOnlyCollection<FilePath>> filePathsCollection, ReadOnlyDictionary<byte, ReadOnlyCollection<string>> fileGroups, Dictionary<int, ExifDirectory> exifDirectoriesById, Action? tick) =>
+        GetToDoCollection(propertyConfiguration, filePathsCollection, fileGroups, exifDirectoriesById, tick);
 
 }

Shared/Models/Stateless/Methods/IDlibDotNet.cs

@@ -4,5 +4,8 @@ public interface IDlibDotNet
 {
 
     void Tick();
+    (string, string) GetResultsFullGroupDirectories();
+    void ConstructProgressBar(int maxTicks, string message);
+    (string, string, string, string) GetResultsFullGroupDirectories(string outputResolution);
 
 }

Shared/Models/Stateless/Methods/IFilePair.cs

@@ -0,0 +1,21 @@
+using System.Collections.ObjectModel;
+using View_by_Distance.Shared.Models.Properties;
+
+namespace View_by_Distance.Shared.Models.Stateless.Methods;
+
+public interface IFilePair
+{
+
+    public static ReadOnlyCollection<Models.FilePair> GetFilePairs(IPropertyConfiguration propertyConfiguration, string directorySearchFilter, string extension, string jsonGroupDirectory, ReadOnlyCollection<ReadOnlyCollection<FilePath>> filePathsCollection) =>
+        FilePair.GetFilePairs(propertyConfiguration, directorySearchFilter, extension, jsonGroupDirectory, filePathsCollection);
+
+    public static ReadOnlyCollection<Models.FilePair> GetFilePairs(IPropertyConfiguration propertyConfiguration, string directorySearchFilter, string extension, string jsonGroupDirectory, ReadOnlyCollection<ReadOnlyCollection<FilePath>> filePathsCollection, ReadOnlyDictionary<int, List<FilePath>> fileNamesToFiles) =>
+        FilePair.GetFilePairs(propertyConfiguration, directorySearchFilter, extension, jsonGroupDirectory, filePathsCollection, fileNamesToFiles);
+
+    internal ReadOnlyCollection<Models.FilePair> TestStatic_GetFilePairs(IPropertyConfiguration propertyConfiguration, string directorySearchFilter, string extension, string jsonGroupDirectory, ReadOnlyCollection<ReadOnlyCollection<FilePath>> filePathsCollection) =>
+        GetFilePairs(propertyConfiguration, directorySearchFilter, extension, jsonGroupDirectory, filePathsCollection);
+
+    internal ReadOnlyCollection<Models.FilePair> TestStatic_GetFilePairs(IPropertyConfiguration propertyConfiguration, string directorySearchFilter, string extension, string jsonGroupDirectory, ReadOnlyCollection<ReadOnlyCollection<FilePath>> filePathsCollection, ReadOnlyDictionary<int, List<FilePath>> fileNamesToFiles) =>
+        GetFilePairs(propertyConfiguration, directorySearchFilter, extension, jsonGroupDirectory, filePathsCollection, fileNamesToFiles);
+
+}

Shared/Models/Stateless/Methods/IId.cs

@@ -1,61 +1,75 @@
+using View_by_Distance.Shared.Models.Properties;
+
 namespace View_by_Distance.Shared.Models.Stateless.Methods;
 
 public interface IId
-{ // ...
+{
 
     const int DeterministicHashCode = 9876543;
 
-    static bool IsOffsetDeterministicHashCode(Properties.IPropertyConfiguration propertyConfiguration) =>
-        propertyConfiguration.Offset == DeterministicHashCode;
-
-    string TestStatic_GetIntelligentId(Properties.IPropertyConfiguration propertyConfiguration, long id, bool? hasIgnoreKeyword, bool? hasDateTimeOriginal) =>
-        GetIntelligentId(propertyConfiguration, id, hasIgnoreKeyword, hasDateTimeOriginal);
-    static string GetIntelligentId(Properties.IPropertyConfiguration propertyConfiguration, long id, bool? hasIgnoreKeyword, bool? hasDateTimeOriginal) =>
-        Id.GetIntelligentId(propertyConfiguration, id, hasIgnoreKeyword, hasDateTimeOriginal);
-
-    int TestStatic_GetId(Properties.IPropertyConfiguration propertyConfiguration, string intelligentId) =>
-        GetId(propertyConfiguration, intelligentId);
-    static int GetId(Properties.IPropertyConfiguration propertyConfiguration, string intelligentId) =>
-        Id.GetId(propertyConfiguration, intelligentId);
-
-    string TestStatic_GetPaddedId(Properties.IPropertyConfiguration propertyConfiguration, int id, bool? hasIgnoreKeyword, bool? hasDateTimeOriginal, int? index) =>
-        GetPaddedId(propertyConfiguration, id, hasIgnoreKeyword, hasDateTimeOriginal, index);
-    static string GetPaddedId(Properties.IPropertyConfiguration propertyConfiguration, int id, bool? hasIgnoreKeyword, bool? hasDateTimeOriginal, int? index) =>
-        Id.GetPaddedId(propertyConfiguration, id, hasIgnoreKeyword, hasDateTimeOriginal, index);
-
-    string TestStatic_GetIgnoreFullPath(FilePath filePath, Models.FileHolder fileHolder) =>
-        GetIgnoreFullPath(filePath, fileHolder);
-    static string GetIgnoreFullPath(FilePath filePath, Models.FileHolder fileHolder) =>
-        fileHolder.DirectoryFullPath is null ?
-            throw new NotSupportedException() :
-            filePath.Id > -1 ?
-                fileHolder.NameWithoutExtension[^1] == '9' ?
-                    Path.Combine(fileHolder.DirectoryFullPath, $"{fileHolder.NameWithoutExtension[..^1]}8{fileHolder.ExtensionLowered}") :
-                    throw new NotSupportedException("High") :
-                fileHolder.NameWithoutExtension[^1] == '1' ?
-                    Path.Combine(fileHolder.DirectoryFullPath, $"{fileHolder.NameWithoutExtension[..^1]}2{fileHolder.ExtensionLowered}") :
-                    throw new NotSupportedException("Low");
-
-    bool TestStatic_NameWithoutExtensionIsIntelligentIdFormat(Properties.IPropertyConfiguration propertyConfiguration, string fileNameFirstSegment) =>
-        NameWithoutExtensionIsIntelligentIdFormat(propertyConfiguration, fileNameFirstSegment);
-    static bool NameWithoutExtensionIsIntelligentIdFormat(Properties.IPropertyConfiguration propertyConfiguration, string fileNameFirstSegment) =>
-        fileNameFirstSegment.Length - 1 == propertyConfiguration.IntMinValueLength && fileNameFirstSegment[^1] is '1' or '2' or '8' or '9' && fileNameFirstSegment.All(char.IsNumber);
-
-    bool TestStatic_NameWithoutExtensionIsPaddedIntelligentIdFormat(Properties.IPropertyConfiguration propertyConfiguration, int sortOrderOnlyLengthIndex, string fileNameFirstSegment) =>
-        NameWithoutExtensionIsPaddedIntelligentIdFormat(propertyConfiguration, sortOrderOnlyLengthIndex, fileNameFirstSegment);
-    static bool NameWithoutExtensionIsPaddedIntelligentIdFormat(Properties.IPropertyConfiguration propertyConfiguration, int sortOrderOnlyLengthIndex, string fileNameFirstSegment) =>
-        fileNameFirstSegment.Length == propertyConfiguration.IntMinValueLength + sortOrderOnlyLengthIndex + 1
-        && fileNameFirstSegment[^1] is '1' or '2' or '8' or '9'
-        && fileNameFirstSegment.All(char.IsNumber);
-
-    bool TestStatic_NameWithoutExtensionIsIdFormat(Properties.IPropertyConfiguration propertyConfiguration, Models.FileHolder fileHolder) =>
-        NameWithoutExtensionIsIdFormat(propertyConfiguration, fileHolder);
-    static bool NameWithoutExtensionIsIdFormat(Properties.IPropertyConfiguration propertyConfiguration, Models.FileHolder fileHolder) =>
-        Id.NameWithoutExtensionIsIdFormat(propertyConfiguration, fileHolder.NameWithoutExtension.Split('.')[0]);
-
-    int TestStatic_GetDeterministicHashCode(byte[] value) =>
-        GetDeterministicHashCode(value);
-    static int GetDeterministicHashCode(byte[] value) =>
+    public static int GetDeterministicHashCode(byte[] value) =>
         Id.GetDeterministicHashCode(value);
 
+    public static byte GetHasIgnoreKeyword(FilePath filePath) =>
+        Id.GetHasIgnoreKeyword(filePath);
+
+    public static int GetId(IPropertyConfiguration propertyConfiguration, string intelligentId) =>
+        Id.GetId(propertyConfiguration, intelligentId);
+
+    public static bool IsOffsetDeterministicHashCode(IPropertyConfiguration propertyConfiguration) =>
+        propertyConfiguration.Offset == DeterministicHashCode;
+
+    public static byte GetHasDateTimeOriginal(IPropertyConfiguration propertyConfiguration, FilePath filePath) =>
+        Id.GetHasDateTimeOriginal(propertyConfiguration, filePath);
+
+    public static byte GetMissingDateTimeOriginal(IPropertyConfiguration propertyConfiguration, FilePath filePath) =>
+        Id.GetMissingDateTimeOriginal(propertyConfiguration, filePath);
+
+    public static bool NameWithoutExtensionIsIdFormat(IPropertyConfiguration propertyConfiguration, Models.FileHolder fileHolder) =>
+        Id.NameWithoutExtensionIsIdFormat(propertyConfiguration, fileHolder.NameWithoutExtension.Split('.')[0]);
+
+    public static bool NameWithoutExtensionIsIntelligentIdFormat(IPropertyConfiguration propertyConfiguration, string fileNameFirstSegment) =>
+        fileNameFirstSegment.Length - 1 == propertyConfiguration.IntMinValueLength && fileNameFirstSegment[^1] is '0' or '1' or '2' or '3' or '4' or '5' or '6' or '7' or '8' or '9' && fileNameFirstSegment.All(char.IsNumber);
+
+    public static string GetIntelligentId(IPropertyConfiguration propertyConfiguration, long id, string extensionLowered, bool? hasIgnoreKeyword, bool? hasDateTimeOriginal) =>
+        Id.GetIntelligentId(propertyConfiguration, id, extensionLowered, hasIgnoreKeyword, hasDateTimeOriginal);
+
+    public static bool NameWithoutExtensionIsPaddedIntelligentIdFormat(IPropertyConfiguration propertyConfiguration, int sortOrderOnlyLengthIndex, string fileNameFirstSegment) =>
+        fileNameFirstSegment.Length == propertyConfiguration.IntMinValueLength + sortOrderOnlyLengthIndex + 1
+        && fileNameFirstSegment[^1] is '0' or '1' or '2' or '3' or '4' or '5' or '6' or '7' or '8' or '9'
+        && fileNameFirstSegment.All(char.IsNumber);
+
+    public static string GetPaddedId(IPropertyConfiguration propertyConfiguration, int id, string extensionLowered, bool? hasIgnoreKeyword, bool? hasDateTimeOriginal, int? index) =>
+        Id.GetPaddedId(propertyConfiguration, id, extensionLowered, hasIgnoreKeyword, hasDateTimeOriginal, index);
+
+    internal int TestStatic_GetDeterministicHashCode(byte[] value) =>
+        GetDeterministicHashCode(value);
+
+    internal byte TestStatic_GetHasIgnoreKeyword(FilePath filePath) =>
+        GetHasIgnoreKeyword(filePath);
+
+    internal int TestStatic_GetId(IPropertyConfiguration propertyConfiguration, string intelligentId) =>
+        GetId(propertyConfiguration, intelligentId);
+
+    internal byte TestStatic_GetHasDateTimeOriginal(IPropertyConfiguration propertyConfiguration, FilePath filePath) =>
+        GetHasDateTimeOriginal(propertyConfiguration, filePath);
+
+    internal byte TestStatic_GetMissingDateTimeOriginal(IPropertyConfiguration propertyConfiguration, FilePath filePath) =>
+        GetMissingDateTimeOriginal(propertyConfiguration, filePath);
+
+    internal bool TestStatic_NameWithoutExtensionIsIdFormat(IPropertyConfiguration propertyConfiguration, Models.FileHolder fileHolder) =>
+        NameWithoutExtensionIsIdFormat(propertyConfiguration, fileHolder);
+
+    internal bool TestStatic_NameWithoutExtensionIsIntelligentIdFormat(IPropertyConfiguration propertyConfiguration, string fileNameFirstSegment) =>
+        NameWithoutExtensionIsIntelligentIdFormat(propertyConfiguration, fileNameFirstSegment);
+
+    internal string TestStatic_GetIntelligentId(IPropertyConfiguration propertyConfiguration, long id, string extensionLowered, bool? hasIgnoreKeyword, bool? hasDateTimeOriginal) =>
+        GetIntelligentId(propertyConfiguration, id, extensionLowered, hasIgnoreKeyword, hasDateTimeOriginal);
+
+    internal bool TestStatic_NameWithoutExtensionIsPaddedIntelligentIdFormat(IPropertyConfiguration propertyConfiguration, int sortOrderOnlyLengthIndex, string fileNameFirstSegment) =>
+        NameWithoutExtensionIsPaddedIntelligentIdFormat(propertyConfiguration, sortOrderOnlyLengthIndex, fileNameFirstSegment);
+
+    internal string TestStatic_GetPaddedId(IPropertyConfiguration propertyConfiguration, int id, string extensionLowered, bool? hasIgnoreKeyword, bool? hasDateTimeOriginal, int? index) =>
+        GetPaddedId(propertyConfiguration, id, extensionLowered, hasIgnoreKeyword, hasDateTimeOriginal, index);
+
 }

Shared/Models/Stateless/Methods/IPath.cs

@@ -4,72 +4,95 @@ using View_by_Distance.Shared.Models.Properties;
 namespace View_by_Distance.Shared.Models.Stateless.Methods;
 
 public interface IPath
-{ // ...
+{
 
-    string TestStatic_GetRelativePath(string path, int length) =>
-        GetRelativePath(path, length);
-    static string GetRelativePath(string path, int length) =>
-        XPath.GetRelativePath(path, length, forceExtensionToLower: false);
+    public static byte GetEnum(FilePath filePath) =>
+         XPath.GetEnum(filePath);
 
-    bool TestStatic_DeleteEmptyDirectories(string rootDirectory) =>
-        DeleteEmptyDirectories(rootDirectory);
-    static bool DeleteEmptyDirectories(string rootDirectory) =>
-        XPath.DeleteEmptyDirectories(rootDirectory);
-
-    void TestStatic_ChangeDateForEmptyDirectories(string rootDirectory, long ticks) =>
-        ChangeDateForEmptyDirectories(rootDirectory, ticks);
-    static void ChangeDateForEmptyDirectories(string rootDirectory, long ticks) =>
-        XPath.ChangeDateForEmptyDirectories(rootDirectory, ticks);
-
-    void TestStatic_MakeHiddenIfAllItemsAreHidden(string rootDirectory) =>
-        MakeHiddenIfAllItemsAreHidden(rootDirectory);
-    static void MakeHiddenIfAllItemsAreHidden(string rootDirectory) =>
-        XPath.MakeHiddenIfAllItemsAreHidden(rootDirectory);
-
-    void TestStatic_DeleteEmptyDirectories(string rootDirectory, List<string> deletedDirectories) =>
-        DeleteEmptyDirectories(rootDirectory, deletedDirectories);
-    static void DeleteEmptyDirectories(string rootDirectory, List<string> deletedDirectories) =>
-        XPath.DeleteEmptyDirectories(rootDirectory, deletedDirectories);
-    // $dirs = gci "" -directory -recurse | Where { (gci $_.fullName).count -eq 0 } | select -expandproperty FullName $dirs | Foreach-Object { Remove-Item $_ }
-
-    string[] TestStatic_GetDirectoryNames(string directory) =>
-        GetDirectoryNames(directory);
-    static string[] GetDirectoryNames(string directory) =>
-        XPath.GetDirectoryNames(directory).ToArray();
-
-    string[] TestStatic_GetDirectories(string directory) =>
-        GetDirectories(directory);
-    static string[] GetDirectories(string directory) =>
+    public static string[] GetDirectories(string directory) =>
         XPath.GetDirectories(directory).ToArray();
 
-    string TestStatic_GetRelativePath(string path, int length, bool forceExtensionToLower) =>
-        GetRelativePath(path, length, forceExtensionToLower);
-    static string GetRelativePath(string path, int length, bool forceExtensionToLower) =>
+    public static string[] GetDirectoryNames(string directory) =>
+        XPath.GetDirectoryNames(directory).ToArray();
+
+    public static string GetRelativePath(string path, int length) =>
+        XPath.GetRelativePath(path, length, forceExtensionToLower: false);
+
+    public static bool DeleteEmptyDirectories(string rootDirectory) =>
+        XPath.DeleteEmptyDirectories(rootDirectory);
+
+    public static void MakeHiddenIfAllItemsAreHidden(string rootDirectory) =>
+        XPath.MakeHiddenIfAllItemsAreHidden(rootDirectory);
+
+    public static void CreateDirectories(ReadOnlyCollection<string> directories) =>
+        XPath.CreateDirectories(directories);
+
+    public static void ChangeDateForEmptyDirectories(string rootDirectory, long ticks) =>
+        XPath.ChangeDateForEmptyDirectories(rootDirectory, ticks);
+
+    public static string GetRelativePath(string path, int length, bool forceExtensionToLower) =>
         XPath.GetRelativePath(path, length, forceExtensionToLower);
 
-    bool TestStatic_WriteAllText(string path, string contents, bool updateDateWhenMatches, bool compareBeforeWrite, DateTime? updateToWhenMatches = null) =>
-        WriteAllText(path, contents, updateDateWhenMatches, compareBeforeWrite, updateToWhenMatches);
-    static bool WriteAllText(string path, string contents, bool updateDateWhenMatches, bool compareBeforeWrite, DateTime? updateToWhenMatches = null) =>
-        XPath.WriteAllText(path, contents, updateDateWhenMatches, compareBeforeWrite, updateToWhenMatches);
-
-    (int level, List<string> directories) TestStatic_Get(string rootDirectory, string sourceDirectory) =>
-        Get(rootDirectory, sourceDirectory);
-    static (int level, List<string> directories) Get(string rootDirectory, string sourceDirectory) =>
-        XPath.Get(rootDirectory, sourceDirectory);
-
-    string TestStatic_GetDirectory(string sourceDirectory, int level, string directoryName) =>
-        GetDirectory(sourceDirectory, level, directoryName);
-    static string GetDirectory(string sourceDirectory, int level, string directoryName) =>
+    public static string GetDirectory(string sourceDirectory, int level, string directoryName) =>
         XPath.GetDirectory(sourceDirectory, level, directoryName);
 
-    (string, int) TestStatic_GetDirectoryNameAndIndex(IPropertyConfiguration propertyConfiguration, FilePath filePath) =>
-        GetDirectoryNameAndIndex(propertyConfiguration, filePath);
-    static (string, int) GetDirectoryNameAndIndex(IPropertyConfiguration propertyConfiguration, FilePath filePath) =>
-        XPath.GetDirectoryNameAndIndex(propertyConfiguration, filePath);
+    public static void DeleteEmptyDirectories(string rootDirectory, List<string> deletedDirectories) =>
+        XPath.DeleteEmptyDirectories(rootDirectory, deletedDirectories);
+    public static (int level, List<string> directories) Get(string rootDirectory, string sourceDirectory) =>
+        XPath.Get(rootDirectory, sourceDirectory);
 
-    ReadOnlyDictionary<string, ReadOnlyCollection<string>> TestStatic_GetKeyValuePairs(IPropertyConfiguration propertyConfiguration, string? resultsFullGroupDirectory, string[]? jsonGroups) =>
-        GetKeyValuePairs(propertyConfiguration, resultsFullGroupDirectory, jsonGroups);
-    static ReadOnlyDictionary<string, ReadOnlyCollection<string>> GetKeyValuePairs(IPropertyConfiguration propertyConfiguration, string? resultsFullGroupDirectory, string[]? jsonGroups) =>
+    public static CombinedEnumAndIndex GetCombinedEnumAndIndex(IPropertyConfiguration propertyConfiguration, FilePath filePath) =>
+        XPath.GetCombinedEnumAndIndex(propertyConfiguration, filePath);
+
+    public static bool WriteAllText(string path, string contents, bool updateDateWhenMatches, bool compareBeforeWrite, DateTime? updateToWhenMatches = null) =>
+        XPath.WriteAllText(path, contents, updateDateWhenMatches, compareBeforeWrite, updateToWhenMatches);
+
+    public static ReadOnlyDictionary<string, ReadOnlyDictionary<byte, ReadOnlyCollection<string>>> GetKeyValuePairs(IPropertyConfiguration propertyConfiguration, string? resultsFullGroupDirectory, string[]? jsonGroups) =>
         XPath.GetKeyValuePairs(propertyConfiguration, resultsFullGroupDirectory, jsonGroups);
 
+    internal byte TestStatic_GetEnum(FilePath filePath) =>
+        GetEnum(filePath);
+
+    internal string[] TestStatic_GetDirectories(string directory) =>
+        GetDirectories(directory);
+
+    internal string[] TestStatic_GetDirectoryNames(string directory) =>
+        GetDirectoryNames(directory);
+
+    internal string TestStatic_GetRelativePath(string path, int length) =>
+        GetRelativePath(path, length);
+
+    internal bool TestStatic_DeleteEmptyDirectories(string rootDirectory) =>
+        DeleteEmptyDirectories(rootDirectory);
+
+    internal void TestStatic_MakeHiddenIfAllItemsAreHidden(string rootDirectory) =>
+        MakeHiddenIfAllItemsAreHidden(rootDirectory);
+
+    internal void TestStatic_CreateDirectories(ReadOnlyCollection<string> directories) =>
+        CreateDirectories(directories);
+
+    internal void TestStatic_ChangeDateForEmptyDirectories(string rootDirectory, long ticks) =>
+        ChangeDateForEmptyDirectories(rootDirectory, ticks);
+
+    internal string TestStatic_GetRelativePath(string path, int length, bool forceExtensionToLower) =>
+        GetRelativePath(path, length, forceExtensionToLower);
+
+    internal string TestStatic_GetDirectory(string sourceDirectory, int level, string directoryName) =>
+        GetDirectory(sourceDirectory, level, directoryName);
+
+    internal void TestStatic_DeleteEmptyDirectories(string rootDirectory, List<string> deletedDirectories) =>
+        DeleteEmptyDirectories(rootDirectory, deletedDirectories);
+
+    internal (int level, List<string> directories) TestStatic_Get(string rootDirectory, string sourceDirectory) =>
+        Get(rootDirectory, sourceDirectory);
+
+    internal CombinedEnumAndIndex TestStatic_GetCombinedEnumAndIndex(IPropertyConfiguration propertyConfiguration, FilePath filePath) =>
+        GetCombinedEnumAndIndex(propertyConfiguration, filePath);
+
+    internal bool TestStatic_WriteAllText(string path, string contents, bool updateDateWhenMatches, bool compareBeforeWrite, DateTime? updateToWhenMatches = null) =>
+        WriteAllText(path, contents, updateDateWhenMatches, compareBeforeWrite, updateToWhenMatches);
+
+    internal ReadOnlyDictionary<string, ReadOnlyDictionary<byte, ReadOnlyCollection<string>>> TestStatic_GetKeyValuePairs(IPropertyConfiguration propertyConfiguration, string? resultsFullGroupDirectory, string[]? jsonGroups) =>
+        GetKeyValuePairs(propertyConfiguration, resultsFullGroupDirectory, jsonGroups);
+
 }

Shared/Models/Stateless/Methods/IProperty.cs

@@ -23,11 +23,6 @@ public interface IProperty
     static string GetDiffRootDirectory(string diffPropertyDirectory) =>
         Property.GetDiffRootDirectory(diffPropertyDirectory);
 
-    bool TestStatic_Any(Models.Container[] propertyHolderCollections) =>
-        Any(propertyHolderCollections);
-    static bool Any(Models.Container[] propertyHolderCollections) =>
-        Property.Any(propertyHolderCollections);
-
     (bool?, string[]) TestStatic_IsWrongYear(string[] segments, string year) =>
         IsWrongYear(segments, year);
     static (bool?, string[]) IsWrongYear(string[] segments, string year) =>
@@ -43,21 +38,6 @@ public interface IProperty
     static List<DateTime> GetDateTimes(Models.Property property) =>
         Property.GetDateTimes(property.CreationTime, property.LastWriteTime, property.DateTime, property.DateTimeDigitized, property.DateTimeFromName, property.DateTimeOriginal, property.GPSDateStamp);
 
-    double TestStatic_GetStandardDeviation(List<long> values, double average) =>
-        GetStandardDeviation(values, average);
-    static double GetStandardDeviation(List<long> values, double average) =>
-        Property.GetStandardDeviation(values, average);
-
-    TimeSpan TestStatic_GetThreeStandardDeviationHigh(int minimum, Models.Container container) =>
-        GetThreeStandardDeviationHigh(minimum, container);
-    static TimeSpan GetThreeStandardDeviationHigh(int minimum, Models.Container container) =>
-        Property.GetThreeStandardDeviationHigh(minimum, container);
-
-    (int, List<DateTime>, List<Models.Item>) TestStatic_Get(Models.Container container, TimeSpan threeStandardDeviationHigh, int i) =>
-        Get(container, threeStandardDeviationHigh, i);
-    static (int, List<DateTime>, List<Models.Item>) Get(Models.Container container, TimeSpan threeStandardDeviationHigh, int i) =>
-        Property.Get(container, threeStandardDeviationHigh, i);
-
     List<DateTime> TestStatic_GetDateTimes(DateTime creationTime, DateTime lastWriteTime, DateTime? dateTime, DateTime? dateTimeDigitized, DateTime? dateTimeFromName, DateTime? dateTimeOriginal, DateTime? gpsDateStamp) =>
         GetDateTimes(creationTime, lastWriteTime, dateTime, dateTimeDigitized, dateTimeFromName, dateTimeOriginal, gpsDateStamp);
     static List<DateTime> GetDateTimes(DateTime creationTime, DateTime lastWriteTime, DateTime? dateTime, DateTime? dateTimeDigitized, DateTime? dateTimeFromName, DateTime? dateTimeOriginal, DateTime? gpsDateStamp) =>

Shared/Models/Stateless/Methods/Id.cs

@@ -5,81 +5,6 @@ namespace View_by_Distance.Shared.Models.Stateless.Methods;
 internal abstract class Id
 {
 
-    internal static bool NameWithoutExtensionIsIdFormat(Properties.IPropertyConfiguration propertyConfiguration, string fileNameWithoutExtension)
-    {
-        bool result;
-        if (fileNameWithoutExtension.Length < 5 || fileNameWithoutExtension.Length > propertyConfiguration.IntMinValueLength)
-            result = false;
-        else
-        {
-            bool skipOneAllAreNumbers = fileNameWithoutExtension[1..].All(char.IsNumber);
-            result = (skipOneAllAreNumbers && fileNameWithoutExtension[0] == '-') || (skipOneAllAreNumbers && char.IsNumber(fileNameWithoutExtension[0]));
-        }
-        return result;
-    }
-
-    internal static int GetId(Properties.IPropertyConfiguration propertyConfiguration, string intelligentId)
-    {
-        int result;
-        StringBuilder results = new();
-        if (propertyConfiguration.IntMinValueLength < (propertyConfiguration.ResultAllInOneSubdirectoryLength + 2))
-            throw new NotSupportedException();
-        for (int i = intelligentId.Length - (propertyConfiguration.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 string GetIntelligentId(Properties.IPropertyConfiguration propertyConfiguration, long id, bool? hasIgnoreKeyword, bool? hasDateTimeOriginal)
-    {
-        string result;
-        StringBuilder stringBuilder = new();
-        if (propertyConfiguration.IntMinValueLength < (propertyConfiguration.ResultAllInOneSubdirectoryLength + 2))
-            throw new NotSupportedException();
-        if (hasDateTimeOriginal is null)
-        { }
-        int key;
-        string value;
-        List<char> resultAllInOneSubdirectoryChars = [];
-        if (id > -1)
-        {
-            key = hasIgnoreKeyword is not null && hasIgnoreKeyword.Value ? 8 : 9;
-            value = id.ToString().PadLeft(propertyConfiguration.IntMinValueLength, '0');
-        }
-        else
-        {
-            key = hasIgnoreKeyword is not null && hasIgnoreKeyword.Value ? 2 : 1;
-            value = id.ToString()[1..].PadLeft(propertyConfiguration.IntMinValueLength, '0');
-        }
-        for (int i = value.Length - propertyConfiguration.ResultAllInOneSubdirectoryLength - 1; i > -1; i--)
-            _ = stringBuilder.Append(value[i]);
-        for (int i = value.Length - propertyConfiguration.ResultAllInOneSubdirectoryLength; i < value.Length; i++)
-            resultAllInOneSubdirectoryChars.Add(value[i]);
-        result = $"{stringBuilder}{string.Join(string.Empty, resultAllInOneSubdirectoryChars)}{key}";
-        return result;
-    }
-
-    internal static string GetPaddedId(Properties.IPropertyConfiguration propertyConfiguration, int id, bool? hasIgnoreKeyword, bool? hasDateTimeOriginal, int? index)
-    {
-        string result;
-        if (propertyConfiguration.Offset < 0)
-            result = Guid.NewGuid().ToString();
-        else
-        {
-            string intelligentId = GetIntelligentId(propertyConfiguration, id, hasIgnoreKeyword, hasDateTimeOriginal);
-            int check = GetId(propertyConfiguration, intelligentId);
-            if (check != id)
-                throw new NotSupportedException();
-            result = index is null || propertyConfiguration.Offset == IId.DeterministicHashCode ? intelligentId : $"{propertyConfiguration.Offset + index}{intelligentId}";
-        }
-        return result;
-    }
-
     internal static int GetDeterministicHashCode(byte[] value)
     {
         int result;
@@ -99,4 +24,97 @@ internal abstract class Id
         return result;
     }
 
+    internal static byte GetHasIgnoreKeyword(FilePath filePath) =>
+        (byte)(filePath.Id > -1 ? 8 : 2);
+
+    internal static int GetId(Properties.IPropertyConfiguration propertyConfiguration, string intelligentId)
+    {
+        int result;
+        StringBuilder results = new();
+        if (propertyConfiguration.IntMinValueLength < (propertyConfiguration.ResultAllInOneSubdirectoryLength + 2))
+            throw new NotSupportedException();
+        for (int i = intelligentId.Length - (propertyConfiguration.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 '0' or '1' or '2' or '3' or '4')
+            result *= -1;
+        else if (intelligentId[^1] is not '9' and not '8' and not '7' and not '6' and not '5')
+            throw new NotSupportedException();
+        return result;
+    }
+
+    internal static byte GetHasDateTimeOriginal(Properties.IPropertyConfiguration propertyConfiguration, FilePath filePath) =>
+        (byte)(!propertyConfiguration.ValidVideoFormatExtensions.Contains(filePath.ExtensionLowered) ? filePath.Id > -1 ? 9 : 1 : filePath.Id > -1 ? 6 : 4);
+
+    internal static byte GetMissingDateTimeOriginal(Properties.IPropertyConfiguration propertyConfiguration, FilePath filePath) =>
+        (byte)(!propertyConfiguration.ValidVideoFormatExtensions.Contains(filePath.ExtensionLowered) ? filePath.Id > -1 ? 7 : 3 : filePath.Id > -1 ? 5 : 0);
+
+    internal static bool NameWithoutExtensionIsIdFormat(Properties.IPropertyConfiguration propertyConfiguration, string fileNameWithoutExtension)
+    {
+        bool result;
+        if (fileNameWithoutExtension.Length < 5 || fileNameWithoutExtension.Length > propertyConfiguration.IntMinValueLength)
+            result = false;
+        else
+        {
+            bool skipOneAllAreNumbers = fileNameWithoutExtension[1..].All(char.IsNumber);
+            result = (skipOneAllAreNumbers && fileNameWithoutExtension[0] == '-') || (skipOneAllAreNumbers && char.IsNumber(fileNameWithoutExtension[0]));
+        }
+        return result;
+    }
+
+    internal static string GetIntelligentId(Properties.IPropertyConfiguration propertyConfiguration, long id, string extensionLowered, bool? hasIgnoreKeyword, bool? hasDateTimeOriginal)
+    {
+        string result;
+        StringBuilder stringBuilder = new();
+        if (propertyConfiguration.IntMinValueLength < (propertyConfiguration.ResultAllInOneSubdirectoryLength + 2))
+            throw new NotSupportedException();
+        int key;
+        string value;
+        List<char> resultAllInOneSubdirectoryChars = [];
+        if (hasDateTimeOriginal is null)
+        {
+            key = 0;
+            value = id.ToString().PadLeft(propertyConfiguration.IntMinValueLength, '0');
+        }
+        else if (id > -1)
+        {
+            if (!propertyConfiguration.ValidVideoFormatExtensions.Contains(extensionLowered))
+                key = hasIgnoreKeyword is not null && hasIgnoreKeyword.Value ? 8 : hasDateTimeOriginal.Value ? 9 : 7;
+            else
+                key = hasIgnoreKeyword is not null && hasIgnoreKeyword.Value ? throw new NotImplementedException() : hasDateTimeOriginal.Value ? 6 : 5;
+            value = id.ToString().PadLeft(propertyConfiguration.IntMinValueLength, '0');
+        }
+        else
+        {
+            if (!propertyConfiguration.ValidVideoFormatExtensions.Contains(extensionLowered))
+                key = hasIgnoreKeyword is not null && hasIgnoreKeyword.Value ? 2 : hasDateTimeOriginal.Value ? 1 : 3;
+            else
+                key = hasIgnoreKeyword is not null && hasIgnoreKeyword.Value ? throw new NotImplementedException() : hasDateTimeOriginal.Value ? 4 : 0;
+            value = id.ToString()[1..].PadLeft(propertyConfiguration.IntMinValueLength, '0');
+        }
+        for (int i = value.Length - propertyConfiguration.ResultAllInOneSubdirectoryLength - 1; i > -1; i--)
+            _ = stringBuilder.Append(value[i]);
+        for (int i = value.Length - propertyConfiguration.ResultAllInOneSubdirectoryLength; i < value.Length; i++)
+            resultAllInOneSubdirectoryChars.Add(value[i]);
+        result = $"{stringBuilder}{string.Join(string.Empty, resultAllInOneSubdirectoryChars)}{key}";
+        return result;
+    }
+
+    internal static string GetPaddedId(Properties.IPropertyConfiguration propertyConfiguration, int id, string extensionLowered, bool? hasIgnoreKeyword, bool? hasDateTimeOriginal, int? index)
+    {
+        string result;
+        if (propertyConfiguration.Offset < 0)
+            result = Guid.NewGuid().ToString();
+        else
+        {
+            string intelligentId = GetIntelligentId(propertyConfiguration, id, extensionLowered, hasIgnoreKeyword, hasDateTimeOriginal);
+            int check = GetId(propertyConfiguration, intelligentId);
+            if (check != id)
+                throw new NotSupportedException();
+            result = index is null || propertyConfiguration.Offset == IId.DeterministicHashCode ? intelligentId : $"{propertyConfiguration.Offset + index}{intelligentId}";
+        }
+        return result;
+    }
+
 }

Shared/Models/Stateless/Methods/MetaBase.cs

@@ -0,0 +1,67 @@
+using System.Collections.ObjectModel;
+
+namespace View_by_Distance.Shared.Models.Stateless.Methods;
+
+internal static class MetaBase
+{
+
+    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 results.AsReadOnly();
+    }
+
+}

Shared/Models/Stateless/Methods/MetadataFileCollection.cs

@@ -3,7 +3,7 @@ namespace View_by_Distance.Shared.Models.Stateless.Methods;
 internal abstract class MetadataFileCollection
 {
 
-    internal static Dictionary<string, List<KeyValuePair<string, string>>> GetDefaultValue() => new(); // {{1}}SingletonValue
+    internal static Dictionary<string, List<KeyValuePair<string, string>>> GetDefaultValue() => []; // {{1}}SingletonValue
 
     // ...
 

Shared/Models/Stateless/Methods/Property.cs

@@ -75,13 +75,15 @@ internal abstract class Property
             for (int i = 0; i < int.MaxValue; i++)
             {
                 check = Path.GetDirectoryName(check);
-                if (string.IsNullOrEmpty(check) || check == pathRoot)
+                if (string.IsNullOrEmpty(check))
                     break;
                 directoryName = Path.GetFileName(check);
                 directorySegments = directoryName.Split(' ');
                 (result, results) = IsWrongYear(directorySegments, year);
                 if (result is not null)
                     break;
+                if (check == pathRoot)
+                    break;
             }
             if (result is not null && !result.Value)
                 break;
@@ -169,112 +171,4 @@ internal abstract class Property
         return result;
     }
 
-    internal static double GetStandardDeviation(List<long> values, double average)
-    {
-        double result = 0;
-        if (values.Count == 0)
-            throw new Exception("Collection must have at least one value!");
-        double sum = values.Sum(l => (l - average) * (l - average));
-        result = Math.Sqrt(sum / values.Count);
-        return result;
-    }
-
-    private static long GetThreeStandardDeviationHigh(ref List<long> ticksCollection, long min)
-    {
-        long result;
-        ticksCollection = (from l in ticksCollection select l - min).ToList();
-        double sum = ticksCollection.Sum();
-        double average = sum / ticksCollection.Count;
-        double standardDeviation = GetStandardDeviation(ticksCollection, average);
-        result = (long)Math.Ceiling(average + min + (standardDeviation * 3));
-        return result;
-    }
-
-    internal static TimeSpan GetThreeStandardDeviationHigh(int minimum, Models.Container container)
-    {
-        TimeSpan result;
-        DateTime? minimumDateTime;
-        List<long> ticksCollection = [];
-        foreach (Models.Item item in container.Items)
-        {
-            if (item.Property is null)
-                continue;
-            minimumDateTime = GetMinimumDateTime(item.Property);
-            if (minimumDateTime is null)
-                continue;
-            ticksCollection.Add(minimumDateTime.Value.Ticks);
-        }
-        long threeStandardDeviationHigh;
-        long min;
-        if (ticksCollection.Count == 0)
-            min = 0;
-        else
-            min = ticksCollection.Min();
-        if (ticksCollection.Count < minimum)
-            threeStandardDeviationHigh = long.MaxValue;
-        else
-            threeStandardDeviationHigh = GetThreeStandardDeviationHigh(ref ticksCollection, min);
-        result = new TimeSpan(threeStandardDeviationHigh - min);
-        return result;
-    }
-
-    internal static (int, List<DateTime>, List<Models.Item>) Get(Models.Container container, TimeSpan threeStandardDeviationHigh, int i)
-    {
-        List<Models.Item> results = [];
-        int j = i;
-        long? ticks;
-        Models.Item item;
-        TimeSpan timeSpan;
-        Models.Item nextItem;
-        DateTime? minimumDateTime;
-        DateTime? nextMinimumDateTime;
-        List<DateTime> dateTimes = [];
-        for (; j < container.Items.Count; j++)
-        {
-            ticks = null;
-            item = container.Items[j];
-            if (item.Property is null)
-                continue;
-            minimumDateTime = GetMinimumDateTime(item.Property);
-            if (minimumDateTime is null)
-                continue;
-            for (int k = j + 1; k < container.Items.Count; k++)
-            {
-                nextItem = container.Items[k];
-                if (nextItem.Property is null)
-                    continue;
-                nextMinimumDateTime = GetMinimumDateTime(nextItem.Property);
-                if (nextMinimumDateTime is null)
-                    continue;
-                ticks = nextMinimumDateTime.Value.Ticks;
-                break;
-            }
-            results.Add(item);
-            dateTimes.Add(minimumDateTime.Value);
-            if (ticks.HasValue)
-            {
-                timeSpan = new(ticks.Value - minimumDateTime.Value.Ticks);
-                if (timeSpan > threeStandardDeviationHigh)
-                    break;
-            }
-        }
-        return new(j, dateTimes, results);
-    }
-
-    internal static bool Any(Models.Container[] containers)
-    {
-        bool result = false;
-        foreach (Models.Container container in containers)
-        {
-            if (container.Items.Count == 0)
-                continue;
-            if ((from l in container.Items where l.Any() select true).Any())
-            {
-                result = true;
-                break;
-            }
-        }
-        return result;
-    }
-
 }

Shared/Models/Stateless/Methods/XDate.cs

@@ -0,0 +1,252 @@
+using System.Collections.ObjectModel;
+using System.Globalization;
+using System.Text;
+
+namespace View_by_Distance.Shared.Models.Stateless.Methods;
+
+internal abstract class XDate
+{
+
+    internal static DateTime GetMinimum(ExifDirectory exifDirectory)
+    {
+        DateTime result;
+        ReadOnlyCollection<DateTime> results = GetDateTimes(exifDirectory);
+        result = results.Count == 0 ? DateTime.MinValue : results.Min();
+        return result;
+    }
+
+    private static ReadOnlyCollection<DateTime> GetDateTimes(ExifDirectory exifDirectory)
+    {
+        List<DateTime> results = [];
+        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.FilePath.Name);
+            DateTime? dateTime = GetDateTimeFromName(fileNameWithoutExtension);
+            if (dateTime is not null)
+                results.Add(dateTime.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);
+            }
+        }
+        return results.AsReadOnly();
+    }
+
+    private static DateTime? GetDateTimeFromName(string fileNameWithoutExtension)
+    {
+        DateTime? result = null;
+        int length;
+        string format;
+        string fullFormat;
+        StringBuilder value = new();
+        const string ticksExample = "##################";
+        string[][] dateFormats =
+        [
+            [string.Empty, "yyyyMMdd_HHmmss", string.Empty],
+            [string.Empty, "yyyyMMddHHmmssfff", string.Empty],
+            [string.Empty, "yyyyMMdd_", ticksExample],
+            [string.Empty, "yyyy-MM-dd_", ticksExample],
+            [string.Empty, "yyyy-MM-dd.", ticksExample],
+            // [string.Empty, "yyyy-MM-dd.", $"{ticksExample}.{fileHolder.Length}"],
+            [string.Empty, "yyyy-MM-dd HH.mm.ss", string.Empty],
+            [string.Empty, "yyyyMMdd_HHmmss", "_LLS"],
+            [string.Empty, "yyyyMMdd_HHmmss", "_HDR"],
+            ["WIN_", "yyyyMMdd_HH_mm_ss", "_Pro"],
+            ["IMG_", "yyyyMMdd_HHmmss", string.Empty],
+            ["IMG#####-", "yyyyMMdd-HHmm", string.Empty],
+            ["CameraZOOM-", "yyyyMMddHHmmss", string.Empty],
+            ["VideoCapture_", "yyyyMMdd-HHmmss ", string.Empty]
+        ];
+        foreach (string[] dateFormat in dateFormats)
+        {
+            _ = value.Clear();
+            if (dateFormat.Length != 3)
+                throw new Exception();
+            fullFormat = string.Join(string.Empty, dateFormat);
+            if (fileNameWithoutExtension.Length != fullFormat.Length)
+                continue;
+            format = dateFormat[1];
+            length = dateFormat[0].Length + dateFormat[1].Length;
+            for (int i = dateFormat[0].Length; i < length; i++)
+                _ = value.Append(fileNameWithoutExtension[i]);
+            if (value.Length != format.Length)
+                continue;
+            if (DateTime.TryParseExact(value.ToString(), format, CultureInfo.InvariantCulture, DateTimeStyles.None, out DateTime checkDateTime))
+            {
+                if (fileNameWithoutExtension.Length < ticksExample.Length || !long.TryParse(fileNameWithoutExtension[^ticksExample.Length..], out long ticks))
+                    result = checkDateTime;
+                else
+                    result = new DateTime(ticks);
+                break;
+            }
+        }
+        return result;
+    }
+
+    internal static (int Season, string seasonName) GetSeason(int dayOfYear)
+    {
+        (int Season, string seasonName) result = dayOfYear switch
+        {
+            < 78 => new(0, "Winter"),
+            < 124 => new(1, "Spring"),
+            < 171 => new(2, "Spring"),
+            < 217 => new(3, "Summer"),
+            < 264 => new(4, "Summer"),
+            < 309 => new(5, "Fall"),
+            < 354 => new(6, "Fall"),
+            _ => new(7, "Winter")
+        };
+        return result;
+    }
+
+    internal static DateTime? GetDateTimeOriginal(ExifDirectory exifDirectory)
+    {
+        DateTime? result;
+        List<DateTime> results = [];
+        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;
+    }
+
+    internal static (bool?, string[]) IsWrongYear(DirectoryInfo directoryInfo, FilePath filePath, ExifDirectory exifDirectory)
+    {
+        string[] results = [];
+        bool? result = null;
+        string year;
+        string directoryName;
+        string[] directorySegments;
+        List<DateTime> collection = [];
+        string? check = Path.GetFullPath(filePath.FullName);
+        DateTime? dateTimeOriginal = GetDateTimeOriginal(exifDirectory);
+        if (dateTimeOriginal is not null)
+            collection.Add(dateTimeOriginal.Value);
+        else
+        {
+            ReadOnlyCollection<DateTime> dateTimes = GetDateTimes(exifDirectory);
+            foreach (DateTime dateTime in dateTimes)
+                collection.Add(dateTime);
+        }
+        foreach (DateTime dateTime in collection)
+        {
+            year = dateTime.ToString("yyyy");
+            for (int i = 0; i < int.MaxValue; i++)
+            {
+                check = Path.GetDirectoryName(check);
+                if (string.IsNullOrEmpty(check))
+                    break;
+                directoryName = Path.GetFileName(check);
+                directorySegments = directoryName.Split(' ');
+                (result, results) = IsWrongYear(directorySegments, year);
+                if (result is not null)
+                    break;
+                if (check == directoryInfo.FullName)
+                    break;
+            }
+            if (result is not null && !result.Value)
+                break;
+        }
+        return new(result, results);
+    }
+
+    private static Record IsWrongYear(string[] segments, string year)
+    {
+        Record result;
+        bool? check;
+        string[] results = (
+            from l
+            in segments
+            where l?.Length > 2
+            && (
+                l[..2] is "18" or "19" or "20"
+            || (l.Length == 5 && l.Substring(1, 2) is "18" or "19" or "20" && (l[0] is '~' or '=' or '-' or '^' or '#'))
+            || (l.Length == 6 && l[..2] is "18" or "19" or "20" && l[4] == '.')
+            || (l.Length == 7 && l.Substring(1, 2) is "18" or "19" or "20" && l[5] == '.')
+            )
+            select l
+        ).ToArray();
+        string[] matches = (
+            from l
+            in results
+            where l == year
+            || (l.Length == 5 && l.Substring(1, 4) == year && (l[0] is '~' or '=' or '-' or '^' or '#'))
+            || (l.Length == 6 && l[..4] == year && l[4] == '.')
+            || (l.Length == 7 && l.Substring(1, 4) == year && l[5] == '.')
+            select l
+        ).ToArray();
+        if (results.Length == 0)
+            check = null;
+        else
+            check = matches.Length == 0;
+        result = new(check, results);
+        return result;
+    }
+
+    private record Record(bool? IsWrongYear, string[] Years);
+
+}

Shared/Models/Stateless/Methods/XDirectory.cs

@@ -5,265 +5,6 @@ namespace View_by_Distance.Shared.Models.Stateless.Methods;
 internal abstract partial class XDirectory
 {
 
-    private static int GetCeilingAverage(List<string[]> fileCollection)
-    {
-        List<int> counts = [];
-        foreach (string[] files in fileCollection)
-            counts.Add(files.Length);
-        int average = (int)Math.Ceiling(counts.Average());
-        return average;
-    }
-
-    private static List<string[]> GetFilesCollection(List<string[]> fileCollection, int ceilingAverage)
-    {
-        List<string[]> results = [];
-        foreach (string[] files in fileCollection)
-        {
-            if (files.Length < ceilingAverage)
-                results.Add(files);
-        }
-        foreach (string[] files in fileCollection)
-        {
-            if (files.Length >= ceilingAverage)
-                results.Add(files);
-        }
-        return results;
-    }
-
-    internal static ReadOnlyCollection<string[]> GetFilesCollection(string directory, string directorySearchFilter, string fileSearchFilter, bool useCeilingAverage)
-    {
-        List<string[]> results = [];
-        if (!fileSearchFilter.Contains('*'))
-            fileSearchFilter = string.Concat('*', fileSearchFilter);
-        if (!directorySearchFilter.Contains('*'))
-            directorySearchFilter = string.Concat('*', directorySearchFilter);
-        if (!Directory.Exists(directory))
-            _ = Directory.CreateDirectory(directory);
-        results.Add(Directory.GetFiles(directory, fileSearchFilter, SearchOption.TopDirectoryOnly));
-        string[] directories = Directory.GetDirectories(directory, directorySearchFilter, SearchOption.TopDirectoryOnly);
-        foreach (string innerDirectory in directories)
-        {
-            try
-            { results.Add(Directory.GetFiles(innerDirectory, fileSearchFilter, SearchOption.AllDirectories)); }
-            catch (UnauthorizedAccessException)
-            { continue; }
-        }
-        int ceilingAverage = directory[^1] == '_' || results.Count == 0 ? 0 : GetCeilingAverage(results);
-        if (useCeilingAverage)
-            results = GetFilesCollection(results, ceilingAverage);
-        return new(results);
-    }
-
-    internal static ReadOnlyCollection<ReadOnlyCollection<FilePath>> GetFilePathCollections(Properties.IPropertyConfiguration propertyConfiguration, string directorySearchFilter, string fileSearchFilter, string directory, bool useCeilingAverage)
-    {
-        ReadOnlyCollection<ReadOnlyCollection<FilePath>> results;
-        ReadOnlyCollection<string[]> filesCollection = GetFilesCollection(directory, directorySearchFilter, fileSearchFilter, useCeilingAverage);
-        results = IDirectory.GetFilePathCollections(propertyConfiguration, filesCollection);
-        return results;
-    }
-
-    internal static IReadOnlyDictionary<string, List<string>> GetFilesKeyValuePairs(ReadOnlyCollection<string[]> filesCollection)
-    {
-        Dictionary<string, List<string>> results = [];
-        string fileName;
-        List<string>? collection;
-        foreach (string[] files in filesCollection)
-        {
-            foreach (string file in files)
-            {
-                fileName = Path.GetFileName(file);
-                if (!results.TryGetValue(fileName, out collection))
-                {
-                    results.Add(fileName, []);
-                    if (!results.TryGetValue(fileName, out collection))
-                        throw new Exception();
-                }
-                collection.Add(file);
-            }
-        }
-        return results;
-    }
-
-    internal static IReadOnlyDictionary<string, List<string>> GetFilesKeyValuePairs(ReadOnlyCollection<ReadOnlyCollection<FilePath>> filePathsCollection)
-    {
-        Dictionary<string, List<string>> results = [];
-        List<string>? collection;
-        foreach (ReadOnlyCollection<FilePath> filePaths in filePathsCollection)
-        {
-            foreach (FilePath filePath in filePaths)
-            {
-                if (!results.TryGetValue(filePath.Name, out collection))
-                {
-                    results.Add(filePath.Name, []);
-                    if (!results.TryGetValue(filePath.Name, out collection))
-                        throw new Exception();
-                }
-                collection.Add(filePath.FullName);
-            }
-        }
-        return results;
-    }
-
-    internal static int LookForAbandoned(ReadOnlyCollection<string[]> jsonFilesCollection, IReadOnlyDictionary<string, List<string>> fileNamesToFiles, string extension)
-    {
-        string fileName;
-        string fileNameWith;
-        List<string>? collection;
-        string fileNameUpperExtension;
-        int length = extension.Length;
-        List<string> renameCollection = [];
-        foreach (string[] files in jsonFilesCollection)
-        {
-            foreach (string file in files)
-            {
-                fileNameWith = Path.GetFileName(file);
-                if (fileNameWith.Length < length || !fileNameWith.EndsWith(extension))
-                    throw new Exception();
-                fileName = fileNameWith[..^length];
-                if (!fileNamesToFiles.TryGetValue(fileName, out collection))
-                {
-                    fileNameUpperExtension = string.Concat(Path.GetFileNameWithoutExtension(fileName), Path.GetExtension(fileName).ToUpper());
-                    if (fileName == fileNameUpperExtension || !fileNamesToFiles.TryGetValue(fileNameUpperExtension, out collection))
-                        renameCollection.Add(file);
-                }
-            }
-        }
-        if (renameCollection.Count > 0)
-            IDirectory.MoveFiles(renameCollection, "{}", "{abd}");
-        return renameCollection.Count;
-    }
-
-    private static bool GetIsNotUniqueAndNeedsReview(string file, List<string> collection)
-    {
-        bool result = false;
-        FileInfo possibleFileInfo;
-        FileInfo fileInfo = new(file);
-        foreach (string possible in collection)
-        {
-            if (possible == file)
-                continue;
-            possibleFileInfo = new(possible);
-            if (possibleFileInfo.LastWriteTime != fileInfo.LastWriteTime)
-                File.SetLastWriteTime(file, new DateTime[] { possibleFileInfo.LastWriteTime, fileInfo.LastWriteTime }.Max());
-            if (possibleFileInfo.LastWriteTime == fileInfo.LastWriteTime && possibleFileInfo.Length == fileInfo.Length)
-                continue;
-            if (!result)
-                result = true;
-        }
-        return result;
-    }
-
-    private static string? GetMatch(string file, List<string> collection)
-    {
-        string? result = null;
-        FileInfo possibleFileInfo;
-        List<long> lengths = [];
-        List<string> matches = [];
-        FileInfo fileInfo = new(file);
-        List<DateTime> creationTimes = [];
-        foreach (string possible in collection)
-        {
-            possibleFileInfo = new(possible);
-            lengths.Add(possibleFileInfo.Length);
-            creationTimes.Add(possibleFileInfo.CreationTime);
-            if (possibleFileInfo.CreationTime != fileInfo.LastWriteTime)
-                continue;
-            matches.Add(possible);
-        }
-        if (matches.Count == 1 || (matches.Count > 0 && lengths.Distinct().Count() == 1 && creationTimes.Distinct().Count() == 1))
-            result = matches.First();
-        return result;
-    }
-
-    internal static List<FilePair> GetFiles(Properties.IPropertyConfiguration propertyConfiguration, ReadOnlyCollection<ReadOnlyCollection<FilePath>> filePathsCollection, IReadOnlyDictionary<string, List<string>> fileNamesToFiles, string extension, IReadOnlyDictionary<string, List<string>> compareFileNamesToFiles)
-    {
-        List<FilePair> results = [];
-        string? match;
-        bool uniqueFileName;
-        List<string>? collection;
-        bool? isNotUniqueAndNeedsReview;
-        foreach (ReadOnlyCollection<FilePath> filePaths in filePathsCollection)
-        {
-            foreach (FilePath filePath in filePaths)
-            {
-                isNotUniqueAndNeedsReview = null;
-                if (propertyConfiguration.IgnoreExtensions.Contains(filePath.ExtensionLowered))
-                    continue;
-                if (!fileNamesToFiles.TryGetValue(filePath.Name, out collection))
-                    throw new Exception();
-                uniqueFileName = collection.Count == 1;
-                if (!uniqueFileName)
-                    isNotUniqueAndNeedsReview = GetIsNotUniqueAndNeedsReview(filePath.FullName, collection);
-                if (!compareFileNamesToFiles.TryGetValue(string.Concat(filePath.Name, extension), out collection))
-                    results.Add(new(filePath.FullName, uniqueFileName, isNotUniqueAndNeedsReview, [], null));
-                else
-                {
-                    if (collection.Count == 0)
-                        results.Add(new(filePath.FullName, uniqueFileName, isNotUniqueAndNeedsReview, collection, null));
-                    else if (uniqueFileName && collection.Count == 1)
-                        results.Add(new(filePath.FullName, uniqueFileName, isNotUniqueAndNeedsReview, collection, collection.First()));
-                    else
-                    {
-                        match = GetMatch(filePath.FullName, collection);
-                        results.Add(new(filePath.FullName, uniqueFileName, isNotUniqueAndNeedsReview, collection, match));
-                    }
-                }
-            }
-        }
-        return results;
-    }
-
-    private static void IsNotUniqueLoop(Properties.IPropertyConfiguration propertyConfiguration, string jsonGroupDirectory, string extension, FilePair filePair, List<(string, string)> rename)
-    {
-        int length = propertyConfiguration.RootDirectory.Length;
-        foreach (string path in filePair.Collection)
-        {
-            if (filePair.Match is null || path != filePair.Match)
-                continue;
-            rename.Add(new(path, string.Concat(jsonGroupDirectory, filePair.Path[length..], extension)));
-        }
-    }
-
-    internal static int MaybeMove(Properties.IPropertyConfiguration propertyConfiguration, List<FilePair> filePairs, string jsonGroupDirectory, string extension)
-    {
-        FileInfo? toFileInfo;
-        FileInfo fromFileInfo;
-        string checkDirectory;
-        List<(string, string)> rename = [];
-        foreach (FilePair filePair in filePairs)
-        {
-            if (filePair.IsUnique)
-                continue;
-            IsNotUniqueLoop(propertyConfiguration, jsonGroupDirectory, extension, filePair, rename);
-        }
-        foreach ((string from, string to) in rename)
-        {
-            toFileInfo = null;
-            checkDirectory = to;
-            fromFileInfo = new(from);
-            if (!fromFileInfo.Exists)
-                continue;
-            for (int i = 0; i < int.MaxValue; i++)
-            {
-                toFileInfo = new(checkDirectory);
-                if (toFileInfo.Directory is null)
-                    continue;
-                if (!toFileInfo.Directory.Exists)
-                    _ = Directory.CreateDirectory(toFileInfo.Directory.FullName);
-                if (checkDirectory.Length > 199)
-                    throw new Exception();
-                if (!toFileInfo.Exists)
-                    break;
-                else if (fromFileInfo.Length == toFileInfo.Length && fromFileInfo.LastWriteTime == toFileInfo.LastWriteTime)
-                    checkDirectory = string.Concat(checkDirectory, ".del");
-                else
-                    checkDirectory = string.Concat(checkDirectory, ".j");
-            }
-            File.Move(from, checkDirectory);
-        }
-        return rename.Count;
-    }
-
     internal static void MoveFiles(List<string> files, string find, string replace)
     {
         string checkFile;
@@ -296,18 +37,139 @@ internal abstract partial class XDirectory
         }
     }
 
-    private static FilePath[] GetSortedRecords(ReadOnlyCollection<ReadOnlyCollection<FilePath>> filePathsCollection)
+    internal static List<string> CopyOrMove(List<(FilePath, string)> toDoCollection, bool move, bool moveBack, Action? tick)
     {
-        List<FilePath> results = [];
-        foreach (ReadOnlyCollection<FilePath> filePaths in filePathsCollection)
+        List<string> results = [];
+        FileInfo fileInfo;
+        List<string> distinctExtensions = [];
+        foreach ((FilePath filePath, string to) in toDoCollection)
         {
-            foreach (FilePath filePath in filePaths)
-                results.Add(filePath);
+            tick?.Invoke();
+            fileInfo = new(to);
+            if (fileInfo.Exists)
+            {
+                if (filePath.Length == fileInfo.Length && filePath.LastWriteTicks == fileInfo.LastWriteTime.Ticks)
+                    continue;
+                fileInfo.Delete();
+            }
+            results.Add(filePath.NameWithoutExtension);
+            try
+            {
+                if (!distinctExtensions.Contains(filePath.ExtensionLowered))
+                    distinctExtensions.Add(filePath.ExtensionLowered);
+                if (move || moveBack)
+                    File.Move(filePath.FullName, to);
+                else
+                    File.Copy(filePath.FullName, to);
+            }
+            catch (Exception) { }
         }
-        return (from l in results orderby l.CreationTicks, l.FullName.Length descending select l).ToArray();
+        return results;
     }
 
-    internal static ReadOnlyCollection<ReadOnlyCollection<FilePath>> GetFilePathCollections(Properties.IPropertyConfiguration propertyConfiguration, ReadOnlyCollection<string[]> filesCollection)
+    internal static ReadOnlyCollection<string[]> GetFilesCollection(string directory, string directorySearchFilter, string fileSearchFilter, bool useCeilingAverage)
+    {
+        List<string[]> results = [];
+        string[] files;
+        if (!fileSearchFilter.Contains('*'))
+            fileSearchFilter = string.Concat('*', fileSearchFilter);
+        if (!directorySearchFilter.Contains('*'))
+            directorySearchFilter = string.Concat('*', directorySearchFilter);
+        if (!Directory.Exists(directory))
+            _ = Directory.CreateDirectory(directory);
+        results.Add(Directory.GetFiles(directory, fileSearchFilter, SearchOption.TopDirectoryOnly));
+        string[] directories = Directory.GetDirectories(directory, directorySearchFilter, SearchOption.TopDirectoryOnly);
+        foreach (string innerDirectory in directories)
+        {
+            try
+            {
+                files = Directory.GetFiles(innerDirectory, fileSearchFilter, SearchOption.AllDirectories);
+                if (files.Length == 0)
+                    continue;
+                results.Add(files);
+            }
+            catch (UnauthorizedAccessException)
+            { continue; }
+        }
+        int ceilingAverage = directory[^1] == '_' || results.Count == 0 ? 0 : GetCeilingAverage(results);
+        if (useCeilingAverage)
+            results = GetFilesCollection(results, ceilingAverage);
+        return results.AsReadOnly();
+    }
+
+    private static int GetCeilingAverage(List<string[]> fileCollection)
+    {
+        List<int> counts = [];
+        foreach (string[] files in fileCollection)
+            counts.Add(files.Length);
+        int average = (int)Math.Ceiling(counts.Average());
+        return average;
+    }
+
+    private static List<string[]> GetFilesCollection(List<string[]> fileCollection, int ceilingAverage)
+    {
+        List<string[]> results = [];
+        foreach (string[] files in fileCollection)
+        {
+            if (files.Length < ceilingAverage)
+                results.Add(files);
+        }
+        foreach (string[] files in fileCollection)
+        {
+            if (files.Length >= ceilingAverage)
+                results.Add(files);
+        }
+        return results;
+    }
+
+    internal static int MaybeMove(Properties.IPropertyConfiguration propertyConfiguration, List<Models.FilePair> filePairs, string jsonGroupDirectory, string extension)
+    {
+        FileInfo? toFileInfo;
+        string checkDirectory;
+        List<(FilePath, string)> rename = [];
+        foreach (Models.FilePair filePair in filePairs)
+        {
+            if (filePair.IsUnique)
+                continue;
+            IsNotUniqueLoop(propertyConfiguration, jsonGroupDirectory, extension, filePair, rename);
+        }
+        foreach ((FilePath from, string to) in rename)
+        {
+            toFileInfo = null;
+            checkDirectory = to;
+            for (int i = 0; i < int.MaxValue; i++)
+            {
+                toFileInfo = new(checkDirectory);
+                if (toFileInfo.Directory is null)
+                    continue;
+                if (!toFileInfo.Directory.Exists)
+                    _ = Directory.CreateDirectory(toFileInfo.Directory.FullName);
+                if (checkDirectory.Length > 199)
+                    throw new Exception();
+                if (!toFileInfo.Exists)
+                    break;
+                else if (from.Length == toFileInfo.Length && from.LastWriteTicks == toFileInfo.LastWriteTime.Ticks)
+                    checkDirectory = string.Concat(checkDirectory, ".del");
+                else
+                    checkDirectory = string.Concat(checkDirectory, ".j");
+            }
+            File.Move(from.FullName, checkDirectory);
+        }
+        return rename.Count;
+    }
+
+    private static void IsNotUniqueLoop(Properties.IPropertyConfiguration propertyConfiguration, string jsonGroupDirectory, string extension, Models.FilePair filePair, List<(FilePath, string)> rename)
+    {
+        int length = propertyConfiguration.RootDirectory.Length;
+        foreach (FilePath path in filePair.Collection)
+        {
+            if (filePair.Match is null || path != filePair.Match)
+                continue;
+            rename.Add(new(path, string.Concat(jsonGroupDirectory, filePair.FilePath.FullName[length..], extension)));
+        }
+    }
+
+    internal static ReadOnlyCollection<ReadOnlyCollection<FilePath>> GetFilePathCollections(Properties.IPropertyConfiguration propertyConfiguration, ReadOnlyCollection<string[]> filesCollection, bool useIgnoreExtensions)
     {
         List<ReadOnlyCollection<FilePath>> results = [];
         FilePath filePath;
@@ -319,36 +181,146 @@ internal abstract partial class XDirectory
             foreach (string file in files)
             {
                 fileHolder = IFileHolder.Get(file);
-                if (propertyConfiguration.IgnoreExtensions.Contains(fileHolder.ExtensionLowered))
+                if (!fileHolder.Exists)
+                    continue;
+                if (useIgnoreExtensions && propertyConfiguration.IgnoreExtensions.Contains(fileHolder.ExtensionLowered))
                     continue;
                 filePath = FilePath.Get(propertyConfiguration, fileHolder, index: null);
                 filePaths.Add(filePath);
             }
             results.Add(new(filePaths));
         }
-        return new(results);
+        return results.AsReadOnly();
     }
 
-    internal static (string[], List<(FilePath, string)>) GetToDoCollection(Properties.IPropertyConfiguration propertyConfiguration, bool copyDuplicates, bool ifCanUseId, ReadOnlyCollection<ReadOnlyCollection<FilePath>> filePathsCollection, IReadOnlyDictionary<string, ReadOnlyCollection<string>> fileGroups, Action? tick)
+    internal static ReadOnlyCollection<ReadOnlyCollection<FilePath>> GetFilePathCollections(Properties.IPropertyConfiguration propertyConfiguration, string directorySearchFilter, string fileSearchFilter, string directory, bool useIgnoreExtensions, bool useCeilingAverage)
+    {
+        ReadOnlyCollection<ReadOnlyCollection<FilePath>> results;
+        ReadOnlyCollection<string[]> filesCollection = GetFilesCollection(directory, directorySearchFilter, fileSearchFilter, useCeilingAverage);
+        results = IDirectory.GetFilePathCollections(propertyConfiguration, filesCollection, useIgnoreExtensions);
+        return results;
+    }
+
+    internal static List<Models.FilePair> GetFiles(Properties.IPropertyConfiguration propertyConfiguration, ReadOnlyCollection<ReadOnlyCollection<FilePath>> filePathsCollection, IReadOnlyDictionary<int, List<FilePath>> fileNamesToFiles, IReadOnlyDictionary<int, List<FilePath>> compareFileNamesToFiles)
+    {
+        List<Models.FilePair> results = [];
+        FilePath? match;
+        bool uniqueFileName;
+        List<FilePath>? collection;
+        Models.FilePair filePair;
+        bool? isNotUniqueAndNeedsReview;
+        foreach (ReadOnlyCollection<FilePath> filePaths in filePathsCollection)
+        {
+            foreach (FilePath filePath in filePaths)
+            {
+                if (filePath.Id is null)
+                    continue;
+                isNotUniqueAndNeedsReview = null;
+                if (propertyConfiguration.IgnoreExtensions.Contains(filePath.ExtensionLowered))
+                    continue;
+                if (!fileNamesToFiles.TryGetValue(filePath.Id.Value, out collection))
+                    throw new Exception();
+                uniqueFileName = collection.Count == 1;
+                if (!uniqueFileName)
+                    isNotUniqueAndNeedsReview = GetIsNotUniqueAndNeedsReview(filePath, collection);
+                if (!compareFileNamesToFiles.TryGetValue(filePath.Id.Value, out collection))
+                    filePair = new(FilePath: filePath,
+                                   IsUnique: uniqueFileName,
+                                   IsNotUniqueAndNeedsReview: isNotUniqueAndNeedsReview,
+                                   Collection: [],
+                                   Match: null);
+                else
+                {
+                    if (collection.Count == 0)
+                        filePair = new(FilePath: filePath,
+                                       IsUnique: uniqueFileName,
+                                       IsNotUniqueAndNeedsReview: isNotUniqueAndNeedsReview,
+                                       Collection: collection,
+                                       Match: null);
+                    else if (uniqueFileName && collection.Count == 1)
+                        filePair = new(FilePath: filePath,
+                                       IsUnique: uniqueFileName,
+                                       IsNotUniqueAndNeedsReview: isNotUniqueAndNeedsReview,
+                                       Collection: collection,
+                                       Match: collection.First());
+                    else
+                    {
+                        match = GetMatch(filePath, collection);
+                        filePair = new(FilePath: filePath,
+                                       IsUnique: uniqueFileName,
+                                       IsNotUniqueAndNeedsReview: isNotUniqueAndNeedsReview,
+                                       Collection: collection,
+                                       Match: match);
+                    }
+                }
+                results.Add(filePair);
+            }
+        }
+        return results;
+    }
+
+    private static bool GetIsNotUniqueAndNeedsReview(FilePath filePath, List<FilePath> collection)
+    {
+        bool result = false;
+        long max;
+        foreach (FilePath possible in collection)
+        {
+            if (possible.FullName == filePath.FullName)
+                continue;
+            if (possible.LastWriteTicks != filePath.LastWriteTicks)
+            {
+                max = new long[] { possible.LastWriteTicks, filePath.LastWriteTicks }.Max();
+                File.SetLastWriteTime(filePath.FullName, new DateTime(max));
+            }
+            if (possible.LastWriteTicks == filePath.LastWriteTicks && possible.Length == filePath.Length)
+                continue;
+            if (!result)
+                result = true;
+        }
+        return result;
+    }
+
+    private static FilePath? GetMatch(FilePath filePath, List<FilePath> collection)
+    {
+        FilePath? result = null;
+        List<long> lengths = [];
+        List<FilePath> matches = [];
+        List<long> lastWriteTicks = [];
+        foreach (FilePath possible in collection)
+        {
+            lengths.Add(possible.Length);
+            lastWriteTicks.Add(possible.LastWriteTicks);
+            if (possible.LastWriteTicks != filePath.LastWriteTicks)
+                continue;
+            matches.Add(possible);
+        }
+        if (matches.Count == 1 || (matches.Count > 0 && lengths.Distinct().Count() == 1 && lastWriteTicks.Distinct().Count() == 1))
+            result = matches.First();
+        return result;
+    }
+
+    internal static (string[], List<(FilePath, string)>) GetToDoCollection(Properties.IPropertyConfiguration propertyConfiguration, bool copyDuplicates, bool ifCanUseId, ReadOnlyCollection<ReadOnlyCollection<FilePath>> filePathsCollection, ReadOnlyDictionary<byte, ReadOnlyCollection<string>> fileGroups, Dictionary<int, ExifDirectory>? exifDirectoriesById, Action? tick)
     {
         List<(FilePath, string)> results = [];
-        string key;
         string paddedId;
         string checkFile;
         string directory;
-        FileInfo fileInfo;
         FilePath filePath;
-        int directoryIndex;
+        DateTime? dateTime;
         string paddedIdFile;
         bool wrapped = false;
         string intelligentId;
+        bool? hasIgnoreKeyword;
         bool paddedCheck = false;
+        CombinedEnumAndIndex cei;
         string fileDirectoryName;
+        bool? hasDateTimeOriginal;
         List<int> distinctIds = [];
         List<string> distinct = [];
+        ExifDirectory? exifDirectory;
         Models.FileHolder fileHolder;
+        ReadOnlyCollection<string> keywords;
         List<string> distinctDirectories = [];
-        ReadOnlyCollection<string>? directories;
         FilePath[] sortedRecords = GetSortedRecords(filePathsCollection);
         bool isOffsetDeterministicHashCode = IId.IsOffsetDeterministicHashCode(propertyConfiguration);
         for (int i = 0; i < sortedRecords.Length; i++)
@@ -357,32 +329,51 @@ internal abstract partial class XDirectory
             filePath = sortedRecords[i];
             if (filePath.Name.EndsWith("len") || filePath.ExtensionLowered == ".id" || filePath.ExtensionLowered == ".lsv" || filePath.DirectoryFullPath is null)
                 continue;
-            key = propertyConfiguration.ValidVideoFormatExtensions.Contains(filePath.ExtensionLowered) ? propertyConfiguration.ResultContentCollection : propertyConfiguration.ResultContent;
-            if (!fileGroups.TryGetValue(key, out directories))
-                continue;
-            (_, directoryIndex) = IPath.GetDirectoryNameAndIndex(propertyConfiguration, filePath);
             fileDirectoryName = Path.GetFileName(filePath.DirectoryFullPath);
+            cei = IPath.GetCombinedEnumAndIndex(propertyConfiguration, filePath);
             if (fileDirectoryName.Length < propertyConfiguration.ResultAllInOneSubdirectoryLength + 3 || !filePath.Name.StartsWith(fileDirectoryName))
             {
                 if (wrapped)
                     continue;
-                directory = directories[directoryIndex];
+                if (cei.Enum == 0)
+                    continue;
+                directory = fileGroups[cei.Enum][cei.Index];
             }
             else
             {
                 if (!wrapped)
                     wrapped = true;
-                directory = Path.Combine(directories[directoryIndex], fileDirectoryName);
+                directory = Path.Combine(fileGroups[cei.Enum][cei.Index], fileDirectoryName);
             }
             if (ifCanUseId && filePath.IsIntelligentIdFormat && filePath.Id is not null && filePath.DirectoryFullPath is not null)
             {
-                paddedId = IId.GetPaddedId(propertyConfiguration, filePath.Id.Value, filePath.HasIgnoreKeyword, filePath.HasDateTimeOriginal, i);
+                if (filePath.Id == -748161839 || filePath.FileNameFirstSegment == "740318810015")
+                {
+                    if (filePath.ExtensionLowered == ".mov") // -748161839)
+                    { }
+                }
+                if (exifDirectoriesById is null || !exifDirectoriesById.TryGetValue(filePath.Id.Value, out exifDirectory))
+                {
+                    hasIgnoreKeyword = filePath.HasIgnoreKeyword;
+                    hasDateTimeOriginal = filePath.HasDateTimeOriginal;
+                }
+                else
+                {
+                    dateTime = IDate.GetDateTimeOriginal(exifDirectory);
+                    hasDateTimeOriginal = dateTime is not null;
+                    if (dateTime is null && propertyConfiguration.ValidVideoFormatExtensions.Contains(filePath.ExtensionLowered))
+                        continue;
+                    keywords = MetaBase.GetKeywords(exifDirectory?.ExifBaseDirectories);
+                    hasIgnoreKeyword = propertyConfiguration.IgnoreRulesKeyWords.Any(keywords.Contains);
+                }
+                paddedId = IId.GetPaddedId(propertyConfiguration, filePath.Id.Value, filePath.ExtensionLowered, hasIgnoreKeyword, hasDateTimeOriginal, i);
                 paddedIdFile = Path.Combine(filePath.DirectoryFullPath, $"{paddedId}{filePath.ExtensionLowered}");
                 if (!File.Exists(paddedIdFile))
                 {
                     File.Move(filePath.FullName, paddedIdFile);
-                    fileInfo = new(paddedIdFile);
-                    fileHolder = Models.FileHolder.Get(fileInfo);
+                    fileHolder = IFileHolder.Get(paddedIdFile);
+                    if (!fileHolder.Exists)
+                        continue;
                     filePath = FilePath.Get(propertyConfiguration, fileHolder, index: null);
                     if (!paddedCheck)
                         paddedCheck = true;
@@ -394,14 +385,14 @@ internal abstract partial class XDirectory
             {
                 if (filePath.Id is null)
                     throw new NullReferenceException(nameof(filePath.Id));
-                intelligentId = IId.GetIntelligentId(propertyConfiguration, filePath.Id.Value, filePath.HasIgnoreKeyword, filePath.HasDateTimeOriginal);
+                intelligentId = IId.GetIntelligentId(propertyConfiguration, filePath.Id.Value, filePath.ExtensionLowered, filePath.HasIgnoreKeyword, filePath.HasDateTimeOriginal);
                 if (!isOffsetDeterministicHashCode)
                     checkFile = Path.Combine(directory, $"{intelligentId}{filePath.ExtensionLowered}");
                 else
                 {
                     if (filePath.DirectoryFullPath is null)
                         continue;
-                    paddedId = IId.GetPaddedId(propertyConfiguration, filePath.Id.Value, filePath.HasIgnoreKeyword, filePath.HasDateTimeOriginal, i);
+                    paddedId = IId.GetPaddedId(propertyConfiguration, filePath.Id.Value, filePath.ExtensionLowered, filePath.HasIgnoreKeyword, filePath.HasDateTimeOriginal, i);
                     paddedIdFile = Path.Combine(filePath.DirectoryFullPath, $"{paddedId}{filePath.ExtensionLowered}");
                     if (File.Exists(paddedIdFile))
                         continue;
@@ -419,8 +410,8 @@ internal abstract partial class XDirectory
                     continue;
                 for (int j = 1; j < int.MaxValue; j++)
                 {
-                    fileInfo = new(checkFile);
-                    if (!fileInfo.Exists || filePath.Length == fileInfo.Length && filePath.LastWriteTicks == fileInfo.LastWriteTime.Ticks)
+                    fileHolder = IFileHolder.Get(checkFile);
+                    if (!fileHolder.Exists || fileHolder.LastWriteTime is null || filePath.Length == fileHolder.Length && filePath.LastWriteTicks == fileHolder.LastWriteTime.Value.Ticks)
                         checkFile = Path.Combine(directory, $"{filePath.NameWithoutExtension}.{j}dup{filePath.ExtensionLowered}");
                     else
                         checkFile = Path.Combine(directory, $"{filePath.NameWithoutExtension}.{j}why{filePath.ExtensionLowered}");
@@ -454,31 +445,15 @@ internal abstract partial class XDirectory
         return (distinctDirectories.ToArray(), results);
     }
 
-    internal static List<string> CopyOrMove(List<(FilePath, string)> toDoCollection, bool move, bool moveBack, Action? tick)
+    private static FilePath[] GetSortedRecords(ReadOnlyCollection<ReadOnlyCollection<FilePath>> filePathsCollection)
     {
-        List<string> results = [];
-        FileInfo fileInfo;
-        foreach ((FilePath filePath, string to) in toDoCollection)
+        List<FilePath> results = [];
+        foreach (ReadOnlyCollection<FilePath> filePaths in filePathsCollection)
         {
-            tick?.Invoke();
-            fileInfo = new(to);
-            if (fileInfo.Exists)
-            {
-                if (filePath.Length == fileInfo.Length && filePath.LastWriteTicks == fileInfo.LastWriteTime.Ticks)
-                    continue;
-                fileInfo.Delete();
-            }
-            results.Add(filePath.NameWithoutExtension);
-            try
-            {
-                if (move || moveBack)
-                    File.Move(filePath.FullName, to);
-                else
-                    File.Copy(filePath.FullName, to);
-            }
-            catch (Exception) { }
+            foreach (FilePath filePath in filePaths)
+                results.Add(filePath);
         }
-        return results;
+        return (from l in results orderby l.CreationTicks, l.FullName.Length descending select l).ToArray();
     }
 
 }

Shared/Models/Stateless/Methods/XPath.cs

@@ -6,35 +6,21 @@ namespace View_by_Distance.Shared.Models.Stateless.Methods;
 internal abstract class XPath
 {
 
-    internal static string GetRelativePath(string path, int length, bool forceExtensionToLower)
+    private static ReadOnlyDictionary<byte, ReadOnlyCollection<string>> Convert(List<CombinedEnumAndIndex> collection)
     {
-        string result;
-        if (forceExtensionToLower)
+        Dictionary<byte, List<string>> results = [];
+        List<string>? c;
+        foreach (CombinedEnumAndIndex cei in collection)
         {
-            string extension = Path.GetExtension(path);
-            string extensionLowered = Path.GetExtension(path).ToLower();
-            if (extension != extensionLowered)
+            if (!results.TryGetValue(cei.Enum, out c))
             {
-                string? directoryName = Path.GetDirectoryName(path);
-                if (string.IsNullOrEmpty(directoryName))
-                    throw new NullReferenceException(directoryName);
-                string fileNameWithoutExtension = Path.GetFileNameWithoutExtension(path);
-                if (string.IsNullOrEmpty(fileNameWithoutExtension))
-                    throw new NullReferenceException(fileNameWithoutExtension);
-                path = Path.Combine(directoryName, $"{fileNameWithoutExtension}{extensionLowered}");
+                results.Add(cei.Enum, []);
+                if (!results.TryGetValue(cei.Enum, out c))
+                    throw new Exception();
             }
+            c.Add(cei.Combined);
         }
-        result = path[length..].Replace(@"\", "/");
-        return result;
-    }
-
-    internal static bool DeleteEmptyDirectories(string rootDirectory)
-    {
-        bool result;
-        List<string> results = [];
-        DeleteEmptyDirectories(rootDirectory, results);
-        result = results.Count > 0;
-        return result;
+        return Convert(results);
     }
 
     internal static void DeleteEmptyDirectories(string rootDirectory, List<string> deletedDirectories)
@@ -72,45 +58,94 @@ internal abstract class XPath
         }
     }
 
-    internal static bool WriteAllText(string path, string contents, bool updateDateWhenMatches, bool compareBeforeWrite, DateTime? updateToWhenMatches)
+    internal static CombinedEnumAndIndex GetCombinedEnumAndIndex(IPropertyConfiguration propertyConfiguration, FilePath filePath, string fileNameWithoutExtension)
     {
-        bool result;
-        string text;
-        if (!compareBeforeWrite)
-            result = true;
+        CombinedEnumAndIndex result;
+        byte @enum;
+        int converted;
+        string combined;
+        byte missingDateTimeOriginal = IId.GetMissingDateTimeOriginal(propertyConfiguration, filePath);
+        if (!filePath.IsIntelligentIdFormat)
+            @enum = missingDateTimeOriginal;
         else
         {
-            if (!File.Exists(path))
-                text = string.Empty;
+            if (filePath.HasIgnoreKeyword is null || filePath.HasDateTimeOriginal is null)
+                throw new NotImplementedException("Chicken and Egg!");
+            if (filePath.HasIgnoreKeyword.Value)
+                @enum = IId.GetHasIgnoreKeyword(filePath);
+            else if (!filePath.HasDateTimeOriginal.Value)
+                @enum = missingDateTimeOriginal;
             else
-                text = File.ReadAllText(path);
-            result = text != contents;
-            if (!result && updateDateWhenMatches)
-            {
-                if (updateToWhenMatches is null)
-                    File.SetLastWriteTime(path, DateTime.Now);
-                else
-                    File.SetLastWriteTime(path, updateToWhenMatches.Value);
-            }
+                @enum = IId.GetHasDateTimeOriginal(propertyConfiguration, filePath);
         }
-        if (result)
+        string fileNameBeforeFirst = fileNameWithoutExtension.Split('.')[0];
+        string check = fileNameBeforeFirst.Length < propertyConfiguration.ResultAllInOneSubdirectoryLength ?
+            new('-', propertyConfiguration.ResultAllInOneSubdirectoryLength) :
+            fileNameBeforeFirst[^propertyConfiguration.ResultAllInOneSubdirectoryLength..];
+        if (check.Any(l => !char.IsNumber(l)))
         {
-            if (path.Contains("()"))
-                File.WriteAllText(path, contents);
-            else if (path.Contains("{}") && !path.EndsWith(".json"))
-                File.WriteAllText(path, contents);
-            else if (path.Contains("[]") && !path.EndsWith(".json"))
-                File.WriteAllText(path, contents);
-            else if (path.Contains("{}") && path.EndsWith(".json") && contents[0] == '{')
-                File.WriteAllText(path, contents);
-            else if (path.Contains("[]") && path.EndsWith(".json") && contents[0] == '[')
-                File.WriteAllText(path, contents);
-            else
-                File.WriteAllText(path, contents);
+            combined = $"{@enum}{new('-', propertyConfiguration.ResultAllInOneSubdirectoryLength)}";
+            converted = int.Parse($"1{new string('0', propertyConfiguration.ResultAllInOneSubdirectoryLength)}");
         }
+        else
+        {
+            combined = $"{@enum}{check}";
+            converted = int.Parse(check);
+        }
+        result = new(combined, @enum, converted);
         return result;
     }
 
+    internal static byte GetEnum(FilePath filePath) =>
+        GetEnum(filePath.HasIgnoreKeyword, filePath.HasDateTimeOriginal);
+
+    private static byte GetEnum(bool? ik, bool? dto)
+    {
+        byte result;
+        if (ik is not null && ik.Value && dto is not null && dto.Value)
+            result = 11;
+        else if (ik is not null && ik.Value && dto is not null && !dto.Value)
+            result = 15;
+        else if (ik is not null && ik.Value && dto is null)
+            result = 19;
+        else if (ik is not null && !ik.Value && dto is not null && dto.Value)
+            result = 51;
+        else if (ik is not null && !ik.Value && dto is not null && !dto.Value)
+            result = 55;
+        else if (ik is not null && !ik.Value && dto is null)
+            result = 59;
+        else if (ik is null && dto is not null && dto.Value)
+            result = 91;
+        else if (ik is null && dto is not null && !dto.Value)
+            result = 95;
+        else if (ik is null && dto is null)
+            result = 99;
+        else
+            throw new Exception();
+        return result;
+    }
+
+    internal static List<string> GetDirectories(string directory)
+    {
+        List<string> results = [];
+        string? checkDirectory = directory;
+        string? pathRoot = Path.GetPathRoot(directory);
+        if (string.IsNullOrEmpty(pathRoot))
+            throw new NullReferenceException(nameof(pathRoot));
+        if (Directory.Exists(directory))
+            results.Add(directory);
+        for (int i = 0; i < int.MaxValue; i++)
+        {
+            checkDirectory = Path.GetDirectoryName(checkDirectory);
+            if (string.IsNullOrEmpty(checkDirectory) || checkDirectory == pathRoot)
+                break;
+            results.Add(checkDirectory);
+        }
+        results.Add(pathRoot);
+        results.Reverse();
+        return results;
+    }
+
     internal static List<string> GetDirectoryNames(string directory)
     {
         List<string> results = [];
@@ -147,83 +182,15 @@ internal abstract class XPath
         return results;
     }
 
-    internal static List<string> GetDirectories(string directory)
+    internal static bool DeleteEmptyDirectories(string rootDirectory)
     {
+        bool result;
         List<string> results = [];
-        string? checkDirectory = directory;
-        string? pathRoot = Path.GetPathRoot(directory);
-        if (string.IsNullOrEmpty(pathRoot))
-            throw new NullReferenceException(nameof(pathRoot));
-        if (Directory.Exists(directory))
-            results.Add(directory);
-        for (int i = 0; i < int.MaxValue; i++)
-        {
-            checkDirectory = Path.GetDirectoryName(checkDirectory);
-            if (string.IsNullOrEmpty(checkDirectory) || checkDirectory == pathRoot)
-                break;
-            results.Add(checkDirectory);
-        }
-        results.Add(pathRoot);
-        results.Reverse();
-        return results;
-    }
-
-    internal static (int level, List<string> directories) Get(string rootDirectory, string sourceDirectory)
-    {
-        int result = 0;
-        string? directory;
-        string? checkDirectory;
-        List<string> results = [];
-        checkDirectory = sourceDirectory;
-        for (int i = 0; i < int.MaxValue; i++)
-        {
-            result += 1;
-            directory = Path.GetFileName(checkDirectory);
-            if (string.IsNullOrEmpty(directory))
-                break;
-            results.Add(directory);
-            checkDirectory = Path.GetDirectoryName(checkDirectory);
-            if (checkDirectory == rootDirectory)
-                break;
-        }
-        results.Reverse();
-        return new(result, results);
-    }
-
-    internal static string GetDirectory(string sourceDirectory, int level, string directoryName)
-    {
-        string result;
-        string? checkDirectory;
-        checkDirectory = Path.GetDirectoryName(sourceDirectory);
-        for (int i = 0; i < level; i++)
-            checkDirectory = Path.GetDirectoryName(checkDirectory);
-        if (string.IsNullOrEmpty(checkDirectory))
-            throw new Exception();
-        checkDirectory = Path.Combine(checkDirectory, directoryName);
-        if (!Directory.Exists(checkDirectory))
-            _ = Directory.CreateDirectory(checkDirectory);
-        result = checkDirectory;
+        DeleteEmptyDirectories(rootDirectory, results);
+        result = results.Count > 0;
         return result;
     }
 
-    internal static void ChangeDateForEmptyDirectories(string rootDirectory, long ticks)
-    {
-        DateTime dateTime = new(ticks);
-        IEnumerable<string> fileSystemEntries;
-        string[] directories;
-        if (!Directory.Exists(rootDirectory))
-            directories = [];
-        else
-            directories = Directory.GetDirectories(rootDirectory, "*", SearchOption.AllDirectories);
-        foreach (string directory in directories)
-        {
-            fileSystemEntries = Directory.EnumerateFileSystemEntries(directory, "*", SearchOption.TopDirectoryOnly);
-            if (fileSystemEntries.Any())
-                continue;
-            Directory.SetLastWriteTime(directory, dateTime);
-        }
-    }
-
     internal static void MakeHiddenIfAllItemsAreHidden(string rootDirectory)
     {
         bool check;
@@ -266,78 +233,221 @@ internal abstract class XPath
         }
     }
 
-    internal static (string, int) GetDirectoryNameAndIndex(int resultAllInOneSubdirectoryLength, string fileName)
+    internal static void CreateDirectories(ReadOnlyCollection<string> directories)
     {
-        int converted;
-        string result;
-        string check = fileName.Length < resultAllInOneSubdirectoryLength ? new('-', resultAllInOneSubdirectoryLength) : fileName.Split('.')[0][^resultAllInOneSubdirectoryLength..];
-        if (check.Any(l => !char.IsNumber(l)))
-        {
-            result = new('-', resultAllInOneSubdirectoryLength);
-            converted = int.Parse($"1{new string('0', resultAllInOneSubdirectoryLength)}");
-        }
-        else
-        {
-            result = check;
-            converted = int.Parse(check);
-        }
-        return (result, converted);
-    }
-
-    internal static (string, int) GetDirectoryNameAndIndex(IPropertyConfiguration propertyConfiguration, FilePath filePath)
-    {
-        int converted;
-        string result;
-        if (filePath.Id is not null)
-            (result, converted) = GetDirectoryNameAndIndex(propertyConfiguration.ResultAllInOneSubdirectoryLength, filePath.Id.Value.ToString());
-        else
-            (result, converted) = GetDirectoryNameAndIndex(propertyConfiguration.ResultAllInOneSubdirectoryLength, filePath.FileNameFirstSegment);
-        return (result, converted);
-    }
-
-    internal static ReadOnlyDictionary<string, ReadOnlyCollection<string>> GetKeyValuePairs(IPropertyConfiguration propertyConfiguration, string? resultsFullGroupDirectory, string[]? jsonGroups)
-    {
-        Dictionary<string, ReadOnlyCollection<string>> results = [];
-        int converted = int.Parse($"1{new string('0', propertyConfiguration.ResultAllInOneSubdirectoryLength)}");
-        string directory;
         string checkDirectory;
-        List<string> collection;
-        int plusOne = converted + 1;
-        if (jsonGroups is not null)
+        foreach (string directory in directories)
         {
-            foreach (string jsonGroup in jsonGroups)
+            for (int i = 0; i < 101; i++)
             {
-                if (resultsFullGroupDirectory is null)
-                    continue;
-                collection = [];
-                for (int i = 0; i < plusOne; i++)
-                {
-                    if (string.IsNullOrEmpty(jsonGroup))
-                    {
-                        if (i == converted)
-                            checkDirectory = Path.GetFullPath(Path.Combine(resultsFullGroupDirectory, new('-', propertyConfiguration.ResultAllInOneSubdirectoryLength)));
-                        else
-                            checkDirectory = Path.GetFullPath(Path.Combine(resultsFullGroupDirectory, i.ToString().PadLeft(propertyConfiguration.ResultAllInOneSubdirectoryLength, '0')));
-                    }
-                    else
-                    {
-                        directory = Path.Combine(resultsFullGroupDirectory, jsonGroup);
-                        if (i == converted)
-                            checkDirectory = Path.GetFullPath(Path.Combine(directory, new('-', propertyConfiguration.ResultAllInOneSubdirectoryLength)));
-                        else
-                            checkDirectory = Path.GetFullPath(Path.Combine(directory, i.ToString().PadLeft(propertyConfiguration.ResultAllInOneSubdirectoryLength, '0')));
-                    }
-                    if (!Directory.Exists(checkDirectory))
-                        _ = Directory.CreateDirectory(checkDirectory);
-                    collection.Add(checkDirectory);
-                }
-                if (!string.IsNullOrEmpty(jsonGroup))
-                    results.Add(jsonGroup, new(collection));
-                else
-                    results.Add(propertyConfiguration.ResultAllInOne, new(collection));
+                checkDirectory = Path.Combine(directory, i.ToString("000"));
+                if (!Directory.Exists(checkDirectory))
+                    _ = Directory.CreateDirectory(checkDirectory);
             }
         }
-        return new(results);
+    }
+
+    internal static void ChangeDateForEmptyDirectories(string rootDirectory, long ticks)
+    {
+        DateTime dateTime = new(ticks);
+        IEnumerable<string> fileSystemEntries;
+        string[] directories;
+        if (!Directory.Exists(rootDirectory))
+            directories = [];
+        else
+            directories = Directory.GetDirectories(rootDirectory, "*", SearchOption.AllDirectories);
+        foreach (string directory in directories)
+        {
+            fileSystemEntries = Directory.EnumerateFileSystemEntries(directory, "*", SearchOption.TopDirectoryOnly);
+            if (fileSystemEntries.Any())
+                continue;
+            Directory.SetLastWriteTime(directory, dateTime);
+        }
+    }
+
+    internal static string GetRelativePath(string path, int length, bool forceExtensionToLower)
+    {
+        string result;
+        if (forceExtensionToLower)
+        {
+            string extension = Path.GetExtension(path);
+            string extensionLowered = Path.GetExtension(path).ToLower();
+            if (extension != extensionLowered)
+            {
+                string? directoryName = Path.GetDirectoryName(path);
+                if (string.IsNullOrEmpty(directoryName))
+                    throw new NullReferenceException(directoryName);
+                string fileNameWithoutExtension = Path.GetFileNameWithoutExtension(path);
+                if (string.IsNullOrEmpty(fileNameWithoutExtension))
+                    throw new NullReferenceException(fileNameWithoutExtension);
+                path = Path.Combine(directoryName, $"{fileNameWithoutExtension}{extensionLowered}");
+            }
+        }
+        result = path[length..].Replace(@"\", "/");
+        return result;
+    }
+
+    internal static string GetDirectory(string sourceDirectory, int level, string directoryName)
+    {
+        string result;
+        string? checkDirectory;
+        checkDirectory = Path.GetDirectoryName(sourceDirectory);
+        for (int i = 0; i < level; i++)
+            checkDirectory = Path.GetDirectoryName(checkDirectory);
+        if (string.IsNullOrEmpty(checkDirectory))
+            throw new Exception();
+        checkDirectory = Path.Combine(checkDirectory, directoryName);
+        if (!Directory.Exists(checkDirectory))
+            _ = Directory.CreateDirectory(checkDirectory);
+        result = checkDirectory;
+        return result;
+    }
+
+    internal static (int level, List<string> directories) Get(string rootDirectory, string sourceDirectory)
+    {
+        int result = 0;
+        string? directory;
+        string? checkDirectory;
+        List<string> results = [];
+        checkDirectory = sourceDirectory;
+        for (int i = 0; i < int.MaxValue; i++)
+        {
+            result += 1;
+            directory = Path.GetFileName(checkDirectory);
+            if (string.IsNullOrEmpty(directory))
+                break;
+            results.Add(directory);
+            checkDirectory = Path.GetDirectoryName(checkDirectory);
+            if (checkDirectory == rootDirectory)
+                break;
+        }
+        results.Reverse();
+        return new(result, results);
+    }
+
+    internal static CombinedEnumAndIndex GetCombinedEnumAndIndex(IPropertyConfiguration propertyConfiguration, FilePath filePath)
+    {
+        CombinedEnumAndIndex result;
+        if (filePath.Id is not null)
+            result = GetCombinedEnumAndIndex(propertyConfiguration, filePath, filePath.Id.Value.ToString());
+        else
+            result = GetCombinedEnumAndIndex(propertyConfiguration, filePath, filePath.FileNameFirstSegment);
+        return result;
+    }
+
+    internal static bool WriteAllText(string path, string contents, bool updateDateWhenMatches, bool compareBeforeWrite, DateTime? updateToWhenMatches)
+    {
+        bool result;
+        string text;
+        if (!compareBeforeWrite)
+            result = true;
+        else
+        {
+            if (!File.Exists(path))
+                text = string.Empty;
+            else
+                text = File.ReadAllText(path);
+            result = text != contents;
+            if (!result && updateDateWhenMatches)
+            {
+                if (updateToWhenMatches is null)
+                    File.SetLastWriteTime(path, DateTime.Now);
+                else
+                    File.SetLastWriteTime(path, updateToWhenMatches.Value);
+            }
+        }
+        if (result)
+        {
+            if (path.Contains("()"))
+                File.WriteAllText(path, contents);
+            else if (path.Contains("{}") && !path.EndsWith(".json"))
+                File.WriteAllText(path, contents);
+            else if (path.Contains("[]") && !path.EndsWith(".json"))
+                File.WriteAllText(path, contents);
+            else if (path.Contains("{}") && path.EndsWith(".json") && contents[0] == '{')
+                File.WriteAllText(path, contents);
+            else if (path.Contains("[]") && path.EndsWith(".json") && contents[0] == '[')
+                File.WriteAllText(path, contents);
+            else
+                File.WriteAllText(path, contents);
+        }
+        return result;
+    }
+
+    internal static ReadOnlyDictionary<string, ReadOnlyDictionary<byte, ReadOnlyCollection<string>>> GetKeyValuePairs(IPropertyConfiguration propertyConfiguration, string? resultsFullGroupDirectory, string[]? jsonGroups)
+    {
+        Dictionary<string, ReadOnlyDictionary<byte, ReadOnlyCollection<string>>> results = [];
+        int plusOne;
+        string directory;
+        string checkDirectory;
+        CombinedEnumAndIndex cei;
+        byte[] bytes = GetBytes();
+        List<CombinedEnumAndIndex> collection;
+        ReadOnlyDictionary<byte, ReadOnlyCollection<string>> keyValuePairs;
+        int converted = int.Parse($"1{new string('0', propertyConfiguration.ResultAllInOneSubdirectoryLength)}");
+        if (jsonGroups is not null)
+        {
+            plusOne = converted + 1;
+            foreach (string jsonGroup in jsonGroups)
+            {
+                collection = [];
+                if (resultsFullGroupDirectory is null)
+                    continue;
+                foreach (byte @enum in bytes)
+                {
+                    for (int i = 0; i < plusOne; i++)
+                    {
+                        if (string.IsNullOrEmpty(jsonGroup))
+                        {
+                            if (i == converted)
+                                checkDirectory = Path.GetFullPath(Path.Combine(resultsFullGroupDirectory, $"{@enum}{new('-', propertyConfiguration.ResultAllInOneSubdirectoryLength)}"));
+                            else
+                                checkDirectory = Path.GetFullPath(Path.Combine(resultsFullGroupDirectory, $"{@enum}{i.ToString().PadLeft(propertyConfiguration.ResultAllInOneSubdirectoryLength, '0')}"));
+                        }
+                        else
+                        {
+                            directory = Path.Combine(resultsFullGroupDirectory, jsonGroup);
+                            if (i == converted)
+                                checkDirectory = Path.GetFullPath(Path.Combine(directory, $"{@enum}{new('-', propertyConfiguration.ResultAllInOneSubdirectoryLength)}"));
+                            else
+                                checkDirectory = Path.GetFullPath(Path.Combine(directory, $"{@enum}{i.ToString().PadLeft(propertyConfiguration.ResultAllInOneSubdirectoryLength, '0')}"));
+                        }
+                        if (!Directory.Exists(checkDirectory))
+                            _ = Directory.CreateDirectory(checkDirectory);
+                        cei = new(Combined: checkDirectory, Enum: @enum, Index: -1);
+                        collection.Add(cei);
+                    }
+                }
+                keyValuePairs = Convert(collection);
+                if (!string.IsNullOrEmpty(jsonGroup))
+                    results.Add(jsonGroup, keyValuePairs);
+                else
+                    results.Add(propertyConfiguration.ResultAllInOne, keyValuePairs);
+            }
+        }
+        return results.AsReadOnly();
+    }
+
+    private static byte[] GetBytes() =>
+    [
+        0,
+        1,
+        2,
+        3,
+        4,
+        5,
+        6,
+        7,
+        8,
+        9
+    ];
+
+    private static ReadOnlyDictionary<byte, ReadOnlyCollection<string>> Convert(Dictionary<byte, List<string>> keyValuePairs)
+    {
+        Dictionary<byte, ReadOnlyCollection<string>> results = [];
+        foreach (KeyValuePair<byte, List<string>> keyValuePair in keyValuePairs)
+            results.Add(keyValuePair.Key, new(keyValuePair.Value));
+        return results.AsReadOnly();
     }
 
 }

Shared/View-by-Distance.Shared.csproj

@@ -33,6 +33,6 @@
     </ItemGroup>
     <ItemGroup>
         <PackageReference Include="System.Drawing.Common" Version="8.0.10" />
-        <PackageReference Include="System.Text.Json" Version="9.0.0" />
+        <PackageReference Include="System.Text.Json" Version="9.0.2" />
     </ItemGroup>
 </Project>

Tests/Tests.csproj

@@ -27,14 +27,14 @@
         <DefineConstants>Linux</DefineConstants>
     </PropertyGroup>
     <ItemGroup>
-        <PackageReference Include="coverlet.collector" Version="6.0.2" />
+        <PackageReference Include="coverlet.collector" Version="6.0.4" />
         <PackageReference Include="Humanizer.Core" Version="2.14.1" />
-        <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="9.0.0" />
-        <PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="9.0.0" />
-        <PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.0" />
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
-        <PackageReference Include="MSTest.TestAdapter" Version="3.7.0" />
-        <PackageReference Include="MSTest.TestFramework" Version="3.7.0" />
+        <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="9.0.2" />
+        <PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="9.0.2" />
+        <PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.2" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
+        <PackageReference Include="MSTest.TestAdapter" Version="3.8.2" />
+        <PackageReference Include="MSTest.TestFramework" Version="3.8.2" />
     </ItemGroup>
     <ItemGroup>
         <ProjectReference Include="..\BlurHash\BlurHash.csproj" />

Tests/UnitTestHardCoded.cs

@@ -45,7 +45,7 @@ public partial class UnitTestHardCoded
         Environment.SetEnvironmentVariable(nameof(workingDirectory), workingDirectory);
         propertyConfiguration = Property.Models.Binder.Configuration.Get(isEnvironment, configurationRoot);
         configuration = Models.Binder.Configuration.Get(isEnvironment, configurationRoot, propertyConfiguration);
-        _Git = "d8013da9";
+        _Git = "0b793904";
         _AppSettings = appSettings;
         _Configuration = configuration;
         _IsEnvironment = isEnvironment;
@@ -54,6 +54,55 @@ public partial class UnitTestHardCoded
         _PropertyConfiguration = propertyConfiguration;
     }
 
+    [TestMethod]
+    public void TestMethodId()
+    {
+        int id;
+        id = 748161839;
+        string imageTrueTruePositive = IId.GetPaddedId(_PropertyConfiguration, id, ".jpg", hasIgnoreKeyword: true, hasDateTimeOriginal: true, index: null);
+        Assert.AreEqual("816184700398", imageTrueTruePositive);
+        string imageTrueFalsePositive = IId.GetPaddedId(_PropertyConfiguration, id, ".jpg", hasIgnoreKeyword: true, hasDateTimeOriginal: false, index: null);
+        Assert.AreEqual("816184700398", imageTrueFalsePositive);
+        string imageFalseFalsePositive = IId.GetPaddedId(_PropertyConfiguration, id, ".jpg", hasIgnoreKeyword: false, hasDateTimeOriginal: false, index: null);
+        Assert.AreEqual("816184700397", imageFalseFalsePositive);
+        string imageFalseTruePositive = IId.GetPaddedId(_PropertyConfiguration, id, ".jpg", hasIgnoreKeyword: false, hasDateTimeOriginal: true, index: null);
+        Assert.AreEqual("816184700399", imageFalseTruePositive);
+        try
+        { string videoTrueTruePositive = IId.GetPaddedId(_PropertyConfiguration, id, ".mov", hasIgnoreKeyword: true, hasDateTimeOriginal: true, index: null); }
+        catch (Exception)
+        { }
+        try
+        { string videoTrueFalsePositive = IId.GetPaddedId(_PropertyConfiguration, id, ".mov", hasIgnoreKeyword: true, hasDateTimeOriginal: false, index: null); }
+        catch (Exception)
+        { }
+        string videoFalseFalsePositive = IId.GetPaddedId(_PropertyConfiguration, id, ".mov", hasIgnoreKeyword: false, hasDateTimeOriginal: false, index: null);
+        Assert.AreEqual("816184700395", videoFalseFalsePositive);
+        string videoFalseTruePositive = IId.GetPaddedId(_PropertyConfiguration, id, ".mov", hasIgnoreKeyword: false, hasDateTimeOriginal: true, index: null);
+        Assert.AreEqual("816184700396", videoFalseTruePositive);
+        id = -748161839;
+        string imageTrueTrueNegative = IId.GetPaddedId(_PropertyConfiguration, id, ".jpg", hasIgnoreKeyword: true, hasDateTimeOriginal: true, index: null);
+        Assert.AreEqual("816184700392", imageTrueTrueNegative);
+        string imageTrueFalseNegative = IId.GetPaddedId(_PropertyConfiguration, id, ".jpg", hasIgnoreKeyword: true, hasDateTimeOriginal: false, index: null);
+        Assert.AreEqual("816184700392", imageTrueFalseNegative);
+        string imageFalseFalseNegative = IId.GetPaddedId(_PropertyConfiguration, id, ".jpg", hasIgnoreKeyword: false, hasDateTimeOriginal: false, index: null);
+        Assert.AreEqual("816184700393", imageFalseFalseNegative);
+        string imageFalseTrueNegative = IId.GetPaddedId(_PropertyConfiguration, id, ".jpg", hasIgnoreKeyword: false, hasDateTimeOriginal: true, index: null);
+        Assert.AreEqual("816184700391", imageFalseTrueNegative);
+        try
+        { string videoTrueTrueNegative = IId.GetPaddedId(_PropertyConfiguration, id, ".mov", hasIgnoreKeyword: true, hasDateTimeOriginal: true, index: null); }
+        catch (Exception)
+        { }
+        try
+        { string videoTrueFalseNegative = IId.GetPaddedId(_PropertyConfiguration, id, ".mov", hasIgnoreKeyword: true, hasDateTimeOriginal: false, index: null); }
+        catch (Exception)
+        { }
+        string videoFalseFalseNegative = IId.GetPaddedId(_PropertyConfiguration, id, ".mov", hasIgnoreKeyword: false, hasDateTimeOriginal: false, index: null);
+        Assert.AreEqual("816184700390", videoFalseFalseNegative);
+        string videoFalseTrueNegative = IId.GetPaddedId(_PropertyConfiguration, id, ".mov", hasIgnoreKeyword: false, hasDateTimeOriginal: true, index: null);
+        Assert.AreEqual("816184700394", videoFalseTrueNegative);
+        NonThrowTryCatch();
+    }
+
     private static void NonThrowTryCatch()
     {
         try
@@ -61,18 +110,6 @@ public partial class UnitTestHardCoded
         catch (Exception) { }
     }
 
-    [TestMethod]
-    public void TestMethodNull()
-    {
-        Assert.IsFalse(_AppSettings is null);
-        Assert.IsFalse(_Configuration is null);
-        Assert.IsFalse(_IsEnvironment is null);
-        Assert.IsFalse(_WorkingDirectory is null);
-        Assert.IsFalse(_ConfigurationRoot is null);
-        Assert.IsFalse(_PropertyConfiguration is null);
-        NonThrowTryCatch();
-    }
-
     [TestMethod]
     public void TestMethodDel()
     {
@@ -86,30 +123,6 @@ public partial class UnitTestHardCoded
         NonThrowTryCatch();
     }
 
-    [TestMethod]
-    public void TestMethodGetApproximateYears()
-    {
-        string personDisplayDirectory = string.Concat($"D:/1-Images-A/Images-{_Git}-Results/A2)People/{_Git}", "/{}/^/Sydney Dupray^9");
-        if (Directory.Exists(Directory.GetDirectoryRoot(personDisplayDirectory)) && Directory.Exists(personDisplayDirectory))
-        {
-            char numberSign = '#';
-            string? minusOne = null;
-            char[] personCharacters = ['^'];
-            string personDisplayDirectoryName = Path.GetFileName(personDisplayDirectory);
-            string personBirthdayFormat = _Configuration.PropertyConfiguration.PersonBirthdayFormat;
-            string[] personKeyDirectories = Directory.GetDirectories(personDisplayDirectory, "*", SearchOption.TopDirectoryOnly);
-            List<(string, PersonBirthday)> collection = IPersonBirthday.GetPersonBirthdays(personBirthdayFormat, personKeyDirectories, personDisplayDirectoryName);
-            int? approximateYears = IAge.GetApproximateYears(personCharacters, personDisplayDirectoryName);
-            if (approximateYears is null)
-                throw new NullReferenceException(nameof(approximateYears));
-            Assert.IsNotNull(approximateYears);
-            Assert.IsTrue(approximateYears.Value == 9);
-            string? change = IPersonContainer.VerifyAge(numberSign, personDisplayDirectory, minusOne, personDisplayDirectoryName, approximateYears, collection);
-            Assert.IsNull(change);
-        }
-        NonThrowTryCatch();
-    }
-
     [TestMethod]
     public void TestMethodDel2()
     {
@@ -123,14 +136,35 @@ public partial class UnitTestHardCoded
         NonThrowTryCatch();
     }
 
-    private static (string?, string, string) Get(string[] segments)
+    [TestMethod]
+    public void TestMethodNull()
     {
-        (string?, string, string) result;
-        if ((!segments[0].Contains('#') && (segments[3].Contains('~') || segments[3].Contains('#'))) || (segments[0].Contains('#') && !segments[3].Contains('#')))
-            result = new(null, segments[3], segments[4]);
-        else
-            result = new(segments[0], segments[3], segments[4]);
-        return result;
+        Assert.IsNotNull(_AppSettings);
+        Assert.IsNotNull(_Configuration);
+        Assert.IsNotNull(_IsEnvironment);
+        Assert.IsNotNull(_WorkingDirectory);
+        Assert.IsNotNull(_ConfigurationRoot);
+        Assert.IsNotNull(_PropertyConfiguration);
+        NonThrowTryCatch();
+    }
+
+    [TestMethod]
+    public void TestMethodRename()
+    {
+        // string $directory = "D:/2-Images-B/Not-Copy-Copy-{_Git}";
+        string directory = $"D:/1-Images-A/Images-{_Git}";
+        // string $directory = "D:/2-Images-B/Not-Copy-Copy-{_Git}";
+        if (Directory.Exists(Path.GetPathRoot(directory)) && Directory.Exists(directory))
+        {
+            string[] directories = Directory.GetDirectories(directory, "*;*", SearchOption.AllDirectories);
+            foreach (string subDirectory in directories.OrderByDescending(l => l.Length - l.Replace(@"\", string.Empty).Length))
+            {
+                if (!subDirectory.EndsWith(";9"))
+                    continue;
+                Directory.Move(subDirectory, $"{subDirectory[..^2]} !9");
+            }
+        }
+        NonThrowTryCatch();
     }
 
     [TestMethod]
@@ -189,64 +223,14 @@ public partial class UnitTestHardCoded
         NonThrowTryCatch();
     }
 
-    [TestMethod]
-    public void TestMethodRenameAbandoned()
+    private static (string?, string, string) Get(string[] segments)
     {
-        string directory = string.Concat($"D:/1-Images-A/Images-{_Git}-Results/A2)People/{_Git}", "/{}/!/Abandoned");
-        if (Directory.Exists(Path.GetPathRoot(directory)) && Directory.Exists(directory))
-        {
-            string checkFile;
-            string[] files = Directory.GetFiles(directory, "*.abd", SearchOption.TopDirectoryOnly);
-            foreach (string file in files)
-            {
-                checkFile = file[..^4];
-                if (File.Exists(checkFile))
-                    continue;
-                File.Move(file, checkFile);
-            }
-            Assert.IsTrue(true);
-        }
-        NonThrowTryCatch();
-    }
-
-    [TestMethod]
-    public void TestMethodRenameDelete()
-    {
-        string directory = string.Concat($"D:/1-Images-A/Images-{_Git}-Results/A)Property/{_Git}", "/{}");
-        if (Directory.Exists(Path.GetPathRoot(directory)) && Directory.Exists(directory))
-        {
-            string checkFile;
-            string[] files = Directory.GetFiles(directory, "*.del", SearchOption.AllDirectories);
-            foreach (string file in files)
-            {
-                checkFile = file[..^4];
-                if (File.Exists(checkFile))
-                    continue;
-                File.Move(file, checkFile);
-            }
-            Assert.IsTrue(true);
-        }
-        NonThrowTryCatch();
-    }
-
-    [TestMethod]
-    public void TestMethodRenameOld()
-    {
-        string directory = $"D:/1-Images-A/Images-{_Git}-Results/E)Distance/{_Git}/()";
-        if (Directory.Exists(Path.GetPathRoot(directory)) && Directory.Exists(directory))
-        {
-            string checkFile;
-            string[] files = Directory.GetFiles(directory, "*.old", SearchOption.AllDirectories);
-            foreach (string file in files)
-            {
-                checkFile = file[..^4];
-                if (File.Exists(checkFile))
-                    continue;
-                File.Move(file, checkFile);
-            }
-            Assert.IsTrue(true);
-        }
-        NonThrowTryCatch();
+        (string?, string, string) result;
+        if ((!segments[0].Contains('#') && (segments[3].Contains('~') || segments[3].Contains('#'))) || (segments[0].Contains('#') && !segments[3].Contains('#')))
+            result = new(null, segments[3], segments[4]);
+        else
+            result = new(segments[0], segments[3], segments[4]);
+        return result;
     }
 
     [TestMethod]
@@ -285,33 +269,59 @@ public partial class UnitTestHardCoded
     }
 
     [TestMethod]
-    public void TestMethodRename()
+    public void TestMethodRenameOld()
     {
-        // string $directory = "D:/2-Images-B/Not-Copy-Copy-{_Git}";
-        string directory = $"D:/1-Images-A/Images-{_Git}";
-        // string $directory = "D:/2-Images-B/Not-Copy-Copy-{_Git}";
+        string directory = $"D:/1-Images-A/Images-{_Git}-Results/E)Distance/{_Git}/()";
         if (Directory.Exists(Path.GetPathRoot(directory)) && Directory.Exists(directory))
         {
-            string[] directories = Directory.GetDirectories(directory, "*;*", SearchOption.AllDirectories);
-            foreach (string subDirectory in directories.OrderByDescending(l => l.Length - l.Replace(@"\", string.Empty).Length))
+            string checkFile;
+            string[] files = Directory.GetFiles(directory, "*.old", SearchOption.AllDirectories);
+            foreach (string file in files)
             {
-                if (!subDirectory.EndsWith(";9"))
+                checkFile = file[..^4];
+                if (File.Exists(checkFile))
                     continue;
-                Directory.Move(subDirectory, $"{subDirectory[..^2]} !9");
+                File.Move(file, checkFile);
             }
+            Assert.IsTrue(true);
         }
         NonThrowTryCatch();
     }
 
     [TestMethod]
-    public void TestMethodRenameForUnknown()
+    public void TestMethodImmichAsset()
     {
-        string directory = $"D:/1-Images-A/Images-{_Git}-Results/E)Distance/{_Git}/(RectInt-2023-06-19-less-0.99)";
+        if (!string.IsNullOrEmpty(_Configuration.ImmichAssetsFile) && File.Exists(_Configuration.ImmichAssetsFile))
+        {
+            Dictionary<string, ImmichAsset> keyValuePairs = [];
+            string json = File.ReadAllText(_Configuration.ImmichAssetsFile);
+            ImmichAsset[]? immichAssets = JsonSerializer.Deserialize(json, ImmichAssetCollectionSourceGenerationContext.Default.ImmichAssetArray);
+            if (immichAssets is not null)
+            {
+                foreach (ImmichAsset immichAsset in immichAssets)
+                    keyValuePairs.Add(immichAsset.OriginalPath, immichAsset);
+            }
+            Assert.IsTrue(keyValuePairs.Count > 0);
+        }
+        NonThrowTryCatch();
+    }
+
+    [TestMethod]
+    public void TestMethodRenameDelete()
+    {
+        string directory = string.Concat($"D:/1-Images-A/Images-{_Git}-Results/A)Property/{_Git}", "/{}");
         if (Directory.Exists(Path.GetPathRoot(directory)) && Directory.Exists(directory))
         {
-            string[] files = Directory.GetFiles(directory, "*.unk", SearchOption.AllDirectories);
+            string checkFile;
+            string[] files = Directory.GetFiles(directory, "*.del", SearchOption.AllDirectories);
             foreach (string file in files)
-                File.Move(file, file[..^4]);
+            {
+                checkFile = file[..^4];
+                if (File.Exists(checkFile))
+                    continue;
+                File.Move(file, checkFile);
+            }
+            Assert.IsTrue(true);
         }
         NonThrowTryCatch();
     }
@@ -347,19 +357,58 @@ public partial class UnitTestHardCoded
     }
 
     [TestMethod]
-    public void TestMethodImmichAsset()
+    public void TestMethodRenameAbandoned()
     {
-        if (!string.IsNullOrEmpty(_Configuration.ImmichAssetsFile) && File.Exists(_Configuration.ImmichAssetsFile))
+        string directory = string.Concat($"D:/1-Images-A/Images-{_Git}-Results/A2)People/{_Git}", "/{}/!/Abandoned");
+        if (Directory.Exists(Path.GetPathRoot(directory)) && Directory.Exists(directory))
         {
-            Dictionary<string, ImmichAsset> keyValuePairs = [];
-            string json = File.ReadAllText(_Configuration.ImmichAssetsFile);
-            ImmichAsset[]? immichAssets = JsonSerializer.Deserialize(json, ImmichAssetCollectionSourceGenerationContext.Default.ImmichAssetArray);
-            if (immichAssets is not null)
+            string checkFile;
+            string[] files = Directory.GetFiles(directory, "*.abd", SearchOption.TopDirectoryOnly);
+            foreach (string file in files)
             {
-                foreach (ImmichAsset immichAsset in immichAssets)
-                    keyValuePairs.Add(immichAsset.OriginalPath, immichAsset);
+                checkFile = file[..^4];
+                if (File.Exists(checkFile))
+                    continue;
+                File.Move(file, checkFile);
             }
-            Assert.IsTrue(keyValuePairs.Count > 0);
+            Assert.IsTrue(true);
+        }
+        NonThrowTryCatch();
+    }
+
+    [TestMethod]
+    public void TestMethodRenameForUnknown()
+    {
+        string directory = $"D:/1-Images-A/Images-{_Git}-Results/E)Distance/{_Git}/(RectInt-2023-06-19-less-0.99)";
+        if (Directory.Exists(Path.GetPathRoot(directory)) && Directory.Exists(directory))
+        {
+            string[] files = Directory.GetFiles(directory, "*.unk", SearchOption.AllDirectories);
+            foreach (string file in files)
+                File.Move(file, file[..^4]);
+        }
+        NonThrowTryCatch();
+    }
+
+    [TestMethod]
+    public void TestMethodGetApproximateYears()
+    {
+        string personDisplayDirectory = string.Concat($"D:/1-Images-A/Images-{_Git}-Results/A2)People/{_Git}", "/{}/^/Sydney Dupray^9");
+        if (Directory.Exists(Directory.GetDirectoryRoot(personDisplayDirectory)) && Directory.Exists(personDisplayDirectory))
+        {
+            char numberSign = '#';
+            string? minusOne = null;
+            char[] personCharacters = ['^'];
+            string personDisplayDirectoryName = Path.GetFileName(personDisplayDirectory);
+            string personBirthdayFormat = _Configuration.PropertyConfiguration.PersonBirthdayFormat;
+            string[] personKeyDirectories = Directory.GetDirectories(personDisplayDirectory, "*", SearchOption.TopDirectoryOnly);
+            List<(string, PersonBirthday)> collection = IPersonBirthday.GetPersonBirthdays(personBirthdayFormat, personKeyDirectories, personDisplayDirectoryName);
+            int? approximateYears = IAge.GetApproximateYears(personCharacters, personDisplayDirectoryName);
+            if (approximateYears is null)
+                throw new NullReferenceException(nameof(approximateYears));
+            Assert.IsNotNull(approximateYears);
+            Assert.AreEqual(9, approximateYears.Value);
+            string? change = IPersonContainer.VerifyAge(numberSign, personDisplayDirectory, minusOne, personDisplayDirectoryName, approximateYears, collection);
+            Assert.IsNull(change);
         }
         NonThrowTryCatch();
     }