xmp and json sidecar support

Metadata alignment

.gitignore

@@ -474,3 +474,5 @@ Compare/.vscode/.UserSecrets/secrets.json
 Rename/.vscode/.UserSecrets/secrets.json
 Rename/.vscode/.UserSecretsOld/rename.json
 Rename/.vscode/.UserSecretsOld/secrets.json
+Windows/.vscode/.UserSecrets/secrets.json
+Windows/.vscode/.7-Question

.vscode/launch.json

@@ -1,6 +1,23 @@
 {
     "version": "0.2.0",
     "configurations": [
+        {
+            "name": "Compare",
+            "type": "coreclr",
+            "request": "launch",
+            "preLaunchTask": "Build-Compare",
+            "program": "${workspaceFolder}/Compare/bin/Debug/net9.0/win-x64/AA.Compare.dll",
+            "args": [
+                "s"
+            ],
+            "env": {
+                "ASPNETCORE_ENVIRONMENT": "Development"
+            },
+            "cwd": "${workspaceFolder}",
+            "console": "integratedTerminal",
+            "stopAtEntry": false,
+            "requireExactSource": false
+        },
         {
             "name": "Rename",
             "type": "coreclr",
@@ -19,11 +36,11 @@
             "requireExactSource": false
         },
         {
-            "name": "Compare",
+            "name": "Windows",
             "type": "coreclr",
             "request": "launch",
-            "preLaunchTask": "Build-Compare",
+            "preLaunchTask": "Build-Windows",
-            "program": "${workspaceFolder}/Compare/bin/Debug/net9.0/win-x64/AA.Compare.dll",
+            "program": "${workspaceFolder}/Windows/bin/Debug/net9.0/win-x64/AA.Windows.dll",
             "args": [
                 "s"
             ],

.vscode/mklink.md

@@ -26,6 +26,8 @@ mklink /J "L:\Git\AA\Compare\.vscode\.UserSecrets" "C:\Users\mikep\AppData\Roami
 ```bash 1736011475498 = 638716082754980000 = Sat Jan 04 2025 10:24:35 GMT-0700 (Mountain Standard Time)
 mklink /J "L:\Git\AA\Rename\.vscode\.UserSecrets" "C:\Users\mikep\AppData\Roaming\Microsoft\UserSecrets\843db3e1-e18f-4cba-8b00-967529a32635"
 mklink /J "L:\Git\AA\Compare\.vscode\.UserSecrets" "C:\Users\mikep\AppData\Roaming\Microsoft\UserSecrets\770b6ae3-266e-4d5f-970a-173709b064de"
+mklink /J "L:\Git\AA\Windows\.vscode\.UserSecrets" "C:\Users\mikep\AppData\Roaming\Microsoft\UserSecrets\076c87e8-c7f0-40a3-aba3-73eb7f9ea892"
+mklink /J "L:\Git\AA\Windows\.vscode\.iCloudPhotos2025" "D:\7-Question\iCloud Photos 2025"
 ```
 
 ```json 1735493575037 = 638710903750370000 = Sun Dec 29 2024 10:32:54 GMT-0700 (Mountain Standard Time)

.vscode/read-me.md

@@ -0,0 +1 @@
+# Read Me

.vscode/settings.json

@@ -40,6 +40,7 @@
         "Rects",
         "resnet",
         "Serilog",
+        "snupkg",
         "Subfile",
         "Subfiles",
         "Syncthing",

.vscode/tasks.json

@@ -8,7 +8,7 @@
             "args": [
                 "user-secrets",
                 "-p",
-                "${workspaceFolder}/Rename/AA.Rename.csproj",
+                "${workspaceFolder}/Windows/AA.Windows.csproj",
                 "init"
             ],
             "problemMatcher": "$msCompile"
@@ -20,10 +20,10 @@
             "args": [
                 "user-secrets",
                 "-p",
-                "${workspaceFolder}/Rename/AA.Rename.csproj",
+                "${workspaceFolder}/Windows/AA.Windows.csproj",
                 "set",
                 "_Application",
-                "Rename"
+                "Windows"
             ],
             "problemMatcher": "$msCompile"
         },
@@ -123,6 +123,126 @@
             ],
             "problemMatcher": "$msCompile"
         },
+        {
+            "label": "Build-Windows",
+            "command": "dotnet",
+            "type": "process",
+            "args": [
+                "build",
+                "${workspaceFolder}/Windows/AA.Windows.csproj",
+                "/property:GenerateFullPaths=true",
+                "/consoleloggerparameters:NoSummary"
+            ],
+            "problemMatcher": "$msCompile"
+        },
+        {
+            "label": "Pack-Compare",
+            "command": "dotnet",
+            "type": "process",
+            "args": [
+                "pack",
+                "${workspaceFolder}/Compare/AA.Compare.csproj",
+                "/property:GenerateFullPaths=true",
+                "/consoleloggerparameters:NoSummary"
+            ],
+            "problemMatcher": "$msCompile"
+        },
+        {
+            "label": "Pack-Distance",
+            "command": "dotnet",
+            "type": "process",
+            "args": [
+                "pack",
+                "${workspaceFolder}/Distance/AA.Distance.csproj",
+                "/property:GenerateFullPaths=true",
+                "/consoleloggerparameters:NoSummary"
+            ],
+            "problemMatcher": "$msCompile"
+        },
+        {
+            "label": "Pack-Face",
+            "command": "dotnet",
+            "type": "process",
+            "args": [
+                "pack",
+                "${workspaceFolder}/Face/AA.Face.csproj",
+                "/property:GenerateFullPaths=true",
+                "/consoleloggerparameters:NoSummary"
+            ],
+            "problemMatcher": "$msCompile"
+        },
+        {
+            "label": "Pack-Face-Recognition-DotNet",
+            "command": "dotnet",
+            "type": "process",
+            "args": [
+                "pack",
+                "${workspaceFolder}/FaceRecognitionDotNet/AA.FaceRecognitionDotNet.csproj",
+                "/property:GenerateFullPaths=true",
+                "/consoleloggerparameters:NoSummary"
+            ],
+            "problemMatcher": "$msCompile"
+        },
+        {
+            "label": "Pack-Metadata",
+            "command": "dotnet",
+            "type": "process",
+            "args": [
+                "pack",
+                "${workspaceFolder}/Metadata/AA.Metadata.csproj",
+                "/property:GenerateFullPaths=true",
+                "/consoleloggerparameters:NoSummary"
+            ],
+            "problemMatcher": "$msCompile"
+        },
+        {
+            "label": "Pack-People",
+            "command": "dotnet",
+            "type": "process",
+            "args": [
+                "pack",
+                "${workspaceFolder}/People/AA.People.csproj",
+                "/property:GenerateFullPaths=true",
+                "/consoleloggerparameters:NoSummary"
+            ],
+            "problemMatcher": "$msCompile"
+        },
+        {
+            "label": "Pack-Rename",
+            "command": "dotnet",
+            "type": "process",
+            "args": [
+                "pack",
+                "${workspaceFolder}/Rename/AA.Rename.csproj",
+                "/property:GenerateFullPaths=true",
+                "/consoleloggerparameters:NoSummary"
+            ],
+            "problemMatcher": "$msCompile"
+        },
+        {
+            "label": "Pack-Shared",
+            "command": "dotnet",
+            "type": "process",
+            "args": [
+                "pack",
+                "${workspaceFolder}/Shared/AA.Shared.csproj",
+                "/property:GenerateFullPaths=true",
+                "/consoleloggerparameters:NoSummary"
+            ],
+            "problemMatcher": "$msCompile"
+        },
+        {
+            "label": "Pack-Windows",
+            "command": "dotnet",
+            "type": "process",
+            "args": [
+                "pack",
+                "${workspaceFolder}/Windows/AA.Windows.csproj",
+                "/property:GenerateFullPaths=true",
+                "/consoleloggerparameters:NoSummary"
+            ],
+            "problemMatcher": "$msCompile"
+        },
         {
             "label": "Format-Compare-Whitespaces",
             "command": "dotnet",
@@ -339,6 +459,22 @@
             ],
             "problemMatcher": "$msCompile"
         },
+        {
+            "label": "Format-Windows",
+            "command": "dotnet",
+            "type": "process",
+            "args": [
+                "format",
+                "${workspaceFolder}/Windows/AA.Windows.csproj",
+                "--report",
+                ".vscode",
+                "--verbosity",
+                "detailed",
+                "--severity",
+                "warn"
+            ],
+            "problemMatcher": "$msCompile"
+        },
         {
             "label": "AOT-Compare",
             "command": "dotnet",
@@ -475,5 +611,36 @@
             ],
             "problemMatcher": "$msCompile"
         },
+        {
+            "label": "AOT-Windows",
+            "command": "dotnet",
+            "type": "process",
+            "args": [
+                "publish",
+                "-r",
+                "win-x64",
+                "-c",
+                "Release",
+                "-p:PublishAot=true",
+                "${workspaceFolder}/Windows/AA.Windows.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/AA",
+                "Day-Helper-2025-03-20",
+                "false",
+                "4"
+            ],
+            "problemMatcher": []
+        }
     ]
 }

Compare/.vscode/read-me.md

@@ -0,0 +1 @@
+# Read Me

Compare/AA.Compare.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
@@ -7,14 +7,19 @@
     <TargetFramework>net9.0</TargetFramework>
     <UserSecretsId>770b6ae3-266e-4d5f-970a-173709b064de</UserSecretsId>
   </PropertyGroup>
+  <PropertyGroup>
+    <HoursSinceNovember122024>$([System.Math]::Floor($([MSBuild]::Divide($([MSBuild]::Subtract($([System.DateTimeOffset]::UtcNow.ToUnixTimeSeconds()), 1731369600)), 3600))))</HoursSinceNovember122024>
+  </PropertyGroup>
   <PropertyGroup>
     <PackageId>Phares.View.by.Distance.Compare</PackageId>
-    <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
+    <Version>9.0.104.$([System.Math]::Floor($([MSBuild]::Divide($([MSBuild]::Subtract($([System.DateTimeOffset]::UtcNow.ToUnixTimeSeconds()), 1731369600)), 3600))))</Version>
-    <Version>9.0.100.0</Version>
-    <Authors>Mike Phares</Authors>
     <Company>Phares</Company>
+    <Authors>Mike Phares</Authors>
     <IncludeSymbols>true</IncludeSymbols>
+    <PackageReadmeFile>read-me.md</PackageReadmeFile>
     <SymbolPackageFormat>snupkg</SymbolPackageFormat>
+    <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
+    <PackageLicenseExpression>MIT</PackageLicenseExpression>
   </PropertyGroup>
   <PropertyGroup>
     <IsWindows Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Windows)))' == 'true'">true</IsWindows>
@@ -34,10 +39,13 @@
     <SupportedPlatform Include="browser" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="runtime.win-x64.Microsoft.DotNet.ILCompiler" Version="9.0.0" />
+    <None Include=".vscode\read-me.md" Pack="true" PackagePath="\" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="9.0.0" />
+  </ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="9.0.0" />
+  <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.0" />
+    <PackageReference Include="runtime.win-x64.Microsoft.DotNet.ILCompiler" Version="8.0.14" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.1" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="8.0.1" />
+    <PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.1" />
     <PackageReference Include="ShellProgressBar" Version="5.2.0" />
   </ItemGroup>
   <ItemGroup>

Compare/Compare.cs

@@ -1,22 +1,41 @@
 using Microsoft.Extensions.Logging;
 using ShellProgressBar;
 using System.Collections.ObjectModel;
+using System.Drawing;
 using View_by_Distance.Compare.Models;
 using View_by_Distance.Distance.Models.Stateless;
 using View_by_Distance.Face.Models.Stateless;
-using View_by_Distance.Metadata.Models;
+using Phares.Metadata.Models;
 using View_by_Distance.People.Models.Stateless;
-using View_by_Distance.Shared.Models;
+using Phares.Shared.Models;
-using View_by_Distance.Shared.Models.Stateless;
+using Phares.Shared.Models.Stateless;
 
 namespace View_by_Distance.Compare;
 
 public partial class Compare : ICompare, IDisposable
 {
 
+    public long Ticks { get; init; }
+    public int? CurrentTick => _ProgressBar?.CurrentTick;
+
     private ProgressBar? _ProgressBar;
     private readonly ProgressBarOptions _ProgressBarOptions;
 
+    void ICompare.Tick() =>
+        _ProgressBar?.Tick();
+
+    void IDisposable.Dispose()
+    {
+        _ProgressBar?.Dispose();
+        GC.SuppressFinalize(this);
+    }
+
+    void ICompare.ConstructProgressBar(int maxTicks, string message)
+    {
+        _ProgressBar?.Dispose();
+        _ProgressBar = new(maxTicks, message, _ProgressBarOptions);
+    }
+
     public Compare(List<string> args, ILogger<Program>? logger, AppSettings appSettings, bool isSilent, IConsole console)
     {
         if (isSilent)
@@ -26,27 +45,56 @@ public partial class Compare : ICompare, IDisposable
         if (console is null)
             throw new NullReferenceException(nameof(console));
         ICompare compare = this;
-        long ticks = DateTime.Now.Ticks;
+        Ticks = DateTime.Now.Ticks;
         _ProgressBarOptions = new() { ProgressCharacter = '─', ProgressBarOnBottom = true, DisableBottomPercentage = true };
-        CompareWork(logger, appSettings, compare, ticks);
+        CompareWork(logger, appSettings, compare);
     }
 
-    void ICompare.Tick() =>
+    private void CompareWork(ILogger<Program>? logger, AppSettings appSettings, ICompare compare)
-        _ProgressBar?.Tick();
-
-    void ICompare.ConstructProgressBar(int maxTicks, string message)
     {
-        _ProgressBar?.Dispose();
+        const int updated = 0;
-        _ProgressBar = new(maxTicks, message, _ProgressBarOptions);
+        DistanceLimits? distanceLimits;
+        ReadOnlyCollection<LocationContainer> matrix;
+        logger?.LogInformation("{Ticks}", compare.Ticks);
+        ReadOnlyCollection<SaveContainer> saveContainers;
+        ReadOnlyCollection<ExifDirectory> exifDirectories;
+        ReadOnlyCollection<LocationContainer> preFiltered;
+        ReadOnlyCollection<LocationContainer> postFiltered;
+        ReadOnlyDictionary<string, LocationContainer> onlyOne;
+        bool runToDoCollectionFirst = GetRunToDoCollectionFirst(appSettings, compare);
+        ReadOnlyCollections readOnlyCollections = GetReadOnlyCollections(appSettings);
+        ReadOnlyDictionary<int, ReadOnlyDictionary<int, LocationContainer>> mappedIdsThenWholePercentagesToLocationContainer = GetMappedIdsThenWholePercentagesToLocationContainer(appSettings, compare, readOnlyCollections);
+        if (appSettings.CompareSettings.SaveExtractedFaces || appSettings.CompareSettings.SaveExtractedJavaScriptObjectNotation)
+            SaveExtracted(appSettings, mappedIdsThenWholePercentagesToLocationContainer);
+        foreach (string outputResolution in appSettings.CompareSettings.OutputResolutions)
+        {
+            if (runToDoCollectionFirst || outputResolution.Any(char.IsNumber))
+                continue;
+            logger?.LogInformation("{outputResolution}", outputResolution);
+            exifDirectories = IFace.GetExifDirectories(appSettings.ResultSettings, appSettings.MetadataSettings, appSettings.DistanceSettings, appSettings.CompareSettings, compare, outputResolution);
+            preFiltered = IDistance.GetPreFilterLocationContainer(appSettings.DistanceSettings, appSettings.CompareSettings, compare, readOnlyCollections, mappedIdsThenWholePercentagesToLocationContainer, exifDirectories);
+            if (preFiltered.Count == 0)
+                continue;
+            if (appSettings.CompareSettings.SaveExtractedFaces || appSettings.CompareSettings.SaveExtractedJavaScriptObjectNotation)
+                SaveExtracted(appSettings, preFiltered);
+            distanceLimits = new(appSettings.DistanceSettings);
+            postFiltered = IDistance.GetPostFilterLocationContainer(preFiltered, distanceLimits);
+            if (postFiltered.Count == 0)
+                continue;
+            matrix = IDistance.GetMatrixLocationContainers(appSettings.DistanceSettings, compare, mappedIdsThenWholePercentagesToLocationContainer, distanceLimits, postFiltered);
+            if (matrix.Count == 0)
+                continue;
+            onlyOne = IDistance.GetOnlyOne(appSettings.DistanceSettings, matrix);
+            if (onlyOne.Count == 0)
+                continue;
+            saveContainers = IDistance.GetSaveContainers(appSettings.ResultSettings, appSettings.DistanceSettings, appSettings.CompareSettings, compare, outputResolution, onlyOne);
+            if (saveContainers.Count == 0)
+                continue;
+            IDistance.SaveContainers(appSettings.DistanceSettings, appSettings.CompareSettings, compare, updated, saveContainers);
+        }
     }
 
-    void IDisposable.Dispose()
+    private static bool GetRunToDoCollectionFirst(AppSettings appSettings, ICompare compare)
-    {
-        _ProgressBar?.Dispose();
-        GC.SuppressFinalize(this);
-    }
-
-    private static bool GetRunToDoCollectionFirst(AppSettings appSettings, long ticks)
     {
         bool result = appSettings.DistanceSettings.SaveSortingWithoutPerson;
         if (!result)
@@ -61,7 +109,7 @@ public partial class Compare : ICompare, IDisposable
             {
                 string seasonDirectory;
                 DirectoryInfo directoryInfo;
-                DateTime dateTime = new(ticks);
+                DateTime dateTime = new(compare.Ticks);
                 string rootDirectory = appSettings.ResultSettings.RootDirectory;
                 (int season, string seasonName) = IDate.GetSeason(dateTime.DayOfYear);
                 string eDistanceContentDirectory = IResult.GetResultsDateGroupDirectory(appSettings.ResultSettings, nameof(E_Distance), appSettings.ResultSettings.ResultContent);
@@ -111,58 +159,127 @@ public partial class Compare : ICompare, IDisposable
         return result;
     }
 
-    private static ReadOnlyCollection<ExifDirectory> GetMappedExifDirectoryWithEncoding(AppSettings appSettings, ICompare compare, long ticks, ReadOnlyCollections readOnlyCollections)
+    private static ReadOnlyDictionary<int, ReadOnlyDictionary<int, LocationContainer>> GetMappedIdsThenWholePercentagesToLocationContainer(AppSettings appSettings, ICompare compare, ReadOnlyCollections readOnlyCollections)
     {
-        ReadOnlyCollection<ExifDirectory> results;
+
-        ReadOnlyCollection<ExifDirectory> exifDirectories = IDistance.GetMapped(appSettings.ResultSettings, appSettings.MetadataSettings, appSettings.PeopleSettings, appSettings.DistanceSettings, appSettings.CompareSettings, compare, ticks, readOnlyCollections);
+        ReadOnlyDictionary<int, ReadOnlyDictionary<int, LocationContainer>> results;
-        if (exifDirectories.Count == 0 && !appSettings.DistanceSettings.SaveSortingWithoutPerson)
+        results = IDistance.GetMappedIdsThenWholePercentagesToLocationContainer(appSettings.ResultSettings,
-            throw new NotSupportedException($"Switch {nameof(appSettings.DistanceSettings.SaveSortingWithoutPerson)}!");
+                                                                                appSettings.MetadataSettings,
-        results = IDistance.GetMappedExifDirectoryWithEncoding(compare, ticks, exifDirectories);
+                                                                                appSettings.PeopleSettings,
+                                                                                appSettings.DistanceSettings,
+                                                                                appSettings.CompareSettings,
+                                                                                compare,
+                                                                                readOnlyCollections);
         if (results.Count == 0 && !appSettings.DistanceSettings.SaveSortingWithoutPerson)
             throw new NotSupportedException($"Switch {nameof(appSettings.DistanceSettings.SaveSortingWithoutPerson)}!");
         return results;
     }
 
-    private void CompareWork(ILogger<Program>? logger, AppSettings appSettings, ICompare compare, long ticks)
+    private void SaveExtracted(AppSettings appSettings, ReadOnlyDictionary<int, ReadOnlyDictionary<int, LocationContainer>> mappedIdsThenWholePercentagesToLocationContainer)
     {
-        const int updated = 0;
+        ReadOnlyCollection<string>? paths;
-        DistanceLimits? distanceLimits;
+        ReadOnlyDictionary<string, ReadOnlyCollection<string>> rootDirectoryFileNameToPaths = GetRootDirectoryFileNameToPaths(appSettings.ResultSettings, appSettings.CompareSettings);
-        logger?.LogInformation("{Ticks}", ticks);
+        foreach (KeyValuePair<int, ReadOnlyDictionary<int, LocationContainer>> keyValuePair in mappedIdsThenWholePercentagesToLocationContainer)
-        ReadOnlyCollection<LocationContainer> matrix;
-        ReadOnlyCollection<SaveContainer> saveContainers;
-        ReadOnlyCollection<ExifDirectory> exifDirectories;
-        ReadOnlyCollection<LocationContainer> preFiltered;
-        ReadOnlyCollection<LocationContainer> postFiltered;
-        ReadOnlyDictionary<string, LocationContainer> onlyOne;
-        bool runToDoCollectionFirst = GetRunToDoCollectionFirst(appSettings, ticks);
-        ReadOnlyCollections readOnlyCollections = GetReadOnlyCollections(appSettings);
-        ReadOnlyCollection<ExifDirectory> mappedExifDirectoryWithEncoding = GetMappedExifDirectoryWithEncoding(appSettings, compare, ticks, readOnlyCollections);
-        ReadOnlyDictionary<int, ReadOnlyDictionary<int, FilePath>> keyValuePairs = IDistance.Extract(appSettings.CompareSettings, mappedExifDirectoryWithEncoding);
-        foreach (string outputResolution in appSettings.CompareSettings.OutputResolutions)
         {
-            if (runToDoCollectionFirst || outputResolution.Any(char.IsNumber))
+            foreach (KeyValuePair<int, LocationContainer> keyValue in keyValuePair.Value)
-                continue;
+            {
-            _ProgressBar?.Dispose();
+                if (keyValue.Value.ExifDirectory is null || keyValue.Value.FaceFile?.Location is null)
-            logger?.LogInformation("{outputResolution}", outputResolution);
+                    continue;
-            exifDirectories = IFace.GetExifDirectories(appSettings.ResultSettings, appSettings.MetadataSettings, appSettings.DistanceSettings, appSettings.CompareSettings, compare, ticks, outputResolution);
+                if (rootDirectoryFileNameToPaths.TryGetValue(keyValue.Value.FilePath.FileNameFirstSegment, out paths))
-            preFiltered = IDistance.GetPreFilterLocationContainer(appSettings.DistanceSettings, appSettings.CompareSettings, compare, ticks, readOnlyCollections, keyValuePairs, exifDirectories);
+                {
-            if (preFiltered.Count == 0)
+                    if (appSettings.CompareSettings.SaveExtractedJavaScriptObjectNotation && keyValue.Value.PersonKeyFormattedAndKeyTicksAndDisplayDirectoryName is not null)
-                continue;
+                        SaveExtractedJavaScriptObjectNotation(keyValue.Key, keyValue.Value, paths);
-            distanceLimits = new(appSettings.DistanceSettings);
+                    if (appSettings.CompareSettings.SaveExtractedFaces)
-            postFiltered = IDistance.GetPostFilterLocationContainer(preFiltered, distanceLimits);
+                        SaveExtractedFace(keyValuePair.Key, keyValue.Key, keyValue.Value.ExifDirectory, keyValue.Value.FaceFile.Location, keyValue.Value.PersonKeyFormattedAndKeyTicksAndDisplayDirectoryName, paths);
-            if (postFiltered.Count == 0)
+                }
-                continue;
+            }
-            matrix = IDistance.GetMatrixLocationContainers(appSettings.DistanceSettings, appSettings.CompareSettings, compare, ticks, mappedExifDirectoryWithEncoding, distanceLimits, postFiltered);
-            if (matrix.Count == 0)
-                continue;
-            onlyOne = IDistance.GetOnlyOne(appSettings.DistanceSettings, matrix);
-            if (onlyOne.Count == 0)
-                continue;
-            saveContainers = IDistance.GetSaveContainers(appSettings.ResultSettings, appSettings.DistanceSettings, appSettings.CompareSettings, compare, ticks, outputResolution, onlyOne);
-            if (saveContainers.Count == 0)
-                continue;
-            IDistance.SaveContainers(appSettings.DistanceSettings, appSettings.CompareSettings, compare, ticks, updated, saveContainers);
         }
     }
 
+    private static void SaveExtracted(AppSettings appSettings, ReadOnlyCollection<LocationContainer> preFiltered)
+    {
+        ReadOnlyCollection<string>? paths;
+        ReadOnlyDictionary<string, ReadOnlyCollection<string>> rootDirectoryFileNameToPaths = GetRootDirectoryFileNameToPaths(appSettings.ResultSettings, appSettings.CompareSettings);
+        foreach (LocationContainer locationContainer in preFiltered)
+        {
+            if (locationContainer?.FilePath?.Id is null || locationContainer?.WholePercentages is null || locationContainer?.ExifDirectory is null || locationContainer?.FaceFile?.Location is null)
+                continue;
+            if (rootDirectoryFileNameToPaths.TryGetValue(locationContainer.FilePath.FileNameFirstSegment, out paths))
+            {
+                if (appSettings.CompareSettings.SaveExtractedJavaScriptObjectNotation && locationContainer.PersonKeyFormattedAndKeyTicksAndDisplayDirectoryName is not null)
+                    SaveExtractedJavaScriptObjectNotation(locationContainer.WholePercentages.Value, locationContainer, paths);
+                if (appSettings.CompareSettings.SaveExtractedFaces)
+                    SaveExtractedFace(locationContainer.FilePath.Id.Value, locationContainer.WholePercentages.Value, locationContainer.ExifDirectory, locationContainer.FaceFile.Location, locationContainer.PersonKeyFormattedAndKeyTicksAndDisplayDirectoryName, paths);
+            }
+        }
+    }
+
+    private static ReadOnlyDictionary<string, ReadOnlyCollection<string>> GetRootDirectoryFileNameToPaths(ResultSettings resultSettings, CompareSettings compareSettings)
+    {
+        Dictionary<string, ReadOnlyCollection<string>> results = [];
+        string key;
+        string extension;
+        List<string>? collection;
+        Dictionary<string, List<string>> keyValuePairs = [];
+        string[] files = !compareSettings.SaveExtractedFaces && !compareSettings.SaveExtractedJavaScriptObjectNotation ? [] : Directory.GetFiles(resultSettings.RootDirectory, "*", SearchOption.AllDirectories);
+        foreach (string file in files)
+        {
+            extension = Path.GetExtension(file);
+            if (resultSettings.IgnoreExtensions.Contains(extension))
+                continue;
+            key = Path.GetFileNameWithoutExtension(file);
+            if (!keyValuePairs.TryGetValue(key, out collection))
+            {
+                keyValuePairs.Add(key, []);
+                if (!keyValuePairs.TryGetValue(key, out collection))
+                    throw new Exception();
+            }
+            collection.Add(file);
+        }
+        foreach (KeyValuePair<string, List<string>> keyValuePair in keyValuePairs)
+            results.Add(keyValuePair.Key, keyValuePair.Value.AsReadOnly());
+        return results.AsReadOnly();
+    }
+
+    private static void SaveExtractedJavaScriptObjectNotation(int wholePercentages, LocationContainer locationContainer, ReadOnlyCollection<string> paths)
+    {
+        string file;
+        string json;
+        foreach (string path in paths)
+        {
+            json = locationContainer.GetWithoutEncoding();
+            file = $"{path}-{wholePercentages}.json";
+            _ = IPath.WriteAllText(file, json, updateDateWhenMatches: false, compareBeforeWrite: true, updateToWhenMatches: null);
+        }
+    }
+
+    private static void SaveExtractedFace(int id, int wholePercentages, ExifDirectory _, Location location, PersonKeyFormattedAndKeyTicksAndDisplayDirectoryName? personKeyFormattedAndKeyTicksAndDisplayDirectoryName, ReadOnlyCollection<string> paths)
+    {
+        int width;
+        int height;
+        string person;
+        foreach (string path in paths)
+        {
+            width = location.Right - location.Left;
+            height = location.Bottom - location.Top;
+            person = personKeyFormattedAndKeyTicksAndDisplayDirectoryName is null ? string.Empty : $"-{personKeyFormattedAndKeyTicksAndDisplayDirectoryName.DisplayDirectoryName}";
+            ExtractFace(file: path,
+                    width: width,
+                    height: height,
+                    left: location.Left,
+                    top: location.Top,
+                    suffix: $"-{id}-{wholePercentages}{person}-face.jpg");
+        }
+    }
+
+    private static void ExtractFace(string file, float width, float height, double left, double top, string suffix)
+    {
+        RectangleF rectangle = new((float)left, (float)top, width, height);
+        using Bitmap source = new(file);
+        using Bitmap bitmap = new((int)width, (int)height);
+        using (Graphics graphics = Graphics.FromImage(bitmap))
+            graphics.DrawImage(source, new RectangleF(0, 0, width, height), rectangle, GraphicsUnit.Pixel);
+        bitmap.Save($"{file}{suffix}");
+    }
+
 }

Compare/Models/AppSettings.cs

@@ -1,7 +1,7 @@
 using Microsoft.Extensions.Configuration;
 using System.Text.Json;
 using System.Text.Json.Serialization;
-using View_by_Distance.Shared.Models;
+using Phares.Shared.Models;
 
 namespace View_by_Distance.Compare.Models;
 
@@ -20,16 +20,16 @@ public record AppSettings(ResultSettings ResultSettings,
 
     private static void Verify(AppSettings appSettings)
     {
-        if (appSettings.DistanceSettings.RangeDaysDeltaTolerance.Length != 3)
+        if (appSettings.DistanceSettings.RangeDaysDeltaTolerance.Length is not 3 and not 6)
             throw new NullReferenceException(nameof(appSettings.DistanceSettings.RangeDaysDeltaTolerance));
-        if (appSettings.DistanceSettings.RangeDistanceTolerance.Length != 3)
+        if (appSettings.DistanceSettings.RangeDistanceTolerance.Length is not 3 and not 6)
             throw new NullReferenceException(nameof(appSettings.DistanceSettings.RangeDistanceTolerance));
-        if (appSettings.DistanceSettings.RangeFaceAreaTolerance.Length != 3)
+        if (appSettings.DistanceSettings.RangeFaceAreaTolerance.Length is not 3 and not 6)
             throw new NullReferenceException(nameof(appSettings.DistanceSettings.RangeFaceAreaTolerance));
-        if (appSettings.DistanceSettings.RangeFaceConfidence.Length != 3)
+        if (appSettings.DistanceSettings.RangeFaceConfidence.Length is not 3 and not 6)
             throw new NullReferenceException(nameof(appSettings.DistanceSettings.RangeFaceConfidence));
         _ = DateTime.Now.AddDays(-appSettings.DistanceSettings.RangeDaysDeltaTolerance[1]);
-        if (appSettings.DistanceSettings.SaveSortingWithoutPerson && appSettings.PeopleSettings.JLinks.Length > 0)
+        if (appSettings.DistanceSettings.SaveSortingWithoutPerson && appSettings.PeopleSettings.JLinks.Where(l => !string.IsNullOrEmpty(l)).Any())
             throw new Exception("Settings has SaveSortingWithoutPerson and JLinks!");
         if (appSettings.DistanceSettings.SaveSortingWithoutPerson && !string.IsNullOrEmpty(appSettings.DistanceSettings.FocusModel))
             throw new Exception("Settings has SaveSortingWithoutPerson and FocusModel!");

Compare/Models/CompareSettings.cs

@@ -1,4 +1,5 @@
 
+using Phares.Shared.Models.Properties;
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
@@ -8,11 +9,10 @@ public record CompareSettings(string Company,
                               string FacesFileNameExtension,
                               string FacesHiddenFileNameExtension,
                               string FacesPartsFileNameExtension,
-                              string[] IgnoreExtensions,
                               int MaxDegreeOfParallelism,
                               string[] OutputResolutions,
-                              string[] ValidImageFormatExtensions,
+                              bool SaveExtractedFaces,
-                              string[] ValidVideoFormatExtensions) : Shared.Models.Properties.ICompareSettings
+                              bool SaveExtractedJavaScriptObjectNotation) : ICompareSettings
 {
 
     public override string ToString()

Compare/Program.cs

@@ -23,7 +23,7 @@ public class Program
         {
             if (args is null)
                 throw new Exception("args is null!");
-            Shared.Models.Console console = new();
+            Phares.Shared.Models.Console console = new();
             _ = new Compare(args, logger, appSettings, silentIndex > -1, console);
         }
         catch (Exception ex)

Distance/.vscode/read-me.md

@@ -0,0 +1 @@
+# Read Me

Distance/AA.Distance.csproj

@@ -1,46 +1,54 @@
 <Project Sdk="Microsoft.NET.Sdk">
-    <PropertyGroup>
+  <PropertyGroup>
-        <ImplicitUsings>enable</ImplicitUsings>
+    <ImplicitUsings>enable</ImplicitUsings>
-        <Nullable>enable</Nullable>
+    <Nullable>enable</Nullable>
-        <OutputType>library</OutputType>
+    <OutputType>library</OutputType>
-        <RuntimeIdentifier>win-x64</RuntimeIdentifier>
+    <RuntimeIdentifier>win-x64</RuntimeIdentifier>
-        <TargetFramework>net9.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
-    </PropertyGroup>
+  </PropertyGroup>
-    <PropertyGroup>
+  <PropertyGroup>
-        <PackageId>Phares.AA.Distance</PackageId>
+    <HoursSinceNovember122024>$([System.Math]::Floor($([MSBuild]::Divide($([MSBuild]::Subtract($([System.DateTimeOffset]::UtcNow.ToUnixTimeSeconds()), 1731369600)), 3600))))</HoursSinceNovember122024>
-        <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
+  </PropertyGroup>
-        <Version>9.0.100.0</Version>
+  <PropertyGroup>
-        <Authors>Mike Phares</Authors>
+    <PackageId>Phares.Distance</PackageId>
-        <Company>Phares</Company>
+    <Version>9.0.104.$([System.Math]::Floor($([MSBuild]::Divide($([MSBuild]::Subtract($([System.DateTimeOffset]::UtcNow.ToUnixTimeSeconds()), 1731369600)), 3600))))</Version>
-        <IncludeSymbols>true</IncludeSymbols>
+    <Company>Phares</Company>
-        <SymbolPackageFormat>snupkg</SymbolPackageFormat>
+    <Authors>Mike Phares</Authors>
-    </PropertyGroup>
+    <IncludeSymbols>true</IncludeSymbols>
-    <PropertyGroup>
+    <PackageReadmeFile>read-me.md</PackageReadmeFile>
-        <IsWindows Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Windows)))' == 'true'">true</IsWindows>
+    <SymbolPackageFormat>snupkg</SymbolPackageFormat>
-        <IsOSX Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::OSX)))' == 'true'">true</IsOSX>
+    <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
-        <IsLinux Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Linux)))' == 'true'">true</IsLinux>
+    <PackageLicenseExpression>MIT</PackageLicenseExpression>
-    </PropertyGroup>
+  </PropertyGroup>
-    <PropertyGroup Condition="'$(IsWindows)'=='true'">
+  <PropertyGroup>
-        <DefineConstants>Windows</DefineConstants>
+    <IsWindows Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Windows)))' == 'true'">true</IsWindows>
-    </PropertyGroup>
+    <IsOSX Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::OSX)))' == 'true'">true</IsOSX>
-    <PropertyGroup Condition="'$(IsOSX)'=='true'">
+    <IsLinux Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Linux)))' == 'true'">true</IsLinux>
-        <DefineConstants>OSX</DefineConstants>
+  </PropertyGroup>
-    </PropertyGroup>
+  <PropertyGroup Condition="'$(IsWindows)'=='true'">
-    <PropertyGroup Condition="'$(IsLinux)'=='true'">
+    <DefineConstants>Windows</DefineConstants>
-        <DefineConstants>Linux</DefineConstants>
+  </PropertyGroup>
-    </PropertyGroup>
+  <PropertyGroup Condition="'$(IsOSX)'=='true'">
-    <ItemGroup Condition="'$(RuntimeIdentifier)' == 'browser-wasm'">
+    <DefineConstants>OSX</DefineConstants>
-        <SupportedPlatform Include="browser" />
+  </PropertyGroup>
-    </ItemGroup>
+  <PropertyGroup Condition="'$(IsLinux)'=='true'">
-    <ItemGroup>
+    <DefineConstants>Linux</DefineConstants>
-        <PackageReference Include="Humanizer.Core" Version="2.14.1" />
+  </PropertyGroup>
-        <PackageReference Include="MetadataExtractor" Version="2.8.1" />
+  <ItemGroup Condition="'$(RuntimeIdentifier)' == 'browser-wasm'">
-        <PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.0" />
+    <SupportedPlatform Include="browser" />
-        <PackageReference Include="WindowsShortcutFactory" Version="1.2.0" />
+  </ItemGroup>
-    </ItemGroup>
+  <ItemGroup>
-    <ItemGroup>
+    <None Include=".vscode\read-me.md" Pack="true" PackagePath="\"/>
-        <ProjectReference Include="..\FaceRecognitionDotNet\AA.FaceRecognitionDotNet.csproj" />
+  </ItemGroup>
-        <ProjectReference Include="..\Metadata\AA.Metadata.csproj" />
+  <ItemGroup>
-        <ProjectReference Include="..\Shared\AA.Shared.csproj" />
+    <PackageReference Include="Humanizer.Core" Version="2.14.1" />
-    </ItemGroup>
+    <PackageReference Include="MetadataExtractor" Version="2.8.1" />
+    <PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.1" />
+    <PackageReference Include="WindowsShortcutFactory" Version="1.2.0" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\FaceRecognitionDotNet\AA.FaceRecognitionDotNet.csproj" />
+    <ProjectReference Include="..\Metadata\AA.Metadata.csproj" />
+    <ProjectReference Include="..\Shared\AA.Shared.csproj" />
+  </ItemGroup>
 </Project>

Distance/Models/C_Resize.cs

@@ -1,3 +1,3 @@
-namespace View_by_Distance.Metadata.Models;
+namespace Phares.Metadata.Models;
 
 public class C_Resize() { }

Distance/Models/D2_FaceParts.cs

@@ -1,3 +1,3 @@
-namespace View_by_Distance.Metadata.Models;
+namespace Phares.Metadata.Models;
 
 public class D2_FaceParts() { }

Distance/Models/DistanceLimits.cs

@@ -1,7 +1,7 @@
-using View_by_Distance.Shared.Models;
+using Phares.Shared.Models;
-using View_by_Distance.Shared.Models.Methods;
+using Phares.Shared.Models.Methods;
 
-namespace View_by_Distance.Metadata.Models;
+namespace Phares.Metadata.Models;
 
 public class DistanceLimits : IDistanceLimits
 {

Distance/Models/E_Distance.cs

@@ -1,3 +1,3 @@
-namespace View_by_Distance.Metadata.Models;
+namespace Phares.Metadata.Models;
 
 public class E_Distance() { }

Distance/Models/IDistanceLimits.cs

@@ -1,4 +1,4 @@
-namespace View_by_Distance.Shared.Models.Methods;
+namespace Phares.Shared.Models.Methods;
 
 public interface IDistanceLimits
 {

Distance/Models/Stateless/FaceEncodingLogic.cs

@@ -1,34 +1,129 @@
+using Phares.Shared.Models;
+using Phares.Shared.Models.Properties;
+using Phares.Shared.Models.Stateless;
 using System.Collections.ObjectModel;
-using System.Text.Json;
-using View_by_Distance.Shared.Models;
-using View_by_Distance.Shared.Models.Stateless;
 
 namespace View_by_Distance.Distance.Models.Stateless;
 
 internal static class FaceEncodingLogic
 {
 
-    internal static ReadOnlyCollection<ExifDirectory> GetMappedExifDirectoryWithEncoding(ICompare compare, long ticks, ReadOnlyCollection<ExifDirectory> exifDirectories)
+    internal static void MoveUnableToMatch(FilePath filePath)
     {
-        List<ExifDirectory> results = [];
+        string checkFile = $"{filePath.FullName}.unk";
-        string? json;
+        if (File.Exists(filePath.FullName) && !File.Exists(checkFile))
-        FaceEncoding? faceEncoding;
+            File.Move(filePath.FullName, checkFile);
-        ExifDirectory exifDirectory;
+    }
-        FaceRecognitionDotNet.Models.FaceEncoding? encoding;
+
-        int totalSeconds = (int)Math.Floor(new TimeSpan(DateTime.Now.Ticks - ticks).TotalSeconds);
+    internal static ReadOnlyDictionary<int, ReadOnlyDictionary<int, LocationContainer>> GetMappedIdsThenWholePercentagesToLocationContainer(ResultSettings resultSettings, MetadataSettings metadataSettings, PeopleSettings peopleSettings, DistanceSettings distanceSettings, ICompareSettings compareSettings, ICompare compare, ReadOnlyCollections readOnlyCollections)
+    {
+        ReadOnlyDictionary<int, ReadOnlyDictionary<int, LocationContainer>> results;
+        List<LocationContainer?> locationContainers = [];
+        int maxDegreeOfParallelism = compareSettings.MaxDegreeOfParallelism;
+        ParallelOptions parallelOptions = new() { MaxDegreeOfParallelism = maxDegreeOfParallelism };
+        ReadOnlyCollection<ExifDirectory> exifDirectories = MappedLogicA.GetMapped(resultSettings,
+                                                                                   metadataSettings,
+                                                                                   peopleSettings,
+                                                                                   distanceSettings,
+                                                                                   compareSettings,
+                                                                                   compare,
+                                                                                   readOnlyCollections);
+        int totalSeconds = (int)Math.Floor(new TimeSpan(DateTime.Now.Ticks - compare.Ticks).TotalSeconds);
         string message = $") Building Mapped with Encoding Face Files Collection - {totalSeconds} total second(s)";
         compare.ConstructProgressBar(exifDirectories.Count, message);
-        foreach (ExifDirectory e in exifDirectories)
+        _ = Parallel.For(0, exifDirectories.Count, parallelOptions, (i, state) =>
+            LocationContainersParallelFor(distanceSettings, compareSettings, compare, exifDirectories, i, locationContainers));
+        results = GetMappedIdsThenWholePercentagesToLocationContainer(locationContainers);
+        return results;
+    }
+
+    private static void LocationContainersParallelFor(DistanceSettings distanceSettings, ICompareSettings compareSettings, ICompare compare, ReadOnlyCollection<ExifDirectory> exifDirectories, int i, List<LocationContainer?> results)
+    {
+        compare.Tick();
+        ExifDirectory exifDirectory = exifDirectories[i];
+        LocationContainer? locationContainer = GetLocationContainer(distanceSettings, compareSettings, exifDirectory);
+        results.Add(locationContainer);
+    }
+
+    internal static LocationContainer? GetLocationContainer(DistanceSettings distanceSettings, ICompareSettings compareSettings, ExifDirectory exifDirectory)
+    {
+        LocationContainer? result;
+        DateOnly dateOnly;
+        FaceFile? faceFile;
+        int? wholePercentages;
+        FaceEncoding? faceEncoding;
+        FaceRecognitionDotNet.Models.FaceEncoding? encoding;
+        wholePercentages = IMapping.GetWholePercentages(compareSettings, exifDirectory.FilePath);
+        if (wholePercentages is null)
         {
-            compare.Tick();
+            if (distanceSettings.DistanceMoveUnableToMatch)
-            json = Metadata.Models.Stateless.IMetadata.GetFaceEncoding(e);
+                MoveUnableToMatch(exifDirectory.FilePath);
-            faceEncoding = json is null ? null : JsonSerializer.Deserialize(json, FaceEncodingGenerationContext.Default.FaceEncoding);
+            result = null;
-            if (faceEncoding is null)
-                continue;
-            encoding = FaceRecognitionDotNet.Models.FaceRecognition.LoadFaceEncoding(faceEncoding.RawEncoding);
-            exifDirectory = ExifDirectory.Get(encoding, e);
-            results.Add(exifDirectory);
         }
+        else
+        {
+            faceFile = GetFaceFile(distanceSettings, exifDirectory);
+            if (faceFile is null)
+                result = null;
+            else
+            {
+                dateOnly = DateOnly.FromDateTime(new DateTime(exifDirectory.FilePath.CreationTicks));
+                faceEncoding = Phares.Metadata.Models.Stateless.IMetadata.GetFaceEncoding(exifDirectory);
+                if (faceEncoding is null)
+                    result = null;
+                else
+                {
+                    encoding = FaceRecognitionDotNet.Models.FaceRecognition.LoadFaceEncoding(faceEncoding.RawEncoding);
+                    result = new(CreationDateOnly: dateOnly,
+                                 ExifDirectory: exifDirectory,
+                                 Encoding: encoding,
+                                 FaceFile: faceFile,
+                                 FilePath: exifDirectory.FilePath,
+                                 LengthPermyriad: null,
+                                 LengthSource: null,
+                                 PersonKeyFormattedAndKeyTicksAndDisplayDirectoryName: exifDirectory.PersonKeyFormattedAndKeyTicksAndDisplayDirectoryName,
+                                 WholePercentages: wholePercentages);
+                }
+            }
+        }
+        return result;
+    }
+
+    private static FaceFile? GetFaceFile(DistanceSettings distanceSettings, ExifDirectory exifDirectory)
+    {
+        FaceFile? result = Phares.Metadata.Models.Stateless.IMetadata.GetFaceFile(exifDirectory);
+        if (result is null || result.Location is null)
+        {
+            if (distanceSettings.DistanceMoveUnableToMatch)
+                MoveUnableToMatch(exifDirectory.FilePath);
+            result = null;
+        }
+        return result;
+    }
+
+    private static ReadOnlyDictionary<int, ReadOnlyDictionary<int, LocationContainer>> GetMappedIdsThenWholePercentagesToLocationContainer(List<LocationContainer?> locationContainers)
+    {
+        Dictionary<int, ReadOnlyDictionary<int, LocationContainer>> results = [];
+        int id;
+        int wholePercentages;
+        Dictionary<int, LocationContainer>? keyValue;
+        Dictionary<int, Dictionary<int, LocationContainer>> keyValuePairs = [];
+        foreach (LocationContainer? locationContainer in locationContainers)
+        {
+            if (locationContainer?.FilePath.Id is null || locationContainer.WholePercentages is null)
+                continue;
+            id = locationContainer.FilePath.Id.Value;
+            wholePercentages = locationContainer.WholePercentages.Value;
+            if (!keyValuePairs.TryGetValue(id, out keyValue))
+            {
+                keyValuePairs.Add(id, []);
+                if (!keyValuePairs.TryGetValue(id, out keyValue))
+                    throw new Exception();
+            }
+            keyValue.Add(wholePercentages, locationContainer);
+        }
+        foreach (KeyValuePair<int, Dictionary<int, LocationContainer>> keyValuePair in keyValuePairs)
+            results.Add(keyValuePair.Key, keyValuePair.Value.AsReadOnly());
         return results.AsReadOnly();
     }
 

Distance/Models/Stateless/FilterLogicA.cs

@@ -1,8 +1,7 @@
 using System.Collections.ObjectModel;
-using System.Text.Json;
+using Phares.Shared.Models;
-using View_by_Distance.Shared.Models;
+using Phares.Shared.Models.Properties;
-using View_by_Distance.Shared.Models.Properties;
+using Phares.Shared.Models.Stateless;
-using View_by_Distance.Shared.Models.Stateless;
 
 namespace View_by_Distance.Distance.Models.Stateless;
 
@@ -32,20 +31,19 @@ internal static class FilterLogicA
         return result;
     }
 
-    internal static ReadOnlyCollection<LocationContainer> GetPreFilterLocationContainer(DistanceSettings distanceSettings, ICompareSettings compareSettings, ICompare compare, long ticks, ReadOnlyCollections readOnlyCollections, ReadOnlyDictionary<int, ReadOnlyDictionary<int, FilePath>> keyValuePairs, ReadOnlyCollection<ExifDirectory> exifDirectories)
+    internal static ReadOnlyCollection<LocationContainer> GetPreFilterLocationContainer(DistanceSettings distanceSettings, ICompareSettings compareSettings, ICompare compare, ReadOnlyCollections readOnlyCollections, ReadOnlyDictionary<int, ReadOnlyDictionary<int, LocationContainer>> mappedIdsThenWholePercentagesToLocationContainer, ReadOnlyCollection<ExifDirectory> exifDirectories)
     {
         List<LocationContainer> results = [];
-        string? json;
         string? model;
         bool? canReMap;
         bool? isFocusPerson;
         bool? inSkipCollection;
         FaceEncoding? faceEncoding;
-        ReadOnlyDictionary<int, FilePath>? keyValues;
         FaceRecognitionDotNet.Models.FaceEncoding? encoding;
+        ReadOnlyDictionary<int, LocationContainer>? keyValues;
         List<FilePathAndWholePercentages>? wholePercentagesCollection;
-        ReadOnlyCollection<LocationContainer> locationContainers = FilterLogicB.GetLocationContainers(distanceSettings, compareSettings, compare, ticks, exifDirectories, nameof(FilterLogicA));
+        ReadOnlyCollection<LocationContainer> locationContainers = FilterLogicB.GetLocationContainers(distanceSettings, compareSettings, compare, exifDirectories, nameof(FilterLogicA));
-        int totalSeconds = (int)Math.Floor(new TimeSpan(DateTime.Now.Ticks - ticks).TotalSeconds);
+        int totalSeconds = (int)Math.Floor(new TimeSpan(DateTime.Now.Ticks - compare.Ticks).TotalSeconds);
         string message = $") PreFiltering LocationContainers Face Files Collection - {totalSeconds} total second(s)";
         compare.ConstructProgressBar(locationContainers.Count, message);
         foreach (LocationContainer locationContainer in locationContainers)
@@ -53,7 +51,7 @@ internal static class FilterLogicA
             compare.Tick();
             if (locationContainer.FilePath.Id is null || locationContainer.WholePercentages is null)
                 continue;
-            if (keyValuePairs.TryGetValue(locationContainer.FilePath.Id.Value, out keyValues))
+            if (mappedIdsThenWholePercentagesToLocationContainer.TryGetValue(locationContainer.FilePath.Id.Value, out keyValues))
             {
                 if (keyValues.ContainsKey(locationContainer.WholePercentages.Value))
                     continue;
@@ -71,7 +69,7 @@ internal static class FilterLogicA
                 continue;
             if (!string.IsNullOrEmpty(distanceSettings.FocusModel))
             {
-                model = Metadata.Models.Stateless.IMetadata.GetModel(locationContainer.ExifDirectory);
+                model = IMetaBase.GetModel(locationContainer.ExifDirectory);
                 if (string.IsNullOrEmpty(model) || !model.Contains(distanceSettings.FocusModel))
                     continue;
             }
@@ -80,12 +78,11 @@ internal static class FilterLogicA
                 if (!locationContainer.FilePath.DirectoryFullPath.Contains(distanceSettings.FocusDirectory))
                     continue;
             }
-            json = Metadata.Models.Stateless.IMetadata.GetFaceEncoding(locationContainer.ExifDirectory);
+            faceEncoding = Phares.Metadata.Models.Stateless.IMetadata.GetFaceEncoding(locationContainer.ExifDirectory);
-            faceEncoding = json is null ? null : JsonSerializer.Deserialize(json, FaceEncodingGenerationContext.Default.FaceEncoding);
             if (faceEncoding is null)
                 continue;
             encoding = FaceRecognitionDotNet.Models.FaceRecognition.LoadFaceEncoding(faceEncoding.RawEncoding);
-            results.Add(LocationContainer.Get(locationContainer, encoding, keepExifDirectory: false));
+            results.Add(LocationContainer.Get(locationContainer, encoding));
         }
         return results.AsReadOnly();
     }

Distance/Models/Stateless/FilterLogicB.cs

@@ -1,80 +1,37 @@
 using System.Collections.ObjectModel;
-using System.Drawing;
+using Phares.Shared.Models;
-using System.Text.Json;
+using Phares.Shared.Models.Properties;
-using View_by_Distance.Shared.Models;
+using Phares.Shared.Models.Stateless;
-using View_by_Distance.Shared.Models.Properties;
-using View_by_Distance.Shared.Models.Stateless;
 
 namespace View_by_Distance.Distance.Models.Stateless;
 
 internal static class FilterLogicB
 {
 
-    private static void MoveUnableToMatch(FilePath filePath)
+    internal static ReadOnlyCollection<LocationContainer> GetLocationContainers(DistanceSettings distanceSettings, ICompareSettings compareSettings, ICompare compare, ReadOnlyCollection<ExifDirectory> exifDirectories, string sourceClass)
-    {
-        string checkFile = $"{filePath.FullName}.unk";
-        if (File.Exists(filePath.FullName) && !File.Exists(checkFile))
-            File.Move(filePath.FullName, checkFile);
-    }
-
-    private static void LocationContainersParallelFor(DistanceSettings distanceSettings, ICompareSettings compareSettings, List<LocationContainer> locationContainers, ExifDirectory exifDirectory)
-    {
-        string? json;
-        if (exifDirectory.FilePath.Id is null)
-            return;
-        DateOnly dateOnly = DateOnly.FromDateTime(new DateTime(exifDirectory.FilePath.CreationTicks));
-        int? wholePercentages = IMapping.GetWholePercentages(compareSettings, exifDirectory.FilePath);
-        if (wholePercentages is null)
-        {
-            if (distanceSettings.DistanceMoveUnableToMatch)
-                MoveUnableToMatch(exifDirectory.FilePath);
-            return;
-        }
-        json = Metadata.Models.Stateless.IMetadata.GetOutputResolution(exifDirectory);
-        if (json is null || !json.Contains(nameof(DateTime)))
-        {
-            if (distanceSettings.DistanceMoveUnableToMatch)
-                MoveUnableToMatch(exifDirectory.FilePath);
-            return;
-        }
-        FaceFile? faceFile = JsonSerializer.Deserialize(json, FaceFileGenerationContext.Default.FaceFile);
-        if (faceFile is null || faceFile.Location is null)
-        {
-            if (distanceSettings.DistanceMoveUnableToMatch)
-                MoveUnableToMatch(exifDirectory.FilePath);
-            return;
-        }
-        RectangleF? rectangle = Shared.Models.Stateless.ILocation.GetPercentagesRectangle(distanceSettings, wholePercentages.Value);
-        if (rectangle is null)
-            return;
-        LocationContainer locationContainer = new(dateOnly,
-                                                  exifDirectory,
-                                                  exifDirectory.Encoding,
-                                                  faceFile,
-                                                  exifDirectory.FilePath,
-                                                  null,
-                                                  null,
-                                                  exifDirectory.PersonKeyFormattedAndKeyTicksAndDisplayDirectoryName,
-                                                  rectangle,
-                                                  wholePercentages);
-        lock (locationContainers)
-            locationContainers.Add(locationContainer);
-    }
-
-    internal static ReadOnlyCollection<LocationContainer> GetLocationContainers(DistanceSettings distanceSettings, ICompareSettings compareSettings, ICompare compare, long ticks, ReadOnlyCollection<ExifDirectory> exifDirectories, string sourceClass)
     {
         List<LocationContainer> results = [];
         int maxDegreeOfParallelism = compareSettings.MaxDegreeOfParallelism;
-        int totalSeconds = (int)Math.Floor(new TimeSpan(DateTime.Now.Ticks - ticks).TotalSeconds);
         ParallelOptions parallelOptions = new() { MaxDegreeOfParallelism = maxDegreeOfParallelism };
+        int totalSeconds = (int)Math.Floor(new TimeSpan(DateTime.Now.Ticks - compare.Ticks).TotalSeconds);
         string message = $") Building LocationContainers Face Files Collection {sourceClass} - {totalSeconds} total second(s)";
         compare.ConstructProgressBar(exifDirectories.Count, message);
         _ = Parallel.For(0, exifDirectories.Count, parallelOptions, (i, state) =>
-        {
+            LocationContainersParallelFor(distanceSettings, compareSettings, compare, exifDirectories, i, results));
-            compare.Tick();
-            LocationContainersParallelFor(distanceSettings, compareSettings, results, exifDirectories[i]);
-        });
         return results.AsReadOnly();
     }
 
+    private static void LocationContainersParallelFor(DistanceSettings distanceSettings, ICompareSettings compareSettings, ICompare compare, ReadOnlyCollection<ExifDirectory> exifDirectories, int i, List<LocationContainer> results)
+    {
+        compare.Tick();
+        ExifDirectory exifDirectory = exifDirectories[i];
+        if (exifDirectory.FilePath.Id is null)
+            return;
+        LocationContainer? locationContainer = FaceEncodingLogic.GetLocationContainer(distanceSettings, compareSettings, exifDirectory);
+        if (locationContainer is null)
+            return;
+        lock (results)
+            results.Add(locationContainer);
+    }
+
 }

Distance/Models/Stateless/FilterLogicC.cs

@@ -1,7 +1,7 @@
 using System.Collections.ObjectModel;
-using View_by_Distance.Metadata.Models;
+using Phares.Metadata.Models;
-using View_by_Distance.Shared.Models;
+using Phares.Shared.Models;
-using View_by_Distance.Shared.Models.Stateless;
+using Phares.Shared.Models.Stateless;
 
 namespace View_by_Distance.Distance.Models.Stateless;
 
@@ -24,23 +24,25 @@ internal static class FilterLogicC
         return results.AsReadOnly();
     }
 
-    private static ReadOnlyCollection<LocationContainer> GetCombined(DistanceSettings distanceSettings, Shared.Models.Properties.ICompareSettings compareSettings, ICompare compare, long ticks, ReadOnlyCollection<ExifDirectory> exifDirectories, ReadOnlyCollection<LocationContainer> postFiltered)
+    private static ReadOnlyCollection<LocationContainer> GetCombined(ReadOnlyDictionary<int, ReadOnlyDictionary<int, LocationContainer>> mappedIdsThenWholePercentagesToLocationContainer, ReadOnlyCollection<LocationContainer> postFiltered)
     {
         List<LocationContainer> results = [];
         foreach (LocationContainer locationContainer in postFiltered)
             results.Add(locationContainer);
-        ReadOnlyCollection<LocationContainer> locationContainers = FilterLogicB.GetLocationContainers(distanceSettings, compareSettings, compare, ticks, exifDirectories, nameof(FilterLogicC));
+        foreach (KeyValuePair<int, ReadOnlyDictionary<int, LocationContainer>> keyValuePair in mappedIdsThenWholePercentagesToLocationContainer)
-        foreach (LocationContainer locationContainer in locationContainers)
+        {
-            results.Add(locationContainer);
+            foreach (KeyValuePair<int, LocationContainer> keyValue in keyValuePair.Value)
+                results.Add(keyValue.Value);
+        }
         return results.AsReadOnly();
     }
 
-    internal static ReadOnlyCollection<LocationContainer> GetMatrixLocationContainers(DistanceSettings distanceSettings, Shared.Models.Properties.ICompareSettings compareSettings, ICompare compare, long ticks, ReadOnlyCollection<ExifDirectory> mappedExifDirectoryWithEncoding, DistanceLimits distanceLimits, ReadOnlyCollection<LocationContainer> postFiltered)
+    internal static ReadOnlyCollection<LocationContainer> GetMatrixLocationContainers(DistanceSettings distanceSettings, ICompare compare, ReadOnlyDictionary<int, ReadOnlyDictionary<int, LocationContainer>> mappedIdsThenWholePercentagesToLocationContainer, DistanceLimits distanceLimits, ReadOnlyCollection<LocationContainer> postFiltered)
     {
         List<LocationContainer> results = [];
         ReadOnlyCollection<LocationContainer> collection;
-        ReadOnlyCollection<LocationContainer> locationContainers = GetCombined(distanceSettings, compareSettings, compare, ticks, mappedExifDirectoryWithEncoding, postFiltered);
+        ReadOnlyCollection<LocationContainer> locationContainers = GetCombined(mappedIdsThenWholePercentagesToLocationContainer, postFiltered);
-        string message = $") Building Matrix - {(int)Math.Floor(new TimeSpan(DateTime.Now.Ticks - ticks).TotalSeconds)} total second(s)";
+        string message = $") Building Matrix - {(int)Math.Floor(new TimeSpan(DateTime.Now.Ticks - compare.Ticks).TotalSeconds)} total second(s)";
         compare.ConstructProgressBar(postFiltered.Count, message);
         foreach (LocationContainer locationContainer in postFiltered)
         {

Distance/Models/Stateless/FilterLogicD.cs

@@ -1,9 +1,9 @@
 using Humanizer;
 using System.Collections.ObjectModel;
-using View_by_Distance.Metadata.Models;
+using Phares.Metadata.Models;
-using View_by_Distance.Shared.Models;
+using Phares.Shared.Models;
-using View_by_Distance.Shared.Models.Properties;
+using Phares.Shared.Models.Properties;
-using View_by_Distance.Shared.Models.Stateless;
+using Phares.Shared.Models.Stateless;
 using WindowsShortcutFactory;
 
 namespace View_by_Distance.Distance.Models.Stateless;
@@ -11,11 +11,21 @@ namespace View_by_Distance.Distance.Models.Stateless;
 internal static class FilterLogicD
 {
 
-    internal record RecordA(long? Ticks, string? Directory);
+    internal static string GetResizeContentDirectory(ResultSettings resultSettings, string cContentDirectory, FilePath filePath)
+    {
+        string result;
+        CombinedEnumAndIndex cei = IPath.GetCombinedEnumAndIndex(resultSettings, filePath);
+        result = Path.Combine(cContentDirectory, cei.Combined);
+        return result;
+    }
 
-    internal record RecordB(string ByValue, bool IsByMapping, bool IsBySorting);
+    internal static string GetFacePartsDirectoryX(ResultSettings resultSettings, string d2FacePartsContentDirectory, FilePath filePath)
-
+    {
-    internal record RecordC(string? DebugDirectory, string? Directory, long? Ticks, string? PersonDirectory);
+        string result;
+        CombinedEnumAndIndex cei = IPath.GetCombinedEnumAndIndex(resultSettings, filePath);
+        result = Path.Combine(d2FacePartsContentDirectory, cei.Combined, filePath.NameWithoutExtension);
+        return result;
+    }
 
     internal static RecordB Get(int? useFiltersCounter, bool saveIndividually, bool sortingContainersAny, string forceSingleImageHumanized, int? distancePermyriad, int? by, string? displayDirectoryName)
     {
@@ -39,142 +49,13 @@ internal static class FilterLogicD
             else if (isBySorting && useFiltersCounter.HasValue)
                 byValue = $"{nameof(IMapLogic.Sorting)}{(!isDefaultName ? "-A" : "-Z")} Modified Filters - {useFiltersCounter.Value}";
             else
-            {
+                byValue = IDistance.Get(saveIndividually, forceSingleImageHumanized, by.Value, isDefaultName);
-                byValue = $"{by.Value switch
-                {
-                    IMapLogic.Mapping => nameof(IMapLogic.Mapping),
-                    IMapLogic.Sorting => saveIndividually ? nameof(IMapLogic.Individually) : nameof(IMapLogic.Sorting),
-                    IMapLogic.ForceSingleImage => forceSingleImageHumanized,
-                    _ => throw new NotImplementedException()
-                }}{(!isDefaultName ? "-A" : "-Z")}";
-            }
         }
         result = new(byValue, isByMapping, isBySorting);
         return result;
     }
 
-    private static RecordB Get(int? useFiltersCounter, bool saveIndividually, bool sortingContainersAny, string forceSingleImageHumanized, int? distancePermyriad, PersonKeyFormattedAndKeyTicksAndDisplayDirectoryName? personKeyFormattedAndKeyTicksAndDisplayDirectoryName) =>
+    internal static void SaveContainers(DistanceSettings distanceSettings, ICompareSettings compareSettings, ICompare compare, int? updated, ReadOnlyCollection<SaveContainer> saveContainers)
-        Get(useFiltersCounter, saveIndividually, sortingContainersAny, forceSingleImageHumanized, distancePermyriad, personKeyFormattedAndKeyTicksAndDisplayDirectoryName is null ? null : IMapLogic.Mapping, personKeyFormattedAndKeyTicksAndDisplayDirectoryName?.DisplayDirectoryName);
-
-    private static RecordC Get(string eDistanceContentTicksDirectory, RecordB recordB, PersonKeyFormattedAndKeyTicksAndDisplayDirectoryName? personKeyFormattedAndKeyTicksAndDisplayDirectoryName, string segmentB)
-    {
-        RecordC result;
-        if (string.IsNullOrEmpty(personKeyFormattedAndKeyTicksAndDisplayDirectoryName?.DisplayDirectoryName))
-            throw new NotImplementedException();
-        long? ticks = null;
-        string? debugDirectory = Path.Combine(eDistanceContentTicksDirectory, recordB.ByValue, personKeyFormattedAndKeyTicksAndDisplayDirectoryName.KeyFormatted, personKeyFormattedAndKeyTicksAndDisplayDirectoryName.DisplayDirectoryName);
-        string? directory = Path.Combine(eDistanceContentTicksDirectory, recordB.ByValue, personKeyFormattedAndKeyTicksAndDisplayDirectoryName.KeyFormatted, segmentB);
-        string? personDirectory = Path.Combine(directory, personKeyFormattedAndKeyTicksAndDisplayDirectoryName.DisplayDirectoryName, "lnk");
-        result = new(debugDirectory, directory, ticks, personDirectory);
-        return result;
-    }
-
-    internal static string GetResizeContentDirectory(ResultSettings resultSettings, string cContentDirectory, FilePath filePath)
-    {
-        string result;
-        (string directoryName, _) = IPath.GetDirectoryNameAndIndex(resultSettings, filePath);
-        result = Path.Combine(cContentDirectory, directoryName);
-        return result;
-    }
-
-    internal static string GetFacePartsDirectoryX(ResultSettings resultSettings, string d2FacePartsContentDirectory, FilePath filePath)
-    {
-        string result;
-        (string directoryName, _) = IPath.GetDirectoryNameAndIndex(resultSettings, filePath);
-        result = Path.Combine(d2FacePartsContentDirectory, directoryName, filePath.NameWithoutExtension);
-        return result;
-    }
-
-    internal static ReadOnlyCollection<SaveContainer> GetSaveContainers(ResultSettings resultSettings, DistanceSettings distanceSettings, ICompareSettings compareSettings, ICompare compare, long ticks, string outputResolution, ReadOnlyDictionary<string, LocationContainer> onlyOne)
-    {
-        List<SaveContainer> results = [];
-        RecordB recordB;
-        RecordC recordC;
-        string segmentB;
-        string checkFile;
-        string? directory;
-        string shortcutFile;
-        string facesDirectory;
-        bool isCounterPersonYear;
-        string facePartsDirectory;
-        FileHolder? faceFileHolder;
-        SaveContainer? saveContainer;
-        FileHolder? resizedFileHolder;
-        int? useFiltersCounter = null;
-        string resizeContentDirectory;
-        FileHolder? facePartsFileHolder;
-        FileHolder? hiddenFaceFileHolder;
-        LocationContainer locationContainer;
-        bool sortingContainersAny = onlyOne.Count > 0;
-        string eResultsFullGroupDirectory = IResult.GetResultsDateGroupDirectory(resultSettings,
-                                                                                 nameof(E_Distance),
-                                                                                 resultSettings.ResultContent);
-        string cResultsFullGroupDirectory = IResult.GetResultsFullGroupDirectory(resultSettings,
-                                                                                 nameof(C_Resize),
-                                                                                 outputResolution,
-                                                                                 includeResizeGroup: true,
-                                                                                 includeModel: false,
-                                                                                 includePredictorModel: false);
-        string d2ResultsFullGroupDirectory = IResult.GetResultsFullGroupDirectory(resultSettings,
-                                                                                  nameof(D2_FaceParts),
-                                                                                  outputResolution,
-                                                                                  includeResizeGroup: true,
-                                                                                  includeModel: true,
-                                                                                  includePredictorModel: true);
-        string cContentDirectory = Path.Combine(cResultsFullGroupDirectory, resultSettings.ResultContent);
-        if (!Directory.Exists(cContentDirectory))
-            _ = Directory.CreateDirectory(cContentDirectory);
-        string eDistanceContentTicksDirectory = Path.Combine(eResultsFullGroupDirectory, ticks.ToString());
-        if (!Directory.Exists(eDistanceContentTicksDirectory))
-            _ = Directory.CreateDirectory(eDistanceContentTicksDirectory);
-        string d2FacePartsContentDirectory = Path.Combine(d2ResultsFullGroupDirectory, resultSettings.ResultContent);
-        if (!Directory.Exists(d2FacePartsContentDirectory))
-            _ = Directory.CreateDirectory(d2FacePartsContentDirectory);
-        string forceSingleImageHumanized = nameof(IMapLogic.ForceSingleImage).Humanize(LetterCasing.Title);
-        string message = $") Building Save Container Collection - {(int)Math.Floor(new TimeSpan(DateTime.Now.Ticks - ticks).TotalSeconds)} total second(s)";
-        compare.ConstructProgressBar(onlyOne.Count, message);
-        foreach (KeyValuePair<string, LocationContainer> keyValuePair in onlyOne)
-        {
-            if (distanceSettings.SaveIndividually)
-                break;
-            locationContainer = keyValuePair.Value;
-            if (locationContainer.LengthPermyriad is null || locationContainer.LengthSource is null)
-                continue;
-            segmentB = locationContainer.LengthPermyriad.Value.ToString().PadLeft(2, '0')[..2];
-            if (locationContainer.PersonKeyFormattedAndKeyTicksAndDisplayDirectoryName is null)
-                continue;
-            isCounterPersonYear = IPersonBirthday.IsCounterPersonYear(locationContainer.PersonKeyFormattedAndKeyTicksAndDisplayDirectoryName.KeyTicks);
-            recordB = Get(useFiltersCounter, distanceSettings.SaveIndividually, sortingContainersAny, forceSingleImageHumanized, locationContainer.LengthPermyriad, locationContainer.PersonKeyFormattedAndKeyTicksAndDisplayDirectoryName);
-            recordC = Get(eDistanceContentTicksDirectory, recordB, locationContainer.PersonKeyFormattedAndKeyTicksAndDisplayDirectoryName, segmentB);
-            if (string.IsNullOrEmpty(recordC.Directory) || string.IsNullOrEmpty(recordC.PersonDirectory))
-                continue;
-            directory = recordC.Directory;
-            if (!string.IsNullOrEmpty(recordC.DebugDirectory))
-                results.Add(SaveContainer.Get(recordC.DebugDirectory));
-            if (locationContainer.PersonKeyFormattedAndKeyTicksAndDisplayDirectoryName is null)
-            {
-                if (!distanceSettings.SaveSortingWithoutPerson)
-                    throw new NotSupportedException();
-                if (recordC.Ticks is null)
-                    continue;
-            }
-            results.Add(SaveContainer.Get(recordC.PersonDirectory));
-            facesDirectory = locationContainer.LengthSource.DirectoryFullPath;
-            faceFileHolder = FileHolder.Get(locationContainer.LengthSource.FullName);
-            checkFile = Path.Combine(directory, $"{locationContainer.LengthSource.Name}");
-            shortcutFile = Path.Combine(recordC.PersonDirectory, $"{locationContainer.LengthSource.Name}.lnk");
-            resizeContentDirectory = GetResizeContentDirectory(resultSettings, cContentDirectory, locationContainer.LengthSource);
-            facePartsDirectory = GetFacePartsDirectoryX(resultSettings, d2FacePartsContentDirectory, locationContainer.LengthSource);
-            hiddenFaceFileHolder = FileHolder.Get(Path.Combine(facesDirectory, $"{locationContainer.LengthSource.NameWithoutExtension}{compareSettings.FacesHiddenFileNameExtension}"));
-            facePartsFileHolder = FileHolder.Get(Path.Combine(facePartsDirectory, $"{locationContainer.LengthSource.NameWithoutExtension}{compareSettings.FacesPartsFileNameExtension}"));
-            resizedFileHolder = FileHolder.Get(Path.Combine(resizeContentDirectory, $"{locationContainer.LengthSource.FileNameFirstSegment}{Path.GetExtension(locationContainer.LengthSource.NameWithoutExtension)}"));
-            saveContainer = SaveContainer.Get(checkFile, directory, faceFileHolder, hiddenFaceFileHolder, facePartsFileHolder, resizedFileHolder, shortcutFile);
-            results.Add(saveContainer);
-        }
-        return results.AsReadOnly();
-    }
-
-    internal static void SaveContainers(DistanceSettings distanceSettings, ICompareSettings compareSettings, ICompare compare, long ticks, int? updated, ReadOnlyCollection<SaveContainer> saveContainers)
     {
         string fileName;
         string checkFile;
@@ -189,7 +70,7 @@ internal static class FilterLogicD
             if (!Directory.Exists(directory))
                 _ = Directory.CreateDirectory(directory);
         }
-        int totalSeconds = (int)Math.Floor(new TimeSpan(DateTime.Now.Ticks - ticks).TotalSeconds);
+        int totalSeconds = (int)Math.Floor(new TimeSpan(DateTime.Now.Ticks - compare.Ticks).TotalSeconds);
         string message;
         if (updated is null)
             message = $") {saveContainers.Count:000} save(s) - {totalSeconds} total second(s)";
@@ -285,4 +166,115 @@ internal static class FilterLogicD
         }
     }
 
+    internal static ReadOnlyCollection<SaveContainer> GetSaveContainers(ResultSettings resultSettings, DistanceSettings distanceSettings, ICompareSettings compareSettings, ICompare compare, string outputResolution, ReadOnlyDictionary<string, LocationContainer> onlyOne)
+    {
+        List<SaveContainer> results = [];
+        RecordB recordB;
+        RecordC recordC;
+        string segmentB;
+        string checkFile;
+        string? directory;
+        string shortcutFile;
+        string facesDirectory;
+        bool isCounterPersonYear;
+        string facePartsDirectory;
+        FileHolder? faceFileHolder;
+        SaveContainer? saveContainer;
+        FileHolder? resizedFileHolder;
+        int? useFiltersCounter = null;
+        string resizeContentDirectory;
+        FileHolder? facePartsFileHolder;
+        FileHolder? hiddenFaceFileHolder;
+        LocationContainer locationContainer;
+        bool sortingContainersAny = onlyOne.Count > 0;
+        string eResultsFullGroupDirectory = IResult.GetResultsDateGroupDirectory(resultSettings,
+                                                                                 nameof(E_Distance),
+                                                                                 resultSettings.ResultContent);
+        string cResultsFullGroupDirectory = IResult.GetResultsFullGroupDirectory(resultSettings,
+                                                                                 nameof(C_Resize),
+                                                                                 outputResolution,
+                                                                                 includeResizeGroup: true,
+                                                                                 includeModel: false,
+                                                                                 includePredictorModel: false);
+        string d2ResultsFullGroupDirectory = IResult.GetResultsFullGroupDirectory(resultSettings,
+                                                                                  nameof(D2_FaceParts),
+                                                                                  outputResolution,
+                                                                                  includeResizeGroup: true,
+                                                                                  includeModel: true,
+                                                                                  includePredictorModel: true);
+        string cContentDirectory = Path.Combine(cResultsFullGroupDirectory, resultSettings.ResultContent);
+        if (!Directory.Exists(cContentDirectory))
+            _ = Directory.CreateDirectory(cContentDirectory);
+        string eDistanceContentTicksDirectory = Path.Combine(eResultsFullGroupDirectory, compare.Ticks.ToString());
+        if (!Directory.Exists(eDistanceContentTicksDirectory))
+            _ = Directory.CreateDirectory(eDistanceContentTicksDirectory);
+        string d2FacePartsContentDirectory = Path.Combine(d2ResultsFullGroupDirectory, resultSettings.ResultContent);
+        if (!Directory.Exists(d2FacePartsContentDirectory))
+            _ = Directory.CreateDirectory(d2FacePartsContentDirectory);
+        string forceSingleImageHumanized = nameof(IMapLogic.ForceSingleImage).Humanize(LetterCasing.Title);
+        string message = $") Building Save Container Collection - {(int)Math.Floor(new TimeSpan(DateTime.Now.Ticks - compare.Ticks).TotalSeconds)} total second(s)";
+        compare.ConstructProgressBar(onlyOne.Count, message);
+        foreach (KeyValuePair<string, LocationContainer> keyValuePair in onlyOne)
+        {
+            if (distanceSettings.SaveIndividually)
+                break;
+            locationContainer = keyValuePair.Value;
+            if (locationContainer.LengthPermyriad is null || locationContainer.LengthSource is null)
+                continue;
+            segmentB = locationContainer.LengthPermyriad.Value.ToString().PadLeft(2, '0')[..2];
+            if (locationContainer.PersonKeyFormattedAndKeyTicksAndDisplayDirectoryName is null)
+                continue;
+            isCounterPersonYear = IPersonBirthday.IsCounterPersonYear(locationContainer.PersonKeyFormattedAndKeyTicksAndDisplayDirectoryName.KeyTicks);
+            recordB = Get(useFiltersCounter, distanceSettings.SaveIndividually, sortingContainersAny, forceSingleImageHumanized, locationContainer.LengthPermyriad, locationContainer.PersonKeyFormattedAndKeyTicksAndDisplayDirectoryName);
+            recordC = Get(eDistanceContentTicksDirectory, recordB, locationContainer.PersonKeyFormattedAndKeyTicksAndDisplayDirectoryName, segmentB);
+            if (string.IsNullOrEmpty(recordC.Directory) || string.IsNullOrEmpty(recordC.PersonDirectory))
+                continue;
+            directory = recordC.Directory;
+            if (!string.IsNullOrEmpty(recordC.DebugDirectory))
+                results.Add(SaveContainer.Get(recordC.DebugDirectory));
+            if (locationContainer.PersonKeyFormattedAndKeyTicksAndDisplayDirectoryName is null)
+            {
+                if (!distanceSettings.SaveSortingWithoutPerson)
+                    throw new NotSupportedException();
+                if (recordC.Ticks is null)
+                    continue;
+            }
+            results.Add(SaveContainer.Get(recordC.PersonDirectory));
+            facesDirectory = locationContainer.LengthSource.DirectoryFullPath;
+            faceFileHolder = FileHolder.Get(locationContainer.LengthSource.FullName);
+            checkFile = Path.Combine(directory, $"{locationContainer.LengthSource.Name}");
+            shortcutFile = Path.Combine(recordC.PersonDirectory, $"{locationContainer.LengthSource.Name}.lnk");
+            resizeContentDirectory = GetResizeContentDirectory(resultSettings, cContentDirectory, locationContainer.LengthSource);
+            facePartsDirectory = GetFacePartsDirectoryX(resultSettings, d2FacePartsContentDirectory, locationContainer.LengthSource);
+            hiddenFaceFileHolder = FileHolder.Get(Path.Combine(facesDirectory, $"{locationContainer.LengthSource.NameWithoutExtension}{compareSettings.FacesHiddenFileNameExtension}"));
+            facePartsFileHolder = FileHolder.Get(Path.Combine(facePartsDirectory, $"{locationContainer.LengthSource.NameWithoutExtension}{compareSettings.FacesPartsFileNameExtension}"));
+            resizedFileHolder = FileHolder.Get(Path.Combine(resizeContentDirectory, $"{locationContainer.LengthSource.FileNameFirstSegment}{Path.GetExtension(locationContainer.LengthSource.NameWithoutExtension)}"));
+            saveContainer = SaveContainer.Get(checkFile, directory, faceFileHolder, hiddenFaceFileHolder, facePartsFileHolder, resizedFileHolder, shortcutFile);
+            results.Add(saveContainer);
+        }
+        return results.AsReadOnly();
+    }
+
+    private static RecordB Get(int? useFiltersCounter, bool saveIndividually, bool sortingContainersAny, string forceSingleImageHumanized, int? distancePermyriad, PersonKeyFormattedAndKeyTicksAndDisplayDirectoryName? personKeyFormattedAndKeyTicksAndDisplayDirectoryName) =>
+        Get(useFiltersCounter, saveIndividually, sortingContainersAny, forceSingleImageHumanized, distancePermyriad, personKeyFormattedAndKeyTicksAndDisplayDirectoryName is null ? null : IMapLogic.Mapping, personKeyFormattedAndKeyTicksAndDisplayDirectoryName?.DisplayDirectoryName);
+
+    private static RecordC Get(string eDistanceContentTicksDirectory, RecordB recordB, PersonKeyFormattedAndKeyTicksAndDisplayDirectoryName? personKeyFormattedAndKeyTicksAndDisplayDirectoryName, string segmentB)
+    {
+        RecordC result;
+        if (string.IsNullOrEmpty(personKeyFormattedAndKeyTicksAndDisplayDirectoryName?.DisplayDirectoryName))
+            throw new NotImplementedException();
+        long? ticks = null;
+        string? debugDirectory = Path.Combine(eDistanceContentTicksDirectory, recordB.ByValue, personKeyFormattedAndKeyTicksAndDisplayDirectoryName.KeyFormatted, personKeyFormattedAndKeyTicksAndDisplayDirectoryName.DisplayDirectoryName);
+        string? directory = Path.Combine(eDistanceContentTicksDirectory, recordB.ByValue, personKeyFormattedAndKeyTicksAndDisplayDirectoryName.KeyFormatted, segmentB);
+        string? personDirectory = Path.Combine(directory, personKeyFormattedAndKeyTicksAndDisplayDirectoryName.DisplayDirectoryName, "lnk");
+        result = new(debugDirectory, directory, ticks, personDirectory);
+        return result;
+    }
+
+    internal record RecordA(long? Ticks, string? Directory);
+
+    internal record RecordB(string ByValue, bool IsByMapping, bool IsBySorting);
+
+    internal record RecordC(string? DebugDirectory, string? Directory, long? Ticks, string? PersonDirectory);
+
 }

Distance/Models/Stateless/IDistance.cs

@@ -1,57 +1,65 @@
 using System.Collections.ObjectModel;
-using View_by_Distance.Metadata.Models;
+using Phares.Metadata.Models;
-using View_by_Distance.Shared.Models;
+using Phares.Shared.Models;
-using View_by_Distance.Shared.Models.Properties;
+using Phares.Shared.Models.Properties;
-using View_by_Distance.Shared.Models.Stateless;
+using Phares.Shared.Models.Stateless;
 
 namespace View_by_Distance.Distance.Models.Stateless;
 
 public interface IDistance
 {
 
-    static ReadOnlyCollection<ExifDirectory> TestStatic_GetMapped(ResultSettings resultSettings, MetadataSettings metadataSettings, PeopleSettings peopleSettings, DistanceSettings distanceSettings, ICompareSettings compareSettings, ICompare compare, long ticks, ReadOnlyCollections readOnlyCollections) =>
+    public static string Get(bool saveIndividually, string forceSingleImageHumanized, int by, bool isDefaultName) =>
-        GetMapped(resultSettings, metadataSettings, peopleSettings, distanceSettings, compareSettings, compare, ticks, readOnlyCollections);
+        $"{by switch
-    static ReadOnlyCollection<ExifDirectory> GetMapped(ResultSettings resultSettings, MetadataSettings metadataSettings, PeopleSettings peopleSettings, DistanceSettings distanceSettings, ICompareSettings compareSettings, ICompare compare, long ticks, ReadOnlyCollections readOnlyCollections) =>
+        {
-        MappedLogicA.GetMapped(resultSettings, metadataSettings, peopleSettings, distanceSettings, compareSettings, compare, ticks, readOnlyCollections);
+            IMapLogic.Mapping => nameof(IMapLogic.Mapping),
+            IMapLogic.Sorting => saveIndividually ?
+                nameof(IMapLogic.Individually) :
+                nameof(IMapLogic.Sorting),
+            IMapLogic.ForceSingleImage => forceSingleImageHumanized,
+            _ => throw new NotImplementedException()
+        }}{(!isDefaultName ? "-A" : "-Z")}";
 
-    static ReadOnlyDictionary<int, ReadOnlyDictionary<int, FilePath>> TestStatic_Extract(ICompareSettings compareSettings, ReadOnlyCollection<ExifDirectory> exifDirectories) =>
+    public static ReadOnlyDictionary<string, LocationContainer> GetOnlyOne(DistanceSettings distanceSettings, ReadOnlyCollection<LocationContainer> matrix) =>
-        Extract(compareSettings, exifDirectories);
-    static ReadOnlyDictionary<int, ReadOnlyDictionary<int, FilePath>> Extract(ICompareSettings compareSettings, ReadOnlyCollection<ExifDirectory> exifDirectories) =>
-        MappedLogicA.Extract(compareSettings, exifDirectories);
-
-    static ReadOnlyCollection<ExifDirectory> TestStatic_GetMappedExifDirectoryWithEncoding(ICompare compare, long ticks, ReadOnlyCollection<ExifDirectory> exifDirectories) =>
-        GetMappedExifDirectoryWithEncoding(compare, ticks, exifDirectories);
-    static ReadOnlyCollection<ExifDirectory> GetMappedExifDirectoryWithEncoding(ICompare compare, long ticks, ReadOnlyCollection<ExifDirectory> exifDirectories) =>
-        FaceEncodingLogic.GetMappedExifDirectoryWithEncoding(compare, ticks, exifDirectories);
-
-    static ReadOnlyCollection<LocationContainer> TestStatic_GetPreFilterLocationContainer(DistanceSettings distanceSettings, ICompareSettings compareSettings, ICompare compare, long ticks, ReadOnlyCollections readOnlyCollections, ReadOnlyDictionary<int, ReadOnlyDictionary<int, FilePath>> keyValuePairs, ReadOnlyCollection<ExifDirectory> exifDirectories) =>
-        GetPreFilterLocationContainer(distanceSettings, compareSettings, compare, ticks, readOnlyCollections, keyValuePairs, exifDirectories);
-    static ReadOnlyCollection<LocationContainer> GetPreFilterLocationContainer(DistanceSettings distanceSettings, ICompareSettings compareSettings, ICompare compare, long ticks, ReadOnlyCollections readOnlyCollections, ReadOnlyDictionary<int, ReadOnlyDictionary<int, FilePath>> keyValuePairs, ReadOnlyCollection<ExifDirectory> exifDirectories) =>
-        FilterLogicA.GetPreFilterLocationContainer(distanceSettings, compareSettings, compare, ticks, readOnlyCollections, keyValuePairs, exifDirectories);
-
-    static ReadOnlyCollection<LocationContainer> TestStatic_GetPostFilterLocationContainer(ReadOnlyCollection<LocationContainer> preFiltered, DistanceLimits distanceLimits) =>
-        GetPostFilterLocationContainer(preFiltered, distanceLimits);
-    static ReadOnlyCollection<LocationContainer> GetPostFilterLocationContainer(ReadOnlyCollection<LocationContainer> preFiltered, DistanceLimits distanceLimits) =>
-        FilterLogicC.GetPostFilterLocationContainer(preFiltered, distanceLimits);
-
-    static ReadOnlyCollection<LocationContainer> TestStatic_GetMatrixLocationContainers(DistanceSettings distanceSettings, ICompareSettings compareSettings, ICompare compare, long ticks, ReadOnlyCollection<ExifDirectory> mappedExifDirectoryWithEncoding, DistanceLimits distanceLimits, ReadOnlyCollection<LocationContainer> postFiltered) =>
-        GetMatrixLocationContainers(distanceSettings, compareSettings, compare, ticks, mappedExifDirectoryWithEncoding, distanceLimits, postFiltered);
-    static ReadOnlyCollection<LocationContainer> GetMatrixLocationContainers(DistanceSettings distanceSettings, ICompareSettings compareSettings, ICompare compare, long ticks, ReadOnlyCollection<ExifDirectory> mappedExifDirectoryWithEncoding, DistanceLimits distanceLimits, ReadOnlyCollection<LocationContainer> postFiltered) =>
-        FilterLogicC.GetMatrixLocationContainers(distanceSettings, compareSettings, compare, ticks, mappedExifDirectoryWithEncoding, distanceLimits, postFiltered);
-
-    static ReadOnlyDictionary<string, LocationContainer> TestStatic_GetOnlyOne(DistanceSettings distanceSettings, ReadOnlyCollection<LocationContainer> matrix) =>
-        GetOnlyOne(distanceSettings, matrix);
-    static ReadOnlyDictionary<string, LocationContainer> GetOnlyOne(DistanceSettings distanceSettings, ReadOnlyCollection<LocationContainer> matrix) =>
         FilterLogicC.GetOnlyOne(distanceSettings, matrix);
 
-    static ReadOnlyCollection<SaveContainer> TestStatic_GetSaveContainers(ResultSettings resultSettings, DistanceSettings distanceSettings, ICompareSettings compareSettings, ICompare compare, long ticks, string outputResolution, ReadOnlyDictionary<string, LocationContainer> onlyOne) =>
+    public static ReadOnlyCollection<LocationContainer> GetPostFilterLocationContainer(ReadOnlyCollection<LocationContainer> preFiltered, DistanceLimits distanceLimits) =>
-        GetSaveContainers(resultSettings, distanceSettings, compareSettings, compare, ticks, outputResolution, onlyOne);
+        FilterLogicC.GetPostFilterLocationContainer(preFiltered, distanceLimits);
-    static ReadOnlyCollection<SaveContainer> GetSaveContainers(ResultSettings resultSettings, DistanceSettings distanceSettings, ICompareSettings compareSettings, ICompare compare, long ticks, string outputResolution, ReadOnlyDictionary<string, LocationContainer> onlyOne) =>
-        FilterLogicD.GetSaveContainers(resultSettings, distanceSettings, compareSettings, compare, ticks, outputResolution, onlyOne);
 
-    static void TestStatic_SaveContainers(DistanceSettings distanceSettings, ICompareSettings compareSettings, ICompare compare, long ticks, int? updated, ReadOnlyCollection<SaveContainer> saveContainers) =>
+    public static void SaveContainers(DistanceSettings distanceSettings, ICompareSettings compareSettings, ICompare compare, int? updated, ReadOnlyCollection<SaveContainer> saveContainers) =>
-        SaveContainers(distanceSettings, compareSettings, compare, ticks, updated, saveContainers);
+        FilterLogicD.SaveContainers(distanceSettings, compareSettings, compare, updated, saveContainers);
-    static void SaveContainers(DistanceSettings distanceSettings, ICompareSettings compareSettings, ICompare compare, long ticks, int? updated, ReadOnlyCollection<SaveContainer> saveContainers) =>
+
-        FilterLogicD.SaveContainers(distanceSettings, compareSettings, compare, ticks, updated, saveContainers);
+    public static ReadOnlyCollection<SaveContainer> GetSaveContainers(ResultSettings resultSettings, DistanceSettings distanceSettings, ICompareSettings compareSettings, ICompare compare, string outputResolution, ReadOnlyDictionary<string, LocationContainer> onlyOne) =>
+        FilterLogicD.GetSaveContainers(resultSettings, distanceSettings, compareSettings, compare, outputResolution, onlyOne);
+
+    public static ReadOnlyCollection<LocationContainer> GetMatrixLocationContainers(DistanceSettings distanceSettings, ICompare compare, ReadOnlyDictionary<int, ReadOnlyDictionary<int, LocationContainer>> mappedIdsThenWholePercentagesToLocationContainer, DistanceLimits distanceLimits, ReadOnlyCollection<LocationContainer> postFiltered) =>
+        FilterLogicC.GetMatrixLocationContainers(distanceSettings, compare, mappedIdsThenWholePercentagesToLocationContainer, distanceLimits, postFiltered);
+
+    public static ReadOnlyDictionary<int, ReadOnlyDictionary<int, LocationContainer>> GetMappedIdsThenWholePercentagesToLocationContainer(ResultSettings resultSettings, MetadataSettings metadataSettings, PeopleSettings peopleSettings, DistanceSettings distanceSettings, ICompareSettings compareSettings, ICompare compare, ReadOnlyCollections readOnlyCollections) =>
+        FaceEncodingLogic.GetMappedIdsThenWholePercentagesToLocationContainer(resultSettings, metadataSettings, peopleSettings, distanceSettings, compareSettings, compare, readOnlyCollections);
+
+    public static ReadOnlyCollection<LocationContainer> GetPreFilterLocationContainer(DistanceSettings distanceSettings, ICompareSettings compareSettings, ICompare compare, ReadOnlyCollections readOnlyCollections, ReadOnlyDictionary<int, ReadOnlyDictionary<int, LocationContainer>> mappedIdsThenWholePercentagesToLocationContainer, ReadOnlyCollection<ExifDirectory> exifDirectories) =>
+        FilterLogicA.GetPreFilterLocationContainer(distanceSettings, compareSettings, compare, readOnlyCollections, mappedIdsThenWholePercentagesToLocationContainer, exifDirectories);
+
+    internal static ReadOnlyDictionary<string, LocationContainer> TestStatic_GetOnlyOne(DistanceSettings distanceSettings, ReadOnlyCollection<LocationContainer> matrix) =>
+        GetOnlyOne(distanceSettings, matrix);
+
+    internal static ReadOnlyCollection<LocationContainer> TestStatic_GetPostFilterLocationContainer(ReadOnlyCollection<LocationContainer> preFiltered, DistanceLimits distanceLimits) =>
+        GetPostFilterLocationContainer(preFiltered, distanceLimits);
+
+    internal static void TestStatic_SaveContainers(DistanceSettings distanceSettings, ICompareSettings compareSettings, ICompare compare, int? updated, ReadOnlyCollection<SaveContainer> saveContainers) =>
+        SaveContainers(distanceSettings, compareSettings, compare, updated, saveContainers);
+
+    internal static ReadOnlyCollection<SaveContainer> TestStatic_GetSaveContainers(ResultSettings resultSettings, DistanceSettings distanceSettings, ICompareSettings compareSettings, ICompare compare, string outputResolution, ReadOnlyDictionary<string, LocationContainer> onlyOne) =>
+        GetSaveContainers(resultSettings, distanceSettings, compareSettings, compare, outputResolution, onlyOne);
+
+    internal static ReadOnlyCollection<LocationContainer> TestStatic_GetMatrixLocationContainers(DistanceSettings distanceSettings, ICompare compare, ReadOnlyDictionary<int, ReadOnlyDictionary<int, LocationContainer>> mappedIdsThenWholePercentagesToLocationContainer, DistanceLimits distanceLimits, ReadOnlyCollection<LocationContainer> postFiltered) =>
+        GetMatrixLocationContainers(distanceSettings, compare, mappedIdsThenWholePercentagesToLocationContainer, distanceLimits, postFiltered);
+
+    internal static ReadOnlyDictionary<int, ReadOnlyDictionary<int, LocationContainer>> TestStatic_GetMappedIdsThenWholePercentagesToLocationContainer(ResultSettings resultSettings, MetadataSettings metadataSettings, PeopleSettings peopleSettings, DistanceSettings distanceSettings, ICompareSettings compareSettings, ICompare compare, ReadOnlyCollections readOnlyCollections) =>
+        GetMappedIdsThenWholePercentagesToLocationContainer(resultSettings, metadataSettings, peopleSettings, distanceSettings, compareSettings, compare, readOnlyCollections);
+
+    internal static ReadOnlyCollection<LocationContainer> TestStatic_GetPreFilterLocationContainer(DistanceSettings distanceSettings, ICompareSettings compareSettings, ICompare compare, ReadOnlyCollections readOnlyCollections, ReadOnlyDictionary<int, ReadOnlyDictionary<int, LocationContainer>> mappedIdsThenWholePercentagesToLocationContainer, ReadOnlyCollection<ExifDirectory> exifDirectories) =>
+        GetPreFilterLocationContainer(distanceSettings, compareSettings, compare, readOnlyCollections, mappedIdsThenWholePercentagesToLocationContainer, exifDirectories);
 
 }

Distance/Models/Stateless/MappedLogicA.cs

@@ -1,9 +1,9 @@
 using System.Collections.ObjectModel;
-using View_by_Distance.Metadata.Models;
+using Phares.Metadata.Models;
-using View_by_Distance.Metadata.Models.Stateless;
+using Phares.Metadata.Models.Stateless;
-using View_by_Distance.Shared.Models;
+using Phares.Shared.Models;
-using View_by_Distance.Shared.Models.Properties;
+using Phares.Shared.Models.Properties;
-using View_by_Distance.Shared.Models.Stateless;
+using Phares.Shared.Models.Stateless;
 
 namespace View_by_Distance.Distance.Models.Stateless;
 
@@ -14,33 +14,27 @@ internal static class MappedLogicA
                                string? PersonDisplayDirectoryName,
                                FilePath FilePath);
 
-    private static List<MappedFile> GetDisplayDirectoryAllFiles(PeopleSettings peopleSettings, ICompareSettings compareSettings, ReadOnlyCollections readOnlyCollections)
+    internal static ReadOnlyCollection<ExifDirectory> GetMapped(ResultSettings resultSettings, MetadataSettings metadataSettings, PeopleSettings peopleSettings, DistanceSettings distanceSettings, ICompareSettings compareSettings, ICompare compare, ReadOnlyCollections readOnlyCollections)
     {
-        List<MappedFile> results = [];
+        List<ExifDirectory> results = [];
-        FilePath filePath;
+        string eDistanceContentDirectory = Path.GetFullPath(IResult.GetResultsDateGroupDirectory(resultSettings, nameof(E_Distance), resultSettings.ResultContent));
-        MappedFile mappedFile;
+        ReadOnlyCollection<MappedLogicB.Record> records = MappedLogicB.DeleteEmptyDirectoriesAndGetCollection(resultSettings, metadataSettings, peopleSettings, distanceSettings, compareSettings, compare, eDistanceContentDirectory, readOnlyCollections);
-        string personKeyFormatted;
+        ReadOnlyCollection<MappedFile> mappedFiles = GetMappedFiles(resultSettings, metadataSettings, peopleSettings, compareSettings, readOnlyCollections, records);
-        List<string> distinct = [];
+        if (mappedFiles.Count > 0)
-        PersonKeyFormattedAndKeyTicksAndDisplayDirectoryName personKeyFormattedAndKeyTicksAndDisplayDirectoryName;
-        foreach (PersonContainer personContainer in readOnlyCollections.PersonContainers)
         {
-            if (personContainer.Key is null)
+            int maxDegreeOfParallelism = compareSettings.MaxDegreeOfParallelism;
-                continue;
+            int totalSeconds = (int)Math.Floor(new TimeSpan(DateTime.Now.Ticks - compare.Ticks).TotalSeconds);
-            for (int i = personContainer.DisplayDirectoryAllFilePaths.Count - 1; i > -1; i--)
+            string message = $") Building Mapped Face Files Collection - {totalSeconds} total second(s)";
+            ParallelOptions parallelOptions = new() { MaxDegreeOfParallelism = maxDegreeOfParallelism };
+            ReadOnlyDictionary<int, List<FilePathAndWholePercentages>> skipNotSkipCollection = readOnlyCollections.SkipNotSkipCollection;
+            compare.ConstructProgressBar(mappedFiles.Count, message);
+            _ = Parallel.For(0, mappedFiles.Count, parallelOptions, (i, state) =>
             {
-                filePath = personContainer.DisplayDirectoryAllFilePaths[i];
+                compare.Tick();
-                if (filePath.ExtensionLowered != compareSettings.FacesFileNameExtension)
+                MappedParallelFor(resultSettings, metadataSettings, distanceSettings, compareSettings, results, skipNotSkipCollection, mappedFiles[i]);
-                    continue;
+            });
-                if (distinct.Contains(filePath.Name))
-                    continue;
-                distinct.Add(filePath.Name);
-                personKeyFormatted = IPersonBirthday.GetFormatted(peopleSettings.PersonBirthdayFormat, personContainer.Key.Value);
-                personKeyFormattedAndKeyTicksAndDisplayDirectoryName = new(personKeyFormatted, personContainer.Key.Value, filePath.Name);
-                mappedFile = new(personKeyFormattedAndKeyTicksAndDisplayDirectoryName, personContainer.DisplayDirectoryName, filePath);
-                results.Add(mappedFile);
-            }
         }
-        return results;
+        return results.AsReadOnly();
     }
 
     private static ReadOnlyCollection<MappedFile> GetMappedFiles(ResultSettings resultSettings, MetadataSettings metadataSettings, PeopleSettings peopleSettings, ICompareSettings compareSettings, ReadOnlyCollections readOnlyCollections, ReadOnlyCollection<MappedLogicB.Record> records)
@@ -102,6 +96,35 @@ internal static class MappedLogicA
         return results.AsReadOnly();
     }
 
+    private static List<MappedFile> GetDisplayDirectoryAllFiles(PeopleSettings peopleSettings, ICompareSettings compareSettings, ReadOnlyCollections readOnlyCollections)
+    {
+        List<MappedFile> results = [];
+        FilePath filePath;
+        MappedFile mappedFile;
+        string personKeyFormatted;
+        List<string> distinct = [];
+        PersonKeyFormattedAndKeyTicksAndDisplayDirectoryName personKeyFormattedAndKeyTicksAndDisplayDirectoryName;
+        foreach (PersonContainer personContainer in readOnlyCollections.PersonContainers)
+        {
+            if (personContainer.Key is null)
+                continue;
+            for (int i = personContainer.DisplayDirectoryAllFilePaths.Count - 1; i > -1; i--)
+            {
+                filePath = personContainer.DisplayDirectoryAllFilePaths[i];
+                if (filePath.ExtensionLowered != compareSettings.FacesFileNameExtension)
+                    continue;
+                if (distinct.Contains(filePath.Name))
+                    continue;
+                distinct.Add(filePath.Name);
+                personKeyFormatted = IPersonBirthday.GetFormatted(peopleSettings.PersonBirthdayFormat, personContainer.Key.Value);
+                personKeyFormattedAndKeyTicksAndDisplayDirectoryName = new(personKeyFormatted, personContainer.Key.Value, filePath.Name);
+                mappedFile = new(personKeyFormattedAndKeyTicksAndDisplayDirectoryName, personContainer.DisplayDirectoryName, filePath);
+                results.Add(mappedFile);
+            }
+        }
+        return results;
+    }
+
     private static void MappedParallelFor(ResultSettings resultSettings, MetadataSettings metadataSettings, DistanceSettings distanceSettings, ICompareSettings compareSettings, List<ExifDirectory> exifDirectories, ReadOnlyDictionary<int, List<FilePathAndWholePercentages>> skipCollection, MappedFile mappedFile)
     {
         int? id;
@@ -145,58 +168,11 @@ internal static class MappedLogicA
         }
         if (mappedFile.FilePath.Name.EndsWith(lnk) || !File.Exists(mappedFile.FilePath.FullName))
             return;
-        ExifDirectory exifDirectory = IMetadata.GetExifDirectory(mappedFile.FilePath, mappedFile.PersonKeyFormattedAndKeyTicksAndDisplayDirectoryName);
+        Stream stream = File.OpenRead(mappedFile.FilePath.FullName);
+        ExifDirectory exifDirectory = IMetadata.GetExifDirectory(mappedFile.FilePath, stream, mappedFile.PersonKeyFormattedAndKeyTicksAndDisplayDirectoryName);
+        stream.Dispose();
         lock (exifDirectories)
             exifDirectories.Add(exifDirectory);
     }
 
-    internal static ReadOnlyCollection<ExifDirectory> GetMapped(ResultSettings resultSettings, MetadataSettings metadataSettings, PeopleSettings peopleSettings, DistanceSettings distanceSettings, ICompareSettings compareSettings, ICompare compare, long ticks, ReadOnlyCollections readOnlyCollections)
-    {
-        List<ExifDirectory> results = [];
-        string eDistanceContentDirectory = IResult.GetResultsDateGroupDirectory(resultSettings, nameof(E_Distance), resultSettings.ResultContent);
-        ReadOnlyCollection<MappedLogicB.Record> records = MappedLogicB.DeleteEmptyDirectoriesAndGetCollection(resultSettings, metadataSettings, peopleSettings, distanceSettings, compareSettings, compare, ticks, eDistanceContentDirectory, readOnlyCollections);
-        ReadOnlyCollection<MappedFile> mappedFiles = GetMappedFiles(resultSettings, metadataSettings, peopleSettings, compareSettings, readOnlyCollections, records);
-        if (mappedFiles.Count > 0)
-        {
-            int maxDegreeOfParallelism = compareSettings.MaxDegreeOfParallelism;
-            int totalSeconds = (int)Math.Floor(new TimeSpan(DateTime.Now.Ticks - ticks).TotalSeconds);
-            string message = $") Building Mapped Face Files Collection - {totalSeconds} total second(s)";
-            ParallelOptions parallelOptions = new() { MaxDegreeOfParallelism = maxDegreeOfParallelism };
-            ReadOnlyDictionary<int, List<FilePathAndWholePercentages>> skipNotSkipCollection = readOnlyCollections.SkipNotSkipCollection;
-            compare.ConstructProgressBar(mappedFiles.Count, message);
-            _ = Parallel.For(0, mappedFiles.Count, parallelOptions, (i, state) =>
-            {
-                compare.Tick();
-                MappedParallelFor(resultSettings, metadataSettings, distanceSettings, compareSettings, results, skipNotSkipCollection, mappedFiles[i]);
-            });
-        }
-        return results.AsReadOnly();
-    }
-
-    internal static ReadOnlyDictionary<int, ReadOnlyDictionary<int, FilePath>> Extract(ICompareSettings compareSettings, ReadOnlyCollection<ExifDirectory> exifDirectories)
-    {
-        Dictionary<int, ReadOnlyDictionary<int, FilePath>> results = [];
-        int? wholePercentages;
-        Dictionary<int, FilePath>? keyValues;
-        Dictionary<int, Dictionary<int, FilePath>> keyValuePairs = [];
-        foreach (ExifDirectory exifDirectory in exifDirectories)
-        {
-            if (exifDirectory.FilePath.Id is null)
-                continue;
-            if (!keyValuePairs.TryGetValue(exifDirectory.FilePath.Id.Value, out keyValues))
-            {
-                keyValuePairs.Add(exifDirectory.FilePath.Id.Value, []);
-                if (!keyValuePairs.TryGetValue(exifDirectory.FilePath.Id.Value, out keyValues))
-                    throw new Exception();
-            }
-            wholePercentages = IMapping.GetWholePercentages(compareSettings, exifDirectory.FilePath);
-            if (wholePercentages is null)
-                continue;
-            keyValues.Add(wholePercentages.Value, exifDirectory.FilePath);
-        }
-        foreach (KeyValuePair<int, Dictionary<int, FilePath>> keyValuePair in keyValuePairs)
-            results.Add(keyValuePair.Key, keyValuePair.Value.AsReadOnly());
-        return results.AsReadOnly();
-    }
-
 }

Distance/Models/Stateless/MappedLogicB.cs

@@ -2,9 +2,9 @@ using Humanizer;
 using System.Collections.ObjectModel;
 using System.Diagnostics;
 using System.Globalization;
-using View_by_Distance.Shared.Models;
+using Phares.Shared.Models;
-using View_by_Distance.Shared.Models.Properties;
+using Phares.Shared.Models.Properties;
-using View_by_Distance.Shared.Models.Stateless;
+using Phares.Shared.Models.Stateless;
 
 namespace View_by_Distance.Distance.Models.Stateless;
 
@@ -21,62 +21,188 @@ internal static class MappedLogicB
     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)
+    internal static ReadOnlyCollection<Record> DeleteEmptyDirectoriesAndGetCollection(ResultSettings resultSettings, MetadataSettings metadataSettings, PeopleSettings peopleSettings, DistanceSettings distanceSettings, ICompareSettings compareSettings, ICompare compare, string eDistanceContentDirectory, ReadOnlyCollections readOnlyCollections)
-    {
-        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)
     {
+        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);
+        string[] yearDirectories;
-        foreach (string directory in directories)
+        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(IMapLogic.ManualCopy).Humanize(LetterCasing.Title);
+        string forceSingleImageHumanized = nameof(IMapLogic.ForceSingleImage).Humanize(LetterCasing.Title);
+        for (int i = 1; i < 6; i++)
         {
-            checkDirectory = Path.Combine(newestPersonKeyDirectory, Path.GetFileName(directory));
+            check = false;
-            if (!Directory.Exists(checkDirectory))
+            results.Clear();
-                Directory.Move(directory, checkDirectory);
+            distinct.Clear();
-            else
+            directoryNumber = 0;
+            ticksDirectories = UpdateDateVerifyAndGetTicksDirectories(distanceSettings, eDistanceContentDirectory);
+            totalSeconds = (int)Math.Floor(new TimeSpan(DateTime.Now.Ticks - compare.Ticks).TotalSeconds);
+            message = $"{i}) {ticksDirectories.Count:000} compile from and clean ticks Director(ies) - B - {totalSeconds} total second(s)";
+            compare.ConstructProgressBar(ticksDirectories.Count, message);
+            foreach (TicksDirectory ticksDirectory in ticksDirectories)
             {
-                files = Directory.GetFiles(directory, "*", SearchOption.AllDirectories);
+                if (i == 1)
-                foreach (string file in files)
+                    compare.Tick();
+                personKeyFormattedDirectories = Directory.GetDirectories(ticksDirectory.Directory, "*", SearchOption.TopDirectoryOnly);
+                foreach (string personKeyFormattedDirectory in personKeyFormattedDirectories)
                 {
-                    if (file.Split(personKeyFormatted).Length != 2 || file.Contains(newestPersonKeyFormatted))
+                    personKeyFormatted = Path.GetFileName(personKeyFormattedDirectory);
-                        continue;
+                    isReservedDirectoryName = personKeyFormatted.StartsWith(nameof(IMapLogic.Sorting)) || personKeyFormatted.StartsWith(nameof(IMapLogic.Mapping)) || personKeyFormatted.StartsWith(nameof(IMapLogic.ManualCopy));
-                    checkFile = file.Replace(personKeyFormatted, newestPersonKeyFormatted);
+                    if (!isReservedDirectoryName && personKeyFormatted.StartsWith(nameof(IMapLogic.Individually)))
-                    checkDirectory = Path.GetDirectoryName(checkFile);
+                    {
-                    if (checkDirectory is null)
+                        Individually(compareSettings, ticksDirectory, personKeyFormattedDirectory);
-                        continue;
+                        throw new Exception($"B) Move personKey directories up one from {nameof(IMapLogic.Sorting)} and delete {nameof(IMapLogic.Sorting)} directory!");
-                    if (File.Exists(checkFile))
+                    }
-                        continue;
+                    _ = readOnlyCollections.PersonKeyFormattedToNewestPersonKeyFormatted.TryGetValue(personKeyFormatted, out newestPersonKeyFormatted);
-                    if (!Directory.Exists(checkDirectory))
+                    if (readOnlyCollections.PersonKeyFormattedToNewestPersonKeyFormatted.Count > 0 && newestPersonKeyFormatted is null)
-                        _ = Directory.CreateDirectory(checkDirectory);
+                    {
-                    File.Move(file, checkFile);
+                        timeSpan = new TimeSpan(DateTime.Now.Ticks - ticksDirectory.DirectoryDateTime.Ticks);
+                        if (timeSpan.TotalDays > 6)
+                            throw new Exception($"{distanceSettings.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 != peopleSettings.PersonBirthdayFormat.Length || !DateTime.TryParseExact(personKeyFormatted, peopleSettings.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(IMapLogic.Sorting)} and delete {nameof(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 (readOnlyCollections.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 != peopleSettings.PersonBirthdayFormat.Length)
+                                continue;
+                            if (personDisplayDirectoryName.Length == 1 || isDefault.Value || !readOnlyCollections.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(resultSettings, metadataSettings, compareSettings, 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);
             }
+            if (check)
+                continue;
+            break;
         }
-        _ = IPath.DeleteEmptyDirectories(personKeyDirectory);
+        return results.AsReadOnly();
     }
 
     private static List<TicksDirectory> UpdateDateVerifyAndGetTicksDirectories(DistanceSettings distanceSettings, string eDistanceContentDirectory)
@@ -85,13 +211,13 @@ internal static class MappedLogicB
         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++)
@@ -101,10 +227,10 @@ internal static class MappedLogicB
         string[] ticksFullPaths = Directory.GetDirectories(eDistanceContentDirectory, "*", SearchOption.TopDirectoryOnly);
         foreach (string ticksFullPath in ticksFullPaths)
         {
-            ticksDirectoryName = Path.GetFileName(ticksFullPath);
+            ticksDirectoryNameFirstSegment = Path.GetFileName(ticksFullPath).Split('.')[0];
-            if (ticksDirectoryName.Length < 3)
+            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;
@@ -130,9 +256,9 @@ internal static class MappedLogicB
             if (directoryInfo.LastWriteTime.Ticks != directoryTicks)
                 Directory.SetLastWriteTime(ticksFullPath, new DateTime(directoryTicks));
             alternateDirectoryDateTime = new DateTime(directoryDateTime.Year, directoryDateTime.Month, directoryDateTime.Day).AddMonths(1);
-            isLocationContainerDebugDirectory = distanceSettings.LocationContainerDebugDirectory is null ? null : ticksDirectoryName.EndsWith(distanceSettings.LocationContainerDebugDirectory);
+            isLocationContainerDebugDirectory = distanceSettings.LocationContainerDebugDirectory is null ? null : ticksDirectoryNameFirstSegment.EndsWith(distanceSettings.LocationContainerDebugDirectory);
             totalDays = lastDirectoryTicks is null || new TimeSpan(dateTime.Ticks - directoryTicks).TotalDays < 1 ? null : (float)new TimeSpan(directoryTicks - lastDirectoryTicks.Value).TotalDays;
-            ticksDirectory = new(alternateDirectoryDateTime, ticksFullPath, 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;
@@ -217,40 +343,42 @@ internal static class MappedLogicB
         }
     }
 
-    private static List<Record> GetRecords(ResultSettings resultSettings, MetadataSettings metadataSettings, ICompareSettings compareSettings, 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 = [];
-        Record record;
-        string fileName;
         string checkFile;
-        FilePath filePath;
+        string actionDirectoryName = Path.GetFileName(actionDirectory);
-        FileHolder fileHolder;
+        string checkDirectory = actionDirectoryName.StartsWith("y", StringComparison.CurrentCultureIgnoreCase) ? Path.Combine(ticksDirectory.Directory, personKeyFormatted, yearDirectoryName, alphaDirectoryName) : Path.Combine(directory, actionDirectoryName);
-        int? wholePercentages;
+        if (!Directory.Exists(checkDirectory))
+            _ = Directory.CreateDirectory(checkDirectory);
         foreach (string file in files)
         {
-            if (file.EndsWith(".lnk"))
+            if (facesFileNames.Contains(file))
-                continue;
-            fileHolder = FileHolder.Get(file);
-            filePath = FilePath.Get(resultSettings, metadataSettings, fileHolder, index: null);
-            if (filePath.Id is null)
-                continue;
-            wholePercentages = IMapping.GetWholePercentages(compareSettings, filePath);
-            if (wholePercentages is null)
-                continue;
-            fileName = Path.GetFileName(file);
-            if (distinct.Contains(fileName))
             {
-                checkFile = $"{file}.dup";
+                checkFile = Path.Combine(checkDirectory, Path.GetFileName(file));
                 if (File.Exists(checkFile))
                     continue;
                 File.Move(file, checkFile);
                 continue;
             }
-            distinct.Add(fileName);
+            File.Delete(file);
-            record = new(directoryNumber, isDefault, linksCount, filePath, personDisplayDirectoryName, personKeyFormatted);
-            results.Add(record);
         }
-        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)
@@ -285,216 +413,117 @@ internal static class MappedLogicB
             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[] files;
-        string[] yearDirectoryNameSegments = Path.GetFileName(yearDirectory).Split('-');
+        string checkFile;
-        if (yearDirectoryNameSegments.Length != 3)
+        string? checkDirectory;
-            result = null;
+        string[] directories = Directory.GetDirectories(personKeyDirectory, "*", SearchOption.TopDirectoryOnly);
-        else
+        foreach (string directory in directories)
         {
-            string lastSegment = yearDirectoryNameSegments[^1];
+            checkDirectory = Path.Combine(newestPersonKeyDirectory, Path.GetFileName(directory));
-            if (lastSegment.Length != 3 || !lastSegment.All(l => l == lastSegment[0]))
+            if (!Directory.Exists(checkDirectory))
-                result = null;
+                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);
+                }
+            }
         }
+        _ = IPath.DeleteEmptyDirectories(personKeyDirectory);
+    }
+
+    private static List<Record> GetRecords(ResultSettings resultSettings, MetadataSettings metadataSettings, ICompareSettings compareSettings, TicksDirectory ticksDirectory, bool? isDefault, string[] files, int directoryNumber, string personKeyFormatted, int? linksCount, List<string> distinct, string? personDisplayDirectoryName)
+    {
+        List<Record> results = [];
+        string @enum;
+        Record record;
+        string fileName;
+        string checkFile;
+        FilePath filePath;
+        FileHolder fileHolder;
+        int? wholePercentages;
+        foreach (string file in files)
+        {
+            if (file.EndsWith(".lnk"))
+                continue;
+            fileHolder = FileHolder.Get(file);
+            filePath = FilePath.Get(resultSettings, metadataSettings, fileHolder, index: null);
+            if (filePath.Id is null)
+                continue;
+            wholePercentages = IMapping.GetWholePercentages(compareSettings, 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 = FileHolder.Get(checkFile);
+                    filePath = FilePath.Get(resultSettings, metadataSettings, 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;
     }
 
-    internal static ReadOnlyCollection<Record> DeleteEmptyDirectoriesAndGetCollection(ResultSettings resultSettings, MetadataSettings metadataSettings, PeopleSettings peopleSettings, DistanceSettings distanceSettings, ICompareSettings compareSettings, ICompare compare, long ticks, string eDistanceContentDirectory, ReadOnlyCollections readOnlyCollections)
-    {
-        List<Record> results = [];
-        bool check;
-        string message;
-        string[] files;
-        bool? isDefault;
-        int? linksCount;
-        int totalSeconds;
-        DateTime dateTime;
-        TimeSpan timeSpan;
-        int directoryNumber;
-        string? checkDirectory;
-        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);
-        for (int i = 1; i < 6; i++)
-        {
-            check = false;
-            results.Clear();
-            distinct.Clear();
-            directoryNumber = 0;
-            ticksDirectories = UpdateDateVerifyAndGetTicksDirectories(distanceSettings, 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)";
-            compare.ConstructProgressBar(ticksDirectories.Count, message);
-            foreach (TicksDirectory ticksDirectory in ticksDirectories)
-            {
-                if (i == 1)
-                    compare.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(compareSettings, 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!");
-                    }
-                    _ = readOnlyCollections.PersonKeyFormattedToNewestPersonKeyFormatted.TryGetValue(personKeyFormatted, out newestPersonKeyFormatted);
-                    if (readOnlyCollections.PersonKeyFormattedToNewestPersonKeyFormatted.Count > 0 && newestPersonKeyFormatted is null)
-                    {
-                        timeSpan = new TimeSpan(DateTime.Now.Ticks - ticksDirectory.DirectoryDateTime.Ticks);
-                        if (timeSpan.TotalDays > 6)
-                            throw new Exception($"{distanceSettings.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 != distanceSettings.LocationContainerDebugDirectory)
-                        {
-                            files = Directory.GetFiles(yearDirectory, "*", SearchOption.TopDirectoryOnly);
-                            foreach (string file in files)
-                                File.Delete(file);
-                        }
-                        if (ticksDirectory.DirectoryName == distanceSettings.LocationContainerDebugDirectory)
-                        {
-                            isDefault = null;
-                            personDisplayDirectoryName = null;
-                            files = Directory.GetFiles(yearDirectory, "*", SearchOption.TopDirectoryOnly);
-                            results.AddRange(GetRecords(resultSettings, metadataSettings, compareSettings, 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 != peopleSettings.PersonBirthdayFormat.Length || !DateTime.TryParseExact(personKeyFormatted, peopleSettings.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 (readOnlyCollections.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 != peopleSettings.PersonBirthdayFormat.Length)
-                                continue;
-                            if (personDisplayDirectoryName.Length == 1 || isDefault.Value || !readOnlyCollections.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(resultSettings, metadataSettings, compareSettings, 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);
-            }
-            if (check)
-                continue;
-            break;
-        }
-        return results.AsReadOnly();
-    }
-
 }

Face/.vscode/read-me.md

@@ -0,0 +1 @@
+# Read Me

Face/AA.Face.csproj

@@ -1,44 +1,52 @@
 <Project Sdk="Microsoft.NET.Sdk">
-    <PropertyGroup>
+  <PropertyGroup>
-        <ImplicitUsings>enable</ImplicitUsings>
+    <ImplicitUsings>enable</ImplicitUsings>
-        <Nullable>enable</Nullable>
+    <Nullable>enable</Nullable>
-        <OutputType>library</OutputType>
+    <OutputType>library</OutputType>
-        <RuntimeIdentifier>win-x64</RuntimeIdentifier>
+    <RuntimeIdentifier>win-x64</RuntimeIdentifier>
-        <TargetFramework>net9.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
-    </PropertyGroup>
+  </PropertyGroup>
-    <PropertyGroup>
+  <PropertyGroup>
-        <PackageId>Phares.AA.Face</PackageId>
+    <HoursSinceNovember122024>$([System.Math]::Floor($([MSBuild]::Divide($([MSBuild]::Subtract($([System.DateTimeOffset]::UtcNow.ToUnixTimeSeconds()), 1731369600)), 3600))))</HoursSinceNovember122024>
-        <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
+  </PropertyGroup>
-        <Version>9.0.100.0</Version>
+  <PropertyGroup>
-        <Authors>Mike Phares</Authors>
+    <PackageId>Phares.Face</PackageId>
-        <Company>Phares</Company>
+    <Version>9.0.104.$([System.Math]::Floor($([MSBuild]::Divide($([MSBuild]::Subtract($([System.DateTimeOffset]::UtcNow.ToUnixTimeSeconds()), 1731369600)), 3600))))</Version>
-        <IncludeSymbols>true</IncludeSymbols>
+    <Company>Phares</Company>
-        <SymbolPackageFormat>snupkg</SymbolPackageFormat>
+    <Authors>Mike Phares</Authors>
-    </PropertyGroup>
+    <IncludeSymbols>true</IncludeSymbols>
-    <PropertyGroup>
+    <PackageReadmeFile>read-me.md</PackageReadmeFile>
-        <IsWindows Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Windows)))' == 'true'">true</IsWindows>
+    <SymbolPackageFormat>snupkg</SymbolPackageFormat>
-        <IsOSX Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::OSX)))' == 'true'">true</IsOSX>
+    <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
-        <IsLinux Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Linux)))' == 'true'">true</IsLinux>
+    <PackageLicenseExpression>MIT</PackageLicenseExpression>
-    </PropertyGroup>
+  </PropertyGroup>
-    <PropertyGroup Condition="'$(IsWindows)'=='true'">
+  <PropertyGroup>
-        <DefineConstants>Windows</DefineConstants>
+    <IsWindows Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Windows)))' == 'true'">true</IsWindows>
-    </PropertyGroup>
+    <IsOSX Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::OSX)))' == 'true'">true</IsOSX>
-    <PropertyGroup Condition="'$(IsOSX)'=='true'">
+    <IsLinux Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Linux)))' == 'true'">true</IsLinux>
-        <DefineConstants>OSX</DefineConstants>
+  </PropertyGroup>
-    </PropertyGroup>
+  <PropertyGroup Condition="'$(IsWindows)'=='true'">
-    <PropertyGroup Condition="'$(IsLinux)'=='true'">
+    <DefineConstants>Windows</DefineConstants>
-        <DefineConstants>Linux</DefineConstants>
+  </PropertyGroup>
-    </PropertyGroup>
+  <PropertyGroup Condition="'$(IsOSX)'=='true'">
-    <ItemGroup Condition="'$(RuntimeIdentifier)' == 'browser-wasm'">
+    <DefineConstants>OSX</DefineConstants>
-        <SupportedPlatform Include="browser" />
+  </PropertyGroup>
-    </ItemGroup>
+  <PropertyGroup Condition="'$(IsLinux)'=='true'">
-    <ItemGroup>
+    <DefineConstants>Linux</DefineConstants>
-        <PackageReference Include="Humanizer.Core" Version="2.14.1" />
+  </PropertyGroup>
-        <PackageReference Include="MetadataExtractor" Version="2.8.1" />
+  <ItemGroup Condition="'$(RuntimeIdentifier)' == 'browser-wasm'">
-        <PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.0" />
+    <SupportedPlatform Include="browser" />
-    </ItemGroup>
+  </ItemGroup>
-    <ItemGroup>
+  <ItemGroup>
-        <ProjectReference Include="..\Metadata\AA.Metadata.csproj" />
+    <None Include=".vscode\read-me.md" Pack="true" PackagePath="\"/>
-        <ProjectReference Include="..\Shared\AA.Shared.csproj" />
+  </ItemGroup>
-    </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="Humanizer.Core" Version="2.14.1" />
+    <PackageReference Include="MetadataExtractor" Version="2.8.1" />
+    <PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.1" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Metadata\AA.Metadata.csproj" />
+    <ProjectReference Include="..\Shared\AA.Shared.csproj" />
+  </ItemGroup>
 </Project>

Face/Models/D_Face.cs

@@ -1,3 +1,3 @@
-namespace View_by_Distance.Metadata.Models;
+namespace Phares.Metadata.Models;
 
 public class D_Face() { }

Face/Models/Stateless/Face.cs

@@ -1,9 +1,9 @@
 using System.Collections.ObjectModel;
-using View_by_Distance.Metadata.Models;
+using Phares.Metadata.Models;
-using View_by_Distance.Metadata.Models.Stateless;
+using Phares.Metadata.Models.Stateless;
-using View_by_Distance.Shared.Models;
+using Phares.Shared.Models;
-using View_by_Distance.Shared.Models.Properties;
+using Phares.Shared.Models.Properties;
-using View_by_Distance.Shared.Models.Stateless;
+using Phares.Shared.Models.Stateless;
 
 namespace View_by_Distance.Face.Models.Stateless;
 
@@ -15,17 +15,19 @@ internal static class Face
         FileHolder fileHolder = FileHolder.Get(fileInfo, id: null);
         const PersonKeyFormattedAndKeyTicksAndDisplayDirectoryName? personKeyFormattedAndKeyTicksAndDisplayDirectoryName = null;
         FilePath filePath = FilePath.Get(resultSettings, metadataSettings, fileHolder, index: null);
-        ExifDirectory exifDirectory = IMetadata.GetExifDirectory(filePath, personKeyFormattedAndKeyTicksAndDisplayDirectoryName);
+        Stream stream = File.OpenRead(filePath.FullName);
+        ExifDirectory exifDirectory = IMetadata.GetExifDirectory(filePath, stream, personKeyFormattedAndKeyTicksAndDisplayDirectoryName);
+        stream.Dispose();
         results.Add(exifDirectory);
     }
 
-    internal static ReadOnlyCollection<ExifDirectory> GetExifDirectories(ResultSettings resultSettings, MetadataSettings metadataSettings, DistanceSettings distanceSettings, ICompareSettings compareSettings, ICompare compare, long ticks, string outputResolution)
+    internal static ReadOnlyCollection<ExifDirectory> GetExifDirectories(ResultSettings resultSettings, MetadataSettings metadataSettings, DistanceSettings distanceSettings, ICompareSettings compareSettings, ICompare compare, string outputResolution)
     {
         List<ExifDirectory> results = [];
         FileInfo fileInfo;
         int maxDegreeOfParallelism = compareSettings.MaxDegreeOfParallelism;
         ParallelOptions parallelOptions = new() { MaxDegreeOfParallelism = maxDegreeOfParallelism };
-        long? skipOlderThan = distanceSettings.SkipOlderThanDays < 1 ? null : new DateTime(ticks).AddDays(-distanceSettings.SkipOlderThanDays).Ticks;
+        long? skipOlderThan = distanceSettings.SkipOlderThanDays < 1 ? null : new DateTime(compare.Ticks).AddDays(-distanceSettings.SkipOlderThanDays).Ticks;
         string resultsFullGroupDirectory = Path.GetFullPath(IResult.GetResultsFullGroupDirectory(resultSettings,
                                                                                                  nameof(D_Face),
                                                                                                  outputResolution,

Face/Models/Stateless/IFace.cs

@@ -1,16 +1,16 @@
 using System.Collections.ObjectModel;
-using View_by_Distance.Shared.Models;
+using Phares.Shared.Models;
-using View_by_Distance.Shared.Models.Properties;
+using Phares.Shared.Models.Properties;
-using View_by_Distance.Shared.Models.Stateless;
+using Phares.Shared.Models.Stateless;
 
 namespace View_by_Distance.Face.Models.Stateless;
 
 public interface IFace
 {
 
-    ReadOnlyCollection<ExifDirectory> TestStatic_GetExifDirectories(ResultSettings resultSettings, MetadataSettings metadataSettings, DistanceSettings distanceSettings, ICompareSettings compareSettings, ICompare compare, long ticks, string outputResolution) =>
+    ReadOnlyCollection<ExifDirectory> TestStatic_GetExifDirectories(ResultSettings resultSettings, MetadataSettings metadataSettings, DistanceSettings distanceSettings, ICompareSettings compareSettings, ICompare compare, string outputResolution) =>
-        GetExifDirectories(resultSettings, metadataSettings, distanceSettings, compareSettings, compare, ticks, outputResolution);
+        GetExifDirectories(resultSettings, metadataSettings, distanceSettings, compareSettings, compare, outputResolution);
-    static ReadOnlyCollection<ExifDirectory> GetExifDirectories(ResultSettings resultSettings, MetadataSettings metadataSettings, DistanceSettings distanceSettings, ICompareSettings compareSettings, ICompare compare, long ticks, string outputResolution) =>
+    static ReadOnlyCollection<ExifDirectory> GetExifDirectories(ResultSettings resultSettings, MetadataSettings metadataSettings, DistanceSettings distanceSettings, ICompareSettings compareSettings, ICompare compare, string outputResolution) =>
-        Face.GetExifDirectories(resultSettings, metadataSettings, distanceSettings, compareSettings, compare, ticks, outputResolution);
+        Face.GetExifDirectories(resultSettings, metadataSettings, distanceSettings, compareSettings, compare, outputResolution);
 
 }

FaceRecognitionDotNet/.vscode/read-me.md

@@ -0,0 +1 @@
+# Read Me

FaceRecognitionDotNet/AA.FaceRecognitionDotNet.csproj

@@ -7,9 +7,12 @@
         <TargetFramework>net9.0</TargetFramework>
     </PropertyGroup>
     <PropertyGroup>
-        <PackageId>Phares.AA.FaceRecognitionDotNet</PackageId>
+        <HoursSinceNovember122024>$([System.Math]::Floor($([MSBuild]::Divide($([MSBuild]::Subtract($([System.DateTimeOffset]::UtcNow.ToUnixTimeSeconds()), 1731369600)), 3600))))</HoursSinceNovember122024>
+    </PropertyGroup>
+    <PropertyGroup>
+        <PackageId>Phares.FaceRecognitionDotNet</PackageId>
         <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
-        <Version>9.0.100.1</Version>
+        <Version>9.0.104.$([System.Math]::Floor($([MSBuild]::Divide($([MSBuild]::Subtract($([System.DateTimeOffset]::UtcNow.ToUnixTimeSeconds()), 1731369600)), 3600))))</Version>
         <Authors>Mike Phares</Authors>
         <Company>Phares</Company>
         <IncludeSymbols>true</IncludeSymbols>

FaceRecognitionDotNet/Dlib/Python/CnnFaceDetectionModelV1.cs

@@ -1,7 +1,7 @@
 using DlibDotNet;
 using DlibDotNet.Dnn;
 using View_by_Distance.FaceRecognitionDotNet.Models;
-using View_by_Distance.Shared.Models.Stateless;
+using Phares.Shared.Models.Stateless;
 
 namespace View_by_Distance.FaceRecognitionDotNet.Dlib.Python;
 

FaceRecognitionDotNet/Dlib/Python/SimpleObjectDetector.cs

@@ -1,6 +1,6 @@
 using DlibDotNet;
 using View_by_Distance.FaceRecognitionDotNet.Models;
-using View_by_Distance.Shared.Models.Stateless;
+using Phares.Shared.Models.Stateless;
 
 namespace View_by_Distance.FaceRecognitionDotNet.Dlib.Python;
 

FaceRecognitionDotNet/Extensions/FaceDetector.cs

@@ -1,6 +1,6 @@
 using DlibDotNet;
 using View_by_Distance.FaceRecognitionDotNet.Models;
-using View_by_Distance.Shared.Models;
+using Phares.Shared.Models;
 
 namespace View_by_Distance.FaceRecognitionDotNet.Extensions;
 

FaceRecognitionDotNet/Extensions/FaceLandmarkDetector.cs

@@ -1,7 +1,7 @@
 using DlibDotNet;
 using View_by_Distance.FaceRecognitionDotNet.Models;
-using View_by_Distance.Shared.Models;
+using Phares.Shared.Models;
-using View_by_Distance.Shared.Models.Stateless;
+using Phares.Shared.Models.Stateless;
 
 namespace View_by_Distance.FaceRecognitionDotNet.Extensions;
 

FaceRecognitionDotNet/Models/FaceRecognition.cs

@@ -6,8 +6,8 @@ using System.Drawing.Imaging;
 using System.Runtime.InteropServices;
 using View_by_Distance.FaceRecognitionDotNet.Dlib.Python;
 using View_by_Distance.FaceRecognitionDotNet.Extensions;
-using View_by_Distance.Shared.Models;
+using Phares.Shared.Models;
-using View_by_Distance.Shared.Models.Stateless;
+using Phares.Shared.Models.Stateless;
 
 namespace View_by_Distance.FaceRecognitionDotNet.Models;
 

FaceRecognitionDotNet/Models/FaceRecognitionGroup.cs

@@ -1,5 +1,5 @@
-using View_by_Distance.Shared.Models;
+using Phares.Shared.Models;
-using View_by_Distance.Shared.Models.Stateless;
+using Phares.Shared.Models.Stateless;
 
 namespace View_by_Distance.FaceRecognitionDotNet.Models;
 

FaceRecognitionDotNet/Models/Image.cs

@@ -1,7 +1,7 @@
 using DlibDotNet;
 using DlibDotNet.Extensions;
 using System.Drawing;
-using View_by_Distance.Shared.Models.Stateless;
+using Phares.Shared.Models.Stateless;
 
 namespace View_by_Distance.FaceRecognitionDotNet.Models;
 

Metadata/.vscode/read-me.md

@@ -0,0 +1 @@
+# Read Me

Metadata/AA.Metadata.csproj

@@ -1,43 +1,51 @@
 <Project Sdk="Microsoft.NET.Sdk">
-    <PropertyGroup>
+  <PropertyGroup>
-        <ImplicitUsings>enable</ImplicitUsings>
+    <ImplicitUsings>enable</ImplicitUsings>
-        <Nullable>enable</Nullable>
+    <Nullable>enable</Nullable>
-        <OutputType>library</OutputType>
+    <OutputType>library</OutputType>
-        <RuntimeIdentifier>win-x64</RuntimeIdentifier>
+    <RuntimeIdentifier>win-x64</RuntimeIdentifier>
-        <TargetFramework>net9.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
-    </PropertyGroup>
+  </PropertyGroup>
-    <PropertyGroup>
+  <PropertyGroup>
-        <PackageId>Phares.AA.Metadata</PackageId>
+    <HoursSinceNovember142023>$([System.Math]::Floor($([MSBuild]::Divide($([MSBuild]::Subtract($([System.DateTimeOffset]::UtcNow.ToUnixTimeSeconds()), 1699920000)), 3600))))</HoursSinceNovember142023>
-        <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
+  </PropertyGroup>
-        <Version>9.0.100.0</Version>
+  <PropertyGroup>
-        <Authors>Mike Phares</Authors>
+    <PackageId>Phares.Metadata</PackageId>
-        <Company>Phares</Company>
+    <Version>8.0.118.$([System.Math]::Floor($([MSBuild]::Divide($([MSBuild]::Subtract($([System.DateTimeOffset]::UtcNow.ToUnixTimeSeconds()), 1699920000)), 3600))))</Version>
-        <IncludeSymbols>true</IncludeSymbols>
+    <Company>Phares</Company>
-        <SymbolPackageFormat>snupkg</SymbolPackageFormat>
+    <Authors>Mike Phares</Authors>
-    </PropertyGroup>
+    <IncludeSymbols>true</IncludeSymbols>
-    <PropertyGroup>
+    <PackageReadmeFile>read-me.md</PackageReadmeFile>
-        <IsWindows Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Windows)))' == 'true'">true</IsWindows>
+    <SymbolPackageFormat>snupkg</SymbolPackageFormat>
-        <IsOSX Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::OSX)))' == 'true'">true</IsOSX>
+    <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
-        <IsLinux Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Linux)))' == 'true'">true</IsLinux>
+    <PackageLicenseExpression>MIT</PackageLicenseExpression>
-    </PropertyGroup>
+  </PropertyGroup>
-    <PropertyGroup Condition="'$(IsWindows)'=='true'">
+  <PropertyGroup>
-        <DefineConstants>Windows</DefineConstants>
+    <IsWindows Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Windows)))' == 'true'">true</IsWindows>
-    </PropertyGroup>
+    <IsOSX Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::OSX)))' == 'true'">true</IsOSX>
-    <PropertyGroup Condition="'$(IsOSX)'=='true'">
+    <IsLinux Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Linux)))' == 'true'">true</IsLinux>
-        <DefineConstants>OSX</DefineConstants>
+  </PropertyGroup>
-    </PropertyGroup>
+  <PropertyGroup Condition="'$(IsWindows)'=='true'">
-    <PropertyGroup Condition="'$(IsLinux)'=='true'">
+    <DefineConstants>Windows</DefineConstants>
-        <DefineConstants>Linux</DefineConstants>
+  </PropertyGroup>
-    </PropertyGroup>
+  <PropertyGroup Condition="'$(IsOSX)'=='true'">
-    <ItemGroup Condition="'$(RuntimeIdentifier)' == 'browser-wasm'">
+    <DefineConstants>OSX</DefineConstants>
-        <SupportedPlatform Include="browser" />
+  </PropertyGroup>
-    </ItemGroup>
+  <PropertyGroup Condition="'$(IsLinux)'=='true'">
-    <ItemGroup>
+    <DefineConstants>Linux</DefineConstants>
-        <PackageReference Include="MetadataExtractor" Version="2.8.1" />
+  </PropertyGroup>
-        <PackageReference Include="System.Text.Json" Version="9.0.0" />
+  <ItemGroup Condition="'$(RuntimeIdentifier)' == 'browser-wasm'">
-        <PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.0" />
+    <SupportedPlatform Include="browser" />
-    </ItemGroup>
+  </ItemGroup>
-    <ItemGroup>
+  <ItemGroup>
-        <ProjectReference Include="..\Shared\AA.Shared.csproj" />
+    <None Include=".vscode\read-me.md" Pack="true" PackagePath="\" />
-    </ItemGroup>
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="MetadataExtractor" Version="2.8.1" />
+    <PackageReference Include="System.Text.Json" Version="9.0.3" />
+    <PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.1" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Shared\AA.Shared.csproj" />
+  </ItemGroup>
 </Project>

Metadata/Models/A_Metadata.cs

@@ -1,17 +1,17 @@
 using System.Collections.ObjectModel;
 using System.Text.Json;
-using View_by_Distance.Metadata.Models.Stateless;
+using Phares.Metadata.Models.Stateless;
-using View_by_Distance.Shared.Models;
+using Phares.Shared.Models;
-using View_by_Distance.Shared.Models.Stateless;
+using Phares.Shared.Models.Stateless;
 
-namespace View_by_Distance.Metadata.Models;
+namespace Phares.Metadata.Models;
 
 public class A_Metadata
 {
 
     private readonly ResultSettings _ResultSettings;
     private readonly MetadataSettings _MetadataSettings;
-    private readonly ReadOnlyDictionary<int, ReadOnlyDictionary<string, string[]>> _FileGroups;
+    private readonly ReadOnlyDictionary<int, ReadOnlyDictionary<byte, ReadOnlyCollection<string>>> _ResultSingletonFileGroups;
 
     public A_Metadata(ResultSettings resultSettings, MetadataSettings metadataSettings)
     {
@@ -23,53 +23,28 @@ public class A_Metadata
                                                                                  includeResizeGroup: false,
                                                                                  includeModel: false,
                                                                                  includePredictorModel: false);
-        _FileGroups = IPath.GetKeyValuePairs(resultSettings, aResultsFullGroupDirectory, [resultSettings.ResultSingleton]);
+        Dictionary<int, ReadOnlyDictionary<byte, ReadOnlyCollection<string>>> results = [];
+        ReadOnlyDictionary<int, ReadOnlyDictionary<string, ReadOnlyDictionary<byte, ReadOnlyCollection<string>>>> keyValuePairs = IPath.GetKeyValuePairs(resultSettings, aResultsFullGroupDirectory, [resultSettings.ResultSingleton]);
+        foreach (KeyValuePair<int, ReadOnlyDictionary<string, ReadOnlyDictionary<byte, ReadOnlyCollection<string>>>> keyValuePair in keyValuePairs)
+        {
+            foreach (KeyValuePair<string, ReadOnlyDictionary<byte, ReadOnlyCollection<string>>> keyValue in keyValuePair.Value)
+            {
+                if (keyValue.Key == resultSettings.ResultSingleton)
+                    results.Add(keyValuePair.Key, keyValue.Value);
+                else
+                    throw new Exception();
+            }
+        }
+        _ResultSingletonFileGroups = new(results);
+        ReadOnlyCollection<string> directories = new([Path.Combine(aResultsFullGroupDirectory, resultSettings.ResultSingleton)]);
+        IPath.CreateDirectories(directories);
     }
 
-    private (int, FileInfo) GetFileInfo(ResultSettings resultSettings, FilePath filePath)
+    public (MinimumYearAndPathCombined, ExifDirectory) GetMetadataCollection(ResultSettings resultSettings, MetadataSettings metadataSettings, FilePath filePath)
-    {
-        FileInfo result;
-        FileInfo fileInfo = new(filePath.FullName);
-        (_, int directoryIndex) = IPath.GetDirectoryNameAndIndex(resultSettings, filePath);
-        DateTime minimumDateTime = fileInfo.CreationTime < fileInfo.LastWriteTime ? fileInfo.CreationTime : fileInfo.LastWriteTime;
-        int fileInfoMinimumYear = minimumDateTime.Year < resultSettings.EpicYear ? resultSettings.EpicYear : minimumDateTime.Year;
-        result = new(Path.Combine(_FileGroups[fileInfoMinimumYear][_ResultSettings.ResultSingleton][directoryIndex], $"{filePath.NameWithoutExtension}{filePath.ExtensionLowered}.json"));
-        return (fileInfoMinimumYear, result);
-    }
-
-    private (int, string) GetJsonFile(ResultSettings resultSettings, FilePath filePath, ExifDirectory exifDirectory)
-    {
-        string? result;
-        DateTime? dateTime;
-        dateTime = IDate.GetDateTimeOriginal(exifDirectory);
-        dateTime ??= IDate.GetMinimum(exifDirectory);
-        (_, int directoryIndex) = IPath.GetDirectoryNameAndIndex(resultSettings, filePath);
-        int exifYear = dateTime.Value.Year < resultSettings.EpicYear ? resultSettings.EpicYear : dateTime.Value.Year;
-        result = Path.Combine(_FileGroups[exifYear][_ResultSettings.ResultSingleton][directoryIndex], $"{filePath.NameWithoutExtension}{filePath.ExtensionLowered}.json");
-        return (exifYear, result);
-    }
-
-    private static (string, ExifDirectory?) Get(string jsonFile)
     {
         ExifDirectory? result;
-        string json = File.ReadAllText(jsonFile);
+        MinimumYearAndPathCombined minimumYearAndPathCombined = GetMinimumYearAndPathCombined(resultSettings, filePath);
-        try
+        FileInfo fileInfo = new(minimumYearAndPathCombined.PathCombined);
-        {
-            result = JsonSerializer.Deserialize(json, ExifDirectorySourceGenerationContext.Default.ExifDirectory);
-            if (result is null)
-                throw new Exception();
-        }
-        catch (Exception)
-        {
-            result = null;
-        }
-        return (json, result);
-    }
-
-    public (FileInfo, ExifDirectory) GetMetadataCollection(ResultSettings resultSettings, MetadataSettings metadataSettings, FilePath filePath)
-    {
-        ExifDirectory? result;
-        (int fileInfoMinimumYear, FileInfo fileInfo) = GetFileInfo(resultSettings, filePath);
         if (_MetadataSettings.ForceMetadataLastWriteTimeToCreationTime && !fileInfo.Exists && File.Exists(Path.ChangeExtension(fileInfo.FullName, ".delete")))
         {
             File.Move(Path.ChangeExtension(fileInfo.FullName, ".delete"), fileInfo.FullName);
@@ -103,10 +78,12 @@ public class A_Metadata
         if (result is null)
         {
             string json;
+            Stream stream = File.OpenRead(filePath.FullName);
             const PersonKeyFormattedAndKeyTicksAndDisplayDirectoryName? personKeyFormattedAndKeyTicksAndDisplayDirectoryName = null;
-            result = Exif.GetExifDirectory(filePath, personKeyFormattedAndKeyTicksAndDisplayDirectoryName);
+            result = Exif.GetExifDirectory(filePath, stream, personKeyFormattedAndKeyTicksAndDisplayDirectoryName);
+            stream.Dispose();
             (int exifYear, string jsonFile) = GetJsonFile(_ResultSettings, filePath, result);
-            if (exifYear == fileInfoMinimumYear)
+            if (exifYear == minimumYearAndPathCombined.MinimumYear)
                 json = JsonSerializer.Serialize(result, ExifDirectorySourceGenerationContext.Default.ExifDirectory);
             else
             {
@@ -131,7 +108,76 @@ public class A_Metadata
                 fileInfo.Refresh();
             }
         }
-        return (fileInfo, result);
+        return new(minimumYearAndPathCombined, result);
+    }
+
+    private MinimumYearAndPathCombined GetMinimumYearAndPathCombined(ResultSettings resultSettings, FilePath filePath)
+    {
+        MinimumYearAndPathCombined result;
+        CombinedEnumAndIndex cei = IPath.GetCombinedEnumAndIndex(resultSettings, filePath);
+        DateTime minimumDateTime = new(filePath.CreationTicks < filePath.LastWriteTicks ? filePath.CreationTicks : filePath.LastWriteTicks);
+        int minimumYear = minimumDateTime.Year < resultSettings.EpicYear ? resultSettings.EpicYear : minimumDateTime.Year;
+        result = new(minimumYear, Path.Combine(_ResultSingletonFileGroups[minimumYear][cei.Enum][cei.Index], $"{filePath.NameWithoutExtension}{filePath.ExtensionLowered}.json"));
+        return result;
+    }
+
+    private (int, string) GetJsonFile(ResultSettings resultSettings, FilePath filePath, ExifDirectory exifDirectory)
+    {
+        string? result;
+        DateTime? dateTime;
+        dateTime = IDate.GetDateTimeOriginal(exifDirectory);
+        dateTime ??= IDate.GetMinimum(exifDirectory);
+        CombinedEnumAndIndex cei = IPath.GetCombinedEnumAndIndex(resultSettings, filePath);
+        int exifYear = dateTime.Value.Year < resultSettings.EpicYear ? resultSettings.EpicYear : dateTime.Value.Year;
+        result = Path.Combine(_ResultSingletonFileGroups[exifYear][cei.Enum][cei.Index], $"{filePath.NameWithoutExtension}{filePath.ExtensionLowered}.json");
+        return new(exifYear, result);
+    }
+
+    private static (string, ExifDirectory?) Get(string jsonFile)
+    {
+        ExifDirectory? result;
+        string json = File.ReadAllText(jsonFile);
+        try
+        {
+            result = JsonSerializer.Deserialize(json, ExifDirectorySourceGenerationContext.Default.ExifDirectory);
+            if (result is null)
+                throw new Exception();
+        }
+        catch (Exception)
+        {
+            result = null;
+        }
+        return new(json, result);
+    }
+
+    public (MinimumYearAndPathCombined, ExifDirectory) GetMetadataCollection(ResultSettings resultSettings, MetadataSettings metadataSettings, HttpClient? httpClient, FilePath filePath)
+    {
+        ExifDirectory result;
+        MinimumYearAndPathCombined minimumYearAndPathCombined;
+        if (httpClient is null)
+            (minimumYearAndPathCombined, result) = GetMetadataCollection(resultSettings, metadataSettings, filePath);
+        else
+        {
+            Stream stream = GetStream(httpClient, filePath);
+            minimumYearAndPathCombined = GetMinimumYearAndPathCombined(resultSettings, filePath);
+            const PersonKeyFormattedAndKeyTicksAndDisplayDirectoryName? personKeyFormattedAndKeyTicksAndDisplayDirectoryName = null;
+            result = Exif.GetExifDirectory(filePath, stream, personKeyFormattedAndKeyTicksAndDisplayDirectoryName);
+            stream.Dispose();
+        }
+        return new(minimumYearAndPathCombined, result);
+    }
+
+    private static Stream GetStream(HttpClient httpClient, FilePath filePath)
+    {
+        Stream result;
+        Task<HttpResponseMessage> httpResponseMessage = httpClient.GetAsync(filePath.FullName);
+        httpResponseMessage.Wait();
+        Task task = httpResponseMessage.Result.Content.LoadIntoBufferAsync();
+        task.Wait();
+        Task<Stream> stream = httpResponseMessage.Result.Content.ReadAsStreamAsync();
+        stream.Wait();
+        result = stream.Result;
+        return result;
     }
 
 }

Metadata/Models/Stateless/Base.cs

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

Metadata/Models/Stateless/Dimensions.cs

@@ -1,6 +1,6 @@
 using System.Drawing;
 
-namespace View_by_Distance.Metadata.Models.Stateless;
+namespace Phares.Metadata.Models.Stateless;
 
 internal static class Dimensions
 {
@@ -8,18 +8,18 @@ internal static class Dimensions
 #pragma warning disable IDE0230
     private static readonly Dictionary<byte[], Func<BinaryReader, Size?>> _ImageFormatDecoders = new()
     {
+        { new byte[] { 0xff, 0xd8 }, DecodeJfif },
         { new byte[] { 0x42, 0x4D }, DecodeBitmap },
+        { new byte[] { 0x52, 0x49, 0x46, 0x46 }, DecodeWebP },
         { new byte[] { 0x47, 0x49, 0x46, 0x38, 0x37, 0x61 }, DecodeGif },
         { new byte[] { 0x47, 0x49, 0x46, 0x38, 0x39, 0x61 }, DecodeGif },
         { new byte[] { 0x89, 0x50, 0x4E, 0x47, 0x0D, 0x0A, 0x1A, 0x0A }, DecodePng },
-        { new byte[] { 0xff, 0xd8 }, DecodeJfif },
-        { new byte[] { 0x52, 0x49, 0x46, 0x46 }, DecodeWebP },
     };
 #pragma warning restore IDE0230
 
-    private static bool StartsWith(byte[] thisBytes, byte[] thatBytes)
+    private static bool StartsWith(List<byte> thisBytes, byte[] thatBytes)
     {
-        for (int i = 0; i < thatBytes.Length; i += 1)
+        for (int i = 0; i < thisBytes.Count && i < thatBytes.Length; i += 1)
         {
             if (thisBytes[i] == thatBytes[i])
                 continue;
@@ -103,24 +103,49 @@ internal static class Dimensions
 
     internal static Size? GetDimensions(BinaryReader binaryReader)
     {
-        int maxMagicBytesLength = _ImageFormatDecoders.Keys.OrderByDescending(x => x.Length).First().Length;
+        Size? result;
-        byte[] magicBytes = new byte[maxMagicBytesLength];
+        List<byte> magicBytes = [];
-        for (int i = 0; i < maxMagicBytesLength; i += 1)
+        int[] magicBytesLengths = (from l in _ImageFormatDecoders.Keys where l.Length <= binaryReader.BaseStream.Length orderby l.Length descending select l.Length).ToArray();
+        if (magicBytesLengths.Length == 0)
+            result = null;
+        else
         {
-            magicBytes[i] = binaryReader.ReadByte();
+            result = null;
-            foreach (KeyValuePair<byte[], Func<BinaryReader, Size?>> kvPair in _ImageFormatDecoders)
+            if (binaryReader.BaseStream.Length == binaryReader.BaseStream.Position)
+                _ = binaryReader.BaseStream.Seek(0, SeekOrigin.Begin);
+            for (int i = 0; i < magicBytesLengths[0]; i++)
             {
-                if (StartsWith(magicBytes, kvPair.Key))
+                magicBytes.Add(binaryReader.ReadByte());
-                    return kvPair.Value(binaryReader);
+                foreach (KeyValuePair<byte[], Func<BinaryReader, Size?>> kvPair in _ImageFormatDecoders)
+                {
+                    if (StartsWith(magicBytes, kvPair.Key))
+                    {
+                        result = kvPair.Value(binaryReader);
+                        break;
+                    }
+                }
+                if (result is not null)
+                    break;
             }
         }
-        return null;
+        return result;
     }
 
     internal static Size? GetDimensions(string path)
     {
-        using BinaryReader binaryReader = new(File.OpenRead(path));
+        Size? result;
-        return GetDimensions(binaryReader);
+        using FileStream fileStream = File.OpenRead(path);
+        using BinaryReader binaryReader = new(fileStream);
+        result = GetDimensions(binaryReader);
+        return result;
+    }
+
+    internal static Size? GetDimensions(Stream stream)
+    {
+        Size? result;
+        using BinaryReader binaryReader = new(stream);
+        result = GetDimensions(binaryReader);
+        return result;
     }
 
 }

Metadata/Models/Stateless/Exif.cs

@@ -1,9 +1,10 @@
 using MetadataExtractor;
-using MetadataExtractor.Formats.Exif;
 using MetadataExtractor.Formats.Exif.Makernotes;
 using System.Globalization;
+using Phares.Shared.Models;
+using Phares.Shared.Models.Stateless;
 
-namespace View_by_Distance.Metadata.Models.Stateless;
+namespace Phares.Metadata.Models.Stateless;
 
 internal abstract class Exif
 {
@@ -24,10 +25,10 @@ internal abstract class Exif
         return result;
     }
 
-    private static Shared.Models.AviDirectory[] GetAviDirectories(IReadOnlyList<MetadataExtractor.Directory> directories)
+    private static AviDirectory[] GetAviDirectories(IReadOnlyList<MetadataExtractor.Directory> directories)
     {
-        List<Shared.Models.AviDirectory> results = [];
+        List<AviDirectory> results = [];
-        Shared.Models.AviDirectory aviDirectory;
+        AviDirectory aviDirectory;
         IEnumerable<MetadataExtractor.Formats.Avi.AviDirectory> aviDirectories = directories.OfType<MetadataExtractor.Formats.Avi.AviDirectory>();
         foreach (MetadataExtractor.Formats.Avi.AviDirectory a in aviDirectories)
         {
@@ -43,18 +44,18 @@ internal abstract class Exif
                 dateTimeOriginal = GetDateTime(a.GetString(MetadataExtractor.Formats.Avi.AviDirectory.TagDateTimeOriginal));
             if (dateTimeOriginal is null && duration is null && height is null && width is null)
                 continue;
-            aviDirectory = new(dateTimeOriginal, duration, height, width);
+            aviDirectory = new(DateTimeOriginal: dateTimeOriginal, Duration: duration, Height: height, Width: width);
             results.Add(aviDirectory);
         }
         return results.ToArray();
     }
 
-    private static Shared.Models.ExifDirectoryBase[] GetExifBaseDirectories(IReadOnlyList<MetadataExtractor.Directory> directories)
+    private static ExifDirectoryBase[] GetExifBaseDirectories(IReadOnlyList<MetadataExtractor.Directory> directories)
     {
-        List<Shared.Models.ExifDirectoryBase> results = [];
+        List<ExifDirectoryBase> results = [];
-        Shared.Models.ExifDirectoryBase exifDirectoryBase;
+        ExifDirectoryBase exifDirectoryBase;
-        IEnumerable<ExifDirectoryBase> exifBaseDirectories = directories.OfType<ExifDirectoryBase>();
+        IEnumerable<MetadataExtractor.Formats.Exif.ExifDirectoryBase> exifBaseDirectories = directories.OfType<MetadataExtractor.Formats.Exif.ExifDirectoryBase>();
-        foreach (ExifDirectoryBase e in exifBaseDirectories)
+        foreach (MetadataExtractor.Formats.Exif.ExifDirectoryBase e in exifBaseDirectories)
         {
             if (e.Tags.Count == 0)
                 continue;
@@ -62,61 +63,63 @@ internal abstract class Exif
             DateTime checkDateTime;
             DateTime? dateTimeOriginal;
             DateTime? dateTimeDigitized;
-            string? aperture = e.GetDescription(ExifDirectoryBase.TagAperture);
+            string? aperture = e.GetDescription(MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagAperture);
-            string? applicationNotes = e.GetDescription(ExifDirectoryBase.TagApplicationNotes);
+            string? applicationNotes = e.GetDescription(MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagApplicationNotes);
-            string? artist = e.GetDescription(ExifDirectoryBase.TagArtist);
+            string? artist = e.GetDescription(MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagArtist);
-            string? bitsPerSample = e.GetDescription(ExifDirectoryBase.TagBitsPerSample);
+            string? bitsPerSample = e.GetDescription(MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagBitsPerSample);
-            string? bodySerialNumber = e.GetDescription(ExifDirectoryBase.TagBodySerialNumber);
+            string? bodySerialNumber = e.GetDescription(MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagBodySerialNumber);
-            string? cameraOwnerName = e.GetDescription(ExifDirectoryBase.TagCameraOwnerName);
+            string? cameraOwnerName = e.GetDescription(MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagCameraOwnerName);
-            string? compressedAverageBitsPerPixel = e.GetDescription(ExifDirectoryBase.TagCompressedAverageBitsPerPixel);
+            string? compressedAverageBitsPerPixel = e.GetDescription(MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagCompressedAverageBitsPerPixel);
-            string? compression = e.GetDescription(ExifDirectoryBase.TagCompression);
+            string? compression = e.GetDescription(MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagCompression);
-            string? copyright = e.GetDescription(ExifDirectoryBase.TagCopyright);
+            string? copyright = e.GetDescription(MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagCopyright);
-            string? documentName = e.GetDescription(ExifDirectoryBase.TagDocumentName);
+            string? documentName = e.GetDescription(MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagDocumentName);
-            string? exifVersion = e.GetDescription(ExifDirectoryBase.TagExifVersion);
+            string? exifVersion = e.GetDescription(MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagExifVersion);
-            string? exposureTime = e.GetDescription(ExifDirectoryBase.TagExposureTime);
+            string? exposureTime = e.GetDescription(MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagExposureTime);
-            string? fileSource = e.GetDescription(ExifDirectoryBase.TagFileSource);
+            string? fileSource = e.GetDescription(MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagFileSource);
-            string? imageDescription = e.GetDescription(ExifDirectoryBase.TagImageDescription);
+            string? imageDescription = e.GetDescription(MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagImageDescription);
-            string? imageHeight = e.GetDescription(ExifDirectoryBase.TagImageHeight);
+            string? imageHeight = e.GetDescription(MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagImageHeight);
-            string? imageNumber = e.GetDescription(ExifDirectoryBase.TagImageNumber);
+            int? imageHeightValue = imageHeight is null ? null : e.GetInt32(MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagImageHeight);
-            string? imageUniqueId = e.GetDescription(ExifDirectoryBase.TagImageUniqueId);
+            string? imageNumber = e.GetDescription(MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagImageNumber);
-            string? imageWidth = e.GetDescription(ExifDirectoryBase.TagImageWidth);
+            string? imageUniqueId = e.GetDescription(MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagImageUniqueId);
-            string? isoSpeed = e.GetDescription(ExifDirectoryBase.TagIsoSpeed);
+            string? imageWidth = e.GetDescription(MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagImageWidth);
-            string? lensMake = e.GetDescription(ExifDirectoryBase.TagLensMake);
+            int? imageWidthValue = imageWidth is null ? null : e.GetInt32(MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagImageWidth);
-            string? lensModel = e.GetDescription(ExifDirectoryBase.TagLensModel);
+            string? isoSpeed = e.GetDescription(MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagIsoSpeed);
-            string? lensSerialNumber = e.GetDescription(ExifDirectoryBase.TagLensSerialNumber);
+            string? lensMake = e.GetDescription(MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagLensMake);
-            string? make = e.GetDescription(ExifDirectoryBase.TagMake);
+            string? lensModel = e.GetDescription(MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagLensModel);
-            string? makerNote = e.GetDescription(ExifDirectoryBase.TagMakernote);
+            string? lensSerialNumber = e.GetDescription(MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagLensSerialNumber);
-            string? model = e.GetDescription(ExifDirectoryBase.TagModel);
+            string? make = e.GetDescription(MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagMake);
-            string? orientation = e.GetDescription(ExifDirectoryBase.TagOrientation);
+            string? makerNote = e.GetDescription(MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagMakernote);
-            int? orientationValue = orientation is null ? null : e.GetInt32(ExifDirectoryBase.TagOrientation);
+            string? model = e.GetDescription(MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagModel);
-            string? rating = e.GetDescription(ExifDirectoryBase.TagRating);
+            string? orientation = e.GetDescription(MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagOrientation);
-            string? ratingPercent = e.GetDescription(ExifDirectoryBase.TagRatingPercent);
+            int? orientationValue = orientation is null ? null : e.GetInt32(MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagOrientation);
-            string? securityClassification = e.GetDescription(ExifDirectoryBase.TagSecurityClassification);
+            string? rating = e.GetDescription(MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagRating);
-            string? shutterSpeed = e.GetDescription(ExifDirectoryBase.TagShutterSpeed);
+            string? ratingPercent = e.GetDescription(MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagRatingPercent);
-            string? software = e.GetDescription(ExifDirectoryBase.TagSoftware);
+            string? securityClassification = e.GetDescription(MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagSecurityClassification);
-            string? timeZone = e.GetDescription(ExifDirectoryBase.TagTimeZone);
+            string? shutterSpeed = e.GetDescription(MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagShutterSpeed);
-            string? timeZoneDigitized = e.GetDescription(ExifDirectoryBase.TagTimeZoneDigitized);
+            string? software = e.GetDescription(MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagSoftware);
-            string? timeZoneOriginal = e.GetDescription(ExifDirectoryBase.TagTimeZoneOriginal);
+            string? timeZone = e.GetDescription(MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagTimeZone);
-            string? userComment = e.GetDescription(ExifDirectoryBase.TagUserComment);
+            string? timeZoneDigitized = e.GetDescription(MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagTimeZoneDigitized);
-            string? winAuthor = e.GetDescription(ExifDirectoryBase.TagWinAuthor);
+            string? timeZoneOriginal = e.GetDescription(MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagTimeZoneOriginal);
-            string? winComment = e.GetDescription(ExifDirectoryBase.TagWinComment);
+            string? userComment = e.GetDescription(MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagUserComment);
-            string? winKeywords = e.GetDescription(ExifDirectoryBase.TagWinKeywords);
+            string? winAuthor = e.GetDescription(MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagWinAuthor);
-            string? winSubject = e.GetDescription(ExifDirectoryBase.TagWinSubject);
+            string? winComment = e.GetDescription(MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagWinComment);
-            string? winTitle = e.GetDescription(ExifDirectoryBase.TagWinTitle);
+            string? winKeywords = e.GetDescription(MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagWinKeywords);
-            string? xResolution = e.GetDescription(ExifDirectoryBase.TagXResolution);
+            string? winSubject = e.GetDescription(MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagWinSubject);
-            string? yResolution = e.GetDescription(ExifDirectoryBase.TagYResolution);
+            string? winTitle = e.GetDescription(MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagWinTitle);
-            if (e.TryGetDateTime(ExifDirectoryBase.TagDateTime, out checkDateTime))
+            string? xResolution = e.GetDescription(MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagXResolution);
+            string? yResolution = e.GetDescription(MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagYResolution);
+            if (e.TryGetDateTime(MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagDateTime, out checkDateTime))
                 dateTime = checkDateTime;
             else
-                dateTime = GetDateTime(e.GetString(ExifDirectoryBase.TagDateTime));
+                dateTime = GetDateTime(e.GetString(MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagDateTime));
-            if (e.TryGetDateTime(ExifDirectoryBase.TagDateTimeOriginal, out checkDateTime))
+            if (e.TryGetDateTime(MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagDateTimeOriginal, out checkDateTime))
                 dateTimeOriginal = checkDateTime;
             else
-                dateTimeOriginal = GetDateTime(e.GetString(ExifDirectoryBase.TagDateTimeOriginal));
+                dateTimeOriginal = GetDateTime(e.GetString(MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagDateTimeOriginal));
-            if (e.TryGetDateTime(ExifDirectoryBase.TagDateTimeDigitized, out checkDateTime))
+            if (e.TryGetDateTime(MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagDateTimeDigitized, out checkDateTime))
                 dateTimeDigitized = checkDateTime;
             else
-                dateTimeDigitized = GetDateTime(e.GetString(ExifDirectoryBase.TagDateTimeDigitized));
+                dateTimeDigitized = GetDateTime(e.GetString(MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagDateTimeDigitized));
             if (userComment is not null && userComment.Length > 255)
                 userComment = "...";
             if (aperture is null
@@ -166,61 +169,63 @@ internal abstract class Exif
                 && xResolution is not null
                 && yResolution is null)
                 continue;
-            exifDirectoryBase = new(aperture,
+            exifDirectoryBase = new(Aperture: aperture,
-                                    applicationNotes,
+                        ApplicationNotes: applicationNotes,
-                                    artist,
+                        Artist: artist,
-                                    bitsPerSample,
+                        BitsPerSample: bitsPerSample,
-                                    bodySerialNumber,
+                        BodySerialNumber: bodySerialNumber,
-                                    cameraOwnerName,
+                        CameraOwnerName: cameraOwnerName,
-                                    compressedAverageBitsPerPixel,
+                        CompressedAverageBitsPerPixel: compressedAverageBitsPerPixel,
-                                    compression,
+                        Compression: compression,
-                                    copyright,
+                        Copyright: copyright,
-                                    dateTime,
+                        DateTime: dateTime,
-                                    dateTimeDigitized,
+                        DateTimeDigitized: dateTimeDigitized,
-                                    dateTimeOriginal,
+                        DateTimeOriginal: dateTimeOriginal,
-                                    documentName,
+                        DocumentName: documentName,
-                                    exifVersion,
+                        ExifVersion: exifVersion,
-                                    exposureTime,
+                        ExposureTime: exposureTime,
-                                    fileSource,
+                        FileSource: fileSource,
-                                    imageDescription,
+                        ImageDescription: imageDescription,
-                                    imageHeight,
+                        ImageHeight: imageHeight,
-                                    imageNumber,
+                        ImageHeightValue: imageHeightValue,
-                                    imageUniqueId,
+                        ImageNumber: imageNumber,
-                                    imageWidth,
+                        ImageUniqueId: imageUniqueId,
-                                    isoSpeed,
+                        ImageWidth: imageWidth,
-                                    lensMake,
+                        ImageWidthValue: imageWidthValue,
-                                    lensModel,
+                        IsoSpeed: isoSpeed,
-                                    lensSerialNumber,
+                        LensMake: lensMake,
-                                    make,
+                        LensModel: lensModel,
-                                    makerNote,
+                        LensSerialNumber: lensSerialNumber,
-                                    model,
+                        Make: make,
-                                    orientation,
+                        MakerNote: makerNote,
-                                    orientationValue,
+                        Model: model,
-                                    rating,
+                        Orientation: orientation,
-                                    ratingPercent,
+                        OrientationValue: orientationValue,
-                                    securityClassification,
+                        Rating: rating,
-                                    shutterSpeed,
+                        RatingPercent: ratingPercent,
-                                    software,
+                        SecurityClassification: securityClassification,
-                                    timeZone,
+                        ShutterSpeed: shutterSpeed,
-                                    timeZoneDigitized,
+                        Software: software,
-                                    timeZoneOriginal,
+                        TimeZone: timeZone,
-                                    userComment,
+                        TimeZoneDigitized: timeZoneDigitized,
-                                    winAuthor,
+                        TimeZoneOriginal: timeZoneOriginal,
-                                    winComment,
+                        UserComment: userComment,
-                                    winKeywords,
+                        WinAuthor: winAuthor,
-                                    winSubject,
+                        WinComment: winComment,
-                                    winTitle,
+                        WinKeywords: winKeywords,
-                                    xResolution,
+                        WinSubject: winSubject,
-                                    yResolution);
+                        WinTitle: winTitle,
+                        XResolution: xResolution,
+                        YResolution: yResolution);
             results.Add(exifDirectoryBase);
         }
         return results.ToArray();
     }
 
-    private static Shared.Models.FileMetadataDirectory[] GetFileMetadataDirectories(string file, IReadOnlyList<MetadataExtractor.Directory> directories)
+    private static FileMetadataDirectory[] GetFileMetadataDirectories(string file, IReadOnlyList<MetadataExtractor.Directory> directories)
     {
-        List<Shared.Models.FileMetadataDirectory> results = [];
+        List<FileMetadataDirectory> results = [];
-        Shared.Models.FileMetadataDirectory fileMetadataDirectory;
+        FileMetadataDirectory fileMetadataDirectory;
         IEnumerable<MetadataExtractor.Formats.FileSystem.FileMetadataDirectory> fileMetadataDirectories = directories.OfType<MetadataExtractor.Formats.FileSystem.FileMetadataDirectory>();
         foreach (MetadataExtractor.Formats.FileSystem.FileMetadataDirectory f in fileMetadataDirectories)
         {
@@ -237,16 +242,16 @@ internal abstract class Exif
                 throw new NotSupportedException($"!{file}.EndsWith({fileName})");
             if (fileModifiedDate is null && fileName is null && fileSize is null)
                 continue;
-            fileMetadataDirectory = new(fileModifiedDate, fileName, fileSize);
+            fileMetadataDirectory = new(FileModifiedDate: fileModifiedDate, FileName: fileName, FileSize: fileSize);
             results.Add(fileMetadataDirectory);
         }
         return results.ToArray();
     }
 
-    private static Shared.Models.GifHeaderDirectory[] GetGifHeaderDirectories(IReadOnlyList<MetadataExtractor.Directory> directories)
+    private static GifHeaderDirectory[] GetGifHeaderDirectories(IReadOnlyList<MetadataExtractor.Directory> directories)
     {
-        List<Shared.Models.GifHeaderDirectory> results = [];
+        List<GifHeaderDirectory> results = [];
-        Shared.Models.GifHeaderDirectory gifHeaderDirectory;
+        GifHeaderDirectory gifHeaderDirectory;
         IEnumerable<MetadataExtractor.Formats.Gif.GifHeaderDirectory> gifHeaderDirectories = directories.OfType<MetadataExtractor.Formats.Gif.GifHeaderDirectory>();
         foreach (MetadataExtractor.Formats.Gif.GifHeaderDirectory g in gifHeaderDirectories)
         {
@@ -256,48 +261,48 @@ internal abstract class Exif
             string? imageWidth = g.GetDescription(MetadataExtractor.Formats.Gif.GifHeaderDirectory.TagImageWidth);
             if (imageHeight is null && imageWidth is null)
                 continue;
-            gifHeaderDirectory = new(imageHeight, imageWidth);
+            gifHeaderDirectory = new(ImageHeight: imageHeight, ImageWidth: imageWidth);
             results.Add(gifHeaderDirectory);
         }
         return results.ToArray();
     }
 
-    private static Shared.Models.GpsDirectory[] GetGpsDirectories(IReadOnlyList<MetadataExtractor.Directory> directories)
+    private static GpsDirectory[] GetGpsDirectories(IReadOnlyList<MetadataExtractor.Directory> directories)
     {
-        List<Shared.Models.GpsDirectory> results = [];
+        List<GpsDirectory> results = [];
-        Shared.Models.GpsDirectory gpsDirectory;
+        GpsDirectory gpsDirectory;
-        IEnumerable<GpsDirectory> gpsDirectories = directories.OfType<GpsDirectory>();
+        IEnumerable<MetadataExtractor.Formats.Exif.GpsDirectory> gpsDirectories = directories.OfType<MetadataExtractor.Formats.Exif.GpsDirectory>();
-        foreach (GpsDirectory g in gpsDirectories)
+        foreach (MetadataExtractor.Formats.Exif.GpsDirectory g in gpsDirectories)
         {
             if (g.Tags.Count == 0)
                 continue;
             DateTime? timeStamp;
-            string? altitude = g.GetDescription(GpsDirectory.TagAltitude);
+            string? altitude = g.GetDescription(MetadataExtractor.Formats.Exif.GpsDirectory.TagAltitude);
-            string? latitude = g.GetDescription(GpsDirectory.TagLatitude);
+            string? latitude = g.GetDescription(MetadataExtractor.Formats.Exif.GpsDirectory.TagLatitude);
-            string? latitudeRef = g.GetDescription(GpsDirectory.TagLatitudeRef);
+            string? latitudeRef = g.GetDescription(MetadataExtractor.Formats.Exif.GpsDirectory.TagLatitudeRef);
-            string? longitude = g.GetDescription(GpsDirectory.TagLongitude);
+            string? longitude = g.GetDescription(MetadataExtractor.Formats.Exif.GpsDirectory.TagLongitude);
-            string? longitudeRef = g.GetDescription(GpsDirectory.TagLongitudeRef);
+            string? longitudeRef = g.GetDescription(MetadataExtractor.Formats.Exif.GpsDirectory.TagLongitudeRef);
-            if (g.TryGetDateTime(GpsDirectory.TagTimeStamp, out DateTime checkDateTime))
+            if (g.TryGetDateTime(MetadataExtractor.Formats.Exif.GpsDirectory.TagTimeStamp, out DateTime checkDateTime))
                 timeStamp = checkDateTime;
             else
-                timeStamp = GetDateTime(g.GetString(GpsDirectory.TagTimeStamp));
+                timeStamp = GetDateTime(g.GetString(MetadataExtractor.Formats.Exif.GpsDirectory.TagTimeStamp));
             if (altitude is null && latitude is null && latitudeRef is null && longitude is null && longitudeRef is null && timeStamp is null)
                 continue;
-            gpsDirectory = new(altitude,
+            gpsDirectory = new(Altitude: altitude,
-                               latitude,
+                               Latitude: latitude,
-                               latitudeRef,
+                               LatitudeRef: latitudeRef,
-                               longitude,
+                               Longitude: longitude,
-                               longitudeRef,
+                               LongitudeRef: longitudeRef,
-                               timeStamp);
+                               TimeStamp: timeStamp);
             results.Add(gpsDirectory);
         }
         return results.ToArray();
     }
 
-    private static Shared.Models.JpegDirectory[] GetJpegDirectories(IReadOnlyList<MetadataExtractor.Directory> directories)
+    private static JpegDirectory[] GetJpegDirectories(IReadOnlyList<MetadataExtractor.Directory> directories)
     {
-        List<Shared.Models.JpegDirectory> results = [];
+        List<JpegDirectory> results = [];
-        Shared.Models.JpegDirectory jpegDirectory;
+        JpegDirectory jpegDirectory;
         IEnumerable<MetadataExtractor.Formats.Jpeg.JpegDirectory> jpegDirectories = directories.OfType<MetadataExtractor.Formats.Jpeg.JpegDirectory>();
         foreach (MetadataExtractor.Formats.Jpeg.JpegDirectory j in jpegDirectories)
         {
@@ -307,16 +312,16 @@ internal abstract class Exif
             string? imageWidth = j.GetDescription(MetadataExtractor.Formats.Jpeg.JpegDirectory.TagImageWidth);
             if (imageHeight is null && imageWidth is null)
                 continue;
-            jpegDirectory = new(imageHeight, imageWidth);
+            jpegDirectory = new(ImageHeight: imageHeight, ImageWidth: imageWidth);
             results.Add(jpegDirectory);
         }
         return results.ToArray();
     }
 
-    private static Shared.Models.MakernoteDirectory[] GetMakernoteDirectories(IReadOnlyList<MetadataExtractor.Directory> directories)
+    private static MakernoteDirectory[] GetMakernoteDirectories(IReadOnlyList<MetadataExtractor.Directory> directories)
     {
-        List<Shared.Models.MakernoteDirectory> results = [];
+        List<MakernoteDirectory> results = [];
-        Shared.Models.MakernoteDirectory makernoteDirectory;
+        MakernoteDirectory makernoteDirectory;
         IEnumerable<AppleMakernoteDirectory> appleMakernoteDirectories = directories.OfType<AppleMakernoteDirectory>();
         foreach (AppleMakernoteDirectory appleMakernoteDirectory in appleMakernoteDirectories)
         {
@@ -405,16 +410,16 @@ internal abstract class Exif
             string? qualityAndFileFormat = null;
             if (cameraSerialNumber is null && firmwareVersion is null && qualityAndFileFormat is null)
                 continue;
-            makernoteDirectory = new(cameraSerialNumber, firmwareVersion, qualityAndFileFormat);
+            makernoteDirectory = new(CameraSerialNumber: cameraSerialNumber, FirmwareVersion: firmwareVersion, QualityAndFileFormat: qualityAndFileFormat);
             results.Add(makernoteDirectory);
         }
         return results.ToArray();
     }
 
-    private static Shared.Models.PhotoshopDirectory[] GetPhotoshopDirectories(IReadOnlyList<MetadataExtractor.Directory> directories)
+    private static PhotoshopDirectory[] GetPhotoshopDirectories(IReadOnlyList<MetadataExtractor.Directory> directories)
     {
-        List<Shared.Models.PhotoshopDirectory> results = [];
+        List<PhotoshopDirectory> results = [];
-        Shared.Models.PhotoshopDirectory photoshopDirectory;
+        PhotoshopDirectory photoshopDirectory;
         IEnumerable<MetadataExtractor.Formats.Photoshop.PhotoshopDirectory> photoshopDirectories = directories.OfType<MetadataExtractor.Formats.Photoshop.PhotoshopDirectory>();
         foreach (MetadataExtractor.Formats.Photoshop.PhotoshopDirectory p in photoshopDirectories)
         {
@@ -424,16 +429,16 @@ internal abstract class Exif
             string? url = p.GetDescription(MetadataExtractor.Formats.Photoshop.PhotoshopDirectory.TagUrl);
             if (jpegQuality is null && url is null)
                 continue;
-            photoshopDirectory = new(jpegQuality, url);
+            photoshopDirectory = new(JpegQuality: jpegQuality, Url: url);
             results.Add(photoshopDirectory);
         }
         return results.ToArray();
     }
 
-    private static Shared.Models.PngDirectory[] GetPngDirectories(IReadOnlyList<MetadataExtractor.Directory> directories)
+    private static PngDirectory[] GetPngDirectories(IReadOnlyList<MetadataExtractor.Directory> directories)
     {
-        List<Shared.Models.PngDirectory> results = [];
+        List<PngDirectory> results = [];
-        Shared.Models.PngDirectory pngDirectory;
+        PngDirectory pngDirectory;
         IEnumerable<MetadataExtractor.Formats.Png.PngDirectory> pngDirectories = directories.OfType<MetadataExtractor.Formats.Png.PngDirectory>();
         foreach (MetadataExtractor.Formats.Png.PngDirectory p in pngDirectories)
         {
@@ -444,16 +449,16 @@ internal abstract class Exif
             string? textualData = p.GetDescription(MetadataExtractor.Formats.Png.PngDirectory.TagTextualData);
             if (imageHeight is null && imageWidth is null && textualData is null)
                 continue;
-            pngDirectory = new(imageHeight, imageWidth, textualData);
+            pngDirectory = new(ImageHeight: imageHeight, ImageWidth: imageWidth, TextualData: textualData);
             results.Add(pngDirectory);
         }
         return results.ToArray();
     }
 
-    private static Shared.Models.QuickTimeMovieHeaderDirectory[] GetQuickTimeMovieHeaderDirectoryDirectories(IReadOnlyList<MetadataExtractor.Directory> directories)
+    private static QuickTimeMovieHeaderDirectory[] GetQuickTimeMovieHeaderDirectoryDirectories(IReadOnlyList<MetadataExtractor.Directory> directories)
     {
-        List<Shared.Models.QuickTimeMovieHeaderDirectory> results = [];
+        List<QuickTimeMovieHeaderDirectory> results = [];
-        Shared.Models.QuickTimeMovieHeaderDirectory quickTimeMovieHeaderDirectory;
+        QuickTimeMovieHeaderDirectory quickTimeMovieHeaderDirectory;
         IEnumerable<MetadataExtractor.Formats.QuickTime.QuickTimeMovieHeaderDirectory> quickTimeMovieHeaderDirectories = directories.OfType<MetadataExtractor.Formats.QuickTime.QuickTimeMovieHeaderDirectory>();
         foreach (MetadataExtractor.Formats.QuickTime.QuickTimeMovieHeaderDirectory q in quickTimeMovieHeaderDirectories)
         {
@@ -466,16 +471,16 @@ internal abstract class Exif
                 created = GetDateTime(q.GetString(MetadataExtractor.Formats.QuickTime.QuickTimeMovieHeaderDirectory.TagCreated));
             if (created is null)
                 continue;
-            quickTimeMovieHeaderDirectory = new(created);
+            quickTimeMovieHeaderDirectory = new(Created: created);
             results.Add(quickTimeMovieHeaderDirectory);
         }
         return results.ToArray();
     }
 
-    private static Shared.Models.QuickTimeTrackHeaderDirectory[] GetQuickTimeTrackHeaderDirectoryDirectories(IReadOnlyList<MetadataExtractor.Directory> directories)
+    private static QuickTimeTrackHeaderDirectory[] GetQuickTimeTrackHeaderDirectoryDirectories(IReadOnlyList<MetadataExtractor.Directory> directories)
     {
-        List<Shared.Models.QuickTimeTrackHeaderDirectory> results = [];
+        List<QuickTimeTrackHeaderDirectory> results = [];
-        Shared.Models.QuickTimeTrackHeaderDirectory quickTimeTrackHeaderDirectory;
+        QuickTimeTrackHeaderDirectory quickTimeTrackHeaderDirectory;
         IEnumerable<MetadataExtractor.Formats.QuickTime.QuickTimeTrackHeaderDirectory> quickTimeTrackHeaderDirectories = directories.OfType<MetadataExtractor.Formats.QuickTime.QuickTimeTrackHeaderDirectory>();
         foreach (MetadataExtractor.Formats.QuickTime.QuickTimeTrackHeaderDirectory q in quickTimeTrackHeaderDirectories)
         {
@@ -488,16 +493,16 @@ internal abstract class Exif
                 created = GetDateTime(q.GetString(MetadataExtractor.Formats.QuickTime.QuickTimeTrackHeaderDirectory.TagCreated));
             if (created is null)
                 continue;
-            quickTimeTrackHeaderDirectory = new(created);
+            quickTimeTrackHeaderDirectory = new(Created: created);
             results.Add(quickTimeTrackHeaderDirectory);
         }
         return results.ToArray();
     }
 
-    private static Shared.Models.WebPDirectory[] GetWebPDirectories(IReadOnlyList<MetadataExtractor.Directory> directories)
+    private static WebPDirectory[] GetWebPDirectories(IReadOnlyList<MetadataExtractor.Directory> directories)
     {
-        List<Shared.Models.WebPDirectory> results = [];
+        List<WebPDirectory> results = [];
-        Shared.Models.WebPDirectory webPDirectory;
+        WebPDirectory webPDirectory;
         IEnumerable<MetadataExtractor.Formats.WebP.WebPDirectory> webPDirectories = directories.OfType<MetadataExtractor.Formats.WebP.WebPDirectory>();
         foreach (MetadataExtractor.Formats.WebP.WebPDirectory w in webPDirectories)
         {
@@ -507,57 +512,67 @@ internal abstract class Exif
             string? imageWidth = w.GetDescription(MetadataExtractor.Formats.WebP.WebPDirectory.TagImageWidth);
             if (imageHeight is null && imageWidth is null)
                 continue;
-            webPDirectory = new(imageHeight, imageWidth);
+            webPDirectory = new(ImageHeight: imageHeight, ImageWidth: imageWidth);
             results.Add(webPDirectory);
         }
         return results.ToArray();
     }
 
-    private static Shared.Models.ExifDirectory Covert(Shared.Models.FilePath filePath, Shared.Models.PersonKeyFormattedAndKeyTicksAndDisplayDirectoryName? personKeyFormattedAndKeyTicksAndDisplayDirectoryName, System.Drawing.Size? size, IReadOnlyList<MetadataExtractor.Directory> directories)
+    private static ExifDirectory Covert(FilePath filePath, PersonKeyFormattedAndKeyTicksAndDisplayDirectoryName? personKeyFormattedAndKeyTicksAndDisplayDirectoryName, IReadOnlyList<MetadataExtractor.Directory> directories, System.Drawing.Size? size)
     {
-        Shared.Models.ExifDirectory result;
+        ExifDirectory result;
-        Shared.Models.AviDirectory[] aviDirectories = GetAviDirectories(directories);
+        AviDirectory[] aviDirectories = GetAviDirectories(directories);
-        Shared.Models.GpsDirectory[] gpsDirectories = GetGpsDirectories(directories);
+        GpsDirectory[] gpsDirectories = GetGpsDirectories(directories);
-        Shared.Models.PngDirectory[] pngDirectories = GetPngDirectories(directories);
+        PngDirectory[] pngDirectories = GetPngDirectories(directories);
-        Shared.Models.JpegDirectory[] jpegDirectories = GetJpegDirectories(directories);
+        JpegDirectory[] jpegDirectories = GetJpegDirectories(directories);
-        Shared.Models.WebPDirectory[] webPDirectories = GetWebPDirectories(directories);
+        WebPDirectory[] webPDirectories = GetWebPDirectories(directories);
-        Shared.Models.ExifDirectoryBase[] exifBaseDirectories = GetExifBaseDirectories(directories);
+        ExifDirectoryBase[] exifBaseDirectories = GetExifBaseDirectories(directories);
-        Shared.Models.GifHeaderDirectory[] gifHeaderDirectories = GetGifHeaderDirectories(directories);
+        GifHeaderDirectory[] gifHeaderDirectories = GetGifHeaderDirectories(directories);
-        Shared.Models.MakernoteDirectory[] MakernoteDirectories = GetMakernoteDirectories(directories);
+        MakernoteDirectory[] makernoteDirectories = GetMakernoteDirectories(directories);
-        Shared.Models.PhotoshopDirectory[] photoshopDirectories = GetPhotoshopDirectories(directories);
+        PhotoshopDirectory[] photoshopDirectories = GetPhotoshopDirectories(directories);
-        Shared.Models.FileMetadataDirectory[] fileMetadataDirectories = GetFileMetadataDirectories(filePath.FullName, directories);
+        FileMetadataDirectory[] fileMetadataDirectories = GetFileMetadataDirectories(filePath.FullName, directories);
-        Shared.Models.QuickTimeMovieHeaderDirectory[] quickTimeMovieHeaderDirectories = GetQuickTimeMovieHeaderDirectoryDirectories(directories);
+        QuickTimeMovieHeaderDirectory[] quickTimeMovieHeaderDirectories = GetQuickTimeMovieHeaderDirectoryDirectories(directories);
-        Shared.Models.QuickTimeTrackHeaderDirectory[] quickTimeTrackHeaderDirectories = GetQuickTimeTrackHeaderDirectoryDirectories(directories);
+        QuickTimeTrackHeaderDirectory[] quickTimeTrackHeaderDirectories = GetQuickTimeTrackHeaderDirectoryDirectories(directories);
-        result = new(aviDirectories,
+        result = new(AviDirectories: aviDirectories,
-                     null,
+                     ExifBaseDirectories: exifBaseDirectories,
-                     exifBaseDirectories,
+                     FileMetadataDirectories: fileMetadataDirectories,
-                     fileMetadataDirectories,
+                     FilePath: filePath,
-                     filePath,
+                     GifHeaderDirectories: gifHeaderDirectories,
-                     gifHeaderDirectories,
+                     GpsDirectories: gpsDirectories,
-                     gpsDirectories,
+                     Height: size?.Height ?? IMetaBase.GetHeight(exifBaseDirectories),
-                     size?.Height,
+                     JpegDirectories: jpegDirectories,
-                     jpegDirectories,
+                     MakernoteDirectories: makernoteDirectories,
-                     MakernoteDirectories,
+                     PersonKeyFormattedAndKeyTicksAndDisplayDirectoryName: personKeyFormattedAndKeyTicksAndDisplayDirectoryName,
-                     personKeyFormattedAndKeyTicksAndDisplayDirectoryName,
+                     PhotoshopDirectories: photoshopDirectories,
-                     photoshopDirectories,
+                     PngDirectories: pngDirectories,
-                     pngDirectories,
+                     QuickTimeMovieHeaderDirectories: quickTimeMovieHeaderDirectories,
-                     quickTimeMovieHeaderDirectories,
+                     QuickTimeTrackHeaderDirectories: quickTimeTrackHeaderDirectories,
-                     quickTimeTrackHeaderDirectories,
+                     WebPDirectories: webPDirectories,
-                     webPDirectories,
+                     Width: size?.Width ?? IMetaBase.GetWidth(exifBaseDirectories));
-                     size?.Width);
         return result;
     }
 
-    internal static Shared.Models.ExifDirectory GetExifDirectory(Shared.Models.FilePath filePath, Shared.Models.PersonKeyFormattedAndKeyTicksAndDisplayDirectoryName? personKeyFormattedAndKeyTicksAndDisplayDirectoryName)
+    internal static ExifDirectory GetExifDirectory(FilePath filePath, Stream stream, PersonKeyFormattedAndKeyTicksAndDisplayDirectoryName? personKeyFormattedAndKeyTicksAndDisplayDirectoryName)
     {
-        Shared.Models.ExifDirectory result;
+        ExifDirectory result;
+        IReadOnlyList<MetadataExtractor.Directory> directories = ImageMetadataReader.ReadMetadata(stream);
         System.Drawing.Size? size;
         try
-        { size = Dimensions.GetDimensions(filePath.FullName); }
+        { size = Dimensions.GetDimensions(stream); }
         catch (Exception)
         { size = null; }
-        IReadOnlyList<MetadataExtractor.Directory> directories = ImageMetadataReader.ReadMetadata(filePath.FullName);
+        result = Covert(filePath, personKeyFormattedAndKeyTicksAndDisplayDirectoryName, directories, size);
-        result = Covert(filePath, personKeyFormattedAndKeyTicksAndDisplayDirectoryName, size, directories);
+        return result;
+    }
+
+    internal static ExifDirectory? GetExifDirectory(ResultSettings resultSettings, MetadataSettings metadataSettings, FileInfo fileInfo)
+    {
+        ExifDirectory? result;
+        FileHolder fileHolder = FileHolder.Get(fileInfo, id: null);
+        const PersonKeyFormattedAndKeyTicksAndDisplayDirectoryName? p = null;
+        FilePath filePath = FilePath.Get(resultSettings, metadataSettings, fileHolder, index: fileHolder.Id);
+        using Stream stream = File.OpenRead(filePath.FullName);
+        result = GetExifDirectory(filePath, stream, p);
         return result;
     }
 

Metadata/Models/Stateless/Face.cs

@@ -1,10 +1,19 @@
-using View_by_Distance.Shared.Models;
+using System.Text.Json;
+using Phares.Shared.Models;
 
-namespace View_by_Distance.Metadata.Models.Stateless;
+namespace Phares.Metadata.Models.Stateless;
 
 internal static class Face
 {
 
+    internal static FaceEncoding? GetFaceEncoding(ExifDirectory? exifDirectory)
+    {
+        FaceEncoding? result;
+        string? json = GetFaceEncoding(exifDirectory?.PngDirectories);
+        result = string.IsNullOrEmpty(json) ? null : JsonSerializer.Deserialize(json, FaceEncodingGenerationContext.Default.FaceEncoding);
+        return result;
+    }
+
     internal static string? GetFaceEncoding(PngDirectory[]? pngDirectories)
     {
         string? result = null;
@@ -22,7 +31,15 @@ internal static class Face
         return result;
     }
 
-    internal static string? GetOutputResolution(PngDirectory[]? pngDirectories)
+    internal static FaceFile? GetFaceFile(ExifDirectory? exifDirectory)
+    {
+        FaceFile? result;
+        string? json = GetOutputResolution(exifDirectory?.PngDirectories);
+        result = string.IsNullOrEmpty(json) ? null : JsonSerializer.Deserialize(json, FaceFileGenerationContext.Default.FaceFile);
+        return result;
+    }
+
+    private static string? GetOutputResolution(PngDirectory[]? pngDirectories)
     {
         string? result = null;
         if (pngDirectories is not null)

Metadata/Models/Stateless/GPS.cs

@@ -1,8 +1,7 @@
 using MetadataExtractor;
-using View_by_Distance.Metadata.Models.Stateless;
+using Phares.Shared.Models;
-using View_by_Distance.Shared.Models;
 
-namespace View_by_Distance.Metadata.Models.Stateless;
+namespace Phares.Metadata.Models.Stateless;
 
 internal abstract class GPS
 {

Metadata/Models/Stateless/Get.cs

@@ -1,9 +1,9 @@
 using System.Collections.ObjectModel;
-using View_by_Distance.Shared.Models;
+using Phares.Shared.Models;
-using View_by_Distance.Shared.Models.Properties;
+using Phares.Shared.Models.Properties;
-using View_by_Distance.Shared.Models.Stateless;
+using Phares.Shared.Models.Stateless;
 
-namespace View_by_Distance.Metadata.Models.Stateless;
+namespace Phares.Metadata.Models.Stateless;
 
 internal static class Get
 {
@@ -31,16 +31,40 @@ internal static class Get
         return results.AsReadOnly();
     }
 
-    internal static Action<string> SetExifDirectoryCollection(IRename rename, ResultSettings resultSettings, MetadataSettings metadataSettings, IRenameSettings renameSettings, A_Metadata metadata, List<string> distinct, List<MetadataGroup> metadataGroups)
+    internal static ReadOnlyDictionary<string, List<FileHolder>> GetKeyValuePairs(IEnumerable<NginxFileSystem> collection)
+    {
+        Dictionary<string, List<FileHolder>> results = [];
+        string key;
+        FileHolder fileHolder;
+        List<FileHolder>? fileHolders;
+        foreach (NginxFileSystem nginxFileSystem in collection)
+        {
+            fileHolder = FileHolder.Get(nginxFileSystem);
+            if (fileHolder.DirectoryFullPath is null)
+                continue;
+            key = $"{Path.Combine(fileHolder.DirectoryFullPath, fileHolder.NameWithoutExtension)}";
+            if (!results.TryGetValue(key, out fileHolders))
+            {
+                results.Add(key, []);
+                if (!results.TryGetValue(key, out fileHolders))
+                    throw new NotImplementedException();
+            }
+            fileHolders.Add(fileHolder);
+        }
+        return results.AsReadOnly();
+    }
+
+    internal static Action<string> SetExifDirectoryCollection(IWindows windows, ResultSettings resultSettings, MetadataSettings metadataSettings, A_Metadata metadata, List<string> distinct, List<MetadataGroup> metadataGroups)
     {
         return file =>
         {
-            rename.Tick();
+            windows.Tick();
-            FileInfo fileInfo;
             ExifDirectory exifDirectory;
             MetadataGroup metadataGroup;
+            HttpClient? httpClient = null;
             DeterministicHashCode deterministicHashCode;
             FileHolder fileHolder = FileHolder.Get(file);
+            MinimumYearAndPathCombined minimumYearAndPathCombined;
             bool fastForwardMovingPictureExpertsGroupUsed;
             FilePath? fastForwardMovingPictureExpertsGroupFilePath;
             ReadOnlyCollection<string>? fastForwardMovingPictureExpertsGroupFiles;
@@ -48,7 +72,7 @@ internal static class Get
             string key = $"{Path.Combine(fileHolder.DirectoryFullPath ?? throw new NotSupportedException(), fileHolder.NameWithoutExtension)}";
             if (distinct.Contains(key))
                 throw new NotSupportedException("Turn off parallelism when sidecar files are present!");
-            if (!renameSettings.SkipIdFiles || filePath.Id is null || (!filePath.IsIntelligentIdFormat && filePath.SortOrder is not null))
+            if (filePath.Id is null || (!filePath.IsIntelligentIdFormat && filePath.SortOrder is not null))
             {
                 if (filePath.Id is not null)
                 {
@@ -57,14 +81,14 @@ internal static class Get
                 }
                 else
                 {
-                    fastForwardMovingPictureExpertsGroupFiles = rename.ConvertAndGetFastForwardMovingPictureExpertsGroupFiles(renameSettings, filePath);
+                    fastForwardMovingPictureExpertsGroupFiles = windows.ConvertAndGetFastForwardMovingPictureExpertsGroupFiles(resultSettings, httpClient, filePath);
                     fastForwardMovingPictureExpertsGroupFilePath = fastForwardMovingPictureExpertsGroupFiles.Count == 0 ? null : FilePath.Get(resultSettings, metadataSettings, FileHolder.Get(fastForwardMovingPictureExpertsGroupFiles[0]), index: null);
-                    deterministicHashCode = fastForwardMovingPictureExpertsGroupFilePath is null ? rename.GetDeterministicHashCode(filePath) : rename.GetDeterministicHashCode(fastForwardMovingPictureExpertsGroupFilePath);
+                    deterministicHashCode = fastForwardMovingPictureExpertsGroupFilePath is null ? windows.GetDeterministicHashCode(httpClient, filePath) : windows.GetDeterministicHashCode(httpClient, fastForwardMovingPictureExpertsGroupFilePath);
                 }
                 filePath = FilePath.Get(filePath, deterministicHashCode);
                 fastForwardMovingPictureExpertsGroupUsed = fastForwardMovingPictureExpertsGroupFiles is not null && fastForwardMovingPictureExpertsGroupFiles.Count > 0;
-                (fileInfo, exifDirectory) = metadata.GetMetadataCollection(resultSettings, metadataSettings, filePath);
+                (minimumYearAndPathCombined, exifDirectory) = metadata.GetMetadataCollection(resultSettings, metadataSettings, filePath);
-                metadataGroup = new(fastForwardMovingPictureExpertsGroupUsed, filePath, fileInfo, exifDirectory, new([]));
+                metadataGroup = new(fastForwardMovingPictureExpertsGroupUsed, filePath, minimumYearAndPathCombined, exifDirectory, new([]));
                 lock (metadataGroups)
                     metadataGroups.Add(metadataGroup);
                 if (fastForwardMovingPictureExpertsGroupUsed && fastForwardMovingPictureExpertsGroupFiles is not null)
@@ -77,4 +101,48 @@ internal static class Get
         };
     }
 
+    internal static Action<string> SetExifDirectoryCollection(IRename rename, ResultSettings resultSettings, MetadataSettings metadataSettings, IRenameSettings renameSettings, A_Metadata metadata, List<string> distinct, List<MetadataGroup> metadataGroups)
+    {
+        return file =>
+        {
+            rename.Tick();
+            ExifDirectory exifDirectory;
+            MetadataGroup metadataGroup;
+            DeterministicHashCode deterministicHashCode;
+            FileHolder fileHolder = FileHolder.Get(file);
+            bool fastForwardMovingPictureExpertsGroupUsed;
+            MinimumYearAndPathCombined minimumYearAndPathCombined;
+            FilePath? fastForwardMovingPictureExpertsGroupFilePath;
+            ReadOnlyCollection<string>? fastForwardMovingPictureExpertsGroupFiles;
+            FilePath filePath = FilePath.Get(resultSettings, metadataSettings, fileHolder, index: null);
+            string key = $"{Path.Combine(fileHolder.DirectoryFullPath ?? throw new NotSupportedException(), fileHolder.NameWithoutExtension)}";
+            if (distinct.Contains(key))
+                throw new NotSupportedException("Turn off parallelism when sidecar files are present!");
+            if (renameSettings.SkipIdFiles && filePath.Id is not null && (filePath.IsIntelligentIdFormat || filePath.SortOrder is null))
+                return;
+            if (filePath.Id is not null)
+            {
+                fastForwardMovingPictureExpertsGroupFiles = null;
+                deterministicHashCode = new(null, filePath.Id, null);
+            }
+            else
+            {
+                fastForwardMovingPictureExpertsGroupFiles = rename.ConvertAndGetFastForwardMovingPictureExpertsGroupFiles(resultSettings, filePath);
+                fastForwardMovingPictureExpertsGroupFilePath = fastForwardMovingPictureExpertsGroupFiles.Count == 0 ? null : FilePath.Get(resultSettings, metadataSettings, FileHolder.Get(fastForwardMovingPictureExpertsGroupFiles[0]), index: null);
+                deterministicHashCode = fastForwardMovingPictureExpertsGroupFilePath is null ? rename.GetDeterministicHashCode(filePath) : rename.GetDeterministicHashCode(fastForwardMovingPictureExpertsGroupFilePath);
+            }
+            filePath = FilePath.Get(filePath, deterministicHashCode);
+            fastForwardMovingPictureExpertsGroupUsed = fastForwardMovingPictureExpertsGroupFiles is not null && fastForwardMovingPictureExpertsGroupFiles.Count > 0;
+            (minimumYearAndPathCombined, exifDirectory) = metadata.GetMetadataCollection(resultSettings, metadataSettings, filePath);
+            metadataGroup = new(fastForwardMovingPictureExpertsGroupUsed, filePath, minimumYearAndPathCombined, exifDirectory, new([]));
+            lock (metadataGroups)
+                metadataGroups.Add(metadataGroup);
+            if (fastForwardMovingPictureExpertsGroupUsed && fastForwardMovingPictureExpertsGroupFiles is not null)
+            {
+                foreach (string fastForwardMovingPictureExpertsGroupFile in fastForwardMovingPictureExpertsGroupFiles)
+                    File.Delete(fastForwardMovingPictureExpertsGroupFile);
+            }
+        };
+    }
+
 }

Metadata/Models/Stateless/IMetadata.cs

@@ -1,10 +1,10 @@
 using MetadataExtractor;
 using System.Collections.ObjectModel;
-using View_by_Distance.Shared.Models;
+using Phares.Shared.Models;
-using View_by_Distance.Shared.Models.Properties;
+using Phares.Shared.Models.Properties;
-using View_by_Distance.Shared.Models.Stateless;
+using Phares.Shared.Models.Stateless;
 
-namespace View_by_Distance.Metadata.Models.Stateless;
+namespace Phares.Metadata.Models.Stateless;
 
 public interface IMetadata
 {
@@ -17,54 +17,70 @@ public interface IMetadata
         Meters
     }
 
-    ExifDirectory TestStatic_GetExifDirectory(FilePath filePath, PersonKeyFormattedAndKeyTicksAndDisplayDirectoryName? personKeyFormattedAndKeyTicksAndDisplayDirectoryName) =>
+    public static FaceFile? GetFaceFile(ExifDirectory? exifDirectory) =>
-        GetExifDirectory(filePath, personKeyFormattedAndKeyTicksAndDisplayDirectoryName);
+        Face.GetFaceFile(exifDirectory);
-    static ExifDirectory GetExifDirectory(FilePath filePath, PersonKeyFormattedAndKeyTicksAndDisplayDirectoryName? personKeyFormattedAndKeyTicksAndDisplayDirectoryName) =>
-        Exif.GetExifDirectory(filePath, personKeyFormattedAndKeyTicksAndDisplayDirectoryName);
 
-    string? TestStatic_GetMaker(ExifDirectory? exifDirectory) =>
+    public static GeoLocation? GeoLocation(ExifDirectory? exifDirectory) =>
-        GetMaker(exifDirectory);
-    static string? GetMaker(ExifDirectory? exifDirectory) =>
-        Base.GetMaker(exifDirectory?.ExifBaseDirectories);
-
-    string? TestStatic_GetModel(ExifDirectory? exifDirectory) =>
-        GetModel(exifDirectory);
-    static string? GetModel(ExifDirectory? exifDirectory) =>
-        Base.GetModel(exifDirectory?.ExifBaseDirectories);
-
-    ReadOnlyCollection<string> TestStatic_GetKeywords(ExifDirectory? exifDirectory) =>
-        GetKeywords(exifDirectory);
-    static ReadOnlyCollection<string> GetKeywords(ExifDirectory? exifDirectory) =>
-        Base.GetKeywords(exifDirectory?.ExifBaseDirectories);
-
-    string? TestStatic_GetOutputResolution(ExifDirectory? exifDirectory) =>
-        GetOutputResolution(exifDirectory);
-    static string? GetOutputResolution(ExifDirectory? exifDirectory) =>
-        Face.GetOutputResolution(exifDirectory?.PngDirectories);
-
-    string? TestStatic_GetFaceEncoding(ExifDirectory? exifDirectory) =>
-        GetFaceEncoding(exifDirectory);
-    static string? GetFaceEncoding(ExifDirectory? exifDirectory) =>
-        Face.GetFaceEncoding(exifDirectory?.PngDirectories);
-
-    GeoLocation? TestStatic_GeoLocation(ExifDirectory? exifDirectory) =>
-        GeoLocation(exifDirectory);
-    static GeoLocation? GeoLocation(ExifDirectory? exifDirectory) =>
         GPS.GeoLocation(exifDirectory?.GpsDirectories);
 
-    double? TestStatic_GetDistance(double originLatitude, double originLongitude, double destinationLatitude, double destinationLongitude, int decimalPlaces = 1, DistanceUnit distanceUnit = DistanceUnit.Miles) =>
+    public static string? GetRawFaceEncoding(ExifDirectory? exifDirectory) =>
-        GetDistance(originLatitude, originLongitude, destinationLatitude, destinationLongitude, decimalPlaces, distanceUnit);
+        Face.GetFaceEncoding(exifDirectory?.PngDirectories);
-    static double? GetDistance(double originLatitude, double originLongitude, double destinationLatitude, double destinationLongitude, int decimalPlaces = 1, DistanceUnit distanceUnit = DistanceUnit.Miles) =>
-        GPS.GetDistance(originLatitude, originLongitude, destinationLatitude, destinationLongitude, decimalPlaces, distanceUnit);
 
-    Action<string> TestStatic_SetExifDirectoryCollection(IRename rename, ResultSettings resultSettings, MetadataSettings metadataSettings, IRenameSettings renameSettings, A_Metadata metadata, List<string> distinct, List<MetadataGroup> metadataGroups) =>
+    public static FaceEncoding? GetFaceEncoding(ExifDirectory? exifDirectory) =>
-        SetExifDirectoryCollection(rename, resultSettings, metadataSettings, renameSettings, metadata, distinct, metadataGroups);
+        Face.GetFaceEncoding(exifDirectory);
-    static Action<string> SetExifDirectoryCollection(IRename rename, ResultSettings resultSettings, MetadataSettings metadataSettings, IRenameSettings renameSettings, A_Metadata metadata, List<string> distinct, List<MetadataGroup> metadataGroups) =>
-        Get.SetExifDirectoryCollection(rename, resultSettings, metadataSettings, renameSettings, metadata, distinct, metadataGroups);
 
-    ReadOnlyDictionary<string, List<FileHolder>> TestStatic_GetKeyValuePairs(IEnumerable<string> files) =>
+    public static ReadOnlyDictionary<string, List<FileHolder>> GetKeyValuePairs(IEnumerable<string> files) =>
-        GetKeyValuePairs(files);
-    static ReadOnlyDictionary<string, List<FileHolder>> GetKeyValuePairs(IEnumerable<string> files) =>
         Get.GetKeyValuePairs(files);
 
+    public static ReadOnlyDictionary<string, List<FileHolder>> GetKeyValuePairs(IEnumerable<NginxFileSystem> collection) =>
+        Get.GetKeyValuePairs(collection);
+
+    public static ExifDirectory? GetExifDirectory(ResultSettings resultSettings, MetadataSettings metadataSettings, FileInfo fileInfo) =>
+        Exif.GetExifDirectory(resultSettings, metadataSettings, fileInfo);
+
+    public static ExifDirectory GetExifDirectory(FilePath filePath, Stream stream, PersonKeyFormattedAndKeyTicksAndDisplayDirectoryName? personKeyFormattedAndKeyTicksAndDisplayDirectoryName) =>
+        Exif.GetExifDirectory(filePath, stream, personKeyFormattedAndKeyTicksAndDisplayDirectoryName);
+
+    public static double? GetDistance(double originLatitude, double originLongitude, double destinationLatitude, double destinationLongitude, int decimalPlaces = 1, DistanceUnit distanceUnit = DistanceUnit.Miles) =>
+        GPS.GetDistance(originLatitude, originLongitude, destinationLatitude, destinationLongitude, decimalPlaces, distanceUnit);
+
+    public static Action<string> SetExifDirectoryCollection(IRename rename, ResultSettings resultSettings, MetadataSettings metadataSettings, IRenameSettings renameSettings, A_Metadata metadata, List<string> distinct, List<MetadataGroup> metadataGroups) =>
+        Get.SetExifDirectoryCollection(rename, resultSettings, metadataSettings, renameSettings, metadata, distinct, metadataGroups);
+
+    public static Action<string> SetExifDirectoryCollection(IWindows windows, ResultSettings resultSettings, MetadataSettings metadataSettings, A_Metadata metadata, List<string> distinct, List<MetadataGroup> metadataGroups) =>
+        Get.SetExifDirectoryCollection(windows, resultSettings, metadataSettings, metadata, distinct, metadataGroups);
+
+    internal GeoLocation? TestStatic_GeoLocation(ExifDirectory? exifDirectory) =>
+        GeoLocation(exifDirectory);
+
+    internal string? TestStatic_GetRawFaceEncoding(ExifDirectory? exifDirectory) =>
+        GetRawFaceEncoding(exifDirectory);
+
+    internal static FaceFile? TestStatic_GetFaceFile(ExifDirectory? exifDirectory) =>
+        GetFaceFile(exifDirectory);
+
+    internal static FaceEncoding? TestStatic_GetFaceEncoding(ExifDirectory? exifDirectory) =>
+        GetFaceEncoding(exifDirectory);
+
+    internal ReadOnlyDictionary<string, List<FileHolder>> TestStatic_GetKeyValuePairs(IEnumerable<string> files) =>
+        GetKeyValuePairs(files);
+
+    internal ReadOnlyDictionary<string, List<FileHolder>> TestStatic_GetKeyValuePairs(IEnumerable<NginxFileSystem> collection) =>
+        GetKeyValuePairs(collection);
+
+    internal ExifDirectory? TestStatic_GetExifDirectory(ResultSettings resultSettings, MetadataSettings metadataSettings, FileInfo fileInfo) =>
+        GetExifDirectory(resultSettings, metadataSettings, fileInfo);
+
+    internal ExifDirectory TestStatic_GetExifDirectory(FilePath filePath, Stream stream, PersonKeyFormattedAndKeyTicksAndDisplayDirectoryName? personKeyFormattedAndKeyTicksAndDisplayDirectoryName) =>
+        GetExifDirectory(filePath, stream, personKeyFormattedAndKeyTicksAndDisplayDirectoryName);
+
+    internal double? TestStatic_GetDistance(double originLatitude, double originLongitude, double destinationLatitude, double destinationLongitude, int decimalPlaces = 1, DistanceUnit distanceUnit = DistanceUnit.Miles) =>
+        GetDistance(originLatitude, originLongitude, destinationLatitude, destinationLongitude, decimalPlaces, distanceUnit);
+
+    internal Action<string> TestStatic_SetExifDirectoryCollection(IWindows windows, ResultSettings resultSettings, MetadataSettings metadataSettings, A_Metadata metadata, List<string> distinct, List<MetadataGroup> metadataGroups) =>
+        SetExifDirectoryCollection(windows, resultSettings, metadataSettings, metadata, distinct, metadataGroups);
+
+    internal Action<string> TestStatic_SetExifDirectoryCollection(IRename rename, ResultSettings resultSettings, MetadataSettings metadataSettings, IRenameSettings renameSettings, A_Metadata metadata, List<string> distinct, List<MetadataGroup> metadataGroups) =>
+        SetExifDirectoryCollection(rename, resultSettings, metadataSettings, renameSettings, metadata, distinct, metadataGroups);
+
 }

People/.vscode/read-me.md

@@ -0,0 +1 @@
+# Read Me

People/AA.People.csproj

@@ -1,44 +1,52 @@
 <Project Sdk="Microsoft.NET.Sdk">
-    <PropertyGroup>
+  <PropertyGroup>
-        <ImplicitUsings>enable</ImplicitUsings>
+    <ImplicitUsings>enable</ImplicitUsings>
-        <Nullable>enable</Nullable>
+    <Nullable>enable</Nullable>
-        <OutputType>library</OutputType>
+    <OutputType>library</OutputType>
-        <RuntimeIdentifier>win-x64</RuntimeIdentifier>
+    <RuntimeIdentifier>win-x64</RuntimeIdentifier>
-        <TargetFramework>net9.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
-    </PropertyGroup>
+  </PropertyGroup>
-    <PropertyGroup>
+  <PropertyGroup>
-        <PackageId>Phares.AA.People</PackageId>
+    <HoursSinceNovember122024>$([System.Math]::Floor($([MSBuild]::Divide($([MSBuild]::Subtract($([System.DateTimeOffset]::UtcNow.ToUnixTimeSeconds()), 1731369600)), 3600))))</HoursSinceNovember122024>
-        <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
+  </PropertyGroup>
-        <Version>9.0.100.0</Version>
+  <PropertyGroup>
-        <Authors>Mike Phares</Authors>
+    <PackageId>Phares.People</PackageId>
-        <Company>Phares</Company>
+    <Version>9.0.104.$([System.Math]::Floor($([MSBuild]::Divide($([MSBuild]::Subtract($([System.DateTimeOffset]::UtcNow.ToUnixTimeSeconds()), 1731369600)), 3600))))</Version>
-        <IncludeSymbols>true</IncludeSymbols>
+    <Company>Phares</Company>
-        <SymbolPackageFormat>snupkg</SymbolPackageFormat>
+    <Authors>Mike Phares</Authors>
-    </PropertyGroup>
+    <IncludeSymbols>true</IncludeSymbols>
-    <PropertyGroup>
+    <PackageReadmeFile>read-me.md</PackageReadmeFile>
-        <IsWindows Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Windows)))' == 'true'">true</IsWindows>
+    <SymbolPackageFormat>snupkg</SymbolPackageFormat>
-        <IsOSX Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::OSX)))' == 'true'">true</IsOSX>
+    <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
-        <IsLinux Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Linux)))' == 'true'">true</IsLinux>
+    <PackageLicenseExpression>MIT</PackageLicenseExpression>
-    </PropertyGroup>
+  </PropertyGroup>
-    <PropertyGroup Condition="'$(IsWindows)'=='true'">
+  <PropertyGroup>
-        <DefineConstants>Windows</DefineConstants>
+    <IsWindows Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Windows)))' == 'true'">true</IsWindows>
-    </PropertyGroup>
+    <IsOSX Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::OSX)))' == 'true'">true</IsOSX>
-    <PropertyGroup Condition="'$(IsOSX)'=='true'">
+    <IsLinux Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Linux)))' == 'true'">true</IsLinux>
-        <DefineConstants>OSX</DefineConstants>
+  </PropertyGroup>
-    </PropertyGroup>
+  <PropertyGroup Condition="'$(IsWindows)'=='true'">
-    <PropertyGroup Condition="'$(IsLinux)'=='true'">
+    <DefineConstants>Windows</DefineConstants>
-        <DefineConstants>Linux</DefineConstants>
+  </PropertyGroup>
-    </PropertyGroup>
+  <PropertyGroup Condition="'$(IsOSX)'=='true'">
-    <ItemGroup Condition="'$(RuntimeIdentifier)' == 'browser-wasm'">
+    <DefineConstants>OSX</DefineConstants>
-        <SupportedPlatform Include="browser" />
+  </PropertyGroup>
-    </ItemGroup>
+  <PropertyGroup Condition="'$(IsLinux)'=='true'">
-    <ItemGroup>
+    <DefineConstants>Linux</DefineConstants>
-        <PackageReference Include="MetadataExtractor" Version="2.8.1" />
+  </PropertyGroup>
-        <PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.0" />
+  <ItemGroup Condition="'$(RuntimeIdentifier)' == 'browser-wasm'">
-        <PackageReference Include="WindowsShortcutFactory" Version="1.2.0" />
+    <SupportedPlatform Include="browser" />
-    </ItemGroup>
+  </ItemGroup>
-    <ItemGroup>
+  <ItemGroup>
-        <ProjectReference Include="..\Metadata\AA.Metadata.csproj" />
+    <None Include=".vscode\read-me.md" Pack="true" PackagePath="\"/>
-        <ProjectReference Include="..\Shared\AA.Shared.csproj" />
+  </ItemGroup>
-    </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="MetadataExtractor" Version="2.8.1" />
+    <PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.1" />
+    <PackageReference Include="WindowsShortcutFactory" Version="1.2.0" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Metadata\AA.Metadata.csproj" />
+    <ProjectReference Include="..\Shared\AA.Shared.csproj" />
+  </ItemGroup>
 </Project>

People/Models/A2_People.cs

@@ -1,3 +1,3 @@
-namespace View_by_Distance.Metadata.Models;
+namespace Phares.Metadata.Models;
 
 public class A2_People() { }

People/Models/Stateless/IPeople.cs

@@ -1,6 +1,6 @@
 using System.Collections.ObjectModel;
-using View_by_Distance.Shared.Models;
+using Phares.Shared.Models;
-using View_by_Distance.Shared.Models.Properties;
+using Phares.Shared.Models.Properties;
 
 namespace View_by_Distance.People.Models.Stateless;
 

People/Models/Stateless/People.cs

@@ -1,9 +1,9 @@
 using System.Collections.ObjectModel;
 using System.Globalization;
-using View_by_Distance.Metadata.Models;
+using Phares.Metadata.Models;
-using View_by_Distance.Shared.Models;
+using Phares.Shared.Models;
-using View_by_Distance.Shared.Models.Properties;
+using Phares.Shared.Models.Properties;
-using View_by_Distance.Shared.Models.Stateless;
+using Phares.Shared.Models.Stateless;
 using WindowsShortcutFactory;
 
 namespace View_by_Distance.People.Models.Stateless;

People/Models/Stateless/ReadOnlyCollectionsLogic.cs

@@ -1,8 +1,8 @@
 using System.Collections.ObjectModel;
-using View_by_Distance.Metadata.Models;
+using Phares.Metadata.Models;
-using View_by_Distance.Shared.Models;
+using Phares.Shared.Models;
-using View_by_Distance.Shared.Models.Properties;
+using Phares.Shared.Models.Properties;
-using View_by_Distance.Shared.Models.Stateless;
+using Phares.Shared.Models.Stateless;
 
 namespace View_by_Distance.People.Models.Stateless;
 

Rename/.vscode/read-me.md

@@ -0,0 +1 @@
+# Read Me

Rename/AA.Rename.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
@@ -8,14 +8,19 @@
     <UserSecretsIdOld>fa0fa59b-afe4-4960-9afc-18fcbc7fb41b</UserSecretsIdOld>
     <UserSecretsId>843db3e1-e18f-4cba-8b00-967529a32635</UserSecretsId>
   </PropertyGroup>
+  <PropertyGroup>
+    <HoursSinceNovember122024>$([System.Math]::Floor($([MSBuild]::Divide($([MSBuild]::Subtract($([System.DateTimeOffset]::UtcNow.ToUnixTimeSeconds()), 1731369600)), 3600))))</HoursSinceNovember122024>
+  </PropertyGroup>
   <PropertyGroup>
     <PackageId>Phares.View.by.Distance.Rename</PackageId>
-    <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
+    <Version>9.0.104.$([System.Math]::Floor($([MSBuild]::Divide($([MSBuild]::Subtract($([System.DateTimeOffset]::UtcNow.ToUnixTimeSeconds()), 1731369600)), 3600))))</Version>
-    <Version>9.0.100.0</Version>
-    <Authors>Mike Phares</Authors>
     <Company>Phares</Company>
+    <Authors>Mike Phares</Authors>
     <IncludeSymbols>true</IncludeSymbols>
+    <PackageReadmeFile>read-me.md</PackageReadmeFile>
     <SymbolPackageFormat>snupkg</SymbolPackageFormat>
+    <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
+    <PackageLicenseExpression>MIT</PackageLicenseExpression>
   </PropertyGroup>
   <PropertyGroup>
     <IsWindows Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Windows)))' == 'true'">true</IsWindows>
@@ -35,12 +40,19 @@
     <SupportedPlatform Include="browser" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="CliWrap" Version="3.6.7" />
+    <None Include=".vscode\read-me.md" Pack="true" PackagePath="\" />
-    <PackageReference Include="runtime.win-x64.Microsoft.DotNet.ILCompiler" Version="9.0.0" />
+  </ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="9.0.0" />
+  <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="9.0.0" />
+    <PackageReference Include="CliWrap" Version="3.8.2" />
-    <PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.0" />
+    <PackageReference Include="runtime.win-x64.Microsoft.DotNet.ILCompiler" Version="8.0.12" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.1" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="8.0.1" />
+    <PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.1" />
     <PackageReference Include="ShellProgressBar" Version="5.2.0" />
+    <PackageReference Include="System.Drawing.Common" Version="8.0.12" />
+  </ItemGroup>
+  <ItemGroup>
+    <RuntimeHostConfigurationOption Include="System.Drawing.EnableUnixSupport" Value="true" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Metadata\AA.Metadata.csproj" />

Rename/Models/AppSettings.cs

@@ -1,7 +1,7 @@
 using Microsoft.Extensions.Configuration;
 using System.Text.Json;
 using System.Text.Json.Serialization;
-using View_by_Distance.Shared.Models;
+using Phares.Shared.Models;
 
 namespace View_by_Distance.Rename.Models;
 

Rename/Models/RenameSettings.cs

@@ -1,4 +1,5 @@
 
+using Phares.Shared.Models.Properties;
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
@@ -6,19 +7,22 @@ namespace View_by_Distance.Rename.Models;
 
 public record RenameSettings(string Company,
                              string DefaultMaker,
+                             Dictionary<string, string?> DirectoryDictionary,
+                             string? FirstPassFile,
                              bool ForceNewId,
-                             string[] IgnoreExtensions,
                              bool InPlace,
                              bool InPlaceMoveDirectory,
                              bool InPlaceWithOriginalName,
+                             bool JustMediaDate,
                              int MaxDegreeOfParallelism,
+                             int MaxMilliSecondsPerCall,
                              bool OnlySaveIdentifiersToDisk,
                              string RelativePropertyCollectionFile,
                              bool RequireRootDirectoryExists,
                              string[] SidecarExtensions,
                              bool SkipIdFiles,
-                             string[] ValidImageFormatExtensions,
+                             int ValidationImageDeterministicHashCodeId,
-                             string[] ValidVideoFormatExtensions) : Shared.Models.Properties.IRenameSettings
+                             string ValidationImageFile) : IRenameSettings
 {
 
     public override string ToString()

Rename/Program.cs

@@ -23,7 +23,7 @@ public class Program
         {
             if (args is null)
                 throw new Exception("args is null!");
-            Shared.Models.Console console = new();
+            Phares.Shared.Models.Console console = new();
             _ = new Rename(args, logger, appSettings, silentIndex > -1, console);
         }
         catch (Exception ex)

Shared/.vscode/read-me.md

@@ -0,0 +1 @@
+# Read Me

Shared/AA.Shared.csproj

@@ -1,38 +1,45 @@
 <Project Sdk="Microsoft.NET.Sdk">
-    <PropertyGroup>
+  <PropertyGroup>
-        <ImplicitUsings>enable</ImplicitUsings>
+    <ImplicitUsings>enable</ImplicitUsings>
-        <Nullable>enable</Nullable>
+    <Nullable>enable</Nullable>
-        <RuntimeIdentifiers>win-x64;linux-x64</RuntimeIdentifiers>
+    <RuntimeIdentifiers>win-x64;linux-x64</RuntimeIdentifiers>
-        <TargetFramework>net9.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
-    </PropertyGroup>
+  </PropertyGroup>
-    <PropertyGroup>
+  <PropertyGroup>
-        <PackageId>Phares.AA.Shared</PackageId>
+    <HoursSinceNovember142023>$([System.Math]::Floor($([MSBuild]::Divide($([MSBuild]::Subtract($([System.DateTimeOffset]::UtcNow.ToUnixTimeSeconds()), 1699920000)), 3600))))</HoursSinceNovember142023>
-        <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
+  </PropertyGroup>
-        <Version>9.0.100.0</Version>
+  <PropertyGroup>
-        <Authors>Mike Phares</Authors>
+    <PackageId>Phares.Shared</PackageId>
-        <Company>Phares</Company>
+    <Version>8.0.118.$([System.Math]::Floor($([MSBuild]::Divide($([MSBuild]::Subtract($([System.DateTimeOffset]::UtcNow.ToUnixTimeSeconds()), 1699920000)), 3600))))</Version>
-        <IncludeSymbols>true</IncludeSymbols>
+    <Company>Phares</Company>
-        <SymbolPackageFormat>snupkg</SymbolPackageFormat>
+    <Authors>Mike Phares</Authors>
-    </PropertyGroup>
+    <IncludeSymbols>true</IncludeSymbols>
-    <PropertyGroup>
+    <PackageReadmeFile>read-me.md</PackageReadmeFile>
-        <IsWindows Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Windows)))' == 'true'">true</IsWindows>
+    <SymbolPackageFormat>snupkg</SymbolPackageFormat>
-        <IsOSX Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::OSX)))' == 'true'">true</IsOSX>
+    <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
-        <IsLinux Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Linux)))' == 'true'">true</IsLinux>
+    <PackageLicenseExpression>MIT</PackageLicenseExpression>
-    </PropertyGroup>
+  </PropertyGroup>
-    <PropertyGroup Condition="'$(IsWindows)'=='true'">
+  <PropertyGroup>
-        <DefineConstants>Windows</DefineConstants>
+    <IsWindows Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Windows)))' == 'true'">true</IsWindows>
-    </PropertyGroup>
+    <IsOSX Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::OSX)))' == 'true'">true</IsOSX>
-    <PropertyGroup Condition="'$(IsOSX)'=='true'">
+    <IsLinux Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Linux)))' == 'true'">true</IsLinux>
-        <DefineConstants>OSX</DefineConstants>
+  </PropertyGroup>
-    </PropertyGroup>
+  <PropertyGroup Condition="'$(IsWindows)'=='true'">
-    <PropertyGroup Condition="'$(IsLinux)'=='true'">
+    <DefineConstants>Windows</DefineConstants>
-        <DefineConstants>Linux</DefineConstants>
+  </PropertyGroup>
-    </PropertyGroup>
+  <PropertyGroup Condition="'$(IsOSX)'=='true'">
-    <ItemGroup Condition="'$(RuntimeIdentifier)' == 'browser-wasm'">
+    <DefineConstants>OSX</DefineConstants>
-        <SupportedPlatform Include="browser" />
+  </PropertyGroup>
-    </ItemGroup>
+  <PropertyGroup Condition="'$(IsLinux)'=='true'">
-    <ItemGroup>
+    <DefineConstants>Linux</DefineConstants>
-        <PackageReference Include="System.Drawing.Common" Version="9.0.0" />
+  </PropertyGroup>
-        <PackageReference Include="System.Text.Json" Version="9.0.0" />
+  <ItemGroup Condition="'$(RuntimeIdentifier)' == 'browser-wasm'">
-    </ItemGroup>
+    <SupportedPlatform Include="browser" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include=".vscode\read-me.md" Pack="true" PackagePath="\" />
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="System.Text.Json" Version="9.0.3" />
+  </ItemGroup>
 </Project>

Shared/Models/AviDirectory.cs

@@ -1,7 +1,7 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-namespace View_by_Distance.Shared.Models;
+namespace Phares.Shared.Models;
 
 public record AviDirectory(DateTime? DateTimeOriginal,
                            string? Duration,

Shared/Models/CombinedEnumAndIndex.cs

@@ -0,0 +1,23 @@
+using System.Text.Json;
+using System.Text.Json.Serialization;
+
+namespace Phares.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/DeterministicHashCode.cs

@@ -1,7 +1,7 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-namespace View_by_Distance.Shared.Models;
+namespace Phares.Shared.Models;
 
 public record DeterministicHashCode(int? Height,
                                     int? Id,

Shared/Models/DistanceSettings.cs

@@ -1,7 +1,7 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-namespace View_by_Distance.Shared.Models;
+namespace Phares.Shared.Models;
 
 public record DistanceSettings(bool DistanceMoveUnableToMatch,
                                int FaceAreaPermyriad,

Shared/Models/ExifDirectory.cs

@@ -1,10 +1,9 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-namespace View_by_Distance.Shared.Models;
+namespace Phares.Shared.Models;
 
 public record ExifDirectory(AviDirectory[] AviDirectories,
-                            object? Encoding,
                             ExifDirectoryBase[] ExifBaseDirectories,
                             FileMetadataDirectory[] FileMetadataDirectories,
                             FilePath FilePath,
@@ -28,25 +27,6 @@ public record ExifDirectory(AviDirectory[] AviDirectories,
         return result;
     }
 
-    public static ExifDirectory Get(object encoding, ExifDirectory e) =>
-        new(e.AviDirectories,
-            encoding,
-            e.ExifBaseDirectories,
-            e.FileMetadataDirectories,
-            e.FilePath,
-            e.GifHeaderDirectories,
-            e.GpsDirectories,
-            e.Height,
-            e.JpegDirectories,
-            e.MakernoteDirectories,
-            e.PersonKeyFormattedAndKeyTicksAndDisplayDirectoryName,
-            e.PhotoshopDirectories,
-            e.PngDirectories,
-            e.QuickTimeMovieHeaderDirectories,
-            e.QuickTimeTrackHeaderDirectories,
-            e.WebPDirectories,
-            e.Width);
-
 }
 
 [JsonSourceGenerationOptions(WriteIndented = true, DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull)]

Shared/Models/ExifDirectoryBase.cs

@@ -1,7 +1,7 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-namespace View_by_Distance.Shared.Models;
+namespace Phares.Shared.Models;
 
 public record ExifDirectoryBase(string? Aperture,
                                 string? ApplicationNotes,
@@ -21,9 +21,11 @@ public record ExifDirectoryBase(string? Aperture,
                                 string? FileSource,
                                 string? ImageDescription,
                                 string? ImageHeight,
+                                int? ImageHeightValue,
                                 string? ImageNumber,
                                 string? ImageUniqueId,
                                 string? ImageWidth,
+                                int? ImageWidthValue,
                                 string? IsoSpeed,
                                 string? LensMake,
                                 string? LensModel,

Shared/Models/FaceDistance.cs

@@ -1,7 +1,7 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-namespace View_by_Distance.Shared.Models;
+namespace Phares.Shared.Models;
 
 public record class FaceDistance : Properties.IFaceDistance
 {

Shared/Models/FaceEncoding.cs

@@ -1,6 +1,6 @@
 using System.Text.Json.Serialization;
 
-namespace View_by_Distance.Shared.Models;
+namespace Phares.Shared.Models;
 
 public record FaceEncoding(double[] RawEncoding, int Size);
 

Shared/Models/FaceFile.cs

@@ -1,6 +1,6 @@
 using System.Text.Json.Serialization;
 
-namespace View_by_Distance.Shared.Models;
+namespace Phares.Shared.Models;
 
 public record FaceFile(int? AreaPermyriad,
                        int? ConfidencePercent,

Shared/Models/FacePartAndFacePointArray.cs

@@ -1,8 +1,8 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
-using View_by_Distance.Shared.Models.Stateless;
+using Phares.Shared.Models.Stateless;
 
-namespace View_by_Distance.Shared.Models;
+namespace Phares.Shared.Models;
 
 public record FacePartAndFacePointArray(FacePart FacePart, FacePoint[] FacePoints)
 {

Shared/Models/FacePoint.cs

@@ -1,7 +1,7 @@
 using System.Drawing;
 using System.Text.Json.Serialization;
 
-namespace View_by_Distance.Shared.Models;
+namespace Phares.Shared.Models;
 
 [method: JsonConstructor]
 public class FacePoint(int index, int x, int y) : Properties.IFacePoint

Shared/Models/FaceRecognitionGroup.cs

@@ -2,7 +2,7 @@ using System.Collections.ObjectModel;
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-namespace View_by_Distance.Shared.Models;
+namespace Phares.Shared.Models;
 
 public record FaceRecognitionGroup(Location Location, ReadOnlyCollection<FaceEncoding?> FaceEncodings, ReadOnlyCollection<ReadOnlyCollection<FacePartAndFacePointArray>> FaceParts)
 {

Shared/Models/FileHolder.cs

@@ -1,7 +1,7 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-namespace View_by_Distance.Shared.Models;
+namespace Phares.Shared.Models;
 
 public record FileHolder(DateTime? CreationTime,
                          string? DirectoryFullPath,
@@ -21,29 +21,44 @@ public record FileHolder(DateTime? CreationTime,
         return result;
     }
 
+    private static FileHolder GetExisting(NginxFileSystem nginxFileSystem, int? id) =>
+        new(CreationTime: nginxFileSystem.LastModified,
+            DirectoryFullPath: Path.GetDirectoryName(nginxFileSystem.URI?.OriginalString ?? throw new Exception()),
+            Exists: true,
+            ExtensionLowered: Path.GetExtension(nginxFileSystem.Name).ToLower(),
+            FullName: nginxFileSystem.URI?.OriginalString ?? throw new Exception(),
+            Id: id,
+            LastWriteTime: nginxFileSystem.LastModified,
+            Length: nginxFileSystem.Length is null ? null : (long)nginxFileSystem.Length.Value,
+            Name: nginxFileSystem.Name,
+            NameWithoutExtension: Path.GetFileNameWithoutExtension(nginxFileSystem.Name));
+
+    public static FileHolder Get(NginxFileSystem nginxFileSystem) =>
+        GetExisting(nginxFileSystem, id: null);
+
     private static FileHolder GetExisting(FileInfo fileInfo, int? id) =>
-        new(fileInfo.CreationTime,
+        new(CreationTime: fileInfo.CreationTime,
-            fileInfo.DirectoryName,
+            DirectoryFullPath: fileInfo.DirectoryName,
-            fileInfo.Exists,
+            Exists: fileInfo.Exists,
-            fileInfo.Extension.ToLower(),
+            ExtensionLowered: fileInfo.Extension.ToLower(),
-            fileInfo.FullName,
+            FullName: fileInfo.FullName,
-            id,
+            Id: id,
-            fileInfo.LastWriteTime,
+            LastWriteTime: fileInfo.LastWriteTime,
-            fileInfo.Length,
+            Length: fileInfo.Length,
-            fileInfo.Name,
+            Name: fileInfo.Name,
-            Path.GetFileNameWithoutExtension(fileInfo.FullName));
+            NameWithoutExtension: Path.GetFileNameWithoutExtension(fileInfo.FullName));
 
     private static FileHolder GetNonExisting(FileInfo fileInfo, int? id) =>
-        new(null,
+        new(CreationTime: null,
-            fileInfo.DirectoryName,
+            DirectoryFullPath: fileInfo.DirectoryName,
-            fileInfo.Exists,
+            Exists: fileInfo.Exists,
-            fileInfo.Extension.ToLower(),
+            ExtensionLowered: fileInfo.Extension.ToLower(),
-            fileInfo.FullName,
+            FullName: fileInfo.FullName,
-            id,
+            Id: id,
-            null,
+            LastWriteTime: null,
-            null,
+            Length: null,
-            fileInfo.Name,
+            Name: fileInfo.Name,
-            Path.GetFileNameWithoutExtension(fileInfo.FullName));
+            NameWithoutExtension: Path.GetFileNameWithoutExtension(fileInfo.FullName));
 
     public static FileHolder Get(FileInfo fileInfo, int? id) =>
         fileInfo.Exists ? GetExisting(fileInfo, id) : GetNonExisting(fileInfo, id);
@@ -52,42 +67,42 @@ public record FileHolder(DateTime? CreationTime,
     {
         FileHolder result;
         DateTime dateTime = new(filePath.CreationTicks);
-        result = new(dateTime,
+        result = new(CreationTime: dateTime,
-                     filePath.DirectoryFullPath,
+                     DirectoryFullPath: filePath.DirectoryFullPath,
-                     true,
+                     Exists: true,
-                     filePath.ExtensionLowered,
+                     ExtensionLowered: filePath.ExtensionLowered,
-                     filePath.FullName,
+                     FullName: filePath.FullName,
-                     id,
+                     Id: id,
-                     new(filePath.LastWriteTicks),
+                     LastWriteTime: new(filePath.LastWriteTicks),
-                     filePath.Length,
+                     Length: filePath.Length,
-                     filePath.Name,
+                     Name: filePath.Name,
-                     Path.GetFileNameWithoutExtension(filePath.FullName));
+                     NameWithoutExtension: Path.GetFileNameWithoutExtension(filePath.FullName));
         return result;
     }
 
     private static FileHolder GetExisting(FileHolder fileHolder) =>
-        new(fileHolder.CreationTime,
+        new(CreationTime: fileHolder.CreationTime,
-            fileHolder.DirectoryFullPath,
+            DirectoryFullPath: fileHolder.DirectoryFullPath,
-            fileHolder.Exists,
+            Exists: fileHolder.Exists,
-            fileHolder.ExtensionLowered,
+            ExtensionLowered: fileHolder.ExtensionLowered,
-            fileHolder.FullName,
+            FullName: fileHolder.FullName,
             Id: null,
-            fileHolder.LastWriteTime,
+            LastWriteTime: fileHolder.LastWriteTime,
-            fileHolder.Length,
+            Length: fileHolder.Length,
-            fileHolder.Name,
+            Name: fileHolder.Name,
-            Path.GetFileNameWithoutExtension(fileHolder.FullName));
+            NameWithoutExtension: Path.GetFileNameWithoutExtension(fileHolder.FullName));
 
     private static FileHolder GetNonExisting(FileHolder fileHolder) =>
-        new(null,
+        new(CreationTime: null,
-            fileHolder.DirectoryFullPath,
+            DirectoryFullPath: fileHolder.DirectoryFullPath,
-            fileHolder.Exists,
+            Exists: fileHolder.Exists,
-            fileHolder.ExtensionLowered,
+            ExtensionLowered: fileHolder.ExtensionLowered,
-            fileHolder.FullName,
+            FullName: fileHolder.FullName,
             Id: null,
-            null,
+            LastWriteTime: null,
-            null,
+            Length: null,
-            fileHolder.Name,
+            Name: fileHolder.Name,
-            Path.GetFileNameWithoutExtension(fileHolder.FullName));
+            NameWithoutExtension: Path.GetFileNameWithoutExtension(fileHolder.FullName));
 
     public static FileHolder Get(FileHolder fileHolder) =>
         fileHolder.Exists ? GetExisting(fileHolder) : GetNonExisting(fileHolder);

Shared/Models/FileMetadataDirectory.cs

@@ -1,7 +1,7 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-namespace View_by_Distance.Shared.Models;
+namespace Phares.Shared.Models;
 
 public record FileMetadataDirectory(DateTime? FileModifiedDate,
                                     string? FileName,

Shared/Models/FilePath.cs

@@ -1,8 +1,8 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
-using View_by_Distance.Shared.Models.Stateless;
+using Phares.Shared.Models.Stateless;
 
-namespace View_by_Distance.Shared.Models;
+namespace Phares.Shared.Models;
 
 public record FilePath(long CreationTicks,
                        string DirectoryFullPath,

Shared/Models/FilePathAndWholePercentages.cs

@@ -1,7 +1,7 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-namespace View_by_Distance.Shared.Models;
+namespace Phares.Shared.Models;
 
 public record FilePathAndWholePercentages(FilePath FilePath, int WholePercentages)
 {

Shared/Models/FirstPass.cs

@@ -0,0 +1,30 @@
+using System.Text.Json;
+using System.Text.Json.Serialization;
+
+namespace Phares.Shared.Models;
+
+public record FirstPass(ExifDirectory ExifDirectory,
+                        bool FastForwardMovingPictureExpertsGroupUsed,
+                        MinimumYearAndPathCombined MinimumYearAndPathCombined,
+                        FileHolder[] SidecarFiles)
+{
+
+    public override string ToString()
+    {
+        string result = JsonSerializer.Serialize(this, FirstPassSourceGenerationContext.Default.FilePath);
+        return result;
+    }
+
+}
+
+[JsonSourceGenerationOptions(WriteIndented = true)]
+[JsonSerializable(typeof(FirstPass))]
+public partial class FirstPassSourceGenerationContext : JsonSerializerContext
+{
+}
+
+[JsonSourceGenerationOptions(WriteIndented = true)]
+[JsonSerializable(typeof(List<FirstPass>))]
+public partial class FirstPassCollectionSourceGenerationContext : JsonSerializerContext
+{
+}

Shared/Models/GifHeaderDirectory.cs

@@ -1,7 +1,7 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-namespace View_by_Distance.Shared.Models;
+namespace Phares.Shared.Models;
 
 public record GifHeaderDirectory(string? ImageHeight,
                                  string? ImageWidth)

Shared/Models/GpsDirectory.cs

@@ -1,7 +1,7 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-namespace View_by_Distance.Shared.Models;
+namespace Phares.Shared.Models;
 
 public record GpsDirectory(string? Altitude,
                            string? Latitude,

Shared/Models/JpegDirectory.cs

@@ -1,7 +1,7 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-namespace View_by_Distance.Shared.Models;
+namespace Phares.Shared.Models;
 
 public record JpegDirectory(string? ImageHeight,
                             string? ImageWidth)

Shared/Models/Location.cs

@@ -1,6 +1,6 @@
 using System.Text.Json.Serialization;
 
-namespace View_by_Distance.Shared.Models;
+namespace Phares.Shared.Models;
 
 [method: JsonConstructor]
 public class Location(int bottom, double confidence, int left, int right, int top) : Properties.ILocation, IEquatable<Location>

Shared/Models/LocationContainer.cs

@@ -1,6 +1,7 @@
-using System.Drawing;
+using System.Text.Json;
+using System.Text.Json.Serialization;
 
-namespace View_by_Distance.Shared.Models;
+namespace Phares.Shared.Models;
 
 public record LocationContainer(DateOnly? CreationDateOnly,
                                 ExifDirectory? ExifDirectory,
@@ -10,40 +11,67 @@ public record LocationContainer(DateOnly? CreationDateOnly,
                                 int? LengthPermyriad,
                                 FilePath? LengthSource,
                                 PersonKeyFormattedAndKeyTicksAndDisplayDirectoryName? PersonKeyFormattedAndKeyTicksAndDisplayDirectoryName,
-                                RectangleF? Rectangle,
                                 int? WholePercentages)
 {
 
-    public static LocationContainer Get(LocationContainer locationContainer, object? encoding, bool keepExifDirectory)
+    public string GetWithoutEncoding()
+    {
+        string result;
+        WithoutEncoding withoutEncoding = new(CreationDateOnly: CreationDateOnly,
+                                              ExifDirectory: ExifDirectory,
+                                              FaceFile: FaceFile,
+                                              FilePath: FilePath,
+                                              LengthPermyriad: LengthPermyriad,
+                                              LengthSource: LengthSource,
+                                              PersonKeyFormattedAndKeyTicksAndDisplayDirectoryName: PersonKeyFormattedAndKeyTicksAndDisplayDirectoryName,
+                                              WholePercentages: WholePercentages);
+        result = JsonSerializer.Serialize(withoutEncoding, WithoutEncodingSourceGenerationContext.Default.WithoutEncoding);
+        return result;
+    }
+
+    public static LocationContainer Get(LocationContainer locationContainer, object? encoding)
     {
         LocationContainer result;
-        result = new(locationContainer.CreationDateOnly,
+        result = new(CreationDateOnly: locationContainer.CreationDateOnly,
-                     keepExifDirectory ? locationContainer.ExifDirectory : null,
+                     ExifDirectory: locationContainer.ExifDirectory,
-                     encoding,
+                     Encoding: encoding,
-                     locationContainer.FaceFile,
+                     FaceFile: locationContainer.FaceFile,
-                     locationContainer.FilePath,
+                     FilePath: locationContainer.FilePath,
-                     locationContainer.LengthPermyriad,
+                     LengthPermyriad: locationContainer.LengthPermyriad,
-                     locationContainer.LengthSource,
+                     LengthSource: locationContainer.LengthSource,
-                     locationContainer.PersonKeyFormattedAndKeyTicksAndDisplayDirectoryName,
+                     PersonKeyFormattedAndKeyTicksAndDisplayDirectoryName: locationContainer.PersonKeyFormattedAndKeyTicksAndDisplayDirectoryName,
-                     locationContainer.Rectangle,
+                     WholePercentages: locationContainer.WholePercentages);
-                     locationContainer.WholePercentages);
         return result;
     }
 
     public static LocationContainer Get(LocationContainer source, LocationContainer locationContainer, int lengthPermyriad, bool keepExifDirectory, bool keepEncoding)
     {
         LocationContainer result;
-        result = new(locationContainer.CreationDateOnly,
+        result = new(CreationDateOnly: locationContainer.CreationDateOnly,
-                     keepExifDirectory ? locationContainer.ExifDirectory : null,
+                     ExifDirectory: keepExifDirectory ? locationContainer.ExifDirectory : null,
-                     keepEncoding ? locationContainer.Encoding : null,
+                     Encoding: keepEncoding ? locationContainer.Encoding : null,
-                     locationContainer.FaceFile,
+                     FaceFile: locationContainer.FaceFile,
-                     locationContainer.FilePath,
+                     FilePath: locationContainer.FilePath,
-                     lengthPermyriad,
+                     LengthPermyriad: lengthPermyriad,
-                     source.FilePath,
+                     LengthSource: source.FilePath,
-                     locationContainer.PersonKeyFormattedAndKeyTicksAndDisplayDirectoryName,
+                     PersonKeyFormattedAndKeyTicksAndDisplayDirectoryName: locationContainer.PersonKeyFormattedAndKeyTicksAndDisplayDirectoryName,
-                     locationContainer.Rectangle,
+                     WholePercentages: locationContainer.WholePercentages);
-                     locationContainer.WholePercentages);
         return result;
     }
 
+}
+
+internal record WithoutEncoding(DateOnly? CreationDateOnly,
+                                ExifDirectory? ExifDirectory,
+                                FaceFile? FaceFile,
+                                FilePath FilePath,
+                                int? LengthPermyriad,
+                                FilePath? LengthSource,
+                                PersonKeyFormattedAndKeyTicksAndDisplayDirectoryName? PersonKeyFormattedAndKeyTicksAndDisplayDirectoryName,
+                                int? WholePercentages);
+
+[JsonSourceGenerationOptions(WriteIndented = true, DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull)]
+[JsonSerializable(typeof(WithoutEncoding))]
+internal partial class WithoutEncodingSourceGenerationContext : JsonSerializerContext
+{
 }

Shared/Models/MakernoteDirectory.cs

@@ -1,7 +1,7 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-namespace View_by_Distance.Shared.Models;
+namespace Phares.Shared.Models;
 
 public record MakernoteDirectory(string? CameraSerialNumber,
                                  string? FirmwareVersion,

Shared/Models/MappingFromFilter.cs

@@ -1,7 +1,7 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-namespace View_by_Distance.Shared.Models;
+namespace Phares.Shared.Models;
 
 public record MappingFromFilter(bool? IsFocusModel,
                                 bool? IsFocusPerson,

Shared/Models/MappingFromFilterPost.cs

@@ -1,7 +1,7 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-namespace View_by_Distance.Shared.Models;
+namespace Phares.Shared.Models;
 
 public record MappingFromFilterPost(bool? CanReMap,
                                     bool? InSkipCollection,

Shared/Models/MappingFromPerson.cs

@@ -1,7 +1,7 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-namespace View_by_Distance.Shared.Models;
+namespace Phares.Shared.Models;
 
 public record MappingFromPerson(int? ApproximateYears,
                                 string DisplayDirectoryName,

Shared/Models/MetaBase.cs

@@ -0,0 +1,135 @@
+using System.Collections.ObjectModel;
+using System.Globalization;
+
+namespace Phares.Shared.Models;
+
+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 int? GetOrientation(ExifDirectoryBase[]? exifBaseDirectories)
+    {
+        int? result = null;
+        // public const int TagOrientation = 274;
+        if (exifBaseDirectories is not null)
+        {
+            foreach (ExifDirectoryBase exifDirectoryBase in exifBaseDirectories)
+            {
+                result = exifDirectoryBase?.OrientationValue;
+                if (result is not null)
+                    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();
+    }
+
+    internal static int? GetWidth(ExifDirectoryBase[]? exifBaseDirectories)
+    {
+        int? result = null;
+        // public const int TagImageWidth = 256;
+        if (exifBaseDirectories is not null)
+        {
+            foreach (ExifDirectoryBase exifDirectoryBase in exifBaseDirectories)
+            {
+                result = exifDirectoryBase?.ImageWidthValue;
+                if (result is not null)
+                    break;
+            }
+        }
+        return result;
+    }
+
+    internal static int? GetHeight(ExifDirectoryBase[]? exifBaseDirectories)
+    {
+        int? result = null;
+        // public const int TagImageHeight = 257;
+        if (exifBaseDirectories is not null)
+        {
+            foreach (ExifDirectoryBase exifDirectoryBase in exifBaseDirectories)
+            {
+                result = exifDirectoryBase?.ImageHeightValue;
+                if (result is not null)
+                    break;
+            }
+        }
+        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;
+    }
+
+#pragma warning restore CA1416
+
+}

Shared/Models/MetadataGroup.cs

@@ -2,9 +2,9 @@ using System.Collections.ObjectModel;
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-namespace View_by_Distance.Shared.Models;
+namespace Phares.Shared.Models;
 
-public record MetadataGroup(bool FastForwardMovingPictureExpertsGroupUsed, FilePath FilePath, FileInfo FileInfo, ExifDirectory ExifDirectory, ReadOnlyCollection<FileHolder> SidecarFiles)
+public record MetadataGroup(bool FastForwardMovingPictureExpertsGroupUsed, FilePath FilePath, MinimumYearAndPathCombined MinimumYearAndPathCombined, ExifDirectory ExifDirectory, ReadOnlyCollection<FileHolder> SidecarFiles)
 {
 
     public override string ToString()

Shared/Models/MetadataSettings.cs

@@ -1,7 +1,7 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-namespace View_by_Distance.Shared.Models;
+namespace Phares.Shared.Models;
 
 public record MetadataSettings(bool ForceMetadataLastWriteTimeToCreationTime,
                                string[] IgnoreRulesKeyWords,
@@ -20,6 +20,6 @@ public record MetadataSettings(bool ForceMetadataLastWriteTimeToCreationTime,
 
 [JsonSourceGenerationOptions(WriteIndented = true)]
 [JsonSerializable(typeof(MetadataSettings))]
-internal partial class MetadataSettingsSourceGenerationContext : JsonSerializerContext
+public partial class MetadataSettingsSourceGenerationContext : JsonSerializerContext
 {
 }

Shared/Models/MinimumYearAndFullPath.cs

@@ -0,0 +1,22 @@
+using System.Text.Json;
+using System.Text.Json.Serialization;
+
+namespace Phares.Shared.Models;
+
+public record MinimumYearAndPathCombined(int MinimumYear,
+                                         string PathCombined)
+{
+
+    public override string ToString()
+    {
+        string result = JsonSerializer.Serialize(this, MinimumYearAndPathCombinedSourceGenerationContext.Default.AviDirectory);
+        return result;
+    }
+
+}
+
+[JsonSourceGenerationOptions(WriteIndented = true)]
+[JsonSerializable(typeof(AviDirectory))]
+public partial class MinimumYearAndPathCombinedSourceGenerationContext : JsonSerializerContext
+{
+}

Shared/Models/NginxFileSystem.cs

@@ -0,0 +1,52 @@
+using System.Globalization;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+
+namespace Phares.Shared.Models;
+
+public record NginxFileSystem([property: JsonPropertyName("name")] string Name,
+                              DateTime? LastModified,
+                              [property: JsonPropertyName("mtime")] string MTime,
+                              Uri? URI,
+                              [property: JsonPropertyName("type")] string Type,
+                              [property: JsonPropertyName("size")] float? Length)
+{
+
+    public override string ToString()
+    {
+        string result = JsonSerializer.Serialize(this, NginxFileSystemSourceGenerationContext.Default.NginxFileSystem);
+        return result;
+    }
+
+    public static NginxFileSystem Get(string format, TimeZoneInfo timeZoneInfo, string name, string mTime, Uri uri, string type, float? size)
+    {
+        NginxFileSystem result;
+        DateTime dateTime;
+        DateTime? nullableDateTime;
+        if (mTime.Length != format.Length + 4 || !DateTime.TryParseExact(mTime[..format.Length], format, CultureInfo.InvariantCulture, DateTimeStyles.None, out dateTime))
+            nullableDateTime = null;
+        else
+            nullableDateTime = TimeZoneInfo.ConvertTimeBySystemTimeZoneId(dateTime, mTime[(format.Length + 1)..], timeZoneInfo.Id);
+        result = new(name, nullableDateTime, mTime, new($"{uri.OriginalString}/{name}"), type, size);
+        return result;
+    }
+
+    public static string GetFormat() =>
+        "ddd, dd MMM yyyy HH:mm:ss";
+
+    public static NginxFileSystem Get(string format, TimeZoneInfo timeZoneInfo, Uri uri, NginxFileSystem nginxFileSystem) =>
+        Get(format, timeZoneInfo, nginxFileSystem.Name, nginxFileSystem.MTime, uri, nginxFileSystem.Type, nginxFileSystem.Length);
+
+}
+
+[JsonSourceGenerationOptions(WriteIndented = true, DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull)]
+[JsonSerializable(typeof(NginxFileSystem))]
+public partial class NginxFileSystemSourceGenerationContext : JsonSerializerContext
+{
+}
+
+[JsonSourceGenerationOptions(WriteIndented = true, DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull)]
+[JsonSerializable(typeof(NginxFileSystem[]))]
+public partial class NginxFileSystemCollectionSourceGenerationContext : JsonSerializerContext
+{
+}

Shared/Models/OutputResolution.cs

@@ -1,4 +1,4 @@
-namespace View_by_Distance.Shared.Models;
+namespace Phares.Shared.Models;
 
 public record OutputResolution(int Height,
                                int Orientation,

Shared/Models/PeopleSettings.cs

@@ -1,7 +1,7 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-namespace View_by_Distance.Shared.Models;
+namespace Phares.Shared.Models;
 
 public record PeopleSettings(string GenealogicalDataCommunicationFile,
                              string[] JLinks,

Shared/Models/PersonBirthday.cs

@@ -1,7 +1,7 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-namespace View_by_Distance.Shared.Models;
+namespace Phares.Shared.Models;
 
 public record PersonBirthday(DateTime Value)
 {

Shared/Models/PersonContainer.cs

@@ -1,9 +1,9 @@
 using System.Collections.ObjectModel;
 using System.Text.Json;
 using System.Text.Json.Serialization;
-using View_by_Distance.Shared.Models.Stateless;
+using Phares.Shared.Models.Stateless;
 
-namespace View_by_Distance.Shared.Models;
+namespace Phares.Shared.Models;
 
 public record PersonContainer(int? ApproximateYears,
                               PersonBirthday[]? Birthdays,