xmp and json sidecar support

Metadata alignment

Compare/Compare.cs

@@ -1,19 +1,23 @@
 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 View_by_Distance.Shared.Models.Stateless;
+using Phares.Shared.Models;
+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;
 
@@ -41,54 +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);
     }
 
-    private void CompareWork(ILogger<Program>? logger, AppSettings appSettings, ICompare compare, long ticks)
+    private void CompareWork(ILogger<Program>? logger, AppSettings appSettings, ICompare compare)
     {
         const int updated = 0;
         DistanceLimits? distanceLimits;
-        logger?.LogInformation("{Ticks}", ticks);
         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, ticks);
+        bool runToDoCollectionFirst = GetRunToDoCollectionFirst(appSettings, compare);
         ReadOnlyCollections readOnlyCollections = GetReadOnlyCollections(appSettings);
-        ReadOnlyCollection<ExifDirectory> mappedExifDirectoryWithEncoding = GetMappedExifDirectoryWithEncoding(appSettings, compare, ticks, readOnlyCollections);
-        ReadOnlyDictionary<int, ReadOnlyDictionary<int, FilePath>> keyValuePairs = IDistance.Extract(appSettings.CompareSettings, mappedExifDirectoryWithEncoding);
+        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;
-            _ProgressBar?.Dispose();
             logger?.LogInformation("{outputResolution}", outputResolution);
-            exifDirectories = IFace.GetExifDirectories(appSettings.ResultSettings, appSettings.MetadataSettings, appSettings.DistanceSettings, appSettings.CompareSettings, compare, ticks, outputResolution);
-            preFiltered = IDistance.GetPreFilterLocationContainer(appSettings.DistanceSettings, appSettings.CompareSettings, compare, ticks, readOnlyCollections, keyValuePairs, exifDirectories);
+            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, appSettings.CompareSettings, compare, ticks, mappedExifDirectoryWithEncoding, distanceLimits, postFiltered);
+            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, ticks, outputResolution, onlyOne);
+            saveContainers = IDistance.GetSaveContainers(appSettings.ResultSettings, appSettings.DistanceSettings, appSettings.CompareSettings, compare, outputResolution, onlyOne);
             if (saveContainers.Count == 0)
                 continue;
-            IDistance.SaveContainers(appSettings.DistanceSettings, appSettings.CompareSettings, compare, ticks, updated, saveContainers);
+            IDistance.SaveContainers(appSettings.DistanceSettings, appSettings.CompareSettings, compare, updated, saveContainers);
         }
     }
 
-    private static bool GetRunToDoCollectionFirst(AppSettings appSettings, long ticks)
+    private static bool GetRunToDoCollectionFirst(AppSettings appSettings, ICompare compare)
     {
         bool result = appSettings.DistanceSettings.SaveSortingWithoutPerson;
         if (!result)
@@ -103,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);
@@ -153,16 +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);
-        if (exifDirectories.Count == 0 && !appSettings.DistanceSettings.SaveSortingWithoutPerson)
-            throw new NotSupportedException($"Switch {nameof(appSettings.DistanceSettings.SaveSortingWithoutPerson)}!");
-        results = IDistance.GetMappedExifDirectoryWithEncoding(compare, ticks, exifDirectories);
+
+        ReadOnlyDictionary<int, ReadOnlyDictionary<int, LocationContainer>> results;
+        results = IDistance.GetMappedIdsThenWholePercentagesToLocationContainer(appSettings.ResultSettings,
+                                                                                appSettings.MetadataSettings,
+                                                                                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 SaveExtracted(AppSettings appSettings, ReadOnlyDictionary<int, ReadOnlyDictionary<int, LocationContainer>> mappedIdsThenWholePercentagesToLocationContainer)
+    {
+        ReadOnlyCollection<string>? paths;
+        ReadOnlyDictionary<string, ReadOnlyCollection<string>> rootDirectoryFileNameToPaths = GetRootDirectoryFileNameToPaths(appSettings.ResultSettings, appSettings.CompareSettings);
+        foreach (KeyValuePair<int, ReadOnlyDictionary<int, LocationContainer>> keyValuePair in mappedIdsThenWholePercentagesToLocationContainer)
+        {
+            foreach (KeyValuePair<int, LocationContainer> keyValue in keyValuePair.Value)
+            {
+                if (keyValue.Value.ExifDirectory is null || keyValue.Value.FaceFile?.Location is null)
+                    continue;
+                if (rootDirectoryFileNameToPaths.TryGetValue(keyValue.Value.FilePath.FileNameFirstSegment, out paths))
+                {
+                    if (appSettings.CompareSettings.SaveExtractedJavaScriptObjectNotation && keyValue.Value.PersonKeyFormattedAndKeyTicksAndDisplayDirectoryName is not null)
+                        SaveExtractedJavaScriptObjectNotation(keyValue.Key, keyValue.Value, paths);
+                    if (appSettings.CompareSettings.SaveExtractedFaces)
+                        SaveExtractedFace(keyValuePair.Key, keyValue.Key, keyValue.Value.ExifDirectory, keyValue.Value.FaceFile.Location, keyValue.Value.PersonKeyFormattedAndKeyTicksAndDisplayDirectoryName, paths);
+                }
+            }
+        }
+    }
+
+    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;
 

Compare/Models/CompareSettings.cs

@@ -1,4 +1,5 @@
 
+using Phares.Shared.Models.Properties;
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
@@ -9,7 +10,9 @@ public record CompareSettings(string Company,
                               string FacesHiddenFileNameExtension,
                               string FacesPartsFileNameExtension,
                               int MaxDegreeOfParallelism,
-                              string[] OutputResolutions) : Shared.Models.Properties.ICompareSettings
+                              string[] OutputResolutions,
+                              bool SaveExtractedFaces,
+                              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/AA.Distance.csproj

@@ -10,7 +10,7 @@
     <HoursSinceNovember122024>$([System.Math]::Floor($([MSBuild]::Divide($([MSBuild]::Subtract($([System.DateTimeOffset]::UtcNow.ToUnixTimeSeconds()), 1731369600)), 3600))))</HoursSinceNovember122024>
   </PropertyGroup>
   <PropertyGroup>
-    <PackageId>Phares.AA.Distance</PackageId>
+    <PackageId>Phares.Distance</PackageId>
     <Version>9.0.104.$([System.Math]::Floor($([MSBuild]::Divide($([MSBuild]::Subtract($([System.DateTimeOffset]::UtcNow.ToUnixTimeSeconds()), 1731369600)), 3600))))</Version>
     <Company>Phares</Company>
     <Authors>Mike Phares</Authors>

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 View_by_Distance.Shared.Models.Methods;
+using Phares.Shared.Models;
+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? json;
-        FaceEncoding? faceEncoding;
-        ExifDirectory exifDirectory;
-        FaceRecognitionDotNet.Models.FaceEncoding? encoding;
-        int totalSeconds = (int)Math.Floor(new TimeSpan(DateTime.Now.Ticks - ticks).TotalSeconds);
+        string checkFile = $"{filePath.FullName}.unk";
+        if (File.Exists(filePath.FullName) && !File.Exists(checkFile))
+            File.Move(filePath.FullName, checkFile);
+    }
+
+    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();
-            json = Metadata.Models.Stateless.IMetadata.GetFaceEncoding(e);
-            faceEncoding = json is null ? null : JsonSerializer.Deserialize(json, FaceEncodingGenerationContext.Default.FaceEncoding);
-            if (faceEncoding is null)
-                continue;
-            encoding = FaceRecognitionDotNet.Models.FaceRecognition.LoadFaceEncoding(faceEncoding.RawEncoding);
-            exifDirectory = ExifDirectory.Get(encoding, e);
-            results.Add(exifDirectory);
+            if (distanceSettings.DistanceMoveUnableToMatch)
+                MoveUnableToMatch(exifDirectory.FilePath);
+            result = null;
         }
+        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 View_by_Distance.Shared.Models;
-using View_by_Distance.Shared.Models.Properties;
-using View_by_Distance.Shared.Models.Stateless;
+using Phares.Shared.Models;
+using Phares.Shared.Models.Properties;
+using Phares.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));
-        int totalSeconds = (int)Math.Floor(new TimeSpan(DateTime.Now.Ticks - ticks).TotalSeconds);
+        ReadOnlyCollection<LocationContainer> locationContainers = FilterLogicB.GetLocationContainers(distanceSettings, compareSettings, compare, exifDirectories, nameof(FilterLogicA));
+        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 = json is null ? null : JsonSerializer.Deserialize(json, FaceEncodingGenerationContext.Default.FaceEncoding);
+            faceEncoding = Phares.Metadata.Models.Stateless.IMetadata.GetFaceEncoding(locationContainer.ExifDirectory);
             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 System.Text.Json;
-using View_by_Distance.Shared.Models;
-using View_by_Distance.Shared.Models.Properties;
-using View_by_Distance.Shared.Models.Stateless;
+using Phares.Shared.Models;
+using Phares.Shared.Models.Properties;
+using Phares.Shared.Models.Stateless;
 
 namespace View_by_Distance.Distance.Models.Stateless;
 
 internal static class FilterLogicB
 {
 
-    private static void MoveUnableToMatch(FilePath filePath)
-    {
-        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)
+    internal static ReadOnlyCollection<LocationContainer> GetLocationContainers(DistanceSettings distanceSettings, ICompareSettings compareSettings, ICompare compare, 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) =>
-        {
-            compare.Tick();
-            LocationContainersParallelFor(distanceSettings, compareSettings, results, exifDirectories[i]);
-        });
+            LocationContainersParallelFor(distanceSettings, compareSettings, compare, exifDirectories, i, results));
         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 View_by_Distance.Shared.Models;
-using View_by_Distance.Shared.Models.Stateless;
+using Phares.Metadata.Models;
+using Phares.Shared.Models;
+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 (LocationContainer locationContainer in locationContainers)
-            results.Add(locationContainer);
+        foreach (KeyValuePair<int, ReadOnlyDictionary<int, LocationContainer>> keyValuePair in mappedIdsThenWholePercentagesToLocationContainer)
+        {
+            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);
-        string message = $") Building Matrix - {(int)Math.Floor(new TimeSpan(DateTime.Now.Ticks - ticks).TotalSeconds)} total second(s)";
+        ReadOnlyCollection<LocationContainer> locationContainers = GetCombined(mappedIdsThenWholePercentagesToLocationContainer, postFiltered);
+        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 View_by_Distance.Shared.Models;
-using View_by_Distance.Shared.Models.Properties;
-using View_by_Distance.Shared.Models.Stateless;
+using Phares.Metadata.Models;
+using Phares.Shared.Models;
+using Phares.Shared.Models.Properties;
+using Phares.Shared.Models.Stateless;
 using WindowsShortcutFactory;
 
 namespace View_by_Distance.Distance.Models.Stateless;
@@ -55,7 +55,7 @@ internal static class FilterLogicD
         return result;
     }
 
-    internal static void SaveContainers(DistanceSettings distanceSettings, ICompareSettings compareSettings, ICompare compare, long ticks, int? updated, ReadOnlyCollection<SaveContainer> saveContainers)
+    internal static void SaveContainers(DistanceSettings distanceSettings, ICompareSettings compareSettings, ICompare compare, int? updated, ReadOnlyCollection<SaveContainer> saveContainers)
     {
         string fileName;
         string checkFile;
@@ -70,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)";
@@ -166,7 +166,7 @@ internal static class FilterLogicD
         }
     }
 
-    internal static ReadOnlyCollection<SaveContainer> GetSaveContainers(ResultSettings resultSettings, DistanceSettings distanceSettings, ICompareSettings compareSettings, ICompare compare, long ticks, string outputResolution, ReadOnlyDictionary<string, LocationContainer> onlyOne)
+    internal static ReadOnlyCollection<SaveContainer> GetSaveContainers(ResultSettings resultSettings, DistanceSettings distanceSettings, ICompareSettings compareSettings, ICompare compare, string outputResolution, ReadOnlyDictionary<string, LocationContainer> onlyOne)
     {
         List<SaveContainer> results = [];
         RecordB recordB;
@@ -205,14 +205,14 @@ internal static class FilterLogicD
         string cContentDirectory = Path.Combine(cResultsFullGroupDirectory, resultSettings.ResultContent);
         if (!Directory.Exists(cContentDirectory))
             _ = Directory.CreateDirectory(cContentDirectory);
-        string eDistanceContentTicksDirectory = Path.Combine(eResultsFullGroupDirectory, ticks.ToString());
+        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 - ticks).TotalSeconds)} total second(s)";
+        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)
         {

Distance/Models/Stateless/IDistance.cs

@@ -1,15 +1,15 @@
 using System.Collections.ObjectModel;
-using View_by_Distance.Metadata.Models;
-using View_by_Distance.Shared.Models;
-using View_by_Distance.Shared.Models.Properties;
-using View_by_Distance.Shared.Models.Stateless;
+using Phares.Metadata.Models;
+using Phares.Shared.Models;
+using Phares.Shared.Models.Properties;
+using Phares.Shared.Models.Stateless;
 
 namespace View_by_Distance.Distance.Models.Stateless;
 
 public interface IDistance
 {
 
-    static string Get(bool saveIndividually, string forceSingleImageHumanized, int by, bool isDefaultName) =>
+    public static string Get(bool saveIndividually, string forceSingleImageHumanized, int by, bool isDefaultName) =>
         $"{by switch
         {
             IMapLogic.Mapping => nameof(IMapLogic.Mapping),
@@ -23,55 +23,43 @@ public interface IDistance
     public static ReadOnlyDictionary<string, LocationContainer> GetOnlyOne(DistanceSettings distanceSettings, ReadOnlyCollection<LocationContainer> matrix) =>
         FilterLogicC.GetOnlyOne(distanceSettings, matrix);
 
-    public static ReadOnlyCollection<ExifDirectory> GetMappedExifDirectoryWithEncoding(ICompare compare, long ticks, ReadOnlyCollection<ExifDirectory> exifDirectories) =>
-        FaceEncodingLogic.GetMappedExifDirectoryWithEncoding(compare, ticks, exifDirectories);
-
     public static ReadOnlyCollection<LocationContainer> GetPostFilterLocationContainer(ReadOnlyCollection<LocationContainer> preFiltered, DistanceLimits distanceLimits) =>
         FilterLogicC.GetPostFilterLocationContainer(preFiltered, distanceLimits);
 
-    public static ReadOnlyDictionary<int, ReadOnlyDictionary<int, FilePath>> Extract(ICompareSettings compareSettings, ReadOnlyCollection<ExifDirectory> exifDirectories) =>
-        MappedLogicA.Extract(compareSettings, exifDirectories);
+    public static void SaveContainers(DistanceSettings distanceSettings, ICompareSettings compareSettings, ICompare compare, int? updated, ReadOnlyCollection<SaveContainer> saveContainers) =>
+        FilterLogicD.SaveContainers(distanceSettings, compareSettings, compare, updated, saveContainers);
 
-    public 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<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);
+    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 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);
+    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> 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);
-
-    public 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);
+    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<ExifDirectory> TestStatic_GetMappedExifDirectoryWithEncoding(ICompare compare, long ticks, ReadOnlyCollection<ExifDirectory> exifDirectories) =>
-        GetMappedExifDirectoryWithEncoding(compare, ticks, exifDirectories);
-
     internal static ReadOnlyCollection<LocationContainer> TestStatic_GetPostFilterLocationContainer(ReadOnlyCollection<LocationContainer> preFiltered, DistanceLimits distanceLimits) =>
         GetPostFilterLocationContainer(preFiltered, distanceLimits);
 
-    internal static ReadOnlyDictionary<int, ReadOnlyDictionary<int, FilePath>> TestStatic_Extract(ICompareSettings compareSettings, ReadOnlyCollection<ExifDirectory> exifDirectories) =>
-        Extract(compareSettings, exifDirectories);
+    internal static void TestStatic_SaveContainers(DistanceSettings distanceSettings, ICompareSettings compareSettings, ICompare compare, int? updated, ReadOnlyCollection<SaveContainer> saveContainers) =>
+        SaveContainers(distanceSettings, compareSettings, compare, updated, saveContainers);
 
-    internal static void TestStatic_SaveContainers(DistanceSettings distanceSettings, ICompareSettings compareSettings, ICompare compare, long ticks, int? updated, ReadOnlyCollection<SaveContainer> saveContainers) =>
-        SaveContainers(distanceSettings, compareSettings, compare, ticks, 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<SaveContainer> TestStatic_GetSaveContainers(ResultSettings resultSettings, DistanceSettings distanceSettings, ICompareSettings compareSettings, ICompare compare, long ticks, string outputResolution, ReadOnlyDictionary<string, LocationContainer> onlyOne) =>
-        GetSaveContainers(resultSettings, distanceSettings, compareSettings, compare, ticks, 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 ReadOnlyCollection<ExifDirectory> TestStatic_GetMapped(ResultSettings resultSettings, MetadataSettings metadataSettings, PeopleSettings peopleSettings, DistanceSettings distanceSettings, ICompareSettings compareSettings, ICompare compare, long ticks, ReadOnlyCollections readOnlyCollections) =>
-        GetMapped(resultSettings, metadataSettings, peopleSettings, distanceSettings, compareSettings, compare, ticks, readOnlyCollections);
+    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_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);
-
-    internal 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);
+    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 View_by_Distance.Metadata.Models.Stateless;
-using View_by_Distance.Shared.Models;
-using View_by_Distance.Shared.Models.Properties;
-using View_by_Distance.Shared.Models.Stateless;
+using Phares.Metadata.Models;
+using Phares.Metadata.Models.Stateless;
+using Phares.Shared.Models;
+using Phares.Shared.Models.Properties;
+using Phares.Shared.Models.Stateless;
 
 namespace View_by_Distance.Distance.Models.Stateless;
 
@@ -14,42 +14,16 @@ internal static class MappedLogicA
                                string? PersonDisplayDirectoryName,
                                FilePath FilePath);
 
-    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();
-    }
-
-    internal static ReadOnlyCollection<ExifDirectory> GetMapped(ResultSettings resultSettings, MetadataSettings metadataSettings, PeopleSettings peopleSettings, DistanceSettings distanceSettings, ICompareSettings compareSettings, ICompare compare, long ticks, ReadOnlyCollections readOnlyCollections)
+    internal static ReadOnlyCollection<ExifDirectory> GetMapped(ResultSettings resultSettings, MetadataSettings metadataSettings, PeopleSettings peopleSettings, DistanceSettings distanceSettings, ICompareSettings compareSettings, ICompare compare, ReadOnlyCollections readOnlyCollections)
     {
         List<ExifDirectory> results = [];
         string eDistanceContentDirectory = Path.GetFullPath(IResult.GetResultsDateGroupDirectory(resultSettings, nameof(E_Distance), resultSettings.ResultContent));
-        ReadOnlyCollection<MappedLogicB.Record> records = MappedLogicB.DeleteEmptyDirectoriesAndGetCollection(resultSettings, metadataSettings, peopleSettings, distanceSettings, compareSettings, compare, ticks, eDistanceContentDirectory, readOnlyCollections);
+        ReadOnlyCollection<MappedLogicB.Record> records = MappedLogicB.DeleteEmptyDirectoriesAndGetCollection(resultSettings, metadataSettings, peopleSettings, distanceSettings, compareSettings, compare, 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);
+            int totalSeconds = (int)Math.Floor(new TimeSpan(DateTime.Now.Ticks - compare.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;

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 View_by_Distance.Shared.Models.Properties;
-using View_by_Distance.Shared.Models.Stateless;
+using Phares.Shared.Models;
+using Phares.Shared.Models.Properties;
+using Phares.Shared.Models.Stateless;
 
 namespace View_by_Distance.Distance.Models.Stateless;
 
@@ -24,7 +24,7 @@ internal static class MappedLogicB
                                    bool? IsLocationContainerDebugDirectory,
                                    float? TotalDays);
 
-    internal static ReadOnlyCollection<Record> DeleteEmptyDirectoriesAndGetCollection(ResultSettings resultSettings, MetadataSettings metadataSettings, PeopleSettings peopleSettings, DistanceSettings distanceSettings, ICompareSettings compareSettings, ICompare compare, long ticks, string eDistanceContentDirectory, ReadOnlyCollections readOnlyCollections)
+    internal static ReadOnlyCollection<Record> DeleteEmptyDirectoriesAndGetCollection(ResultSettings resultSettings, MetadataSettings metadataSettings, PeopleSettings peopleSettings, DistanceSettings distanceSettings, ICompareSettings compareSettings, ICompare compare, string eDistanceContentDirectory, ReadOnlyCollections readOnlyCollections)
     {
         List<Record> results = [];
         bool check;
@@ -59,7 +59,7 @@ internal static class MappedLogicB
             distinct.Clear();
             directoryNumber = 0;
             ticksDirectories = UpdateDateVerifyAndGetTicksDirectories(distanceSettings, eDistanceContentDirectory);
-            totalSeconds = (int)Math.Floor(new TimeSpan(DateTime.Now.Ticks - ticks).TotalSeconds);
+            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)

Face/AA.Face.csproj

@@ -10,7 +10,7 @@
     <HoursSinceNovember122024>$([System.Math]::Floor($([MSBuild]::Divide($([MSBuild]::Subtract($([System.DateTimeOffset]::UtcNow.ToUnixTimeSeconds()), 1731369600)), 3600))))</HoursSinceNovember122024>
   </PropertyGroup>
   <PropertyGroup>
-    <PackageId>Phares.AA.Face</PackageId>
+    <PackageId>Phares.Face</PackageId>
     <Version>9.0.104.$([System.Math]::Floor($([MSBuild]::Divide($([MSBuild]::Subtract($([System.DateTimeOffset]::UtcNow.ToUnixTimeSeconds()), 1731369600)), 3600))))</Version>
     <Company>Phares</Company>
     <Authors>Mike Phares</Authors>

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 View_by_Distance.Metadata.Models.Stateless;
-using View_by_Distance.Shared.Models;
-using View_by_Distance.Shared.Models.Properties;
-using View_by_Distance.Shared.Models.Stateless;
+using Phares.Metadata.Models;
+using Phares.Metadata.Models.Stateless;
+using Phares.Shared.Models;
+using Phares.Shared.Models.Properties;
+using Phares.Shared.Models.Stateless;
 
 namespace View_by_Distance.Face.Models.Stateless;
 
@@ -21,13 +21,13 @@ internal static class Face
         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 View_by_Distance.Shared.Models.Properties;
-using View_by_Distance.Shared.Models.Stateless;
+using Phares.Shared.Models;
+using Phares.Shared.Models.Properties;
+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) =>
-        GetExifDirectories(resultSettings, metadataSettings, distanceSettings, compareSettings, compare, ticks, outputResolution);
-    static ReadOnlyCollection<ExifDirectory> GetExifDirectories(ResultSettings resultSettings, MetadataSettings metadataSettings, DistanceSettings distanceSettings, ICompareSettings compareSettings, ICompare compare, long ticks, string outputResolution) =>
-        Face.GetExifDirectories(resultSettings, metadataSettings, distanceSettings, compareSettings, compare, ticks, outputResolution);
+    ReadOnlyCollection<ExifDirectory> TestStatic_GetExifDirectories(ResultSettings resultSettings, MetadataSettings metadataSettings, DistanceSettings distanceSettings, ICompareSettings compareSettings, ICompare compare, string outputResolution) =>
+        GetExifDirectories(resultSettings, metadataSettings, distanceSettings, compareSettings, compare, outputResolution);
+    static ReadOnlyCollection<ExifDirectory> GetExifDirectories(ResultSettings resultSettings, MetadataSettings metadataSettings, DistanceSettings distanceSettings, ICompareSettings compareSettings, ICompare compare, string outputResolution) =>
+        Face.GetExifDirectories(resultSettings, metadataSettings, distanceSettings, compareSettings, compare, outputResolution);
 
 }

FaceRecognitionDotNet/AA.FaceRecognitionDotNet.csproj

@@ -10,7 +10,7 @@
         <HoursSinceNovember122024>$([System.Math]::Floor($([MSBuild]::Divide($([MSBuild]::Subtract($([System.DateTimeOffset]::UtcNow.ToUnixTimeSeconds()), 1731369600)), 3600))))</HoursSinceNovember122024>
     </PropertyGroup>
     <PropertyGroup>
-        <PackageId>Phares.AA.FaceRecognitionDotNet</PackageId>
+        <PackageId>Phares.FaceRecognitionDotNet</PackageId>
         <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
         <Version>9.0.104.$([System.Math]::Floor($([MSBuild]::Divide($([MSBuild]::Subtract($([System.DateTimeOffset]::UtcNow.ToUnixTimeSeconds()), 1731369600)), 3600))))</Version>
         <Authors>Mike Phares</Authors>

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 View_by_Distance.Shared.Models.Stateless;
+using Phares.Shared.Models;
+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 View_by_Distance.Shared.Models.Stateless;
+using Phares.Shared.Models;
+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 View_by_Distance.Shared.Models.Stateless;
+using Phares.Shared.Models;
+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/AA.Metadata.csproj

@@ -10,8 +10,8 @@
     <HoursSinceNovember142023>$([System.Math]::Floor($([MSBuild]::Divide($([MSBuild]::Subtract($([System.DateTimeOffset]::UtcNow.ToUnixTimeSeconds()), 1699920000)), 3600))))</HoursSinceNovember142023>
   </PropertyGroup>
   <PropertyGroup>
-    <PackageId>Phares.AA.Metadata</PackageId>
-    <Version>8.0.114.$([System.Math]::Floor($([MSBuild]::Divide($([MSBuild]::Subtract($([System.DateTimeOffset]::UtcNow.ToUnixTimeSeconds()), 1699920000)), 3600))))</Version>
+    <PackageId>Phares.Metadata</PackageId>
+    <Version>8.0.118.$([System.Math]::Floor($([MSBuild]::Divide($([MSBuild]::Subtract($([System.DateTimeOffset]::UtcNow.ToUnixTimeSeconds()), 1699920000)), 3600))))</Version>
     <Company>Phares</Company>
     <Authors>Mike Phares</Authors>
     <IncludeSymbols>true</IncludeSymbols>

Metadata/Models/A_Metadata.cs

@@ -1,10 +1,10 @@
 using System.Collections.ObjectModel;
 using System.Text.Json;
-using View_by_Distance.Metadata.Models.Stateless;
-using View_by_Distance.Shared.Models;
-using View_by_Distance.Shared.Models.Stateless;
+using Phares.Metadata.Models.Stateless;
+using Phares.Shared.Models;
+using Phares.Shared.Models.Stateless;
 
-namespace View_by_Distance.Metadata.Models;
+namespace Phares.Metadata.Models;
 
 public class A_Metadata
 {
@@ -36,45 +36,8 @@ public class A_Metadata
             }
         }
         _ResultSingletonFileGroups = new(results);
-    }
-
-    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);
+        ReadOnlyCollection<string> directories = new([Path.Combine(aResultsFullGroupDirectory, resultSettings.ResultSingleton)]);
+        IPath.CreateDirectories(directories);
     }
 
     public (MinimumYearAndPathCombined, ExifDirectory) GetMetadataCollection(ResultSettings resultSettings, MetadataSettings metadataSettings, FilePath filePath)
@@ -148,19 +111,45 @@ public class A_Metadata
         return new(minimumYearAndPathCombined, result);
     }
 
-    private static Stream GetStream(HttpClient httpClient, FilePath filePath)
+    private MinimumYearAndPathCombined GetMinimumYearAndPathCombined(ResultSettings resultSettings, 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;
+        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;
@@ -178,4 +167,17 @@ public class A_Metadata
         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,30 +103,49 @@ internal static class Dimensions
 
     internal static Size? GetDimensions(BinaryReader binaryReader)
     {
-        int maxMagicBytesLength = _ImageFormatDecoders.Keys.OrderByDescending(x => x.Length).First().Length;
-        byte[] magicBytes = new byte[maxMagicBytesLength];
-        for (int i = 0; i < maxMagicBytesLength; i += 1)
+        Size? result;
+        List<byte> magicBytes = [];
+        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();
-            foreach (KeyValuePair<byte[], Func<BinaryReader, Size?>> kvPair in _ImageFormatDecoders)
+            result = null;
+            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))
-                    return kvPair.Value(binaryReader);
+                magicBytes.Add(binaryReader.ReadByte());
+                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));
-        return GetDimensions(binaryReader);
+        Size? result;
+        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);
-        return GetDimensions(binaryReader);
+        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 = [];
-        Shared.Models.AviDirectory aviDirectory;
+        List<AviDirectory> results = [];
+        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 = [];
-        Shared.Models.ExifDirectoryBase exifDirectoryBase;
-        IEnumerable<ExifDirectoryBase> exifBaseDirectories = directories.OfType<ExifDirectoryBase>();
-        foreach (ExifDirectoryBase e in exifBaseDirectories)
+        List<ExifDirectoryBase> results = [];
+        ExifDirectoryBase exifDirectoryBase;
+        IEnumerable<MetadataExtractor.Formats.Exif.ExifDirectoryBase> exifBaseDirectories = directories.OfType<MetadataExtractor.Formats.Exif.ExifDirectoryBase>();
+        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? applicationNotes = e.GetDescription(ExifDirectoryBase.TagApplicationNotes);
-            string? artist = e.GetDescription(ExifDirectoryBase.TagArtist);
-            string? bitsPerSample = e.GetDescription(ExifDirectoryBase.TagBitsPerSample);
-            string? bodySerialNumber = e.GetDescription(ExifDirectoryBase.TagBodySerialNumber);
-            string? cameraOwnerName = e.GetDescription(ExifDirectoryBase.TagCameraOwnerName);
-            string? compressedAverageBitsPerPixel = e.GetDescription(ExifDirectoryBase.TagCompressedAverageBitsPerPixel);
-            string? compression = e.GetDescription(ExifDirectoryBase.TagCompression);
-            string? copyright = e.GetDescription(ExifDirectoryBase.TagCopyright);
-            string? documentName = e.GetDescription(ExifDirectoryBase.TagDocumentName);
-            string? exifVersion = e.GetDescription(ExifDirectoryBase.TagExifVersion);
-            string? exposureTime = e.GetDescription(ExifDirectoryBase.TagExposureTime);
-            string? fileSource = e.GetDescription(ExifDirectoryBase.TagFileSource);
-            string? imageDescription = e.GetDescription(ExifDirectoryBase.TagImageDescription);
-            string? imageHeight = e.GetDescription(ExifDirectoryBase.TagImageHeight);
-            string? imageNumber = e.GetDescription(ExifDirectoryBase.TagImageNumber);
-            string? imageUniqueId = e.GetDescription(ExifDirectoryBase.TagImageUniqueId);
-            string? imageWidth = e.GetDescription(ExifDirectoryBase.TagImageWidth);
-            string? isoSpeed = e.GetDescription(ExifDirectoryBase.TagIsoSpeed);
-            string? lensMake = e.GetDescription(ExifDirectoryBase.TagLensMake);
-            string? lensModel = e.GetDescription(ExifDirectoryBase.TagLensModel);
-            string? lensSerialNumber = e.GetDescription(ExifDirectoryBase.TagLensSerialNumber);
-            string? make = e.GetDescription(ExifDirectoryBase.TagMake);
-            string? makerNote = e.GetDescription(ExifDirectoryBase.TagMakernote);
-            string? model = e.GetDescription(ExifDirectoryBase.TagModel);
-            string? orientation = e.GetDescription(ExifDirectoryBase.TagOrientation);
-            int? orientationValue = orientation is null ? null : e.GetInt32(ExifDirectoryBase.TagOrientation);
-            string? rating = e.GetDescription(ExifDirectoryBase.TagRating);
-            string? ratingPercent = e.GetDescription(ExifDirectoryBase.TagRatingPercent);
-            string? securityClassification = e.GetDescription(ExifDirectoryBase.TagSecurityClassification);
-            string? shutterSpeed = e.GetDescription(ExifDirectoryBase.TagShutterSpeed);
-            string? software = e.GetDescription(ExifDirectoryBase.TagSoftware);
-            string? timeZone = e.GetDescription(ExifDirectoryBase.TagTimeZone);
-            string? timeZoneDigitized = e.GetDescription(ExifDirectoryBase.TagTimeZoneDigitized);
-            string? timeZoneOriginal = e.GetDescription(ExifDirectoryBase.TagTimeZoneOriginal);
-            string? userComment = e.GetDescription(ExifDirectoryBase.TagUserComment);
-            string? winAuthor = e.GetDescription(ExifDirectoryBase.TagWinAuthor);
-            string? winComment = e.GetDescription(ExifDirectoryBase.TagWinComment);
-            string? winKeywords = e.GetDescription(ExifDirectoryBase.TagWinKeywords);
-            string? winSubject = e.GetDescription(ExifDirectoryBase.TagWinSubject);
-            string? winTitle = e.GetDescription(ExifDirectoryBase.TagWinTitle);
-            string? xResolution = e.GetDescription(ExifDirectoryBase.TagXResolution);
-            string? yResolution = e.GetDescription(ExifDirectoryBase.TagYResolution);
-            if (e.TryGetDateTime(ExifDirectoryBase.TagDateTime, out checkDateTime))
+            string? aperture = e.GetDescription(MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagAperture);
+            string? applicationNotes = e.GetDescription(MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagApplicationNotes);
+            string? artist = e.GetDescription(MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagArtist);
+            string? bitsPerSample = e.GetDescription(MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagBitsPerSample);
+            string? bodySerialNumber = e.GetDescription(MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagBodySerialNumber);
+            string? cameraOwnerName = e.GetDescription(MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagCameraOwnerName);
+            string? compressedAverageBitsPerPixel = e.GetDescription(MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagCompressedAverageBitsPerPixel);
+            string? compression = e.GetDescription(MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagCompression);
+            string? copyright = e.GetDescription(MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagCopyright);
+            string? documentName = e.GetDescription(MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagDocumentName);
+            string? exifVersion = e.GetDescription(MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagExifVersion);
+            string? exposureTime = e.GetDescription(MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagExposureTime);
+            string? fileSource = e.GetDescription(MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagFileSource);
+            string? imageDescription = e.GetDescription(MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagImageDescription);
+            string? imageHeight = e.GetDescription(MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagImageHeight);
+            int? imageHeightValue = imageHeight is null ? null : e.GetInt32(MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagImageHeight);
+            string? imageNumber = e.GetDescription(MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagImageNumber);
+            string? imageUniqueId = e.GetDescription(MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagImageUniqueId);
+            string? imageWidth = e.GetDescription(MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagImageWidth);
+            int? imageWidthValue = imageWidth is null ? null : e.GetInt32(MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagImageWidth);
+            string? isoSpeed = e.GetDescription(MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagIsoSpeed);
+            string? lensMake = e.GetDescription(MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagLensMake);
+            string? lensModel = e.GetDescription(MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagLensModel);
+            string? lensSerialNumber = e.GetDescription(MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagLensSerialNumber);
+            string? make = e.GetDescription(MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagMake);
+            string? makerNote = e.GetDescription(MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagMakernote);
+            string? model = e.GetDescription(MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagModel);
+            string? orientation = e.GetDescription(MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagOrientation);
+            int? orientationValue = orientation is null ? null : e.GetInt32(MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagOrientation);
+            string? rating = e.GetDescription(MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagRating);
+            string? ratingPercent = e.GetDescription(MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagRatingPercent);
+            string? securityClassification = e.GetDescription(MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagSecurityClassification);
+            string? shutterSpeed = e.GetDescription(MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagShutterSpeed);
+            string? software = e.GetDescription(MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagSoftware);
+            string? timeZone = e.GetDescription(MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagTimeZone);
+            string? timeZoneDigitized = e.GetDescription(MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagTimeZoneDigitized);
+            string? timeZoneOriginal = e.GetDescription(MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagTimeZoneOriginal);
+            string? userComment = e.GetDescription(MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagUserComment);
+            string? winAuthor = e.GetDescription(MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagWinAuthor);
+            string? winComment = e.GetDescription(MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagWinComment);
+            string? winKeywords = e.GetDescription(MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagWinKeywords);
+            string? winSubject = e.GetDescription(MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagWinSubject);
+            string? winTitle = e.GetDescription(MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagWinTitle);
+            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));
-            if (e.TryGetDateTime(ExifDirectoryBase.TagDateTimeOriginal, out checkDateTime))
+                dateTime = GetDateTime(e.GetString(MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagDateTime));
+            if (e.TryGetDateTime(MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagDateTimeOriginal, out checkDateTime))
                 dateTimeOriginal = checkDateTime;
             else
-                dateTimeOriginal = GetDateTime(e.GetString(ExifDirectoryBase.TagDateTimeOriginal));
-            if (e.TryGetDateTime(ExifDirectoryBase.TagDateTimeDigitized, out checkDateTime))
+                dateTimeOriginal = GetDateTime(e.GetString(MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagDateTimeOriginal));
+            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,
-                                    applicationNotes,
-                                    artist,
-                                    bitsPerSample,
-                                    bodySerialNumber,
-                                    cameraOwnerName,
-                                    compressedAverageBitsPerPixel,
-                                    compression,
-                                    copyright,
-                                    dateTime,
-                                    dateTimeDigitized,
-                                    dateTimeOriginal,
-                                    documentName,
-                                    exifVersion,
-                                    exposureTime,
-                                    fileSource,
-                                    imageDescription,
-                                    imageHeight,
-                                    imageNumber,
-                                    imageUniqueId,
-                                    imageWidth,
-                                    isoSpeed,
-                                    lensMake,
-                                    lensModel,
-                                    lensSerialNumber,
-                                    make,
-                                    makerNote,
-                                    model,
-                                    orientation,
-                                    orientationValue,
-                                    rating,
-                                    ratingPercent,
-                                    securityClassification,
-                                    shutterSpeed,
-                                    software,
-                                    timeZone,
-                                    timeZoneDigitized,
-                                    timeZoneOriginal,
-                                    userComment,
-                                    winAuthor,
-                                    winComment,
-                                    winKeywords,
-                                    winSubject,
-                                    winTitle,
-                                    xResolution,
-                                    yResolution);
+            exifDirectoryBase = new(Aperture: aperture,
+                        ApplicationNotes: applicationNotes,
+                        Artist: artist,
+                        BitsPerSample: bitsPerSample,
+                        BodySerialNumber: bodySerialNumber,
+                        CameraOwnerName: cameraOwnerName,
+                        CompressedAverageBitsPerPixel: compressedAverageBitsPerPixel,
+                        Compression: compression,
+                        Copyright: copyright,
+                        DateTime: dateTime,
+                        DateTimeDigitized: dateTimeDigitized,
+                        DateTimeOriginal: dateTimeOriginal,
+                        DocumentName: documentName,
+                        ExifVersion: exifVersion,
+                        ExposureTime: exposureTime,
+                        FileSource: fileSource,
+                        ImageDescription: imageDescription,
+                        ImageHeight: imageHeight,
+                        ImageHeightValue: imageHeightValue,
+                        ImageNumber: imageNumber,
+                        ImageUniqueId: imageUniqueId,
+                        ImageWidth: imageWidth,
+                        ImageWidthValue: imageWidthValue,
+                        IsoSpeed: isoSpeed,
+                        LensMake: lensMake,
+                        LensModel: lensModel,
+                        LensSerialNumber: lensSerialNumber,
+                        Make: make,
+                        MakerNote: makerNote,
+                        Model: model,
+                        Orientation: orientation,
+                        OrientationValue: orientationValue,
+                        Rating: rating,
+                        RatingPercent: ratingPercent,
+                        SecurityClassification: securityClassification,
+                        ShutterSpeed: shutterSpeed,
+                        Software: software,
+                        TimeZone: timeZone,
+                        TimeZoneDigitized: timeZoneDigitized,
+                        TimeZoneOriginal: timeZoneOriginal,
+                        UserComment: userComment,
+                        WinAuthor: winAuthor,
+                        WinComment: winComment,
+                        WinKeywords: winKeywords,
+                        WinSubject: winSubject,
+                        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 = [];
-        Shared.Models.FileMetadataDirectory fileMetadataDirectory;
+        List<FileMetadataDirectory> results = [];
+        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 = [];
-        Shared.Models.GifHeaderDirectory gifHeaderDirectory;
+        List<GifHeaderDirectory> results = [];
+        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 = [];
-        Shared.Models.GpsDirectory gpsDirectory;
-        IEnumerable<GpsDirectory> gpsDirectories = directories.OfType<GpsDirectory>();
-        foreach (GpsDirectory g in gpsDirectories)
+        List<GpsDirectory> results = [];
+        GpsDirectory gpsDirectory;
+        IEnumerable<MetadataExtractor.Formats.Exif.GpsDirectory> gpsDirectories = directories.OfType<MetadataExtractor.Formats.Exif.GpsDirectory>();
+        foreach (MetadataExtractor.Formats.Exif.GpsDirectory g in gpsDirectories)
         {
             if (g.Tags.Count == 0)
                 continue;
             DateTime? timeStamp;
-            string? altitude = g.GetDescription(GpsDirectory.TagAltitude);
-            string? latitude = g.GetDescription(GpsDirectory.TagLatitude);
-            string? latitudeRef = g.GetDescription(GpsDirectory.TagLatitudeRef);
-            string? longitude = g.GetDescription(GpsDirectory.TagLongitude);
-            string? longitudeRef = g.GetDescription(GpsDirectory.TagLongitudeRef);
-            if (g.TryGetDateTime(GpsDirectory.TagTimeStamp, out DateTime checkDateTime))
+            string? altitude = g.GetDescription(MetadataExtractor.Formats.Exif.GpsDirectory.TagAltitude);
+            string? latitude = g.GetDescription(MetadataExtractor.Formats.Exif.GpsDirectory.TagLatitude);
+            string? latitudeRef = g.GetDescription(MetadataExtractor.Formats.Exif.GpsDirectory.TagLatitudeRef);
+            string? longitude = g.GetDescription(MetadataExtractor.Formats.Exif.GpsDirectory.TagLongitude);
+            string? longitudeRef = g.GetDescription(MetadataExtractor.Formats.Exif.GpsDirectory.TagLongitudeRef);
+            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,
-                               latitude,
-                               latitudeRef,
-                               longitude,
-                               longitudeRef,
-                               timeStamp);
+            gpsDirectory = new(Altitude: altitude,
+                               Latitude: latitude,
+                               LatitudeRef: latitudeRef,
+                               Longitude: longitude,
+                               LongitudeRef: longitudeRef,
+                               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 = [];
-        Shared.Models.JpegDirectory jpegDirectory;
+        List<JpegDirectory> results = [];
+        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 = [];
-        Shared.Models.MakernoteDirectory makernoteDirectory;
+        List<MakernoteDirectory> results = [];
+        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 = [];
-        Shared.Models.PhotoshopDirectory photoshopDirectory;
+        List<PhotoshopDirectory> results = [];
+        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 = [];
-        Shared.Models.PngDirectory pngDirectory;
+        List<PngDirectory> results = [];
+        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 = [];
-        Shared.Models.QuickTimeMovieHeaderDirectory quickTimeMovieHeaderDirectory;
+        List<QuickTimeMovieHeaderDirectory> results = [];
+        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 = [];
-        Shared.Models.QuickTimeTrackHeaderDirectory quickTimeTrackHeaderDirectory;
+        List<QuickTimeTrackHeaderDirectory> results = [];
+        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 = [];
-        Shared.Models.WebPDirectory webPDirectory;
+        List<WebPDirectory> results = [];
+        WebPDirectory webPDirectory;
         IEnumerable<MetadataExtractor.Formats.WebP.WebPDirectory> webPDirectories = directories.OfType<MetadataExtractor.Formats.WebP.WebPDirectory>();
         foreach (MetadataExtractor.Formats.WebP.WebPDirectory w in webPDirectories)
         {
@@ -507,63 +512,68 @@ 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, IReadOnlyList<MetadataExtractor.Directory> directories, System.Drawing.Size? size)
+    private static ExifDirectory Covert(FilePath filePath, PersonKeyFormattedAndKeyTicksAndDisplayDirectoryName? personKeyFormattedAndKeyTicksAndDisplayDirectoryName, IReadOnlyList<MetadataExtractor.Directory> directories, System.Drawing.Size? size)
     {
-        Shared.Models.ExifDirectory result;
-        Shared.Models.AviDirectory[] aviDirectories = GetAviDirectories(directories);
-        Shared.Models.GpsDirectory[] gpsDirectories = GetGpsDirectories(directories);
-        Shared.Models.PngDirectory[] pngDirectories = GetPngDirectories(directories);
-        Shared.Models.JpegDirectory[] jpegDirectories = GetJpegDirectories(directories);
-        Shared.Models.WebPDirectory[] webPDirectories = GetWebPDirectories(directories);
-        Shared.Models.ExifDirectoryBase[] exifBaseDirectories = GetExifBaseDirectories(directories);
-        Shared.Models.GifHeaderDirectory[] gifHeaderDirectories = GetGifHeaderDirectories(directories);
-        Shared.Models.MakernoteDirectory[] MakernoteDirectories = GetMakernoteDirectories(directories);
-        Shared.Models.PhotoshopDirectory[] photoshopDirectories = GetPhotoshopDirectories(directories);
-        Shared.Models.FileMetadataDirectory[] fileMetadataDirectories = GetFileMetadataDirectories(filePath.FullName, directories);
-        Shared.Models.QuickTimeMovieHeaderDirectory[] quickTimeMovieHeaderDirectories = GetQuickTimeMovieHeaderDirectoryDirectories(directories);
-        Shared.Models.QuickTimeTrackHeaderDirectory[] quickTimeTrackHeaderDirectories = GetQuickTimeTrackHeaderDirectoryDirectories(directories);
-        result = new(aviDirectories,
-                     null,
-                     exifBaseDirectories,
-                     fileMetadataDirectories,
-                     filePath,
-                     gifHeaderDirectories,
-                     gpsDirectories,
-                     size?.Height,
-                     jpegDirectories,
-                     MakernoteDirectories,
-                     personKeyFormattedAndKeyTicksAndDisplayDirectoryName,
-                     photoshopDirectories,
-                     pngDirectories,
-                     quickTimeMovieHeaderDirectories,
-                     quickTimeTrackHeaderDirectories,
-                     webPDirectories,
-                     size?.Width);
+        ExifDirectory result;
+        AviDirectory[] aviDirectories = GetAviDirectories(directories);
+        GpsDirectory[] gpsDirectories = GetGpsDirectories(directories);
+        PngDirectory[] pngDirectories = GetPngDirectories(directories);
+        JpegDirectory[] jpegDirectories = GetJpegDirectories(directories);
+        WebPDirectory[] webPDirectories = GetWebPDirectories(directories);
+        ExifDirectoryBase[] exifBaseDirectories = GetExifBaseDirectories(directories);
+        GifHeaderDirectory[] gifHeaderDirectories = GetGifHeaderDirectories(directories);
+        MakernoteDirectory[] makernoteDirectories = GetMakernoteDirectories(directories);
+        PhotoshopDirectory[] photoshopDirectories = GetPhotoshopDirectories(directories);
+        FileMetadataDirectory[] fileMetadataDirectories = GetFileMetadataDirectories(filePath.FullName, directories);
+        QuickTimeMovieHeaderDirectory[] quickTimeMovieHeaderDirectories = GetQuickTimeMovieHeaderDirectoryDirectories(directories);
+        QuickTimeTrackHeaderDirectory[] quickTimeTrackHeaderDirectories = GetQuickTimeTrackHeaderDirectoryDirectories(directories);
+        result = new(AviDirectories: aviDirectories,
+                     ExifBaseDirectories: exifBaseDirectories,
+                     FileMetadataDirectories: fileMetadataDirectories,
+                     FilePath: filePath,
+                     GifHeaderDirectories: gifHeaderDirectories,
+                     GpsDirectories: gpsDirectories,
+                     Height: size?.Height ?? IMetaBase.GetHeight(exifBaseDirectories),
+                     JpegDirectories: jpegDirectories,
+                     MakernoteDirectories: makernoteDirectories,
+                     PersonKeyFormattedAndKeyTicksAndDisplayDirectoryName: personKeyFormattedAndKeyTicksAndDisplayDirectoryName,
+                     PhotoshopDirectories: photoshopDirectories,
+                     PngDirectories: pngDirectories,
+                     QuickTimeMovieHeaderDirectories: quickTimeMovieHeaderDirectories,
+                     QuickTimeTrackHeaderDirectories: quickTimeTrackHeaderDirectories,
+                     WebPDirectories: webPDirectories,
+                     Width: size?.Width ?? IMetaBase.GetWidth(exifBaseDirectories));
         return result;
     }
 
-    internal static Shared.Models.ExifDirectory GetExifDirectory(Shared.Models.FilePath filePath, Stream stream, 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;
-        if (!stream.CanSeek)
-            size = null;
-        else
-        {
-            try
-            { size = Dimensions.GetDimensions(stream); }
-            catch (Exception)
-            { size = null; }
-        }
+        try
+        { size = Dimensions.GetDimensions(stream); }
+        catch (Exception)
+        { size = null; }
         result = Covert(filePath, personKeyFormattedAndKeyTicksAndDisplayDirectoryName, directories, size);
         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 View_by_Distance.Shared.Models;
+using Phares.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 View_by_Distance.Shared.Models.Properties;
-using View_by_Distance.Shared.Models.Stateless;
+using Phares.Shared.Models;
+using Phares.Shared.Models.Properties;
+using Phares.Shared.Models.Stateless;
 
-namespace View_by_Distance.Metadata.Models.Stateless;
+namespace Phares.Metadata.Models.Stateless;
 
 internal static class Get
 {

Metadata/Models/Stateless/IMetadata.cs

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

@@ -10,7 +10,7 @@
     <HoursSinceNovember122024>$([System.Math]::Floor($([MSBuild]::Divide($([MSBuild]::Subtract($([System.DateTimeOffset]::UtcNow.ToUnixTimeSeconds()), 1731369600)), 3600))))</HoursSinceNovember122024>
   </PropertyGroup>
   <PropertyGroup>
-    <PackageId>Phares.AA.People</PackageId>
+    <PackageId>Phares.People</PackageId>
     <Version>9.0.104.$([System.Math]::Floor($([MSBuild]::Divide($([MSBuild]::Subtract($([System.DateTimeOffset]::UtcNow.ToUnixTimeSeconds()), 1731369600)), 3600))))</Version>
     <Company>Phares</Company>
     <Authors>Mike Phares</Authors>

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 View_by_Distance.Shared.Models.Properties;
+using Phares.Shared.Models;
+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 View_by_Distance.Shared.Models;
-using View_by_Distance.Shared.Models.Properties;
-using View_by_Distance.Shared.Models.Stateless;
+using Phares.Metadata.Models;
+using Phares.Shared.Models;
+using Phares.Shared.Models.Properties;
+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 View_by_Distance.Shared.Models;
-using View_by_Distance.Shared.Models.Properties;
-using View_by_Distance.Shared.Models.Stateless;
+using Phares.Metadata.Models;
+using Phares.Shared.Models;
+using Phares.Shared.Models.Properties;
+using Phares.Shared.Models.Stateless;
 
 namespace View_by_Distance.People.Models.Stateless;
 

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;
 
@@ -19,7 +20,9 @@ public record RenameSettings(string Company,
                              string RelativePropertyCollectionFile,
                              bool RequireRootDirectoryExists,
                              string[] SidecarExtensions,
-                             bool SkipIdFiles) : Shared.Models.Properties.IRenameSettings
+                             bool SkipIdFiles,
+                             int ValidationImageDeterministicHashCodeId,
+                             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)

Rename/Rename.cs

@@ -1,5 +1,9 @@
 using CliWrap;
 using Microsoft.Extensions.Logging;
+using Phares.Metadata.Models;
+using Phares.Metadata.Models.Stateless;
+using Phares.Shared.Models;
+using Phares.Shared.Models.Stateless;
 using ShellProgressBar;
 using System.Collections.ObjectModel;
 using System.Data;
@@ -7,17 +11,16 @@ using System.Drawing;
 using System.Drawing.Imaging;
 using System.Runtime.InteropServices;
 using System.Text.Json;
-using View_by_Distance.Metadata.Models;
-using View_by_Distance.Metadata.Models.Stateless;
 using View_by_Distance.Rename.Models;
-using View_by_Distance.Shared.Models;
-using View_by_Distance.Shared.Models.Stateless;
 
 namespace View_by_Distance.Rename;
 
 public partial class Rename : IRename, IDisposable
 {
 
+    public long Ticks { get; init; }
+    public int? CurrentTick => _ProgressBar?.CurrentTick;
+
     private sealed record ToDo(string? Directory,
                                FileInfo FileInfo,
                                string File,
@@ -124,23 +127,58 @@ public partial class Rename : IRename, IDisposable
         if (console is null)
             throw new NullReferenceException(nameof(console));
         IRename rename = this;
-        long ticks = DateTime.Now.Ticks;
+        LogNetToHoursSince(logger);
+        Ticks = DateTime.Now.Ticks;
         _ProgressBarOptions = new() { ProgressCharacter = '─', ProgressBarOnBottom = true, DisableBottomPercentage = true };
-        RenameWork(logger, appSettings, rename, ticks);
+        Verify(logger, appSettings, rename);
+        RenameWork(logger, appSettings, rename);
     }
 
-    private void RenameWork(ILogger<Program>? logger, AppSettings appSettings, IRename rename, long ticks)
+    private static void Verify(ILogger<Program>? logger, AppSettings appSettings, IRename rename)
+    {
+        FileHolder fileHolder = FileHolder.Get(appSettings.RenameSettings.ValidationImageFile);
+        FilePath filePath = FilePath.Get(appSettings.ResultSettings, appSettings.MetadataSettings, fileHolder, index: null);
+        DeterministicHashCode deterministicHashCode = rename.GetDeterministicHashCode(filePath);
+        if (deterministicHashCode.Id is null)
+            throw new NullReferenceException(nameof(deterministicHashCode));
+        if (deterministicHashCode.Id.Value != appSettings.RenameSettings.ValidationImageDeterministicHashCodeId)
+            throw new Exception("Deterministic hash code id is incorrect!");
+        logger?.LogDebug("Validated deterministic hash code id");
+    }
+
+    private static void LogNetToHoursSince(ILogger<Program>? logger)
+    {
+        double secondsInAHour = 3600f;
+        long epoch = new DateTime(1970, 1, 1).Ticks;
+        long net8ReleaseDate = new DateTime(2023, 11, 14).Ticks;
+        long net9ReleaseDate = new DateTime(2024, 11, 12).Ticks;
+        long net10ReleaseDate = new DateTime(2026, 01, 01).Ticks;
+        double net8TotalSeconds = new TimeSpan(net8ReleaseDate - epoch).TotalSeconds;
+        double net9TotalSeconds = new TimeSpan(net9ReleaseDate - epoch).TotalSeconds;
+        double net10TotalSeconds = new TimeSpan(net10ReleaseDate - epoch).TotalSeconds;
+        logger?.LogInformation("It has been {net8TotalSeconds} seconds since net8 was released", net8TotalSeconds);
+        logger?.LogInformation("It has been {net9TotalSeconds} seconds since net9 was released", net9TotalSeconds);
+        logger?.LogInformation("It has been {net10TotalSeconds} seconds since net10 was released", net10TotalSeconds);
+        double net8TotalHours = Math.Floor((DateTimeOffset.UtcNow.ToUnixTimeSeconds() - net8TotalSeconds) / secondsInAHour);
+        double net9TotalHours = Math.Floor((DateTimeOffset.UtcNow.ToUnixTimeSeconds() - net9TotalSeconds) / secondsInAHour);
+        double net10TotalHours = Math.Floor((DateTimeOffset.UtcNow.ToUnixTimeSeconds() - net10TotalSeconds) / secondsInAHour);
+        logger?.LogInformation("It has been {net8TotalHours} hours since net8 was released", net8TotalHours);
+        logger?.LogInformation("It has been {net9TotalHours} hours since net9 was released", net9TotalHours);
+        logger?.LogInformation("It has been {net10TotalHours} hours since net10 was released", net10TotalHours);
+    }
+
+    private void RenameWork(ILogger<Program>? logger, AppSettings appSettings, IRename rename)
     {
         ReadOnlyCollection<int> ids = GetIds(appSettings.RenameSettings);
         string sourceDirectory = Path.GetFullPath(appSettings.ResultSettings.RootDirectory);
         if (!Directory.Exists(sourceDirectory))
             _ = Directory.CreateDirectory(sourceDirectory);
-        logger?.LogInformation("{Ticks} {RootDirectory}", ticks, sourceDirectory);
+        logger?.LogInformation("{Ticks} {RootDirectory}", rename.Ticks, sourceDirectory);
         ReadOnlyCollection<string> files = Directory.GetFiles(sourceDirectory, "*", SearchOption.AllDirectories).ToArray().AsReadOnly();
         if (files.Count > 0)
             _ = IPath.DeleteEmptyDirectories(appSettings.ResultSettings.RootDirectory);
-        ReadOnlyCollection<Record> recordCollection = GetRecordCollection(logger, appSettings, rename, ticks, ids, sourceDirectory, files);
-        SaveIdentifiersToDisk(ticks, appSettings, recordCollection);
+        ReadOnlyCollection<Record> recordCollection = GetRecordCollection(logger, appSettings, rename, ids, sourceDirectory, files);
+        SaveIdentifiersToDisk(appSettings, rename, recordCollection);
         if (appSettings.RenameSettings.InPlace || appSettings.RenameSettings.InPlaceWithOriginalName)
         {
             if (recordCollection.Count > 0)
@@ -173,13 +211,13 @@ public partial class Rename : IRename, IDisposable
         return results;
     }
 
-    private ReadOnlyCollection<Record> GetRecordCollection(ILogger<Program>? logger, AppSettings appSettings, IRename rename, long ticks, ReadOnlyCollection<int> ids, string sourceDirectory, ReadOnlyCollection<string> files)
+    private ReadOnlyCollection<Record> GetRecordCollection(ILogger<Program>? logger, AppSettings appSettings, IRename rename, ReadOnlyCollection<int> ids, string sourceDirectory, ReadOnlyCollection<string> files)
     {
         ReadOnlyCollection<Record> results;
         List<FirstPass> collection;
         string? checkFile = string.IsNullOrEmpty(appSettings.RenameSettings.FirstPassFile) ? null : Path.Combine(sourceDirectory, appSettings.RenameSettings.FirstPassFile);
         if (string.IsNullOrEmpty(checkFile) || !File.Exists(checkFile))
-            collection = GetRecordCollection(logger, appSettings, rename, ticks, ids, sourceDirectory, files, checkFile);
+            collection = GetRecordCollection(logger, appSettings, rename, ids, sourceDirectory, files, checkFile);
         else
         {
             string json = File.ReadAllText(checkFile);
@@ -192,7 +230,7 @@ public partial class Rename : IRename, IDisposable
         return results;
     }
 
-    private List<FirstPass> GetRecordCollection(ILogger<Program>? logger, AppSettings appSettings, IRename rename, long ticks, ReadOnlyCollection<int> ids, string sourceDirectory, ReadOnlyCollection<string> files, string? checkFile)
+    private List<FirstPass> GetRecordCollection(ILogger<Program>? logger, AppSettings appSettings, IRename rename, ReadOnlyCollection<int> ids, string sourceDirectory, ReadOnlyCollection<string> files, string? checkFile)
     {
         List<FirstPass> results;
         FirstPass firstPass;
@@ -203,7 +241,7 @@ public partial class Rename : IRename, IDisposable
         if (appSettingsMaxDegreeOfParallelism == 1)
         {
             ReadOnlyDictionary<string, List<FileHolder>> keyValuePairs = IMetadata.GetKeyValuePairs(files);
-            results = GetFirstPassCollection(logger, appSettings, rename, ticks, ids, metadata, keyValuePairs);
+            results = GetFirstPassCollection(logger, appSettings, rename, ids, metadata, keyValuePairs);
         }
         else
         {
@@ -225,13 +263,13 @@ public partial class Rename : IRename, IDisposable
         if (!string.IsNullOrEmpty(checkFile))
         {
             string json = JsonSerializer.Serialize(results, FirstPassCollectionSourceGenerationContext.Default.ListFirstPass);
-            File.WriteAllText(Path.Combine(sourceDirectory, $"{ticks}.json"), json);
+            File.WriteAllText(Path.Combine(sourceDirectory, $"{rename.Ticks}.json"), json);
         }
 
         return results;
     }
 
-    private List<FirstPass> GetFirstPassCollection(ILogger<Program>? logger, AppSettings appSettings, IRename rename, long ticks, ReadOnlyCollection<int> ids, A_Metadata metadata, ReadOnlyDictionary<string, List<FileHolder>> keyValuePairs)
+    private List<FirstPass> GetFirstPassCollection(ILogger<Program>? logger, AppSettings appSettings, IRename rename, ReadOnlyCollection<int> ids, A_Metadata metadata, ReadOnlyDictionary<string, List<FileHolder>> keyValuePairs)
     {
         List<FirstPass> results = [];
         int index = -1;
@@ -249,7 +287,7 @@ public partial class Rename : IRename, IDisposable
             if (keyValuePair.Value.Count > 2)
                 throw new NotSupportedException("Too many sidecar files!");
             SetFirstPassCollection(logger, appSettings, rename, ids, metadata, index, keyValuePair, results);
-            timeSpan = new(DateTime.Now.Ticks - ticks);
+            timeSpan = new(DateTime.Now.Ticks - rename.Ticks);
             if (timeSpan.TotalMilliseconds > appSettings.RenameSettings.MaxMilliSecondsPerCall)
                 break;
         }
@@ -361,11 +399,11 @@ public partial class Rename : IRename, IDisposable
         const string jpeg = ".jpeg";
         List<ToDo> toDoCollection = [];
         DateTime? dateTime = IDate.GetDateTimeOriginal(exifDirectory);
-        ReadOnlyCollection<string> keywords = IMetadata.GetKeywords(exifDirectory);
+        ReadOnlyCollection<string> keywords = IMetaBase.GetKeywords(exifDirectory);
         bool hasIgnoreKeyword = appSettings.MetadataSettings.IgnoreRulesKeyWords.Any(keywords.Contains);
         string checkFileExtension = exifDirectory.FilePath.ExtensionLowered == jpeg ? jpg : exifDirectory.FilePath.ExtensionLowered;
         bool hasDateTimeOriginal = dateTime is not null;
-        string paddedId = IId.GetPaddedId(appSettings.ResultSettings, appSettings.MetadataSettings, exifDirectory.FilePath.Id.Value, hasIgnoreKeyword, hasDateTimeOriginal, i);
+        string paddedId = IId.GetPaddedId(appSettings.ResultSettings, appSettings.MetadataSettings, exifDirectory.FilePath, hasIgnoreKeyword, hasDateTimeOriginal, i);
         string checkDirectory = appSettings.RenameSettings.InPlaceWithOriginalName ? Path.Combine(exifDirectory.FilePath.DirectoryFullPath, exifDirectory.FilePath.FileNameFirstSegment) : exifDirectory.FilePath.DirectoryFullPath;
         string checkFile = Path.Combine(checkDirectory, $"{paddedId}{checkFileExtension}");
         if (checkFile != exifDirectory.FilePath.FullName)
@@ -421,7 +459,7 @@ public partial class Rename : IRename, IDisposable
             dateTime = IDate.GetDateTimeOriginal(firstPass.ExifDirectory);
             hasDateTimeOriginal = dateTime is not null;
             dateTime ??= IDate.GetMinimum(firstPass.ExifDirectory);
-            keywords = IMetadata.GetKeywords(firstPass.ExifDirectory);
+            keywords = IMetaBase.GetKeywords(firstPass.ExifDirectory);
             hasIgnoreKeyword = appSettings.MetadataSettings.IgnoreRulesKeyWords.Any(l => keywords.Contains(l));
             record = new(DateTime: dateTime.Value,
                          ExifDirectory: firstPass.ExifDirectory,
@@ -435,7 +473,7 @@ public partial class Rename : IRename, IDisposable
         return results.AsReadOnly();
     }
 
-    private static void SaveIdentifiersToDisk(long ticks, AppSettings appSettings, ReadOnlyCollection<Record> recordCollection)
+    private static void SaveIdentifiersToDisk(AppSettings appSettings, IRename rename, ReadOnlyCollection<Record> recordCollection)
     {
         string paddedId;
         Identifier identifier;
@@ -445,12 +483,12 @@ public partial class Rename : IRename, IDisposable
         {
             if (record.ExifDirectory.FilePath.Id is null)
                 continue;
-            paddedId = IId.GetPaddedId(appSettings.ResultSettings, appSettings.MetadataSettings, record.ExifDirectory.FilePath.Id.Value, record.HasIgnoreKeyword, record.HasDateTimeOriginal, index: null);
+            paddedId = IId.GetPaddedId(appSettings.ResultSettings, appSettings.MetadataSettings, record.ExifDirectory.FilePath, record.HasIgnoreKeyword, record.HasDateTimeOriginal, index: null);
             identifier = new([], record.HasDateTimeOriginal, record.ExifDirectory.FilePath.Id.Value, record.ExifDirectory.FilePath.Length, paddedId, record.DateTime.Ticks);
             identifiers.Add(identifier);
         }
         string json = JsonSerializer.Serialize(identifiers.OrderBy(l => l.PaddedId).ToArray(), IdentifierCollectionSourceGenerationContext.Default.IdentifierArray);
-        _ = IPath.WriteAllText(Path.Combine(aMetadataCollectionDirectory, $"{ticks}.json"), json, updateDateWhenMatches: false, compareBeforeWrite: true, updateToWhenMatches: null);
+        _ = IPath.WriteAllText(Path.Combine(aMetadataCollectionDirectory, $"{rename.Ticks}.json"), json, updateDateWhenMatches: false, compareBeforeWrite: true, updateToWhenMatches: null);
     }
 
     private static ReadOnlyCollection<ToDo> GetToDoCollection(AppSettings appSettings, DirectoryInfo directoryInfo, ReadOnlyCollection<int> ids, ReadOnlyCollection<string> files, ReadOnlyCollection<Record> recordCollection)
@@ -462,15 +500,19 @@ public partial class Rename : IRename, IDisposable
         string paddedId;
         string checkFile;
         FilePath filePath;
+        DateTime? dateTime;
         FileInfo[] matches;
         FileHolder fileHolder;
+        bool? hasIgnoreKeyword;
         string? checkDirectory;
         CombinedEnumAndIndex cei;
+        bool? hasDateTimeOriginal;
         const string jpg = ".jpg";
         string checkFileExtension;
         List<string> distinct = [];
         const string jpeg = ".jpeg";
         string jsonFileSubDirectory;
+        ReadOnlyCollection<string> keywords;
         bool? directoryCheck = GetDirectoryCheck(appSettings.ResultSettings);
         VerifyIntMinValueLength(appSettings.MetadataSettings, recordCollection);
         bool multipleDirectoriesWithFiles = directoryCheck is not null && directoryCheck.Value;
@@ -481,7 +523,7 @@ public partial class Rename : IRename, IDisposable
             record = sorted[i];
             if (record.ExifDirectory.FilePath.Id is null)
                 continue;
-            paddedId = IId.GetPaddedId(appSettings.ResultSettings, appSettings.MetadataSettings, record.ExifDirectory.FilePath.Id.Value, record.HasIgnoreKeyword, record.HasDateTimeOriginal, i);
+            paddedId = IId.GetPaddedId(appSettings.ResultSettings, appSettings.MetadataSettings, record.ExifDirectory.FilePath, record.HasIgnoreKeyword, record.HasDateTimeOriginal, i);
             checkDirectory = GetCheckDirectory(appSettings, directoryInfo, record, ids, multipleDirectoriesWithFiles, paddedId);
             if (string.IsNullOrEmpty(checkDirectory))
                 continue;
@@ -496,6 +538,20 @@ public partial class Rename : IRename, IDisposable
                 if (File.Exists(checkFile))
                     continue;
             }
+            if (record.ExifDirectory.FilePath.HasDateTimeOriginal is not null && record.ExifDirectory.FilePath.HasIgnoreKeyword is not null)
+            {
+                hasIgnoreKeyword = record.ExifDirectory.FilePath.HasIgnoreKeyword;
+                hasDateTimeOriginal = record.ExifDirectory.FilePath.HasDateTimeOriginal;
+            }
+            else
+            {
+                dateTime = IDate.GetDateTimeOriginal(record.ExifDirectory);
+                hasDateTimeOriginal = dateTime is not null;
+                if (dateTime is null && appSettings.ResultSettings.ValidVideoFormatExtensions.Contains(record.ExifDirectory.FilePath.ExtensionLowered))
+                    continue;
+                keywords = IMetaBase.GetKeywords(record.ExifDirectory);
+                hasIgnoreKeyword = appSettings.MetadataSettings.IgnoreRulesKeyWords.Any(keywords.Contains);
+            }
             cei = IPath.GetCombinedEnumAndIndex(appSettings.ResultSettings, record.ExifDirectory.FilePath);
             jsonFile = Path.Combine(jsonFileSubDirectory, cei.Combined, $"{record.ExifDirectory.FilePath.Id.Value}{checkFileExtension}.json");
             if (record.JsonFile != jsonFile)
@@ -589,7 +645,7 @@ public partial class Rename : IRename, IDisposable
                     isWrongYear = null;
                 string directoryName;
                 string tfw = GetTFW(record, isWrongYear);
-                string? maker = IMetadata.GetMaker(record.ExifDirectory);
+                string? maker = IMetaBase.GetMaker(record.ExifDirectory);
                 string rootDirectory = appSettings.ResultSettings.RootDirectory;
                 string[] segments = checkDirectoryName.Split(years, StringSplitOptions.None);
                 (int seasonValue, string seasonName) = IDate.GetSeason(record.DateTime.DayOfYear);
@@ -658,7 +714,7 @@ public partial class Rename : IRename, IDisposable
         foreach (ToDo toDo in toDoCollection)
         {
             if (useProgressBar)
-                _ProgressBar?.Tick();
+                rename?.Tick();
             if (!toDo.FileInfo.Exists)
                 continue;
             if (toDo.JsonFile)
@@ -683,8 +739,6 @@ public partial class Rename : IRename, IDisposable
                 results.Add($"{toDo.FileInfo.FullName}\t{toDo.File}");
             }
         }
-        if (useProgressBar)
-            _ProgressBar?.Dispose();
         return results.AsReadOnly();
     }
 

Shared/AA.Shared.csproj

@@ -9,8 +9,8 @@
     <HoursSinceNovember142023>$([System.Math]::Floor($([MSBuild]::Divide($([MSBuild]::Subtract($([System.DateTimeOffset]::UtcNow.ToUnixTimeSeconds()), 1699920000)), 3600))))</HoursSinceNovember142023>
   </PropertyGroup>
   <PropertyGroup>
-    <PackageId>Phares.AA.Shared</PackageId>
-    <Version>8.0.114.$([System.Math]::Floor($([MSBuild]::Divide($([MSBuild]::Subtract($([System.DateTimeOffset]::UtcNow.ToUnixTimeSeconds()), 1699920000)), 3600))))</Version>
+    <PackageId>Phares.Shared</PackageId>
+    <Version>8.0.118.$([System.Math]::Floor($([MSBuild]::Divide($([MSBuild]::Subtract($([System.DateTimeOffset]::UtcNow.ToUnixTimeSeconds()), 1699920000)), 3600))))</Version>
     <Company>Phares</Company>
     <Authors>Mike Phares</Authors>
     <IncludeSymbols>true</IncludeSymbols>

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

@@ -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 CombinedEnumAndIndex(string Combined,
                                     byte Enum,

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,

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

@@ -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 FirstPass(ExifDirectory ExifDirectory,
                         bool FastForwardMovingPictureExpertsGroupUsed,

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,
-                     keepExifDirectory ? locationContainer.ExifDirectory : null,
-                     encoding,
-                     locationContainer.FaceFile,
-                     locationContainer.FilePath,
-                     locationContainer.LengthPermyriad,
-                     locationContainer.LengthSource,
-                     locationContainer.PersonKeyFormattedAndKeyTicksAndDisplayDirectoryName,
-                     locationContainer.Rectangle,
-                     locationContainer.WholePercentages);
+        result = new(CreationDateOnly: locationContainer.CreationDateOnly,
+                     ExifDirectory: locationContainer.ExifDirectory,
+                     Encoding: encoding,
+                     FaceFile: locationContainer.FaceFile,
+                     FilePath: locationContainer.FilePath,
+                     LengthPermyriad: locationContainer.LengthPermyriad,
+                     LengthSource: locationContainer.LengthSource,
+                     PersonKeyFormattedAndKeyTicksAndDisplayDirectoryName: locationContainer.PersonKeyFormattedAndKeyTicksAndDisplayDirectoryName,
+                     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,
-                     keepExifDirectory ? locationContainer.ExifDirectory : null,
-                     keepEncoding ? locationContainer.Encoding : null,
-                     locationContainer.FaceFile,
-                     locationContainer.FilePath,
-                     lengthPermyriad,
-                     source.FilePath,
-                     locationContainer.PersonKeyFormattedAndKeyTicksAndDisplayDirectoryName,
-                     locationContainer.Rectangle,
-                     locationContainer.WholePercentages);
+        result = new(CreationDateOnly: locationContainer.CreationDateOnly,
+                     ExifDirectory: keepExifDirectory ? locationContainer.ExifDirectory : null,
+                     Encoding: keepEncoding ? locationContainer.Encoding : null,
+                     FaceFile: locationContainer.FaceFile,
+                     FilePath: locationContainer.FilePath,
+                     LengthPermyriad: lengthPermyriad,
+                     LengthSource: source.FilePath,
+                     PersonKeyFormattedAndKeyTicksAndDisplayDirectoryName: locationContainer.PersonKeyFormattedAndKeyTicksAndDisplayDirectoryName,
+                     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,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 MetadataGroup(bool FastForwardMovingPictureExpertsGroupUsed, FilePath FilePath, MinimumYearAndPathCombined MinimumYearAndPathCombined, ExifDirectory ExifDirectory, ReadOnlyCollection<FileHolder> SidecarFiles)
 {

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

@@ -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 MinimumYearAndPathCombined(int MinimumYear,
                                          string PathCombined)

Shared/Models/NginxFileSystem.cs

@@ -2,7 +2,7 @@ using System.Globalization;
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-namespace View_by_Distance.Shared.Models;
+namespace Phares.Shared.Models;
 
 public record NginxFileSystem([property: JsonPropertyName("name")] string Name,
                               DateTime? LastModified,

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,

Shared/Models/PersonDirectory.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 PersonDirectory(char Char, string Group, char Status, char Sex, char First)
 {

Shared/Models/PersonKeyFormattedAndPersonBirthday.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 PersonKeyFormattedAndPersonBirthday(string PersonKeyFormatted, PersonBirthday PersonBirthday)
 {

Shared/Models/PersonKeyFormattedAndPersonKeyTicks.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 PersonKeyFormattedAndKeyTicksAndDisplayDirectoryName(string KeyFormatted,
                                                                    long KeyTicks,

Shared/Models/PhotoshopDirectory.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 PhotoshopDirectory(string? JpegQuality,
                                  string? Url)

Shared/Models/PngDirectory.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 PngDirectory(string? ImageHeight,
                            string? ImageWidth,

Shared/Models/Properties/ICompareSettings.cs

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

Shared/Models/Properties/IFaceDistance.cs

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

Shared/Models/Properties/IFacePoint.cs

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

Shared/Models/Properties/ILocation.cs

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

Shared/Models/Properties/IRenameSettings.cs

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

Shared/Models/Properties/IWindowsSettings.cs

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

Shared/Models/QuickTimeMovieHeaderDirectory.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 QuickTimeMovieHeaderDirectory(DateTime? Created)
 {

Shared/Models/QuickTimeTrackHeaderDirectory.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 QuickTimeTrackHeaderDirectory(DateTime? Created)
 {

Shared/Models/ReadOnlyCollections.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 ReadOnlyCollections(ReadOnlyCollection<long> JLinkResolvedPersonKeys,
                                   ReadOnlyCollection<PersonContainer> PersonContainers,

Shared/Models/ResultSettings.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 ResultSettings(string DateGroup,
                              int EpicYear,
@@ -29,6 +29,6 @@ public record ResultSettings(string DateGroup,
 
 [JsonSourceGenerationOptions(WriteIndented = true)]
 [JsonSerializable(typeof(ResultSettings))]
-internal partial class ResultSettingsSourceGenerationContext : JsonSerializerContext
+public partial class ResultSettingsSourceGenerationContext : JsonSerializerContext
 {
 }

Shared/Models/SaveContainer.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 SaveContainer(string CheckFile,
                             string Directory,