MapFaceFileLogic

Author:

.editorconfig

@@ -82,28 +82,60 @@ csharp_style_var_elsewhere = false:warning
 csharp_style_var_for_built_in_types = false:warning
 csharp_style_var_when_type_is_apparent = false:warning
 csharp_using_directive_placement = outside_namespace
+dotnet_analyzer_diagnostic.category-Design.severity = error
+dotnet_analyzer_diagnostic.category-Documentation.severity = error
+dotnet_analyzer_diagnostic.category-Globalization.severity = none
+dotnet_analyzer_diagnostic.category-Interoperability.severity = error
+dotnet_analyzer_diagnostic.category-Maintainability.severity = error
+dotnet_analyzer_diagnostic.category-Naming.severity = none
+dotnet_analyzer_diagnostic.category-Performance.severity = none
+dotnet_analyzer_diagnostic.category-Reliability.severity = error
+dotnet_analyzer_diagnostic.category-Security.severity = error
+dotnet_analyzer_diagnostic.category-SingleFile.severity = error
+dotnet_analyzer_diagnostic.category-Style.severity = error
+dotnet_analyzer_diagnostic.category-Usage.severity = error
 dotnet_code_quality_unused_parameters = all
 dotnet_code_quality_unused_parameters = non_public # IDE0060: Remove unused parameter
 dotnet_code_quality.CAXXXX.api_surface = private, internal
+dotnet_diagnostic.CA1001.severity = none # CA1001: Types that own disposable fields should be disposable
+dotnet_diagnostic.CA1051.severity = none # CA1051: Do not declare visible instance fields
+dotnet_diagnostic.CA1511.severity = warning # CA1511: Use 'ArgumentException.ThrowIfNullOrEmpty' instead of explicitly throwing a new exception instance
+dotnet_diagnostic.CA1511.severity = warning # CA1511: Use 'ArgumentException.ThrowIfNullOrEmpty' instead of explicitly throwing a new exception instance
+dotnet_diagnostic.CA1513.severity = warning # Use 'ObjectDisposedException.ThrowIf' instead of explicitly throwing a new exception instance
+dotnet_diagnostic.CA1816.severity = none # CA1816: Call GC.SuppressFinalize correctly
 dotnet_diagnostic.CA1825.severity = warning # CA1823: Avoid zero-length array allocations
 dotnet_diagnostic.CA1829.severity = warning # CA1829: Use Length/Count property instead of Count() when available
 dotnet_diagnostic.CA1834.severity = warning # CA1834: Consider using 'StringBuilder.Append(char)' when applicable
-dotnet_diagnostic.CA1860.severity = error # CA1860: Prefer comparing 'Count' to 0 rather than using 'Any()', both for clarity and for performance
+dotnet_diagnostic.CA1854.severity = warning # CA1854: Prefer a 'TryGetValue' call over a Dictionary indexer access guarded by a 'ContainsKey' check to avoid double lookup
+dotnet_diagnostic.CA1860.severity = warning # CA1860: Prefer comparing 'Count' to 0 rather than using 'Any()', both for clarity and for performance
+dotnet_diagnostic.CA1861.severity = none # CA1861: Prefer 'static readonly' fields over constant array arguments
+dotnet_diagnostic.CA1862.severity = warning # CA1862: Prefer using 'string.Equals(string, StringComparison)' to perform a case-insensitive comparison, but keep in mind that this might cause subtle changes in behavior, so make sure to conduct thorough testing after applying the suggestion, or if culturally sensitive comparison is not required, consider using 'StringComparison.OrdinalIgnoreCase'
+dotnet_diagnostic.CA1866.severity = none # CA1866: Use 'string.EndsWith(char)' instead of 'string.EndsWith(string)' when you have a string with a single char
 dotnet_diagnostic.CA1869.severity = none # CA1869: Avoid creating a new 'JsonSerializerOptions' instance for every serialization operation. Cache and reuse instances instead.
+dotnet_diagnostic.CA2201.severity = none # CA2201: Exception type System.NullReferenceException is reserved by the runtime
 dotnet_diagnostic.CA2254.severity = none # CA2254: The logging message template should not vary between calls to 'LoggerExtensions.LogInformation(ILogger, string?, params object?[])'
 dotnet_diagnostic.IDE0001.severity = warning # IDE0001: Simplify name
 dotnet_diagnostic.IDE0002.severity = warning # Simplify (member access) - System.Version.Equals("1", "2"); Version.Equals("1", "2");
 dotnet_diagnostic.IDE0004.severity = warning # IDE0004: Cast is redundant.
 dotnet_diagnostic.IDE0005.severity = warning # Using directive is unnecessary
-dotnet_diagnostic.IDE0028.severity = error # IDE0028: Collection initialization can be simplified
+dotnet_diagnostic.IDE0010.severity = none # Add missing cases to switch statement (IDE0010)
+dotnet_diagnostic.IDE0028.severity = warning # IDE0028: Collection initialization can be simplified
 dotnet_diagnostic.IDE0031.severity = warning # Use null propagation (IDE0031)
 dotnet_diagnostic.IDE0047.severity = warning # IDE0047: Parentheses can be removed
+dotnet_diagnostic.IDE0048.severity = none # Parentheses preferences (IDE0047 and IDE0048)
 dotnet_diagnostic.IDE0049.severity = warning # Use language keywords instead of framework type names for type references (IDE0049)
+dotnet_diagnostic.IDE0051.severity = error # Private member '' is unused [, ]
+dotnet_diagnostic.IDE0058.severity = warning # IDE0058: Expression value is never used
 dotnet_diagnostic.IDE0060.severity = warning # IDE0060: Remove unused parameter
+dotnet_diagnostic.IDE0074.severity = warning # IDE0074: Use compound assignment
+dotnet_diagnostic.IDE0130.severity = none # Namespace does not match folder structure (IDE0130)
+dotnet_diagnostic.IDE0200.severity = warning # IDE0200: Lambda expression can be removed [Map]
+dotnet_diagnostic.IDE0230.severity = warning # IDE0230: Use UTF-8 string literal
 dotnet_diagnostic.IDE0290.severity = none # Use primary constructor [Distance]csharp(IDE0290)
-dotnet_diagnostic.IDE0300.severity = error # IDE0300: Collection initialization can be simplified
-dotnet_diagnostic.IDE0301.severity = error #IDE0301: Collection initialization can be simplified
+dotnet_diagnostic.IDE0300.severity = warning # IDE0300: Collection initialization can be simplified
+dotnet_diagnostic.IDE0301.severity = warning #IDE0301: Collection initialization can be simplified
 dotnet_diagnostic.IDE0305.severity = none # IDE0305: Collection initialization can be simplified
+dotnet_diagnostic.JSON002.severity = warning # JSON002: Probable JSON string detected
 dotnet_naming_rule.abstract_method_should_be_pascal_case.severity = warning
 dotnet_naming_rule.abstract_method_should_be_pascal_case.style = pascal_case
 dotnet_naming_rule.abstract_method_should_be_pascal_case.symbols = abstract_method

.gitignore

@@ -468,3 +468,5 @@ globalStorage/
 [Ll]ib/
 
 Shared/.kanbn
+
+.Immich/immich-assets.json

.vscode/mklink.md

@@ -7,8 +7,9 @@ updated: "2023-10-20T03:57:15.006Z"
 # mklink
 
 ```bash
+mklink /J "D:\1-Images-A\Images-4083e56a-Results\A2)People\4083e56a\{}\!" "D:\1-Images-A\Images-4083e56a-Results\E)Distance\4083e56a\{}\!"
 ```
 
 ```bash
-mklink /J "D:\1-Images-A\Images-4083e56a-Results\A2)People\4083e56a\{}\!" "D:\1-Images-A\Images-4083e56a-Results\E)Distance\4083e56a\{}\!"
+mklink /J "L:\Git\View-by-Distance-MKLink-Console\.Immich" "D:\1-Images-A\Images-c9dbce3b-Results\F)Immich\c9dbce3b\{}"
 ```

.vscode/settings.json

@@ -20,10 +20,9 @@
         "Hasher",
         "Hmmss",
         "Hmmssfff",
+        "Immich",
         "jfif",
         "JOSN",
-        "Makernote",
-        "Makernotes",
         "mmod",
         "Nicéphore",
         "Niépce",
@@ -33,14 +32,15 @@
         "permyriad",
         "Phares",
         "Phgtv",
-        "photoshop",
         "RDHC",
         "Rects",
         "resnet",
+        "Rijndael",
         "Serilog",
         "Subfile",
         "Subfiles",
         "Syncthing",
+        "Thumbhash",
         "Unmanaged",
         "Upsample",
         "Vericruz"

.vscode/tasks.json

@@ -42,6 +42,16 @@
             ],
             "problemMatcher": "$msCompile"
         },
+        {
+            "label": "Format-Whitespaces",
+            "command": "dotnet",
+            "type": "process",
+            "args": [
+                "format",
+                "whitespace"
+            ],
+            "problemMatcher": "$msCompile"
+        },
         {
             "label": "build",
             "command": "dotnet",

Compare/Models/Binder/AppSettings.cs

@@ -20,6 +20,23 @@ public class AppSettings
         return result;
     }
 
+    private static void PreVerify(IConfigurationRoot configurationRoot, AppSettings? appSettings)
+    {
+        if (appSettings?.Company is null)
+        {
+            List<string> paths = [];
+            foreach (IConfigurationProvider configurationProvider in configurationRoot.Providers)
+            {
+                if (configurationProvider is not Microsoft.Extensions.Configuration.Json.JsonConfigurationProvider jsonConfigurationProvider)
+                    continue;
+                if (jsonConfigurationProvider.Source.FileProvider is not Microsoft.Extensions.FileProviders.PhysicalFileProvider physicalFileProvider)
+                    continue;
+                paths.Add(physicalFileProvider.Root);
+            }
+            throw new NotSupportedException($"Not found!{Environment.NewLine}{string.Join(Environment.NewLine, paths.Distinct())}");
+        }
+    }
+
     private static Models.AppSettings Get(AppSettings? appSettings)
     {
         Models.AppSettings result;
@@ -36,7 +53,10 @@ public class AppSettings
     public static Models.AppSettings Get(IConfigurationRoot configurationRoot)
     {
         Models.AppSettings result;
+#pragma warning disable IL3050, IL2026
         AppSettings? appSettings = configurationRoot.Get<AppSettings>();
+#pragma warning restore IL3050, IL2026
+        PreVerify(configurationRoot, appSettings);
         result = Get(appSettings);
         return result;
     }

Compare/Models/Binder/Configuration.cs

@@ -5,7 +5,6 @@ namespace View_by_Distance.Compare.Models.Binder;
 public class Configuration
 {
 
-#nullable disable
     public string DiffPropertyDirectory { get; set; }
     public Property.Models.Configuration PropertyConfiguration { get; set; }
     public string[] Rename { get; set; }
@@ -13,8 +12,6 @@ public class Configuration
     public string[] RenameC { get; set; }
     public string[] Spelling { get; set; }
 
-#nullable restore
-
     public override string ToString()
     {
         string result = JsonSerializer.Serialize(this, new JsonSerializerOptions() { WriteIndented = true });

Copy-Distinct/Models/Binder/AppSettings.cs

@@ -21,6 +21,23 @@ public class AppSettings
         return result;
     }
 
+    private static void PreVerify(IConfigurationRoot configurationRoot, AppSettings? appSettings)
+    {
+        if (appSettings?.Company is null)
+        {
+            List<string> paths = [];
+            foreach (IConfigurationProvider configurationProvider in configurationRoot.Providers)
+            {
+                if (configurationProvider is not Microsoft.Extensions.Configuration.Json.JsonConfigurationProvider jsonConfigurationProvider)
+                    continue;
+                if (jsonConfigurationProvider.Source.FileProvider is not Microsoft.Extensions.FileProviders.PhysicalFileProvider physicalFileProvider)
+                    continue;
+                paths.Add(physicalFileProvider.Root);
+            }
+            throw new NotSupportedException($"Not found!{Environment.NewLine}{string.Join(Environment.NewLine, paths.Distinct())}");
+        }
+    }
+
     private static Models.AppSettings Get(AppSettings? appSettings)
     {
         Models.AppSettings result;
@@ -56,6 +73,7 @@ public class AppSettings
 #pragma warning disable IL3050, IL2026
         AppSettings? appSettings = configurationRoot.Get<AppSettings>();
 #pragma warning restore IL3050, IL2026
+        PreVerify(configurationRoot, appSettings);
         result = Get(appSettings);
         return result;
     }

Copy-Distinct/Models/Binder/Configuration.cs

@@ -7,13 +7,9 @@ namespace View_by_Distance.Copy.Distinct.Models.Binder;
 public class Configuration
 {
 
-#nullable disable
-
-    public string[] IgnoreExtensions { get; set; }
-    public Property.Models.Configuration PropertyConfiguration { get; set; }
-    public string PersonBirthdayFormat { get; set; }
-
-#nullable restore
+    public string[]? IgnoreExtensions { get; set; }
+    public Property.Models.Configuration? PropertyConfiguration { get; set; }
+    public string? PersonBirthdayFormat { get; set; }
 
     public override string ToString()
     {
@@ -21,12 +17,30 @@ public class Configuration
         return result;
     }
 
+    private static void PreVerify(IConfigurationRoot configurationRoot, Configuration? configuration)
+    {
+        if (configuration?.IgnoreExtensions is null)
+        {
+            List<string> paths = [];
+            foreach (IConfigurationProvider configurationProvider in configurationRoot.Providers)
+            {
+                if (configurationProvider is not Microsoft.Extensions.Configuration.Json.JsonConfigurationProvider jsonConfigurationProvider)
+                    continue;
+                if (jsonConfigurationProvider.Source.FileProvider is not Microsoft.Extensions.FileProviders.PhysicalFileProvider physicalFileProvider)
+                    continue;
+                paths.Add(physicalFileProvider.Root);
+            }
+            throw new NotSupportedException($"Not found!{Environment.NewLine}{string.Join(Environment.NewLine, paths.Distinct())}");
+        }
+    }
+
     private static Models.Configuration Get(Configuration? configuration)
     {
         Models.Configuration result;
         if (configuration is null) throw new NullReferenceException(nameof(configuration));
         if (configuration.IgnoreExtensions is null) throw new NullReferenceException(nameof(configuration.IgnoreExtensions));
         if (configuration.PersonBirthdayFormat is null) throw new NullReferenceException(nameof(configuration.PersonBirthdayFormat));
+        if (configuration.PropertyConfiguration is null) throw new NullReferenceException(nameof(configuration.PropertyConfiguration));
         result = new(
             configuration.IgnoreExtensions,
             configuration.PersonBirthdayFormat,
@@ -39,14 +53,19 @@ public class Configuration
         Models.Configuration result;
         Configuration? configuration;
         if (isEnvironment is null)
+#pragma warning disable IL3050, IL2026
             configuration = configurationRoot.Get<Configuration>();
+#pragma warning restore IL3050, IL2026
         else
         {
             string environmentName = IsEnvironment.GetEnvironmentName(isEnvironment);
             string section = string.Concat(environmentName, ":", nameof(Configuration));
             IConfigurationSection configurationSection = configurationRoot.GetSection(section);
+#pragma warning disable IL3050, IL2026
             configuration = configurationSection.Get<Configuration>();
+#pragma warning restore IL3050, IL2026
         }
+        PreVerify(configurationRoot, configuration);
         result = Get(configuration);
         return result;
     }

Date-Group/DateGroup.cs

@@ -193,15 +193,11 @@ public class DateGroup
             if (item.Property is not null)
                 dateTimes = item.Property.GetDateTimes();
             else
-            {
-                if (item.ImageFileHolder.LastWriteTime is null)
-                    throw new Exception();
-                dateTimes = [item.ImageFileHolder.LastWriteTime.Value];
-            }
+                dateTimes = [new(item.FilePath.LastWriteTicks)];
             if (item.Property is not null && item.Property.DateTimeOriginal is not null)
                 dateTime = item.Property.DateTimeOriginal.Value;
-            else if (item.ImageFileHolder.LastWriteTime is not null && item.Property is null)
-                dateTime = item.ImageFileHolder.LastWriteTime.Value;
+            else if (item.Property is null)
+                dateTime = new(item.FilePath.LastWriteTicks);
             else
                 dateTime = Shared.Models.Stateless.Methods.IProperty.GetMinimumDateTime(item.Property);
             day = dateTime.ToString("MM-dd");
@@ -213,7 +209,7 @@ public class DateGroup
             }
             else
             {
-                (isWrongYear, _) = Shared.Models.Stateless.Methods.IProperty.IsWrongYear(item.ImageFileHolder, item.Property.DateTimeOriginal, dateTimes);
+                (isWrongYear, _) = Shared.Models.Stateless.Methods.IProperty.IsWrongYear(item.FilePath, item.Property.DateTimeOriginal, dateTimes);
                 if (isWrongYear is null)
                     flag = '#';
                 else if (isWrongYear.Value)
@@ -283,18 +279,16 @@ public class DateGroup
                 }
             }
             if (!_Configuration.ByHash || item.Property?.Id is null)
-                fileName = item.ImageFileHolder.Name;
+                fileName = item.FilePath.Name;
             else
-                fileName = $"{item.Property.Id.Value}{item.ImageFileHolder.ExtensionLowered}";
+                fileName = $"{item.Property.Id.Value}{item.FilePath.ExtensionLowered}";
             destinationCollection.Add(destinationDirectory);
             destinationCollection.AddRange(directoryNames);
             destinationCollection.Add(fileName);
-            if (item.ImageFileHolder.LastWriteTime is null)
-                continue;
-            if (item.Property is not null)
-                results.Add(new(item, item.Property.LastWriteTime.Ticks, dateTime.Ticks, destinationCollection.ToArray()));
+            if (item.Property is null)
+                results.Add(new(item, item.FilePath.LastWriteTicks, dateTime.Ticks, destinationCollection.ToArray()));
             else
-                results.Add(new(item, item.ImageFileHolder.LastWriteTime.Value.Ticks, dateTime.Ticks, destinationCollection.ToArray()));
+                results.Add(new(item, item.Property.LastWriteTime.Ticks, dateTime.Ticks, destinationCollection.ToArray()));
         }
         return results;
     }
@@ -313,7 +307,7 @@ public class DateGroup
         List<Item> results = [];
         foreach (Item item in container.Items)
         {
-            if (item.ImageFileHolder is not null)
+            if (item.FilePath is not null)
                 results.Add(item);
         }
         return results.ToArray();
@@ -422,13 +416,13 @@ public class DateGroup
                         continue;
                 }
             }
-            File.Move(item.ImageFileHolder.FullName, fullFileName);
+            File.Move(item.FilePath.FullName, fullFileName);
             moved += 1;
             if (hasDuplicate)
             {
                 try
                 {
-                    windowsShortcut = new() { Path = item.ImageFileHolder.DirectoryName, Description = item.ImageFileHolder.Name };
+                    windowsShortcut = new() { Path = item.FilePath.DirectoryName, Description = item.FilePath.Name };
                     windowsShortcut.Save(string.Concat(fullFileName, ".lnk"));
                     windowsShortcut.Dispose();
                 }
@@ -447,11 +441,11 @@ public class DateGroup
         foreach ((Item item, long lastWriteTimeTicks, long minimumDateTimeTicks, string[] destination) in fileMoveCollectionAll)
         {
             fullFileName = Path.Combine(destination);
-            if (File.Exists(item.ImageFileHolder.FullName))
+            if (File.Exists(item.FilePath.FullName))
                 continue;
             if (!File.Exists(fullFileName))
                 continue;
-            File.Move(fullFileName, item.ImageFileHolder.FullName);
+            File.Move(fullFileName, item.FilePath.FullName);
             moved += 1;
         }
         _Logger?.LogInformation($"Done moving back {moved} file(s)");
@@ -493,8 +487,8 @@ public class DateGroup
                     relativePathDirectory = Path.GetDirectoryName(item.RelativePath);
                     if (string.IsNullOrEmpty(relativePathDirectory))
                         continue;
-                    if (item.ImageFileHolder.LastWriteTime is not null && item.Property is null)
-                        dateTime = item.ImageFileHolder.LastWriteTime.Value;
+                    if (item.Property is null)
+                        dateTime = new(item.FilePath.LastWriteTicks);
                     else if (item.Property is not null && item.Property.DateTimeOriginal is not null)
                         dateTime = item.Property.DateTimeOriginal.Value;
                     else

Date-Group/Models/Binder/AppSettings.cs

@@ -20,6 +20,23 @@ public class AppSettings
         return result;
     }
 
+    private static void PreVerify(IConfigurationRoot configurationRoot, AppSettings? appSettings)
+    {
+        if (appSettings?.Company is null)
+        {
+            List<string> paths = [];
+            foreach (IConfigurationProvider configurationProvider in configurationRoot.Providers)
+            {
+                if (configurationProvider is not Microsoft.Extensions.Configuration.Json.JsonConfigurationProvider jsonConfigurationProvider)
+                    continue;
+                if (jsonConfigurationProvider.Source.FileProvider is not Microsoft.Extensions.FileProviders.PhysicalFileProvider physicalFileProvider)
+                    continue;
+                paths.Add(physicalFileProvider.Root);
+            }
+            throw new NotSupportedException($"Not found!{Environment.NewLine}{string.Join(Environment.NewLine, paths.Distinct())}");
+        }
+    }
+
     private static Models.AppSettings Get(AppSettings? appSettings)
     {
         Models.AppSettings result;
@@ -36,7 +53,10 @@ public class AppSettings
     public static Models.AppSettings Get(IConfigurationRoot configurationRoot)
     {
         Models.AppSettings result;
+#pragma warning disable IL3050, IL2026
         AppSettings? appSettings = configurationRoot.Get<AppSettings>();
+#pragma warning restore IL3050, IL2026
+        PreVerify(configurationRoot, appSettings);
         result = Get(appSettings);
         return result;
     }

Date-Group/Models/Binder/Configuration.cs

@@ -7,17 +7,13 @@ namespace View_by_Distance.Date.Group.Models.Binder;
 public class Configuration
 {
 
-#nullable disable
-
     public bool? ByCreateDateShortcut { get; set; }
     public bool? ByDay { get; set; }
     public bool? ByHash { get; set; }
     public bool? BySeason { get; set; }
     public bool? ByWeek { get; set; }
     public bool? KeepFullPath { get; set; }
-    public Property.Models.Configuration PropertyConfiguration { get; set; }
-
-#nullable restore
+    public Property.Models.Configuration? PropertyConfiguration { get; set; }
 
     public override string ToString()
     {
@@ -25,10 +21,28 @@ public class Configuration
         return result;
     }
 
+    private static void PreVerify(IConfigurationRoot configurationRoot, Configuration? configuration)
+    {
+        if (configuration?.ByCreateDateShortcut is null)
+        {
+            List<string> paths = [];
+            foreach (IConfigurationProvider configurationProvider in configurationRoot.Providers)
+            {
+                if (configurationProvider is not Microsoft.Extensions.Configuration.Json.JsonConfigurationProvider jsonConfigurationProvider)
+                    continue;
+                if (jsonConfigurationProvider.Source.FileProvider is not Microsoft.Extensions.FileProviders.PhysicalFileProvider physicalFileProvider)
+                    continue;
+                paths.Add(physicalFileProvider.Root);
+            }
+            throw new NotSupportedException($"Not found!{Environment.NewLine}{string.Join(Environment.NewLine, paths.Distinct())}");
+        }
+    }
+
     private static Models.Configuration Get(Configuration? configuration)
     {
         Models.Configuration result;
         if (configuration is null) throw new NullReferenceException(nameof(configuration));
+        if (configuration.PropertyConfiguration is null) throw new NullReferenceException(nameof(configuration.PropertyConfiguration));
         if (configuration.ByCreateDateShortcut is null) throw new NullReferenceException(nameof(configuration.ByCreateDateShortcut));
         if (configuration.ByDay is null) throw new NullReferenceException(nameof(configuration.ByDay));
         if (configuration.ByHash is null) throw new NullReferenceException(nameof(configuration.ByHash));
@@ -51,16 +65,20 @@ public class Configuration
         Models.Configuration result;
         Configuration? configuration;
         if (isEnvironment is null)
+#pragma warning disable IL3050, IL2026
             configuration = configurationRoot.Get<Configuration>();
+#pragma warning restore IL3050, IL2026
         else
         {
             string environmentName = IsEnvironment.GetEnvironmentName(isEnvironment);
             string section = string.Concat(environmentName, ":", nameof(Configuration));
             IConfigurationSection configurationSection = configurationRoot.GetSection(section);
+#pragma warning disable IL3050, IL2026
             configuration = configurationSection.Get<Configuration>();
+#pragma warning restore IL3050, IL2026
         }
+        PreVerify(configurationRoot, configuration);
         result = Get(configuration);
-        if (configuration is null) throw new NullReferenceException(nameof(configuration));
         return result;
     }
 

Delete-By-Distinct/Models/Binder/AppSettings.cs

@@ -27,6 +27,23 @@ public class AppSettings
         return result;
     }
 
+    private static void PreVerify(IConfigurationRoot configurationRoot, AppSettings? appSettings)
+    {
+        if (appSettings?.Company is null)
+        {
+            List<string> paths = [];
+            foreach (IConfigurationProvider configurationProvider in configurationRoot.Providers)
+            {
+                if (configurationProvider is not Microsoft.Extensions.Configuration.Json.JsonConfigurationProvider jsonConfigurationProvider)
+                    continue;
+                if (jsonConfigurationProvider.Source.FileProvider is not Microsoft.Extensions.FileProviders.PhysicalFileProvider physicalFileProvider)
+                    continue;
+                paths.Add(physicalFileProvider.Root);
+            }
+            throw new NotSupportedException($"Not found!{Environment.NewLine}{string.Join(Environment.NewLine, paths.Distinct())}");
+        }
+    }
+
     private static Models.AppSettings Get(AppSettings? appSettings)
     {
         Models.AppSettings result;
@@ -58,7 +75,10 @@ public class AppSettings
     public static Models.AppSettings Get(IConfigurationRoot configurationRoot)
     {
         Models.AppSettings result;
+#pragma warning disable IL3050, IL2026
         AppSettings? appSettings = configurationRoot.Get<AppSettings>();
+#pragma warning restore IL3050, IL2026
+        PreVerify(configurationRoot, appSettings);
         result = Get(appSettings);
         return result;
     }

Delete-By-Relative/Models/Binder/AppSettings.cs

@@ -22,6 +22,23 @@ public class AppSettings
         return result;
     }
 
+    private static void PreVerify(IConfigurationRoot configurationRoot, AppSettings? appSettings)
+    {
+        if (appSettings?.Company is null)
+        {
+            List<string> paths = [];
+            foreach (IConfigurationProvider configurationProvider in configurationRoot.Providers)
+            {
+                if (configurationProvider is not Microsoft.Extensions.Configuration.Json.JsonConfigurationProvider jsonConfigurationProvider)
+                    continue;
+                if (jsonConfigurationProvider.Source.FileProvider is not Microsoft.Extensions.FileProviders.PhysicalFileProvider physicalFileProvider)
+                    continue;
+                paths.Add(physicalFileProvider.Root);
+            }
+            throw new NotSupportedException($"Not found!{Environment.NewLine}{string.Join(Environment.NewLine, paths.Distinct())}");
+        }
+    }
+
     private static Models.AppSettings Get(AppSettings? appSettings)
     {
         Models.AppSettings result;
@@ -40,7 +57,10 @@ public class AppSettings
     public static Models.AppSettings Get(IConfigurationRoot configurationRoot)
     {
         Models.AppSettings result;
+#pragma warning disable IL3050, IL2026
         AppSettings? appSettings = configurationRoot.Get<AppSettings>();
+#pragma warning restore IL3050, IL2026
+        PreVerify(configurationRoot, appSettings);
         result = Get(appSettings);
         return result;
     }

Distance/Models/DistanceLimits.cs

@@ -14,6 +14,7 @@ public class DistanceLimits : IDistanceLimits
     public double FaceDistancePermyriad { init; get; }
     public int SortingMaximumPerFaceShouldBeHigh { init; get; }
     public bool RangeDaysDeltaTargetLessThenUpper { init; get; }
+    public double RangeDistanceToleranceUpperLimit { init; get; }
 
     public DistanceLimits(int faceAreaPermyriad,
                           int faceConfidencePercent,
@@ -25,6 +26,7 @@ public class DistanceLimits : IDistanceLimits
                           int sortingMaximumPerFaceShouldBeHigh,
                           int? useFiltersCounter = null)
     {
+        RangeDistanceToleranceUpperLimit = rangeDistanceTolerance[2];
         SortingMaximumPerFaceShouldBeHigh = sortingMaximumPerFaceShouldBeHigh;
         RangeDaysDeltaTargetLessThenUpper = rangeDaysDeltaTolerance[1] > rangeDaysDeltaTolerance[2];
         if (useFiltersCounter is null)

Distance/Models/_E_Distance.cs

@@ -1,10 +1,13 @@
 using ShellProgressBar;
 using System.Collections.ObjectModel;
+using System.Data;
 using System.Text.Json;
 using View_by_Distance.FaceRecognitionDotNet;
+using View_by_Distance.Map.Models;
 using View_by_Distance.Property.Models.Stateless;
 using View_by_Distance.Shared.Models;
 using View_by_Distance.Shared.Models.Methods;
+using View_by_Distance.Shared.Models.Stateless.Methods;
 
 namespace View_by_Distance.Distance.Models;
 
@@ -50,6 +53,7 @@ public partial class E_Distance : IDistance
     private FaceDistanceContainer[] GetFaceDistanceContainers(MappingFromItem mappingFromItem, List<Face> intersectFaces)
     {
         FaceDistanceContainer[] results;
+        DateTime dateTime;
         int wholePercentages;
         int confidencePercent;
         FaceDistance faceDistance;
@@ -61,14 +65,15 @@ public partial class E_Distance : IDistance
                 throw new NotSupportedException();
             if (face.Mapping?.MappingFromFilterPost is null)
                 throw new NotSupportedException();
+            dateTime = mappingFromItem.GetDateTimeOriginalThenMinimumDateTime();
             confidencePercent = Shared.Models.Stateless.Methods.ILocation.GetConfidencePercent(_FaceConfidencePercent, face.Location.Confidence);
             wholePercentages = Shared.Models.Stateless.Methods.ILocation.GetWholePercentages(face.Location, Shared.Models.Stateless.ILocation.Digits, face.OutputResolution);
             if (face.FaceDistance?.Encoding is not null && face.FaceDistance.Encoding is FaceRecognitionDotNet.FaceEncoding faceEncoding)
-                faceDistance = new(confidencePercent, mappingFromItem.GetDateTimeOriginalThenMinimumDateTime(), faceEncoding, face.Mapping?.MappingFromFilterPost, mappingFromItem.Id, mappingFromItem.IsWrongYear, wholePercentages);
+                faceDistance = new(confidencePercent, dateTime, faceEncoding, face.Mapping?.MappingFromFilterPost, mappingFromItem.Id, mappingFromItem.IsWrongYear, wholePercentages);
             else
             {
                 faceEncoding = FaceRecognition.LoadFaceEncoding(face.FaceEncoding.RawEncoding);
-                faceDistance = new(confidencePercent, mappingFromItem.GetDateTimeOriginalThenMinimumDateTime(), faceEncoding, face.Mapping?.MappingFromFilterPost, mappingFromItem.Id, mappingFromItem.IsWrongYear, wholePercentages);
+                faceDistance = new(confidencePercent, dateTime, faceEncoding, face.Mapping?.MappingFromFilterPost, mappingFromItem.Id, mappingFromItem.IsWrongYear, wholePercentages);
                 lock (intersectFaces)
                     face.SetFaceDistance(faceDistance);
             }
@@ -91,7 +96,7 @@ public partial class E_Distance : IDistance
         return new(faceDistanceEncodings);
     }
 
-    private List<(Face Face, double? Length)> GetValues(MappingFromItem mappingFromItem, List<Face> intersectFaces, Shared.Models.FaceEncoding modelsFaceEncoding)
+    private List<(Face Face, double? Length)> GetValues(IDistanceLimits distanceLimits, MappingFromItem mappingFromItem, List<Face> intersectFaces, Shared.Models.FaceEncoding modelsFaceEncoding)
     {
         List<(Face Face, double? Length)> results = [];
         Face face;
@@ -112,6 +117,8 @@ public partial class E_Distance : IDistance
         {
             face = intersectFaces[i];
             faceDistanceLength = faceDistanceLengths[i];
+            if (faceDistanceLength.Length is null || faceDistanceLength.Length > distanceLimits.RangeDistanceToleranceUpperLimit)
+                continue;
             if (faceDistanceLength.Length is null)
                 throw new NotSupportedException();
             results.Add(new(face, faceDistanceLength.Length.Value));
@@ -119,10 +126,10 @@ public partial class E_Distance : IDistance
         return results;
     }
 
-    private (Face, double?)[] GetClosestFaceByDistanceIgnoringTolerance(MappingFromItem mappingFromItem, List<Face> intersectFaces, Shared.Models.FaceEncoding modelsFaceEncoding)
+    private (Face, double?)[] GetClosestFaceByDistanceIgnoringTolerance(IDistanceLimits distanceLimits, MappingFromItem mappingFromItem, List<Face> intersectFaces, Shared.Models.FaceEncoding modelsFaceEncoding)
     {
         (Face, double?)[] results;
-        List<(Face Face, double? Length)> collection = GetValues(mappingFromItem, intersectFaces, modelsFaceEncoding);
+        List<(Face Face, double? Length)> collection = GetValues(distanceLimits, mappingFromItem, intersectFaces, modelsFaceEncoding);
         results = (from l in collection where l.Length < _RangeDistanceToleranceAverage orderby l.Length select l).Take(1).ToArray();
         if (results.Length > 0)
         {
@@ -132,11 +139,11 @@ public partial class E_Distance : IDistance
         return results;
     }
 
-    private static List<(Face, double?)> GetMatchingFacesByFaceEncoding(Face[] filteredFaces, string? json)
+    private static List<(Face, double?)> GetMatchingFacesByFaceEncoding(List<Face> faces, string? json)
     {
         List<(Face, double?)> results = [];
         string check;
-        foreach (Face face in filteredFaces)
+        foreach (Face face in faces)
         {
             if (json is null || face.FaceEncoding is null)
                 continue;
@@ -165,8 +172,8 @@ public partial class E_Distance : IDistance
             mappedFaceDirectory = Path.GetDirectoryName(file);
             if (mappedFaceDirectory is null)
                 throw new NotSupportedException();
-            deterministicHashCodeKey = Shared.Models.Stateless.Methods.IMapping.GetDeterministicHashCodeKey(filePath, face.Location, Shared.Models.Stateless.ILocation.Digits, face.OutputResolution);
-            checkFile = Path.Combine(mappedFaceDirectory, $"{deterministicHashCodeKey}{mappingFromItem.ImageFileHolder.ExtensionLowered}{facesFileNameExtension}");
+            deterministicHashCodeKey = IMapping.GetDeterministicHashCodeKey(filePath, face.Location, Shared.Models.Stateless.ILocation.Digits, face.OutputResolution);
+            checkFile = Path.Combine(mappedFaceDirectory, $"{deterministicHashCodeKey}{mappingFromItem.FilePath.ExtensionLowered}{facesFileNameExtension}");
             if (checkFile == file)
                 continue;
             result = new FileInfo(checkFile);
@@ -201,17 +208,14 @@ public partial class E_Distance : IDistance
         }
     }
 
-    public void LookForMatchFacesAndPossiblyRename(string facesFileNameExtension, FilePath filePath, MappingFromItem mappingFromItem, List<Face> faces, ReadOnlyCollection<LocationContainer> locationContainers)
+    public void LookForMatchFacesAndPossiblyRename(bool overrideForFaceImages, IDistanceLimits distanceLimits, IFaceD dFace, FilePath filePath, MappingFromItem mappingFromItem, ExifDirectory exifDirectory, List<Face> faces, ReadOnlyCollection<LocationContainer> locationContainers)
     {
         string? json;
         string[] matches;
         FileInfo? fileInfo;
         List<Face> intersectFaces;
-        List<(Face, double?)> checkFaces = [];
         Shared.Models.FaceEncoding? modelsFaceEncoding;
-        Face[] filteredFaces = (from l in faces where l.FaceEncoding is not null && l.Location is not null && l.OutputResolution is not null select l).ToArray();
-        if (filteredFaces.Length != faces.Count)
-            checkFaces.Clear();
+        List<(Face Face, double? Distance)> checkFaces = [];
         foreach (LocationContainer locationContainer in locationContainers)
         {
             if (_Renamed.Contains(locationContainer.FilePath.FullName))
@@ -232,8 +236,8 @@ public partial class E_Distance : IDistance
                     MoveUnableToMatch(locationContainer.FilePath);
                 continue;
             }
-            if (filteredFaces.Length > 0)
-                checkFaces.AddRange(GetMatchingFacesByFaceEncoding(filteredFaces, json));
+            if (faces.Count > 0)
+                checkFaces.AddRange(GetMatchingFacesByFaceEncoding(faces, json));
             if (checkFaces.Count == 1)
                 _Debug.Add(0);
             if (checkFaces.Count != 1 && !string.IsNullOrEmpty(json))
@@ -242,11 +246,11 @@ public partial class E_Distance : IDistance
                 modelsFaceEncoding = JsonSerializer.Deserialize<Shared.Models.FaceEncoding>(json);
                 if (modelsFaceEncoding is null)
                     throw new NotSupportedException();
-                if (filteredFaces.Length > 0)
+                if (faces.Count > 0)
                 {
-                    intersectFaces = Shared.Models.Stateless.Methods.ILocation.FilterByIntersect(filteredFaces, _RectangleIntersectMinimum, locationContainer.WholePercentages);
+                    intersectFaces = Shared.Models.Stateless.Methods.ILocation.FilterByIntersect(faces, _RectangleIntersectMinimum, locationContainer.WholePercentages);
                     if (intersectFaces.Count > 0)
-                        checkFaces.AddRange(GetClosestFaceByDistanceIgnoringTolerance(mappingFromItem, intersectFaces, modelsFaceEncoding));
+                        checkFaces.AddRange(GetClosestFaceByDistanceIgnoringTolerance(distanceLimits, mappingFromItem, intersectFaces, modelsFaceEncoding));
                 }
             }
             if (checkFaces.Count == 0)
@@ -261,7 +265,7 @@ public partial class E_Distance : IDistance
                     MoveUnableToMatch(locationContainer.FilePath);
                 continue;
             }
-            fileInfo = CheckFileThenGetFileInfo(facesFileNameExtension, filePath, mappingFromItem, locationContainer.FilePath.FullName, checkFaces);
+            fileInfo = CheckFileThenGetFileInfo(dFace.FileNameExtension, filePath, mappingFromItem, locationContainer.FilePath.FullName, checkFaces);
             if (fileInfo is not null)
             {
                 if (_DistanceRenameToMatch && fileInfo is not null)
@@ -275,6 +279,15 @@ public partial class E_Distance : IDistance
                 }
                 continue;
             }
+            if (overrideForFaceImages)
+            {
+                json = Metadata.Models.Stateless.Methods.IMetadata.GetOutputResolution(locationContainer.ExifDirectory);
+                if (json is null || !json.Contains(nameof(DateTime)))
+                {
+                    if (checkFaces.Count == 1)
+                        dFace.ReSaveFace(exifDirectory, locationContainer.FilePath, checkFaces[0].Face, mappedFile: true);
+                }
+            }
             if (_AllMappedFaceFileNames.Contains(locationContainer.FilePath.Name))
             {
                 lock (_AllMappedFaceFiles)
@@ -322,10 +335,88 @@ public partial class E_Distance : IDistance
         File.WriteAllLines(eDistanceContentFileName, results);
     }
 
-    public static void PreFilterSetFaceDistances(int maxDegreeOfParallelism, long ticks, ReadOnlyCollection<Face> distinctFilteredFaces)
+    public static ReadOnlyDictionary<int, ReadOnlyDictionary<int, LocationContainer>> GetMappedWithEncoding(ReadOnlyDictionary<int, ReadOnlyDictionary<int, LocationContainer>> mapped)
+    {
+        Dictionary<int, ReadOnlyDictionary<int, LocationContainer>> results = [];
+        string? json;
+        LocationContainer? locationContainer;
+        Shared.Models.FaceEncoding? faceEncoding;
+        FaceRecognitionDotNet.FaceEncoding? encoding;
+        Dictionary<int, LocationContainer> keyValuePairs;
+        foreach (KeyValuePair<int, ReadOnlyDictionary<int, LocationContainer>> keyValuePair in mapped)
+        {
+            keyValuePairs = [];
+            foreach (KeyValuePair<int, LocationContainer> keyValue in keyValuePair.Value)
+            {
+                json = Metadata.Models.Stateless.Methods.IMetadata.GetFaceEncoding(keyValue.Value.ExifDirectory);
+                faceEncoding = json is null ? null : JsonSerializer.Deserialize<Shared.Models.FaceEncoding>(json);
+                if (faceEncoding is null)
+                    continue;
+                encoding = FaceRecognition.LoadFaceEncoding(faceEncoding.RawEncoding);
+                locationContainer = LocationContainer.Get(keyValue.Value, encoding, keepExifDirectory: false);
+                keyValuePairs.Add(keyValue.Key, locationContainer);
+            }
+            results.Add(keyValuePair.Key, new(keyValuePairs));
+        }
+        return new(results);
+    }
+
+    public static List<LocationContainer> GetPreFilterLocationContainer(int maxDegreeOfParallelism, Configuration configuration, string focusDirectory, string focusModel, int? skipPersonWithMoreThen, long ticks, MapLogic mapLogic, long[] jLinkResolvedPersonKeys, ReadOnlyDictionary<int, ReadOnlyDictionary<int, LocationContainer>> mapped, List<LocationContainer> available)
+    {
+        List<LocationContainer> results = [];
+        string? json;
+        string? model;
+        bool? canReMap;
+        bool? isFocusPerson;
+        bool? inSkipCollection;
+        Shared.Models.FaceEncoding? faceEncoding;
+        FaceRecognitionDotNet.FaceEncoding? encoding;
+        ReadOnlyDictionary<int, LocationContainer>? keyValuePairs;
+        ReadOnlyDictionary<int, ReadOnlyCollection<PersonContainer>>? wholePercentagesToPersonContainers;
+        foreach (LocationContainer locationContainer in available)
+        {
+            if (mapped.TryGetValue(locationContainer.Id, out keyValuePairs))
+            {
+                if (keyValuePairs.ContainsKey(locationContainer.WholePercentages))
+                    continue;
+            }
+            if (locationContainer.ExifDirectory is null || locationContainer.FaceFile is null)
+                continue;
+            inSkipCollection = mapLogic.InSkipCollection(locationContainer.Id, locationContainer.WholePercentages);
+            if (inSkipCollection is not null && inSkipCollection.Value)
+                continue;
+            wholePercentagesToPersonContainers = mapLogic.GetWholePercentagesToPersonContainers(locationContainer.Id);
+            canReMap = Map.Models.Stateless.Methods.IMapLogic.CanReMap(jLinkResolvedPersonKeys, wholePercentagesToPersonContainers, locationContainer.WholePercentages);
+            if (canReMap is not null && !canReMap.Value)
+                continue;
+            isFocusPerson = mapLogic.IsFocusPerson(skipPersonWithMoreThen, jLinkResolvedPersonKeys, wholePercentagesToPersonContainers, locationContainer.WholePercentages);
+            if (isFocusPerson is not null && !isFocusPerson.Value)
+                continue;
+            if (!string.IsNullOrEmpty(focusModel))
+            {
+                model = Metadata.Models.Stateless.Methods.IMetadata.GetModel(locationContainer.ExifDirectory);
+                if (string.IsNullOrEmpty(model) || !model.Contains(focusModel))
+                    continue;
+            }
+            if (!string.IsNullOrEmpty(focusDirectory))
+            {
+                if (!locationContainer.FilePath.DirectoryName.Contains(focusDirectory))
+                    continue;
+            }
+            json = Metadata.Models.Stateless.Methods.IMetadata.GetFaceEncoding(locationContainer.ExifDirectory);
+            faceEncoding = json is null ? null : JsonSerializer.Deserialize<Shared.Models.FaceEncoding>(json);
+            if (faceEncoding is null)
+                continue;
+            encoding = FaceRecognition.LoadFaceEncoding(faceEncoding.RawEncoding);
+            results.Add(LocationContainer.Get(locationContainer, encoding, keepExifDirectory: false));
+        }
+        return results;
+    }
+
+    public static void PreFilterSetFaceDistances(int maxDegreeOfParallelism, Configuration configuration, long ticks, ReadOnlyCollection<Face> distinctValidImageFaces)
     {
         List<Face> faces = [];
-        foreach (Face face in distinctFilteredFaces)
+        foreach (Face face in distinctValidImageFaces)
         {
             if (face.Mapping?.MappingFromFilterPre is null)
                 throw new NotSupportedException();
@@ -335,7 +426,10 @@ public partial class E_Distance : IDistance
                 continue;
             if (face.Mapping.MappingFromFilterPre.IsFocusRelativePath is not null && !face.Mapping.MappingFromFilterPre.IsFocusRelativePath.Value)
                 continue;
-            if (face.FaceEncoding is not null && face.FaceDistance?.Encoding is not null && face.FaceDistance.Encoding is FaceRecognitionDotNet.FaceEncoding _)
+            if (!configuration.ReMap && face.Mapping.MappingFromPerson is not null)
+                continue;
+            if (!configuration.ReMap && face.FaceEncoding is not null && face.FaceDistance?.Encoding is not null && face.FaceDistance.Encoding is FaceRecognitionDotNet.FaceEncoding)
+                // throw new NotSupportedException($"{face.FaceEncoding} should not be null!");
                 continue;
             faces.Add(face);
         }
@@ -352,18 +446,19 @@ public partial class E_Distance : IDistance
                 throw new NotSupportedException();
             progressBar.Tick();
             faceEncoding = FaceRecognition.LoadFaceEncoding(face.FaceEncoding.RawEncoding);
-            FaceDistance faceDistance = new(face.Mapping.MappingFromLocation.ConfidencePercent, face.Mapping.MappingFromItem.GetDateTimeOriginalThenMinimumDateTime(), faceEncoding, face.Mapping.MappingFromFilterPost, face.Mapping.MappingFromItem.Id, face.Mapping.MappingFromItem.IsWrongYear, face.Mapping.MappingFromLocation.WholePercentages);
+            DateTime dateTime = face.Mapping.MappingFromItem.GetDateTimeOriginalThenMinimumDateTime();
+            FaceDistance faceDistance = new(face.Mapping.MappingFromLocation.ConfidencePercent, dateTime, faceEncoding, face.Mapping.MappingFromFilterPost, face.Mapping.MappingFromItem.Id, face.Mapping.MappingFromItem.IsWrongYear, face.Mapping.MappingFromLocation.WholePercentages);
             lock (face)
                 face.SetFaceDistance(faceDistance);
         });
     }
 
-    private static List<SortingContainer> GetSortingContainers(Map.Models.Configuration mapConfiguration, IDistanceLimits distanceLimits, Face face, FaceDistance faceDistanceEncoding, List<Sorting> sortingCollection)
+    private static List<SortingContainer> GetSortingContainers(Configuration mapConfiguration, IDistanceLimits distanceLimits, Face face, FaceDistance faceDistanceEncoding, List<Sorting> sortingCollection)
     {
         List<SortingContainer> results = [];
-        SortingContainer sortingContainer;
         int days = 0, distance = 0;
-        Sorting[] collection = Shared.Models.Stateless.Methods.ISorting.Sort(sortingCollection);
+        SortingContainer sortingContainer;
+        Sorting[] collection = ISorting.Sort(sortingCollection);
         foreach (Sorting sorting in collection)
         {
             if (face.Mapping?.MappingFromLocation is null || faceDistanceEncoding.WholePercentages is null)
@@ -389,7 +484,7 @@ public partial class E_Distance : IDistance
         return results;
     }
 
-    private static List<Sorting> GetSortingCollection(Map.Models.MapLogic mapLogic, ReadOnlyCollection<FaceDistance> faceDistanceEncodings, int i, Face face, FaceDistance faceDistanceEncoding)
+    private static List<Sorting> GetSortingCollection(MapLogic mapLogic, ReadOnlyCollection<FaceDistance> faceDistanceEncodings, int i, Face face, FaceDistance faceDistanceEncoding)
     {
         List<Sorting> results;
         List<FaceDistance> faceDistanceLengths = FaceRecognition.FaceDistances(faceDistanceEncodings, faceDistanceEncoding);
@@ -397,19 +492,21 @@ public partial class E_Distance : IDistance
         return results;
     }
 
-    public static ReadOnlyCollection<FaceDistanceContainer> GetFaceDistanceContainers(ReadOnlyCollection<Face> distinctFilteredFaces)
+    public static ReadOnlyCollection<FaceDistanceContainer> GetFaceDistanceContainers(ReadOnlyCollection<Face> distinctValidImageFaces)
     {
         ReadOnlyCollection<FaceDistanceContainer> results;
+        DateTime dateTime;
         FaceDistance faceDistance;
         FaceDistanceContainer faceDistanceContainer;
         List<FaceDistanceContainer> collection = [];
-        foreach (Face face in distinctFilteredFaces)
+        foreach (Face face in distinctValidImageFaces)
         {
             if (face.Mapping?.MappingFromLocation is null)
                 throw new NotSupportedException();
             if (face.FaceDistance?.Encoding is not FaceRecognitionDotNet.FaceEncoding faceEncoding)
                 continue;
-            faceDistance = new(face.Mapping.MappingFromLocation.ConfidencePercent, face.Mapping.MappingFromItem.GetDateTimeOriginalThenMinimumDateTime(), faceEncoding, face.Mapping.MappingFromFilterPost, face.Mapping.MappingFromItem.Id, face.Mapping.MappingFromItem.IsWrongYear, face.Mapping.MappingFromLocation.WholePercentages);
+            dateTime = face.Mapping.MappingFromItem.GetDateTimeOriginalThenMinimumDateTime();
+            faceDistance = new(face.Mapping.MappingFromLocation.ConfidencePercent, dateTime, faceEncoding, face.Mapping.MappingFromFilterPost, face.Mapping.MappingFromItem.Id, face.Mapping.MappingFromItem.IsWrongYear, face.Mapping.MappingFromLocation.WholePercentages);
             faceDistanceContainer = new(face, faceDistance);
             collection.Add(faceDistanceContainer);
         }
@@ -417,7 +514,23 @@ public partial class E_Distance : IDistance
         return results;
     }
 
-    public static FaceDistanceContainer[] FilteredPostLoadFaceDistanceContainers(Map.Models.MapLogic mapLogic, ReadOnlyCollection<FaceDistanceContainer> faceDistanceContainers, long? skipOlderThan, DistanceLimits distanceLimits)
+    public static List<LocationContainer> GetPostFilterLocationContainer(MapLogic mapLogic, List<LocationContainer> preFiltered, DistanceLimits distanceLimits)
+    {
+        List<LocationContainer> results = [];
+        foreach (LocationContainer locationContainer in preFiltered)
+        {
+            if (locationContainer.FaceFile is null)
+                continue;
+            if (locationContainer.FaceFile.AreaPermyriad < distanceLimits.FaceAreaPermyriad)
+                continue;
+            if (locationContainer.FaceFile.ConfidencePercent < distanceLimits.FaceConfidencePercent)
+                continue;
+            results.Add(locationContainer);
+        }
+        return results;
+    }
+
+    public static FaceDistanceContainer[] FilteredPostLoadFaceDistanceContainers(MapLogic mapLogic, ReadOnlyCollection<FaceDistanceContainer> faceDistanceContainers, long? skipOlderThan, DistanceLimits distanceLimits)
     {
         List<FaceDistanceContainer> results = [];
         foreach (FaceDistanceContainer faceDistanceContainer in faceDistanceContainers)
@@ -431,7 +544,8 @@ public partial class E_Distance : IDistance
             if (faceDistanceContainer.Face.Mapping.MappingFromLocation.AreaPermyriad < distanceLimits.FaceAreaPermyriad)
                 continue;
             if (faceDistanceContainer.Face.Mapping.MappingFromFilterPre.InSkipCollection is not null && faceDistanceContainer.Face.Mapping.MappingFromFilterPre.InSkipCollection.Value)
-                throw new NotSupportedException(nameof(PreFilterSetFaceDistances));
+                // throw new NotSupportedException(nameof(PreFilterSetFaceDistances));
+                continue;
             if (faceDistanceContainer.Face.Mapping.MappingFromFilterPre.IsFocusModel is not null && !faceDistanceContainer.Face.Mapping.MappingFromFilterPre.IsFocusModel.Value)
                 continue;
             if (faceDistanceContainer.Face.Mapping.MappingFromFilterPre.IsFocusRelativePath is not null && !faceDistanceContainer.Face.Mapping.MappingFromFilterPre.IsFocusRelativePath.Value)
@@ -445,7 +559,46 @@ public partial class E_Distance : IDistance
         return results.ToArray();
     }
 
-    public static ReadOnlyCollection<SortingContainer> SetFaceMappingSortingCollectionThenGetSortedSortingContainers(int maxDegreeOfParallelism, Map.Models.Configuration mapConfiguration, long ticks, Map.Models.MapLogic mapLogic, IDistanceLimits distanceLimits, ReadOnlyCollection<FaceDistance> faceDistanceEncodings, FaceDistanceContainer[] filteredFaceDistanceContainers)
+    private static ReadOnlyCollection<LocationContainer> GetReadOnlyLocationContainer(ReadOnlyDictionary<int, ReadOnlyDictionary<int, LocationContainer>> mappedWithEncoding, List<LocationContainer> postFiltered)
+    {
+        List<LocationContainer> results = [];
+        foreach (LocationContainer locationContainer in postFiltered)
+            results.Add(locationContainer);
+        foreach (KeyValuePair<int, ReadOnlyDictionary<int, LocationContainer>> keyValuePair in mappedWithEncoding)
+        {
+            foreach (KeyValuePair<int, LocationContainer> keyValue in keyValuePair.Value)
+                results.Add(keyValue.Value);
+        }
+        return new(results);
+    }
+
+    public static ReadOnlyCollection<LocationContainer> GetMatrixLocationContainers(IDlibDotNet dlibDotNet, Configuration mapConfiguration, long ticks, MapLogic mapLogic, ReadOnlyDictionary<int, ReadOnlyDictionary<int, LocationContainer>> mappedWithEncoding, List<LocationContainer> preFiltered, DistanceLimits distanceLimits, List<LocationContainer> postFiltered)
+    {
+        List<LocationContainer> results = [];
+        ReadOnlyCollection<LocationContainer> locationContainers;
+        ReadOnlyCollection<LocationContainer> readOnlyLocationContainers = GetReadOnlyLocationContainer(mappedWithEncoding, postFiltered);
+        foreach (LocationContainer locationContainer in postFiltered)
+        {
+            dlibDotNet.Tick();
+            locationContainers = FaceRecognition.GetLocationContainers(mapConfiguration.FaceDistancePermyriad, readOnlyLocationContainers, locationContainer);
+            foreach (LocationContainer item in locationContainers)
+            {
+                if (item.LengthPermyriad is null)
+                    continue;
+                if (item.LengthPermyriad > distanceLimits.FaceDistancePermyriad)
+                    break;
+                if (!mapConfiguration.SaveSortingWithoutPerson && item.PersonKey is null)
+                    continue;
+                if (item.Id == locationContainer.Id && item.WholePercentages == locationContainer.WholePercentages)
+                    continue;
+                results.Add(item);
+            }
+        }
+        LocationContainer[] array = results.OrderBy(l => l.LengthPermyriad).ToArray();
+        return new(array);
+    }
+
+    public static ReadOnlyCollection<SortingContainer> SetFaceMappingSortingCollectionThenGetSortedSortingContainers(int maxDegreeOfParallelism, Configuration mapConfiguration, long ticks, MapLogic mapLogic, IDistanceLimits distanceLimits, ReadOnlyCollection<FaceDistance> faceDistanceEncodings, FaceDistanceContainer[] filteredFaceDistanceContainers)
     {
         List<SortingContainer> results = [];
         int totalSeconds = (int)Math.Floor(new TimeSpan(DateTime.Now.Ticks - ticks).TotalSeconds);
@@ -469,13 +622,13 @@ public partial class E_Distance : IDistance
             }
         });
         if (distanceLimits is not null && distanceLimits.RangeDaysDeltaTargetLessThenUpper)
-            results = Shared.Models.Stateless.Methods.ISortingContainer.Sort(results);
+            results = ISortingContainer.Sort(results);
         else
-            results = Shared.Models.Stateless.Methods.ISortingContainer.SortUsingDaysDelta(results);
+            results = ISortingContainer.SortUsingDaysDelta(results);
         return new(results);
     }
 
-    private static ReadOnlyCollection<RelationContainer> GetRelationCollections(int faceDistancePermyriad, int locationContainerDistanceTake, float distanceTolerance, List<Record> records)
+    private static ReadOnlyCollection<RelationContainer> GetRelationCollections(IDistanceLimits distanceLimits, int faceDistancePermyriad, int locationContainerDistanceTake, float distanceTolerance, List<Record> records)
     {
         List<RelationContainer> results = [];
         string fileName;
@@ -495,6 +648,7 @@ public partial class E_Distance : IDistance
         foreach (Record record in records)
         {
             mappedRelations = [];
+            FaceDistance faceDistanceLength;
             fileHolder = Shared.Models.Stateless.Methods.IFileHolder.Get(record.FilePath.FullName);
             if (files.Count > 1)
             {
@@ -507,10 +661,12 @@ public partial class E_Distance : IDistance
                     fileName = Path.GetFileName(files[i]);
                     if (fileName == fileHolder.Name)
                         continue;
-                    FaceDistance faceDistance = faceDistanceLengths[i];
-                    if (faceDistance.Length is null || faceDistance.Length.Value > distanceTolerance)
+                    faceDistanceLength = faceDistanceLengths[i];
+                    if (faceDistanceLength.Length is null || faceDistanceLength.Length > distanceLimits.RangeDistanceToleranceUpperLimit)
                         continue;
-                    distancePermyriad = (int)(faceDistance.Length.Value * faceDistancePermyriad);
+                    if (faceDistanceLength.Length is null || faceDistanceLength.Length.Value > distanceTolerance)
+                        continue;
+                    distancePermyriad = (int)(faceDistanceLength.Length.Value * faceDistancePermyriad);
                     mappedRelations.Add(new(distancePermyriad, files[i]));
                 }
             }
@@ -520,7 +676,7 @@ public partial class E_Distance : IDistance
         return new(results);
     }
 
-    ReadOnlyCollection<RelationContainer> IDistance.GetRelationContainers(int faceDistancePermyriad, int locationContainerDistanceTake, float locationContainerDistanceTolerance, ReadOnlyCollection<LocationContainer> locationContainers)
+    ReadOnlyCollection<RelationContainer> IDistance.GetRelationContainers(IDistanceLimits distanceLimits, int faceDistancePermyriad, int locationContainerDistanceTake, float locationContainerDistanceTolerance, ReadOnlyCollection<LocationContainer> locationContainers)
     {
         ReadOnlyCollection<RelationContainer> result;
         string? json;
@@ -538,7 +694,7 @@ public partial class E_Distance : IDistance
             faceRecognitionDotNetFaceEncoding = FaceRecognition.LoadFaceEncoding(modelsFaceEncoding.RawEncoding);
             records.Add(new(locationContainer.FilePath, faceRecognitionDotNetFaceEncoding));
         }
-        result = GetRelationCollections(faceDistancePermyriad, locationContainerDistanceTake, locationContainerDistanceTolerance, records);
+        result = GetRelationCollections(distanceLimits, faceDistancePermyriad, locationContainerDistanceTake, locationContainerDistanceTolerance, records);
         return result;
     }
 

Drag-Drop-Explorer/DragDropExplorer.cs

@@ -59,7 +59,7 @@ public partial class DragDropExplorer : Form
         Controls.Add(_FirstTextBox);
     }
 
-    void Form1_Load(object? sender, EventArgs e)
+    private void Form1_Load(object? sender, EventArgs e)
     {
         try
         {
@@ -81,7 +81,7 @@ public partial class DragDropExplorer : Form
         return result;
     }
 
-    void TextBox_LostFocus(object? sender, EventArgs e)
+    private void TextBox_LostFocus(object? sender, EventArgs e)
     {
         try
         {
@@ -99,7 +99,7 @@ public partial class DragDropExplorer : Form
         }
     }
 
-    void Form1_DragEnter(object? sender, DragEventArgs e)
+    private void Form1_DragEnter(object? sender, DragEventArgs e)
     {
         try
         {
@@ -112,7 +112,7 @@ public partial class DragDropExplorer : Form
         }
     }
 
-    void Form1_DragDrop(object? sender, DragEventArgs e)
+    private void Form1_DragDrop(object? sender, DragEventArgs e)
     {
         try
         {

Drag-Drop-Explorer/Models/Binder/AppSettings.cs

@@ -20,6 +20,23 @@ public class AppSettings
         return result;
     }
 
+    private static void PreVerify(IConfigurationRoot configurationRoot, AppSettings? appSettings)
+    {
+        if (appSettings?.Company is null)
+        {
+            List<string> paths = [];
+            foreach (IConfigurationProvider configurationProvider in configurationRoot.Providers)
+            {
+                if (configurationProvider is not Microsoft.Extensions.Configuration.Json.JsonConfigurationProvider jsonConfigurationProvider)
+                    continue;
+                if (jsonConfigurationProvider.Source.FileProvider is not Microsoft.Extensions.FileProviders.PhysicalFileProvider physicalFileProvider)
+                    continue;
+                paths.Add(physicalFileProvider.Root);
+            }
+            throw new NotSupportedException($"Not found!{Environment.NewLine}{string.Join(Environment.NewLine, paths.Distinct())}");
+        }
+    }
+
     private static Models.AppSettings Get(AppSettings? appSettings)
     {
         Models.AppSettings result;
@@ -36,7 +53,10 @@ public class AppSettings
     public static Models.AppSettings Get(IConfigurationRoot configurationRoot)
     {
         Models.AppSettings result;
+#pragma warning disable IL3050, IL2026
         AppSettings? appSettings = configurationRoot.Get<AppSettings>();
+#pragma warning restore IL3050, IL2026
+        PreVerify(configurationRoot, appSettings);
         result = Get(appSettings);
         return result;
     }

Drag-Drop-Explorer/Program.cs

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

Drag-Drop-Move/Models/Binder/AppSettings.cs

@@ -16,6 +16,23 @@ public class AppSettings
         return result;
     }
 
+    private static void PreVerify(IConfigurationRoot configurationRoot, AppSettings? appSettings)
+    {
+        if (appSettings?.Company is null)
+        {
+            List<string> paths = [];
+            foreach (IConfigurationProvider configurationProvider in configurationRoot.Providers)
+            {
+                if (configurationProvider is not Microsoft.Extensions.Configuration.Json.JsonConfigurationProvider jsonConfigurationProvider)
+                    continue;
+                if (jsonConfigurationProvider.Source.FileProvider is not Microsoft.Extensions.FileProviders.PhysicalFileProvider physicalFileProvider)
+                    continue;
+                paths.Add(physicalFileProvider.Root);
+            }
+            throw new NotSupportedException($"Not found!{Environment.NewLine}{string.Join(Environment.NewLine, paths.Distinct())}");
+        }
+    }
+
     private static Models.AppSettings Get(AppSettings? appSettings)
     {
         Models.AppSettings result;
@@ -36,7 +53,10 @@ public class AppSettings
     public static Models.AppSettings Get(IConfigurationRoot configurationRoot)
     {
         Models.AppSettings result;
+#pragma warning disable IL3050, IL2026
         AppSettings? appSettings = configurationRoot.Get<AppSettings>();
+#pragma warning restore IL3050, IL2026
+        PreVerify(configurationRoot, appSettings);
         result = Get(appSettings);
         return result;
     }

Drag-Drop-Move/Program.cs

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

Drag-Drop-Search/DragDropSearch.cs

@@ -64,7 +64,7 @@ public partial class DragDropSearch : Form
         Controls.Add(_TextBox);
     }
 
-    void Form1_Load(object? sender, EventArgs e)
+    private void Form1_Load(object? sender, EventArgs e)
     {
         try
         {
@@ -79,7 +79,7 @@ public partial class DragDropSearch : Form
         }
     }
 
-    void TextBox_LostFocus(object? sender, EventArgs e)
+    private void TextBox_LostFocus(object? sender, EventArgs e)
     {
         try
         {
@@ -92,7 +92,7 @@ public partial class DragDropSearch : Form
         }
     }
 
-    void Form1_DragEnter(object? sender, DragEventArgs e)
+    private void Form1_DragEnter(object? sender, DragEventArgs e)
     {
         try
         {
@@ -105,7 +105,7 @@ public partial class DragDropSearch : Form
         }
     }
 
-    void LoadData()
+    private void LoadData()
     {
         Container[] containers;
         string aPropertySingletonDirectory = Property.Models.Stateless.IResult.GetResultsDateGroupDirectory(_Configuration.PropertyConfiguration, nameof(A_Property), "{}");
@@ -160,15 +160,15 @@ public partial class DragDropSearch : Form
                 LoadData();
             if (int.TryParse(segments[0], out int id) && _IdToItem.TryGetValue(id, out Item? item))
             {
-                Text = item.ImageFileHolder.Name;
-                _TextBox.Text = item.ImageFileHolder.FullName;
-                if (!string.IsNullOrEmpty(item.ImageFileHolder.DirectoryName))
-                    _ = Process.Start("explorer.exe", string.Concat("\"", item.ImageFileHolder.DirectoryName, "\""));
+                Text = item.FilePath.Name;
+                _TextBox.Text = item.FilePath.FullName;
+                if (!string.IsNullOrEmpty(item.FilePath.DirectoryName))
+                    _ = Process.Start("explorer.exe", string.Concat("\"", item.FilePath.DirectoryName, "\""));
             }
         }
     }
 
-    void Form1_DragDrop(object? sender, DragEventArgs e)
+    private void Form1_DragDrop(object? sender, DragEventArgs e)
     {
         try
         {

Drag-Drop-Search/Models/Binder/AppSettings.cs

@@ -20,6 +20,23 @@ public class AppSettings
         return result;
     }
 
+    private static void PreVerify(IConfigurationRoot configurationRoot, AppSettings? appSettings)
+    {
+        if (appSettings?.Company is null)
+        {
+            List<string> paths = [];
+            foreach (IConfigurationProvider configurationProvider in configurationRoot.Providers)
+            {
+                if (configurationProvider is not Microsoft.Extensions.Configuration.Json.JsonConfigurationProvider jsonConfigurationProvider)
+                    continue;
+                if (jsonConfigurationProvider.Source.FileProvider is not Microsoft.Extensions.FileProviders.PhysicalFileProvider physicalFileProvider)
+                    continue;
+                paths.Add(physicalFileProvider.Root);
+            }
+            throw new NotSupportedException($"Not found!{Environment.NewLine}{string.Join(Environment.NewLine, paths.Distinct())}");
+        }
+    }
+
     private static Models.AppSettings Get(AppSettings? appSettings)
     {
         Models.AppSettings result;
@@ -36,7 +53,10 @@ public class AppSettings
     public static Models.AppSettings Get(IConfigurationRoot configurationRoot)
     {
         Models.AppSettings result;
+#pragma warning disable IL3050, IL2026
         AppSettings? appSettings = configurationRoot.Get<AppSettings>();
+#pragma warning restore IL3050, IL2026
+        PreVerify(configurationRoot, appSettings);
         result = Get(appSettings);
         return result;
     }

Drag-Drop-Search/Models/Binder/Configuration.cs

@@ -7,8 +7,6 @@ namespace View_by_Distance.Drag_Drop.Models.Binder;
 public class Configuration
 {
 
-#nullable disable
-
     public bool? CheckDFaceAndUpWriteDates { get; set; }
     public bool? CheckJsonForDistanceResults { get; set; }
     public int? CrossDirectoryMaxItemsInDistanceCollection { get; set; }
@@ -16,40 +14,38 @@ public class Configuration
     public bool? ForceFaceLastWriteTimeToCreationTime { get; set; }
     public bool? ForceMetadataLastWriteTimeToCreationTime { get; set; }
     public bool? ForceResizeLastWriteTimeToCreationTime { get; set; }
-    public string[] IgnoreExtensions { get; set; }
-    public string[] JLinks { get; set; }
-    public string[] LoadOrCreateThenSaveDistanceResultsForOutputResolutions { get; set; }
-    public string[] LoadOrCreateThenSaveImageFacesResultsForOutputResolutions { get; set; }
-    public string[] MixedYearRelativePaths { get; set; }
-    public string ModelDirectory { get; set; }
-    public string ModelName { get; set; }
+    public string[]? IgnoreExtensions { get; set; }
+    public string[]? JLinks { get; set; }
+    public string[]? LoadOrCreateThenSaveDistanceResultsForOutputResolutions { get; set; }
+    public string[]? LoadOrCreateThenSaveImageFacesResultsForOutputResolutions { get; set; }
+    public string[]? MixedYearRelativePaths { get; set; }
+    public string? ModelDirectory { get; set; }
+    public string? ModelName { get; set; }
     public int? NumberOfJitters { get; set; }
     public int? NumberOfTimesToUpsample { get; set; }
-    public string OutputExtension { get; set; }
+    public string? OutputExtension { get; set; }
     public int? OutputQuality { get; set; }
-    public string[] OutputResolutions { get; set; }
+    public string[]? OutputResolutions { get; set; }
     public bool? OverrideForFaceImages { get; set; }
     public bool? OverrideForFaceLandmarkImages { get; set; }
     public bool? OverrideForResizeImages { get; set; }
-    public string PersonBirthdayFormat { get; set; }
-    public string PredictorModelName { get; set; }
+    public string? PersonBirthdayFormat { get; set; }
+    public string? PredictorModelName { get; set; }
     public bool? PropertiesChangedForDistance { get; set; }
     public bool? PropertiesChangedForFaces { get; set; }
     public bool? PropertiesChangedForIndex { get; set; }
     public bool? PropertiesChangedForMetadata { get; set; }
     public bool? PropertiesChangedForResize { get; set; }
-    public Property.Models.Configuration PropertyConfiguration { get; set; }
+    public Property.Models.Configuration? PropertyConfiguration { get; set; }
     public bool? Reverse { get; set; }
-    public string[] SaveFaceLandmarkForOutputResolutions { get; set; }
+    public string[]? SaveFaceLandmarkForOutputResolutions { get; set; }
     public bool? SaveFullYearOfRandomFiles { get; set; }
-    public string[] SaveFilteredOriginalImagesFromJLinksForOutputResolutions { get; set; }
-    public string[] SaveShortcutsForOutputResolutions { get; set; }
+    public string[]? SaveFilteredOriginalImagesFromJLinksForOutputResolutions { get; set; }
+    public string[]? SaveShortcutsForOutputResolutions { get; set; }
     public bool? SaveResizedSubfiles { get; set; }
     public bool? SkipSearch { get; set; }
     public bool? TestDistanceResults { get; set; }
-    public string[] ValidResolutions { get; set; }
-
-#nullable restore
+    public string[]? ValidResolutions { get; set; }
 
     public override string ToString()
     {
@@ -57,10 +53,28 @@ public class Configuration
         return result;
     }
 
+    private static void PreVerify(IConfigurationRoot configurationRoot, Configuration? configuration)
+    {
+        if (configuration?.CheckDFaceAndUpWriteDates is null)
+        {
+            List<string> paths = [];
+            foreach (IConfigurationProvider configurationProvider in configurationRoot.Providers)
+            {
+                if (configurationProvider is not Microsoft.Extensions.Configuration.Json.JsonConfigurationProvider jsonConfigurationProvider)
+                    continue;
+                if (jsonConfigurationProvider.Source.FileProvider is not Microsoft.Extensions.FileProviders.PhysicalFileProvider physicalFileProvider)
+                    continue;
+                paths.Add(physicalFileProvider.Root);
+            }
+            throw new NotSupportedException($"Not found!{Environment.NewLine}{string.Join(Environment.NewLine, paths.Distinct())}");
+        }
+    }
+
     private static Models.Configuration Get(Configuration? configuration)
     {
         Models.Configuration result;
         if (configuration is null) throw new NullReferenceException(nameof(configuration));
+        if (configuration.PropertyConfiguration is null) throw new NullReferenceException(nameof(configuration.PropertyConfiguration));
         if (configuration.CheckDFaceAndUpWriteDates is null) throw new NullReferenceException(nameof(configuration.CheckDFaceAndUpWriteDates));
         if (configuration.CheckJsonForDistanceResults is null) throw new NullReferenceException(nameof(configuration.CheckJsonForDistanceResults));
         if (configuration.CrossDirectoryMaxItemsInDistanceCollection is null) throw new NullReferenceException(nameof(configuration.CrossDirectoryMaxItemsInDistanceCollection));
@@ -68,18 +82,23 @@ public class Configuration
         if (configuration.ForceFaceLastWriteTimeToCreationTime is null) throw new NullReferenceException(nameof(configuration.ForceFaceLastWriteTimeToCreationTime));
         if (configuration.ForceMetadataLastWriteTimeToCreationTime is null) throw new NullReferenceException(nameof(configuration.ForceMetadataLastWriteTimeToCreationTime));
         if (configuration.ForceResizeLastWriteTimeToCreationTime is null) throw new NullReferenceException(nameof(configuration.ForceResizeLastWriteTimeToCreationTime));
+        if (configuration.JLinks is null) throw new NullReferenceException(nameof(configuration.JLinks));
         if (configuration.IgnoreExtensions is null) throw new NullReferenceException(nameof(configuration.IgnoreExtensions));
         configuration.LoadOrCreateThenSaveDistanceResultsForOutputResolutions ??= [];
         configuration.LoadOrCreateThenSaveImageFacesResultsForOutputResolutions ??= [];
         if (configuration.MixedYearRelativePaths is null) throw new NullReferenceException(nameof(configuration.MixedYearRelativePaths));
+        if (configuration.ModelDirectory is null) throw new NullReferenceException(nameof(configuration.ModelDirectory));
+        if (configuration.ModelName is null) throw new NullReferenceException(nameof(configuration.ModelName));
         if (configuration.NumberOfJitters is null) throw new NullReferenceException(nameof(configuration.NumberOfJitters));
         if (configuration.NumberOfTimesToUpsample is null) throw new NullReferenceException(nameof(configuration.NumberOfTimesToUpsample));
+        if (configuration.OutputExtension is null) throw new NullReferenceException(nameof(configuration.OutputExtension));
         if (configuration.OutputQuality is null) throw new NullReferenceException(nameof(configuration.OutputQuality));
         if (configuration.OutputResolutions is null) throw new NullReferenceException(nameof(configuration.OutputResolutions));
         if (configuration.OverrideForFaceImages is null) throw new NullReferenceException(nameof(configuration.OverrideForFaceImages));
         if (configuration.OverrideForFaceLandmarkImages is null) throw new NullReferenceException(nameof(configuration.OverrideForFaceLandmarkImages));
         if (configuration.OverrideForResizeImages is null) throw new NullReferenceException(nameof(configuration.OverrideForResizeImages));
         if (configuration.PersonBirthdayFormat is null) throw new NullReferenceException(nameof(configuration.PersonBirthdayFormat));
+        if (configuration.PredictorModelName is null) throw new NullReferenceException(nameof(configuration.PredictorModelName));
         if (configuration.PropertiesChangedForDistance is null) throw new NullReferenceException(nameof(configuration.PropertiesChangedForDistance));
         if (configuration.PropertiesChangedForFaces is null) throw new NullReferenceException(nameof(configuration.PropertiesChangedForFaces));
         if (configuration.PropertiesChangedForIndex is null) throw new NullReferenceException(nameof(configuration.PropertiesChangedForIndex));
@@ -141,14 +160,19 @@ public class Configuration
         Models.Configuration result;
         Configuration? configuration;
         if (isEnvironment is null)
+#pragma warning disable IL3050, IL2026
             configuration = configurationRoot.Get<Configuration>();
+#pragma warning restore IL3050, IL2026
         else
         {
             string environmentName = IsEnvironment.GetEnvironmentName(isEnvironment);
             string section = string.Concat(environmentName, ":", nameof(Configuration));
             IConfigurationSection configurationSection = configurationRoot.GetSection(section);
+#pragma warning disable IL3050, IL2026
             configuration = configurationSection.Get<Configuration>();
+#pragma warning restore IL3050, IL2026
         }
+        PreVerify(configurationRoot, configuration);
         result = Get(configuration);
         return result;
     }

Drag-Drop-Search/Program.cs

@@ -8,7 +8,7 @@ public class Program
     ///  The main entry point for the application.
     /// </summary>
     [STAThread]
-    static void Main()
+    private static void Main()
     {
         ApplicationConfiguration.Initialize();
         Application.Run(new DragDropSearch());
@@ -19,9 +19,8 @@ public class Program
         List<Item> results = [];
         foreach (Item item in container.Items)
         {
-            if (item.ImageFileHolder is not null
-                && item.IsValidImageFormatExtension
-                && !configuration.IgnoreExtensions.Contains(item.ImageFileHolder.ExtensionLowered))
+            if (item.IsValidImageFormatExtension
+                && !configuration.IgnoreExtensions.Contains(item.FilePath.ExtensionLowered))
                 results.Add(item);
         }
         return results.ToArray();

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

@@ -116,7 +116,7 @@ public partial class DragDropSetPropertyItem : Form
             fileHolder = IFileHolder.Get(file);
             isValidImageFormatExtension = _PropertyConfiguration.ValidImageFormatExtensions.Contains(fileHolder.ExtensionLowered);
             isIgnoreExtension = isValidImageFormatExtension && _PropertyConfiguration.IgnoreExtensions.Contains(fileHolder.ExtensionLowered);
-            (dateTimeOriginal, _, id, message) = Property.Models.Stateless.IProperty.Get(_PropertyConfiguration.PopulatePropertyId, fileHolder, isIgnoreExtension, isValidImageFormatExtension, asciiEncoding);
+            (dateTimeOriginal, _, id, message) = Property.Models.Stateless.IProperty.Get(_PropertyConfiguration, _PropertyConfiguration.PopulatePropertyId, fileHolder, isIgnoreExtension, isValidImageFormatExtension, asciiEncoding);
             if (message is not null)
                 throw new Exception(message);
             if (id is null)
@@ -165,7 +165,7 @@ public partial class DragDropSetPropertyItem : Form
             bitmap.SetPropertyItem(propertyItem);
             bitmap.Save(checkFile);
             bitmap.Dispose();
-            (_, _, id, message) = Property.Models.Stateless.IProperty.Get(_PropertyConfiguration.PopulatePropertyId, record.FileHolder, record.IsIgnoreExtension, record.IsValidImageFormatExtension, asciiEncoding);
+            (_, _, id, message) = Property.Models.Stateless.IProperty.Get(_PropertyConfiguration, _PropertyConfiguration.PopulatePropertyId, record.FileHolder, record.IsIgnoreExtension, record.IsValidImageFormatExtension, asciiEncoding);
             if (id is null || id.Value != record.Id)
                 throw new NotSupportedException();
             File.Delete(record.FileHolder.FullName);

Drag-Drop-Set-Property-Item/Models/Binder/AppSettings.cs

@@ -17,6 +17,23 @@ public class AppSettings
         return result;
     }
 
+    private static void PreVerify(IConfigurationRoot configurationRoot, AppSettings? appSettings)
+    {
+        if (appSettings?.Company is null)
+        {
+            List<string> paths = [];
+            foreach (IConfigurationProvider configurationProvider in configurationRoot.Providers)
+            {
+                if (configurationProvider is not Microsoft.Extensions.Configuration.Json.JsonConfigurationProvider jsonConfigurationProvider)
+                    continue;
+                if (jsonConfigurationProvider.Source.FileProvider is not Microsoft.Extensions.FileProviders.PhysicalFileProvider physicalFileProvider)
+                    continue;
+                paths.Add(physicalFileProvider.Root);
+            }
+            throw new NotSupportedException($"Not found!{Environment.NewLine}{string.Join(Environment.NewLine, paths.Distinct())}");
+        }
+    }
+
     private static Models.AppSettings Get(AppSettings? appSettings)
     {
         Models.AppSettings result;
@@ -36,7 +53,10 @@ public class AppSettings
     public static Models.AppSettings Get(IConfigurationRoot configurationRoot)
     {
         Models.AppSettings result;
+#pragma warning disable IL3050, IL2026
         AppSettings? appSettings = configurationRoot.Get<AppSettings>();
+#pragma warning restore IL3050, IL2026
+        PreVerify(configurationRoot, appSettings);
         result = Get(appSettings);
         return result;
     }

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

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

Duplicate-Search/DuplicateSearch.cs

@@ -2,6 +2,7 @@
 using Microsoft.Extensions.Logging;
 using Phares.Shared;
 using ShellProgressBar;
+using System.Collections.ObjectModel;
 using System.Text;
 using System.Text.Json;
 using View_by_Distance.Duplicate.Search.Models;
@@ -29,9 +30,9 @@ public class DuplicateSearch
         else
         {
             Configuration.Verify(configuration, requireExist: false);
+            Container[] containers = GetContainers(ticks, configuration);
             string argZero = args.Count > 0 ? Path.GetFullPath(args[0]) : Path.GetFullPath(configuration.RootDirectory);
             bool argZeroIsConfigurationRootDirectory = configuration.RootDirectory == argZero;
-            Container[] containers = GetContainers(appSettings, ticks, argZero, configuration, argZeroIsConfigurationRootDirectory);
             string destinationRoot = Property.Models.Stateless.IResult.GetResultsGroupDirectory(configuration, "Z) Moved");
             List<int> preloadIds = GetPreloadIds(destinationRoot);
             Dictionary<int, List<MappingFromItem?>> idToCollection = GetIdToCollection(argZero, configuration, argZeroIsConfigurationRootDirectory, containers, destinationRoot, preloadIds);
@@ -60,10 +61,10 @@ public class DuplicateSearch
         File.WriteAllText(Path.Combine(alongSideDirectory, $"{directoryName}-{ticks}.json"), json);
     }
 
-    private static void Move(ILogger<Program>? logger, long ticks, string destinationRoot, List<(FileHolder ImageFileHolder, string Destination)> collection)
+    private static void Move(ILogger<Program>? logger, long ticks, string destinationRoot, List<(FilePath FilePath, string Destination)> collection)
     {
         StringBuilder stringBuilder = new();
-        foreach ((FileHolder fileHolder, string destination) in collection)
+        foreach ((FilePath fileHolder, string destination) in collection)
         {
             _ = stringBuilder.AppendLine(fileHolder.FullName);
             _ = stringBuilder.AppendLine(destination);
@@ -77,12 +78,12 @@ public class DuplicateSearch
                 break;
         }
         logger?.LogInformation(". . .");
-        foreach ((FileHolder fileHolder, string destination) in collection)
+        foreach ((FilePath filePath, string destination) in collection)
         {
             try
-            { File.Move(fileHolder.FullName, destination); }
+            { File.Move(filePath.FullName, destination); }
             catch (Exception exception)
-            { logger?.LogError(exception, $"Failed to move <{fileHolder.FullName}>"); }
+            { logger?.LogError(exception, $"Failed to move <{filePath.FullName}>"); }
         }
         logger?.LogInformation($"{collection.Count} file(s) moved");
         for (int y = 0; y < int.MaxValue; y++)
@@ -91,14 +92,14 @@ public class DuplicateSearch
             if (System.Console.ReadKey().Key != ConsoleKey.Y)
                 continue;
             logger?.LogInformation(". . .");
-            foreach ((FileHolder fileHolder, string destination) in collection)
+            foreach ((FilePath filePath, string destination) in collection)
             {
                 if (!File.Exists(destination))
                     continue;
-                if (File.Exists(fileHolder.FullName))
+                if (File.Exists(filePath.FullName))
                     continue;
                 try
-                { File.Move(destination, fileHolder.FullName); }
+                { File.Move(destination, filePath.FullName); }
                 catch (Exception exception)
                 { logger?.LogError(exception, $"Failed to move <{destination}>"); }
             }
@@ -119,12 +120,12 @@ public class DuplicateSearch
             if (System.Console.ReadKey().Key != ConsoleKey.Y)
                 continue;
             logger?.LogInformation(". . .");
-            List<(FileHolder ImageFileHolder, string Destination)> collection = GetCollectionAndCreateDirectories(idToCollection);
+            List<(FilePath FilePath, string Destination)> collection = GetCollectionAndCreateDirectories(idToCollection);
             Move(logger, ticks, destinationRoot, collection);
         }
     }
 
-    private static Container[] GetContainers(AppSettings appSettings, long ticks, string argZero, Configuration configuration, bool argZeroIsConfigurationRootDirectory)
+    private static Container[] GetContainers(long ticks, Configuration configuration)
     {
         int f;
         Container[] containers;
@@ -145,11 +146,11 @@ public class DuplicateSearch
         Dictionary<int, List<MappingFromItem?>> results = [];
         string directory;
         const int zero = 0;
-        Item[] filteredItems;
         FileHolder resizedFileHolder;
         DateTime[] containerDateTimes;
         MappingFromItem? mappingFromItem;
         List<MappingFromItem?>? collection;
+        ReadOnlyCollection<Item> validImageItems;
         const string duplicates = "-Duplicate(s)";
         if (containers.Length != 0)
         {
@@ -162,15 +163,15 @@ public class DuplicateSearch
                 continue;
             if (!argZeroIsConfigurationRootDirectory && !container.SourceDirectory.StartsWith(argZero))
                 continue;
-            filteredItems = Shared.Models.Stateless.Methods.IContainer.GetFilterItems(configuration, container);
-            if (filteredItems.Length == 0)
+            validImageItems = Shared.Models.Stateless.Methods.IContainer.GetValidImageItems(configuration, container);
+            if (validImageItems.Count == 0)
                 continue;
-            containerDateTimes = Shared.Models.Stateless.Methods.IContainer.GetContainerDateTimes(filteredItems);
-            foreach (Item item in filteredItems)
+            containerDateTimes = Shared.Models.Stateless.Methods.IContainer.GetContainerDateTimes(validImageItems);
+            foreach (Item item in validImageItems)
             {
                 if (item.Property?.Id is null)
                 {
-                    if (int.TryParse(item.ImageFileHolder.NameWithoutExtension, out int id))
+                    if (int.TryParse(item.FilePath.NameWithoutExtension, out int id))
                         continue;
                     continue;
                 }
@@ -188,7 +189,7 @@ public class DuplicateSearch
                     if (mappingFromItem is not null)
                     {
                         resizedFileHolder = Shared.Models.Stateless.Methods.IFileHolder.Get(mappingFromItem.ResizedFileHolder.FullName.Replace($"0{duplicates}", $"1{duplicates}"));
-                        collection[0] = new(mappingFromItem.ContainerDateTimes, item.Property.DateTimeDigitized, item.Property.DateTimeOriginal, mappingFromItem.Id, mappingFromItem.ImageFileHolder, mappingFromItem.IsWrongYear, item.Property.Keywords ?? [], mappingFromItem.MinimumDateTime, item.Property.Model, mappingFromItem.RelativePath, resizedFileHolder);
+                        collection[0] = new(mappingFromItem.ContainerDateTimes, item.Property.DateTimeDigitized, item.Property.DateTimeOriginal, mappingFromItem.Id, mappingFromItem.FilePath, mappingFromItem.IsWrongYear, item.Property.Keywords ?? [], mappingFromItem.MinimumDateTime, item.Property.Model, mappingFromItem.RelativePath, resizedFileHolder);
                     }
                 }
                 resizedFileHolder = Shared.Models.Stateless.Methods.IFileHolder.Get(string.Concat(Path.Combine(destinationRoot, directory), item.RelativePath));
@@ -199,9 +200,9 @@ public class DuplicateSearch
         return results;
     }
 
-    private static List<(FileHolder ImageFileHolder, string Destination)> GetCollectionAndCreateDirectories(Dictionary<int, List<MappingFromItem?>> idToCollection)
+    private static List<(FilePath FilePath, string Destination)> GetCollectionAndCreateDirectories(Dictionary<int, List<MappingFromItem?>> idToCollection)
     {
-        List<(FileHolder ImageFileHolder, string Destination)> results = [];
+        List<(FilePath FilePath, string Destination)> results = [];
         List<string> collection = [];
         foreach (KeyValuePair<int, List<MappingFromItem?>> keyValuePair in idToCollection)
         {
@@ -209,10 +210,10 @@ public class DuplicateSearch
             {
                 if (mappingFromItem?.ResizedFileHolder.DirectoryName is null)
                     continue;
-                if (!mappingFromItem.ImageFileHolder.Exists || mappingFromItem.ResizedFileHolder.Exists)
+                if (mappingFromItem.ResizedFileHolder.Exists)
                     continue;
                 collection.Add(mappingFromItem.ResizedFileHolder.DirectoryName);
-                results.Add(new(mappingFromItem.ImageFileHolder, mappingFromItem.ResizedFileHolder.FullName));
+                results.Add(new(mappingFromItem.FilePath, mappingFromItem.ResizedFileHolder.FullName));
             }
         }
         foreach (string directory in collection.Distinct())

Duplicate-Search/Models/Binder/AppSettings.cs

@@ -23,6 +23,23 @@ public class AppSettings
         return result;
     }
 
+    private static void PreVerify(IConfigurationRoot configurationRoot, AppSettings? appSettings)
+    {
+        if (appSettings?.Company is null)
+        {
+            List<string> paths = [];
+            foreach (IConfigurationProvider configurationProvider in configurationRoot.Providers)
+            {
+                if (configurationProvider is not Microsoft.Extensions.Configuration.Json.JsonConfigurationProvider jsonConfigurationProvider)
+                    continue;
+                if (jsonConfigurationProvider.Source.FileProvider is not Microsoft.Extensions.FileProviders.PhysicalFileProvider physicalFileProvider)
+                    continue;
+                paths.Add(physicalFileProvider.Root);
+            }
+            throw new NotSupportedException($"Not found!{Environment.NewLine}{string.Join(Environment.NewLine, paths.Distinct())}");
+        }
+    }
+
     private static Models.AppSettings Get(AppSettings? appSettings)
     {
         Models.AppSettings result;
@@ -46,7 +63,10 @@ public class AppSettings
     public static Models.AppSettings Get(IConfigurationRoot configurationRoot)
     {
         Models.AppSettings result;
+#pragma warning disable IL3050, IL2026
         AppSettings? appSettings = configurationRoot.Get<AppSettings>();
+#pragma warning restore IL3050, IL2026
+        PreVerify(configurationRoot, appSettings);
         result = Get(appSettings);
         return result;
     }

Face/Models/_D_Face.cs

@@ -6,19 +6,20 @@ using System.Text.Json;
 using System.Text.Json.Serialization;
 using View_by_Distance.FaceRecognitionDotNet;
 using View_by_Distance.Metadata.Models;
+using View_by_Distance.Metadata.Models.Stateless.Methods;
 using View_by_Distance.Property.Models;
-using View_by_Distance.Property.Models.Stateless;
 using View_by_Distance.Resize.Models;
 using View_by_Distance.Shared.Models;
 using View_by_Distance.Shared.Models.Properties;
 using View_by_Distance.Shared.Models.Stateless;
+using View_by_Distance.Shared.Models.Stateless.Methods;
 
 namespace View_by_Distance.Face.Models;
 
 /// <summary>
 // List<D_Faces>
 /// </summary>
-public class D_Face
+public class D_Face : IFaceD
 {
 
     protected readonly string _FileNameExtension;
@@ -149,51 +150,66 @@ public class D_Face
 
 #pragma warning disable CA1416
 
-    private void SaveFaces(FileHolder resizedFileHolder, List<(Shared.Models.Face, FileInfo?, string, bool)> collection)
+    private void SaveFaces(FileHolder resizedFileHolder, ExifDirectory exifDirectory, List<(Shared.Models.Face, FileHolder?, string, bool)> collection)
     {
         int width;
         int height;
         Bitmap bitmap;
         short type = 2;
+        FaceFile faceFile;
         Graphics graphics;
         Location? location;
         Rectangle rectangle;
-        string locationJson;
+        string faceFileJson;
         string faceEncodingJson;
         PropertyItem? propertyItem;
-        string outputResolutionJson;
+        string? maker = IMetadata.GetMaker(exifDirectory);
+        string? model = IMetadata.GetModel(exifDirectory);
         using Bitmap source = new(resizedFileHolder.FullName);
-        int artist = MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagArtist;
-        int fileSource = MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagFileSource;
-        int userComment = MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagUserComment;
-        foreach ((Shared.Models.Face face, FileInfo? fileInfo, string fileName, bool save) in collection)
+        MetadataExtractor.GeoLocation? geoLocation = IMetadata.GeoLocation(exifDirectory);
+        const int artist = MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagArtist; // 315
+        const int userComment = MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagUserComment;
+        foreach ((Shared.Models.Face face, FileHolder? fileHolder, string fileName, bool save) in collection)
         {
             if (!save)
                 continue;
-            if (fileInfo is null)
+            if (fileHolder is null)
                 continue;
             if (face.FaceEncoding is null || face?.Location is null || face?.OutputResolution is null)
                 continue;
+            if (_OverrideForFaceImages && fileHolder.Exists)
+            {
+                IFaceD dFace = this;
+                FilePath filePath = FilePath.Get(_PropertyConfiguration, fileHolder, index: null);
+                dFace.ReSaveFace(exifDirectory, filePath, face, mappedFile: false);
+                continue;
+            }
             location = Shared.Models.Stateless.Methods.ILocation.GetLocation(face.Location, Shared.Models.Stateless.ILocation.Digits, Shared.Models.Stateless.ILocation.Factor, source.Height, source.Width, collection.Count);
             if (location is null)
                 continue;
             width = location.Right - location.Left;
             height = location.Bottom - location.Top;
-            locationJson = JsonSerializer.Serialize(face.Location);
             faceEncodingJson = JsonSerializer.Serialize(face.FaceEncoding);
-            outputResolutionJson = JsonSerializer.Serialize(face.OutputResolution);
             rectangle = new Rectangle(location.Left, location.Top, width, height);
+            faceFile = new(face.Mapping?.MappingFromLocation?.AreaPermyriad,
+                           face.Mapping?.MappingFromLocation?.ConfidencePercent,
+                           face.DateTime,
+                           geoLocation?.ToDmsString(),
+                           face.FaceParts,
+                           face.Location,
+                           maker,
+                           model,
+                           face.OutputResolution);
+            faceFileJson = JsonSerializer.Serialize(faceFile, FaceFileGenerationContext.Default.FaceFile);
             using (bitmap = new(width, height))
             {
                 using (graphics = Graphics.FromImage(bitmap))
                     graphics.DrawImage(source, new Rectangle(0, 0, width, height), rectangle, GraphicsUnit.Pixel);
-                propertyItem = IProperty.GetPropertyItem(_ConstructorInfo, fileSource, type, locationJson);
+                propertyItem = Property.Models.Stateless.IProperty.GetPropertyItem(_ConstructorInfo, artist, type, faceFileJson);
                 bitmap.SetPropertyItem(propertyItem);
-                propertyItem = IProperty.GetPropertyItem(_ConstructorInfo, artist, type, outputResolutionJson);
+                propertyItem = Property.Models.Stateless.IProperty.GetPropertyItem(_ConstructorInfo, userComment, type, faceEncodingJson);
                 bitmap.SetPropertyItem(propertyItem);
-                propertyItem = IProperty.GetPropertyItem(_ConstructorInfo, userComment, type, faceEncodingJson);
-                bitmap.SetPropertyItem(propertyItem);
-                bitmap.Save(fileInfo.FullName, _ImageCodecInfo, _EncoderParameters);
+                bitmap.Save(fileHolder.FullName, _ImageCodecInfo, _EncoderParameters);
             }
             if (File.Exists(fileName))
                 File.Delete(fileName);
@@ -213,7 +229,7 @@ public class D_Face
         }
     }
 
-    private List<Shared.Models.Face> GetFaces(string outputResolution, Shared.Models.Property property, MappingFromItem mappingFromItem, Dictionary<string, int[]> outputResolutionToResize, List<Location>? locations)
+    private List<Shared.Models.Face> GetFaces(string outputResolution, Shared.Models.Property property, MappingFromItem mappingFromItem, Dictionary<string, int[]> outputResolutionToResize, List<Location> locations)
     {
         if (_PropertyConfiguration.NumberOfJitters is null)
             throw new NullReferenceException(nameof(_PropertyConfiguration.NumberOfJitters));
@@ -260,73 +276,17 @@ public class D_Face
 
 #pragma warning restore CA1416
 
-    private static List<LocationContainer> GetLocationContainers(string outputResolution, ReadOnlyCollection<LocationContainer> locationContainers, Dictionary<string, int[]> outputResolutionToResize, List<Shared.Models.Face> faces)
-    {
-        List<LocationContainer> results = [];
-        string? json;
-        Location? location;
-        Rectangle? rectangle;
-        List<int> skip = [];
-        OutputResolution? outputResolutionCheck = null;
-        (int outputResolutionWidth, int outputResolutionHeight, int outputResolutionOrientation) = Resize.Models.Stateless.Methods.IResize.Get(outputResolution, outputResolutionToResize);
-        foreach (Shared.Models.Face face in faces)
-        {
-            if (face.Location is null || face.OutputResolution is null)
-                continue;
-            skip.Add(Shared.Models.Stateless.Methods.ILocation.GetWholePercentages(face.Location, Shared.Models.Stateless.ILocation.Digits, face.OutputResolution));
-        }
-        foreach (LocationContainer locationContainer in locationContainers)
-        {
-            if (locationContainer.ExifDirectory is null)
-                continue;
-            if (skip.Contains(locationContainer.WholePercentages))
-                continue;
-            foreach (Shared.Models.Face face in faces)
-            {
-                if (face.Location is not null && face.OutputResolution is not null)
-                    continue;
-                json = Metadata.Models.Stateless.Methods.IMetadata.GetOutputResolution(locationContainer.ExifDirectory);
-                if (json is null)
-                    continue;
-                outputResolutionCheck = JsonSerializer.Deserialize<OutputResolution>(json);
-                if (outputResolutionCheck is null || outputResolutionCheck.Width != outputResolutionWidth || outputResolutionCheck.Height != outputResolutionHeight)
-                    continue;
-                rectangle = Shared.Models.Stateless.Methods.ILocation.GetRectangle(Shared.Models.Stateless.ILocation.Digits, outputResolutionCheck, locationContainer.WholePercentages);
-                if (rectangle is null)
-                    continue;
-                location = Shared.Models.Stateless.Methods.ILocation.GetLocation(outputResolutionHeight, rectangle.Value, outputResolutionWidth);
-                if (location is null)
-                    continue;
-                if (!results.Any(l => l.WholePercentages == locationContainer.WholePercentages))
-                    results.Add(new(locationContainer.CreationDateOnly,
-                                    locationContainer.ExifDirectory,
-                                    locationContainer.DirectoryNumber,
-                                    locationContainer.DisplayDirectoryName,
-                                    locationContainer.FilePath,
-                                    locationContainer.FromDistanceContent,
-                                    locationContainer.Id,
-                                    location,
-                                    locationContainer.PersonKey,
-                                    rectangle.Value,
-                                    locationContainer.WholePercentages));
-            }
-        }
-        if (results.Count > 0)
-            outputResolutionCheck = null;
-        return results;
-    }
-
-    public List<Shared.Models.Face> GetFaces(string outputResolution, string dResultsFullGroupDirectory, FilePath filePath, List<Tuple<string, DateTime>> subFileTuples, List<string> parseExceptions, Shared.Models.Property property, MappingFromItem mappingFromItem, Dictionary<string, int[]> outputResolutionToResize, ReadOnlyCollection<LocationContainer>? locationContainers, List<MappingFromPhotoPrism>? mappingFromPhotoPrismCollection)
+    public List<Shared.Models.Face> GetFaces(string outputResolution, string dResultsFullGroupDirectory, FilePath filePath, List<Tuple<string, DateTime>> subFileTuples, List<string> parseExceptions, Shared.Models.Property property, MappingFromItem mappingFromItem, Dictionary<string, int[]> outputResolutionToResize, List<MappingFromPhotoPrism>? mappingFromPhotoPrismCollection)
     {
         List<Shared.Models.Face>? results;
         if (string.IsNullOrEmpty(dResultsFullGroupDirectory))
             throw new NullReferenceException(nameof(dResultsFullGroupDirectory));
         string? json;
-        List<Location>? locations;
+        List<Location> locations;
         string[] changesFrom = [nameof(A_Property), nameof(B_Metadata), nameof(C_Resize)];
         List<DateTime> dateTimes = (from l in subFileTuples where changesFrom.Contains(l.Item1) select l.Item2).ToList();
         (_, int directoryIndex) = Shared.Models.Stateless.Methods.IPath.GetDirectoryNameAndIndex(_PropertyConfiguration, filePath);
-        FileInfo fileInfo = new(Path.Combine(_FileGroups[_PropertyConfiguration.ResultCollection][directoryIndex], $"{mappingFromItem.ImageFileHolder.NameWithoutExtension}{mappingFromItem.ImageFileHolder.ExtensionLowered}.json"));
+        FileInfo fileInfo = new(Path.Combine(_FileGroups[_PropertyConfiguration.ResultCollection][directoryIndex], $"{mappingFromItem.FilePath.NameWithoutExtension}{mappingFromItem.FilePath.ExtensionLowered}.json"));
         if (_ForceFaceLastWriteTimeToCreationTime && !fileInfo.Exists && File.Exists(Path.ChangeExtension(fileInfo.FullName, ".delete")))
         {
             File.Move(Path.ChangeExtension(fileInfo.FullName, ".delete"), fileInfo.FullName);
@@ -359,16 +319,11 @@ public class D_Face
                 parseExceptions.Add(nameof(D_Face));
             }
         }
-        List<LocationContainer> collection;
-        if (results is null || locationContainers is null)
-            collection = [];
-        else
-            collection = GetLocationContainers(outputResolution, locationContainers, outputResolutionToResize, results);
         if (!_LoadPhotoPrismLocations || mappingFromPhotoPrismCollection is null || results is null)
-            locations = (from l in collection where l is not null select l.Location).ToList();
+            locations = [];
         else
-            locations = Shared.Models.Stateless.Methods.ILocation.GetLocations(collection, results, mappingFromPhotoPrismCollection, _RectangleIntersectMinimum);
-        if (results is null || (locations is not null && locations.Count > 0))
+            locations = Shared.Models.Stateless.Methods.ILocation.GetLocations(results, mappingFromPhotoPrismCollection, _RectangleIntersectMinimum);
+        if (results is null || locations.Count > 0)
         {
             results = GetFaces(outputResolution, property, mappingFromItem, outputResolutionToResize, locations);
             if (results.Count == 0)
@@ -394,16 +349,17 @@ public class D_Face
         return results;
     }
 
-    public List<(Shared.Models.Face, FileInfo?, string, bool)> SaveFaces(string f, string dResultsFullGroupDirectory, FilePath filePath, List<Tuple<string, DateTime>> subFileTuples, List<string> parseExceptions, MappingFromItem mappingFromItem, List<Shared.Models.Face> faces)
+    public List<(Shared.Models.Face, FileHolder?, string, bool)> SaveFaces(string f, string dResultsFullGroupDirectory, FilePath filePath, List<Tuple<string, DateTime>> subFileTuples, List<string> parseExceptions, MappingFromItem mappingFromItem, ExifDirectory exifDirectory, List<Shared.Models.Face> faces)
     {
-        List<(Shared.Models.Face, FileInfo?, string, bool Save)> results = [];
+        List<(Shared.Models.Face, FileHolder?, string, bool Save)> results = [];
         bool save;
         FileInfo fileInfo;
+        FileHolder fileHolder;
         string deterministicHashCodeKey;
         string[] changesFrom = [nameof(A_Property), nameof(B_Metadata), nameof(C_Resize)];
         List<DateTime> dateTimes = (from l in subFileTuples where changesFrom.Contains(l.Item1) select l.Item2).ToList();
         (_, int directoryIndex) = Shared.Models.Stateless.Methods.IPath.GetDirectoryNameAndIndex(_PropertyConfiguration, filePath);
-        string directory = Path.Combine(_FileGroups[_PropertyConfiguration.ResultContent][directoryIndex], mappingFromItem.ImageFileHolder.NameWithoutExtension);
+        string directory = Path.Combine(_FileGroups[_PropertyConfiguration.ResultContent][directoryIndex], mappingFromItem.FilePath.NameWithoutExtension);
         bool directoryExists = Directory.Exists(directory);
         foreach (Shared.Models.Face face in faces)
         {
@@ -414,24 +370,92 @@ public class D_Face
                 continue;
             }
             deterministicHashCodeKey = Shared.Models.Stateless.Methods.IMapping.GetDeterministicHashCodeKey(filePath, face.Location, Shared.Models.Stateless.ILocation.Digits, face.OutputResolution);
-            fileInfo = new FileInfo(Path.Combine(directory, $"{deterministicHashCodeKey}{mappingFromItem.ImageFileHolder.ExtensionLowered}{_FileNameExtension}"));
+            fileInfo = new FileInfo(Path.Combine(directory, $"{deterministicHashCodeKey}{mappingFromItem.FilePath.ExtensionLowered}{_FileNameExtension}"));
+            fileHolder = FileHolder.Get(fileInfo);
             if (!directoryExists)
                 save = true;
             else if (_OverrideForFaceImages)
                 save = true;
-            else if (!fileInfo.Exists)
+            else if (!fileHolder.Exists)
                 save = true;
             else if (_CheckDFaceAndUpWriteDates && dateTimes.Count > 0 && dateTimes.Max() > fileInfo.LastWriteTime)
                 save = true;
-            results.Add(new(face, fileInfo, Path.Combine(directory, $"{deterministicHashCodeKey}{mappingFromItem.ImageFileHolder.ExtensionLowered}{_HiddenFileNameExtension}"), save));
+            results.Add(new(face, fileHolder, Path.Combine(directory, $"{deterministicHashCodeKey}{mappingFromItem.FilePath.ExtensionLowered}{_HiddenFileNameExtension}"), save));
         }
         if (results.Any(l => l.Save))
         {
             if (!directoryExists)
                 _ = Directory.CreateDirectory(directory);
-            SaveFaces(mappingFromItem.ResizedFileHolder, results);
+            SaveFaces(mappingFromItem.ResizedFileHolder, exifDirectory, results);
         }
         return results;
     }
 
+#pragma warning disable CA1416
+
+    private static (string?, string?) Get(string? json)
+    {
+        string? model;
+        string? maker;
+        FaceFile? faceFile = json is null ? null : JsonSerializer.Deserialize(json, FaceFileGenerationContext.Default.FaceFile);
+        if (faceFile is null || faceFile.Location is null)
+            (maker, model) = (null, null);
+        else
+            (maker, model) = (faceFile.Maker, faceFile.Model);
+        return (maker, model);
+    }
+
+    void IFaceD.ReSaveFace(ExifDirectory exifDirectory, FilePath filePath, Shared.Models.Face face, bool mappedFile)
+    {
+        FileInfo fileInfo = new(filePath.FullName);
+        if (fileInfo.Exists)
+        {
+            string? json;
+            short type = 2;
+            string? model;
+            string? maker;
+            string checkFile = $"{filePath.FullName}.exif";
+            const int artist = MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagArtist;
+            // const int author = MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagWinAuthor; // 40093
+            if (mappedFile)
+            {
+                json = IMetadata.GetOutputResolution(exifDirectory);
+                if (json is not null && json.Contains(nameof(DateTime)))
+                    return;
+                (maker, model) = Get(json);
+            }
+            else
+            {
+                maker = IMetadata.GetMaker(exifDirectory);
+                model = IMetadata.GetModel(exifDirectory);
+                ExifDirectory? faceExifDirectory = IMetadata.GetExifDirectory(filePath);
+                json = IMetadata.GetOutputResolution(faceExifDirectory);
+                if (json is not null && json.Contains(nameof(DateTime)))
+                    return;
+            }
+            MetadataExtractor.GeoLocation? geoLocation = IMetadata.GeoLocation(exifDirectory);
+            FaceFile faceFile = new(face.Mapping?.MappingFromLocation?.AreaPermyriad,
+                                    face.Mapping?.MappingFromLocation?.ConfidencePercent,
+                                    face.DateTime,
+                                    geoLocation?.ToDmsString(),
+                                    face.FaceParts,
+                                    face.Location,
+                                    maker,
+                                    model,
+                                    face.OutputResolution);
+            string faceFileJson = JsonSerializer.Serialize(faceFile, FaceFileGenerationContext.Default.FaceFile);
+            ConstructorInfo? constructorInfo = typeof(PropertyItem).GetConstructor(BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.Public, null, [], null) ?? throw new Exception();
+            PropertyItem? propertyItem = Property.Models.Stateless.IProperty.GetPropertyItem(constructorInfo, artist, type, faceFileJson);
+            Bitmap bitmap = new(fileInfo.FullName);
+            bitmap.SetPropertyItem(propertyItem);
+            bitmap.Save(checkFile);
+            bitmap.Dispose();
+            File.SetLastWriteTime(checkFile, fileInfo.LastWriteTime);
+            File.Delete(fileInfo.FullName);
+            File.Move(checkFile, fileInfo.FullName);
+        }
+    }
+
+#pragma warning restore CA1416
+
 }

FaceParts/Models/_D2_FaceParts.cs

@@ -57,10 +57,10 @@ public class D2_FaceParts
             _FileGroups.Add(keyValuePair.Key, keyValuePair.Value);
     }
 
-    public void SetAngleBracketCollection(Configuration configuration, string d2ResultsFullGroupDirectory, string sourceDirectory)
+    public void SetAngleBracketCollection(IPropertyConfiguration propertyConfiguration, string d2ResultsFullGroupDirectory, string sourceDirectory)
     {
         _AngleBracketCollection.Clear();
-        _AngleBracketCollection.AddRange(IResult.GetDirectoryInfoCollection(configuration,
+        _AngleBracketCollection.AddRange(IResult.GetDirectoryInfoCollection(propertyConfiguration,
                                                                             sourceDirectory,
                                                                             d2ResultsFullGroupDirectory,
                                                                             contentDescription: "n gif file(s) for each face found",
@@ -69,18 +69,18 @@ public class D2_FaceParts
                                                                             converted: true));
     }
 
-    public string GetFacePartsDirectory(Configuration configuration, string dResultsFullGroupDirectory, Item item, bool includeNameWithoutExtension)
+    public string GetFacePartsDirectory(IPropertyConfiguration propertyConfiguration, string dResultsFullGroupDirectory, Item item, bool includeNameWithoutExtension)
     {
         string result;
         bool angleBracketCollectionAny = _AngleBracketCollection.Count != 0;
         if (!angleBracketCollectionAny)
         {
-            if (item.ImageFileHolder.DirectoryName is null)
-                throw new NullReferenceException(nameof(item.ImageFileHolder.DirectoryName));
-            SetAngleBracketCollection(configuration, dResultsFullGroupDirectory, item.ImageFileHolder.DirectoryName);
+            if (item.FilePath.DirectoryName is null)
+                throw new NullReferenceException(nameof(item.FilePath.DirectoryName));
+            SetAngleBracketCollection(propertyConfiguration, dResultsFullGroupDirectory, item.FilePath.DirectoryName);
         }
         if (includeNameWithoutExtension)
-            result = Path.Combine(_AngleBracketCollection[0].Replace("<>", _PropertyConfiguration.ResultContent), item.ImageFileHolder.NameWithoutExtension);
+            result = Path.Combine(_AngleBracketCollection[0].Replace("<>", _PropertyConfiguration.ResultContent), item.FilePath.NameWithoutExtension);
         else
         {
             result = _AngleBracketCollection[0].Replace("<>", $"[{_PropertyConfiguration.ResultContent}]");
@@ -259,7 +259,7 @@ public class D2_FaceParts
         string[] changesFrom = [nameof(A_Property), nameof(B_Metadata), nameof(C_Resize), nameof(D_Face)];
         List<DateTime> dateTimes = (from l in subFileTuples where changesFrom.Contains(l.Item1) select l.Item2).ToList();
         (_, int directoryIndex) = Shared.Models.Stateless.Methods.IPath.GetDirectoryNameAndIndex(_PropertyConfiguration, filePath);
-        string directory = Path.Combine(_FileGroups[_PropertyConfiguration.ResultContent][directoryIndex], mappingFromItem.ImageFileHolder.NameWithoutExtension);
+        string directory = Path.Combine(_FileGroups[_PropertyConfiguration.ResultContent][directoryIndex], mappingFromItem.FilePath.NameWithoutExtension);
         bool directoryExists = Directory.Exists(directory);
         foreach (Shared.Models.Face face in faces)
         {
@@ -269,10 +269,10 @@ public class D2_FaceParts
                 continue;
             }
             deterministicHashCodeKey = Shared.Models.Stateless.Methods.IMapping.GetDeterministicHashCodeKey(filePath, face.Location, Shared.Models.Stateless.ILocation.Digits, face.OutputResolution);
-            fileInfo = new FileInfo(Path.Combine(directory, $"{deterministicHashCodeKey}{mappingFromItem.ImageFileHolder.ExtensionLowered}{_FileNameExtension}"));
+            fileInfo = new FileInfo(Path.Combine(directory, $"{deterministicHashCodeKey}{mappingFromItem.FilePath.ExtensionLowered}{_FileNameExtension}"));
             if (string.IsNullOrEmpty(fileInfo.DirectoryName))
                 continue;
-            rotatedFileInfo = new FileInfo(Path.Combine(fileInfo.DirectoryName, $"{deterministicHashCodeKey} - R{mappingFromItem.ImageFileHolder.ExtensionLowered}{_FileNameExtension}"));
+            rotatedFileInfo = new FileInfo(Path.Combine(fileInfo.DirectoryName, $"{deterministicHashCodeKey} - R{mappingFromItem.FilePath.ExtensionLowered}{_FileNameExtension}"));
             collection.Add(new(face, fileInfo.FullName, rotatedFileInfo.FullName));
             if (check)
                 continue;
@@ -302,12 +302,12 @@ public class D2_FaceParts
 
 #pragma warning disable CA1416
 
-    private void SaveFaceLandmarkImage(MappingFromItem mappingFromItem, List<(Shared.Models.Face, FileInfo?, string, bool)> faceCollection, string fileName)
+    private void SaveFaceLandmarkImage(MappingFromItem mappingFromItem, List<(Shared.Models.Face, FileHolder?, string, bool)> faceCollection, string fileName)
     {
         Pen pen;
         using Image image = Image.FromFile(mappingFromItem.ResizedFileHolder.FullName);
         using Graphics graphic = Graphics.FromImage(image);
-        foreach ((Shared.Models.Face face, FileInfo? fileInfo, string _, bool _) in faceCollection)
+        foreach ((Shared.Models.Face face, FileHolder? _, string _, bool _) in faceCollection)
         {
             if (face.FaceEncoding is null || face.Location is null || face.OutputResolution is null || face.FaceParts is null || face.FaceParts.Count == 0)
                 continue;
@@ -327,17 +327,17 @@ public class D2_FaceParts
 
 #pragma warning restore CA1416
 
-    private static bool GetNotMapped(string facePartsCollectionDirectory, List<(Shared.Models.Face Face, FileInfo?, string, bool)> faceCollection)
+    private static bool GetNotMapped(string facePartsCollectionDirectory, List<(Shared.Models.Face Face, FileHolder?, string, bool)> faceCollection)
     {
         bool results = false;
         string checkFile;
-        foreach ((Shared.Models.Face face, FileInfo? fileInfo, string _, bool _) in faceCollection)
+        foreach ((Shared.Models.Face face, FileHolder? fileHolder, string _, bool _) in faceCollection)
         {
             if (face.FaceEncoding is null || face.Location is null || face.OutputResolution is null)
                 continue;
-            if (fileInfo is not null)
+            if (fileHolder is not null)
             {
-                checkFile = Path.Combine(facePartsCollectionDirectory, fileInfo.Name);
+                checkFile = Path.Combine(facePartsCollectionDirectory, fileHolder.Name);
                 if (face.Mapping?.MappingFromPerson is not null)
                 {
                     if (File.Exists(checkFile))
@@ -353,17 +353,17 @@ public class D2_FaceParts
                     if (!results)
                         results = true;
                     if (!File.Exists(checkFile))
-                        File.Copy(fileInfo.FullName, checkFile);
+                        File.Copy(fileHolder.FullName, checkFile);
                 }
             }
         }
         return results;
     }
 
-    public void CopyFacesAndSaveFaceLandmarkImage(string facePartsCollectionDirectory, MappingFromItem mappingFromItem, List<(Shared.Models.Face Face, FileInfo?, string, bool)> faceCollection)
+    public void CopyFacesAndSaveFaceLandmarkImage(string facePartsCollectionDirectory, MappingFromItem mappingFromItem, List<(Shared.Models.Face Face, FileHolder?, string, bool)> faceCollection)
     {
         bool hasNotMapped = GetNotMapped(facePartsCollectionDirectory, faceCollection);
-        string fileName = Path.Combine(facePartsCollectionDirectory, $"{mappingFromItem.ImageFileHolder.Name}{_FileNameExtension}");
+        string fileName = Path.Combine(facePartsCollectionDirectory, $"{mappingFromItem.FilePath.Name}{_FileNameExtension}");
         bool save = faceCollection.Any(l => l.Face.FaceEncoding is not null && l.Face.Location is not null && l.Face.OutputResolution is not null && l.Face.FaceParts is not null && l.Face.FaceParts.Count != 0);
         FileInfo fileInfo = new(fileName);
         if (save && (!fileInfo.Exists || new TimeSpan(DateTime.Now.Ticks - fileInfo.LastWriteTime.Ticks).TotalDays > 10))

FaceRecognitionDotNet/DisposableObject.cs

@@ -26,16 +26,15 @@ public abstract class DisposableObject : IDisposable
     /// <summary>
     /// If this object is disposed, then <see cref="ObjectDisposedException"/> is thrown.
     /// </summary>
-    public void ThrowIfDisposed()
-    {
-        if (IsDisposed)
-            throw new ObjectDisposedException(GetType().FullName);
-    }
+    public void ThrowIfDisposed() =>
+        ObjectDisposedException.ThrowIf(IsDisposed, this);
 
     internal void ThrowIfDisposed(string objectName)
     {
+#pragma warning disable CA1513
         if (IsDisposed)
             throw new ObjectDisposedException(objectName);
+#pragma warning restore CA1513
     }
 
     #region Overrides

FaceRecognitionDotNet/FaceRecognition.cs

@@ -167,7 +167,13 @@ public class FaceRecognition : DisposableObject
         }
         else
         {
-            ShapePredictor posePredictor = _PredictorModel switch { PredictorModel.Large => _PosePredictor68Point, PredictorModel.Small => _PosePredictor5Point, _ => throw new Exception() };
+            ShapePredictor posePredictor = _PredictorModel switch
+            {
+                PredictorModel.Large => _PosePredictor68Point,
+                PredictorModel.Small => _PosePredictor5Point,
+                PredictorModel.Custom => throw new NotImplementedException(),
+                _ => throw new Exception()
+            };
             foreach (Location location in locations)
             {
                 DlibDotNet.Rectangle rectangle = new(location.Left, location.Top, location.Right, location.Bottom);
@@ -197,7 +203,7 @@ public class FaceRecognition : DisposableObject
         return results;
     }
 
-    public List<(Location, FaceEncoding?, Dictionary<FacePart, FacePoint[]>?)> GetCollection(Image image, List<Location>? locations, bool includeFaceEncoding, bool includeFaceParts)
+    public List<(Location, FaceEncoding?, Dictionary<FacePart, FacePoint[]>?)> GetCollection(Image image, List<Location> locations, bool includeFaceEncoding, bool includeFaceParts)
     {
         List<(Location, FaceEncoding?, Dictionary<FacePart, FacePoint[]>?)> results = [];
         if (image is null)
@@ -206,9 +212,7 @@ public class FaceRecognition : DisposableObject
         ThrowIfDisposed();
         if (_PredictorModel == PredictorModel.Custom)
             throw new NotSupportedException("FaceRecognition.PredictorModel.Custom is not supported.");
-        if (locations is null)
-            locations = GetLocations(image);
-        else if (locations.Count == 0)
+        if (locations.Count == 0)
             locations.AddRange(GetLocations(image));
         List<FullObjectDetection> fullObjectDetections = GetFullObjectDetections(image, locations);
         if (fullObjectDetections.Count != locations.Count)
@@ -408,22 +412,50 @@ public class FaceRecognition : DisposableObject
         return null;
     }
 
+    public static ReadOnlyCollection<LocationContainer> GetLocationContainers(int permyriad, ReadOnlyCollection<LocationContainer> readOnlyLocationContainers, LocationContainer locationContainer)
+    {
+        List<LocationContainer> results = [];
+        int lengthPermyriad;
+        if (readOnlyLocationContainers.Count != 0)
+        {
+            double length;
+            LocationContainer result;
+            if (locationContainer.Encoding is not FaceEncoding faceEncodingToCompare)
+                throw new NullReferenceException(nameof(locationContainer));
+            faceEncodingToCompare.ThrowIfDisposed();
+            foreach (LocationContainer item in readOnlyLocationContainers)
+            {
+#pragma warning disable CA1513
+                if (item.Encoding is not FaceEncoding faceEncoding || faceEncoding.IsDisposed)
+                    throw new ObjectDisposedException($"{nameof(item)} contains disposed object.");
+#pragma warning restore CA1513
+                using (Matrix<double> diff = faceEncoding.Encoding - faceEncodingToCompare.Encoding)
+                    length = DlibDotNet.Dlib.Length(diff);
+                lengthPermyriad = (int)(length * permyriad);
+                result = LocationContainer.Get(locationContainer, item, lengthPermyriad, keepExifDirectory: false, keepEncoding: false);
+                results.Add(result);
+            }
+        }
+        LocationContainer[] array = results.OrderBy(l => l.LengthPermyriad).ToArray();
+        return new(array);
+    }
+
     public static List<FaceDistance> FaceDistances(ReadOnlyCollection<FaceDistance> faceDistances, FaceDistance faceDistanceToCompare)
     {
         List<FaceDistance> results = [];
-        if (faceDistances is null)
-            throw new NullReferenceException(nameof(faceDistances));
         if (faceDistances.Count != 0)
         {
             double length;
             FaceDistance result;
-            if (faceDistanceToCompare is null || faceDistanceToCompare.Encoding is not FaceEncoding faceEncodingToCompare)
+            if (faceDistanceToCompare.Encoding is not FaceEncoding faceEncodingToCompare)
                 throw new NullReferenceException(nameof(faceDistanceToCompare));
             faceEncodingToCompare.ThrowIfDisposed();
             foreach (FaceDistance faceDistance in faceDistances)
             {
+#pragma warning disable CA1513
                 if (faceDistance.Encoding is not FaceEncoding faceEncoding || faceEncoding.IsDisposed)
                     throw new ObjectDisposedException($"{nameof(faceDistances)} contains disposed object.");
+#pragma warning restore CA1513
                 using (Matrix<double> diff = faceEncoding.Encoding - faceEncodingToCompare.Encoding)
                     length = DlibDotNet.Dlib.Length(diff);
                 result = new(faceDistance, length);

Instance/DlibDotNet.cs

@@ -22,23 +22,25 @@ using WindowsShortcutFactory;
 
 namespace View_by_Distance.Instance;
 
-public partial class DlibDotNet
+public partial class DlibDotNet : IDlibDotNet, IDisposable
 {
 
     [GeneratedRegex(@"[\\,\/,\:,\*,\?,\"",\<,\>,\|]")]
     private static partial Regex CameraRegex();
 
     private readonly D_Face _Faces;
+    private ProgressBar? _ProgressBar;
     private readonly C_Resize _Resize;
     private readonly F_Random _Random;
     private readonly IConsole _Console;
     private readonly E_Distance _Distance;
-    private readonly IBlurHasher _BlurHasher;
     private readonly D2_FaceParts _FaceParts;
+    private readonly IBlurHasher _BlurHasher;
     private readonly AppSettings _AppSettings;
     private readonly List<string> _Exceptions;
     private readonly ILogger<Program>? _Logger;
     private readonly IsEnvironment _IsEnvironment;
+    private readonly DistanceLimits _DistanceLimits;
     private readonly bool _PropertyRootExistedBefore;
     private readonly Models.Configuration _Configuration;
     private readonly bool _ArgZeroIsConfigurationRootDirectory;
@@ -111,7 +113,8 @@ public partial class DlibDotNet
             (ImageCodecInfo imageCodecInfo, EncoderParameters encoderParameters, string filenameExtension) = C_Resize.GetGifLowQuality();
             _FaceParts = new D2_FaceParts(_Configuration.PropertyConfiguration, imageCodecInfo, encoderParameters, filenameExtension, configuration.CheckDFaceAndUpWriteDates, configuration.OverrideForFaceLandmarkImages);
         }
-        _MapConfiguration = Get(configuration, _Faces.FileNameExtension, _Faces.HiddenFileNameExtension, _FaceParts.FileNameExtension);
+        _DistanceLimits = new(_Configuration.FaceAreaPermyriad, _Configuration.FaceConfidencePercent, _Configuration.FaceDistancePermyriad, _Configuration.RangeDaysDeltaTolerance, _Configuration.RangeDistanceTolerance, _Configuration.RangeFaceAreaPermyriadTolerance, _Configuration.RangeFaceConfidence, _Configuration.SortingMaximumPerFaceShouldBeHigh);
+        _MapConfiguration = Get(configuration, _DistanceLimits, _Faces.FileNameExtension, _Faces.HiddenFileNameExtension, _FaceParts.FileNameExtension);
         _Distance = new(configuration.DistanceMoveUnableToMatch, configuration.DistanceRenameToMatch, configuration.FaceConfidencePercent, configuration.RangeDistanceTolerance, configuration.RectangleIntersectMinimums);
         if (_PropertyRootExistedBefore || !_ArgZeroIsConfigurationRootDirectory)
             personContainers = new(new List<PersonContainer>());
@@ -165,6 +168,15 @@ public partial class DlibDotNet
             _Logger?.LogInformation("First run completed. Run again if wanted");
     }
 
+    void IDlibDotNet.Tick() =>
+        _ProgressBar?.Tick();
+
+    void IDisposable.Dispose()
+    {
+        _ProgressBar?.Dispose();
+        GC.SuppressFinalize(this);
+    }
+
     private static void Verify(Models.Configuration configuration)
     {
         if (configuration.RangeDaysDeltaTolerance.Length != 3)
@@ -232,6 +244,12 @@ public partial class DlibDotNet
             throw new Exception("Configuration has to match interface!");
         if (configuration.LocationFactor != Shared.Models.Stateless.ILocation.Factor)
             throw new Exception("Configuration has to match interface!");
+        if (configuration.SaveSortingWithoutPerson && configuration.JLinks.Length > 0)
+            throw new Exception("Configuration has SaveSortingWithoutPerson and JLinks!");
+        if (configuration.SaveSortingWithoutPerson && !string.IsNullOrEmpty(configuration.FocusModel))
+            throw new Exception("Configuration has SaveSortingWithoutPerson and FocusModel!");
+        if (configuration.SaveSortingWithoutPerson && !string.IsNullOrEmpty(configuration.FocusDirectory))
+            throw new Exception("Configuration has SaveSortingWithoutPerson and FocusDirectory!");
     }
 
     private ReadOnlyCollection<int> GetNotNineCollection(ReadOnlyCollection<string[]> filesCollection)
@@ -255,6 +273,47 @@ public partial class DlibDotNet
         return new(results);
     }
 
+    private static void DeleteContinueFiles(ReadOnlyCollection<PersonContainer> personContainers)
+    {
+        foreach (PersonContainer personContainer in personContainers)
+        {
+            foreach (FilePath filePath in personContainer.DisplayDirectoryAllFilePaths)
+            {
+                if (filePath.ExtensionLowered != ".continue")
+                    continue;
+                File.Delete(filePath.FullName);
+            }
+        }
+    }
+
+    private void MapFaceFileLogic(long ticks, ReadOnlyCollection<PersonContainer> personContainers, MapLogic mapLogic, string? a2PeopleContentDirectory, string eDistanceContentDirectory, ProgressBarOptions options)
+    {
+        foreach (string outputResolution in _Configuration.OutputResolutions)
+        {
+            if (_Exceptions.Count != 0)
+                break;
+            if (!_Configuration.SaveResizedSubfiles)
+                continue;
+            if (!_ArgZeroIsConfigurationRootDirectory)
+                continue;
+            if (outputResolution != _Configuration.OutputResolutions[0])
+                continue;
+            if (_PropertyRootExistedBefore || a2PeopleContentDirectory is null)
+                break;
+            if (!_Configuration.SaveFaceDistancesForOutputResolutions.Contains(outputResolution))
+                continue;
+            if (!_Configuration.LoadOrCreateThenSaveDistanceResultsForOutputResolutions.Contains(outputResolution))
+                continue;
+            List<SaveContainer> saveContainers = GetSaveContainers(ticks, personContainers, a2PeopleContentDirectory, eDistanceContentDirectory, options, mapLogic, outputResolution);
+            if (saveContainers.Count > 0)
+            {
+                int updated = 0;
+                mapLogic.SaveContainers(updated, saveContainers);
+                throw new NotSupportedException("Done Restart! :)");
+            }
+        }
+    }
+
     private void Search(long ticks, ReadOnlyCollection<PersonContainer> personContainers, string argZero, string propertyRoot)
     {
         int t;
@@ -277,9 +336,8 @@ public partial class DlibDotNet
         ReadOnlyCollection<int>? notNineCollection = null;
         ReadOnlyDictionary<long, List<int>> personKeyToIds;
         ReadOnlyCollection<string[]>? filesCollection = null;
-        bool runToDoCollectionFirst = GetRunToDoCollectionFirst(ticks);
-        Dictionary<int, List<MappingFromPhotoPrism>> fileNameToCollection;
         (aResultsFullGroupDirectory, bResultsFullGroupDirectory) = GetResultsFullGroupDirectories();
+        bool runToDoCollectionFirst = GetRunToDoCollectionFirst(_Configuration.PropertyConfiguration, ticks);
         ProgressBarOptions options = new() { ProgressCharacter = '─', ProgressBarOnBottom = true, DisableBottomPercentage = true };
         Shared.Models.Stateless.Methods.IPath.ChangeDateForEmptyDirectories(_Configuration.PropertyConfiguration.RootDirectory, ticks);
         a2PeopleContentDirectory = Property.Models.Stateless.IResult.GetResultsDateGroupDirectory(_Configuration.PropertyConfiguration, nameof(A2_People), "([])");
@@ -341,38 +399,40 @@ public partial class DlibDotNet
         if (filesCollectionRootDirectory is null || filesCollection is null)
             throw new NullReferenceException(nameof(filesCollection));
         message = $") Building Container(s) - {(int)Math.Floor(new TimeSpan(DateTime.Now.Ticks - ticks).TotalSeconds)} total second(s)";
-        using (ProgressBar progressBar = new(2, message, options))
-        {
-            progressBar.Tick();
-            string aPropertySingletonDirectory = Path.Combine(aResultsFullGroupDirectory, _Configuration.PropertyConfiguration.ResultSingleton);
-            if (!Directory.Exists(aPropertySingletonDirectory))
-                _ = Directory.CreateDirectory(aPropertySingletonDirectory);
-            (t, containers) = Shared.Models.Stateless.Methods.IContainer.GetContainers(_Configuration.PropertyConfiguration, aPropertySingletonDirectory, filesCollectionRootDirectory, filesCollection);
-            progressBar.Tick();
-        }
-        fileNameToCollection = !Directory.Exists(fPhotoPrismSingletonDirectory) ? fileNameToCollection = [] : F_PhotoPrism.GetFileNameToCollection(fPhotoPrismSingletonDirectory);
-        B_Metadata metadata = new(_Configuration.PropertyConfiguration, _Configuration.ForceMetadataLastWriteTimeToCreationTime, _Configuration.PropertiesChangedForMetadata, bResultsFullGroupDirectory);
+        string aPropertySingletonDirectory = Path.Combine(aResultsFullGroupDirectory, _Configuration.PropertyConfiguration.ResultSingleton);
+        if (!Directory.Exists(aPropertySingletonDirectory))
+            _ = Directory.CreateDirectory(aPropertySingletonDirectory);
+        _ProgressBar = new(short.MaxValue, message, options);
+        (t, containers) = Shared.Models.Stateless.Methods.IContainer.GetContainers(this, _Configuration.PropertyConfiguration, aPropertySingletonDirectory, filesCollectionRootDirectory, filesCollection);
+        _ProgressBar.Dispose();
+        ReadOnlyCollection<Container> readOnlyContainers = new(containers);
+        SaveDistinctIds(_Configuration.PropertyConfiguration, bResultsFullGroupDirectory, readOnlyContainers);
         mapLogic ??= new(_AppSettings.MaxDegreeOfParallelism, _Configuration.PropertyConfiguration, _MapConfiguration, _Distance, personContainers, ticks, a2PeopleContentDirectory, a2PeopleSingletonDirectory, eDistanceContentDirectory);
-        FullDoWork(argZero, propertyRoot, ticks, aResultsFullGroupDirectory, bResultsFullGroupDirectory, t, containers, propertyLogic, metadata, fileNameToCollection, mapLogic);
-        ReadOnlyCollection<Item> distinctFilteredItems = Shared.Models.Stateless.Methods.IContainer.GetItems(_Configuration.PropertyConfiguration, new(containers), distinctItems: true, filterItems: true);
+        DeleteContinueFiles(personContainers);
+        if (!runToDoCollectionFirst)
+            MapFaceFileLogic(ticks, personContainers, mapLogic, a2PeopleContentDirectory, eDistanceContentDirectory, options);
+        FullDoWork(argZero, propertyRoot, ticks, aResultsFullGroupDirectory, bResultsFullGroupDirectory, fPhotoPrismSingletonDirectory, t, readOnlyContainers, propertyLogic, mapLogic);
+        ReadOnlyCollection<Item> distinctValidImageItems = Shared.Models.Stateless.Methods.IContainer.GetValidImageItems(_Configuration.PropertyConfiguration, readOnlyContainers, distinctItems: true, filterItems: true);
         if (_Configuration.LookForAbandoned)
         {
             string dResultsFullGroupDirectory;
             string d2ResultsFullGroupDirectory;
             foreach (string outputResolution in _Configuration.OutputResolutions)
             {
+                _ProgressBar = new(5, nameof(mapLogic.LookForAbandoned), options);
                 (cResultsFullGroupDirectory, _, dResultsFullGroupDirectory, d2ResultsFullGroupDirectory) = GetResultsFullGroupDirectories(outputResolution);
-                mapLogic.LookForAbandoned(_Configuration.PropertyConfiguration, bResultsFullGroupDirectory, containers, cResultsFullGroupDirectory, dResultsFullGroupDirectory, d2ResultsFullGroupDirectory);
+                mapLogic.LookForAbandoned(this, _Configuration.PropertyConfiguration, bResultsFullGroupDirectory, readOnlyContainers, cResultsFullGroupDirectory, dResultsFullGroupDirectory, d2ResultsFullGroupDirectory);
+                _ProgressBar.Dispose();
             }
         }
         _Distance.Clear();
-        ReadOnlyCollection<Shared.Models.Face> distinctFilteredFaces = Map.Models.Stateless.Methods.IMapLogic.GetFaces(distinctFilteredItems);
-        ReadOnlyCollection<Mapping> distinctFilteredMappingCollection = GetMappings(_Configuration.PropertyConfiguration, eDistanceContentDirectory, containers, mapLogic, distinctItems: true);
+        ReadOnlyCollection<Shared.Models.Face> distinctValidImageFaces = Map.Models.Stateless.Methods.IMapLogic.GetFaces(distinctValidImageItems);
+        ReadOnlyCollection<Mapping> distinctValidImageMappingCollection = GetMappings(_Configuration.PropertyConfiguration, eDistanceContentDirectory, readOnlyContainers, mapLogic, distinctItems: true);
         if (runToDoCollectionFirst)
         {
             if (!Directory.Exists(eDistanceContentDirectory))
                 _ = Directory.CreateDirectory(eDistanceContentDirectory);
-            string json = JsonSerializer.Serialize(distinctFilteredMappingCollection);
+            string json = JsonSerializer.Serialize(distinctValidImageMappingCollection);
             File.WriteAllText(Path.Combine(eDistanceContentDirectory, $"{ticks}.json"), json);
         }
         foreach (string outputResolution in _Configuration.OutputResolutions)
@@ -381,19 +441,19 @@ public partial class DlibDotNet
                 break;
             personKeyToIds = mapLogic.GetPersonKeyToIds();
             if (_Configuration.SavePropertyShortcutsForOutputResolutions.Contains(outputResolution))
-                SavePropertyShortcutsForOutputResolutions(eDistanceContentDirectory, distinctFilteredItems);
+                SavePropertyShortcutsForOutputResolutions(eDistanceContentDirectory, distinctValidImageItems);
             if (!string.IsNullOrEmpty(a2PeopleContentDirectory) && _Configuration.SaveShortcutsForOutputResolutions.Contains(outputResolution))
-                mapLogic.SaveShortcutsForOutputResolutionsPreMapLogic(eDistanceContentDirectory, personKeyToIds, distinctFilteredMappingCollection);
+                mapLogic.SaveShortcutsForOutputResolutionsPreMapLogic(eDistanceContentDirectory, personKeyToIds, distinctValidImageMappingCollection);
             if (!string.IsNullOrEmpty(a2PeopleContentDirectory) && _Configuration.JLinks.Where(l => !string.IsNullOrEmpty(l)).Any() && _Configuration.SaveFilteredOriginalImagesFromJLinksForOutputResolutions.Contains(outputResolution))
-                mapLogic.SaveFilteredOriginalImagesFromJLinks(_Configuration.JLinks, personContainers, a2PeopleContentDirectory, personKeyToIds, distinctFilteredMappingCollection);
+                mapLogic.SaveFilteredOriginalImagesFromJLinks(_Configuration.JLinks, personContainers, a2PeopleContentDirectory, personKeyToIds, distinctValidImageMappingCollection);
             if (_ArgZeroIsConfigurationRootDirectory
                 && _Configuration.SaveResizedSubfiles
                 && outputResolution == _Configuration.OutputResolutions[0]
                 && _Configuration.LoadOrCreateThenSaveDistanceResultsForOutputResolutions.Contains(outputResolution)
                 && _Exceptions.Count == 0)
-                MapLogic(ticks, new(containers), fPhotoPrismContentDirectory, mapLogic, outputResolution, new(personKeyToIds), distinctFilteredFaces, distinctFilteredMappingCollection);
-            if (runToDoCollectionFirst && _Configuration.SaveRandomForOutputResolutions.Contains(outputResolution) && personKeyToIds.Count > 0 && distinctFilteredMappingCollection.Count > 0)
-                _Random.Random(_Configuration.PropertyConfiguration, _Configuration.RadomUseBirthdayMinimum, _Configuration.ValidKeyWordsToIgnoreInRandom, outputResolution, personKeyToIds, notNineCollection, distinctFilteredMappingCollection);
+                MapLogic(ticks, readOnlyContainers, fPhotoPrismContentDirectory, mapLogic, outputResolution, new(personKeyToIds), distinctValidImageFaces, distinctValidImageMappingCollection);
+            if (runToDoCollectionFirst && _Configuration.SaveRandomForOutputResolutions.Contains(outputResolution) && personKeyToIds.Count > 0 && distinctValidImageMappingCollection.Count > 0)
+                _Random.Random(_Configuration.PropertyConfiguration, _Configuration.ImmichAssetsFile, _Configuration.RadomUseBirthdayMinimum, _Configuration.ValidKeyWordsToIgnoreInRandom, personKeyToIds, notNineCollection, distinctValidImageMappingCollection);
             if (_IsEnvironment.Development)
                 continue;
             if (!_IsEnvironment.Development)
@@ -411,47 +471,50 @@ public partial class DlibDotNet
         }
     }
 
-    private bool GetRunToDoCollectionFirst(long ticks)
+    private bool GetRunToDoCollectionFirst(Property.Models.Configuration propertyConfiguration, long ticks)
     {
-        bool result = false;
-        string[] directories;
-        directories = Directory.GetDirectories(_Configuration.PropertyConfiguration.RootDirectory, "*", SearchOption.TopDirectoryOnly);
-        if (directories.Length == 0)
-            result = true;
-        else
+        bool result = !IId.IsOffsetDeterministicHashCode(propertyConfiguration);
+        if (!result)
         {
-            string seasonDirectory;
-            DirectoryInfo directoryInfo;
-            DateTime dateTime = new(ticks);
-            string rootDirectory = _Configuration.PropertyConfiguration.RootDirectory;
-            string eDistanceContentDirectory = Property.Models.Stateless.IResult.GetResultsDateGroupDirectory(_Configuration.PropertyConfiguration, nameof(E_Distance), _Configuration.PropertyConfiguration.ResultContent);
-            (int season, string seasonName) = Shared.Models.Stateless.Methods.IProperty.GetSeason(dateTime.DayOfYear);
-            FileSystemInfo fileSystemInfo = new DirectoryInfo(eDistanceContentDirectory);
-            string[] checkDirectories =
-            [
-                Path.Combine(rootDirectory, "Ancestry"),
-                Path.Combine(rootDirectory, "Facebook"),
-                Path.Combine(rootDirectory, "LinkedIn"),
-                rootDirectory,
-            ];
-            foreach (string checkDirectory in checkDirectories)
+            string[] directories;
+            directories = Directory.GetDirectories(_Configuration.PropertyConfiguration.RootDirectory, "*", SearchOption.TopDirectoryOnly);
+            if (directories.Length == 0)
+                result = true;
+            else
             {
-                if (checkDirectory == rootDirectory)
-                    seasonDirectory = Path.Combine(checkDirectory, $"{dateTime.Year}.{season} {seasonName}");
-                else
-                    seasonDirectory = Path.Combine(checkDirectory, $"{dateTime.Year}.{season} {seasonName} {Path.GetFileName(checkDirectory)}");
-                if (!Directory.Exists(seasonDirectory))
-                    _ = Directory.CreateDirectory(seasonDirectory);
-                if (result)
-                    continue;
-                directories = Directory.GetDirectories(checkDirectory, "*", SearchOption.TopDirectoryOnly);
-                foreach (string directory in directories)
+                string seasonDirectory;
+                DirectoryInfo directoryInfo;
+                DateTime dateTime = new(ticks);
+                string rootDirectory = _Configuration.PropertyConfiguration.RootDirectory;
+                string eDistanceContentDirectory = Property.Models.Stateless.IResult.GetResultsDateGroupDirectory(_Configuration.PropertyConfiguration, nameof(E_Distance), _Configuration.PropertyConfiguration.ResultContent);
+                (int season, string seasonName) = Shared.Models.Stateless.Methods.IProperty.GetSeason(dateTime.DayOfYear);
+                FileSystemInfo fileSystemInfo = new DirectoryInfo(eDistanceContentDirectory);
+                string[] checkDirectories =
+                [
+                    Path.Combine(rootDirectory, "Ancestry"),
+                    Path.Combine(rootDirectory, "Facebook"),
+                    Path.Combine(rootDirectory, "LinkedIn"),
+                    rootDirectory,
+                ];
+                foreach (string checkDirectory in checkDirectories)
                 {
-                    directoryInfo = new(directory);
-                    if (directoryInfo.LastWriteTime > fileSystemInfo.LastWriteTime)
+                    if (checkDirectory == rootDirectory)
+                        seasonDirectory = Path.Combine(checkDirectory, $"{dateTime.Year}.{season} {seasonName}");
+                    else
+                        seasonDirectory = Path.Combine(checkDirectory, $"{dateTime.Year}.{season} {seasonName} {Path.GetFileName(checkDirectory)}");
+                    if (!Directory.Exists(seasonDirectory))
+                        _ = Directory.CreateDirectory(seasonDirectory);
+                    if (result)
+                        continue;
+                    directories = Directory.GetDirectories(checkDirectory, "*", SearchOption.TopDirectoryOnly);
+                    foreach (string directory in directories)
                     {
-                        result = true;
-                        break;
+                        directoryInfo = new(directory);
+                        if (directoryInfo.LastWriteTime > fileSystemInfo.LastWriteTime)
+                        {
+                            result = true;
+                            break;
+                        }
                     }
                 }
             }
@@ -509,7 +572,7 @@ public partial class DlibDotNet
         return result;
     }
 
-    private void FullDoWork(string argZero, string propertyRoot, long ticks, string aResultsFullGroupDirectory, string bResultsFullGroupDirectory, int t, Container[] containers, A_Property propertyLogic, B_Metadata metadata, Dictionary<int, List<MappingFromPhotoPrism>> fileNameToCollection, MapLogic mapLogic)
+    private void FullDoWork(string argZero, string propertyRoot, long ticks, string aResultsFullGroupDirectory, string bResultsFullGroupDirectory, string fPhotoPrismSingletonDirectory, int t, ReadOnlyCollection<Container> readOnlyContainers, A_Property propertyLogic, MapLogic mapLogic)
     {
         int total;
         int notMapped;
@@ -517,7 +580,6 @@ public partial class DlibDotNet
         bool exceptions;
         int totalSeconds;
         Container container;
-        Item[] filteredItems;
         int totalNotMapped = 0;
         bool outputResolutionHasNumber;
         bool anyNullOrNoIsUniqueFileName;
@@ -525,33 +587,36 @@ public partial class DlibDotNet
         string dResultsFullGroupDirectory;
         string c2ResultsFullGroupDirectory;
         string d2ResultsFullGroupDirectory;
-        int containersLength = containers.Length;
+        ReadOnlyCollection<Item> filteredItems;
+        int containersLength = readOnlyContainers.Count;
         List<Tuple<string, DateTime>> sourceDirectoryChanges = [];
         int maxDegreeOfParallelism = _AppSettings.MaxDegreeOfParallelism;
+        Dictionary<int, List<MappingFromPhotoPrism>> fileNameToCollection = !Directory.Exists(fPhotoPrismSingletonDirectory) ? fileNameToCollection = [] : F_PhotoPrism.GetFileNameToCollection(fPhotoPrismSingletonDirectory);
         string dResultsDateGroupDirectory = Property.Models.Stateless.IResult.GetResultsDateGroupDirectory(_Configuration.PropertyConfiguration, nameof(D_Face));
+        B_Metadata metadata = new(_Configuration.PropertyConfiguration, _Configuration.ForceMetadataLastWriteTimeToCreationTime, _Configuration.PropertiesChangedForMetadata, bResultsFullGroupDirectory);
         foreach (string outputResolution in _Configuration.OutputResolutions)
         {
             total = 0;
-            outputResolutionHasNumber = outputResolution.Any(l => char.IsNumber(l));
+            outputResolutionHasNumber = outputResolution.Any(char.IsNumber);
             (cResultsFullGroupDirectory, c2ResultsFullGroupDirectory, dResultsFullGroupDirectory, d2ResultsFullGroupDirectory) = GetResultsFullGroupDirectories(outputResolution);
             _Faces.Update(dResultsFullGroupDirectory);
             _Resize.Update(cResultsFullGroupDirectory);
             _FaceParts.Update(d2ResultsFullGroupDirectory);
             _BlurHasher.Update(c2ResultsFullGroupDirectory);
-            for (int i = 0; i < containers.Length; i++)
+            for (int i = 0; i < readOnlyContainers.Count; i++)
             {
-                container = containers[i];
+                container = readOnlyContainers[i];
                 if (container.Items.Count == 0)
                     continue;
                 if (!_ArgZeroIsConfigurationRootDirectory && !container.SourceDirectory.StartsWith(argZero))
                     continue;
-                filteredItems = Shared.Models.Stateless.Methods.IContainer.GetFilterItems(_Configuration.PropertyConfiguration, container);
-                if (filteredItems.Length == 0)
+                filteredItems = Shared.Models.Stateless.Methods.IContainer.GetValidImageItems(_Configuration.PropertyConfiguration, container);
+                if (filteredItems.Count == 0)
                     continue;
                 sourceDirectoryChanges.Clear();
                 anyNullOrNoIsUniqueFileName = filteredItems.Any(l => !l.IsUniqueFileName);
                 totalSeconds = (int)Math.Floor(new TimeSpan(DateTime.Now.Ticks - ticks).TotalSeconds);
-                message = $"{i + 1:000} [{filteredItems.Length:000}] / {containersLength:000} - {total} / {t} total - {totalSeconds} total second(s) - {outputResolution} - <{container.SourceDirectory}> - total not mapped {totalNotMapped:000000}";
+                message = $"{i + 1:000} [{filteredItems.Count:000}] / {containersLength:000} - {total} / {t} total - {totalSeconds} total second(s) - {outputResolution} - <{container.SourceDirectory}> - total not mapped {totalNotMapped:000000}";
                 propertyLogic.SetAngleBracketCollection(aResultsFullGroupDirectory, container.SourceDirectory, anyNullOrNoIsUniqueFileName);
                 if (outputResolutionHasNumber)
                     _Resize.SetAngleBracketCollection(cResultsFullGroupDirectory, container.SourceDirectory);
@@ -595,26 +660,54 @@ public partial class DlibDotNet
         }
     }
 
-    private ReadOnlyCollection<Mapping> GetMappings(Property.Models.Configuration propertyConfiguration, string eDistanceContentDirectory, Container[] containers, MapLogic mapLogic, bool distinctItems)
+    private static void SaveDistinctIds(Property.Models.Configuration propertyConfiguration, string bResultsFullGroupDirectory, ReadOnlyCollection<Container> readOnlyContainers)
     {
-        ReadOnlyCollection<Mapping> results;
+        string paddedId;
+        List<int> distinct = [];
+        List<Identifier> identifiers = [];
+        string bMetadataCollectionDirectory = Path.Combine(bResultsFullGroupDirectory, propertyConfiguration.ResultCollection);
+        if (!Directory.Exists(bMetadataCollectionDirectory))
+            _ = Directory.CreateDirectory(bMetadataCollectionDirectory);
+        foreach (Container container in readOnlyContainers)
+        {
+            if (container.Items.Count == 0)
+                continue;
+            foreach (Item item in container.Items)
+            {
+                if (item.Property?.Id is null)
+                    continue;
+                if (item.Property.Id != item.FilePath.Id)
+                    throw new NotSupportedException();
+                if (distinct.Contains(item.Property.Id.Value))
+                    continue;
+                distinct.Add(item.Property.Id.Value);
+                paddedId = IId.GetPaddedId(propertyConfiguration, item.Property.Id.Value, item.FilePath.IsIgnore, index: null);
+                identifiers.Add(new(item.Property.Id.Value, paddedId));
+            }
+        }
+        string json = JsonSerializer.Serialize(identifiers.OrderBy(l => l.PaddedId).ToArray(), IdentifierCollectionSourceGenerationContext.Default.IdentifierArray);
+        _ = Shared.Models.Stateless.Methods.IPath.WriteAllText(Path.Combine(bMetadataCollectionDirectory, ".json"), json, updateDateWhenMatches: false, compareBeforeWrite: true, updateToWhenMatches: null);
+    }
+
+    private ReadOnlyCollection<Mapping> GetMappings(Property.Models.Configuration propertyConfiguration, string eDistanceContentDirectory, ReadOnlyCollection<Container> readOnlyContainers, MapLogic mapLogic, bool distinctItems)
+    {
+        List<Mapping> results = [];
         int count = 0;
         int notMapped;
         Mapping mapping;
         bool anyValidFaces;
+        List<int> distinct = [];
         string focusRelativePath;
         bool? isFocusRelativePath;
-        List<int> distinct = [];
         DateTime[] containerDateTimes;
-        IEnumerable<Item> filteredItems;
         MappingFromItem mappingFromItem;
-        List<Mapping> mappingCollection = [];
-        foreach (Container container in containers)
+        ReadOnlyCollection<Item> filteredItems;
+        foreach (Container container in readOnlyContainers)
         {
             if (container.Items.Count == 0)
                 continue;
-            filteredItems = Shared.Models.Stateless.Methods.IContainer.GetFilterItems(propertyConfiguration, container);
-            if (!filteredItems.Any())
+            filteredItems = Shared.Models.Stateless.Methods.IContainer.GetValidImageItems(propertyConfiguration, container);
+            if (filteredItems.Count == 0)
                 continue;
             containerDateTimes = Shared.Models.Stateless.Methods.IContainer.GetContainerDateTimes(filteredItems);
             focusRelativePath = Path.GetFullPath(string.Concat(_Configuration.PropertyConfiguration.RootDirectory, _Configuration.FocusDirectory));
@@ -635,24 +728,25 @@ public partial class DlibDotNet
                 foreach (Shared.Models.Face face in item.Faces)
                 {
                     if (face.Mapping is null)
+                        throw new NotSupportedException();
+                    if (face.FaceEncoding is null || face.Location is null || face.OutputResolution is null)
                         continue;
                     anyValidFaces = true;
-                    mappingCollection.Add(face.Mapping);
+                    results.Add(face.Mapping);
                 }
                 if (!anyValidFaces)
                 {
                     (mapping, notMapped) = GetMappingAndUpdateMappingFromPerson(mapLogic, item, isFocusRelativePath, mappingFromItem);
-                    mappingCollection.Add(mapping);
+                    results.Add(mapping);
                 }
             }
         }
         if (_Configuration.MoveToDecade && _Configuration.LocationContainerDistanceTolerance is null)
             _ = Shared.Models.Stateless.Methods.IPath.DeleteEmptyDirectories(eDistanceContentDirectory);
-        results = new((from l in mappingCollection orderby l.MappingFromItem.Id select l).ToArray());
-        return results;
+        return new(results);
     }
 
-    private static void SavePropertyShortcutsForOutputResolutions(string eDistanceContentDirectory, ReadOnlyCollection<Item> distinctFilteredItems)
+    private static void SavePropertyShortcutsForOutputResolutions(string eDistanceContentDirectory, ReadOnlyCollection<Item> distinctValidImageItems)
     {
 #if VerifyItem
         bool found;
@@ -683,32 +777,32 @@ public partial class DlibDotNet
         List<string> distinct = [];
         WindowsShortcut windowsShortcut;
         List<(string, string, string)> collection = [];
-        foreach (Item item in distinctFilteredItems)
+        foreach (Item item in distinctValidImageItems)
         {
-            if (item.Property?.Id is null || item.ImageFileHolder.LastWriteTime is null)
+            if (item.Property?.Id is null)
                 continue;
             if (item.IsNotUniqueAndNeedsReview is null || !item.IsNotUniqueAndNeedsReview.Value)
                 continue;
-            directory = Path.Combine($"{eDistanceContentDirectory[..^1]}{nameof(item.IsNotUniqueAndNeedsReview)})", item.ImageFileHolder.NameWithoutExtension);
-            fileName = Path.Combine(directory, $"{item.ImageFileHolder.Length} {item.ImageFileHolder.LastWriteTime.Value.Ticks}.lnk");
-            collection.Add((item.ImageFileHolder.FullName, directory, fileName));
+            directory = Path.Combine($"{eDistanceContentDirectory[..^1]}{nameof(item.IsNotUniqueAndNeedsReview)})", item.FilePath.NameWithoutExtension);
+            fileName = Path.Combine(directory, $"{item.FilePath.Length} {item.FilePath.LastWriteTicks}.lnk");
+            collection.Add((item.FilePath.FullName, directory, fileName));
             if (distinct.Contains(directory))
                 continue;
             distinct.Add(directory);
         }
-        foreach (Item item in distinctFilteredItems)
+        foreach (Item item in distinctValidImageItems)
         {
             if (item.Property?.Id is null || item.Property.DateTimeOriginal is null)
                 continue;
             dateTimes = item.Property.GetDateTimes();
-            (isWrongYear, _) = Shared.Models.Stateless.Methods.IProperty.IsWrongYear(item.ImageFileHolder, item.Property.DateTimeOriginal, dateTimes);
+            (isWrongYear, _) = Shared.Models.Stateless.Methods.IProperty.IsWrongYear(item.FilePath, item.Property.DateTimeOriginal, dateTimes);
             if (isWrongYear is null || !isWrongYear.Value)
                 continue;
             // Remove-Item -LiteralPath "\\?\D:\Tmp\a\EX-Z70     "
             model = string.IsNullOrEmpty(item.Property.Model) ? "Unknown" : CameraRegex().Replace(item.Property.Model.Trim(), "_");
             directory = Path.Combine($"{eDistanceContentDirectory[..^1]}{nameof(Item)})", item.Property.DateTimeOriginal.Value.Year.ToString(), model);
-            fileName = item.IsNotUniqueAndNeedsReview is not null && item.IsNotUniqueAndNeedsReview.Value ? Path.Combine(directory, $"{item.ImageFileHolder.Name} {item.ImageFileHolder.Length}.lnk") : Path.Combine(directory, $"{item.ImageFileHolder.Name}.lnk");
-            collection.Add((item.ImageFileHolder.FullName, directory, fileName));
+            fileName = item.IsNotUniqueAndNeedsReview is not null && item.IsNotUniqueAndNeedsReview.Value ? Path.Combine(directory, $"{item.FilePath.Name} {item.FilePath.Length}.lnk") : Path.Combine(directory, $"{item.FilePath.Name}.lnk");
+            collection.Add((item.FilePath.FullName, directory, fileName));
             if (distinct.Contains(directory))
                 continue;
             distinct.Add(directory);
@@ -741,27 +835,78 @@ public partial class DlibDotNet
         }
     }
 
-    private void MapLogic(long ticks, ReadOnlyCollection<Container> containers, string fPhotoPrismContentDirectory, MapLogic mapLogic, string outputResolution, ReadOnlyDictionary<long, List<int>> personKeyToIds, ReadOnlyCollection<Shared.Models.Face> distinctFilteredFaces, ReadOnlyCollection<Mapping> distinctFilteredMappingCollection)
+    private ReadOnlyCollection<FilePath> GetFilePath(long ticks, string dFacesContentDirectory)
+    {
+        List<FilePath> results = [];
+        FilePath filePath;
+        FileHolder fileHolder;
+        string[] files = Directory.GetFiles(dFacesContentDirectory, $"*{_Faces.FileNameExtension}", SearchOption.AllDirectories);
+        long? skipOlderThan = _Configuration.SkipOlderThanDays is null ? null : new DateTime(ticks).AddDays(-_Configuration.SkipOlderThanDays.Value).Ticks;
+        foreach (string file in files)
+        {
+            fileHolder = Shared.Models.Stateless.Methods.IFileHolder.Get(file);
+            filePath = FilePath.Get(_Configuration.PropertyConfiguration, fileHolder, index: null);
+            if (filePath.Id is null)
+                continue;
+            if (skipOlderThan is not null && (fileHolder.LastWriteTime is null || fileHolder.LastWriteTime.Value.Ticks < skipOlderThan.Value))
+                continue;
+            results.Add(filePath);
+        }
+        return new(results);
+    }
+
+    private List<SaveContainer> GetSaveContainers(long ticks, ReadOnlyCollection<PersonContainer> personContainers, string a2PeopleSingletonDirectory, string eDistanceContentDirectory, ProgressBarOptions options, MapLogic mapLogic, string outputResolution)
+    {
+        List<SaveContainer> results;
+        long[] jLinkResolvedPersonKeys = _JLinkResolvedDirectories.Select(l => l.PersonKey).ToArray();
+        (string cResultsFullGroupDirectory, string _, string dResultsFullGroupDirectory, string d2ResultsFullGroupDirectory) = GetResultsFullGroupDirectories(outputResolution);
+        string dFacesContentDirectory = Path.Combine(dResultsFullGroupDirectory, _Configuration.PropertyConfiguration.ResultContent);
+        ReadOnlyDictionary<int, ReadOnlyDictionary<int, LocationContainer>> mapped = Map.Models.Stateless.Methods.IMapLogic.GetMapped(_AppSettings.MaxDegreeOfParallelism, _Configuration.PropertyConfiguration, _MapConfiguration, ticks, personContainers, a2PeopleSingletonDirectory, eDistanceContentDirectory);
+        if (mapped.Count == 0 && !_Configuration.SaveSortingWithoutPerson)
+            throw new NotSupportedException($"Switch {nameof(_Configuration.SaveSortingWithoutPerson)}!");
+        ReadOnlyCollection<FilePath> filePaths = GetFilePath(ticks, dFacesContentDirectory);
+        List<LocationContainer> available = Map.Models.Stateless.Methods.IMapLogic.GetAvailable(_AppSettings.MaxDegreeOfParallelism, _Configuration.PropertyConfiguration, _MapConfiguration, _Faces, ticks, dFacesContentDirectory, filePaths);
+        if (!string.IsNullOrEmpty(_Configuration.FocusDirectory) && _Configuration.FocusDirectory.Length != 2)
+            throw new NotSupportedException($"{nameof(_Configuration.FocusDirectory)} currently only works with output directory! Example 00.");
+        ReadOnlyDictionary<int, ReadOnlyDictionary<int, LocationContainer>> mappedWithEncoding = E_Distance.GetMappedWithEncoding(mapped);
+        if (mappedWithEncoding.Count == 0 && !_Configuration.SaveSortingWithoutPerson)
+            throw new NotSupportedException($"Switch {nameof(_Configuration.SaveSortingWithoutPerson)}!");
+        List<LocationContainer> preFiltered = E_Distance.GetPreFilterLocationContainer(_AppSettings.MaxDegreeOfParallelism, _MapConfiguration, _Configuration.FocusDirectory, _Configuration.FocusModel, _Configuration.SkipPersonWithMoreThen, ticks, mapLogic, jLinkResolvedPersonKeys, mapped, available);
+        if (preFiltered.Count == 0)
+            throw new NotSupportedException("Done?");
+        DistanceLimits distanceLimits = new(_Configuration.FaceAreaPermyriad, _Configuration.FaceConfidencePercent, _Configuration.FaceDistancePermyriad, _Configuration.RangeDaysDeltaTolerance, _Configuration.RangeDistanceTolerance, _Configuration.RangeFaceAreaPermyriadTolerance, _Configuration.RangeFaceConfidence, _Configuration.SortingMaximumPerFaceShouldBeHigh);
+        List<LocationContainer> postFiltered = E_Distance.GetPostFilterLocationContainer(mapLogic, preFiltered, distanceLimits);
+        if (postFiltered.Count == 0)
+            throw new NotSupportedException("Done?");
+        string message = $") Building Matrix - {(int)Math.Floor(new TimeSpan(DateTime.Now.Ticks - ticks).TotalSeconds)} total second(s)";
+        _ProgressBar = new(postFiltered.Count, message, options);
+        ReadOnlyCollection<LocationContainer> matrix = E_Distance.GetMatrixLocationContainers(this, _MapConfiguration, ticks, mapLogic, mappedWithEncoding, preFiltered, distanceLimits, postFiltered);
+        _ProgressBar.Dispose();
+        results = mapLogic.GetSaveContainers(cResultsFullGroupDirectory, dResultsFullGroupDirectory, d2ResultsFullGroupDirectory, distanceLimits, matrix);
+        return results;
+    }
+
+    private void MapLogic(long ticks, ReadOnlyCollection<Container> containers, string fPhotoPrismContentDirectory, MapLogic mapLogic, string outputResolution, ReadOnlyDictionary<long, List<int>> personKeyToIds, ReadOnlyCollection<Shared.Models.Face> distinctValidImageFaces, ReadOnlyCollection<Mapping> distinctValidImageMappingCollection)
     {
         (_, _, string dResultsFullGroupDirectory, string d2ResultsFullGroupDirectory) = GetResultsFullGroupDirectories(outputResolution);
         string dFacesContentDirectory = Path.Combine(dResultsFullGroupDirectory, _Configuration.PropertyConfiguration.ResultContent);
         string d2FacePartsContentDirectory = Path.Combine(d2ResultsFullGroupDirectory, _Configuration.PropertyConfiguration.ResultContent);
         string d2FacePartsContentCollectionDirectory = Path.Combine(d2ResultsFullGroupDirectory, "[()]");
-        if (distinctFilteredMappingCollection.Count > 0)
+        if (distinctValidImageMappingCollection.Count > 0)
         {
             Shared.Models.Stateless.Methods.IPath.ChangeDateForEmptyDirectories(d2FacePartsContentDirectory, ticks);
             if (Directory.Exists(d2FacePartsContentCollectionDirectory))
                 Shared.Models.Stateless.Methods.IPath.MakeHiddenIfAllItemsAreHidden(d2FacePartsContentCollectionDirectory);
         }
         if (Directory.Exists(fPhotoPrismContentDirectory))
-            F_PhotoPrism.WriteMatches(fPhotoPrismContentDirectory, _Configuration.PersonBirthdayFormat, _Configuration.RectangleIntersectMinimums, ticks, distinctFilteredFaces, mapLogic);
+            F_PhotoPrism.WriteMatches(fPhotoPrismContentDirectory, _Configuration.PersonBirthdayFormat, _Configuration.RectangleIntersectMinimums, ticks, distinctValidImageFaces, mapLogic);
         if (_Configuration.SaveShortcutsForOutputResolutions.Contains(outputResolution))
-            mapLogic.SaveShortcutsForOutputResolutionsDuringMapLogic(containers, personKeyToIds, dFacesContentDirectory, distinctFilteredMappingCollection);
-        ReadOnlyDictionary<int, ReadOnlyDictionary<int, Mapping>> idToWholePercentagesToMapping = Map.Models.Stateless.Methods.IMapLogic.GetIdToWholePercentagesToFace(distinctFilteredMappingCollection);
+            mapLogic.SaveShortcutsForOutputResolutionsDuringMapLogic(containers, personKeyToIds, dFacesContentDirectory, distinctValidImageMappingCollection);
+        ReadOnlyDictionary<int, ReadOnlyDictionary<int, Mapping>> idToWholePercentagesToMapping = Map.Models.Stateless.Methods.IMapLogic.GetIdToWholePercentagesToFace(distinctValidImageMappingCollection);
         if (_Configuration.SaveMappedForOutputResolutions.Contains(outputResolution))
-            mapLogic.SaveMapped(dFacesContentDirectory, d2FacePartsContentDirectory, d2FacePartsContentCollectionDirectory, personKeyToIds, distinctFilteredMappingCollection, idToWholePercentagesToMapping);
+            mapLogic.SaveMapped(dFacesContentDirectory, d2FacePartsContentDirectory, d2FacePartsContentCollectionDirectory, personKeyToIds, distinctValidImageMappingCollection, idToWholePercentagesToMapping);
         if (_Configuration.SaveFaceDistancesForOutputResolutions.Contains(outputResolution))
-            SaveFaceDistances(ticks, mapLogic, distinctFilteredFaces, dFacesContentDirectory, d2FacePartsContentDirectory, d2FacePartsContentCollectionDirectory, idToWholePercentagesToMapping);
+            SaveFaceDistances(ticks, mapLogic, distinctValidImageFaces, dFacesContentDirectory, d2FacePartsContentDirectory, d2FacePartsContentCollectionDirectory, idToWholePercentagesToMapping);
     }
 
     private bool? GetIsFocusModel(Shared.Models.Property? property)
@@ -779,16 +924,16 @@ public partial class DlibDotNet
     private void LogItemPropertyIsNull(Item item)
     {
         if (!item.SourceDirectoryFileHolder.Exists)
-            _Logger?.LogInformation(string.Concat("NoJson <", item.ImageFileHolder.FullName, '>'));
+            _Logger?.LogInformation(string.Concat("NoJson <", item.FilePath.FullName, '>'));
         else if (item.FileSizeChanged.HasValue && item.FileSizeChanged.Value)
-            _Logger?.LogInformation(string.Concat("FileSizeChanged <", item.ImageFileHolder.FullName, '>'));
+            _Logger?.LogInformation(string.Concat("FileSizeChanged <", item.FilePath.FullName, '>'));
         else if (item.LastWriteTimeChanged.HasValue && item.LastWriteTimeChanged.Value)
-            _Logger?.LogInformation(string.Concat("LastWriteTimeChanged <", item.ImageFileHolder.FullName, '>'));
+            _Logger?.LogInformation(string.Concat("LastWriteTimeChanged <", item.FilePath.FullName, '>'));
         else if (item.Moved.HasValue && item.Moved.Value)
-            _Logger?.LogInformation(string.Concat("Moved <", item.ImageFileHolder.FullName, '>'));
+            _Logger?.LogInformation(string.Concat("Moved <", item.FilePath.FullName, '>'));
     }
 
-    private int GetNotMappedCountAndUpdateMappingFromPersonThenSetMapping(MapLogic mapLogic, Item item, bool? isFocusRelativePath, ReadOnlyCollection<LocationContainer> locationContainers, MappingFromItem mappingFromItem, List<MappingFromPhotoPrism>? mappingFromPhotoPrismCollection, List<Shared.Models.Face> faces)
+    private int GetNotMappedCountAndUpdateMappingFromPersonThenSetMapping(MapLogic mapLogic, Item item, bool? isFocusRelativePath, MappingFromItem mappingFromItem, List<MappingFromPhotoPrism>? mappingFromPhotoPrismCollection, List<Shared.Models.Face> faces)
     {
         int result;
         double? α;
@@ -809,7 +954,6 @@ public partial class DlibDotNet
         bool? isFocusModel = GetIsFocusModel(item.Property);
         long[] jLinkResolvedPersonKeys = _JLinkResolvedDirectories.Select(l => l.PersonKey).ToArray();
         ReadOnlyDictionary<int, ReadOnlyCollection<PersonContainer>>? wholePercentagesToPersonContainers;
-        ReadOnlyCollection<string> locationContainersFiles = new((from l in locationContainers select l.FilePath.FullName).ToArray());
         foreach (Shared.Models.Face face in faces)
         {
             wholePercentagesToPersonContainers = mapLogic.GetWholePercentagesToPersonContainers(item.Property?.Id);
@@ -850,76 +994,58 @@ public partial class DlibDotNet
         return result;
     }
 
-    private static Map.Models.Configuration Get(Models.Configuration configuration, string facesFileNameExtension, string facesHiddenFileNameExtension, string facePartsFileNameExtension)
+    private static Map.Models.Configuration Get(Models.Configuration configuration, IDistanceLimits distanceLimits, string facesFileNameExtension, string facesHiddenFileNameExtension, string facePartsFileNameExtension)
     {
-        Map.Models.Configuration result = new(
-            configuration.DeletePossibleDuplicates,
-            configuration.DistanceMoveUnableToMatch,
-            configuration.DistanceRenameToMatch,
-            configuration.FaceConfidencePercent,
-            configuration.FaceDistancePermyriad,
-            configuration.LocationContainerDebugDirectory,
-            configuration.LocationContainerDirectoryPattern,
-            configuration.LocationContainerDistanceGroupMinimum,
-            configuration.LocationContainerDistanceTake,
-            configuration.LocationContainerDistanceTolerance,
-            configuration.LocationDigits,
-            configuration.MappingDefaultName,
-            configuration.PersonBirthdayFirstYear,
-            configuration.PersonBirthdayFormat,
-            configuration.PersonCharacters.ToArray(),
-            configuration.RangeDaysDeltaTolerance,
-            configuration.RangeDistanceTolerance,
-            configuration.ReMap,
-            configuration.SaveIndividually,
-            configuration.SaveSortingWithoutPerson,
-            configuration.SkipNotSkipDirectories,
-            configuration.SortingMaximumPerKey,
-            configuration.SortingMinimumToUseSigma,
-            facesFileNameExtension,
-            facesHiddenFileNameExtension,
-            facePartsFileNameExtension);
+        Map.Models.Configuration result = new(distanceLimits,
+                                              configuration.PropertyConfiguration,
+                                              configuration.DeletePossibleDuplicates,
+                                              configuration.DistanceMoveUnableToMatch,
+                                              configuration.DistanceRenameToMatch,
+                                              configuration.FaceConfidencePercent,
+                                              configuration.FaceDistancePermyriad,
+                                              configuration.LinkedAlpha,
+                                              configuration.LocationContainerDebugDirectory,
+                                              configuration.LocationContainerDirectoryPattern,
+                                              configuration.LocationContainerDistanceGroupMinimum,
+                                              configuration.LocationContainerDistanceTake,
+                                              configuration.LocationContainerDistanceTolerance,
+                                              configuration.LocationDigits,
+                                              configuration.MappingDefaultName,
+                                              configuration.PersonBirthdayFirstYear,
+                                              configuration.PersonBirthdayFormat,
+                                              configuration.PersonCharacters.ToArray(),
+                                              configuration.RangeDaysDeltaTolerance,
+                                              configuration.RangeDistanceTolerance,
+                                              configuration.ReMap,
+                                              configuration.SaveIndividually,
+                                              configuration.SaveSortingWithoutPerson,
+                                              configuration.SkipNotSkipDirectories,
+                                              configuration.SortingMaximumPerKey,
+                                              configuration.SortingMinimumToUseSigma,
+                                              facesFileNameExtension,
+                                              facesHiddenFileNameExtension,
+                                              facePartsFileNameExtension);
         return result;
     }
 
     private (Mapping, int) GetMappingAndUpdateMappingFromPerson(MapLogic mapLogic, Item item, bool? isFocusRelativePath, MappingFromItem mappingFromItem)
     {
         Mapping result;
-        bool? canReMap;
         int? eyeα = null;
-        bool? isFocusPerson;
         bool? eyeReview = null;
-        bool? inSkipCollection;
         int confidencePercent = 0;
         int faceAreaPermyriad = 0;
-        int wholePercentRectangle;
-        string deterministicHashCodeKey;
-        MappingFromLocation? mappingFromLocation;
-        MappingFromFilterPre mappingFromFilterPre;
-        MappingFromFilterPost mappingFromFilterPost;
         bool? isFocusModel = GetIsFocusModel(item.Property);
         long[] jLinkResolvedPersonKeys = _JLinkResolvedDirectories.Select(l => l.PersonKey).ToArray();
-        ReadOnlyDictionary<int, ReadOnlyCollection<PersonContainer>>? wholePercentagesToPersonContainers = mapLogic.GetWholePercentagesToPersonContainers(item.Property?.Id);
-        if (item.Property?.Id is null)
-        {
-            canReMap = null;
-            isFocusPerson = null;
-            inSkipCollection = null;
-            mappingFromLocation = null;
-            mappingFromFilterPost = new(canReMap, inSkipCollection, isFocusPerson);
-            mappingFromFilterPre = new(inSkipCollection, isFocusModel, isFocusRelativePath);
-        }
-        else
-        {
-            wholePercentRectangle = Shared.Models.Stateless.Methods.ILocation.GetWholePercentages(Shared.Models.Stateless.ILocation.Digits);
-            deterministicHashCodeKey = IMapping.GetDeterministicHashCodeKey(item.FilePath, Shared.Models.Stateless.ILocation.Digits);
-            mappingFromLocation = new(faceAreaPermyriad, confidencePercent, deterministicHashCodeKey, eyeα, eyeReview, wholePercentRectangle);
-            inSkipCollection = mapLogic.InSkipCollection(item.Property.Id.Value, mappingFromLocation);
-            mappingFromFilterPre = new(inSkipCollection, isFocusModel, isFocusRelativePath);
-            canReMap = Map.Models.Stateless.Methods.IMapLogic.CanReMap(jLinkResolvedPersonKeys, wholePercentagesToPersonContainers, mappingFromLocation);
-            isFocusPerson = mapLogic.IsFocusPerson(_Configuration.SkipPersonWithMoreThen, jLinkResolvedPersonKeys, wholePercentagesToPersonContainers, mappingFromLocation);
-            mappingFromFilterPost = new(canReMap, inSkipCollection, isFocusPerson);
-        }
+        ReadOnlyDictionary<int, ReadOnlyCollection<PersonContainer>>? wholePercentagesToPersonContainers = mapLogic.GetWholePercentagesToPersonContainers(mappingFromItem.Id);
+        int wholePercentRectangle = Shared.Models.Stateless.Methods.ILocation.GetWholePercentages(Shared.Models.Stateless.ILocation.Digits);
+        string deterministicHashCodeKey = IMapping.GetDeterministicHashCodeKey(item.FilePath, Shared.Models.Stateless.ILocation.Digits);
+        MappingFromLocation? mappingFromLocation = new(faceAreaPermyriad, confidencePercent, deterministicHashCodeKey, eyeα, eyeReview, wholePercentRectangle);
+        bool? inSkipCollection = mapLogic.InSkipCollection(mappingFromItem.Id, mappingFromLocation);
+        MappingFromFilterPre mappingFromFilterPre = new(inSkipCollection, isFocusModel, isFocusRelativePath);
+        bool? canReMap = Map.Models.Stateless.Methods.IMapLogic.CanReMap(jLinkResolvedPersonKeys, wholePercentagesToPersonContainers, mappingFromLocation);
+        bool? isFocusPerson = mapLogic.IsFocusPerson(_Configuration.SkipPersonWithMoreThen, jLinkResolvedPersonKeys, wholePercentagesToPersonContainers, mappingFromLocation);
+        MappingFromFilterPost mappingFromFilterPost = new(canReMap, inSkipCollection, isFocusPerson);
         result = new(item.FilePath, mappingFromFilterPost, mappingFromFilterPre, mappingFromItem, mappingFromLocation, mappingFromPhotoPrismCollection: null);
         int notMapped = mapLogic.UpdateMappingFromPerson(wholePercentagesToPersonContainers, result);
         return (result, notMapped);
@@ -951,7 +1077,6 @@ public partial class DlibDotNet
         string[] changesFrom = [nameof(A_Property)];
         List<Tuple<string, DateTime>> subFileTuples = [];
         FileHolder resizedFileHolder = _Resize.GetResizedFileHolder(cResultsFullGroupDirectory, item, outputResolutionHasNumber);
-        ReadOnlyCollection<LocationContainer> locationContainers = mapLogic.GetLocationContainers(item);
         if (item.Property is null || item.Property.Id is null || !item.SourceDirectoryFileHolder.Exists || item.SourceDirectoryFileHolder.CreationTime is null || item.SourceDirectoryFileHolder.LastWriteTime is null || item.Any())
         {
             LogItemPropertyIsNull(item);
@@ -981,7 +1106,6 @@ public partial class DlibDotNet
                 subFileTuples.Add(new Tuple<string, DateTime>(nameof(A_Property), item.SourceDirectoryFileHolder.LastWriteTime.Value));
             else
                 subFileTuples.Add(new Tuple<string, DateTime>(nameof(A_Property), new FileInfo(item.SourceDirectoryFileHolder.FullName).LastWriteTime));
-            FilePath filePath = FilePath.Get(_Configuration.PropertyConfiguration, item.ImageFileHolder, index: null);
             if (resizedFileHolder.Exists && item.Property.Width is not null && item.Property.Width.Value > 4 && _Configuration.SaveBlurHashForOutputResolutions.Contains(outputResolution))
             {
                 string? file = _BlurHasher.GetFile(item.FilePath);
@@ -994,7 +1118,6 @@ public partial class DlibDotNet
         item.SetResizedFileHolder(_Resize.FileNameExtension, resizedFileHolder);
         MappingFromItem mappingFromItem = IMappingFromItem.GetMappingFromItem(containerDateTimes, item, resizedFileHolder);
         ExifDirectory exifDirectory = metadata.GetMetadataCollection(item.FilePath, subFileTuples, parseExceptions, changesFrom, mappingFromItem);
-        Map.Models.Stateless.Methods.IMapLogic.SetCreationTimeMaybeMoveToDecade(_Configuration.PropertyConfiguration, _Configuration.MoveToDecade && _Configuration.LocationContainerDistanceTolerance is null, mappingFromItem, locationContainers);
         if (_AppSettings.Places.Count > 0)
         {
             float latitude;
@@ -1029,15 +1152,23 @@ public partial class DlibDotNet
             List<MappingFromPhotoPrism>? mappingFromPhotoPrismCollection;
             if (!fileNameToCollection.TryGetValue(mappingFromItem.Id, out mappingFromPhotoPrismCollection))
                 mappingFromPhotoPrismCollection = null;
-            faces = _Faces.GetFaces(outputResolution, dResultsFullGroupDirectory, item.FilePath, subFileTuples, parseExceptions, property, mappingFromItem, outputResolutionToResize, locationContainers, mappingFromPhotoPrismCollection);
-            result = GetNotMappedCountAndUpdateMappingFromPersonThenSetMapping(mapLogic, item, isFocusRelativePath, locationContainers, mappingFromItem, mappingFromPhotoPrismCollection, faces);
-            List<(Shared.Models.Face, FileInfo?, string, bool Saved)> faceCollection = _Faces.SaveFaces(_FaceParts.FileNameExtension, dResultsFullGroupDirectory, item.FilePath, subFileTuples, parseExceptions, mappingFromItem, faces);
+            bool move = _Configuration.DistanceMoveUnableToMatch || _Configuration.DistanceRenameToMatch && _Configuration.LoadOrCreateThenSaveDistanceResultsForOutputResolutions.Contains(outputResolution);
+            faces = _Faces.GetFaces(outputResolution, dResultsFullGroupDirectory, item.FilePath, subFileTuples, parseExceptions, property, mappingFromItem, outputResolutionToResize, mappingFromPhotoPrismCollection);
+            result = GetNotMappedCountAndUpdateMappingFromPersonThenSetMapping(mapLogic, item, isFocusRelativePath, mappingFromItem, mappingFromPhotoPrismCollection, faces);
+            List<(Shared.Models.Face, FileHolder?, string, bool Saved)> faceCollection = _Faces.SaveFaces(_FaceParts.FileNameExtension, dResultsFullGroupDirectory, item.FilePath, subFileTuples, parseExceptions, mappingFromItem, exifDirectory, faces);
             if (_Configuration.CopyFacesAndSaveFaceLandmarkForOutputResolutions.Contains(outputResolution))
                 _FaceParts.CopyFacesAndSaveFaceLandmarkImage(facePartsCollectionDirectory, mappingFromItem, faceCollection);
-            if ((_Configuration.DistanceMoveUnableToMatch || _Configuration.DistanceRenameToMatch)
-                && _Configuration.LoadOrCreateThenSaveDistanceResultsForOutputResolutions.Contains(outputResolution)
-                && locationContainers is not null && faceCollection.All(l => !l.Saved))
-                _Distance.LookForMatchFacesAndPossiblyRename(_Faces.FileNameExtension, item.FilePath, mappingFromItem, faces, locationContainers);
+            if (move && faceCollection.All(l => !l.Saved))
+            {
+                ReadOnlyCollection<LocationContainer> locationContainers = mapLogic.GetLocationContainers(item);
+                if (locationContainers.Count > 0)
+                {
+                    Map.Models.Stateless.Methods.IMapLogic.SetCreationTime(mappingFromItem, locationContainers);
+                    if (_Configuration.LocationContainerDistanceTolerance is null && _Configuration.MoveToDecade)
+                        Map.Models.Stateless.Methods.IMapLogic.MoveToDecade(_Configuration.PropertyConfiguration, mappingFromItem, locationContainers);
+                    _Distance.LookForMatchFacesAndPossiblyRename(_Configuration.OverrideForFaceImages, _DistanceLimits, _Faces, item.FilePath, mappingFromItem, exifDirectory, faces, locationContainers);
+                }
+            }
             (bool review, int[] eyesCollection) = Shared.Models.Stateless.Methods.IFace.GetEyeCollection(_Configuration.EyeThreshold, faces);
             if (review || _Configuration.SaveFaceLandmarkForOutputResolutions.Contains(outputResolution))
             {
@@ -1066,7 +1197,7 @@ public partial class DlibDotNet
                                          List<Tuple<string, DateTime>> sourceDirectoryChanges,
                                          Dictionary<int, List<MappingFromPhotoPrism>> fileNameToCollection,
                                          Container container,
-                                         Item[] filteredItems,
+                                         ReadOnlyCollection<Item> filteredItems,
                                          string message)
     {
         int result = 0;
@@ -1078,8 +1209,8 @@ public partial class DlibDotNet
         bool? isFocusRelativePath = string.IsNullOrEmpty(_Configuration.FocusDirectory) ? null : container.SourceDirectory.StartsWith(focusRelativePath);
         string facePartsCollectionDirectory = _Configuration.CopyFacesAndSaveFaceLandmarkForOutputResolutions.Contains(outputResolution) ? _FaceParts.GetFacePartsDirectory(_Configuration.PropertyConfiguration, d2ResultsFullGroupDirectory, item: filteredItems.First(), includeNameWithoutExtension: false) : string.Empty;
         bool anyPropertiesChangedForX = _Configuration.PropertyConfiguration.PropertiesChangedForProperty || _Configuration.PropertiesChangedForDistance || _Configuration.PropertiesChangedForFaces || _Configuration.PropertiesChangedForIndex || _Configuration.PropertiesChangedForMetadata || _Configuration.PropertiesChangedForResize;
-        using ProgressBar progressBar = new(filteredItems.Length, message, options);
-        _ = Parallel.For(0, filteredItems.Length, parallelOptions, (i, state) =>
+        using ProgressBar progressBar = new(filteredItems.Count, message, options);
+        _ = Parallel.For(0, filteredItems.Count, parallelOptions, (i, state) =>
            {
                try
                {
@@ -1105,7 +1236,7 @@ public partial class DlibDotNet
                catch (Exception)
                {
                    exceptionsCount++;
-                   if (exceptionsCount == filteredItems.Length)
+                   if (exceptionsCount == filteredItems.Count)
                        throw new Exception(string.Concat("All in [", container.SourceDirectory, "] failed!"));
                }
            });
@@ -1200,18 +1331,17 @@ public partial class DlibDotNet
             if (filteredFaceDistanceContainers.Length > 0)
             {
                 int updated = sortingContainers.Count == 0 ? 0 : mapLogic.UpdateFromSortingContainers(dFacesContentDirectory, d2FacePartsContentDirectory, d2FacePartsContentCollectionDirectory, idToWholePercentagesToMapping, sortingContainers);
-                List<SaveContainer> saveContainers;
-                saveContainers = mapLogic.GetSaveContainers(dFacesContentDirectory, d2FacePartsContentDirectory, d2FacePartsContentCollectionDirectory, idToWholePercentagesToMapping, distanceLimits, useFiltersCounter, sortingContainers);
+                List<SaveContainer> saveContainers = mapLogic.GetSaveContainers(dFacesContentDirectory, d2FacePartsContentDirectory, d2FacePartsContentCollectionDirectory, idToWholePercentagesToMapping, distanceLimits, useFiltersCounter, sortingContainers);
                 if (saveContainers.Count > 0)
                     mapLogic.SaveContainers(updated, saveContainers);
             }
         }
     }
 
-    private void SaveFaceDistances(long ticks, MapLogic mapLogic, ReadOnlyCollection<Shared.Models.Face> distinctFilteredFaces, string dFacesContentDirectory, string d2FacePartsContentDirectory, string d2FacePartsContentCollectionDirectory, ReadOnlyDictionary<int, ReadOnlyDictionary<int, Mapping>> idToWholePercentagesToMapping)
+    private void SaveFaceDistances(long ticks, MapLogic mapLogic, ReadOnlyCollection<Shared.Models.Face> distinctValidImageFaces, string dFacesContentDirectory, string d2FacePartsContentDirectory, string d2FacePartsContentCollectionDirectory, ReadOnlyDictionary<int, ReadOnlyDictionary<int, Mapping>> idToWholePercentagesToMapping)
     {
-        E_Distance.PreFilterSetFaceDistances(_AppSettings.MaxDegreeOfParallelism, ticks, distinctFilteredFaces);
-        ReadOnlyCollection<FaceDistanceContainer> faceDistanceContainers = E_Distance.GetFaceDistanceContainers(distinctFilteredFaces);
+        E_Distance.PreFilterSetFaceDistances(_AppSettings.MaxDegreeOfParallelism, _MapConfiguration, ticks, distinctValidImageFaces);
+        ReadOnlyCollection<FaceDistanceContainer> faceDistanceContainers = E_Distance.GetFaceDistanceContainers(distinctValidImageFaces);
         if (faceDistanceContainers.Count > 0)
         {
             List<FaceDistance> faceDistanceEncodings = [];

Instance/Models/Binder/AppSettings.cs

@@ -19,6 +19,23 @@ public class AppSettings
         return result;
     }
 
+    private static void PreVerify(IConfigurationRoot configurationRoot, AppSettings? appSettings)
+    {
+        if (appSettings?.Company is null)
+        {
+            List<string> paths = [];
+            foreach (IConfigurationProvider configurationProvider in configurationRoot.Providers)
+            {
+                if (configurationProvider is not Microsoft.Extensions.Configuration.Json.JsonConfigurationProvider jsonConfigurationProvider)
+                    continue;
+                if (jsonConfigurationProvider.Source.FileProvider is not Microsoft.Extensions.FileProviders.PhysicalFileProvider physicalFileProvider)
+                    continue;
+                paths.Add(physicalFileProvider.Root);
+            }
+            throw new NotSupportedException($"Not found!{Environment.NewLine}{string.Join(Environment.NewLine, paths.Distinct())}");
+        }
+    }
+
     private static Models.AppSettings Get(AppSettings? appSettings)
     {
         Models.AppSettings result;
@@ -42,6 +59,7 @@ public class AppSettings
 #pragma warning disable IL3050, IL2026
         AppSettings? appSettings = configurationRoot.Get<AppSettings>();
 #pragma warning restore IL3050, IL2026
+        PreVerify(configurationRoot, appSettings);
         result = Get(appSettings);
         return result;
     }

Instance/Models/Binder/Configuration.cs

@@ -27,8 +27,10 @@ public class Configuration
     public bool? ForceMetadataLastWriteTimeToCreationTime { get; set; }
     public bool? ForceResizeLastWriteTimeToCreationTime { get; set; }
     public string? GenealogicalDataCommunicationFile { get; set; }
+    public string? ImmichAssetsFile { get; set; }
     public string[]? IgnoreExtensions { get; set; }
     public string[]? JLinks { get; set; }
+    public string? LinkedAlpha { get; set; }
     public string[]? LoadOrCreateThenSaveDistanceResultsForOutputResolutions { get; set; }
     public string[]? LoadOrCreateThenSaveImageFacesResultsForOutputResolutions { get; set; }
     public bool? LoadPhotoPrismLocations { get; set; }
@@ -102,7 +104,22 @@ public class Configuration
         return result;
     }
 
-#pragma warning restore csharp_preserve_single_line_statements
+    private static void PreVerify(IConfigurationRoot configurationRoot, Configuration? configuration)
+    {
+        if (configuration?.CheckDFaceAndUpWriteDates is null)
+        {
+            List<string> paths = [];
+            foreach (IConfigurationProvider configurationProvider in configurationRoot.Providers)
+            {
+                if (configurationProvider is not Microsoft.Extensions.Configuration.Json.JsonConfigurationProvider jsonConfigurationProvider)
+                    continue;
+                if (jsonConfigurationProvider.Source.FileProvider is not Microsoft.Extensions.FileProviders.PhysicalFileProvider physicalFileProvider)
+                    continue;
+                paths.Add(physicalFileProvider.Root);
+            }
+            throw new NotSupportedException($"Not found!{Environment.NewLine}{string.Join(Environment.NewLine, paths.Distinct())}");
+        }
+    }
 
     private static Models.Configuration Get(Configuration? configuration, Property.Models.Configuration propertyConfiguration)
     {
@@ -129,8 +146,10 @@ public class Configuration
         if (configuration?.ForceMetadataLastWriteTimeToCreationTime is null) throw new NullReferenceException(nameof(configuration.ForceMetadataLastWriteTimeToCreationTime));
         if (configuration?.ForceResizeLastWriteTimeToCreationTime is null) throw new NullReferenceException(nameof(configuration.ForceResizeLastWriteTimeToCreationTime));
         if (configuration?.GenealogicalDataCommunicationFile is null) throw new NullReferenceException(nameof(configuration.GenealogicalDataCommunicationFile));
+        if (configuration?.ImmichAssetsFile is null) throw new NullReferenceException(nameof(configuration.ImmichAssetsFile));
         // if (configuration?.IgnoreExtensions is null) throw new NullReferenceException(nameof(configuration.IgnoreExtensions));
         // if (configuration?.JLinks is null) throw new NullReferenceException(nameof(configuration.JLinks));
+        // if (configuration?.LinkedAlpha is null) throw new NullReferenceException(nameof(configuration.LinkedAlpha));
         // if (configuration?.LoadOrCreateThenSaveDistanceResultsForOutputResolutions is null) throw new NullReferenceException(nameof(configuration.LoadOrCreateThenSaveDistanceResultsForOutputResolutions));
         // if (configuration?.LoadOrCreateThenSaveImageFacesResultsForOutputResolutions is null) throw new NullReferenceException(nameof(configuration.LoadOrCreateThenSaveImageFacesResultsForOutputResolutions));
         if (configuration?.LoadPhotoPrismLocations is null) throw new NullReferenceException(nameof(configuration.LoadPhotoPrismLocations));
@@ -218,8 +237,10 @@ public class Configuration
                      configuration.ForceMetadataLastWriteTimeToCreationTime.Value,
                      configuration.ForceResizeLastWriteTimeToCreationTime.Value,
                      configuration.GenealogicalDataCommunicationFile,
+                     configuration.ImmichAssetsFile,
                      configuration.IgnoreExtensions ?? [],
                      configuration.JLinks ?? [],
+                     configuration.LinkedAlpha,
                      configuration.LoadOrCreateThenSaveDistanceResultsForOutputResolutions ?? [],
                      configuration.LoadOrCreateThenSaveImageFacesResultsForOutputResolutions ?? [],
                      configuration.LoadPhotoPrismLocations.Value,
@@ -294,14 +315,19 @@ public class Configuration
         Models.Configuration result;
         Configuration? configuration;
         if (isEnvironment is null)
+#pragma warning disable IL3050, IL2026
             configuration = configurationRoot.Get<Configuration>();
+#pragma warning restore IL3050, IL2026
         else
         {
             string environmentName = IsEnvironment.GetEnvironmentName(isEnvironment);
             string section = string.Concat(environmentName, ":", nameof(Configuration));
             IConfigurationSection configurationSection = configurationRoot.GetSection(section);
+#pragma warning disable IL3050, IL2026
             configuration = configurationSection.Get<Configuration>();
+#pragma warning restore IL3050, IL2026
         }
+        PreVerify(configurationRoot, configuration);
         result = Get(configuration, propertyConfiguration);
         return result;
     }

Instance/Models/Configuration.cs

@@ -21,8 +21,10 @@ public record Configuration(Property.Models.Configuration PropertyConfiguration,
                             bool ForceMetadataLastWriteTimeToCreationTime,
                             bool ForceResizeLastWriteTimeToCreationTime,
                             string GenealogicalDataCommunicationFile,
+                            string ImmichAssetsFile,
                             string[] IgnoreExtensions,
                             string[] JLinks,
+                            string? LinkedAlpha,
                             string[] LoadOrCreateThenSaveDistanceResultsForOutputResolutions,
                             string[] LoadOrCreateThenSaveImageFacesResultsForOutputResolutions,
                             bool LoadPhotoPrismLocations,

Instance/Models/Identifier.cs

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

Instance/Models/_F_Random.cs

@@ -1,5 +1,6 @@
 using System.Collections.ObjectModel;
 using System.Text.Json;
+using View_by_Distance.Shared.Models;
 
 namespace View_by_Distance.Instance.Models;
 
@@ -24,16 +25,18 @@ internal class F_Random
         return result;
     }
 
-    private static ReadOnlyDictionary<string, List<string>> GetDayToRelativePaths(ReadOnlyCollection<Shared.Models.Mapping> mappingCollection, string dateFormat, ReadOnlyDictionary<int, List<long>> idToPersonKeys)
+    private static ReadOnlyDictionary<string, List<string>> GetDayToRelativePaths(ReadOnlyCollection<Mapping> distinctValidImageMappingCollection, string dateFormat, Dictionary<string, ImmichAsset> immichAssets, ReadOnlyDictionary<int, List<long>> idToPersonKeys)
     {
         Dictionary<string, List<string>> results = [];
         string key;
         DateTime dateTime;
         List<long>? personKeys;
+        ImmichAsset? immichAsset;
         List<string>? relativePaths;
-        foreach (Shared.Models.Mapping mapping in mappingCollection)
+        bool immichAssetsCountIsZero = immichAssets.Count == 0;
+        foreach (Mapping mapping in distinctValidImageMappingCollection)
         {
-            if (mapping.MappingFromItem.ImageFileHolder.DirectoryName is null || mapping.MappingFromPerson is null)
+            if (mapping.MappingFromItem.FilePath.DirectoryName is null || mapping.MappingFromPerson is null)
                 continue;
             if (!idToPersonKeys.TryGetValue(mapping.MappingFromItem.Id, out personKeys))
                 continue;
@@ -49,39 +52,72 @@ internal class F_Random
                 if (!results.TryGetValue(key, out relativePaths))
                     throw new Exception();
             }
-            relativePaths.Add(mapping.MappingFromItem.RelativePath);
+            if (immichAssetsCountIsZero)
+                relativePaths.Add(mapping.MappingFromItem.RelativePath);
+            else
+            {
+                if (!immichAssets.TryGetValue(mapping.MappingFromItem.RelativePath, out immichAsset))
+                    continue;
+                relativePaths.Add(immichAsset.PreviewPath);
+            }
         }
         return new(results);
     }
 
-    internal void Random(Property.Models.Configuration configuration, int radomUseBirthdayMinimum, string[] validKeyWordsToIgnoreInRandom, string outputResolution, ReadOnlyDictionary<long, List<int>> personKeyToIds, ReadOnlyCollection<int>? notNineCollection, ReadOnlyCollection<Shared.Models.Mapping> mappingCollection)
+    private static Dictionary<string, ImmichAsset> GetImmichAssets(string immichAssetsFile)
+    {
+        Dictionary<string, ImmichAsset> results = [];
+        if (!string.IsNullOrEmpty(immichAssetsFile) && File.Exists(immichAssetsFile))
+        {
+            string json = File.ReadAllText(immichAssetsFile);
+            ImmichAsset[]? immichAssets = JsonSerializer.Deserialize(json, ImmichAssetCollectionSourceGenerationContext.Default.ImmichAssetArray);
+            if (immichAssets is not null)
+            {
+                foreach (ImmichAsset immichAsset in immichAssets)
+                    results.Add(immichAsset.OriginalPath, immichAsset);
+            }
+        }
+        return results;
+    }
+
+    internal void Random(Property.Models.Configuration configuration, string immichAssetsFile, int radomUseBirthdayMinimum, string[] validKeyWordsToIgnoreInRandom, ReadOnlyDictionary<long, List<int>> personKeyToIds, ReadOnlyCollection<int>? notNineCollection, ReadOnlyCollection<Mapping> distinctValidImageMappingCollection)
     {
         string key;
         string json;
         string jsonFile;
         Random random = new();
         List<string>? collection;
+        ImmichAsset? immichAsset;
         string dateFormat = "MM-dd";
         List<string> relativePaths = [];
         List<int> distinctCollection = [];
         DateTime dateTime = new(2024, 1, 1); //Leap year
+        Dictionary<string, ImmichAsset> immichAssets = GetImmichAssets(immichAssetsFile);
         ReadOnlyDictionary<int, List<long>> idToPersonKeys = Map.Models.Stateless.Methods.IMapLogic.GetIdToPersonKeys(personKeyToIds);
-        ReadOnlyDictionary<string, List<string>> dayToRelativePaths = GetDayToRelativePaths(mappingCollection, dateFormat, idToPersonKeys);
+        ReadOnlyDictionary<string, List<string>> dayToRelativePaths = GetDayToRelativePaths(distinctValidImageMappingCollection, dateFormat, immichAssets, idToPersonKeys);
         string fRandomCollectionDirectory = Property.Models.Stateless.IResult.GetResultsDateGroupDirectory(configuration, nameof(F_Random), "[]");
         string[] files = Directory.GetFiles(fRandomCollectionDirectory, "*", SearchOption.TopDirectoryOnly);
         foreach (string file in files)
             File.Delete(file);
-        foreach (Shared.Models.Mapping mapping in mappingCollection)
+        bool immichAssetsCountIsZero = immichAssets.Count == 0;
+        foreach (Mapping mapping in distinctValidImageMappingCollection)
         {
             if (distinctCollection.Contains(mapping.MappingFromItem.Id))
                 continue;
-            if (mapping.MappingFromItem.ImageFileHolder.DirectoryName is null)
+            if (mapping.MappingFromItem.FilePath.DirectoryName is null)
                 continue;
             if (notNineCollection is not null && notNineCollection.Contains(mapping.MappingFromItem.Id))
                 continue;
             if (mapping.MappingFromItem.Keywords is not null && mapping.MappingFromItem.Keywords.Any(l => validKeyWordsToIgnoreInRandom.Contains(l)))
                 continue;
-            relativePaths.Add(mapping.MappingFromItem.RelativePath);
+            if (immichAssetsCountIsZero)
+                relativePaths.Add(mapping.MappingFromItem.RelativePath);
+            else
+            {
+                if (!immichAssets.TryGetValue(mapping.MappingFromItem.RelativePath, out immichAsset))
+                    continue;
+                relativePaths.Add(immichAsset.PreviewPath);
+            }
             distinctCollection.Add(mapping.MappingFromItem.Id);
         }
         if (relativePaths.Count > 0)

Map/.vscode/format-report.json

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

Map/.vscode/tasks.json

@@ -0,0 +1,42 @@
+{
+    "version": "2.0.0",
+    "tasks": [
+        {
+            "label": "Format",
+            "command": "dotnet",
+            "type": "process",
+            "args": [
+                "format",
+                "--report",
+                ".vscode",
+                "--verbosity",
+                "detailed",
+                "--severity",
+                "warn"
+            ],
+            "problemMatcher": "$msCompile"
+        },
+        {
+            "label": "Format-Whitespaces",
+            "command": "dotnet",
+            "type": "process",
+            "args": [
+                "format",
+                "whitespace"
+            ],
+            "problemMatcher": "$msCompile"
+        },
+        {
+            "label": "build",
+            "command": "dotnet",
+            "type": "process",
+            "args": [
+                "build",
+                "${workspaceFolder}/Map.csproj",
+                "/property:GenerateFullPaths=true",
+                "/consoleloggerparameters:NoSummary"
+            ],
+            "problemMatcher": "$msCompile"
+        }
+    ]
+}

Map/Models/Configuration.cs

@@ -1,10 +1,13 @@
 namespace View_by_Distance.Map.Models;
 
-public record Configuration(bool DeletePossibleDuplicates,
+public record Configuration(Shared.Models.Methods.IDistanceLimits DistanceLimits,
+                            Shared.Models.Properties.IPropertyConfiguration PropertyConfiguration,
+                            bool DeletePossibleDuplicates,
                             bool DistanceMoveUnableToMatch,
                             bool DistanceRenameToMatch,
                             int FaceConfidencePercent,
                             int FaceDistancePermyriad,
+                            string? LinkedAlpha,
                             string LocationContainerDebugDirectory,
                             string LocationContainerDirectoryPattern,
                             int LocationContainerDistanceGroupMinimum,

Map/Models/MapLogic.cs

@@ -23,6 +23,14 @@ public partial class MapLogic : Shared.Models.Methods.IMapLogic
                            long? Ticks,
                            string? PersonDirectory);
 
+    internal record FilteredOriginalImage(int Id,
+                                          FilePath FilePath,
+                                          int ApproximateYears,
+                                          string PersonKeyFormatted,
+                                          string Directory,
+                                          string PersonDirectory,
+                                          string CheckFile);
+
     public void SaveContainers(int? updated, List<SaveContainer> saveContainers)
     {
         if (_Configuration is null)
@@ -137,7 +145,7 @@ public partial class MapLogic : Shared.Models.Methods.IMapLogic
         }
     }
 
-    private List<SaveShortcutsForOutputResolutions> GetCollectionForSaveShortcutsForOutputResolutionsPreMapLogic(string eDistanceContentDirectory, ReadOnlyDictionary<long, List<int>> personKeyToIds, ReadOnlyCollection<Mapping> mappingCollection)
+    private List<SaveShortcutsForOutputResolutions> GetCollectionForSaveShortcutsForOutputResolutionsPreMapLogic(string eDistanceContentDirectory, ReadOnlyDictionary<long, List<int>> personKeyToIds, ReadOnlyCollection<Mapping> distinctValidImageMappingCollection)
     {
         List<SaveShortcutsForOutputResolutions> results = [];
         if (_Configuration is null)
@@ -153,24 +161,24 @@ public partial class MapLogic : Shared.Models.Methods.IMapLogic
         string personKeyFormatted;
         Calendar calendar = new CultureInfo("en-US").Calendar;
         ReadOnlyDictionary<int, List<long>> idToPersonKeys = IMapLogic.GetIdToPersonKeys(personKeyToIds);
-        foreach (Mapping mapping in mappingCollection)
+        foreach (Mapping mapping in distinctValidImageMappingCollection)
         {
             dateTime = mapping.MappingFromItem.GetDateTimeOriginalThenMinimumDateTime();
             description = mapping.MappingFromLocation is null ? mapping.MappingFromItem.Id.ToString() : mapping.MappingFromLocation.DeterministicHashCodeKey;
             (season, _) = IProperty.GetSeason(dateTime.DayOfYear);
             weekOfYear = calendar.GetWeekOfYear(dateTime, CalendarWeekRule.FirstDay, DayOfWeek.Sunday).ToString("00");
             directory = Path.Combine($"{eDistanceContentDirectory}---", "Date Shortcuts", $"{dateTime.Year}.{season}-MM{dateTime.Month:00}-WW{weekOfYear}");
-            fileName = Path.Combine(directory, $"{mapping.MappingFromItem.ImageFileHolder.Name}.lnk");
-            results.Add(new(mapping.MappingFromItem.ImageFileHolder.FullName, directory, dateTime, fileName, description, MakeAllHidden: false));
-            if (mapping.MappingFromItem.ImageFileHolder.DirectoryName is null)
+            fileName = Path.Combine(directory, $"{mapping.MappingFromItem.FilePath.Name}.lnk");
+            results.Add(new(mapping.MappingFromItem.FilePath.FullName, directory, dateTime, fileName, description, MakeAllHidden: false));
+            if (mapping.MappingFromItem.FilePath.DirectoryName is null)
                 continue;
-            directoryName = Path.GetFileName(mapping.MappingFromItem.ImageFileHolder.DirectoryName);
+            directoryName = Path.GetFileName(mapping.MappingFromItem.FilePath.DirectoryName);
             if (!string.IsNullOrEmpty(mapping.MappingFromItem.Model) && !string.IsNullOrEmpty(mapping.MappingFromItem.Model.Trim()))
             {
                 // Remove-Item -LiteralPath "\\?\D:\Tmp\a\EX-Z70     "
                 directory = Path.Combine($"{eDistanceContentDirectory}---", "Model Shortcuts", FileSystemSafe().Replace(mapping.MappingFromItem.Model.Trim(), "_"), directoryName);
-                fileName = Path.Combine(directory, $"{mapping.MappingFromItem.ImageFileHolder.Name}.lnk");
-                results.Add(new(mapping.MappingFromItem.ImageFileHolder.FullName, directory, dateTime, fileName, description, MakeAllHidden: false));
+                fileName = Path.Combine(directory, $"{mapping.MappingFromItem.FilePath.Name}.lnk");
+                results.Add(new(mapping.MappingFromItem.FilePath.FullName, directory, dateTime, fileName, description, MakeAllHidden: false));
             }
             if (mapping.MappingFromPerson is null)
                 continue;
@@ -180,13 +188,13 @@ public partial class MapLogic : Shared.Models.Methods.IMapLogic
                 continue;
             personKeyFormatted = IPersonBirthday.GetFormatted(_Configuration.PersonBirthdayFormat, mapping.MappingFromPerson.PersonKey);
             directory = Path.Combine($"{eDistanceContentDirectory}---", "Person Key Shortcuts", personKeyFormatted, directoryName);
-            fileName = Path.Combine(directory, $"{mapping.MappingFromItem.ImageFileHolder.Name}.lnk");
-            results.Add(new(mapping.MappingFromItem.ImageFileHolder.FullName, directory, mapping.MappingFromItem.GetDateTimeOriginalThenMinimumDateTime(), fileName, description, MakeAllHidden: false));
+            fileName = Path.Combine(directory, $"{mapping.MappingFromItem.FilePath.Name}.lnk");
+            results.Add(new(mapping.MappingFromItem.FilePath.FullName, directory, dateTime, fileName, description, MakeAllHidden: false));
             if (IPerson.IsDefaultName(mapping.MappingFromPerson))
                 continue;
             directory = Path.Combine($"{eDistanceContentDirectory}---", "Name Shortcuts", mapping.MappingFromPerson.DisplayDirectoryName, directoryName);
-            fileName = Path.Combine(directory, $"{mapping.MappingFromItem.ImageFileHolder.Name}.lnk");
-            results.Add(new(mapping.MappingFromItem.ImageFileHolder.FullName, directory, mapping.MappingFromItem.GetDateTimeOriginalThenMinimumDateTime(), fileName, description, MakeAllHidden: false));
+            fileName = Path.Combine(directory, $"{mapping.MappingFromItem.FilePath.Name}.lnk");
+            results.Add(new(mapping.MappingFromItem.FilePath.FullName, directory, dateTime, fileName, description, MakeAllHidden: false));
         }
         return results;
     }
@@ -225,11 +233,12 @@ public partial class MapLogic : Shared.Models.Methods.IMapLogic
         _Ticks = ticks;
         _Configuration = configuration;
         _PropertyConfiguration = propertyConfiguration;
-        ReadOnlyDictionary<long, int> readOnlyPersonKeyToCount;
+        List<LocationContainer> locationContainers = [];
         List<PersonContainer> notMappedPersonContainers = [];
+        ReadOnlyDictionary<long, int> readOnlyPersonKeyToCount;
         Dictionary<int, List<(string, int)>> skipCollection = [];
         Dictionary<int, List<(string, int)>> skipNotSkipCollection = [];
-        List<LocationContainer> locationContainers = [];
+        ReadOnlyDictionary<int, List<(string, int)>> readOnlySkipCollection;
         string? rootDirectoryParent = Path.GetDirectoryName(propertyConfiguration.RootDirectory);
         string eDistanceContentTicksDirectory = Path.Combine(eDistanceContentDirectory, ticks.ToString());
         ReadOnlyDictionary<int, ReadOnlyDictionary<int, ReadOnlyCollection<PersonContainer>>> idThenWholePercentagesToPersonContainers;
@@ -293,8 +302,10 @@ public partial class MapLogic : Shared.Models.Methods.IMapLogic
                                                                readOnlyPersonKeyToCount,
                                                                readOnlyPossiblyNewPersonDisplayDirectoryNamesAndPersonContainer);
             idThenWholePercentagesToPersonContainers = Stateless.MapLogic.GetIdThenWholePercentagesToPersonContainers(configuration,
+                                                                                                                      skipCollection,
                                                                                                                       readOnlyPersonKeyFormattedToPersonContainer,
                                                                                                                       personKeyFormattedIdThenWholePercentagesCollection);
+            readOnlySkipCollection = new(skipCollection);
             notMappedPersonContainers.AddRange(Stateless.MapLogic.GetNotMappedPersonContainers(configuration,
                                                                                                ticks,
                                                                                                personContainers,
@@ -304,7 +315,7 @@ public partial class MapLogic : Shared.Models.Methods.IMapLogic
                                                                                  configuration,
                                                                                  ticks,
                                                                                  personContainers,
-                                                                                 skipCollection,
+                                                                                 readOnlySkipCollection,
                                                                                  records));
             int lossCount = records.Count - locationContainers.Count;
             int unableToMatchCount = records.Count - personKeyFormattedIdThenWholePercentagesCollection.Count;
@@ -433,22 +444,47 @@ public partial class MapLogic : Shared.Models.Methods.IMapLogic
         {
             string checkFile;
             string facesDirectory = Stateless.MapLogic.GetFacesDirectory(_PropertyConfiguration, dFacesContentDirectory, mapping.FilePath, mapping.MappingFromItem);
-            FileHolder faceFileHolder = IFileHolder.Get(Path.Combine(facesDirectory, $"{mapping.MappingFromLocation.DeterministicHashCodeKey}{mapping.MappingFromItem.ImageFileHolder.ExtensionLowered}{_Configuration.FacesFileNameExtension}"));
+            FileHolder faceFileHolder = IFileHolder.Get(Path.Combine(facesDirectory, $"{mapping.MappingFromLocation.DeterministicHashCodeKey}{mapping.MappingFromItem.FilePath.ExtensionLowered}{_Configuration.FacesFileNameExtension}"));
             if (!faceFileHolder.Exists)
                 result = null;
             else
             {
                 string shortcutFile = string.Empty;
                 string facePartsDirectory = Stateless.MapLogic.GetFacePartsDirectory(_PropertyConfiguration, d2FacePartsContentDirectory, mapping.FilePath, mapping.MappingFromItem);
-                checkFile = Path.Combine(directory, $"{mapping.MappingFromLocation.DeterministicHashCodeKey}{mapping.MappingFromItem.ImageFileHolder.ExtensionLowered}");
-                FileHolder hiddenFaceFileHolder = IFileHolder.Get(Path.Combine(facesDirectory, $"{mapping.MappingFromLocation.DeterministicHashCodeKey}{mapping.MappingFromItem.ImageFileHolder.ExtensionLowered}{_Configuration.FacesHiddenFileNameExtension}"));
-                FileHolder facePartsFileHolder = IFileHolder.Get(Path.Combine(facePartsDirectory, $"{mapping.MappingFromLocation.DeterministicHashCodeKey}{mapping.MappingFromItem.ImageFileHolder.ExtensionLowered}{_Configuration.FacePartsFileNameExtension}"));
+                checkFile = Path.Combine(directory, $"{mapping.MappingFromLocation.DeterministicHashCodeKey}{mapping.MappingFromItem.FilePath.ExtensionLowered}");
+                FileHolder hiddenFaceFileHolder = IFileHolder.Get(Path.Combine(facesDirectory, $"{mapping.MappingFromLocation.DeterministicHashCodeKey}{mapping.MappingFromItem.FilePath.ExtensionLowered}{_Configuration.FacesHiddenFileNameExtension}"));
+                FileHolder facePartsFileHolder = IFileHolder.Get(Path.Combine(facePartsDirectory, $"{mapping.MappingFromLocation.DeterministicHashCodeKey}{mapping.MappingFromItem.FilePath.ExtensionLowered}{_Configuration.FacePartsFileNameExtension}"));
                 result = new(checkFile, directory, faceFileHolder, hiddenFaceFileHolder, facePartsFileHolder, mapping.MappingFromItem.ResizedFileHolder, shortcutFile);
             }
         }
         return result;
     }
 
+    private (long?, string?) GetDirectory(Configuration configuration, string by, string segmentB)
+    {
+        long? ticks = null;
+        const int zero = 0;
+        string? directory = null;
+        string personKeyFormatted;
+        PersonBirthday personBirthday;
+        PersonContainer personContainer;
+        for (int i = _NotMappedPersonContainers.Count - 1; i > 0; i--)
+        {
+            if (configuration.SaveIndividually)
+                break;
+            personContainer = _NotMappedPersonContainers[i];
+            if (personContainer.Key is null || personContainer.Birthdays is null || personContainer.Birthdays.Length == 0)
+                continue;
+            personBirthday = personContainer.Birthdays[zero];
+            ticks = personBirthday.Value.Ticks;
+            personKeyFormatted = IPersonBirthday.GetFormatted(configuration.PersonBirthdayFormat, personBirthday);
+            directory = Path.Combine(_EDistanceContentTicksDirectory, by, personKeyFormatted, segmentB);
+            _NotMappedPersonContainers.RemoveAt(i);
+            break;
+        }
+        return (ticks, directory);
+    }
+
     private (long?, string?) GetDirectory(Configuration configuration, bool saveIndividually, int padLeft, string? segmentC, string by, MappingFromItem mappingFromItem)
     {
         long? ticks = null;
@@ -501,7 +537,30 @@ public partial class MapLogic : Shared.Models.Methods.IMapLogic
         return result;
     }
 
-    private Record Get(Configuration configuration, bool saveIndividually, string by, Mapping question, int padLeft)
+    private Record Get(Configuration configuration, string by, long? personKey, string? displayDirectoryName, string segmentB)
+    {
+        long? ticks;
+        string? directory;
+        string? debugDirectory;
+        string? personDirectory;
+        if (personKey is null || string.IsNullOrEmpty(displayDirectoryName))
+        {
+            debugDirectory = null;
+            (ticks, directory) = GetDirectory(configuration, by, segmentB);
+            personDirectory = directory is null ? null : Path.Combine(directory, $"X+{ticks}");
+        }
+        else
+        {
+            ticks = null;
+            string personKeyFormatted = IPersonBirthday.GetFormatted(configuration.PersonBirthdayFormat, personKey.Value);
+            debugDirectory = Path.Combine(_EDistanceContentTicksDirectory, by, personKeyFormatted, displayDirectoryName);
+            directory = Path.Combine(_EDistanceContentTicksDirectory, by, personKeyFormatted, segmentB);
+            personDirectory = Path.Combine(directory, displayDirectoryName, "lnk");
+        }
+        return new(debugDirectory, directory, ticks, personDirectory);
+    }
+
+    private Record Get(Configuration configuration, bool saveIndividually, int padLeft, string by, Mapping question)
     {
         long? ticks;
         string? directory;
@@ -529,7 +588,7 @@ public partial class MapLogic : Shared.Models.Methods.IMapLogic
         return new(debugDirectory, directory, ticks, personDirectory);
     }
 
-    private List<SaveContainer> GetSaveContainers(string dFacesContentDirectory, string d2FacePartsContentDirectory, ReadOnlyCollection<Mapping> mappingCollection, ReadOnlyDictionary<int, ReadOnlyDictionary<int, Mapping>> idToWholePercentagesToMapping, ReadOnlyDictionary<long, List<int>> personKeyToIds, int? useFiltersCounter, bool saveMapped, bool saveIndividually, bool sortingContainersAny)
+    private List<SaveContainer> GetSaveContainers(string dFacesContentDirectory, string d2FacePartsContentDirectory, ReadOnlyCollection<Mapping> distinctValidImageMappingCollection, ReadOnlyDictionary<int, ReadOnlyDictionary<int, Mapping>> idToWholePercentagesToMapping, ReadOnlyDictionary<long, List<int>> personKeyToIds, int? useFiltersCounter, bool saveMapped, bool saveIndividually, bool sortingContainersAny)
     {
         if (_Configuration is null)
             throw new NullReferenceException(nameof(_Configuration));
@@ -554,7 +613,7 @@ public partial class MapLogic : Shared.Models.Methods.IMapLogic
         ReadOnlyDictionary<int, Mapping>? wholePercentagesToMapping;
         int padLeft = _Configuration.FaceDistancePermyriad.ToString().Length;
         string forceSingleImageHumanized = nameof(Shared.Models.Stateless.IMapLogic.ForceSingleImage).Humanize(LetterCasing.Title);
-        foreach (Mapping mapping in mappingCollection)
+        foreach (Mapping mapping in distinctValidImageMappingCollection)
         {
             if (mapping.MappingFromLocation is null)
                 continue;
@@ -583,7 +642,7 @@ public partial class MapLogic : Shared.Models.Methods.IMapLogic
                 if (!PreAndPostContinue(_Configuration, mapping, question))
                     continue;
             }
-            record = Get(_Configuration, saveIndividually, by, mapping, padLeft);
+            record = Get(_Configuration, saveIndividually, padLeft, by, mapping);
             if (string.IsNullOrEmpty(record.Directory) || string.IsNullOrEmpty(record.PersonDirectory))
                 continue;
             directory = record.Directory;
@@ -618,18 +677,18 @@ public partial class MapLogic : Shared.Models.Methods.IMapLogic
                     results.Add(new(Path.Combine(directory, "Maybe")));
             }
             facesDirectory = Stateless.MapLogic.GetFacesDirectory(_PropertyConfiguration, dFacesContentDirectory, mapping.FilePath, mapping.MappingFromItem);
-            faceFileHolder = IFileHolder.Get(Path.Combine(facesDirectory, $"{mapping.MappingFromLocation.DeterministicHashCodeKey}{mapping.MappingFromItem.ImageFileHolder.ExtensionLowered}{_Configuration.FacesFileNameExtension}"));
+            faceFileHolder = IFileHolder.Get(Path.Combine(facesDirectory, $"{mapping.MappingFromLocation.DeterministicHashCodeKey}{mapping.MappingFromItem.FilePath.ExtensionLowered}{_Configuration.FacesFileNameExtension}"));
             if (!faceFileHolder.Exists)
                 continue;
             if (isByMapping)
             {
-                checkFile = Path.Combine(record.PersonDirectory, $"{mapping.MappingFromLocation.DeterministicHashCodeKey}{mapping.MappingFromItem.ImageFileHolder.ExtensionLowered}");
+                checkFile = Path.Combine(record.PersonDirectory, $"{mapping.MappingFromLocation.DeterministicHashCodeKey}{mapping.MappingFromItem.FilePath.ExtensionLowered}");
                 saveContainer = new(checkFile, directory, faceFileHolder);
             }
             else if (saveIndividually)
             {
                 facePartsDirectory = Stateless.MapLogic.GetFacePartsDirectory(_PropertyConfiguration, d2FacePartsContentDirectory, mapping.FilePath, mapping.MappingFromItem);
-                facePartsFileHolder = IFileHolder.Get(Path.Combine(facePartsDirectory, $"{mapping.MappingFromLocation.DeterministicHashCodeKey}{mapping.MappingFromItem.ImageFileHolder.ExtensionLowered}{_Configuration.FacePartsFileNameExtension}"));
+                facePartsFileHolder = IFileHolder.Get(Path.Combine(facePartsDirectory, $"{mapping.MappingFromLocation.DeterministicHashCodeKey}{mapping.MappingFromItem.FilePath.ExtensionLowered}{_Configuration.FacePartsFileNameExtension}"));
                 (saveContainer, SaveContainer? extraSaveContainer) = Stateless.MapLogic.GetContainers(_Configuration.FacesFileNameExtension, _Configuration.FacePartsFileNameExtension, directory, faceFileHolder, facePartsFileHolder, mapping);
                 if (extraSaveContainer is not null)
                     results.Add(extraSaveContainer);
@@ -637,10 +696,10 @@ public partial class MapLogic : Shared.Models.Methods.IMapLogic
             else
             {
                 facePartsDirectory = Stateless.MapLogic.GetFacePartsDirectory(_PropertyConfiguration, d2FacePartsContentDirectory, mapping.FilePath, mapping.MappingFromItem);
-                shortcutFile = Path.Combine(record.PersonDirectory, $"{mapping.MappingFromLocation.DeterministicHashCodeKey}{mapping.MappingFromItem.ImageFileHolder.ExtensionLowered}.lnk");
-                checkFile = Path.Combine(directory, $"{mapping.MappingFromLocation.DeterministicHashCodeKey}{mapping.MappingFromItem.ImageFileHolder.ExtensionLowered}");
-                hiddenFaceFileHolder = IFileHolder.Get(Path.Combine(facesDirectory, $"{mapping.MappingFromLocation.DeterministicHashCodeKey}{mapping.MappingFromItem.ImageFileHolder.ExtensionLowered}{_Configuration.FacesHiddenFileNameExtension}"));
-                facePartsFileHolder = IFileHolder.Get(Path.Combine(facePartsDirectory, $"{mapping.MappingFromLocation.DeterministicHashCodeKey}{mapping.MappingFromItem.ImageFileHolder.ExtensionLowered}{_Configuration.FacePartsFileNameExtension}"));
+                shortcutFile = Path.Combine(record.PersonDirectory, $"{mapping.MappingFromLocation.DeterministicHashCodeKey}{mapping.MappingFromItem.FilePath.ExtensionLowered}.lnk");
+                checkFile = Path.Combine(directory, $"{mapping.MappingFromLocation.DeterministicHashCodeKey}{mapping.MappingFromItem.FilePath.ExtensionLowered}");
+                hiddenFaceFileHolder = IFileHolder.Get(Path.Combine(facesDirectory, $"{mapping.MappingFromLocation.DeterministicHashCodeKey}{mapping.MappingFromItem.FilePath.ExtensionLowered}{_Configuration.FacesHiddenFileNameExtension}"));
+                facePartsFileHolder = IFileHolder.Get(Path.Combine(facePartsDirectory, $"{mapping.MappingFromLocation.DeterministicHashCodeKey}{mapping.MappingFromItem.FilePath.ExtensionLowered}{_Configuration.FacePartsFileNameExtension}"));
                 saveContainer = new(checkFile, directory, faceFileHolder, hiddenFaceFileHolder, facePartsFileHolder, mapping.MappingFromItem.ResizedFileHolder, shortcutFile);
             }
             results.Add(saveContainer);
@@ -648,7 +707,7 @@ public partial class MapLogic : Shared.Models.Methods.IMapLogic
         return results;
     }
 
-    public void SaveMapped(string dFacesContentDirectory, string d2FacePartsContentDirectory, string d2FacePartsContentCollectionDirectory, ReadOnlyDictionary<long, List<int>> personKeyToIds, ReadOnlyCollection<Mapping> mappingCollection, ReadOnlyDictionary<int, ReadOnlyDictionary<int, Mapping>> idToWholePercentagesToMapping)
+    public void SaveMapped(string dFacesContentDirectory, string d2FacePartsContentDirectory, string d2FacePartsContentCollectionDirectory, ReadOnlyDictionary<long, List<int>> personKeyToIds, ReadOnlyCollection<Mapping> distinctValidImageMappingCollection, ReadOnlyDictionary<int, ReadOnlyDictionary<int, Mapping>> idToWholePercentagesToMapping)
     {
         if (_Configuration is null)
             throw new NullReferenceException(nameof(_Configuration));
@@ -656,7 +715,7 @@ public partial class MapLogic : Shared.Models.Methods.IMapLogic
         bool saveMapped = true;
         int? useFiltersCounter = null;
         string mappingDirectory = Path.Combine(_EDistanceContentTicksDirectory, nameof(Shared.Models.Stateless.IMapLogic.Mapping));
-        List<SaveContainer> saveContainers = GetSaveContainers(dFacesContentDirectory, d2FacePartsContentDirectory, mappingCollection, idToWholePercentagesToMapping, personKeyToIds, useFiltersCounter, saveMapped, sortingContainersAny: true, saveIndividually: false);
+        List<SaveContainer> saveContainers = GetSaveContainers(dFacesContentDirectory, d2FacePartsContentDirectory, distinctValidImageMappingCollection, idToWholePercentagesToMapping, personKeyToIds, useFiltersCounter, saveMapped, sortingContainersAny: true, saveIndividually: false);
         SaveContainers(updated, saveContainers);
         if (!string.IsNullOrEmpty(_EDistanceContentTicksDirectory) && Directory.Exists(mappingDirectory))
             Stateless.MapLogic.SaveMappingShortcuts(mappingDirectory);
@@ -750,7 +809,7 @@ public partial class MapLogic : Shared.Models.Methods.IMapLogic
                     keyToCount.Add(key, new());
                 _ = keyToCount.TryAdd(key, 0);
                 keyToCount[key]++;
-                if (!_Configuration.SaveIndividually && keyToCount[key] < _Configuration.SortingMaximumPerKey)
+                if (!_Configuration.SaveIndividually && keyToCount[key] <= _Configuration.SortingMaximumPerKey)
                     segmentC = null;
                 else
                     segmentC = sortingContainer.Sorting.DistancePermyriad.ToString();
@@ -761,6 +820,94 @@ public partial class MapLogic : Shared.Models.Methods.IMapLogic
         return result;
     }
 
+    private string? GetDisplayDirectoryName(string? displayDirectoryName, LocationContainer locationContainer)
+    {
+        string? result = displayDirectoryName;
+        ReadOnlyDictionary<int, ReadOnlyCollection<PersonContainer>>? wholePercentagesToPersonContainers = GetWholePercentagesToPersonContainers(locationContainer.Id);
+        if (wholePercentagesToPersonContainers is not null)
+        {
+            foreach (KeyValuePair<int, ReadOnlyCollection<PersonContainer>> keyValuePair in wholePercentagesToPersonContainers)
+            {
+                if (keyValuePair.Key != locationContainer.WholePercentages)
+                    continue;
+                if (keyValuePair.Value.Count != 1)
+                    continue;
+                result = keyValuePair.Value[0].DisplayDirectoryName;
+            }
+        }
+        return result;
+    }
+
+    public List<SaveContainer> GetSaveContainers(string cResultsFullGroupDirectory, string dResultsFullGroupDirectory, string d2ResultsFullGroupDirectory, Shared.Models.Methods.IDistanceLimits distanceLimits, ReadOnlyCollection<LocationContainer> matrix)
+    {
+        if (_Configuration is null)
+            throw new NullReferenceException(nameof(_Configuration));
+        List<SaveContainer> results = [];
+        string by;
+        Record record;
+        string segmentB;
+        bool isBySorting;
+        string checkFile;
+        string? directory;
+        string shortcutFile;
+        string facesDirectory;
+        List<string> added = [];
+        bool isCounterPersonYear;
+        string facePartsDirectory;
+        FileHolder? faceFileHolder;
+        SaveContainer? saveContainer;
+        string? displayDirectoryName;
+        FileHolder? resizedFileHolder;
+        int? useFiltersCounter = null;
+        string resizeContentDirectory;
+        FileHolder? facePartsFileHolder;
+        FileHolder? hiddenFaceFileHolder;
+        bool sortingContainersAny = matrix.Count > 0;
+        string cContentDirectory = Path.Combine(cResultsFullGroupDirectory, _Configuration.PropertyConfiguration.ResultContent);
+        string forceSingleImageHumanized = nameof(Shared.Models.Stateless.IMapLogic.ForceSingleImage).Humanize(LetterCasing.Title);
+        string d2FacePartsContentDirectory = Path.Combine(d2ResultsFullGroupDirectory, _Configuration.PropertyConfiguration.ResultContent);
+        foreach (LocationContainer locationContainer in matrix)
+        {
+            if (_Configuration.SaveIndividually)
+                break;
+            if (locationContainer.LengthPermyriad is null || locationContainer.LengthSource is null)
+                continue;
+            if (added.Contains(locationContainer.LengthSource.Name))
+                continue;
+            segmentB = locationContainer.LengthPermyriad.Value.ToString().PadLeft(2, '0')[..2];
+            isCounterPersonYear = locationContainer.PersonKey is not null && IPersonBirthday.IsCounterPersonYear(locationContainer.PersonKey.Value);
+            displayDirectoryName = isCounterPersonYear ? locationContainer.DisplayDirectoryName : GetDisplayDirectoryName(locationContainer.DisplayDirectoryName, locationContainer);
+            (by, _, isBySorting) = Stateless.MapLogic.Get(useFiltersCounter, _Configuration.SaveIndividually, sortingContainersAny, forceSingleImageHumanized, locationContainer.LengthPermyriad, locationContainer.PersonKey, displayDirectoryName);
+            record = Get(_Configuration, by, locationContainer.PersonKey, displayDirectoryName, segmentB);
+            if (string.IsNullOrEmpty(record.Directory) || string.IsNullOrEmpty(record.PersonDirectory))
+                continue;
+            directory = record.Directory;
+            if (!string.IsNullOrEmpty(record.DebugDirectory))
+                results.Add(new(record.DebugDirectory));
+            if (locationContainer.PersonKey is null)
+            {
+                if (!_Configuration.SaveSortingWithoutPerson)
+                    throw new NotSupportedException();
+                if (record.Ticks is null)
+                    continue;
+            }
+            results.Add(new(record.PersonDirectory));
+            facesDirectory = locationContainer.LengthSource.DirectoryName;
+            faceFileHolder = IFileHolder.Get(locationContainer.LengthSource.FullName);
+            checkFile = Path.Combine(directory, $"{locationContainer.LengthSource.Name}");
+            shortcutFile = Path.Combine(record.PersonDirectory, $"{locationContainer.LengthSource.Name}.lnk");
+            resizeContentDirectory = Stateless.MapLogic.GetResizeContentDirectory(_PropertyConfiguration, cContentDirectory, locationContainer.LengthSource);
+            facePartsDirectory = Stateless.MapLogic.GetFacePartsDirectoryX(_PropertyConfiguration, d2FacePartsContentDirectory, locationContainer.LengthSource);
+            hiddenFaceFileHolder = IFileHolder.Get(Path.Combine(facesDirectory, $"{locationContainer.LengthSource.NameWithoutExtension}{_Configuration.FacesHiddenFileNameExtension}"));
+            facePartsFileHolder = IFileHolder.Get(Path.Combine(facePartsDirectory, $"{locationContainer.LengthSource.NameWithoutExtension}{_Configuration.FacePartsFileNameExtension}"));
+            resizedFileHolder = IFileHolder.Get(Path.Combine(resizeContentDirectory, $"{locationContainer.LengthSource.FileNameFirstSegment}{Path.GetExtension(locationContainer.LengthSource.NameWithoutExtension)}"));
+            saveContainer = new(checkFile, directory, faceFileHolder, hiddenFaceFileHolder, facePartsFileHolder, resizedFileHolder, shortcutFile);
+            results.Add(saveContainer);
+            added.Add(locationContainer.LengthSource.Name);
+        }
+        return results;
+    }
+
     public List<SaveContainer> GetSaveContainers(string dFacesContentDirectory, string d2FacePartsContentDirectory, string d2FacePartsContentCollectionDirectory, ReadOnlyDictionary<int, ReadOnlyDictionary<int, Mapping>> idToWholePercentagesToMapping, Shared.Models.Methods.IDistanceLimits distanceLimits, int? useFiltersCounter, ReadOnlyCollection<SortingContainer> sortingContainers)
     {
         if (_Configuration is null)
@@ -799,7 +946,7 @@ public partial class MapLogic : Shared.Models.Methods.IMapLogic
                 throw new NotSupportedException();
             if (question.MappingFromLocation is null)
                 continue;
-            record = Get(_Configuration, _Configuration.SaveIndividually, by, question, padLeft);
+            record = Get(_Configuration, _Configuration.SaveIndividually, padLeft, by, question);
             if (string.IsNullOrEmpty(record.Directory) || string.IsNullOrEmpty(record.PersonDirectory))
                 continue;
             directory = record.Directory;
@@ -829,12 +976,12 @@ public partial class MapLogic : Shared.Models.Methods.IMapLogic
             if (_Configuration.SaveIndividually && question.MappingFromLocation.WholePercentages == question.MappingFromLocation.WholePercentages)
                 results.Add(new(Path.Combine(directory, "Maybe")));
             facesDirectory = Stateless.MapLogic.GetFacesDirectory(_PropertyConfiguration, dFacesContentDirectory, question.FilePath, question.MappingFromItem);
-            faceFileHolder = IFileHolder.Get(Path.Combine(facesDirectory, $"{question.MappingFromLocation.DeterministicHashCodeKey}{question.MappingFromItem.ImageFileHolder.ExtensionLowered}{_Configuration.FacesFileNameExtension}"));
+            faceFileHolder = IFileHolder.Get(Path.Combine(facesDirectory, $"{question.MappingFromLocation.DeterministicHashCodeKey}{question.MappingFromItem.FilePath.ExtensionLowered}{_Configuration.FacesFileNameExtension}"));
             facePartsDirectory = Stateless.MapLogic.GetFacePartsDirectory(_PropertyConfiguration, d2FacePartsContentDirectory, question.FilePath, question.MappingFromItem);
-            shortcutFile = Path.Combine(record.PersonDirectory, $"{question.MappingFromLocation.DeterministicHashCodeKey}{question.MappingFromItem.ImageFileHolder.ExtensionLowered}.lnk");
-            checkFile = Path.Combine(directory, $"{question.MappingFromLocation.DeterministicHashCodeKey}{question.MappingFromItem.ImageFileHolder.ExtensionLowered}");
-            hiddenFaceFileHolder = IFileHolder.Get(Path.Combine(facesDirectory, $"{question.MappingFromLocation.DeterministicHashCodeKey}{question.MappingFromItem.ImageFileHolder.ExtensionLowered}{_Configuration.FacesHiddenFileNameExtension}"));
-            facePartsFileHolder = IFileHolder.Get(Path.Combine(facePartsDirectory, $"{question.MappingFromLocation.DeterministicHashCodeKey}{question.MappingFromItem.ImageFileHolder.ExtensionLowered}{_Configuration.FacePartsFileNameExtension}"));
+            shortcutFile = Path.Combine(record.PersonDirectory, $"{question.MappingFromLocation.DeterministicHashCodeKey}{question.MappingFromItem.FilePath.ExtensionLowered}.lnk");
+            checkFile = Path.Combine(directory, $"{question.MappingFromLocation.DeterministicHashCodeKey}{question.MappingFromItem.FilePath.ExtensionLowered}");
+            hiddenFaceFileHolder = IFileHolder.Get(Path.Combine(facesDirectory, $"{question.MappingFromLocation.DeterministicHashCodeKey}{question.MappingFromItem.FilePath.ExtensionLowered}{_Configuration.FacesHiddenFileNameExtension}"));
+            facePartsFileHolder = IFileHolder.Get(Path.Combine(facePartsDirectory, $"{question.MappingFromLocation.DeterministicHashCodeKey}{question.MappingFromItem.FilePath.ExtensionLowered}{_Configuration.FacePartsFileNameExtension}"));
             saveContainer = new(checkFile, directory, faceFileHolder, hiddenFaceFileHolder, facePartsFileHolder, question.MappingFromItem.ResizedFileHolder, shortcutFile);
             results.Add(saveContainer);
             if (!_Configuration.SaveIndividually && isBySorting && question.MappingFromPerson is null)
@@ -1026,7 +1173,7 @@ public partial class MapLogic : Shared.Models.Methods.IMapLogic
                     collection.Add(new(personBirthday.Value.Ticks, Path.Combine(checkDirectory, personKeyFormatted, fileNameWithoutExtension, $"{ids.Count} Face(s)")));
                 foreach ((long personKey, string displayDirectoryName) in collection)
                 {
-                    matches = (from l in personContainers where l.Key == personKey && l.ApproximateYears.HasValue select l).ToArray();
+                    matches = (from l in personContainers where l.Key == personKey select l).ToArray();
                     if (matches.Length == 0)
                         continue;
                     personKeyFormatted = IPersonBirthday.GetFormatted(_Configuration.PersonBirthdayFormat, personKey);
@@ -1041,11 +1188,11 @@ public partial class MapLogic : Shared.Models.Methods.IMapLogic
         return results;
     }
 
-    private (int, FileHolder, int, string, string, string, string)[] GetCollectionForSaveFilteredOriginalImagesFromJLinks(string[] jLinks, string a2PeopleContentDirectory, ReadOnlyCollection<PersonContainer> personContainers, ReadOnlyCollection<Mapping> mappingCollection, ReadOnlyDictionary<long, List<int>> personKeyToIds)
+    private FilteredOriginalImage[] GetCollectionForSaveFilteredOriginalImagesFromJLinks(string[] jLinks, string a2PeopleContentDirectory, ReadOnlyCollection<PersonContainer> personContainers, ReadOnlyCollection<Mapping> distinctValidImageMappingCollection, ReadOnlyDictionary<long, List<int>> personKeyToIds)
     {
         if (_Configuration is null)
             throw new NullReferenceException(nameof(_Configuration));
-        (int, FileHolder, int, string, string, string, string)[] results;
+        FilteredOriginalImage[] results;
         int count = 0;
         int group = 65;
         string checkFile;
@@ -1055,9 +1202,9 @@ public partial class MapLogic : Shared.Models.Methods.IMapLogic
         string personKeyFormatted;
         List<int> distinctCollection = [];
         bool usePersonKeyAndDeterministicHashCodeKey = false;
+        List<FilteredOriginalImage> filteredOriginalImages = [];
         List<string> personKeyFormattedCollection = GetPersonKeyFormattedCollection(jLinks, a2PeopleContentDirectory, personContainers, personKeyToIds);
-        List<(int Id, FileHolder ImageFileHolder, int ApproximateYears, string PersonKeyFormatted, string CheckFile, string Directory, string PersonDirectory)> collection = [];
-        foreach (Mapping mapping in mappingCollection)
+        foreach (Mapping mapping in distinctValidImageMappingCollection)
         {
             if (distinctCollection.Contains(mapping.MappingFromItem.Id))
                 continue;
@@ -1066,7 +1213,7 @@ public partial class MapLogic : Shared.Models.Methods.IMapLogic
                 throw new NotSupportedException();
             if (mapping.By is null or Shared.Models.Stateless.IMapLogic.Sorting)
                 continue;
-            if (mapping.MappingFromPerson?.ApproximateYears is null || mapping.MappingFromLocation is null)
+            if (mapping.MappingFromPerson is null || mapping.MappingFromLocation is null)
                 continue;
             if (string.IsNullOrEmpty(mapping.MappingFromPerson.SegmentB))
                 throw new NotSupportedException();
@@ -1086,45 +1233,52 @@ public partial class MapLogic : Shared.Models.Methods.IMapLogic
                 }
                 directory = Path.Combine(_EDistanceContentTicksDirectory, ((char)group).ToString());
                 personDirectory = Path.Combine(directory, mapping.MappingFromPerson.DisplayDirectoryName);
-                checkFile = Path.Combine(directory, $"{mapping.MappingFromItem.Id}{mapping.MappingFromItem.ImageFileHolder.ExtensionLowered}");
+                checkFile = Path.Combine(directory, $"{mapping.MappingFromItem.Id}{mapping.MappingFromItem.FilePath.ExtensionLowered}");
             }
             else
             {
                 directory = Path.Combine(_EDistanceContentTicksDirectory, "Images", personKeyFormatted);
                 personDirectory = Path.Combine(directory, mapping.MappingFromPerson.DisplayDirectoryName);
-                checkFile = Path.Combine(directory, $"{mapping.MappingFromLocation.DeterministicHashCodeKey}{mapping.MappingFromItem.ImageFileHolder.ExtensionLowered}");
+                checkFile = Path.Combine(directory, $"{mapping.MappingFromLocation.DeterministicHashCodeKey}{mapping.MappingFromItem.FilePath.ExtensionLowered}");
             }
-            collection.Add(new(mapping.MappingFromItem.Id, mapping.MappingFromItem.ImageFileHolder, mapping.MappingFromPerson.ApproximateYears.Value, personKeyFormatted, directory, personDirectory, checkFile));
+            if (mapping is null)
+                continue;
+            if (mapping.MappingFromPerson.ApproximateYears is null)
+                filteredOriginalImages.Add(new(mapping.MappingFromItem.Id, mapping.MappingFromItem.FilePath, -1, personKeyFormatted, directory, personDirectory, checkFile));
+            else
+                filteredOriginalImages.Add(new(mapping.MappingFromItem.Id, mapping.MappingFromItem.FilePath, mapping.MappingFromPerson.ApproximateYears.Value, personKeyFormatted, directory, personDirectory, checkFile));
             distinctCollection.Add(mapping.MappingFromItem.Id);
             count += 1;
         }
-        results = (from l in collection orderby l.ApproximateYears descending, l.PersonKeyFormatted descending select l).ToArray();
+        results = (from l in filteredOriginalImages orderby l.ApproximateYears descending, l.PersonKeyFormatted descending select l).ToArray();
         return results;
     }
 
-    public void SaveFilteredOriginalImagesFromJLinks(string[] jLinks, ReadOnlyCollection<PersonContainer> personContainers, string a2PeopleContentDirectory, ReadOnlyDictionary<long, List<int>> personKeyToIds, ReadOnlyCollection<Mapping> mappingCollection)
+    public void SaveFilteredOriginalImagesFromJLinks(string[] jLinks, ReadOnlyCollection<PersonContainer> personContainers, string a2PeopleContentDirectory, ReadOnlyDictionary<long, List<int>> personKeyToIds, ReadOnlyCollection<Mapping> distinctValidImageMappingCollection)
     {
         if (_Configuration is null)
             throw new NullReferenceException(nameof(_Configuration));
+        FileHolder fileHolder;
         SaveContainer? saveContainer;
         List<SaveContainer> saveContainers = [];
-        (int, FileHolder, int, string, string, string, string)[] collection = GetCollectionForSaveFilteredOriginalImagesFromJLinks(jLinks, a2PeopleContentDirectory, personContainers, mappingCollection, personKeyToIds);
-        foreach ((int id, FileHolder imageFileHolder, int approximateYears, string personKeyFormatted, string directory, string personDirectory, string checkFile) in collection)
+        FilteredOriginalImage[] filteredOriginalImages = GetCollectionForSaveFilteredOriginalImagesFromJLinks(jLinks, a2PeopleContentDirectory, personContainers, distinctValidImageMappingCollection, personKeyToIds);
+        foreach (FilteredOriginalImage filteredOriginalImage in filteredOriginalImages)
         {
-            saveContainer = new(personDirectory);
+            fileHolder = FileHolder.Get(filteredOriginalImage.FilePath);
+            saveContainer = new(filteredOriginalImage.PersonDirectory);
             saveContainers.Add(saveContainer);
-            saveContainer = new(imageFileHolder, checkFile, directory);
+            saveContainer = new(fileHolder, filteredOriginalImage.CheckFile, filteredOriginalImage.Directory);
             saveContainers.Add(saveContainer);
         }
         SaveContainers(null, saveContainers);
     }
 
-    public void SaveShortcutsForOutputResolutionsPreMapLogic(string eDistanceContentDirectory, ReadOnlyDictionary<long, List<int>> personKeyToIds, ReadOnlyCollection<Mapping> mappingCollection)
+    public void SaveShortcutsForOutputResolutionsPreMapLogic(string eDistanceContentDirectory, ReadOnlyDictionary<long, List<int>> personKeyToIds, ReadOnlyCollection<Mapping> distinctValidImageMappingCollection)
     {
         string hiddenFile;
         WindowsShortcut windowsShortcut;
         List<SaveShortcutsForOutputResolutions> collection = [];
-        collection = GetCollectionForSaveShortcutsForOutputResolutionsPreMapLogic(eDistanceContentDirectory, personKeyToIds, mappingCollection);
+        collection = GetCollectionForSaveShortcutsForOutputResolutionsPreMapLogic(eDistanceContentDirectory, personKeyToIds, distinctValidImageMappingCollection);
         string[] distinctDirectories = (from l in collection select l.Directory).Distinct().ToArray();
         foreach (string directory in distinctDirectories)
         {
@@ -1158,7 +1312,7 @@ public partial class MapLogic : Shared.Models.Methods.IMapLogic
         }
     }
 
-    private (List<(string, DateTime[])>, List<SaveShortcutsForOutputResolutions>) GetCollectionForSaveShortcutsForOutputResolutionsDuringMapLogic(ReadOnlyDictionary<long, List<int>> personKeyToIds, string dFacesContentDirectory, ReadOnlyCollection<Item> filteredItems, ReadOnlyCollection<Mapping> mappingCollection)
+    private (List<(string, DateTime[])>, List<SaveShortcutsForOutputResolutions>) GetCollectionForSaveShortcutsForOutputResolutionsDuringMapLogic(ReadOnlyDictionary<long, List<int>> personKeyToIds, string dFacesContentDirectory, ReadOnlyCollection<Item> validImageItems, ReadOnlyCollection<Mapping> distinctValidImageMappingCollection)
     {
         if (_Configuration is null)
             throw new NullReferenceException(nameof(_Configuration));
@@ -1166,6 +1320,7 @@ public partial class MapLogic : Shared.Models.Methods.IMapLogic
         string fileName;
         string fullName;
         string directory;
+        DateTime dateTime;
         string facesDirectory;
         string? directoryName;
         string personDirectory;
@@ -1173,7 +1328,7 @@ public partial class MapLogic : Shared.Models.Methods.IMapLogic
         List<string> distinct = [];
         List<SaveShortcutsForOutputResolutions> collection = [];
         List<(string, DateTime[])> directoriesAndDateTimes = [];
-        foreach (Item item in filteredItems)
+        foreach (Item item in validImageItems)
         {
             if (item.ResizedFileHolder is null)
                 continue;
@@ -1186,12 +1341,12 @@ public partial class MapLogic : Shared.Models.Methods.IMapLogic
                 directoryName = Path.GetDirectoryName(face.Mapping.MappingFromItem.RelativePath);
                 if (directoryName is null)
                     throw new NotSupportedException();
-                if (item.ResizedFileHolder?.DirectoryName is null || !item.ResizedFileHolder.Exists || item.ImageFileHolder.LastWriteTime is null)
+                if (item.ResizedFileHolder?.DirectoryName is null || !item.ResizedFileHolder.Exists)
                     continue;
                 directory = Path.Combine(item.ResizedFileHolder.DirectoryName, $"{_PropertyConfiguration.ResultAllInOne}Shortcuts", _PropertyConfiguration.ResultAllInOne);
                 personDirectory = Path.Combine(directory, "No Faces");
                 fileName = Path.Combine(personDirectory, $"{item.ResizedFileHolder.Name}.lnk");
-                collection.Add(new(item.ResizedFileHolder.FullName, personDirectory, item.ImageFileHolder.LastWriteTime.Value, fileName, face.Mapping.MappingFromItem.Id.ToString(), MakeAllHidden: false));
+                collection.Add(new(item.ResizedFileHolder.FullName, personDirectory, new(item.FilePath.LastWriteTicks), fileName, face.Mapping.MappingFromItem.Id.ToString(), MakeAllHidden: false));
                 if (face.Mapping.MappingFromItem.ContainerDateTimes.Length > 0 && !distinct.Contains(item.ResizedFileHolder.DirectoryName))
                 {
                     distinct.Add(item.ResizedFileHolder.DirectoryName);
@@ -1199,13 +1354,14 @@ public partial class MapLogic : Shared.Models.Methods.IMapLogic
                 }
             }
         }
-        foreach (Mapping mapping in mappingCollection)
+        foreach (Mapping mapping in distinctValidImageMappingCollection)
         {
             directoryName = Path.GetDirectoryName(mapping.MappingFromItem.RelativePath);
             if (directoryName is null)
                 throw new NotSupportedException();
             if (mapping.MappingFromItem.ResizedFileHolder.DirectoryName is null || !mapping.MappingFromItem.ResizedFileHolder.Exists)
                 continue;
+            dateTime = mapping.MappingFromItem.GetDateTimeOriginalThenMinimumDateTime();
             if (mapping.By is null or Shared.Models.Stateless.IMapLogic.Sorting || mapping.MappingFromPerson?.ApproximateYears is null)
             {
                 if (mapping.MappingFromItem.ContainerDateTimes.Length > 0 && !distinct.Contains(mapping.MappingFromItem.ResizedFileHolder.DirectoryName))
@@ -1216,13 +1372,13 @@ public partial class MapLogic : Shared.Models.Methods.IMapLogic
                 directory = Path.Combine(mapping.MappingFromItem.ResizedFileHolder.DirectoryName, $"{_PropertyConfiguration.ResultAllInOne}Shortcuts", _PropertyConfiguration.ResultAllInOne);
                 personDirectory = Path.Combine(directory, "Unknown");
                 fileName = Path.Combine(personDirectory, $"{mapping.MappingFromItem.ResizedFileHolder.Name}.lnk");
-                collection.Add(new(mapping.MappingFromItem.ResizedFileHolder.FullName, personDirectory, mapping.MappingFromItem.GetDateTimeOriginalThenMinimumDateTime(), fileName, mapping.MappingFromLocation?.DeterministicHashCodeKey, MakeAllHidden: false));
+                collection.Add(new(mapping.MappingFromItem.ResizedFileHolder.FullName, personDirectory, dateTime, fileName, mapping.MappingFromLocation?.DeterministicHashCodeKey, MakeAllHidden: false));
                 facesDirectory = Stateless.MapLogic.GetFacesDirectory(_PropertyConfiguration, dFacesContentDirectory, mapping.FilePath, mapping.MappingFromItem);
                 if (mapping.MappingFromLocation is null)
                     continue;
-                fullName = Path.Combine(facesDirectory, $"{mapping.MappingFromLocation.DeterministicHashCodeKey}{mapping.MappingFromItem.ImageFileHolder.ExtensionLowered}{_Configuration.FacesFileNameExtension}");
+                fullName = Path.Combine(facesDirectory, $"{mapping.MappingFromLocation.DeterministicHashCodeKey}{mapping.MappingFromItem.FilePath.ExtensionLowered}{_Configuration.FacesFileNameExtension}");
                 fileName = Path.Combine(personDirectory, $"{mapping.MappingFromLocation.DeterministicHashCodeKey}{mapping.MappingFromItem.ResizedFileHolder.ExtensionLowered}{_Configuration.FacesFileNameExtension}.lnk");
-                collection.Add(new(fullName, personDirectory, mapping.MappingFromItem.GetDateTimeOriginalThenMinimumDateTime(), fileName, mapping.MappingFromLocation.DeterministicHashCodeKey, MakeAllHidden: true));
+                collection.Add(new(fullName, personDirectory, dateTime, fileName, mapping.MappingFromLocation.DeterministicHashCodeKey, MakeAllHidden: true));
             }
             else
             {
@@ -1242,21 +1398,21 @@ public partial class MapLogic : Shared.Models.Methods.IMapLogic
                 else
                     personDirectory = Path.Combine(directory, mapping.MappingFromPerson.DisplayDirectoryName, $"{ids.Count} Face(s)");
                 fileName = Path.Combine(directory, $"{mapping.MappingFromItem.ResizedFileHolder.Name}.lnk");
-                collection.Add(new(mapping.MappingFromItem.ResizedFileHolder.FullName, personDirectory, mapping.MappingFromItem.GetDateTimeOriginalThenMinimumDateTime(), fileName, mapping.MappingFromLocation?.DeterministicHashCodeKey, MakeAllHidden: false));
+                collection.Add(new(mapping.MappingFromItem.ResizedFileHolder.FullName, personDirectory, dateTime, fileName, mapping.MappingFromLocation?.DeterministicHashCodeKey, MakeAllHidden: false));
             }
         }
         return new(directoriesAndDateTimes, collection);
     }
 
-    public void SaveShortcutsForOutputResolutionsDuringMapLogic(ReadOnlyCollection<Container> containers, ReadOnlyDictionary<long, List<int>> personKeyToIds, string dFacesContentDirectory, ReadOnlyCollection<Mapping> mappingCollection)
+    public void SaveShortcutsForOutputResolutionsDuringMapLogic(ReadOnlyCollection<Container> containers, ReadOnlyDictionary<long, List<int>> personKeyToIds, string dFacesContentDirectory, ReadOnlyCollection<Mapping> distinctValidImageMappingCollection)
     {
         if (_Configuration is null)
             throw new NullReferenceException(nameof(_Configuration));
         WindowsShortcut windowsShortcut;
         List<(string, DateTime[])> directoriesAndDateTimes;
         List<SaveShortcutsForOutputResolutions> collection;
-        ReadOnlyCollection<Item> filteredItems = IContainer.GetItems(_PropertyConfiguration, containers, distinctItems: true, filterItems: true);
-        (directoriesAndDateTimes, collection) = GetCollectionForSaveShortcutsForOutputResolutionsDuringMapLogic(personKeyToIds, dFacesContentDirectory, filteredItems, mappingCollection);
+        ReadOnlyCollection<Item> validImageItems = IContainer.GetValidImageItems(_PropertyConfiguration, containers, distinctItems: true, filterItems: true);
+        (directoriesAndDateTimes, collection) = GetCollectionForSaveShortcutsForOutputResolutionsDuringMapLogic(personKeyToIds, dFacesContentDirectory, validImageItems, distinctValidImageMappingCollection);
         string[] directories = (from l in collection select l.Directory).Distinct().ToArray();
         foreach (string directory in directories)
         {
@@ -1300,10 +1456,13 @@ public partial class MapLogic : Shared.Models.Methods.IMapLogic
         return result;
     }
 
-    public bool InSkipCollection(int id, MappingFromLocation mappingFromLocation) =>
-        _SkipCollection.TryGetValue(id, out List<int>? wholePercentagesCollection) && wholePercentagesCollection.Contains(mappingFromLocation.WholePercentages);
+    public bool InSkipCollection(int id, int wholePercentages) =>
+        _SkipCollection.TryGetValue(id, out List<int>? wholePercentagesCollection) && wholePercentagesCollection.Contains(wholePercentages);
 
-    public bool? IsFocusPerson(int? skipPersonWithMoreThen, long[] jLinkResolvedPersonKeys, ReadOnlyDictionary<int, ReadOnlyCollection<PersonContainer>>? wholePercentagesToPersonContainers, MappingFromLocation mappingFromLocation)
+    public bool InSkipCollection(int id, MappingFromLocation mappingFromLocation) =>
+        InSkipCollection(id, mappingFromLocation.WholePercentages);
+
+    public bool? IsFocusPerson(int? skipPersonWithMoreThen, long[] jLinkResolvedPersonKeys, ReadOnlyDictionary<int, ReadOnlyCollection<PersonContainer>>? wholePercentagesToPersonContainers, int wholePercentages)
     {
         bool? result;
         ReadOnlyCollection<PersonContainer>? personContainers;
@@ -1311,7 +1470,7 @@ public partial class MapLogic : Shared.Models.Methods.IMapLogic
             result = null;
         else if (wholePercentagesToPersonContainers is null)
             result = null;
-        else if (!wholePercentagesToPersonContainers.TryGetValue(mappingFromLocation.WholePercentages, out personContainers))
+        else if (!wholePercentagesToPersonContainers.TryGetValue(wholePercentages, out personContainers))
             result = null;
         else
         {
@@ -1335,37 +1494,46 @@ public partial class MapLogic : Shared.Models.Methods.IMapLogic
         return result;
     }
 
-    public void LookForAbandoned(Property.Models.Configuration propertyConfiguration, string bResultsFullGroupDirectory, Container[] containers, string cResultsFullGroupDirectory, string dResultsFullGroupDirectory, string d2ResultsFullGroupDirectory)
+    public bool? IsFocusPerson(int? skipPersonWithMoreThen, long[] jLinkResolvedPersonKeys, ReadOnlyDictionary<int, ReadOnlyCollection<PersonContainer>>? wholePercentagesToPersonContainers, MappingFromLocation mappingFromLocation) =>
+        IsFocusPerson(skipPersonWithMoreThen, jLinkResolvedPersonKeys, wholePercentagesToPersonContainers, mappingFromLocation.WholePercentages);
+
+    public void LookForAbandoned(IDlibDotNet dlibDotNet, Property.Models.Configuration propertyConfiguration, string bResultsFullGroupDirectory, ReadOnlyCollection<Container> readOnlyContainers, string cResultsFullGroupDirectory, string dResultsFullGroupDirectory, string d2ResultsFullGroupDirectory)
     {
         string[] directories;
         string? directoryName;
-        List<int> distinctFilteredIds = IContainer.GetFilteredDistinctIds(propertyConfiguration, containers);
+        List<int> distinctFilteredIds = IContainer.GetFilteredDistinctIds(propertyConfiguration, readOnlyContainers);
         LookForAbandoned(propertyConfiguration, distinctFilteredIds);
-        Stateless.LookForAbandonedLogic.LookForAbandoned(propertyConfiguration, bResultsFullGroupDirectory, distinctFilteredIds);
+        dlibDotNet.Tick();
+        List<string> distinctFilteredFileNameFirstSegments = IContainer.GetFilteredDistinctFileNameFirstSegments(propertyConfiguration, readOnlyContainers);
+        Stateless.LookForAbandonedLogic.LookForAbandoned(propertyConfiguration, bResultsFullGroupDirectory, distinctFilteredFileNameFirstSegments);
+        dlibDotNet.Tick();
         directories = Directory.GetDirectories(cResultsFullGroupDirectory, "*", SearchOption.TopDirectoryOnly);
         foreach (string directory in directories)
         {
             directoryName = Path.GetFileName(directory);
             if (string.IsNullOrEmpty(directoryName) || directoryName.Length != 2 && directoryName.Length != 4)
                 continue;
-            Stateless.LookForAbandonedLogic.LookForAbandoned(propertyConfiguration, distinctFilteredIds, directory, directoryName);
+            Stateless.LookForAbandonedLogic.LookForAbandoned(propertyConfiguration, distinctFilteredFileNameFirstSegments, directory, directoryName);
         }
+        dlibDotNet.Tick();
         directories = Directory.GetDirectories(dResultsFullGroupDirectory, "*", SearchOption.TopDirectoryOnly);
         foreach (string directory in directories)
         {
             directoryName = Path.GetFileName(directory);
             if (string.IsNullOrEmpty(directoryName) || directoryName.Length != 2 && directoryName.Length != 4)
                 continue;
-            Stateless.LookForAbandonedLogic.LookForAbandoned(propertyConfiguration, distinctFilteredIds, directory, directoryName);
+            Stateless.LookForAbandonedLogic.LookForAbandoned(propertyConfiguration, distinctFilteredFileNameFirstSegments, directory, directoryName);
         }
+        dlibDotNet.Tick();
         directories = Directory.GetDirectories(d2ResultsFullGroupDirectory, "*", SearchOption.TopDirectoryOnly);
         foreach (string directory in directories)
         {
             directoryName = Path.GetFileName(directory);
             if (string.IsNullOrEmpty(directoryName) || directoryName.Length != 2 && directoryName.Length != 4)
                 continue;
-            Stateless.LookForAbandonedLogic.LookForAbandoned(propertyConfiguration, distinctFilteredIds, directory, directoryName);
+            Stateless.LookForAbandonedLogic.LookForAbandoned(propertyConfiguration, distinctFilteredFileNameFirstSegments, directory, directoryName);
         }
+        dlibDotNet.Tick();
     }
 
 }

Map/Models/Stateless/DecadeLogic.cs

@@ -32,9 +32,23 @@ internal abstract class DecadeLogic
         return result;
     }
 
-    internal static void SetCreationTimeMaybeMoveToDecade(Property.Models.Configuration propertyConfiguration, bool moveToDecade, MappingFromItem mappingFromItem, ReadOnlyCollection<LocationContainer> locationContainers)
+    internal static void SetCreationTime(MappingFromItem mappingFromItem, ReadOnlyCollection<LocationContainer> locationContainers)
     {
         DateTime dateTime;
+        foreach (LocationContainer locationContainer in locationContainers)
+        {
+            dateTime = mappingFromItem.DateTimeOriginal is null ? mappingFromItem.MinimumDateTime : mappingFromItem.DateTimeOriginal.Value;
+            if (locationContainer.CreationDateOnly.Year != dateTime.Year || locationContainer.CreationDateOnly.Month != dateTime.Month || locationContainer.CreationDateOnly.Day != dateTime.Day)
+            {
+                if (!File.Exists(locationContainer.FilePath.FullName))
+                    continue;
+                File.SetCreationTime(locationContainer.FilePath.FullName, dateTime);
+            }
+        }
+    }
+
+    internal static void MoveToDecade(Property.Models.Configuration propertyConfiguration, MappingFromItem mappingFromItem, ReadOnlyCollection<LocationContainer> locationContainers)
+    {
         string halfDecade;
         string checkDirectory;
         string? yearDirectory;
@@ -44,13 +58,6 @@ internal abstract class DecadeLogic
         string? personKeyFormattedDirectoryName;
         foreach (LocationContainer locationContainer in locationContainers)
         {
-            if (!File.Exists(locationContainer.FilePath.FullName))
-                continue;
-            dateTime = mappingFromItem.DateTimeOriginal is null ? mappingFromItem.MinimumDateTime : mappingFromItem.DateTimeOriginal.Value;
-            if (locationContainer.CreationDateOnly.Year != dateTime.Year || locationContainer.CreationDateOnly.Month != dateTime.Month || locationContainer.CreationDateOnly.Day != dateTime.Day)
-                File.SetCreationTime(locationContainer.FilePath.FullName, dateTime);
-            if (!moveToDecade)
-                continue;
             if (string.IsNullOrEmpty(locationContainer.FilePath.DirectoryName))
                 continue;
             personNameDirectoryName = Path.GetFileName(locationContainer.FilePath.DirectoryName);
@@ -68,6 +75,8 @@ internal abstract class DecadeLogic
             if (halfDecade == yearDirectoryName)
                 continue;
             checkDirectory = Path.Combine(personKeyFormattedDirectory, halfDecade, personNameDirectoryName);
+            if (!File.Exists(locationContainer.FilePath.FullName))
+                continue;
             if (!Directory.Exists(checkDirectory))
                 _ = Directory.CreateDirectory(checkDirectory);
             File.Move(locationContainer.FilePath.FullName, Path.Combine(checkDirectory, locationContainer.FilePath.Name));

Map/Models/Stateless/DistanceLogic.cs

@@ -9,19 +9,21 @@ using View_by_Distance.Shared.Models.Stateless.Methods;
 
 namespace View_by_Distance.Map.Models.Stateless;
 
-internal record Record(string PersonKeyFormatted,
-                       int DirectoryNumber,
-                       string? PersonDisplayDirectoryName,
+internal record Record(int DirectoryNumber,
                        bool? IsDefault,
-                       FilePath MappedFaceFilePath);
+                       int? LinksCount,
+                       FilePath MappedFaceFilePath,
+                       string? PersonDisplayDirectoryName,
+                       string PersonKeyFormatted);
 
 internal abstract class DistanceLogic
 {
 
-    internal record TicksDirectory(string Directory,
-                                   string DirectoryName,
+    internal record TicksDirectory(DateTime AlternateDirectoryDateTime,
+                                   string Directory,
                                    DateTime DirectoryDateTime,
-                                   DateTime AlternateDirectoryDateTime,
+                                   string DirectoryName,
+                                   bool? IsLocationContainerDebugDirectory,
                                    float? TotalDays);
 
     private static void MoveTo(string actionDirectory, TicksDirectory ticksDirectory, string directory, string personKeyFormatted, string yearDirectoryName, string alphaDirectoryName, string[] files, string[] facesFileNames)
@@ -89,6 +91,8 @@ internal abstract class DistanceLogic
         DirectoryInfo directoryInfo;
         long? lastDirectoryTicks = null;
         DateTime dateTime = DateTime.Now;
+        DateTime alternateDirectoryDateTime;
+        bool? isLocationContainerDebugDirectory;
         long month = dateTime.AddMonths(1).Ticks - dateTime.Ticks;
         for (int i = 1; i < 5; i++)
             _ = IPath.DeleteEmptyDirectories(eDistanceContentDirectory);
@@ -125,8 +129,10 @@ internal abstract class DistanceLogic
                 Directory.SetCreationTime(ticksDirectory, new DateTime(directoryTicks));
             if (directoryInfo.LastWriteTime.Ticks != directoryTicks)
                 Directory.SetLastWriteTime(ticksDirectory, new DateTime(directoryTicks));
+            alternateDirectoryDateTime = new DateTime(directoryDateTime.Year, directoryDateTime.Month, directoryDateTime.Day).AddMonths(1);
+            isLocationContainerDebugDirectory = configuration.LocationContainerDebugDirectory is null ? null : ticksDirectoryName.EndsWith(configuration.LocationContainerDebugDirectory);
             totalDays = lastDirectoryTicks is null || new TimeSpan(dateTime.Ticks - directoryTicks).TotalDays < 1 ? null : (float)new TimeSpan(directoryTicks - lastDirectoryTicks.Value).TotalDays;
-            results.Add(new(ticksDirectory, ticksDirectoryName, new(directoryTicks), new DateTime(directoryDateTime.Year, directoryDateTime.Month, directoryDateTime.Day).AddMonths(1), totalDays));
+            results.Add(new(alternateDirectoryDateTime, ticksDirectory, new(directoryTicks), ticksDirectoryName, isLocationContainerDebugDirectory, totalDays));
             if (directoryDateTime.Hour == 0 && directoryDateTime.Minute == 0 && directoryDateTime.Second == 0)
                 continue;
             lastDirectoryTicks = directoryTicks;
@@ -210,7 +216,7 @@ internal abstract class DistanceLogic
         }
     }
 
-    private static List<Record> GetRecords(Shared.Models.Properties.IPropertyConfiguration propertyConfiguration, Configuration configuration, bool? isDefault, string[] files, int directoryNumber, string personKeyFormatted, List<string> distinct, string? personDisplayDirectoryName)
+    private static List<Record> GetRecords(Shared.Models.Properties.IPropertyConfiguration propertyConfiguration, Configuration configuration, bool? isDefault, string[] files, int directoryNumber, string personKeyFormatted, int? linksCount, List<string> distinct, string? personDisplayDirectoryName)
     {
         List<Record> results = [];
         string fileName;
@@ -239,19 +245,32 @@ internal abstract class DistanceLogic
                 continue;
             }
             distinct.Add(fileName);
-            results.Add(new(personKeyFormatted, directoryNumber, personDisplayDirectoryName, isDefault, filePath));
+            results.Add(new(directoryNumber, isDefault, linksCount, filePath, personDisplayDirectoryName, personKeyFormatted));
         }
         return results;
     }
 
-    private static void RenameUnknown(string[] files)
+    private static string[] RenameBirth(string[] files)
     {
+        List<string> results = [];
+        string checkFile;
         foreach (string file in files)
         {
-            if (file.EndsWith(".unk"))
+            if (file.EndsWith(".brt"))
+            {
+                results.Add(file);
                 continue;
-            File.Move(file, $"{file}.unk");
+            }
+            checkFile = $"{file}.brt";
+            if (File.Exists(checkFile))
+            {
+                results.Add(file);
+                continue;
+            }
+            File.Move(file, checkFile);
+            results.Add(checkFile);
         }
+        return results.ToArray();
     }
 
     private static void MovedToNewestPersonKeyFormatted(string personKeyFormatted, string newestPersonKeyFormatted, TicksDirectory ticksDirectory, string personKeyDirectory)
@@ -263,6 +282,23 @@ internal abstract class DistanceLogic
             Directory.Move(personKeyDirectory, newestPersonKeyDirectory);
     }
 
+    private static int? GetLinksCount(string yearDirectory)
+    {
+        int? result;
+        string[] yearDirectoryNameSegments = Path.GetFileName(yearDirectory).Split('-');
+        if (yearDirectoryNameSegments.Length != 3)
+            result = null;
+        else
+        {
+            string lastSegment = yearDirectoryNameSegments[^1];
+            if (lastSegment.Length != 3 || !lastSegment.All(l => l == lastSegment[0]))
+                result = null;
+            else
+                result = lastSegment[0] - 65;
+        }
+        return result;
+    }
+
     internal static List<Record> DeleteEmptyDirectoriesAndGetCollection(Shared.Models.Properties.IPropertyConfiguration propertyConfiguration, Configuration configuration, long ticks, string eDistanceContentDirectory, ReadOnlyDictionary<string, string> personKeyFormattedToNewestPersonKeyFormatted, ReadOnlyCollection<string> personKeyFormattedCollection)
     {
         List<Record> results = [];
@@ -270,6 +306,7 @@ internal abstract class DistanceLogic
         string message;
         string[] files;
         bool? isDefault;
+        int? linksCount;
         int totalSeconds;
         DateTime dateTime;
         TimeSpan timeSpan;
@@ -327,6 +364,10 @@ internal abstract class DistanceLogic
                     {
                         if (check && !Directory.Exists(yearDirectory))
                             continue;
+                        if (ticksDirectory.IsLocationContainerDebugDirectory is null || !ticksDirectory.IsLocationContainerDebugDirectory.Value)
+                            linksCount = null;
+                        else
+                            linksCount = GetLinksCount(yearDirectory);
                         if (ticksDirectory.DirectoryName != configuration.LocationContainerDebugDirectory)
                         {
                             files = Directory.GetFiles(yearDirectory, "*", SearchOption.TopDirectoryOnly);
@@ -338,7 +379,7 @@ internal abstract class DistanceLogic
                             isDefault = null;
                             personDisplayDirectoryName = null;
                             files = Directory.GetFiles(yearDirectory, "*", SearchOption.TopDirectoryOnly);
-                            results.AddRange(GetRecords(propertyConfiguration, configuration, isDefault, files, directoryNumber, personKeyFormatted, distinct, personDisplayDirectoryName));
+                            results.AddRange(GetRecords(propertyConfiguration, configuration, isDefault, files, directoryNumber, personKeyFormatted, linksCount, distinct, personDisplayDirectoryName));
                             files = Directory.GetFiles(yearDirectory, "*.lnk", SearchOption.AllDirectories);
                             foreach (string file in files)
                                 File.Delete(file);
@@ -346,7 +387,7 @@ internal abstract class DistanceLogic
                         }
                         personNameDirectories = Directory.GetDirectories(yearDirectory, "*", SearchOption.TopDirectoryOnly);
                         if (personNameDirectories.Length > 1)
-                            throw new NotSupportedException();
+                            throw new NotSupportedException("Try deleting *.lnk files!");
                         foreach (string personNameDirectory in personNameDirectories)
                         {
                             directoryNumber++;
@@ -394,7 +435,7 @@ internal abstract class DistanceLogic
                             if (!isDefault.Value)
                             {
                                 if (personKeyFormattedToNewestPersonKeyFormatted.Count > 0 && newestPersonKeyFormatted is null)
-                                    RenameUnknown(files);
+                                    files = RenameBirth(files);
                                 else if (newestPersonKeyFormatted is not null && personKeyFormatted != newestPersonKeyFormatted)
                                 {
                                     if (!check)
@@ -426,7 +467,7 @@ internal abstract class DistanceLogic
                                 Directory.Move(personNameDirectory, personFirstInitialDirectory);
                                 files = Directory.GetFiles(personFirstInitialDirectory, "*", SearchOption.TopDirectoryOnly);
                             }
-                            results.AddRange(GetRecords(propertyConfiguration, configuration, isDefault, files, directoryNumber, personKeyFormatted, distinct, personDisplayDirectoryName));
+                            results.AddRange(GetRecords(propertyConfiguration, configuration, isDefault, files, directoryNumber, personKeyFormatted, linksCount, distinct, personDisplayDirectoryName));
                             personNameLinkDirectories = Directory.GetDirectories(personFirstInitialDirectory, "*", SearchOption.TopDirectoryOnly);
                             foreach (string personNameLinkDirectory in personNameLinkDirectories)
                             {

Map/Models/Stateless/FaceFileLogic.cs

@@ -0,0 +1,212 @@
+using ShellProgressBar;
+using System.Collections.ObjectModel;
+using System.Drawing;
+using System.Text.Json;
+using View_by_Distance.Shared.Models;
+using View_by_Distance.Shared.Models.Stateless.Methods;
+using static View_by_Distance.Map.Models.Stateless.MapLogic;
+
+namespace View_by_Distance.Map.Models.Stateless;
+
+internal abstract class FaceFileLogic
+{
+
+    private static void MappedParallelFor(Shared.Models.Properties.IPropertyConfiguration propertyConfiguration, Configuration configuration, ReadOnlyDictionary<int, List<(string, int)>> skipCollection, List<LocationContainer> locationContainers, MappedFile mappedFile)
+    {
+        int? id;
+        string checkFile;
+        DateOnly dateOnly;
+        FilePath filePath;
+        string[] fileMatches;
+        FileHolder fileHolder;
+        int? wholePercentages;
+        const string lnk = ".lnk";
+        ExifDirectory? exifDirectory;
+        string personDisplayDirectoryName;
+        const bool fromDistanceContent = true;
+        List<(string File, int WholePercentages)>? wholePercentagesCollection;
+        if (!mappedFile.FilePath.Name.EndsWith(lnk))
+        {
+            if (mappedFile.FilePath.Id is null)
+                return;
+            id = mappedFile.FilePath.Id;
+            wholePercentages = IMapping.GetWholePercentages(configuration.FacesFileNameExtension, mappedFile.FilePath);
+        }
+        else
+        {
+            fileHolder = IFileHolder.Get(mappedFile.FilePath.FullName[..^4]);
+            filePath = FilePath.Get(propertyConfiguration, fileHolder, index: null);
+            if (filePath.Id is null)
+                return;
+            id = filePath.Id;
+            wholePercentages = IMapping.GetWholePercentages(configuration.FacesFileNameExtension, filePath);
+        }
+        if (wholePercentages is null)
+            return;
+        if (configuration.LinkedAlpha is null && string.IsNullOrEmpty(configuration.LocationContainerDebugDirectory) && skipCollection.TryGetValue(id.Value, out wholePercentagesCollection))
+        {
+            fileMatches = (from l in wholePercentagesCollection where l.WholePercentages == wholePercentages select l.File).ToArray();
+            foreach (string fileMatch in fileMatches)
+            {
+                if (string.IsNullOrEmpty(fileMatch) || !File.Exists(fileMatch))
+                    continue;
+                checkFile = $"{fileMatch}.dup";
+                if (File.Exists(checkFile))
+                    continue;
+                File.Move(fileMatch, checkFile);
+                continue;
+            }
+        }
+        dateOnly = DateOnly.FromDateTime(new DateTime(mappedFile.FilePath.CreationTicks));
+        if (mappedFile.FilePath.Name.EndsWith(lnk) || !File.Exists(mappedFile.FilePath.FullName))
+            exifDirectory = null;
+        else
+            exifDirectory = Metadata.Models.Stateless.Methods.IMetadata.GetExifDirectory(mappedFile.FilePath);
+        RectangleF? rectangle = ILocation.GetPercentagesRectangle(configuration.LocationDigits, wholePercentages.Value);
+        personDisplayDirectoryName = mappedFile.PersonDisplayDirectoryName is null ? configuration.MappingDefaultName : mappedFile.PersonDisplayDirectoryName;
+        lock (locationContainers)
+            locationContainers.Add(new(dateOnly,
+                                       exifDirectory,
+                                       mappedFile.DirectoryNumber,
+                                       personDisplayDirectoryName,
+                                       null,
+                                       null,
+                                       mappedFile.FilePath,
+                                       fromDistanceContent,
+                                       id.Value,
+                                       null,
+                                       null,
+                                       mappedFile.PersonKey,
+                                       rectangle,
+                                       wholePercentages.Value));
+    }
+
+    private static ReadOnlyDictionary<int, ReadOnlyDictionary<int, LocationContainer>> GetReadOnly(Dictionary<int, Dictionary<int, LocationContainer>> keyValuePairs)
+    {
+        Dictionary<int, ReadOnlyDictionary<int, LocationContainer>> results = [];
+        foreach (KeyValuePair<int, Dictionary<int, LocationContainer>> keyValuePair in keyValuePairs)
+            results.Add(keyValuePair.Key, new(keyValuePair.Value));
+        return new(results);
+    }
+
+    internal static ReadOnlyDictionary<int, ReadOnlyDictionary<int, LocationContainer>> GetMapped(int maxDegreeOfParallelism, Property.Models.Configuration propertyConfiguration, Configuration configuration, long ticks, ReadOnlyCollection<PersonContainer> personContainers, string a2PeopleSingletonDirectory, string eDistanceContentDirectory)
+    {
+        Dictionary<int, Dictionary<int, LocationContainer>> results = [];
+        List<LocationContainer> locationContainers = [];
+        Dictionary<int, LocationContainer>? keyValuePairs;
+        Dictionary<int, List<(string, int)>> skipCollection = [];
+        Dictionary<int, List<(string, int)>> skipNotSkipCollection = [];
+        ReadOnlyCollection<string> readOnlyPersonKeyFormattedCollection;
+        ReadOnlyDictionary<string, string> readOnlyPersonKeyFormattedToNewestPersonKeyFormatted;
+        SetSkipCollections(configuration, personContainers, a2PeopleSingletonDirectory, skipCollection, skipNotSkipCollection);
+        {
+            List<string> personKeyFormattedCollection = [];
+            Dictionary<string, string> personKeyFormattedToNewestPersonKeyFormatted = [];
+            SetPersonCollections(configuration, personContainers, personKeyFormattedToNewestPersonKeyFormatted, personKeyFormattedCollection);
+            readOnlyPersonKeyFormattedCollection = new(personKeyFormattedCollection);
+            readOnlyPersonKeyFormattedToNewestPersonKeyFormatted = new(personKeyFormattedToNewestPersonKeyFormatted);
+        }
+        List<Record> records = DistanceLogic.DeleteEmptyDirectoriesAndGetCollection(propertyConfiguration, configuration, ticks, eDistanceContentDirectory, readOnlyPersonKeyFormattedToNewestPersonKeyFormatted, readOnlyPersonKeyFormattedCollection);
+        List<MappedFile> mappedFiles = GetMappedFiles(propertyConfiguration, configuration, personContainers, records);
+        if (mappedFiles.Count > 0)
+        {
+            int totalSeconds = (int)Math.Floor(new TimeSpan(DateTime.Now.Ticks - ticks).TotalSeconds);
+            string message = $") Building Mapped Face Files Collection - {totalSeconds} total second(s)";
+            ParallelOptions parallelOptions = new() { MaxDegreeOfParallelism = maxDegreeOfParallelism };
+            ReadOnlyDictionary<int, List<(string, int)>> readOnlySkipNotSkipCollection = new(skipCollection);
+            ProgressBarOptions options = new() { ProgressCharacter = '─', ProgressBarOnBottom = true, DisableBottomPercentage = true };
+            using ProgressBar progressBar = new(mappedFiles.Count, message, options);
+            _ = Parallel.For(0, mappedFiles.Count, parallelOptions, (i, state) =>
+            {
+                progressBar.Tick();
+                MappedParallelFor(propertyConfiguration, configuration, readOnlySkipNotSkipCollection, locationContainers, mappedFiles[i]);
+            });
+        }
+        foreach (LocationContainer locationContainer in locationContainers)
+        {
+            if (!results.TryGetValue(locationContainer.Id, out keyValuePairs))
+            {
+                results.Add(locationContainer.Id, []);
+                if (!results.TryGetValue(locationContainer.Id, out keyValuePairs))
+                    throw new Exception();
+            }
+            if (keyValuePairs.ContainsKey(locationContainer.WholePercentages))
+                continue;
+            keyValuePairs.Add(locationContainer.WholePercentages, locationContainer);
+        }
+        return GetReadOnly(results);
+    }
+
+    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 AvailableParallelFor(Shared.Models.Properties.IPropertyConfiguration propertyConfiguration, Configuration configuration, IFaceD dFace, List<LocationContainer> locationContainers, FilePath filePath)
+    {
+        string? json;
+        const bool fromDistanceContent = false;
+        if (filePath.Id is null)
+            return;
+        DateOnly dateOnly = DateOnly.FromDateTime(new DateTime(filePath.CreationTicks));
+        int? wholePercentages = IMapping.GetWholePercentages(dFace.FileNameExtension, filePath);
+        if (wholePercentages is null)
+        {
+            if (configuration.DistanceMoveUnableToMatch)
+                MoveUnableToMatch(filePath);
+            return;
+        }
+        ExifDirectory exifDirectory = Metadata.Models.Stateless.Methods.IMetadata.GetExifDirectory(filePath);
+        json = Metadata.Models.Stateless.Methods.IMetadata.GetOutputResolution(exifDirectory);
+        if (json is null || !json.Contains(nameof(DateTime)))
+        {
+            if (configuration.DistanceMoveUnableToMatch)
+                MoveUnableToMatch(filePath);
+            return;
+        }
+        FaceFile? faceFile = JsonSerializer.Deserialize(json, FaceFileGenerationContext.Default.FaceFile);
+        if (faceFile is null || faceFile.Location is null)
+        {
+            if (configuration.DistanceMoveUnableToMatch)
+                MoveUnableToMatch(filePath);
+            return;
+        }
+        RectangleF? rectangle = ILocation.GetPercentagesRectangle(configuration.LocationDigits, wholePercentages.Value);
+        if (rectangle is null)
+            return;
+        lock (locationContainers)
+            locationContainers.Add(new(dateOnly,
+                                       exifDirectory,
+                                       null,
+                                       null,
+                                       null,
+                                       faceFile,
+                                       filePath,
+                                       fromDistanceContent,
+                                       filePath.Id.Value,
+                                       null,
+                                       null,
+                                       null,
+                                       rectangle,
+                                       wholePercentages.Value));
+    }
+
+    internal static List<LocationContainer> GetAvailable(int maxDegreeOfParallelism, Property.Models.Configuration propertyConfiguration, Configuration configuration, IFaceD dFace, long ticks, string dFacesContentDirectory, ReadOnlyCollection<FilePath> filePaths)
+    {
+        List<LocationContainer> results = [];
+        int totalSeconds = (int)Math.Floor(new TimeSpan(DateTime.Now.Ticks - ticks).TotalSeconds);
+        ParallelOptions parallelOptions = new() { MaxDegreeOfParallelism = maxDegreeOfParallelism };
+        string message = $") Building Available Face Files Collection - {totalSeconds} total second(s)";
+        ProgressBarOptions options = new() { ProgressCharacter = '─', ProgressBarOnBottom = true, DisableBottomPercentage = true };
+        using ProgressBar progressBar = new(filePaths.Count, message, options);
+        _ = Parallel.For(0, filePaths.Count, parallelOptions, (i, state) =>
+        {
+            progressBar.Tick();
+            AvailableParallelFor(propertyConfiguration, configuration, dFace, results, filePaths[i]);
+        });
+        return results;
+    }
+
+}

Map/Models/Stateless/LookForAbandonedLogic.cs

@@ -6,13 +6,12 @@ namespace View_by_Distance.Map.Models.Stateless;
 internal abstract class LookForAbandonedLogic
 {
 
-    internal static void LookForAbandoned(Property.Models.Configuration propertyConfiguration, List<int> distinctFilteredIds, string directory, string directoryName)
+    internal static void LookForAbandoned(Property.Models.Configuration propertyConfiguration, List<string> distinctFilteredFileNameFirstSegments, string directory, string directoryName)
     {
         FilePath filePath;
         FileHolder fileHolder;
         string fileNameFirstSegment;
         List<string> renameCollection = [];
-        string[] distinctFilteredIdsValues = distinctFilteredIds.Select(l => l.ToString()).ToArray();
         string[] files = Directory.GetFiles(directory, "*", SearchOption.AllDirectories);
         foreach (string file in files)
         {
@@ -21,7 +20,7 @@ internal abstract class LookForAbandonedLogic
             fileNameFirstSegment = fileHolder.NameWithoutExtension.Split('.')[0];
             if (!filePath.IsIntelligentIdFormat && filePath.SortOrder is null)
                 continue;
-            if (distinctFilteredIdsValues.Contains(fileNameFirstSegment))
+            if (distinctFilteredFileNameFirstSegments.Contains(fileNameFirstSegment))
                 continue;
             renameCollection.Add(file);
         }
@@ -36,7 +35,7 @@ internal abstract class LookForAbandonedLogic
         }
     }
 
-    internal static void LookForAbandoned(Property.Models.Configuration propertyConfiguration, string bResultsFullGroupDirectory, List<int> distinctFilteredIds)
+    internal static void LookForAbandoned(Property.Models.Configuration propertyConfiguration, string bResultsFullGroupDirectory, List<string> distinctFilteredFileNameFirstSegments)
     {
         string[] directories = Directory.GetDirectories(bResultsFullGroupDirectory, "*", SearchOption.TopDirectoryOnly);
         foreach (string directory in directories)
@@ -44,7 +43,7 @@ internal abstract class LookForAbandonedLogic
             string? directoryName = Path.GetFileName(directory);
             if (string.IsNullOrEmpty(directoryName) || (directoryName.Length != 2 && directoryName.Length != 4))
                 continue;
-            LookForAbandoned(propertyConfiguration, distinctFilteredIds, directory, directoryName);
+            LookForAbandoned(propertyConfiguration, distinctFilteredFileNameFirstSegments, directory, directoryName);
         }
     }
 

Map/Models/Stateless/MapLogic.cs

@@ -27,6 +27,7 @@ internal abstract class MapLogic
     internal record PersonKeyFormattedIdThenWholePercentages(string PersonKeyFormatted,
                                                              string? PersonDisplayDirectoryName,
                                                              bool? IsDefault,
+                                                             int? LinksCount,
                                                              FilePath MappedFaceFilePath,
                                                              int Id,
                                                              int WholePercentages);
@@ -67,7 +68,7 @@ internal abstract class MapLogic
             wholePercentages = IMapping.GetWholePercentages(configuration.FacesFileNameExtension, filePath);
             if (wholePercentages is null)
                 continue;
-            if (!skipNotSkipDirectoriesAny || !checkDirectories.Any(l => filePath.FullName.StartsWith(l)))
+            if (!skipNotSkipDirectoriesAny || !checkDirectories.Any(filePath.FullName.StartsWith))
             {
                 if (!skipCollection.ContainsKey(filePath.Id.Value))
                     skipCollection.Add(filePath.Id.Value, []);
@@ -105,8 +106,9 @@ internal abstract class MapLogic
     internal static string GetMappingSegmentB(long ticks, long personKey, int? approximateYears, MappingFromItem mappingFromItem)
     {
         string result;
+        DateTime dateTime = mappingFromItem.GetDateTimeOriginalThenMinimumDateTime();
         PersonBirthday personBirthday = IPersonBirthday.GetPersonBirthday(personKey);
-        result = GetMappingSegmentB(ticks, personBirthday, approximateYears, mappingFromItem.GetDateTimeOriginalThenMinimumDateTime(), mappingFromItem.IsWrongYear);
+        result = GetMappingSegmentB(ticks, personBirthday, approximateYears, dateTime, mappingFromItem.IsWrongYear);
         return result;
     }
 
@@ -177,7 +179,9 @@ internal abstract class MapLogic
 
     internal static string GetMappingSegmentB(long ticks, PersonBirthday personBirthday, int? approximateYears, MappingFromItem mappingFromItem)
     {
-        string result = GetMappingSegmentB(ticks, personBirthday, approximateYears, mappingFromItem.GetDateTimeOriginalThenMinimumDateTime(), mappingFromItem.IsWrongYear);
+        string result;
+        DateTime dateTime = mappingFromItem.GetDateTimeOriginalThenMinimumDateTime();
+        result = GetMappingSegmentB(ticks, personBirthday, approximateYears, dateTime, mappingFromItem.IsWrongYear);
         return result;
     }
 
@@ -234,7 +238,7 @@ internal abstract class MapLogic
     {
         string result;
         (string directoryName, _) = IPath.GetDirectoryNameAndIndex(propertyConfiguration, filePath);
-        result = Path.Combine(dFacesContentDirectory, directoryName, mappingFromItem.ImageFileHolder.NameWithoutExtension);
+        result = Path.Combine(dFacesContentDirectory, directoryName, mappingFromItem.FilePath.NameWithoutExtension);
         return result;
     }
 
@@ -298,13 +302,14 @@ internal abstract class MapLogic
         return results;
     }
 
-    private static Dictionary<int, Dictionary<int, List<PersonContainer>>> GetAll(Configuration configuration, ReadOnlyDictionary<string, PersonContainer> personKeyFormattedToPersonContainer, ReadOnlyCollection<PersonKeyFormattedIdThenWholePercentages> personKeyFormattedIdThenWholePercentagesCollection)
+    private static Dictionary<int, Dictionary<int, List<PersonContainer>>> GetAll(Configuration configuration, Dictionary<int, List<(string, int)>> skipCollection, ReadOnlyDictionary<string, PersonContainer> personKeyFormattedToPersonContainer, ReadOnlyCollection<PersonKeyFormattedIdThenWholePercentages> personKeyFormattedIdThenWholePercentagesCollection)
     {
         Dictionary<int, Dictionary<int, List<PersonContainer>>> results = [];
         PersonBirthday? personBirthday;
         PersonContainer? personContainer;
         List<PersonContainer>? personContainers;
         Dictionary<int, List<PersonContainer>>? idTo;
+        int? linkedAlphaCheck = string.IsNullOrEmpty(configuration.LinkedAlpha) ? null : configuration.LinkedAlpha[0] - 65;
         if (personKeyFormattedIdThenWholePercentagesCollection.Count > 0)
         {
             foreach (PersonKeyFormattedIdThenWholePercentages personKeyFormattedIdThenWholePercentages in personKeyFormattedIdThenWholePercentagesCollection)
@@ -312,6 +317,13 @@ internal abstract class MapLogic
                 personBirthday = IPersonBirthday.GetPersonBirthday(configuration.PersonBirthdayFormat, personKeyFormattedIdThenWholePercentages.PersonKeyFormatted);
                 if (personBirthday is null)
                     throw new Exception();
+                if (linkedAlphaCheck is not null && personKeyFormattedIdThenWholePercentages.LinksCount is not null && personKeyFormattedIdThenWholePercentages.LinksCount.Value < linkedAlphaCheck.Value)
+                {
+                    if (!skipCollection.ContainsKey(personKeyFormattedIdThenWholePercentages.Id))
+                        skipCollection.Add(personKeyFormattedIdThenWholePercentages.Id, []);
+                    skipCollection[personKeyFormattedIdThenWholePercentages.Id].Add((personKeyFormattedIdThenWholePercentages.MappedFaceFilePath.FullName, personKeyFormattedIdThenWholePercentages.WholePercentages));
+                    continue;
+                }
                 if (!personKeyFormattedToPersonContainer.TryGetValue(personKeyFormattedIdThenWholePercentages.PersonKeyFormatted, out personContainer))
                     throw new Exception();
                 if (!results.TryGetValue(personKeyFormattedIdThenWholePercentages.Id, out idTo))
@@ -426,7 +438,7 @@ internal abstract class MapLogic
         return result;
     }
 
-    private static List<MappedFile> GetMappedFiles(Shared.Models.Properties.IPropertyConfiguration propertyConfiguration, Configuration configuration, ReadOnlyCollection<PersonContainer> personContainers, List<Record> records)
+    internal static List<MappedFile> GetMappedFiles(Shared.Models.Properties.IPropertyConfiguration propertyConfiguration, Configuration configuration, ReadOnlyCollection<PersonContainer> personContainers, List<Record> records)
     {
         List<MappedFile> results = [];
         long personKey;
@@ -455,9 +467,9 @@ internal abstract class MapLogic
                 results.RemoveAt(i);
                 continue;
             }
-            if (!filePath.Name.EndsWith(".dup") && !filePath.Name.EndsWith(".unk") && !filePath.Name.EndsWith(".abd"))
+            if (!filePath.Name.EndsWith(".abd") && !filePath.Name.EndsWith(".brt") && !filePath.Name.EndsWith(".dup") && !filePath.Name.EndsWith(".unk"))
                 continue;
-            if (!File.Exists(filePath.Name))
+            if (!File.Exists(filePath.FullName))
                 continue;
             checkFile = filePath.FullName[..^4];
             if (File.Exists(checkFile))
@@ -470,7 +482,7 @@ internal abstract class MapLogic
         return results;
     }
 
-    private static void ParallelFor(Shared.Models.Properties.IPropertyConfiguration propertyConfiguration, Configuration configuration, Dictionary<int, List<(string, int)>> skipCollection, List<LocationContainer> locationContainers, MappedFile mappedFile)
+    private static void ParallelFor(Shared.Models.Properties.IPropertyConfiguration propertyConfiguration, Configuration configuration, ReadOnlyDictionary<int, List<(string, int)>> skipCollection, List<LocationContainer> locationContainers, MappedFile mappedFile)
     {
         int? id;
         string checkFile;
@@ -502,7 +514,7 @@ internal abstract class MapLogic
         }
         if (wholePercentages is null)
             return;
-        if (string.IsNullOrEmpty(configuration.LocationContainerDebugDirectory) && skipCollection.TryGetValue(id.Value, out wholePercentagesCollection))
+        if (configuration.LinkedAlpha is null && string.IsNullOrEmpty(configuration.LocationContainerDebugDirectory) && skipCollection.TryGetValue(id.Value, out wholePercentagesCollection))
         {
             fileMatches = (from l in wholePercentagesCollection where l.WholePercentages == wholePercentages select l.File).ToArray();
             foreach (string fileMatch in fileMatches)
@@ -528,10 +540,13 @@ internal abstract class MapLogic
                                        exifDirectory,
                                        mappedFile.DirectoryNumber,
                                        personDisplayDirectoryName,
+                                       null,
+                                       null,
                                        mappedFile.FilePath,
                                        fromDistanceContent,
                                        id.Value,
                                        null,
+                                       null,
                                        mappedFile.PersonKey,
                                        rectangle,
                                        wholePercentages.Value));
@@ -549,6 +564,8 @@ internal abstract class MapLogic
         Dictionary<string, (FilePath, int)> distinct = [];
         foreach (LocationContainer locationContainer in locationContainers)
         {
+            if (locationContainer.PersonKey is null)
+                continue;
             key = string.Concat(locationContainer.PersonKey, locationContainer.Id);
             if (distinct.TryGetValue(key, out item))
             {
@@ -564,7 +581,7 @@ internal abstract class MapLogic
                 }
                 delete.Add(item.FilePath);
                 delete.Add(locationContainer.FilePath);
-                duplicates.Add(new(locationContainer.PersonKey, locationContainer.Id, locationContainer.FilePath, percent));
+                duplicates.Add(new(locationContainer.PersonKey.Value, locationContainer.Id, locationContainer.FilePath, percent));
                 continue;
             }
             distinct.Add(key, new(locationContainer.FilePath, locationContainer.WholePercentages));
@@ -596,16 +613,16 @@ internal abstract class MapLogic
                 result = null;
             else
             {
-                string checkFile = Path.Combine(directory, $"{keyMapping.MappingFromItem.ImageFileHolder.Name}{facePartsFileNameExtension}");
+                string checkFile = Path.Combine(directory, $"{keyMapping.MappingFromItem.FilePath.Name}{facePartsFileNameExtension}");
                 result = new(checkFile, directory, IFileHolder.Get(facePartsContentCollectionFile));
             }
             string facesDirectory = GetFacesDirectory(propertyConfiguration, dFacesContentDirectory, keyMapping.FilePath, keyMapping.MappingFromItem);
-            FileHolder faceFileHolder = IFileHolder.Get(Path.Combine(facesDirectory, $"{keyMapping.MappingFromLocation.DeterministicHashCodeKey}{keyMapping.MappingFromItem.ImageFileHolder.ExtensionLowered}{facesFileNameExtension}"));
+            FileHolder faceFileHolder = IFileHolder.Get(Path.Combine(facesDirectory, $"{keyMapping.MappingFromLocation.DeterministicHashCodeKey}{keyMapping.MappingFromItem.FilePath.ExtensionLowered}{facesFileNameExtension}"));
             if (!faceFileHolder.Exists)
                 saveContainer = null;
             else
             {
-                string checkFile = Path.Combine(directory, $"{keyMapping.MappingFromLocation.DeterministicHashCodeKey}{keyMapping.MappingFromItem.ImageFileHolder.ExtensionLowered}{facesFileNameExtension}");
+                string checkFile = Path.Combine(directory, $"{keyMapping.MappingFromLocation.DeterministicHashCodeKey}{keyMapping.MappingFromItem.FilePath.ExtensionLowered}{facesFileNameExtension}");
                 saveContainer = new(checkFile, directory, faceFileHolder);
             }
         }
@@ -734,11 +751,11 @@ internal abstract class MapLogic
         }
     }
 
-    internal static ReadOnlyDictionary<int, ReadOnlyDictionary<int, ReadOnlyCollection<PersonContainer>>> GetIdThenWholePercentagesToPersonContainers(Configuration configuration, ReadOnlyDictionary<string, PersonContainer> personKeyFormattedToPersonContainer, ReadOnlyCollection<PersonKeyFormattedIdThenWholePercentages> personKeyFormattedIdThenWholePercentagesCollection)
+    internal static ReadOnlyDictionary<int, ReadOnlyDictionary<int, ReadOnlyCollection<PersonContainer>>> GetIdThenWholePercentagesToPersonContainers(Configuration configuration, Dictionary<int, List<(string, int)>> skipCollection, ReadOnlyDictionary<string, PersonContainer> personKeyFormattedToPersonContainer, ReadOnlyCollection<PersonKeyFormattedIdThenWholePercentages> personKeyFormattedIdThenWholePercentagesCollection)
     {
         ReadOnlyDictionary<int, ReadOnlyDictionary<int, ReadOnlyCollection<PersonContainer>>> results;
         Dictionary<int, Dictionary<int, List<PersonContainer>>> idThenWholePercentagesToPersonContainerCollection;
-        idThenWholePercentagesToPersonContainerCollection = GetAll(configuration, personKeyFormattedToPersonContainer, personKeyFormattedIdThenWholePercentagesCollection);
+        idThenWholePercentagesToPersonContainerCollection = GetAll(configuration, skipCollection, personKeyFormattedToPersonContainer, personKeyFormattedIdThenWholePercentagesCollection);
         results = GetReadOnly(idThenWholePercentagesToPersonContainerCollection);
         return results;
     }
@@ -766,7 +783,7 @@ internal abstract class MapLogic
             wholePercentagesCollection = idToWholePercentagesCollection[record.MappedFaceFilePath.Id.Value];
             wholePercentagesCollection.Add(wholePercentages.Value);
             idToWholePercentagesCollection[record.MappedFaceFilePath.Id.Value].Add(wholePercentages.Value);
-            results.Add(new(record.PersonKeyFormatted, record.PersonDisplayDirectoryName, record.IsDefault, record.MappedFaceFilePath, record.MappedFaceFilePath.Id.Value, wholePercentages.Value));
+            results.Add(new(record.PersonKeyFormatted, record.PersonDisplayDirectoryName, record.IsDefault, record.LinksCount, record.MappedFaceFilePath, record.MappedFaceFilePath.Id.Value, wholePercentages.Value));
         }
         return new(results);
     }
@@ -890,7 +907,7 @@ internal abstract class MapLogic
         }
     }
 
-    internal static List<LocationContainer> GetLocationContainers(int maxDegreeOfParallelism, Shared.Models.Properties.IPropertyConfiguration propertyConfiguration, Configuration configuration, long ticks, ReadOnlyCollection<PersonContainer> personContainers, Dictionary<int, List<(string, int)>> skipCollection, List<Record> records)
+    internal static List<LocationContainer> GetLocationContainers(int maxDegreeOfParallelism, Shared.Models.Properties.IPropertyConfiguration propertyConfiguration, Configuration configuration, long ticks, ReadOnlyCollection<PersonContainer> personContainers, ReadOnlyDictionary<int, List<(string, int)>> skipCollection, List<Record> records)
     {
         List<LocationContainer> results = [];
         List<MappedFile> mappedFiles = GetMappedFiles(propertyConfiguration, configuration, personContainers, records);
@@ -966,7 +983,7 @@ internal abstract class MapLogic
         if (directoryName is null)
             result = null;
         else
-            result = Path.Combine($"{d2FacePartsContentCollectionDirectory}{directoryName}", $"{mappingFromItem.ImageFileHolder.Name}{extension}");
+            result = Path.Combine($"{d2FacePartsContentCollectionDirectory}{directoryName}", $"{mappingFromItem.FilePath.Name}{extension}");
         return result;
     }
 
@@ -974,7 +991,23 @@ internal abstract class MapLogic
     {
         string result;
         (string directoryName, _) = IPath.GetDirectoryNameAndIndex(propertyConfiguration, filePath);
-        result = Path.Combine(d2FacePartsContentDirectory, directoryName, mappingFromItem.ImageFileHolder.NameWithoutExtension);
+        result = Path.Combine(d2FacePartsContentDirectory, directoryName, mappingFromItem.FilePath.NameWithoutExtension);
+        return result;
+    }
+
+    internal static string GetFacePartsDirectoryX(Shared.Models.Properties.IPropertyConfiguration propertyConfiguration, string d2FacePartsContentDirectory, FilePath filePath)
+    {
+        string result;
+        (string directoryName, _) = IPath.GetDirectoryNameAndIndex(propertyConfiguration, filePath);
+        result = Path.Combine(d2FacePartsContentDirectory, directoryName, filePath.NameWithoutExtension);
+        return result;
+    }
+
+    internal static string GetResizeContentDirectory(Shared.Models.Properties.IPropertyConfiguration propertyConfiguration, string cContentDirectory, FilePath filePath)
+    {
+        string result;
+        (string directoryName, _) = IPath.GetDirectoryNameAndIndex(propertyConfiguration, filePath);
+        result = Path.Combine(cContentDirectory, directoryName);
         return result;
     }
 
@@ -986,9 +1019,9 @@ internal abstract class MapLogic
             throw new NullReferenceException(nameof(sortingContainer.Source.MappingFromLocation));
         FileHolder faceFileHolder = IFileHolder.Get($"C:/{sortingContainer.Sorting.Id}.{sortingContainer.Sorting.WholePercentages}");
         if (keyMapping.MappingFromPerson is not null && keyMapping.MappingFromLocation is not null)
-            shortcutFile = Path.Combine(directory, $"{keyMapping.MappingFromLocation.DeterministicHashCodeKey}{keyMapping.MappingFromItem.ImageFileHolder.ExtensionLowered}.{sortingContainer.Sorting.DistancePermyriad}.lnk");
+            shortcutFile = Path.Combine(directory, $"{keyMapping.MappingFromLocation.DeterministicHashCodeKey}{keyMapping.MappingFromItem.FilePath.ExtensionLowered}.{sortingContainer.Sorting.DistancePermyriad}.lnk");
         else
-            shortcutFile = Path.Combine(directory, $"{sortingContainer.Source.MappingFromLocation.DeterministicHashCodeKey}{sortingContainer.Source.MappingFromItem.ImageFileHolder.ExtensionLowered}.{sortingContainer.Sorting.DistancePermyriad}.lnk");
+            shortcutFile = Path.Combine(directory, $"{sortingContainer.Source.MappingFromLocation.DeterministicHashCodeKey}{sortingContainer.Source.MappingFromItem.FilePath.ExtensionLowered}.{sortingContainer.Sorting.DistancePermyriad}.lnk");
         result = new(directory, faceFileHolder, sortingContainer.Source.MappingFromItem.ResizedFileHolder, shortcutFile);
         return result;
     }
@@ -999,9 +1032,9 @@ internal abstract class MapLogic
         SaveContainer? saveContainer;
         if (mapping.MappingFromLocation is null)
             throw new NullReferenceException(nameof(mapping.MappingFromLocation));
-        checkFile = Path.Combine(directory, $"{mapping.MappingFromItem.ImageFileHolder.Name}{facePartsFileNameExtension}");
+        checkFile = Path.Combine(directory, $"{mapping.MappingFromItem.FilePath.Name}{facePartsFileNameExtension}");
         saveContainer = !facePartsFileHolder.Exists ? null : new(checkFile, directory, facePartsFileHolder);
-        checkFile = Path.Combine(directory, $"{mapping.MappingFromLocation.DeterministicHashCodeKey}{mapping.MappingFromItem.ImageFileHolder.ExtensionLowered}{facesFileNameExtension}");
+        checkFile = Path.Combine(directory, $"{mapping.MappingFromLocation.DeterministicHashCodeKey}{mapping.MappingFromItem.FilePath.ExtensionLowered}{facesFileNameExtension}");
         return (new(checkFile, directory, faceFileHolder), saveContainer);
     }
 
@@ -1086,11 +1119,11 @@ internal abstract class MapLogic
         return new(results);
     }
 
-    internal static ReadOnlyDictionary<int, ReadOnlyDictionary<int, Mapping>> GetIdToWholePercentagesToFace(ReadOnlyCollection<Mapping> mappingCollection)
+    internal static ReadOnlyDictionary<int, ReadOnlyDictionary<int, Mapping>> GetIdToWholePercentagesToFace(ReadOnlyCollection<Mapping> distinctValidImageMappingCollection)
     {
         Dictionary<int, Dictionary<int, Mapping>> results = [];
         Dictionary<int, Mapping>? keyValuePairs;
-        foreach (Mapping mapping in mappingCollection)
+        foreach (Mapping mapping in distinctValidImageMappingCollection)
         {
             if (mapping.MappingFromLocation is null)
                 continue;
@@ -1159,29 +1192,29 @@ internal abstract class MapLogic
         return results;
     }
 
-    internal static (string, bool, bool) Get(int? useFiltersCounter, bool saveIndividually, bool sortingContainersAny, string forceSingleImageHumanized, int? distancePermyriad, Mapping mapping)
+    internal static (string, bool, bool) Get(int? useFiltersCounter, bool saveIndividually, bool sortingContainersAny, string forceSingleImageHumanized, int? distancePermyriad, int? by, string? displayDirectoryName)
     {
-        string by;
+        string byValue;
         bool isByMapping;
         bool isBySorting;
-        if (mapping.By is null)
+        if (by is null)
         {
             isByMapping = false;
             isBySorting = !sortingContainersAny;
-            by = $"{nameof(Shared.Models.Stateless.IMapLogic.Mapping)}Null";
+            byValue = $"{nameof(Shared.Models.Stateless.IMapLogic.Mapping)}Null";
         }
         else
         {
-            isByMapping = mapping.By == Shared.Models.Stateless.IMapLogic.Mapping;
-            isBySorting = mapping.By == Shared.Models.Stateless.IMapLogic.Sorting;
-            bool isDefaultName = mapping.MappingFromPerson is not null && IPerson.IsDefaultName(mapping.MappingFromPerson.DisplayDirectoryName);
-            if (isBySorting && mapping.MappingFromPerson is null)
-                by = saveIndividually ? nameof(Shared.Models.Stateless.IMapLogic.Individually) : $"{nameof(Shared.Models.Stateless.IMapLogic.Sorting)} Without Person{(distancePermyriad < 2000 ? "-A" : "-Z")}";
+            isByMapping = by == Shared.Models.Stateless.IMapLogic.Mapping;
+            isBySorting = by == Shared.Models.Stateless.IMapLogic.Sorting;
+            bool isDefaultName = displayDirectoryName is not null && IPerson.IsDefaultName(displayDirectoryName);
+            if (isBySorting && displayDirectoryName is null)
+                byValue = saveIndividually ? nameof(Shared.Models.Stateless.IMapLogic.Individually) : $"{nameof(Shared.Models.Stateless.IMapLogic.Sorting)} Without Person{(distancePermyriad < 2000 ? "-A" : "-Z")}";
             else if (isBySorting && useFiltersCounter.HasValue)
-                by = $"{nameof(Shared.Models.Stateless.IMapLogic.Sorting)}{(!isDefaultName ? "-A" : "-Z")} Modified Filters - {useFiltersCounter.Value}";
+                byValue = $"{nameof(Shared.Models.Stateless.IMapLogic.Sorting)}{(!isDefaultName ? "-A" : "-Z")} Modified Filters - {useFiltersCounter.Value}";
             else
             {
-                by = $"{mapping.By.Value switch
+                byValue = $"{by.Value switch
                 {
                     Shared.Models.Stateless.IMapLogic.Mapping => nameof(Shared.Models.Stateless.IMapLogic.Mapping),
                     Shared.Models.Stateless.IMapLogic.Sorting => saveIndividually ? nameof(Shared.Models.Stateless.IMapLogic.Individually) : nameof(Shared.Models.Stateless.IMapLogic.Sorting),
@@ -1190,9 +1223,15 @@ internal abstract class MapLogic
                 }}{(!isDefaultName ? "-A" : "-Z")}";
             }
         }
-        return new(by, isByMapping, isBySorting);
+        return new(byValue, isByMapping, isBySorting);
     }
 
+    internal static (string, bool, bool) Get(int? useFiltersCounter, bool saveIndividually, bool sortingContainersAny, string forceSingleImageHumanized, int? distancePermyriad, long? personKey, string? displayDirectoryName) =>
+        Get(useFiltersCounter, saveIndividually, sortingContainersAny, forceSingleImageHumanized, distancePermyriad, personKey is null ? null : Shared.Models.Stateless.IMapLogic.Mapping, displayDirectoryName);
+
+    internal static (string, bool, bool) Get(int? useFiltersCounter, bool saveIndividually, bool sortingContainersAny, string forceSingleImageHumanized, int? distancePermyriad, Mapping mapping) =>
+        Get(useFiltersCounter, saveIndividually, sortingContainersAny, forceSingleImageHumanized, distancePermyriad, mapping.By, mapping.MappingFromPerson?.DisplayDirectoryName);
+
     internal static void CheckCollection(Shared.Models.Properties.IPropertyConfiguration propertyConfiguration, string? rootDirectoryParent)
     {
         string json;
@@ -1260,7 +1299,7 @@ internal abstract class MapLogic
         return new(results);
     }
 
-    internal static bool? CanReMap(long[] jLinkResolvedPersonKeys, ReadOnlyDictionary<int, ReadOnlyCollection<PersonContainer>>? wholePercentagesToPersonContainers, MappingFromLocation mappingFromLocation)
+    internal static bool? CanReMap(long[] jLinkResolvedPersonKeys, ReadOnlyDictionary<int, ReadOnlyCollection<PersonContainer>>? wholePercentagesToPersonContainers, int wholePercentages)
     {
         bool? result;
         ReadOnlyCollection<PersonContainer>? personContainers;
@@ -1268,7 +1307,7 @@ internal abstract class MapLogic
             result = null;
         else
         {
-            if (!wholePercentagesToPersonContainers.TryGetValue(mappingFromLocation.WholePercentages, out personContainers))
+            if (!wholePercentagesToPersonContainers.TryGetValue(wholePercentages, out personContainers))
                 result = null;
             else
             {

Map/Models/Stateless/Methods/IMapLogic.cs

@@ -1,4 +1,6 @@
 using System.Collections.ObjectModel;
+using View_by_Distance.Shared.Models;
+using View_by_Distance.Shared.Models.Stateless.Methods;
 
 namespace View_by_Distance.Map.Models.Stateless.Methods;
 
@@ -10,44 +12,64 @@ public interface IMapLogic
     static ReadOnlyDictionary<int, List<long>> GetIdToPersonKeys(ReadOnlyDictionary<long, List<int>> personKeyToIds) =>
         MapLogic.GetIdToPersonKeys(personKeyToIds);
 
-    ReadOnlyCollection<Shared.Models.Face> TestStatic_GetFaces(ReadOnlyCollection<Shared.Models.Item> items) =>
+    ReadOnlyCollection<Face> TestStatic_GetFaces(ReadOnlyCollection<Item> items) =>
          GetFaces(items);
-    static ReadOnlyCollection<Shared.Models.Face> GetFaces(ReadOnlyCollection<Shared.Models.Item> items) =>
+    static ReadOnlyCollection<Face> GetFaces(ReadOnlyCollection<Item> items) =>
         MapLogic.GetFaces(items);
 
-    Shared.Models.Mapping[] TestStatic_GetSelectedMappingCollection(ReadOnlyCollection<Shared.Models.Item> items) =>
+    Mapping[] TestStatic_GetSelectedMappingCollection(ReadOnlyCollection<Item> items) =>
         GetSelectedMappingCollection(items);
-    static Shared.Models.Mapping[] GetSelectedMappingCollection(ReadOnlyCollection<Shared.Models.Item> items) =>
+    static Mapping[] GetSelectedMappingCollection(ReadOnlyCollection<Item> items) =>
         MapLogic.GetSelectedMappingCollection(items);
 
-    Shared.Models.Mapping[] TestStatic_GetSelectedMappingCollection(ReadOnlyCollection<Shared.Models.Face> faces) =>
+    Mapping[] TestStatic_GetSelectedMappingCollection(ReadOnlyCollection<Face> faces) =>
         GetSelectedMappingCollection(faces);
-    static Shared.Models.Mapping[] GetSelectedMappingCollection(ReadOnlyCollection<Shared.Models.Face> faces) =>
+    static Mapping[] GetSelectedMappingCollection(ReadOnlyCollection<Face> faces) =>
         MapLogic.GetSelectedMappingCollection(faces);
 
-    ReadOnlyDictionary<int, ReadOnlyDictionary<int, Shared.Models.Mapping>> TestStatic_GetIdToWholePercentagesToFace(ReadOnlyCollection<Shared.Models.Mapping> mappingCollection) =>
-        GetIdToWholePercentagesToFace(mappingCollection);
-    static ReadOnlyDictionary<int, ReadOnlyDictionary<int, Shared.Models.Mapping>> GetIdToWholePercentagesToFace(ReadOnlyCollection<Shared.Models.Mapping> mappingCollection) =>
-        MapLogic.GetIdToWholePercentagesToFace(mappingCollection);
+    ReadOnlyDictionary<int, ReadOnlyDictionary<int, Mapping>> TestStatic_GetIdToWholePercentagesToFace(ReadOnlyCollection<Mapping> distinctValidImageMappingCollection) =>
+        GetIdToWholePercentagesToFace(distinctValidImageMappingCollection);
+    static ReadOnlyDictionary<int, ReadOnlyDictionary<int, Mapping>> GetIdToWholePercentagesToFace(ReadOnlyCollection<Mapping> distinctValidImageMappingCollection) =>
+        MapLogic.GetIdToWholePercentagesToFace(distinctValidImageMappingCollection);
 
     List<(string, long)> TestStatic_GetJLinkDirectories(string genealogicalDataCommunicationFile, string[] jLinks, string personBirthdayFormat, char[] personCharacters, string a2PeopleSingletonDirectory, string a2PeopleContentDirectory) =>
          GetJLinkDirectories(genealogicalDataCommunicationFile, jLinks, personBirthdayFormat, personCharacters, a2PeopleSingletonDirectory, a2PeopleContentDirectory);
     static List<(string, long)> GetJLinkDirectories(string genealogicalDataCommunicationFile, string[] jLinks, string personBirthdayFormat, char[] personCharacters, string a2PeopleSingletonDirectory, string a2PeopleContentDirectory) =>
         MapLogic.GetJLinkDirectories(genealogicalDataCommunicationFile, jLinks, personBirthdayFormat, personCharacters, a2PeopleSingletonDirectory, a2PeopleContentDirectory);
 
-    void TestStatic_SetCreationTimeMaybeMoveToDecade(Property.Models.Configuration propertyConfiguration, bool moveToDecade, Shared.Models.MappingFromItem mappingFromItem, ReadOnlyCollection<Shared.Models.LocationContainer> locationContainers) =>
-        SetCreationTimeMaybeMoveToDecade(propertyConfiguration, moveToDecade, mappingFromItem, locationContainers);
-    static void SetCreationTimeMaybeMoveToDecade(Property.Models.Configuration propertyConfiguration, bool moveToDecade, Shared.Models.MappingFromItem mappingFromItem, ReadOnlyCollection<Shared.Models.LocationContainer> locationContainers) =>
-        DecadeLogic.SetCreationTimeMaybeMoveToDecade(propertyConfiguration, moveToDecade, mappingFromItem, locationContainers);
+    void TestStatic_SetCreationTime(MappingFromItem mappingFromItem, ReadOnlyCollection<LocationContainer> locationContainers) =>
+        SetCreationTime(mappingFromItem, locationContainers);
+    static void SetCreationTime(MappingFromItem mappingFromItem, ReadOnlyCollection<LocationContainer> locationContainers) =>
+        DecadeLogic.SetCreationTime(mappingFromItem, locationContainers);
 
-    bool? TestStatic_CanReMap(long[] jLinkResolvedPersonKeys, ReadOnlyDictionary<int, ReadOnlyCollection<Shared.Models.PersonContainer>>? wholePercentagesToPersonContainers, Shared.Models.MappingFromLocation mappingFromLocation) =>
+    void TestStatic_MoveToDecade(Property.Models.Configuration propertyConfiguration, MappingFromItem mappingFromItem, ReadOnlyCollection<LocationContainer> locationContainers) =>
+        MoveToDecade(propertyConfiguration, mappingFromItem, locationContainers);
+    static void MoveToDecade(Property.Models.Configuration propertyConfiguration, MappingFromItem mappingFromItem, ReadOnlyCollection<LocationContainer> locationContainers) =>
+        DecadeLogic.MoveToDecade(propertyConfiguration, mappingFromItem, locationContainers);
+
+    bool? TestStatic_CanReMap(long[] jLinkResolvedPersonKeys, ReadOnlyDictionary<int, ReadOnlyCollection<PersonContainer>>? wholePercentagesToPersonContainers, MappingFromLocation mappingFromLocation) =>
         CanReMap(jLinkResolvedPersonKeys, wholePercentagesToPersonContainers, mappingFromLocation);
-    static bool? CanReMap(long[] jLinkResolvedPersonKeys, ReadOnlyDictionary<int, ReadOnlyCollection<Shared.Models.PersonContainer>>? wholePercentagesToPersonContainers, Shared.Models.MappingFromLocation mappingFromLocation) =>
-        MapLogic.CanReMap(jLinkResolvedPersonKeys, wholePercentagesToPersonContainers, mappingFromLocation);
+    static bool? CanReMap(long[] jLinkResolvedPersonKeys, ReadOnlyDictionary<int, ReadOnlyCollection<PersonContainer>>? wholePercentagesToPersonContainers, MappingFromLocation mappingFromLocation) =>
+        MapLogic.CanReMap(jLinkResolvedPersonKeys, wholePercentagesToPersonContainers, mappingFromLocation.WholePercentages);
 
-    string TestStatic_GetDecade(Shared.Models.MappingFromItem mappingFromItem) =>
+    bool? TestStatic_CanReMap(long[] jLinkResolvedPersonKeys, ReadOnlyDictionary<int, ReadOnlyCollection<PersonContainer>>? wholePercentagesToPersonContainers, int wholePercentages) =>
+        CanReMap(jLinkResolvedPersonKeys, wholePercentagesToPersonContainers, wholePercentages);
+    static bool? CanReMap(long[] jLinkResolvedPersonKeys, ReadOnlyDictionary<int, ReadOnlyCollection<PersonContainer>>? wholePercentagesToPersonContainers, int wholePercentages) =>
+        MapLogic.CanReMap(jLinkResolvedPersonKeys, wholePercentagesToPersonContainers, wholePercentages);
+
+    string TestStatic_GetDecade(MappingFromItem mappingFromItem) =>
         GetDecade(mappingFromItem);
-    static string GetDecade(Shared.Models.MappingFromItem mappingFromItem) =>
+    static string GetDecade(MappingFromItem mappingFromItem) =>
         DecadeLogic.GetDecade(mappingFromItem, null);
 
+    ReadOnlyDictionary<int, ReadOnlyDictionary<int, LocationContainer>> TestStatic_GetMappedFiles(int maxDegreeOfParallelism, Property.Models.Configuration propertyConfiguration, Configuration configuration, long ticks, ReadOnlyCollection<PersonContainer> personContainers, string a2PeopleSingletonDirectory, string eDistanceContentDirectory) =>
+        GetMapped(maxDegreeOfParallelism, propertyConfiguration, configuration, ticks, personContainers, a2PeopleSingletonDirectory, eDistanceContentDirectory);
+    static ReadOnlyDictionary<int, ReadOnlyDictionary<int, LocationContainer>> GetMapped(int maxDegreeOfParallelism, Property.Models.Configuration propertyConfiguration, Configuration configuration, long ticks, ReadOnlyCollection<PersonContainer> personContainers, string a2PeopleSingletonDirectory, string eDistanceContentDirectory) =>
+        FaceFileLogic.GetMapped(maxDegreeOfParallelism, propertyConfiguration, configuration, ticks, personContainers, a2PeopleSingletonDirectory, eDistanceContentDirectory);
+
+    List<LocationContainer> TestStatic_GetAvailable(int maxDegreeOfParallelism, Property.Models.Configuration propertyConfiguration, Configuration configuration, IFaceD dFace, long ticks, string dFacesContentDirectory, ReadOnlyCollection<FilePath> filePaths) =>
+        GetAvailable(maxDegreeOfParallelism, propertyConfiguration, configuration, dFace, ticks, dFacesContentDirectory, filePaths);
+    static List<LocationContainer> GetAvailable(int maxDegreeOfParallelism, Property.Models.Configuration propertyConfiguration, Configuration configuration, IFaceD dFace, long ticks, string dFacesContentDirectory, ReadOnlyCollection<FilePath> filePaths) =>
+        FaceFileLogic.GetAvailable(maxDegreeOfParallelism, propertyConfiguration, configuration, dFace, ticks, dFacesContentDirectory, filePaths);
+
 }

Map/Models/Stateless/RelationLogic.cs

@@ -17,14 +17,16 @@ internal abstract class RelationLogic
         Dictionary<long, Dictionary<int, List<LocationContainer>>> personKeyTo = [];
         foreach (LocationContainer locationContainer in locationContainers)
         {
+            if (locationContainer.PersonKey is null)
+                continue;
             if (!locationContainer.FromDistanceContent)
                 continue;
             if (!locationContainer.FilePath.FullName.Contains(configuration.LocationContainerDirectoryPattern))
                 continue;
-            if (!personKeyTo.TryGetValue(locationContainer.PersonKey, out yearTo))
+            if (!personKeyTo.TryGetValue(locationContainer.PersonKey.Value, out yearTo))
             {
-                personKeyTo.Add(locationContainer.PersonKey, []);
-                if (!personKeyTo.TryGetValue(locationContainer.PersonKey, out yearTo))
+                personKeyTo.Add(locationContainer.PersonKey.Value, []);
+                if (!personKeyTo.TryGetValue(locationContainer.PersonKey.Value, out yearTo))
                     throw new Exception();
             }
             if (!yearTo.TryGetValue(locationContainer.CreationDateOnly.Year, out collection))
@@ -45,6 +47,7 @@ internal abstract class RelationLogic
         int lastIndex;
         List<int> years = [];
         List<int> indices = [];
+        LocationContainer locationContainer;
         List<(int Index, int Year)> sort = [];
         List<LocationContainer> collection = [];
         KeyValuePair<int, List<LocationContainer>> keyValue;
@@ -76,7 +79,10 @@ internal abstract class RelationLogic
                     key = $"{years.Min()}-{keyValue.Key}";
                 if (collection.Count == 0)
                     continue;
-                results.Add(new(key, collection[0].PersonKey, new(collection)));
+                locationContainer = collection[0];
+                if (locationContainer.PersonKey is null)
+                    continue;
+                results.Add(new(key, locationContainer.PersonKey.Value, new(collection)));
                 collection = [];
                 years.Clear();
             }
@@ -84,7 +90,7 @@ internal abstract class RelationLogic
         return new(results);
     }
 
-    private static ReadOnlyDictionary<string, string> MoveFiles(Configuration configuration, string key, bool isCounterPersonYear, string? displayDirectoryName, ReadOnlyCollection<RelationContainer> relationContainers, List<string> linked1, List<string> linked2, List<string> linked3, List<string> linked4, List<string> linked5, List<string> linked6, List<string> linked7, List<string> linked8, List<string> linked9)
+    private static ReadOnlyDictionary<string, string> MoveFiles(Configuration configuration, string key, bool isCounterPersonYear, string? displayDirectoryName, ReadOnlyCollection<RelationContainer> relationContainers, List<List<string>> linked)
     {
         Dictionary<string, string> results = [];
         string value;
@@ -105,23 +111,55 @@ internal abstract class RelationLogic
             maybeTicksDirectoryName = Path.GetFileName(personKeyFormattedDirectory);
             if (string.IsNullOrEmpty(personNameDirectory) || string.IsNullOrEmpty(yearDirectory) || string.IsNullOrEmpty(personKeyFormattedDirectory) || string.IsNullOrEmpty(personNameDirectoryName))
                 continue;
-            if (linked9.Contains(fileHolder.FullName))
+            if (linked[24].Contains(fileHolder.FullName))
+                value = "ZZZ";
+            else if (linked[23].Contains(fileHolder.FullName))
+                value = "YYY";
+            else if (linked[22].Contains(fileHolder.FullName))
+                value = "XXX";
+            else if (linked[21].Contains(fileHolder.FullName))
+                value = "WWW";
+            else if (linked[20].Contains(fileHolder.FullName))
+                value = "VVV";
+            else if (linked[19].Contains(fileHolder.FullName))
+                value = "UUU";
+            else if (linked[18].Contains(fileHolder.FullName))
+                value = "TTT";
+            else if (linked[17].Contains(fileHolder.FullName))
+                value = "SSS";
+            else if (linked[16].Contains(fileHolder.FullName))
+                value = "RRR";
+            else if (linked[15].Contains(fileHolder.FullName))
+                value = "QQQ";
+            else if (linked[14].Contains(fileHolder.FullName))
+                value = "PPP";
+            else if (linked[13].Contains(fileHolder.FullName))
+                value = "OOO";
+            else if (linked[12].Contains(fileHolder.FullName))
+                value = "NNN";
+            else if (linked[11].Contains(fileHolder.FullName))
+                value = "MMM";
+            else if (linked[10].Contains(fileHolder.FullName))
+                value = "LLL";
+            else if (linked[9].Contains(fileHolder.FullName))
+                value = "KKK";
+            else if (linked[8].Contains(fileHolder.FullName))
                 value = "JJJ";
-            else if (linked8.Contains(fileHolder.FullName))
+            else if (linked[7].Contains(fileHolder.FullName))
                 value = "III";
-            else if (linked7.Contains(fileHolder.FullName))
+            else if (linked[6].Contains(fileHolder.FullName))
                 value = "HHH";
-            else if (linked6.Contains(fileHolder.FullName))
+            else if (linked[5].Contains(fileHolder.FullName))
                 value = "GGG";
-            else if (linked5.Contains(fileHolder.FullName))
+            else if (linked[4].Contains(fileHolder.FullName))
                 value = "FFF";
-            else if (linked4.Contains(fileHolder.FullName))
+            else if (linked[3].Contains(fileHolder.FullName))
                 value = "EEE";
-            else if (linked3.Contains(fileHolder.FullName))
+            else if (linked[2].Contains(fileHolder.FullName))
                 value = "DDD";
-            else if (linked2.Contains(fileHolder.FullName))
+            else if (linked[1].Contains(fileHolder.FullName))
                 value = "CCC";
-            else if (linked1.Contains(fileHolder.FullName))
+            else if (linked[0].Contains(fileHolder.FullName))
                 value = "BBB";
             else
                 value = "AAA";
@@ -222,7 +260,7 @@ internal abstract class RelationLogic
             _ = Directory.CreateDirectory(vsCodeDirectory);
         if (displayDirectoryName is not null)
             File.WriteAllText(Path.Combine(directory, $"_ {displayDirectoryName}.txt"), string.Empty);
-        json = "{ \"[markdown]\": { \"editor.wordWrap\": \"off\" }, \"foam.links.hover.enable\": false, \"foam.graph.style\": { \"background\": \"#202020\", \"node\": { \"note\": \"#f2cb1d\", \"distance\": \"green\", \"image\": \"orange\", \"placeholder\": \"white\", } } }";
+        json = /*lang=json*/ """{ "[markdown]": { "editor.wordWrap": "off" }, "foam.links.hover.enable": false, "foam.graph.style": { "background": "#202020", "node": { "note": "#f2cb1d", "distance": "green", "image": "orange", "placeholder": "white", } } }""";
         _ = IPath.WriteAllText(Path.Combine(vsCodeDirectory, "settings.json"), json, updateDateWhenMatches: false, compareBeforeWrite: true, updateToWhenMatches: null);
         json = string.Concat("{ \"version\": \"2.0.0\", \"tasks\": [ { \"label\": \"MKLink\", \"type\": \"shell\", \"command\": \"New-Item\", \"args\": [ \"-ItemType\", \"Junction\", \"-Path\", \"'", directory.Replace('\\', '/'), "/()'\", \"-Target\", \"'", eDistanceContentDirectory.Replace('\\', '/'), "'\" ], \"problemMatcher\": [] } ] }");
         _ = IPath.WriteAllText(Path.Combine(vsCodeDirectory, "tasks.json"), json, updateDateWhenMatches: false, compareBeforeWrite: true, updateToWhenMatches: null);
@@ -231,67 +269,24 @@ internal abstract class RelationLogic
     private static ReadOnlyDictionary<string, string> GetMoveFiles(Configuration configuration, string key, int take, bool isCounterPersonYear, string? displayDirectoryName, ReadOnlyCollection<RelationContainer> relationContainers)
     {
         ReadOnlyDictionary<string, string> results;
-        List<string> linked1 = [];
-        List<string> linked2 = [];
-        List<string> linked3 = [];
-        List<string> linked4 = [];
-        List<string> linked5 = [];
-        List<string> linked6 = [];
-        List<string> linked7 = [];
-        List<string> linked8 = [];
-        List<string> linked9 = [];
+        List<List<string>> linked = [];
+        for (int i = 0; i < 25; i++)
+            linked.Add([]);
         foreach ((FileHolder fileHolder, ReadOnlyCollection<Relation> relations) in relationContainers)
         {
             foreach (Relation relation in relations.Take(take))
             {
-                if (!linked1.Contains(relation.File))
+                for (int i = 0; i < 25; i++)
                 {
-                    linked1.Add(relation.File);
-                    continue;
-                }
-                if (!linked2.Contains(relation.File))
-                {
-                    linked2.Add(relation.File);
-                    continue;
-                }
-                if (!linked3.Contains(relation.File))
-                {
-                    linked3.Add(relation.File);
-                    continue;
-                }
-                if (!linked4.Contains(relation.File))
-                {
-                    linked4.Add(relation.File);
-                    continue;
-                }
-                if (!linked5.Contains(relation.File))
-                {
-                    linked5.Add(relation.File);
-                    continue;
-                }
-                if (!linked6.Contains(relation.File))
-                {
-                    linked6.Add(relation.File);
-                    continue;
-                }
-                if (!linked7.Contains(relation.File))
-                {
-                    linked7.Add(relation.File);
-                    continue;
-                }
-                if (!linked8.Contains(relation.File))
-                {
-                    linked8.Add(relation.File);
-                    continue;
-                }
-                if (!linked9.Contains(relation.File))
-                {
-                    linked9.Add(relation.File);
-                    continue;
+                    if (!linked[i].Contains(relation.File))
+                    {
+                        linked[i].Add(relation.File);
+                        break;
+                    }
                 }
             }
         }
-        results = MoveFiles(configuration, key, isCounterPersonYear, displayDirectoryName, relationContainers, linked1, linked2, linked3, linked4, linked5, linked6, linked7, linked8, linked9);
+        results = MoveFiles(configuration, key, isCounterPersonYear, displayDirectoryName, relationContainers, linked);
         return results;
     }
 
@@ -433,7 +428,7 @@ internal abstract class RelationLogic
             if (!Directory.Exists(directory))
                 _ = Directory.CreateDirectory(directory);
             WriteVsCodeFiles(eDistanceContentDirectory, displayDirectoryName, directory);
-            relationContainers = distance.GetRelationContainers(configuration.FaceDistancePermyriad, configuration.LocationContainerDistanceTake, configuration.LocationContainerDistanceTolerance.Value, group.RelationContainersCollection);
+            relationContainers = distance.GetRelationContainers(configuration.DistanceLimits, configuration.FaceDistancePermyriad, configuration.LocationContainerDistanceTake, configuration.LocationContainerDistanceTolerance.Value, group.RelationContainersCollection);
             movedFiles = GetMoveFiles(configuration, group.Key, take, isCounterPersonYear, displayDirectoryName, relationContainers);
             WriteFile(take, group.PersonKey, isCounterPersonYear, personKeyFormatted, displayDirectoryName, directory, ticks, uri, relationContainers, movedFiles);
         }

Metadata-Query/MetadataQuery.cs

@@ -4,6 +4,7 @@ using Phares.Shared;
 using ShellProgressBar;
 using System.Collections.ObjectModel;
 using System.Text;
+using System.Text.Json;
 using View_by_Distance.Metadata.Query.Models;
 using View_by_Distance.Shared.Models;
 using View_by_Distance.Shared.Models.Methods;
@@ -58,12 +59,13 @@ public class MetadataQuery
 
     private List<(string FileName, string TagGroup, string TagIdName, string Value)> GetCollection(long ticks)
     {
+        string json;
+        string? model;
+        string? maker;
         string message;
         FileInfo fileInfo;
-        FilePath filePath;
-        FileHolder fileHolder;
         ProgressBar progressBar;
-        ExifDirectory exifDirectory;
+        ExifDirectory? exifDirectory;
         const string fileSearchFilter = "*";
         const bool useCeilingAverage = true;
         const string directorySearchFilter = "*";
@@ -80,17 +82,12 @@ public class MetadataQuery
             {
                 progressBar.Tick();
                 fileInfo = new(file);
-                fileHolder = FileHolder.Get(fileInfo);
-                filePath = FilePath.Get(_PropertyConfiguration, fileHolder, index: null);
-                exifDirectory = Metadata.Models.Stateless.Methods.IMetadata.GetExifDirectory(filePath);
-                // exifDirectory.ExifDirectoryBase.Artist;
-                // exifDirectory.ExifDirectoryBase.WinComment;
-                // exifDirectory.ExifDirectoryBase.Model;
-                // exifDirectory.ExifDirectoryBase.CameraOwnerName;
-                // exifDirectory.ExifDirectoryBase.Make;
-                // exifDirectory.ExifDirectoryBase.BodySerialNumber;
-                // exifDirectory.ExifDirectoryBase.LensSerialNumber;
-                // exifDirectory.ExifDirectoryBase.Software;
+                json = File.ReadAllText(fileInfo.FullName);
+                exifDirectory = JsonSerializer.Deserialize(json, ExifDirectorySourceGenerationContext.Default.ExifDirectory);
+                if (exifDirectory is null)
+                    continue;
+                maker = Metadata.Models.Stateless.Methods.IMetadata.GetMaker(exifDirectory);
+                model = Metadata.Models.Stateless.Methods.IMetadata.GetModel(exifDirectory);
                 // collection.Add(new(fileInfo.Name, keyValuePair.Key, keyValue.Key, keyValue.Value));
             }
             progressBar.Dispose();

Metadata-Query/Models/Binder/AppSettings.cs

@@ -16,6 +16,23 @@ public class AppSettings
         return result;
     }
 
+    private static void PreVerify(IConfigurationRoot configurationRoot, AppSettings? appSettings)
+    {
+        if (appSettings?.Company is null)
+        {
+            List<string> paths = [];
+            foreach (IConfigurationProvider configurationProvider in configurationRoot.Providers)
+            {
+                if (configurationProvider is not Microsoft.Extensions.Configuration.Json.JsonConfigurationProvider jsonConfigurationProvider)
+                    continue;
+                if (jsonConfigurationProvider.Source.FileProvider is not Microsoft.Extensions.FileProviders.PhysicalFileProvider physicalFileProvider)
+                    continue;
+                paths.Add(physicalFileProvider.Root);
+            }
+            throw new NotSupportedException($"Not found!{Environment.NewLine}{string.Join(Environment.NewLine, paths.Distinct())}");
+        }
+    }
+
     private static Models.AppSettings Get(AppSettings? appSettings)
     {
         Models.AppSettings result;
@@ -36,7 +53,10 @@ public class AppSettings
     public static Models.AppSettings Get(IConfigurationRoot configurationRoot)
     {
         Models.AppSettings result;
+#pragma warning disable IL3050, IL2026
         AppSettings? appSettings = configurationRoot.Get<AppSettings>();
+#pragma warning restore IL3050, IL2026
+        PreVerify(configurationRoot, appSettings);
         result = Get(appSettings);
         return result;
     }

Metadata-Query/Models/Binder/Configuration.cs

@@ -7,13 +7,9 @@ namespace View_by_Distance.Metadata.Query.Models.Binder;
 public class Configuration
 {
 
-#nullable disable
-
-    public string[] IgnoreExtensions { get; set; }
-    public Property.Models.Configuration PropertyConfiguration { get; set; }
-    public string PersonBirthdayFormat { get; set; }
-
-#nullable restore
+    public string[]? IgnoreExtensions { get; set; }
+    public Property.Models.Configuration? PropertyConfiguration { get; set; }
+    public string? PersonBirthdayFormat { get; set; }
 
     public override string ToString()
     {
@@ -21,12 +17,30 @@ public class Configuration
         return result;
     }
 
+    private static void PreVerify(IConfigurationRoot configurationRoot, Configuration? configuration)
+    {
+        if (configuration?.IgnoreExtensions is null)
+        {
+            List<string> paths = [];
+            foreach (IConfigurationProvider configurationProvider in configurationRoot.Providers)
+            {
+                if (configurationProvider is not Microsoft.Extensions.Configuration.Json.JsonConfigurationProvider jsonConfigurationProvider)
+                    continue;
+                if (jsonConfigurationProvider.Source.FileProvider is not Microsoft.Extensions.FileProviders.PhysicalFileProvider physicalFileProvider)
+                    continue;
+                paths.Add(physicalFileProvider.Root);
+            }
+            throw new NotSupportedException($"Not found!{Environment.NewLine}{string.Join(Environment.NewLine, paths.Distinct())}");
+        }
+    }
+
     private static Models.Configuration Get(Configuration? configuration)
     {
         Models.Configuration result;
         if (configuration is null) throw new NullReferenceException(nameof(configuration));
         if (configuration.IgnoreExtensions is null) throw new NullReferenceException(nameof(configuration.IgnoreExtensions));
         if (configuration.PersonBirthdayFormat is null) throw new NullReferenceException(nameof(configuration.PersonBirthdayFormat));
+        if (configuration.PropertyConfiguration is null) throw new NullReferenceException(nameof(configuration.PropertyConfiguration));
         result = new(
             configuration.IgnoreExtensions,
             configuration.PersonBirthdayFormat,
@@ -39,14 +53,19 @@ public class Configuration
         Models.Configuration result;
         Configuration? configuration;
         if (isEnvironment is null)
+#pragma warning disable IL3050, IL2026
             configuration = configurationRoot.Get<Configuration>();
+#pragma warning restore IL3050, IL2026
         else
         {
             string environmentName = IsEnvironment.GetEnvironmentName(isEnvironment);
             string section = string.Concat(environmentName, ":", nameof(Configuration));
             IConfigurationSection configurationSection = configurationRoot.GetSection(section);
+#pragma warning disable IL3050, IL2026
             configuration = configurationSection.Get<Configuration>();
+#pragma warning restore IL3050, IL2026
         }
+        PreVerify(configurationRoot, configuration);
         result = Get(configuration);
         return result;
     }

Metadata/Models/B_Metadata.cs

@@ -48,7 +48,7 @@ public class B_Metadata : IMetadata<MetadataExtractor.Directory>
         ExifDirectory? result = null;
         List<DateTime> dateTimes = (from l in subFileTuples where changesFrom.Contains(l.Item1) select l.Item2).ToList();
         (_, int directoryIndex) = Shared.Models.Stateless.Methods.IPath.GetDirectoryNameAndIndex(_PropertyConfiguration, filePath);
-        FileInfo fileInfo = new(Path.Combine(_FileGroups[_PropertyConfiguration.ResultSingleton][directoryIndex], $"{mappingFromItem.ImageFileHolder.NameWithoutExtension}{mappingFromItem.ImageFileHolder.ExtensionLowered}.json"));
+        FileInfo fileInfo = new(Path.Combine(_FileGroups[_PropertyConfiguration.ResultSingleton][directoryIndex], $"{mappingFromItem.FilePath.NameWithoutExtension}{mappingFromItem.FilePath.ExtensionLowered}.json"));
         if (_ForceMetadataLastWriteTimeToCreationTime && !fileInfo.Exists && File.Exists(Path.ChangeExtension(fileInfo.FullName, ".delete")))
         {
             File.Move(Path.ChangeExtension(fileInfo.FullName, ".delete"), fileInfo.FullName);
@@ -104,7 +104,7 @@ public class B_Metadata : IMetadata<MetadataExtractor.Directory>
         return result;
     }
 
-    (DateTime?, DateTime?[]) IMetadata<MetadataExtractor.Directory>.GetDateTimes(FileHolder fileHolder, IReadOnlyList<MetadataExtractor.Directory> directories)
+    (DateTime?, DateTime?[]) IMetadata<MetadataExtractor.Directory>.GetDateTimes(FilePath filePath, IReadOnlyList<MetadataExtractor.Directory> directories)
     {
         List<DateTime?> results = [];
         DateTime? result = null;
@@ -112,8 +112,8 @@ public class B_Metadata : IMetadata<MetadataExtractor.Directory>
         DateTime checkDateTime;
         string dateTimeFormat = Property.Models.Stateless.IProperty.DateTimeFormat();
         MetadataExtractor.Formats.Exif.ExifDirectoryBase? exifDirectoryBase = directories.OfType<MetadataExtractor.Formats.Exif.ExifDirectoryBase>().FirstOrDefault();
-        results.Add(fileHolder.CreationTime);
-        results.Add(fileHolder.LastWriteTime);
+        results.Add(new DateTime(filePath.CreationTicks));
+        results.Add(new DateTime(filePath.LastWriteTicks));
         if (exifDirectoryBase is not null)
         {
             if (exifDirectoryBase.TryGetDateTime(MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagDateTime, out checkDateTime))

Metadata/Models/Stateless/Base.cs

@@ -5,7 +5,7 @@ namespace View_by_Distance.Metadata.Models.Stateless.Methods;
 internal static class Base
 {
 
-    internal static string GetMaker(ExifDirectoryBase[]? exifBaseDirectories)
+    internal static string? GetMaker(ExifDirectoryBase[]? exifBaseDirectories)
     {
         string? result = null;
         if (exifBaseDirectories is not null)
@@ -23,12 +23,10 @@ internal static class Base
                 }
             }
         }
-        if (string.IsNullOrEmpty(result))
-            result = "Unknown";
         return result;
     }
 
-    internal static string GetModel(ExifDirectoryBase[]? exifBaseDirectories)
+    internal static string? GetModel(ExifDirectoryBase[]? exifBaseDirectories)
     {
         string? result = null;
         if (exifBaseDirectories is not null)
@@ -46,8 +44,6 @@ internal static class Base
                 }
             }
         }
-        if (string.IsNullOrEmpty(result))
-            result = "Unknown";
         return result;
     }
 

Metadata/Models/Stateless/Exif.cs

@@ -519,8 +519,12 @@ internal abstract class Exif
 
     internal static Shared.Models.ExifDirectory GetExifDirectory(Shared.Models.FilePath filePath)
     {
-        Shared.Models.ExifDirectory? result;
-        System.Drawing.Size? size = Dimensions.GetDimensions(filePath.FullName);
+        Shared.Models.ExifDirectory result;
+        System.Drawing.Size? size;
+        try
+        { size = Dimensions.GetDimensions(filePath.FullName); }
+        catch (Exception)
+        { size = null; }
         IReadOnlyList<MetadataExtractor.Directory> directories = ImageMetadataReader.ReadMetadata(filePath.FullName);
         result = Covert(filePath, size, directories);
         return result;

Metadata/Models/Stateless/Face.cs

@@ -35,6 +35,17 @@ internal static class Face
                 result = pngDirectory.TextualData[artist.Length..];
                 break;
             }
+            if (result is null)
+            {
+                const string author = "Author:";
+                foreach (PngDirectory pngDirectory in pngDirectories)
+                {
+                    if (pngDirectory.TextualData is null || !pngDirectory.TextualData.StartsWith(author))
+                        continue;
+                    result = pngDirectory.TextualData[author.Length..];
+                    break;
+                }
+            }
         }
         return result;
     }

Metadata/Models/Stateless/Methods/IMetadata.cs

@@ -19,14 +19,14 @@ public interface IMetadata
     static ExifDirectory GetExifDirectory(FilePath filePath) =>
         Exif.GetExifDirectory(filePath);
 
-    string TestStatic_GetMaker(ExifDirectory? exifDirectory) =>
+    string? TestStatic_GetMaker(ExifDirectory? exifDirectory) =>
         GetMaker(exifDirectory);
-    static string GetMaker(ExifDirectory? exifDirectory) =>
+    static string? GetMaker(ExifDirectory? exifDirectory) =>
         Base.GetMaker(exifDirectory?.ExifBaseDirectories);
 
-    string TestStatic_GetModel(ExifDirectory? exifDirectory) =>
+    string? TestStatic_GetModel(ExifDirectory? exifDirectory) =>
         GetModel(exifDirectory);
-    static string GetModel(ExifDirectory? exifDirectory) =>
+    static string? GetModel(ExifDirectory? exifDirectory) =>
         Base.GetModel(exifDirectory?.ExifBaseDirectories);
 
     string? TestStatic_GetOutputResolution(ExifDirectory? exifDirectory) =>

Mirror-Length/Models/Binder/AppSettings.cs

@@ -17,6 +17,23 @@ public class AppSettings
         return result;
     }
 
+    private static void PreVerify(IConfigurationRoot configurationRoot, AppSettings? appSettings)
+    {
+        if (appSettings?.Company is null)
+        {
+            List<string> paths = [];
+            foreach (IConfigurationProvider configurationProvider in configurationRoot.Providers)
+            {
+                if (configurationProvider is not Microsoft.Extensions.Configuration.Json.JsonConfigurationProvider jsonConfigurationProvider)
+                    continue;
+                if (jsonConfigurationProvider.Source.FileProvider is not Microsoft.Extensions.FileProviders.PhysicalFileProvider physicalFileProvider)
+                    continue;
+                paths.Add(physicalFileProvider.Root);
+            }
+            throw new NotSupportedException($"Not found!{Environment.NewLine}{string.Join(Environment.NewLine, paths.Distinct())}");
+        }
+    }
+
     private static Models.AppSettings Get(AppSettings? appSettings)
     {
         Models.AppSettings result;
@@ -40,7 +57,10 @@ public class AppSettings
     public static Models.AppSettings Get(IConfigurationRoot configurationRoot)
     {
         Models.AppSettings result;
+#pragma warning disable IL3050, IL2026
         AppSettings? appSettings = configurationRoot.Get<AppSettings>();
+#pragma warning restore IL3050, IL2026
+        PreVerify(configurationRoot, appSettings);
         result = Get(appSettings);
         return result;
     }

Mirror-Length/Models/Binder/Configuration.cs

@@ -7,13 +7,9 @@ namespace View_by_Distance.Mirror.Length.Models.Binder;
 public class Configuration
 {
 
-#nullable disable
-
-    public string[] IgnoreExtensions { get; set; }
-    public Property.Models.Configuration PropertyConfiguration { get; set; }
-    public string PersonBirthdayFormat { get; set; }
-
-#nullable restore
+    public string[]? IgnoreExtensions { get; set; }
+    public Property.Models.Configuration? PropertyConfiguration { get; set; }
+    public string? PersonBirthdayFormat { get; set; }
 
     public override string ToString()
     {
@@ -21,12 +17,30 @@ public class Configuration
         return result;
     }
 
+    private static void PreVerify(IConfigurationRoot configurationRoot, Configuration? configuration)
+    {
+        if (configuration?.IgnoreExtensions is null)
+        {
+            List<string> paths = [];
+            foreach (IConfigurationProvider configurationProvider in configurationRoot.Providers)
+            {
+                if (configurationProvider is not Microsoft.Extensions.Configuration.Json.JsonConfigurationProvider jsonConfigurationProvider)
+                    continue;
+                if (jsonConfigurationProvider.Source.FileProvider is not Microsoft.Extensions.FileProviders.PhysicalFileProvider physicalFileProvider)
+                    continue;
+                paths.Add(physicalFileProvider.Root);
+            }
+            throw new NotSupportedException($"Not found!{Environment.NewLine}{string.Join(Environment.NewLine, paths.Distinct())}");
+        }
+    }
+
     private static Models.Configuration Get(Configuration? configuration)
     {
         Models.Configuration result;
         if (configuration is null) throw new NullReferenceException(nameof(configuration));
         if (configuration.IgnoreExtensions is null) throw new NullReferenceException(nameof(configuration.IgnoreExtensions));
         if (configuration.PersonBirthdayFormat is null) throw new NullReferenceException(nameof(configuration.PersonBirthdayFormat));
+        if (configuration.PropertyConfiguration is null) throw new NullReferenceException(nameof(configuration.PropertyConfiguration));
         result = new(
             configuration.IgnoreExtensions,
             configuration.PersonBirthdayFormat,
@@ -39,14 +53,19 @@ public class Configuration
         Models.Configuration result;
         Configuration? configuration;
         if (isEnvironment is null)
+#pragma warning disable IL3050, IL2026
             configuration = configurationRoot.Get<Configuration>();
+#pragma warning restore IL3050, IL2026
         else
         {
             string environmentName = IsEnvironment.GetEnvironmentName(isEnvironment);
             string section = string.Concat(environmentName, ":", nameof(Configuration));
             IConfigurationSection configurationSection = configurationRoot.GetSection(section);
+#pragma warning disable IL3050, IL2026
             configuration = configurationSection.Get<Configuration>();
+#pragma warning restore IL3050, IL2026
         }
+        PreVerify(configurationRoot, configuration);
         result = Get(configuration);
         return result;
     }

Move-By-Id/Models/Binder/AppSettings.cs

@@ -23,6 +23,23 @@ public class AppSettings
         return result;
     }
 
+    private static void PreVerify(IConfigurationRoot configurationRoot, AppSettings? appSettings)
+    {
+        if (appSettings?.Company is null)
+        {
+            List<string> paths = [];
+            foreach (IConfigurationProvider configurationProvider in configurationRoot.Providers)
+            {
+                if (configurationProvider is not Microsoft.Extensions.Configuration.Json.JsonConfigurationProvider jsonConfigurationProvider)
+                    continue;
+                if (jsonConfigurationProvider.Source.FileProvider is not Microsoft.Extensions.FileProviders.PhysicalFileProvider physicalFileProvider)
+                    continue;
+                paths.Add(physicalFileProvider.Root);
+            }
+            throw new NotSupportedException($"Not found!{Environment.NewLine}{string.Join(Environment.NewLine, paths.Distinct())}");
+        }
+    }
+
     private static Models.AppSettings Get(AppSettings? appSettings)
     {
         Models.AppSettings result;
@@ -44,7 +61,10 @@ public class AppSettings
     public static Models.AppSettings Get(IConfigurationRoot configurationRoot)
     {
         Models.AppSettings result;
+#pragma warning disable IL3050, IL2026
         AppSettings? appSettings = configurationRoot.Get<AppSettings>();
+#pragma warning restore IL3050, IL2026
+        PreVerify(configurationRoot, appSettings);
         result = Get(appSettings);
         return result;
     }

Move-By-Id/Models/Binder/Configuration.cs

@@ -7,13 +7,9 @@ namespace View_by_Distance.Move.By.Id.Models.Binder;
 public class Configuration
 {
 
-#nullable disable
-
-    public string[] IgnoreExtensions { get; set; }
-    public Property.Models.Configuration PropertyConfiguration { get; set; }
-    public string PersonBirthdayFormat { get; set; }
-
-#nullable restore
+    public string[]? IgnoreExtensions { get; set; }
+    public Property.Models.Configuration? PropertyConfiguration { get; set; }
+    public string? PersonBirthdayFormat { get; set; }
 
     public override string ToString()
     {
@@ -21,12 +17,30 @@ public class Configuration
         return result;
     }
 
+    private static void PreVerify(IConfigurationRoot configurationRoot, Configuration? configuration)
+    {
+        if (configuration?.IgnoreExtensions is null)
+        {
+            List<string> paths = [];
+            foreach (IConfigurationProvider configurationProvider in configurationRoot.Providers)
+            {
+                if (configurationProvider is not Microsoft.Extensions.Configuration.Json.JsonConfigurationProvider jsonConfigurationProvider)
+                    continue;
+                if (jsonConfigurationProvider.Source.FileProvider is not Microsoft.Extensions.FileProviders.PhysicalFileProvider physicalFileProvider)
+                    continue;
+                paths.Add(physicalFileProvider.Root);
+            }
+            throw new NotSupportedException($"Not found!{Environment.NewLine}{string.Join(Environment.NewLine, paths.Distinct())}");
+        }
+    }
+
     private static Models.Configuration Get(Configuration? configuration)
     {
         Models.Configuration result;
         if (configuration is null) throw new NullReferenceException(nameof(configuration));
         if (configuration.IgnoreExtensions is null) throw new NullReferenceException(nameof(configuration.IgnoreExtensions));
         if (configuration.PersonBirthdayFormat is null) throw new NullReferenceException(nameof(configuration.PersonBirthdayFormat));
+        if (configuration.PropertyConfiguration is null) throw new NullReferenceException(nameof(configuration.PropertyConfiguration));
         result = new(
             configuration.IgnoreExtensions,
             configuration.PersonBirthdayFormat,
@@ -39,14 +53,19 @@ public class Configuration
         Models.Configuration result;
         Configuration? configuration;
         if (isEnvironment is null)
+#pragma warning disable IL3050, IL2026
             configuration = configurationRoot.Get<Configuration>();
+#pragma warning restore IL3050, IL2026
         else
         {
             string environmentName = IsEnvironment.GetEnvironmentName(isEnvironment);
             string section = string.Concat(environmentName, ":", nameof(Configuration));
             IConfigurationSection configurationSection = configurationRoot.GetSection(section);
+#pragma warning disable IL3050, IL2026
             configuration = configurationSection.Get<Configuration>();
+#pragma warning restore IL3050, IL2026
         }
+        PreVerify(configurationRoot, configuration);
         result = Get(configuration);
         return result;
     }

Move-By-Id/MoveById.cs

@@ -128,7 +128,7 @@ public class MoveById
                 if (filePath.IsIntelligentIdFormat || filePath.SortOrder is not null)
                     continue;
             }
-            (_, _, id, message) = Property.Models.Stateless.IProperty.Get(_PropertyConfiguration.PopulatePropertyId, fileHolder, isIgnoreExtension, isValidImageFormatExtension, asciiEncoding);
+            (_, _, id, message) = Property.Models.Stateless.IProperty.Get(_PropertyConfiguration, _PropertyConfiguration.PopulatePropertyId, fileHolder, isIgnoreExtension, isValidImageFormatExtension, asciiEncoding);
             if (id is null)
                 continue;
             matches = (from l in allFiles where l.Contains($"{id}{fileHolder.ExtensionLowered}") select l).ToArray();

Offset-Date-Time-Original/Models/Binder/AppSettings.cs

@@ -16,6 +16,23 @@ public class AppSettings
         return result;
     }
 
+    private static void PreVerify(IConfigurationRoot configurationRoot, AppSettings? appSettings)
+    {
+        if (appSettings?.Company is null)
+        {
+            List<string> paths = [];
+            foreach (IConfigurationProvider configurationProvider in configurationRoot.Providers)
+            {
+                if (configurationProvider is not Microsoft.Extensions.Configuration.Json.JsonConfigurationProvider jsonConfigurationProvider)
+                    continue;
+                if (jsonConfigurationProvider.Source.FileProvider is not Microsoft.Extensions.FileProviders.PhysicalFileProvider physicalFileProvider)
+                    continue;
+                paths.Add(physicalFileProvider.Root);
+            }
+            throw new NotSupportedException($"Not found!{Environment.NewLine}{string.Join(Environment.NewLine, paths.Distinct())}");
+        }
+    }
+
     private static Models.AppSettings Get(AppSettings? appSettings)
     {
         Models.AppSettings result;
@@ -36,7 +53,10 @@ public class AppSettings
     public static Models.AppSettings Get(IConfigurationRoot configurationRoot)
     {
         Models.AppSettings result;
+#pragma warning disable IL3050, IL2026
         AppSettings? appSettings = configurationRoot.Get<AppSettings>();
+#pragma warning restore IL3050, IL2026
+        PreVerify(configurationRoot, appSettings);
         result = Get(appSettings);
         return result;
     }

Offset-Date-Time-Original/Models/Binder/Configuration.cs

@@ -7,13 +7,9 @@ namespace View_by_Distance.Offset.Date.Time.Original.Models.Binder;
 public class Configuration
 {
 
-#nullable disable
-
-    public string[] IgnoreExtensions { get; set; }
-    public Property.Models.Configuration PropertyConfiguration { get; set; }
-    public string PersonBirthdayFormat { get; set; }
-
-#nullable restore
+    public string[]? IgnoreExtensions { get; set; }
+    public Property.Models.Configuration? PropertyConfiguration { get; set; }
+    public string? PersonBirthdayFormat { get; set; }
 
     public override string ToString()
     {
@@ -21,12 +17,30 @@ public class Configuration
         return result;
     }
 
+    private static void PreVerify(IConfigurationRoot configurationRoot, Configuration? configuration)
+    {
+        if (configuration?.IgnoreExtensions is null)
+        {
+            List<string> paths = [];
+            foreach (IConfigurationProvider configurationProvider in configurationRoot.Providers)
+            {
+                if (configurationProvider is not Microsoft.Extensions.Configuration.Json.JsonConfigurationProvider jsonConfigurationProvider)
+                    continue;
+                if (jsonConfigurationProvider.Source.FileProvider is not Microsoft.Extensions.FileProviders.PhysicalFileProvider physicalFileProvider)
+                    continue;
+                paths.Add(physicalFileProvider.Root);
+            }
+            throw new NotSupportedException($"Not found!{Environment.NewLine}{string.Join(Environment.NewLine, paths.Distinct())}");
+        }
+    }
+
     private static Models.Configuration Get(Configuration? configuration)
     {
         Models.Configuration result;
         if (configuration is null) throw new NullReferenceException(nameof(configuration));
         if (configuration.IgnoreExtensions is null) throw new NullReferenceException(nameof(configuration.IgnoreExtensions));
         if (configuration.PersonBirthdayFormat is null) throw new NullReferenceException(nameof(configuration.PersonBirthdayFormat));
+        if (configuration.PropertyConfiguration is null) throw new NullReferenceException(nameof(configuration.PropertyConfiguration));
         result = new(
             configuration.IgnoreExtensions,
             configuration.PersonBirthdayFormat,
@@ -39,14 +53,19 @@ public class Configuration
         Models.Configuration result;
         Configuration? configuration;
         if (isEnvironment is null)
+#pragma warning disable IL3050, IL2026
             configuration = configurationRoot.Get<Configuration>();
+#pragma warning restore IL3050, IL2026
         else
         {
             string environmentName = IsEnvironment.GetEnvironmentName(isEnvironment);
             string section = string.Concat(environmentName, ":", nameof(Configuration));
             IConfigurationSection configurationSection = configurationRoot.GetSection(section);
+#pragma warning disable IL3050, IL2026
             configuration = configurationSection.Get<Configuration>();
+#pragma warning restore IL3050, IL2026
         }
+        PreVerify(configurationRoot, configuration);
         result = Get(configuration);
         return result;
     }

Offset-Date-Time-Original/OffsetDateTimeOriginal.cs

@@ -85,7 +85,7 @@ public class OffsetDateTimeOriginal
             fileHolder = Shared.Models.Stateless.Methods.IFileHolder.Get(file);
             isValidImageFormatExtension = _PropertyConfiguration.ValidImageFormatExtensions.Contains(fileHolder.ExtensionLowered);
             isIgnoreExtension = isValidImageFormatExtension && _PropertyConfiguration.IgnoreExtensions.Contains(fileHolder.ExtensionLowered);
-            (dateTimeOriginal, dateTimes, id, message) = Property.Models.Stateless.IProperty.Get(_PropertyConfiguration.PopulatePropertyId, fileHolder, isIgnoreExtension, isValidImageFormatExtension, asciiEncoding);
+            (dateTimeOriginal, dateTimes, id, message) = Property.Models.Stateless.IProperty.Get(_PropertyConfiguration, _PropertyConfiguration.PopulatePropertyId, fileHolder, isIgnoreExtension, isValidImageFormatExtension, asciiEncoding);
             if (message is not null)
                 throw new Exception(message);
             if (id is null || dateTimeOriginal is null)
@@ -112,7 +112,7 @@ public class OffsetDateTimeOriginal
         string checkFile;
         PropertyItem? propertyItem;
         string? ticksDirectory = null;
-        int dateTimeOriginal = MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagDateTimeOriginal;
+        const int dateTimeOriginal = MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagDateTimeOriginal; // 36867
         for (int i = 0; i < int.MaxValue; i++)
         {
             ticksDirectory = Path.Combine(sourceDirectory, ticks.ToString());
@@ -141,7 +141,7 @@ public class OffsetDateTimeOriginal
             bitmap.SetPropertyItem(propertyItem);
             bitmap.Save(checkFile);
             bitmap.Dispose();
-            (_, _, id, message) = Property.Models.Stateless.IProperty.Get(_PropertyConfiguration.PopulatePropertyId, record.FileHolder, record.IsIgnoreExtension, record.IsValidImageFormatExtension, asciiEncoding);
+            (_, _, id, message) = Property.Models.Stateless.IProperty.Get(_PropertyConfiguration, _PropertyConfiguration.PopulatePropertyId, record.FileHolder, record.IsIgnoreExtension, record.IsValidImageFormatExtension, asciiEncoding);
             if (message is not null)
                 throw new Exception(message);
             if (id is null || id.Value != record.Id)
@@ -200,12 +200,12 @@ public class OffsetDateTimeOriginal
                         targetIsIgnoreExtension = targetIsValidImageFormatExtension && _PropertyConfiguration.IgnoreExtensions.Contains(targetFileHolder.ExtensionLowered);
                         DateTime minimumDateTime = DateTime.ParseExact(Path.GetFileName(minimumDirectory.First()), format, CultureInfo.InvariantCulture, DateTimeStyles.None);
                         DateTime maximumDateTime = DateTime.ParseExact(Path.GetFileName(maximumDirectory.First()), format, CultureInfo.InvariantCulture, DateTimeStyles.None).AddHours(23);
-                        (badDateTimeOriginal, badDateTimes, badId, badMessage) = Property.Models.Stateless.IProperty.Get(_PropertyConfiguration.PopulatePropertyId, badFileHolder, badIsIgnoreExtension, badIsValidImageFormatExtension, asciiEncoding);
+                        (badDateTimeOriginal, badDateTimes, badId, badMessage) = Property.Models.Stateless.IProperty.Get(_PropertyConfiguration, _PropertyConfiguration.PopulatePropertyId, badFileHolder, badIsIgnoreExtension, badIsValidImageFormatExtension, asciiEncoding);
                         if (badMessage is not null)
                             throw new Exception(badMessage);
                         if (badDateTimes.Length == 0 || badId is null)
                             throw new Exception(badMessage);
-                        (targetDateTimeOriginal, targetDateTimes, targetId, targetMessage) = Property.Models.Stateless.IProperty.Get(_PropertyConfiguration.PopulatePropertyId, targetFileHolder, targetIsIgnoreExtension, targetIsValidImageFormatExtension, asciiEncoding);
+                        (targetDateTimeOriginal, targetDateTimes, targetId, targetMessage) = Property.Models.Stateless.IProperty.Get(_PropertyConfiguration, _PropertyConfiguration.PopulatePropertyId, targetFileHolder, targetIsIgnoreExtension, targetIsValidImageFormatExtension, asciiEncoding);
                         if (targetMessage is not null)
                             throw new Exception(targetMessage);
                         if (targetDateTimes.Length == 0 || targetId is null)

PhotoPrism/Models/_F_PhotoPrism.cs

@@ -169,7 +169,7 @@ public class F_PhotoPrism
         }
     }
 
-    public static void WriteMatches(string fPhotoPrismContentDirectory, string personBirthdayFormat, float[] rectangleIntersectMinimums, long ticks, ReadOnlyCollection<Face> distinctFilteredFaces, Shared.Models.Methods.IMapLogic mapLogic)
+    public static void WriteMatches(string fPhotoPrismContentDirectory, string personBirthdayFormat, float[] rectangleIntersectMinimums, long ticks, ReadOnlyCollection<Face> distinctValidImageFaces, Shared.Models.Methods.IMapLogic mapLogic)
     {
         string file;
         string text;
@@ -189,7 +189,7 @@ public class F_PhotoPrism
         ReadOnlyDictionary<int, ReadOnlyCollection<PersonContainer>>? wholePercentagesToPersonContainers;
         (MappingFromPhotoPrism MappingFromPhotoPrism, Shared.Models.Marker Marker, float Percent)[] sortedCollection;
         List<(MappingFromPhotoPrism MappingFromPhotoPrism, Shared.Models.Marker Marker, float Percent)> collection = [];
-        foreach (Face face in distinctFilteredFaces)
+        foreach (Face face in distinctValidImageFaces)
         {
             collection.Clear();
             wholePercentages = face.Mapping?.MappingFromLocation?.WholePercentages;

PrepareForOld/Models/Binder/AppSettings.cs

@@ -20,6 +20,23 @@ public class AppSettings
         return result;
     }
 
+    private static void PreVerify(IConfigurationRoot configurationRoot, AppSettings? appSettings)
+    {
+        if (appSettings?.Company is null)
+        {
+            List<string> paths = [];
+            foreach (IConfigurationProvider configurationProvider in configurationRoot.Providers)
+            {
+                if (configurationProvider is not Microsoft.Extensions.Configuration.Json.JsonConfigurationProvider jsonConfigurationProvider)
+                    continue;
+                if (jsonConfigurationProvider.Source.FileProvider is not Microsoft.Extensions.FileProviders.PhysicalFileProvider physicalFileProvider)
+                    continue;
+                paths.Add(physicalFileProvider.Root);
+            }
+            throw new NotSupportedException($"Not found!{Environment.NewLine}{string.Join(Environment.NewLine, paths.Distinct())}");
+        }
+    }
+
     private static Models.AppSettings Get(AppSettings? appSettings)
     {
         Models.AppSettings result;
@@ -36,7 +53,10 @@ public class AppSettings
     public static Models.AppSettings Get(IConfigurationRoot configurationRoot)
     {
         Models.AppSettings result;
+#pragma warning disable IL3050, IL2026
         AppSettings? appSettings = configurationRoot.Get<AppSettings>();
+#pragma warning restore IL3050, IL2026
+        PreVerify(configurationRoot, appSettings);
         result = Get(appSettings);
         return result;
     }

PrepareForOld/Models/Binder/Configuration.cs

@@ -5,12 +5,8 @@ namespace View_by_Distance.PrepareForOld.Models.Binder;
 public class Configuration
 {
 
-#nullable disable
-
-    public Property.Models.Configuration PropertyConfiguration { get; set; }
-    public string[] Spelling { get; set; }
-
-#nullable restore
+    public Property.Models.Configuration? PropertyConfiguration { get; set; }
+    public string[]? Spelling { get; set; }
 
     public override string ToString()
     {

Property/Models/A_Property.cs

@@ -54,11 +54,11 @@ public class A_Property
         string angleBracket = _AngleBracketCollection[0];
         bool populateId = _Configuration.PopulatePropertyId;
         if (!item.IsUniqueFileName)
-            fileInfo = new(Path.Combine(angleBracket.Replace("<>", _PropertyConfiguration.ResultSingleton), $"{item.ImageFileHolder.NameWithoutExtension}{item.ImageFileHolder.ExtensionLowered}.json"));
+            fileInfo = new(Path.Combine(angleBracket.Replace("<>", _PropertyConfiguration.ResultSingleton), $"{item.FilePath.NameWithoutExtension}{item.FilePath.ExtensionLowered}.json"));
         else
         {
             (_, int directoryIndex) = Shared.Models.Stateless.Methods.IPath.GetDirectoryNameAndIndex(_PropertyConfiguration, item.FilePath);
-            fileInfo = new(Path.Combine(_FileGroups[_PropertyConfiguration.ResultSingleton][directoryIndex], $"{item.ImageFileHolder.NameWithoutExtension}{item.ImageFileHolder.ExtensionLowered}.json"));
+            fileInfo = new(Path.Combine(_FileGroups[_PropertyConfiguration.ResultSingleton][directoryIndex], $"{item.FilePath.NameWithoutExtension}{item.FilePath.ExtensionLowered}.json"));
         }
         List<DateTime> dateTimes = (from l in sourceDirectoryFileTuples where l is not null && changesFrom.Contains(l.Item1) select l.Item2).ToList();
         if (_Configuration.ForcePropertyLastWriteTimeToCreationTime && !fileInfo.Exists && File.Exists(Path.ChangeExtension(fileInfo.FullName, ".delete")))
@@ -99,19 +99,19 @@ public class A_Property
                     id = result?.Id;
                     result = null;
                 }
-                if (!isIgnoreExtension && item.IsValidImageFormatExtension && populateId && result is not null && result.LastWriteTime != item.ImageFileHolder.LastWriteTime)
+                if (!isIgnoreExtension && item.IsValidImageFormatExtension && populateId && result is not null && result.LastWriteTime.Ticks != item.FilePath.LastWriteTicks)
                 {
                     id = null;
                     result = null;
                 }
-                if (!isIgnoreExtension && item.IsValidImageFormatExtension && result?.Width is not null && result.Height is not null && result.Width.Value == result.Height.Value && item.ImageFileHolder.Exists)
+                if (!isIgnoreExtension && item.IsValidImageFormatExtension && result?.Width is not null && result.Height is not null && result.Width.Value == result.Height.Value)
                 {
                     id = result.Id;
                     result = null;
                     if (result?.Width is not null && result.Height is not null && result.Width.Value != result.Height.Value)
                         throw new Exception("Was square!");
                 }
-                if (!isIgnoreExtension && item.IsValidImageFormatExtension && result is not null && result.FileSize != item.ImageFileHolder.Length)
+                if (!isIgnoreExtension && item.IsValidImageFormatExtension && result is not null && result.FileSize != item.FilePath.Length)
                 {
                     id = result.Id;
                     result = null;
@@ -135,7 +135,7 @@ public class A_Property
         if (result is null)
         {
             id ??= item.FilePath.Id;
-            (_, _, result) = Stateless.Property.GetProperty(populateId, metadata, item.ImageFileHolder, result, isIgnoreExtension, item.IsValidImageFormatExtension, id, _ASCIIEncoding);
+            (_, _, result) = Stateless.Property.GetProperty(populateId, metadata, item.FilePath, result, isIgnoreExtension, item.IsValidImageFormatExtension, id, _ASCIIEncoding);
             json = JsonSerializer.Serialize(result, PropertyGenerationContext.Default.Property);
             if (populateId && Shared.Models.Stateless.Methods.IPath.WriteAllText(fileInfo.FullName, json, updateDateWhenMatches: true, compareBeforeWrite: true))
             {
@@ -183,10 +183,10 @@ public class A_Property
     {
         Shared.Models.Property property;
         List<string> parseExceptions = [];
-        bool isIgnoreExtension = item.IsValidImageFormatExtension && _PropertyConfiguration.IgnoreExtensions.Contains(item.ImageFileHolder.ExtensionLowered);
-        string filteredSourceDirectoryFileExtensionLowered = Path.Combine(sourceDirectory, $"{item.ImageFileHolder.NameWithoutExtension}{item.ImageFileHolder.ExtensionLowered}");
-        if (item.IsValidImageFormatExtension && item.ImageFileHolder.FullName.Length == filteredSourceDirectoryFileExtensionLowered.Length && item.ImageFileHolder.FullName != filteredSourceDirectoryFileExtensionLowered)
-            File.Move(item.ImageFileHolder.FullName, filteredSourceDirectoryFileExtensionLowered);
+        bool isIgnoreExtension = item.IsValidImageFormatExtension && _PropertyConfiguration.IgnoreExtensions.Contains(item.FilePath.ExtensionLowered);
+        string filteredSourceDirectoryFileExtensionLowered = Path.Combine(sourceDirectory, $"{item.FilePath.NameWithoutExtension}{item.FilePath.ExtensionLowered}");
+        if (item.IsValidImageFormatExtension && item.FilePath.FullName.Length == filteredSourceDirectoryFileExtensionLowered.Length && item.FilePath.FullName != filteredSourceDirectoryFileExtensionLowered)
+            File.Move(item.FilePath.FullName, filteredSourceDirectoryFileExtensionLowered);
         if (item.FileSizeChanged is null || item.FileSizeChanged.Value || item.LastWriteTimeChanged is null || item.LastWriteTimeChanged.Value || item.Property is null)
         {
             property = GetImageProperty(metadata, item, sourceDirectoryFileTuples, parseExceptions, isIgnoreExtension);
@@ -209,7 +209,7 @@ public class A_Property
         SetAngleBracketCollection(aResultsFullGroupDirectory, sourceDirectory, anyNullOrNoIsUniqueFileName);
     }
 
-    private void SavePropertyParallelWork(int maxDegreeOfParallelism, Shared.Models.Methods.IMetadata<MetadataExtractor.Directory> metadata, List<Exception> exceptions, List<Tuple<string, DateTime>> sourceDirectoryChanges, Container container, List<Item> items, string message)
+    private void SavePropertyParallelWork(int maxDegreeOfParallelism, Shared.Models.Methods.IMetadata<MetadataExtractor.Directory> metadata, List<Exception> exceptions, List<Tuple<string, DateTime>> sourceDirectoryChanges, Container container, ReadOnlyCollection<Item> items, string message)
     {
         List<Tuple<string, DateTime>> sourceDirectoryFileTuples = [];
         ParallelOptions parallelOptions = new() { MaxDegreeOfParallelism = maxDegreeOfParallelism };
@@ -277,11 +277,11 @@ public class A_Property
         bool angleBracketCollectionAny = _AngleBracketCollection.Count != 0;
         if (!angleBracketCollectionAny)
         {
-            if (item.ImageFileHolder.DirectoryName is null)
-                throw new NullReferenceException(nameof(item.ImageFileHolder.DirectoryName));
-            SetAngleBracketCollection(item.ImageFileHolder.DirectoryName, !item.IsUniqueFileName);
+            if (item.FilePath.DirectoryName is null)
+                throw new NullReferenceException(nameof(item.FilePath.DirectoryName));
+            SetAngleBracketCollection(item.FilePath.DirectoryName, !item.IsUniqueFileName);
         }
-        bool isIgnoreExtension = item.IsValidImageFormatExtension && _PropertyConfiguration.IgnoreExtensions.Contains(item.ImageFileHolder.ExtensionLowered);
+        bool isIgnoreExtension = item.IsValidImageFormatExtension && _PropertyConfiguration.IgnoreExtensions.Contains(item.FilePath.ExtensionLowered);
         result = GetImageProperty(metadata, item, sourceDirectoryFileTuples, parseExceptions, isIgnoreExtension);
         if (!angleBracketCollectionAny)
             _AngleBracketCollection.Clear();

Property/Models/Binder/Configuration.cs

@@ -39,6 +39,23 @@ public class Configuration
         return result;
     }
 
+    private static void PreVerify(IConfigurationRoot configurationRoot, Configuration? configuration)
+    {
+        if (configuration?.DateGroup is null)
+        {
+            List<string> paths = [];
+            foreach (IConfigurationProvider configurationProvider in configurationRoot.Providers)
+            {
+                if (configurationProvider is not Microsoft.Extensions.Configuration.Json.JsonConfigurationProvider jsonConfigurationProvider)
+                    continue;
+                if (jsonConfigurationProvider.Source.FileProvider is not Microsoft.Extensions.FileProviders.PhysicalFileProvider physicalFileProvider)
+                    continue;
+                paths.Add(physicalFileProvider.Root);
+            }
+            throw new NotSupportedException($"Not found!{Environment.NewLine}{string.Join(Environment.NewLine, paths.Distinct())}");
+        }
+    }
+
     private static Models.Configuration Get(Configuration? configuration)
     {
         Models.Configuration result;
@@ -101,15 +118,19 @@ public class Configuration
         Models.Configuration result;
         Configuration? configuration;
         if (isEnvironment is null)
+#pragma warning disable IL3050, IL2026
             configuration = configurationRoot.Get<Configuration>();
+#pragma warning restore IL3050, IL2026
         else
         {
             string environmentName = IsEnvironment.GetEnvironmentName(isEnvironment);
             string section = string.Concat(environmentName, ":", nameof(Configuration));
             IConfigurationSection configurationSection = configurationRoot.GetSection(section);
+#pragma warning disable IL3050, IL2026
             configuration = configurationSection.Get<Configuration>();
+#pragma warning restore IL3050, IL2026
         }
-        if (configuration is null) throw new NullReferenceException(nameof(configuration));
+        PreVerify(configurationRoot, configuration);
         result = Get(configuration);
         return result;
     }

Property/Models/Stateless/IProperty.cs

@@ -1,7 +1,9 @@
 using System.Drawing.Imaging;
 using System.Reflection;
 using System.Text;
+using View_by_Distance.Shared.Models;
 using View_by_Distance.Shared.Models.Methods;
+using View_by_Distance.Shared.Models.Properties;
 
 namespace View_by_Distance.Property.Models.Stateless;
 
@@ -28,19 +30,29 @@ public interface IProperty
     static PropertyItem GetPropertyItem(ConstructorInfo constructorInfo, int id, short type, string value) =>
         Property.GetPropertyItem(constructorInfo, id, type, value);
 
-    (string?, DateTime[], Shared.Models.Property) TestStatic_GetProperty(bool populateId, IMetadata<MetadataExtractor.Directory>? metadata, Shared.Models.FileHolder fileHolder, Shared.Models.Property? property, bool isIgnoreExtension, bool isValidImageFormatExtension, int? id, ASCIIEncoding asciiEncoding) =>
-        GetProperty(populateId, metadata, fileHolder, property, isIgnoreExtension, isValidImageFormatExtension, id, asciiEncoding);
-    static (string?, DateTime[], Shared.Models.Property) GetProperty(bool populateId, IMetadata<MetadataExtractor.Directory>? metadata, Shared.Models.FileHolder fileHolder, Shared.Models.Property? property, bool isIgnoreExtension, bool isValidImageFormatExtension, int? id, ASCIIEncoding asciiEncoding) =>
-        Property.GetProperty(populateId, metadata, fileHolder, property, isIgnoreExtension, isValidImageFormatExtension, id, asciiEncoding);
+    (string?, DateTime[], Shared.Models.Property) TestStatic_GetProperty(bool populateId, IMetadata<MetadataExtractor.Directory>? metadata, FilePath filePath, Shared.Models.Property? property, bool isIgnoreExtension, bool isValidImageFormatExtension, int? id, ASCIIEncoding asciiEncoding) =>
+        GetProperty(populateId, metadata, filePath, property, isIgnoreExtension, isValidImageFormatExtension, id, asciiEncoding);
+    static (string?, DateTime[], Shared.Models.Property) GetProperty(bool populateId, IMetadata<MetadataExtractor.Directory>? metadata, FilePath filePath, Shared.Models.Property? property, bool isIgnoreExtension, bool isValidImageFormatExtension, int? id, ASCIIEncoding asciiEncoding) =>
+        Property.GetProperty(populateId, metadata, filePath, property, isIgnoreExtension, isValidImageFormatExtension, id, asciiEncoding);
 
-    (DateTime?, DateTime[], int?, string?) TestStatic_Get(bool populateId, Shared.Models.FileHolder fileHolder, bool isIgnoreExtension, bool isValidImageFormatExtension, ASCIIEncoding asciiEncoding) =>
-        Get(populateId, fileHolder, isIgnoreExtension, isValidImageFormatExtension, asciiEncoding);
-    static (DateTime?, DateTime[], int?, string?) Get(bool populateId, Shared.Models.FileHolder fileHolder, bool isIgnoreExtension, bool isValidImageFormatExtension, ASCIIEncoding asciiEncoding) =>
-        Property.Get(populateId, null, fileHolder, isIgnoreExtension, isValidImageFormatExtension, asciiEncoding);
+    (DateTime?, DateTime[], int?, string?) TestStatic_Get(IPropertyConfiguration propertyConfiguration, bool populateId, FileHolder fileHolder, bool isIgnoreExtension, bool isValidImageFormatExtension, ASCIIEncoding asciiEncoding) =>
+        Get(propertyConfiguration, populateId, fileHolder, isIgnoreExtension, isValidImageFormatExtension, asciiEncoding);
+    static (DateTime?, DateTime[], int?, string?) Get(IPropertyConfiguration propertyConfiguration, bool populateId, FileHolder fileHolder, bool isIgnoreExtension, bool isValidImageFormatExtension, ASCIIEncoding asciiEncoding) =>
+        Property.Get(populateId, null, FilePath.Get(propertyConfiguration, fileHolder, index: null), isIgnoreExtension, isValidImageFormatExtension, asciiEncoding);
 
-    (DateTime?, DateTime[], int?, string?) TestStatic_Get(bool populateId, IMetadata<MetadataExtractor.Directory>? metadata, Shared.Models.FileHolder fileHolder, bool isIgnoreExtension, bool isValidImageFormatExtension, ASCIIEncoding asciiEncoding) =>
-        Get(populateId, metadata, fileHolder, isIgnoreExtension, isValidImageFormatExtension, asciiEncoding);
-    static (DateTime?, DateTime[], int?, string?) Get(bool populateId, IMetadata<MetadataExtractor.Directory>? metadata, Shared.Models.FileHolder fileHolder, bool isIgnoreExtension, bool isValidImageFormatExtension, ASCIIEncoding asciiEncoding) =>
-        Property.Get(populateId, metadata, fileHolder, isIgnoreExtension, isValidImageFormatExtension, asciiEncoding);
+    (DateTime?, DateTime[], int?, string?) TestStatic_Get(bool populateId, FilePath filePath, bool isIgnoreExtension, bool isValidImageFormatExtension, ASCIIEncoding asciiEncoding) =>
+        Get(populateId, filePath, isIgnoreExtension, isValidImageFormatExtension, asciiEncoding);
+    static (DateTime?, DateTime[], int?, string?) Get(bool populateId, FilePath filePath, bool isIgnoreExtension, bool isValidImageFormatExtension, ASCIIEncoding asciiEncoding) =>
+        Property.Get(populateId, null, filePath, isIgnoreExtension, isValidImageFormatExtension, asciiEncoding);
+
+    (DateTime?, DateTime[], int?, string?) TestStatic_Get(bool populateId, IMetadata<MetadataExtractor.Directory>? metadata, FilePath filePath, bool isIgnoreExtension, bool isValidImageFormatExtension, ASCIIEncoding asciiEncoding) =>
+        Get(populateId, metadata, filePath, isIgnoreExtension, isValidImageFormatExtension, asciiEncoding);
+    static (DateTime?, DateTime[], int?, string?) Get(bool populateId, IMetadata<MetadataExtractor.Directory>? metadata, FilePath filePath, bool isIgnoreExtension, bool isValidImageFormatExtension, ASCIIEncoding asciiEncoding) =>
+        Property.Get(populateId, metadata, filePath, isIgnoreExtension, isValidImageFormatExtension, asciiEncoding);
+
+    (DateTime?, DateTime[], int?, string?) TestStatic_Get(IPropertyConfiguration propertyConfiguration, bool populateId, IMetadata<MetadataExtractor.Directory>? metadata, FileHolder fileHolder, bool isIgnoreExtension, bool isValidImageFormatExtension, ASCIIEncoding asciiEncoding) =>
+        Get(propertyConfiguration, populateId, metadata, fileHolder, isIgnoreExtension, isValidImageFormatExtension, asciiEncoding);
+    static (DateTime?, DateTime[], int?, string?) Get(IPropertyConfiguration propertyConfiguration, bool populateId, IMetadata<MetadataExtractor.Directory>? metadata, FileHolder fileHolder, bool isIgnoreExtension, bool isValidImageFormatExtension, ASCIIEncoding asciiEncoding) =>
+        Property.Get(populateId, metadata, FilePath.Get(propertyConfiguration, fileHolder, index: null), isIgnoreExtension, isValidImageFormatExtension, asciiEncoding);
 
 }

Property/Models/Stateless/Property.cs

@@ -47,10 +47,10 @@ internal partial class Property
         return results;
     }
 
-    private static List<DateTime> GetDateTimes(FileHolder fileHolder, DateTime?[] dateTimes)
+    private static List<DateTime> GetDateTimes(FilePath filePath, DateTime?[] dateTimes)
     {
         List<DateTime> results = [];
-        string[] digits = Digit().Split(fileHolder.FullName);
+        string[] digits = Digit().Split(filePath.FullName);
         foreach (string digit in digits)
         {
             if (digit.Length != 4 || digit[..2] is not "19" and not "20" || !int.TryParse(digit, out int year))
@@ -75,7 +75,7 @@ internal partial class Property
         return results;
     }
 
-    internal static DateTime? GetDateTimeFromName(FileHolder fileHolder)
+    internal static DateTime? GetDateTimeFromName(FilePath filePath)
     {
         DateTime? result = null;
         int length;
@@ -90,7 +90,7 @@ internal partial class Property
             [string.Empty, "yyyyMMdd_", ticksExample],
             [string.Empty, "yyyy-MM-dd_", ticksExample],
             [string.Empty, "yyyy-MM-dd.", ticksExample],
-            [string.Empty, "yyyy-MM-dd.", $"{ticksExample}.{fileHolder.Length}"],
+            [string.Empty, "yyyy-MM-dd.", $"{ticksExample}.{filePath.Length}"],
             [string.Empty, "yyyy-MM-dd HH.mm.ss", string.Empty],
             [string.Empty, "yyyyMMdd_HHmmss", "_LLS"],
             [string.Empty, "yyyyMMdd_HHmmss", "_HDR"],
@@ -106,17 +106,17 @@ internal partial class Property
             if (dateFormat.Length != 3)
                 throw new Exception();
             fullFormat = string.Join(string.Empty, dateFormat);
-            if (fileHolder.NameWithoutExtension.Length != fullFormat.Length)
+            if (filePath.NameWithoutExtension.Length != fullFormat.Length)
                 continue;
             format = dateFormat[1];
             length = dateFormat[0].Length + dateFormat[1].Length;
             for (int i = dateFormat[0].Length; i < length; i++)
-                _ = value.Append(fileHolder.NameWithoutExtension[i]);
+                _ = value.Append(filePath.NameWithoutExtension[i]);
             if (value.Length != format.Length)
                 continue;
             if (DateTime.TryParseExact(value.ToString(), format, CultureInfo.InvariantCulture, DateTimeStyles.None, out DateTime checkDateTime))
             {
-                if (fileHolder.NameWithoutExtension.Length < ticksExample.Length || !long.TryParse(fileHolder.NameWithoutExtension[^ticksExample.Length..], out long ticks))
+                if (filePath.NameWithoutExtension.Length < ticksExample.Length || !long.TryParse(filePath.NameWithoutExtension[^ticksExample.Length..], out long ticks))
                     result = checkDateTime;
                 else
                     result = new DateTime(ticks);
@@ -183,12 +183,11 @@ internal partial class Property
 
 #pragma warning disable CA1416
 
-    internal static (string?, DateTime[], Shared.Models.Property) GetProperty(bool populateId, IMetadata<MetadataExtractor.Directory>? metadata, FileHolder fileHolder, Shared.Models.Property? property, bool isIgnoreExtension, bool isValidImageFormatExtension, int? id, ASCIIEncoding asciiEncoding)
+    internal static (string?, DateTime[], Shared.Models.Property) GetProperty(bool populateId, IMetadata<MetadataExtractor.Directory>? metadata, FilePath filePath, Shared.Models.Property? property, bool isIgnoreExtension, bool isValidImageFormatExtension, int? id, ASCIIEncoding asciiEncoding)
     {
         Shared.Models.Property result;
         byte[] bytes;
         string value;
-        long fileLength;
         string? message;
         int? width = null;
         int? height = null;
@@ -206,27 +205,27 @@ internal partial class Property
         DateTime? dateTimeOriginal = null;
         DateTime? dateTimeDigitized = null;
         DateTime? dateTimeOriginalByLogic = null;
-        DateTime? dateTimeFromName = GetDateTimeFromName(fileHolder);
-        if (!isValidImageFormatExtension && fileHolder.Exists && metadata is not null)
+        DateTime? dateTimeFromName = GetDateTimeFromName(filePath);
+        if (!isValidImageFormatExtension && metadata is not null)
         {
             try
             {
-                IReadOnlyList<MetadataExtractor.Directory> directories = MetadataExtractor.ImageMetadataReader.ReadMetadata(fileHolder.FullName);
-                (dateTimeOriginalByLogic, DateTime?[] metadataDateTimes) = metadata.GetDateTimes(fileHolder, directories);
+                IReadOnlyList<MetadataExtractor.Directory> directories = MetadataExtractor.ImageMetadataReader.ReadMetadata(filePath.FullName);
+                (dateTimeOriginalByLogic, DateTime?[] metadataDateTimes) = metadata.GetDateTimes(filePath, directories);
                 dateTimesByLogic = GetDateTimes(metadataDateTimes);
                 message = null;
             }
             catch (Exception)
             {
                 dateTimesByLogic = [];
-                message = string.Concat(new StackFrame().GetMethod()?.Name, " <", fileHolder.FullName, ">");
+                message = string.Concat(new StackFrame().GetMethod()?.Name, " <", filePath.FullName, ">");
             }
         }
-        else if (!isIgnoreExtension && isValidImageFormatExtension && fileHolder.Exists)
+        else if (!isIgnoreExtension && isValidImageFormatExtension)
         {
             try
             {
-                using Image image = Image.FromFile(fileHolder.FullName);
+                using Image image = Image.FromFile(filePath.FullName);
                 width = image.Width;
                 height = image.Height;
                 if (populateId && id is null)
@@ -320,51 +319,41 @@ internal partial class Property
                     }
                 }
                 message = null;
-                dateTimes = [fileHolder.LastWriteTime, fileHolder.CreationTime, dateTime, dateTimeDigitized, dateTimeOriginal, gpsDateStamp];
+                dateTimes = [new(filePath.LastWriteTicks), new(filePath.CreationTicks), dateTime, dateTimeDigitized, dateTimeOriginal, gpsDateStamp];
             }
             catch (Exception)
             {
                 dateTimes = [];
-                message = string.Concat(new StackFrame().GetMethod()?.Name, " <", fileHolder.FullName, ">");
+                message = string.Concat(new StackFrame().GetMethod()?.Name, " <", filePath.FullName, ">");
             }
             if (metadata is not null && dateTimeOriginal is null)
             {
                 try
                 {
-                    IReadOnlyList<MetadataExtractor.Directory> directories = MetadataExtractor.ImageMetadataReader.ReadMetadata(fileHolder.FullName);
-                    (dateTimeOriginalByLogic, DateTime?[] metadataDateTimes) = metadata.GetDateTimes(fileHolder, directories);
+                    IReadOnlyList<MetadataExtractor.Directory> directories = MetadataExtractor.ImageMetadataReader.ReadMetadata(filePath.FullName);
+                    (dateTimeOriginalByLogic, DateTime?[] metadataDateTimes) = metadata.GetDateTimes(filePath, directories);
                     dateTimesByLogic = GetDateTimes(dateTimes, metadataDateTimes);
                     message = null;
                 }
-                catch (Exception) { message = string.Concat(new StackFrame().GetMethod()?.Name, " <", fileHolder.FullName, ">"); }
+                catch (Exception) { message = string.Concat(new StackFrame().GetMethod()?.Name, " <", filePath.FullName, ">"); }
             }
             if (dateTimeFromName is null)
-                (dateTimeOriginalByLogic, dateTimesByLogic) = (dateTimeOriginal, GetDateTimes(fileHolder, dateTimes));
+                (dateTimeOriginalByLogic, dateTimesByLogic) = (dateTimeOriginal, GetDateTimes(filePath, dateTimes));
             else
                 (dateTimeOriginalByLogic, dateTimesByLogic) = (dateTimeOriginal, GetDateTimes(dateTimeFromName.Value, dateTimes));
         }
         else
             (message, dateTimeOriginalByLogic, dateTimesByLogic) = (null, null, []);
-        if (fileHolder.Length is null)
-            fileLength = 0;
+        if (property is not null)
+            result = new(property.CreationTime, dateTime, dateTimeDigitized, dateTimeFromName, dateTimeOriginalByLogic, filePath.Length, gpsDateStamp, height, id, keywords, property.LastWriteTime, make, model, orientation?.ToString(), width);
         else
-            fileLength = fileHolder.Length.Value;
-        if (fileHolder.CreationTime is null && property?.CreationTime is null)
-            throw new NullReferenceException(nameof(fileHolder.CreationTime));
-        if (fileHolder.LastWriteTime is null && property?.LastWriteTime is null)
-            throw new NullReferenceException(nameof(fileHolder.LastWriteTime));
-        if (fileHolder.CreationTime is not null && fileHolder.LastWriteTime is not null)
-            result = new(fileHolder.CreationTime.Value, dateTime, dateTimeDigitized, dateTimeFromName, dateTimeOriginalByLogic, fileLength, gpsDateStamp, height, id, keywords, fileHolder.LastWriteTime.Value, make, model, orientation?.ToString(), width);
-        else if (property is not null)
-            result = new(property.CreationTime, dateTime, dateTimeDigitized, dateTimeFromName, dateTimeOriginalByLogic, fileLength, gpsDateStamp, height, id, keywords, property.LastWriteTime, make, model, orientation?.ToString(), width);
-        else
-            throw new NullReferenceException(nameof(property));
+            result = new(new(filePath.CreationTicks), dateTime, dateTimeDigitized, dateTimeFromName, dateTimeOriginalByLogic, filePath.Length, gpsDateStamp, height, id, keywords, new(filePath.LastWriteTicks), make, model, orientation?.ToString(), width);
         return (message, dateTimesByLogic.ToArray(), result);
     }
 
 #pragma warning restore CA1416
 
-    internal static (DateTime?, DateTime[], int?, string?) Get(bool populateId, IMetadata<MetadataExtractor.Directory>? metadata, FileHolder fileHolder, bool isIgnoreExtension, bool isValidImageFormatExtension, ASCIIEncoding asciiEncoding)
+    internal static (DateTime?, DateTime[], int?, string?) Get(bool populateId, IMetadata<MetadataExtractor.Directory>? metadata, FilePath filePath, bool isIgnoreExtension, bool isValidImageFormatExtension, ASCIIEncoding asciiEncoding)
     {
         int? id = null;
         string? message;
@@ -373,7 +362,7 @@ internal partial class Property
         if (isIgnoreExtension || !isValidImageFormatExtension)
             (message, dateTimes, property) = (null, [], null);
         else
-            (message, dateTimes, property) = GetProperty(populateId, metadata, fileHolder, property, isIgnoreExtension, isValidImageFormatExtension, id, asciiEncoding);
+            (message, dateTimes, property) = GetProperty(populateId, metadata, filePath, property, isIgnoreExtension, isValidImageFormatExtension, id, asciiEncoding);
         return new(property?.DateTimeOriginal, dateTimes, property?.Id, message);
     }
 

Rename/Models/Binder/AppSettings.cs

@@ -21,6 +21,23 @@ public class AppSettings
         return result;
     }
 
+    private static void PreVerify(IConfigurationRoot configurationRoot, AppSettings? appSettings)
+    {
+        if (appSettings?.Company is null)
+        {
+            List<string> paths = [];
+            foreach (IConfigurationProvider configurationProvider in configurationRoot.Providers)
+            {
+                if (configurationProvider is not Microsoft.Extensions.Configuration.Json.JsonConfigurationProvider jsonConfigurationProvider)
+                    continue;
+                if (jsonConfigurationProvider.Source.FileProvider is not Microsoft.Extensions.FileProviders.PhysicalFileProvider physicalFileProvider)
+                    continue;
+                paths.Add(physicalFileProvider.Root);
+            }
+            throw new NotSupportedException($"Not found!{Environment.NewLine}{string.Join(Environment.NewLine, paths.Distinct())}");
+        }
+    }
+
     private static Models.AppSettings Get(AppSettings? appSettings)
     {
         Models.AppSettings result;
@@ -49,6 +66,7 @@ public class AppSettings
 #pragma warning disable IL3050, IL2026
         AppSettings? appSettings = configurationRoot.Get<AppSettings>();
 #pragma warning restore IL3050, IL2026
+        PreVerify(configurationRoot, appSettings);
         result = Get(appSettings);
         return result;
     }

Rename/Models/Binder/Configuration.cs

@@ -18,6 +18,23 @@ public class Configuration
         return result;
     }
 
+    private static void PreVerify(IConfigurationRoot configurationRoot, Configuration? configuration)
+    {
+        if (configuration?.ForceMetadataLastWriteTimeToCreationTime is null)
+        {
+            List<string> paths = [];
+            foreach (IConfigurationProvider configurationProvider in configurationRoot.Providers)
+            {
+                if (configurationProvider is not Microsoft.Extensions.Configuration.Json.JsonConfigurationProvider jsonConfigurationProvider)
+                    continue;
+                if (jsonConfigurationProvider.Source.FileProvider is not Microsoft.Extensions.FileProviders.PhysicalFileProvider physicalFileProvider)
+                    continue;
+                paths.Add(physicalFileProvider.Root);
+            }
+            throw new NotSupportedException($"Not found!{Environment.NewLine}{string.Join(Environment.NewLine, paths.Distinct())}");
+        }
+    }
+
     private static Models.Configuration Get(Configuration? configuration, Property.Models.Configuration propertyConfiguration)
     {
         Models.Configuration result;
@@ -39,14 +56,19 @@ public class Configuration
         Models.Configuration result;
         Configuration? configuration;
         if (isEnvironment is null)
+#pragma warning disable IL3050, IL2026
             configuration = configurationRoot.Get<Configuration>();
+#pragma warning restore IL3050, IL2026
         else
         {
             string environmentName = IsEnvironment.GetEnvironmentName(isEnvironment);
             string section = string.Concat(environmentName, ":", nameof(Configuration));
             IConfigurationSection configurationSection = configurationRoot.GetSection(section);
+#pragma warning disable IL3050, IL2026
             configuration = configurationSection.Get<Configuration>();
+#pragma warning restore IL3050, IL2026
         }
+        PreVerify(configurationRoot, configuration);
         result = Get(configuration, propertyConfiguration);
         return result;
     }

Rename/Rename.cs

@@ -268,7 +268,7 @@ public class Rename
                 if (fileHolder.DirectoryName is null)
                     continue;
             }
-            (dateTimeOriginal, dateTimes, id, message) = Property.Models.Stateless.IProperty.Get(_PropertyConfiguration.PopulatePropertyId, metadata, fileHolder, isIgnoreExtension, isValidImageFormatExtension, asciiEncoding);
+            (dateTimeOriginal, dateTimes, id, message) = Property.Models.Stateless.IProperty.Get(_PropertyConfiguration, _PropertyConfiguration.PopulatePropertyId, metadata, fileHolder, isIgnoreExtension, isValidImageFormatExtension, asciiEncoding);
             if (ffmpegFiles is not null)
             {
                 fileHolder = Shared.Models.Stateless.Methods.IFileHolder.Get(files[i]);
@@ -402,7 +402,7 @@ public class Rename
             {
                 if (record.Id is null)
                     continue;
-                paddedId = IId.GetPaddedId(_PropertyConfiguration, record.Index, record.Id.Value);
+                paddedId = IId.GetPaddedId(_PropertyConfiguration, record.Id.Value, ignore: null, record.Index);
                 checkFileExtension = fileHolder.ExtensionLowered == jpeg ? jpg : fileHolder.ExtensionLowered;
                 checkFile = Path.Combine(seasonDirectory, $"{paddedId}{checkFileExtension}");
                 if (checkFile == fileHolder.FullName)

Resize/Models/_C_Resize.cs

@@ -193,7 +193,7 @@ public class C_Resize
     {
         Bitmap bitmap;
         int outputResolutionWidth = resize[_OutputResolutionWidthIndex];
-        using Bitmap temp = new(mappingFromItem.ImageFileHolder.FullName, useIcm: false);
+        using Bitmap temp = new(mappingFromItem.FilePath.FullName, useIcm: false);
         int outputResolutionHeight = resize[_OutputResolutionHeightIndex];
         PropertyItem[] propertyItems = temp.PropertyItems;
         int outputResolutionOrientation = resize[_OutputResolutionOrientationIndex];
@@ -236,7 +236,7 @@ public class C_Resize
     private void SaveResizedSubfile5(MappingFromItem mappingFromItem, int[] resize, byte[] bytes)
     {
         Bitmap bitmap;
-        using Bitmap temp = new(mappingFromItem.ImageFileHolder.FullName, useIcm: false);
+        using Bitmap temp = new(mappingFromItem.FilePath.FullName, useIcm: false);
         PropertyItem[] propertyItems = temp.PropertyItems;
         int tempResolutionWidth = resize[_TempResolutionWidth];
         int tempResolutionHeight = resize[_TempResolutionHeight];
@@ -312,10 +312,12 @@ public class C_Resize
     {
         if (mappingFromItem.ResizedFileHolder is null)
             throw new NullReferenceException(nameof(mappingFromItem.ResizedFileHolder));
+#pragma warning disable CA1854
         if (!outputResolutionToResize.ContainsKey(_Original))
             throw new Exception();
         if (!outputResolutionToResize.ContainsKey(outputResolution))
             throw new Exception();
+#pragma warning restore CA1854
         FileInfo fileInfo = new(mappingFromItem.ResizedFileHolder.FullName);
         bool check = false;
         int[] resize = outputResolutionToResize[outputResolution];
@@ -337,7 +339,7 @@ public class C_Resize
             {
                 // if (fileInfo.Exists)
                 //     File.Delete(fileInfo.FullName);
-                // File.Copy(mappingFromItem.ImageFileHolder.FullName, fileInfo.FullName);
+                // File.Copy(mappingFromItem.FilePath.FullName, fileInfo.FullName);
                 // item.SetResizedFileHolder(_FileNameExtension, Shared.Models.Stateless.Methods.IFileHolder.Refresh(mappingFromItem.ResizedFileHolder));
                 // subFileTuples.Add(new Tuple<string, DateTime>(nameof(C_Resize), DateTime.Now));
             }
@@ -429,10 +431,10 @@ public class C_Resize
     }
 
     public FileHolder GetResizedFileHolder(string cResultsFullGroupDirectory, Item item, bool outputResolutionHasNumber) =>
-        GetResizedFileHolder(cResultsFullGroupDirectory, item.FilePath, outputResolutionHasNumber, item.ImageFileHolder.Name);
+        GetResizedFileHolder(cResultsFullGroupDirectory, item.FilePath, outputResolutionHasNumber, item.FilePath.Name);
 
     public FileHolder GetResizedFileHolder(string cResultsFullGroupDirectory, Item item, bool outputResolutionHasNumber, int id) =>
-        GetResizedFileHolder(cResultsFullGroupDirectory, item.FilePath, outputResolutionHasNumber, $"{id}{item.ImageFileHolder.ExtensionLowered}");
+        GetResizedFileHolder(cResultsFullGroupDirectory, item.FilePath, outputResolutionHasNumber, $"{id}{item.FilePath.ExtensionLowered}");
 
     public Dictionary<string, int[]> GetResizeKeyValuePairs(Configuration configuration, string cResultsFullGroupDirectory, FilePath filePath, List<Tuple<string, DateTime>> subFileTuples, List<string> parseExceptions, Shared.Models.Property property, MappingFromItem mappingFromItem)
     {
@@ -441,7 +443,7 @@ public class C_Resize
         string[] changesFrom = [nameof(A_Property), nameof(B_Metadata)];
         List<DateTime> dateTimes = (from l in subFileTuples where changesFrom.Contains(l.Item1) select l.Item2).ToList();
         (_, int directoryIndex) = Shared.Models.Stateless.Methods.IPath.GetDirectoryNameAndIndex(_PropertyConfiguration, filePath);
-        FileInfo fileInfo = new(Path.Combine(_FileGroups[_PropertyConfiguration.ResultSingleton][directoryIndex], $"{mappingFromItem.ImageFileHolder.NameWithoutExtension}{mappingFromItem.ImageFileHolder.ExtensionLowered}.json"));
+        FileInfo fileInfo = new(Path.Combine(_FileGroups[_PropertyConfiguration.ResultSingleton][directoryIndex], $"{mappingFromItem.FilePath.NameWithoutExtension}{mappingFromItem.FilePath.ExtensionLowered}.json"));
         if (_ForceResizeLastWriteTimeToCreationTime && !fileInfo.Exists && File.Exists(Path.ChangeExtension(fileInfo.FullName, ".delete")))
         {
             File.Move(Path.ChangeExtension(fileInfo.FullName, ".delete"), fileInfo.FullName);

Set-Created-Date/Models/Binder/AppSettings.cs

@@ -21,6 +21,23 @@ public class AppSettings
         return result;
     }
 
+    private static void PreVerify(IConfigurationRoot configurationRoot, AppSettings? appSettings)
+    {
+        if (appSettings?.Company is null)
+        {
+            List<string> paths = [];
+            foreach (IConfigurationProvider configurationProvider in configurationRoot.Providers)
+            {
+                if (configurationProvider is not Microsoft.Extensions.Configuration.Json.JsonConfigurationProvider jsonConfigurationProvider)
+                    continue;
+                if (jsonConfigurationProvider.Source.FileProvider is not Microsoft.Extensions.FileProviders.PhysicalFileProvider physicalFileProvider)
+                    continue;
+                paths.Add(physicalFileProvider.Root);
+            }
+            throw new NotSupportedException($"Not found!{Environment.NewLine}{string.Join(Environment.NewLine, paths.Distinct())}");
+        }
+    }
+
     private static Models.AppSettings Get(AppSettings? appSettings)
     {
         Models.AppSettings result;
@@ -38,7 +55,10 @@ public class AppSettings
     public static Models.AppSettings Get(IConfigurationRoot configurationRoot)
     {
         Models.AppSettings result;
+#pragma warning disable IL3050, IL2026
         AppSettings? appSettings = configurationRoot.Get<AppSettings>();
+#pragma warning restore IL3050, IL2026
+        PreVerify(configurationRoot, appSettings);
         result = Get(appSettings);
         return result;
     }

Set-Created-Date/Models/Binder/Configuration.cs

@@ -7,13 +7,9 @@ namespace View_by_Distance.Set.Created.Date.Models.Binder;
 public class Configuration
 {
 
-#nullable disable
-
-    public string[] IgnoreExtensions { get; set; }
-    public Property.Models.Configuration PropertyConfiguration { get; set; }
-    public string PersonBirthdayFormat { get; set; }
-
-#nullable restore
+    public string[]? IgnoreExtensions { get; set; }
+    public Property.Models.Configuration? PropertyConfiguration { get; set; }
+    public string? PersonBirthdayFormat { get; set; }
 
     public override string ToString()
     {
@@ -21,12 +17,30 @@ public class Configuration
         return result;
     }
 
+    private static void PreVerify(IConfigurationRoot configurationRoot, Configuration? configuration)
+    {
+        if (configuration?.IgnoreExtensions is null)
+        {
+            List<string> paths = [];
+            foreach (IConfigurationProvider configurationProvider in configurationRoot.Providers)
+            {
+                if (configurationProvider is not Microsoft.Extensions.Configuration.Json.JsonConfigurationProvider jsonConfigurationProvider)
+                    continue;
+                if (jsonConfigurationProvider.Source.FileProvider is not Microsoft.Extensions.FileProviders.PhysicalFileProvider physicalFileProvider)
+                    continue;
+                paths.Add(physicalFileProvider.Root);
+            }
+            throw new NotSupportedException($"Not found!{Environment.NewLine}{string.Join(Environment.NewLine, paths.Distinct())}");
+        }
+    }
+
     private static Models.Configuration Get(Configuration? configuration)
     {
         Models.Configuration result;
         if (configuration is null) throw new NullReferenceException(nameof(configuration));
         if (configuration.IgnoreExtensions is null) throw new NullReferenceException(nameof(configuration.IgnoreExtensions));
         if (configuration.PersonBirthdayFormat is null) throw new NullReferenceException(nameof(configuration.PersonBirthdayFormat));
+        if (configuration.PropertyConfiguration is null) throw new NullReferenceException(nameof(configuration.PropertyConfiguration));
         result = new(
             configuration.IgnoreExtensions,
             configuration.PersonBirthdayFormat,
@@ -39,14 +53,19 @@ public class Configuration
         Models.Configuration result;
         Configuration? configuration;
         if (isEnvironment is null)
+#pragma warning disable IL3050, IL2026
             configuration = configurationRoot.Get<Configuration>();
+#pragma warning restore IL3050, IL2026
         else
         {
             string environmentName = IsEnvironment.GetEnvironmentName(isEnvironment);
             string section = string.Concat(environmentName, ":", nameof(Configuration));
             IConfigurationSection configurationSection = configurationRoot.GetSection(section);
+#pragma warning disable IL3050, IL2026
             configuration = configurationSection.Get<Configuration>();
+#pragma warning restore IL3050, IL2026
         }
+        PreVerify(configurationRoot, configuration);
         result = Get(configuration);
         return result;
     }

Set-Created-Date/SetCreatedDate.cs

@@ -86,7 +86,7 @@ public class SetCreatedDate
             isIgnoreExtension = isValidImageFormatExtension && _PropertyConfiguration.IgnoreExtensions.Contains(fileHolder.ExtensionLowered);
             if (isIgnoreExtension || !isValidImageFormatExtension)
                 continue;
-            (dateTimeOriginal, dateTimes, id, message) = Property.Models.Stateless.IProperty.Get(_PropertyConfiguration.PopulatePropertyId, metadata, fileHolder, isIgnoreExtension, isValidImageFormatExtension, asciiEncoding);
+            (dateTimeOriginal, dateTimes, id, message) = Property.Models.Stateless.IProperty.Get(_PropertyConfiguration, _PropertyConfiguration.PopulatePropertyId, metadata, fileHolder, isIgnoreExtension, isValidImageFormatExtension, asciiEncoding);
             if (dateTimeOriginal is null)
                 results.Add(new(fileHolder, false, dateTimes.Min()));
             else

Shared/Models/Aggregations.cs

@@ -0,0 +1,19 @@
+using System.Text.Json.Serialization;
+
+namespace View_by_Distance.Shared.Models;
+
+public record Aggregations(
+    [property: JsonPropertyName("allPeople")] IReadOnlyList<AllPerson> AllPeople,
+    [property: JsonPropertyName("clusterId")] IReadOnlyList<ClusterId> ClusterId,
+    [property: JsonPropertyName("location")] IReadOnlyList<LocationAmazon> Location,
+    [property: JsonPropertyName("people")] IReadOnlyList<PersonAmazon> People,
+    [property: JsonPropertyName("things")] IReadOnlyList<Thing> Things,
+    [property: JsonPropertyName("time")] IReadOnlyList<Time> Time,
+    [property: JsonPropertyName("type")] IReadOnlyList<Type> Type
+);
+
+[JsonSourceGenerationOptions(WriteIndented = true)]
+[JsonSerializable(typeof(Aggregations))]
+public partial class AggregationsGenerationContext : JsonSerializerContext
+{
+}

Shared/Models/AllPerson.cs

@@ -0,0 +1,15 @@
+using System.Text.Json.Serialization;
+
+namespace View_by_Distance.Shared.Models;
+
+public record AllPerson(
+    [property: JsonPropertyName("count")] int Count,
+    [property: JsonPropertyName("match")] string Match,
+    [property: JsonPropertyName("searchData")] SearchData SearchData
+);
+
+[JsonSourceGenerationOptions(WriteIndented = true)]
+[JsonSerializable(typeof(AllPerson))]
+public partial class AllPersonGenerationContext : JsonSerializerContext
+{
+}

Shared/Models/ClusterId.cs

@@ -0,0 +1,15 @@
+using System.Text.Json.Serialization;
+
+namespace View_by_Distance.Shared.Models;
+
+public record ClusterId(
+    [property: JsonPropertyName("count")] int Count,
+    [property: JsonPropertyName("match")] string Match,
+    [property: JsonPropertyName("searchData")] SearchData SearchData
+);
+
+[JsonSourceGenerationOptions(WriteIndented = true)]
+[JsonSerializable(typeof(ClusterId))]
+public partial class ClusterIdGenerationContext : JsonSerializerContext
+{
+}

Shared/Models/Container.cs

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

Shared/Models/ContentProperties.cs

@@ -0,0 +1,20 @@
+using System.Text.Json.Serialization;
+
+namespace View_by_Distance.Shared.Models;
+
+public record ContentProperties(
+    [property: JsonPropertyName("contentDate")] DateTime ContentDate,
+    [property: JsonPropertyName("contentSignatures")] IReadOnlyList<ContentSignature> ContentSignatures,
+    [property: JsonPropertyName("contentType")] string ContentType,
+    [property: JsonPropertyName("extension")] string Extension,
+    [property: JsonPropertyName("image")] ImageAmazon Image,
+    [property: JsonPropertyName("md5")] string Md5,
+    [property: JsonPropertyName("size")] int Size,
+    [property: JsonPropertyName("version")] int Version
+);
+
+[JsonSourceGenerationOptions(WriteIndented = true)]
+[JsonSerializable(typeof(ContentProperties))]
+public partial class ContentPropertiesGenerationContext : JsonSerializerContext
+{
+}

Shared/Models/ContentSignature.cs

@@ -0,0 +1,14 @@
+using System.Text.Json.Serialization;
+
+namespace View_by_Distance.Shared.Models;
+
+public record ContentSignature(
+    [property: JsonPropertyName("contentSignature")] string Value,
+    [property: JsonPropertyName("contentSignatureType")] string ContentSignatureType
+);
+
+[JsonSourceGenerationOptions(WriteIndented = true)]
+[JsonSerializable(typeof(ContentSignature))]
+public partial class ContentSignatureGenerationContext : JsonSerializerContext
+{
+}

Shared/Models/Datum.cs

@@ -0,0 +1,45 @@
+using System.Text.Json.Serialization;
+
+namespace View_by_Distance.Shared.Models;
+
+public record Datum(
+    [property: JsonPropertyName("accessRuleIds")] IReadOnlyList<object> AccessRuleIds,
+    [property: JsonPropertyName("childAssetTypeInfo")] IReadOnlyList<object> ChildAssetTypeInfo,
+    [property: JsonPropertyName("contentProperties")] ContentProperties ContentProperties,
+    [property: JsonPropertyName("createdBy")] string CreatedBy,
+    [property: JsonPropertyName("createdDate")] DateTime CreatedDate,
+    [property: JsonPropertyName("eTagResponse")] string ETagResponse,
+    [property: JsonPropertyName("groupPermissions")] IReadOnlyList<object> GroupPermissions,
+    [property: JsonPropertyName("id")] string Id,
+    [property: JsonPropertyName("isRoot")] bool IsRoot,
+    [property: JsonPropertyName("isShared")] bool IsShared,
+    [property: JsonPropertyName("keywords")] IReadOnlyList<object> Keywords,
+    [property: JsonPropertyName("kind")] string Kind,
+    [property: JsonPropertyName("labels")] IReadOnlyList<object> Labels,
+    [property: JsonPropertyName("modifiedDate")] DateTime ModifiedDate,
+    [property: JsonPropertyName("name")] string Name,
+    [property: JsonPropertyName("ownerId")] string OwnerId,
+    [property: JsonPropertyName("parentMap")] ParentMap ParentMap,
+    [property: JsonPropertyName("parents")] IReadOnlyList<string> Parents,
+    [property: JsonPropertyName("protectedFolder")] bool ProtectedFolder,
+    [property: JsonPropertyName("restricted")] bool Restricted,
+    [property: JsonPropertyName("status")] string Status,
+    [property: JsonPropertyName("subKinds")] IReadOnlyList<object> SubKinds,
+    [property: JsonPropertyName("transforms")] IReadOnlyList<string> Transforms,
+    [property: JsonPropertyName("version")] int Version,
+    [property: JsonPropertyName("xAccntParentMap")] XAccntParentMap XAccntParentMap,
+    [property: JsonPropertyName("xAccntParents")] IReadOnlyList<object> XAccntParents,
+    [property: JsonPropertyName("match")] bool? Match
+);
+
+[JsonSourceGenerationOptions(WriteIndented = true)]
+[JsonSerializable(typeof(Datum))]
+public partial class DatumGenerationContext : JsonSerializerContext
+{
+}
+
+[JsonSourceGenerationOptions(WriteIndented = true)]
+[JsonSerializable(typeof(Dictionary<string, Datum>))]
+public partial class DictionaryDatumGenerationContext : JsonSerializerContext
+{
+}

Shared/Models/FaceFile.cs

@@ -0,0 +1,19 @@
+using System.Text.Json.Serialization;
+
+namespace View_by_Distance.Shared.Models;
+
+public record FaceFile(int? AreaPermyriad,
+                       int? ConfidencePercent,
+                       DateTime DateTime,
+                       string? DMS,
+                       Dictionary<Stateless.FacePart, FacePoint[]>? FaceParts,
+                       Location? Location,
+                       string? Maker,
+                       string? Model,
+                       OutputResolution? OutputResolution);
+
+[JsonSourceGenerationOptions(WriteIndented = false)]
+[JsonSerializable(typeof(FaceFile))]
+public partial class FaceFileGenerationContext : JsonSerializerContext
+{
+}

Shared/Models/FileHolder.cs

@@ -48,6 +48,21 @@ public record FileHolder(DateTime? CreationTime,
         return result;
     }
 
+    public static FileHolder Get(FilePath filePath)
+    {
+        FileHolder result;
+        result = new(new(filePath.CreationTicks),
+                     filePath.DirectoryName,
+                     true,
+                     filePath.ExtensionLowered,
+                     filePath.FullName,
+                     new(filePath.LastWriteTicks),
+                     filePath.Length,
+                     filePath.Name,
+                     Path.GetFileNameWithoutExtension(filePath.FullName));
+        return result;
+    }
+
 }
 
 [JsonSourceGenerationOptions(WriteIndented = true)]

Shared/Models/FilePath.cs

@@ -10,6 +10,7 @@ public record FilePath(long CreationTicks,
                        string FileNameFirstSegment,
                        string FullName,
                        int? Id,
+                       bool? IsIgnore,
                        bool IsIntelligentIdFormat,
                        long LastWriteTicks,
                        long Length,
@@ -38,14 +39,15 @@ public record FilePath(long CreationTicks,
         string fileNameFirstSegment = fileHolder.Name.Split('.')[0];
         int sortOrderOnlyLengthIndex = propertyConfiguration.Offset.ToString().Length;
         string fileDirectoryName = fileHolder.DirectoryName ?? throw new NullReferenceException();
-        bool fileNameFirstSegmentIsIntelligentIdFormat = IId.NameWithoutExtensionIsIntelligentIdFormat(propertyConfiguration, fileNameFirstSegment);
-        bool fileNameFirstSegmentIsPaddedIntelligentIdFormat = IId.NameWithoutExtensionIsPaddedIntelligentIdFormat(propertyConfiguration, sortOrderOnlyLengthIndex, fileNameFirstSegment);
-        bool fileNameFirstSegmentIsIdFormat = !fileNameFirstSegmentIsPaddedIntelligentIdFormat && !fileNameFirstSegmentIsIntelligentIdFormat && IId.NameWithoutExtensionIsIdFormat(propertyConfiguration, fileHolder);
-        if (!fileNameFirstSegmentIsIdFormat && !fileNameFirstSegmentIsIntelligentIdFormat && !fileNameFirstSegmentIsPaddedIntelligentIdFormat)
+        bool isIntelligentIdFormat = IId.NameWithoutExtensionIsIntelligentIdFormat(propertyConfiguration, fileNameFirstSegment);
+        bool isPaddedIntelligentIdFormat = IId.NameWithoutExtensionIsPaddedIntelligentIdFormat(propertyConfiguration, sortOrderOnlyLengthIndex, fileNameFirstSegment);
+        bool fileNameFirstSegmentIsIdFormat = !isPaddedIntelligentIdFormat && !isIntelligentIdFormat && IId.NameWithoutExtensionIsIdFormat(propertyConfiguration, fileHolder);
+        bool? isIgnore = !isIntelligentIdFormat && !isPaddedIntelligentIdFormat ? null : fileNameFirstSegment[^1] is '2' or '8';
+        if (!fileNameFirstSegmentIsIdFormat && !isIntelligentIdFormat && !isPaddedIntelligentIdFormat)
             (id, sortOder) = (null, null);
-        else if (fileNameFirstSegmentIsIntelligentIdFormat)
+        else if (isIntelligentIdFormat)
             (id, sortOder) = (IId.GetId(propertyConfiguration, fileNameFirstSegment), null);
-        else if (fileNameFirstSegmentIsPaddedIntelligentIdFormat)
+        else if (isPaddedIntelligentIdFormat)
         {
             if (!int.TryParse(fileNameFirstSegment[..sortOrderOnlyLengthIndex], out int absoluteValueOfSortOrder))
                 (id, sortOder) = (null, null);
@@ -68,7 +70,8 @@ public record FilePath(long CreationTicks,
                      fileNameFirstSegment,
                      fileHolder.FullName,
                      id,
-                     fileNameFirstSegmentIsIntelligentIdFormat,
+                     isIgnore,
+                     isIntelligentIdFormat,
                      fileHolder.LastWriteTime.Value.Ticks,
                      fileHolder.Length.Value,
                      fileHolder.Name,

Shared/Models/ImageAmazon.cs

@@ -0,0 +1,36 @@
+using System.Text.Json.Serialization;
+
+namespace View_by_Distance.Shared.Models;
+
+public record ImageAmazon(
+    [property: JsonPropertyName("colorSpace")] string ColorSpace,
+    [property: JsonPropertyName("dateTime")] DateTime DateTime,
+    [property: JsonPropertyName("dateTimeDigitized")] DateTime DateTimeDigitized,
+    [property: JsonPropertyName("dateTimeOriginal")] DateTime DateTimeOriginal,
+    [property: JsonPropertyName("exposureMode")] string ExposureMode,
+    [property: JsonPropertyName("exposureProgram")] string ExposureProgram,
+    [property: JsonPropertyName("exposureTime")] string ExposureTime,
+    [property: JsonPropertyName("flash")] string Flash,
+    [property: JsonPropertyName("focalLength")] string FocalLength,
+    [property: JsonPropertyName("height")] int Height,
+    [property: JsonPropertyName("make")] string Make,
+    [property: JsonPropertyName("meteringMode")] string MeteringMode,
+    [property: JsonPropertyName("model")] string Model,
+    [property: JsonPropertyName("orientation")] string Orientation,
+    [property: JsonPropertyName("resolutionUnit")] string ResolutionUnit,
+    [property: JsonPropertyName("sensingMethod")] string SensingMethod,
+    [property: JsonPropertyName("sharpness")] string Sharpness,
+    [property: JsonPropertyName("software")] string Software,
+    [property: JsonPropertyName("subSecTime")] string SubSecTime,
+    [property: JsonPropertyName("subSecTimeDigitized")] string SubSecTimeDigitized,
+    [property: JsonPropertyName("subSecTimeOriginal")] string SubSecTimeOriginal,
+    [property: JsonPropertyName("whiteBalance")] string WhiteBalance,
+    [property: JsonPropertyName("width")] int Width,
+    [property: JsonPropertyName("apertureValue")] string ApertureValue
+);
+
+[JsonSourceGenerationOptions(WriteIndented = true)]
+[JsonSerializable(typeof(ImageAmazon))]
+public partial class ImageAmazonGenerationContext : JsonSerializerContext
+{
+}

Shared/Models/ImmichAsset.cs

@@ -0,0 +1,33 @@
+using System.Text.Json;
+using System.Text.Json.Serialization;
+
+namespace View_by_Distance.Shared.Models;
+
+public record ImmichAsset([property: JsonPropertyName("id")] string Id,
+                          [property: JsonPropertyName("deviceAssetId")] string DeviceAssetId,
+                          [property: JsonPropertyName("originalPath")] string OriginalPath,
+                          [property: JsonPropertyName("previewPath")] string PreviewPath,
+                          [property: JsonPropertyName("isFavorite")] bool IsFavorite,
+                          [property: JsonPropertyName("thumbnailPath")] string ThumbnailPath,
+                          [property: JsonPropertyName("thumbhash")] string Thumbhash)
+{
+
+    public override string ToString()
+    {
+        string result = JsonSerializer.Serialize(this, ImmichAssetSourceGenerationContext.Default.ImmichAsset);
+        return result;
+    }
+
+}
+
+[JsonSourceGenerationOptions(WriteIndented = true, DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull)]
+[JsonSerializable(typeof(ImmichAsset))]
+public partial class ImmichAssetSourceGenerationContext : JsonSerializerContext
+{
+}
+
+[JsonSourceGenerationOptions(WriteIndented = true, DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull)]
+[JsonSerializable(typeof(ImmichAsset[]))]
+public partial class ImmichAssetCollectionSourceGenerationContext : JsonSerializerContext
+{
+}

Shared/Models/Item.cs

@@ -9,7 +9,6 @@ public class Item : Properties.IItem
     protected List<Face> _Faces;
     protected readonly bool? _FileSizeChanged;
     protected readonly FilePath _FilePath;
-    protected readonly FileHolder _ImageFileHolder;
     protected bool? _IsNotUniqueAndNeedsReview;
     protected bool _IsUniqueFileName;
     protected bool _IsValidImageFormatExtension;
@@ -22,7 +21,6 @@ public class Item : Properties.IItem
     public List<Face> Faces => _Faces;
     public bool? FileSizeChanged => _FileSizeChanged;
     public FilePath FilePath => _FilePath;
-    public FileHolder ImageFileHolder => _ImageFileHolder;
     public bool? IsNotUniqueAndNeedsReview => _IsNotUniqueAndNeedsReview;
     public bool IsUniqueFileName => _IsUniqueFileName;
     public bool IsValidImageFormatExtension => _IsValidImageFormatExtension;
@@ -34,12 +32,11 @@ public class Item : Properties.IItem
     public FileHolder SourceDirectoryFileHolder => _SourceDirectoryFileHolder;
 
     [JsonConstructor]
-    public Item(List<Face> faces, FilePath filePath, bool? fileSizeChanged, FileHolder imageFileHolder, bool? isNotUniqueAndNeedsReview, bool isUniqueFileName, bool isValidImageFormatExtension, bool? lastWriteTimeChanged, bool? moved, Property? property, string relativePath, FileHolder? resizedFileHolder, FileHolder sourceDirectoryFileHolder)
+    public Item(List<Face> faces, FilePath filePath, bool? fileSizeChanged, bool? isNotUniqueAndNeedsReview, bool isUniqueFileName, bool isValidImageFormatExtension, bool? lastWriteTimeChanged, bool? moved, Property? property, string relativePath, FileHolder? resizedFileHolder, FileHolder sourceDirectoryFileHolder)
     {
         _Faces = faces;
         _FilePath = filePath;
         _FileSizeChanged = fileSizeChanged;
-        _ImageFileHolder = imageFileHolder;
         _IsNotUniqueAndNeedsReview = isNotUniqueAndNeedsReview;
         _IsUniqueFileName = isUniqueFileName;
         _IsValidImageFormatExtension = isValidImageFormatExtension;
@@ -51,17 +48,17 @@ public class Item : Properties.IItem
         _SourceDirectoryFileHolder = sourceDirectoryFileHolder;
     }
 
-    public Item(FilePath filePath, FileHolder sourceDirectoryFileHolder, string relativePath, FileHolder imageFileInfo, bool? isNotUniqueAndNeedsReview, bool isUniqueFileName, bool isValidImageFormatExtension, Property? property, bool? abandoned, bool? fileSizeChanged, bool? lastWriteTimeChanged) :
-        this([], filePath, fileSizeChanged, imageFileInfo, isNotUniqueAndNeedsReview, isUniqueFileName, isValidImageFormatExtension, lastWriteTimeChanged, null, property, relativePath, null, sourceDirectoryFileHolder)
+    public Item(FilePath filePath, FileHolder sourceDirectoryFileHolder, string relativePath, bool? isNotUniqueAndNeedsReview, bool isUniqueFileName, bool isValidImageFormatExtension, Property? property, bool? abandoned, bool? fileSizeChanged, bool? lastWriteTimeChanged) :
+        this([], filePath, fileSizeChanged, isNotUniqueAndNeedsReview, isUniqueFileName, isValidImageFormatExtension, lastWriteTimeChanged, null, property, relativePath, null, sourceDirectoryFileHolder)
     {
         if (relativePath.EndsWith(".json"))
             throw new ArgumentException("Can not be a *.json file!");
-        if (imageFileInfo is not null && imageFileInfo.ExtensionLowered is ".json")
+        if (filePath is not null && filePath.ExtensionLowered is ".json")
             throw new ArgumentException("Can not be a *.json file!");
     }
 
     public Item(FilePath filePath, FileHolder sourceDirectoryFileHolder, string relativePath, bool isValidImageFormatExtension) :
-        this(filePath, sourceDirectoryFileHolder, relativePath, sourceDirectoryFileHolder, null, false, isValidImageFormatExtension, null, null, null, null)
+        this(filePath, sourceDirectoryFileHolder, relativePath, null, false, isValidImageFormatExtension, null, null, null, null)
     { }
 
     public override string ToString()

Shared/Models/LocationAmazon.cs

@@ -0,0 +1,15 @@
+using System.Text.Json.Serialization;
+
+namespace View_by_Distance.Shared.Models;
+
+public record LocationAmazon(
+    [property: JsonPropertyName("count")] int Count,
+    [property: JsonPropertyName("match")] string Match,
+    [property: JsonPropertyName("searchData")] SearchData SearchData
+);
+
+[JsonSourceGenerationOptions(WriteIndented = true)]
+[JsonSerializable(typeof(LocationAmazon))]
+public partial class LocationAmazonGenerationContext : JsonSerializerContext
+{
+}

Shared/Models/LocationContainer.cs

@@ -5,11 +5,57 @@ namespace View_by_Distance.Shared.Models;
 public record LocationContainer(DateOnly CreationDateOnly,
                                 ExifDirectory? ExifDirectory,
                                 int? DirectoryNumber,
-                                string DisplayDirectoryName,
+                                string? DisplayDirectoryName,
+                                object? Encoding,
+                                FaceFile? FaceFile,
                                 FilePath FilePath,
                                 bool FromDistanceContent,
                                 int Id,
-                                Location? Location,
-                                long PersonKey,
+                                int? LengthPermyriad,
+                                FilePath? LengthSource,
+                                long? PersonKey,
                                 RectangleF? Rectangle,
-                                int WholePercentages);
+                                int WholePercentages)
+{
+
+    public static LocationContainer Get(LocationContainer locationContainer, object? encoding, bool keepExifDirectory)
+    {
+        LocationContainer result;
+        result = new(locationContainer.CreationDateOnly,
+                     keepExifDirectory ? locationContainer.ExifDirectory : null,
+                     locationContainer.DirectoryNumber,
+                     locationContainer.DisplayDirectoryName,
+                     encoding,
+                     locationContainer.FaceFile,
+                     locationContainer.FilePath,
+                     locationContainer.FromDistanceContent,
+                     locationContainer.Id,
+                     locationContainer.LengthPermyriad,
+                     locationContainer.LengthSource,
+                     locationContainer.PersonKey,
+                     locationContainer.Rectangle,
+                     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,
+                     locationContainer.DirectoryNumber,
+                     locationContainer.DisplayDirectoryName,
+                     keepEncoding ? locationContainer.Encoding : null,
+                     locationContainer.FaceFile,
+                     locationContainer.FilePath,
+                     locationContainer.FromDistanceContent,
+                     locationContainer.Id,
+                     lengthPermyriad,
+                     source.FilePath,
+                     locationContainer.PersonKey,
+                     locationContainer.Rectangle,
+                     locationContainer.WholePercentages);
+        return result;
+    }
+
+}

Shared/Models/LocationInfo.cs

@@ -0,0 +1,17 @@
+using System.Text.Json.Serialization;
+
+namespace View_by_Distance.Shared.Models;
+
+public record LocationInfo(
+    [property: JsonPropertyName("city")] string City,
+    [property: JsonPropertyName("country")] string Country,
+    [property: JsonPropertyName("countryIso3Code")] string CountryIso3Code,
+    [property: JsonPropertyName("state")] string State,
+    [property: JsonPropertyName("stateCode")] string StateCode
+);
+
+[JsonSourceGenerationOptions(WriteIndented = true)]
+[JsonSerializable(typeof(LocationInfo))]
+public partial class LocationInfoGenerationContext : JsonSerializerContext
+{
+}

Shared/Models/MappingFromFilterPre.cs

@@ -14,6 +14,9 @@ public record MappingFromFilterPre(bool? InSkipCollection,
         return result;
     }
 
+    internal static void Constructor() =>
+        _ = new MappingFromFilterPre(null, null, null);
+
 }
 
 [JsonSourceGenerationOptions(WriteIndented = true)]

Shared/Models/MappingFromItem.cs

@@ -7,7 +7,7 @@ public record MappingFromItem(DateTime[] ContainerDateTimes,
                               DateTime? DateTimeDigitized,
                               DateTime? DateTimeOriginal,
                               int Id,
-                              FileHolder ImageFileHolder,
+                              FilePath FilePath,
                               bool? IsWrongYear,
                               string[] Keywords,
                               DateTime MinimumDateTime,
@@ -34,8 +34,8 @@ public record MappingFromItem(DateTime[] ContainerDateTimes,
             throw new NotSupportedException();
         List<DateTime> dateTimes = item.Property.GetDateTimes();
         DateTime minimumDateTime = Stateless.Methods.IProperty.GetMinimumDateTime(item.Property);
-        (bool? isWrongYear, _) = Stateless.Methods.IProperty.IsWrongYear(item.ImageFileHolder, item.Property.DateTimeOriginal, dateTimes);
-        result = new(containerDateTimes, item.Property.DateTimeDigitized, item.Property.DateTimeOriginal, item.Property.Id.Value, item.ImageFileHolder, isWrongYear, item.Property.Keywords ?? [], minimumDateTime, item.Property.Model, item.RelativePath, resizedFileHolder);
+        (bool? isWrongYear, _) = Stateless.Methods.IProperty.IsWrongYear(item.FilePath, item.Property.DateTimeOriginal, dateTimes);
+        result = new(containerDateTimes, item.Property.DateTimeDigitized, item.Property.DateTimeOriginal, item.Property.Id.Value, item.FilePath, isWrongYear, item.Property.Keywords ?? [], minimumDateTime, item.Property.Model, item.RelativePath, resizedFileHolder);
         return result;
     }
 

Shared/Models/Methods/IDistance.cs

@@ -5,6 +5,6 @@ namespace View_by_Distance.Shared.Models.Methods;
 public interface IDistance
 {
 
-    ReadOnlyCollection<RelationContainer> GetRelationContainers(int faceDistancePermyriad, int locationContainerDistanceTake, float locationContainerDistanceTolerance, ReadOnlyCollection<LocationContainer> locationContainers);
+    ReadOnlyCollection<RelationContainer> GetRelationContainers(IDistanceLimits distanceLimits, int faceDistancePermyriad, int locationContainerDistanceTake, float locationContainerDistanceTolerance, ReadOnlyCollection<LocationContainer> locationContainers);
 
 }