SaveSortingWithoutPerson

Delete-By-Distinct/DeleteByDistinct.cs

@@ -78,7 +78,7 @@ public class DeleteByDistinct
                     if (!fileTicksToNames.TryGetValue(checkDate.Ticks, out fileNames))
                         throw new Exception();
                 }
-                checkName = fileInfo.Name.ToLower(); //.Replace(".jpeg", ".jpg");
+                checkName = fileInfo.Name.ToLower().Replace(".jpeg", ".jpg");
                 if (fileNames.Contains(checkName))
                     deletedFiles.Add(file);
                 else

Delete-By-Distinct/appsettings.Development.json

@@ -1,21 +1,21 @@
 {
   "xCompareRootDirectory": "",
-  "CompareRootDirectory": "F:/7) Question/- - - Images",
+  "CompareRootDirectory": "D:/7) Question/- - - Images",
   "Logging": {
     "LogLevel": {
       "Log4netProvider": "Debug"
     }
   },
   "MaxDegreeOfParallelism": 6,
-  "SearchPattern": "*",
+  "SearchPattern": "*.j*",
   "Serilog": {
     "MinimumLevel": "Debug"
   },
   "Windows": {
     "Configuration": {
-      "RootDirectory": "D:/2) Images B/Corrupt",
+      "xRootDirectory": "D:/2) Images B/Corrupt",
       "xxRootDirectory": "D:/2) Images B/Not-Copy-Copy-37c7b67",
-      "xxxRootDirectory": "G:/1) Images A/Images-37c7b67",
+      "RootDirectory": "D:/1) Images A/Images-37c7b67",
       "VerifyToSeason": [
         ". 2000",
         ". 2001",

Distance/Models/MapLogicSupport.cs

@@ -43,7 +43,7 @@ public class MapLogicSupport : Shared.Models.Methods.IMapLogicSupport
         File.WriteAllLines(eDistanceContentFileName, results);
     }
 
-    private List<SortingContainer> GetSortingContainers(Face face, FaceDistance faceDistanceEncoding, List<Sorting> sortingCollection, int? useFiltersCounter)
+    private List<SortingContainer> GetSortingContainers(Configuration mapConfiguration, Face face, FaceDistance faceDistanceEncoding, List<Sorting> sortingCollection, int? useFiltersCounter)
     {
         List<SortingContainer> results = new();
         SortingContainer sortingContainer;
@@ -137,6 +137,8 @@ public class MapLogicSupport : Shared.Models.Methods.IMapLogicSupport
         {
             if (face.Mapping is null || faceDistanceEncoding.NormalizedRectangle is null)
                 throw new NotSupportedException();
+            if (!mapConfiguration.SaveSortingWithoutPerson && face.Mapping.MappingFromPerson is null)
+                continue;
             if (sorting.DaysDelta > rangeDaysDeltaTolerance)
             {
                 _Days += 1;
@@ -211,7 +213,7 @@ public class MapLogicSupport : Shared.Models.Methods.IMapLogicSupport
         return faceDistanceEncodings;
     }
 
-    public SortingContainer[] SetFaceMappingSortingCollectionThenGetSortingContainers(int maxDegreeOfParallelism, long ticks, MapLogic mapLogic, List<Face> distinctFilteredFaces, List<FaceDistanceContainer> missingFaceDistanceContainers, int? useFiltersCounter)
+    public SortingContainer[] SetFaceMappingSortingCollectionThenGetSortingContainers(int maxDegreeOfParallelism, Configuration mapConfiguration, long ticks, MapLogic mapLogic, List<Face> distinctFilteredFaces, List<FaceDistanceContainer> missingFaceDistanceContainers, int? useFiltersCounter)
     {
         SortingContainer[] results;
         List<SortingContainer> collection = new();
@@ -234,7 +236,7 @@ public class MapLogicSupport : Shared.Models.Methods.IMapLogicSupport
             List<Sorting> sortingCollection = GetSortingCollection(mapLogic, faceDistanceEncodings, i, faceDistanceEncoding);
             if (!sortingCollection.Any())
                 return;
-            List<SortingContainer> sortingContainers = GetSortingContainers(face, faceDistanceEncoding, sortingCollection, useFiltersCounter);
+            List<SortingContainer> sortingContainers = GetSortingContainers(mapConfiguration, face, faceDistanceEncoding, sortingCollection, useFiltersCounter);
             if (sortingContainers.Any())
             {
                 lock (collection)

Drag-Drop/Form.cs

@@ -54,7 +54,7 @@ public partial class Form : System.Windows.Forms.Form
         configurationRoot = configurationBuilder.Build();
         appSettings = Models.Binder.AppSettings.Get(configurationRoot);
         if (string.IsNullOrEmpty(appSettings.WorkingDirectoryName))
-            throw new Exception("Working directory name must have parentDirectory value!");
+            throw new Exception("Working path name must have parentDirectory value!");
         workingDirectory = IWorkingDirectory.GetWorkingDirectory(assembly.GetName().Name, appSettings.WorkingDirectoryName);
         Environment.SetEnvironmentVariable(nameof(workingDirectory), workingDirectory);
         _ = ConfigurationLoggerConfigurationExtensions.Configuration(loggerConfiguration.ReadFrom, configurationRoot);
@@ -396,6 +396,32 @@ public partial class Form : System.Windows.Forms.Form
         return results;
     }
 
+    private static void Rename2000(string[] paths)
+    {
+        string name;
+        string check;
+        string? directoryName;
+        foreach (string path in paths)
+        {
+            name = Path.GetFileName(path);
+            if (name.Length < 1 || (!name.StartsWith("zzz =20") && !name.StartsWith("=20")))
+                continue;
+            directoryName = Path.GetDirectoryName(path);
+            if (directoryName is null)
+                continue;
+            if (!name.StartsWith("zzz =20"))
+                check = Path.Combine(directoryName, name[1..]);
+            else
+                check = Path.Combine(directoryName, $"zzz {name[5..]}");
+            if (Directory.Exists(check) || File.Exists(check))
+                continue;
+            if (!Directory.Exists(path))
+                File.Move(path, check);
+            else
+                Directory.Move(path, check);
+        }
+    }
+
     private void RenameFilesInDirectories(List<string> directories)
     {
         string directoryName;
@@ -452,13 +478,18 @@ public partial class Form : System.Windows.Forms.Form
                 _TextBox.Text = string.Empty;
             else
             {
-                List<string> directories = GetDirectoriesOrDoDragDrop(paths);
+                if (paths.All(l => l.Contains("=20")))
-                if (directories.Any())
+                    Rename2000(paths);
+                else
                 {
-                    RenameFilesInDirectories(directories);
+                    List<string> directories = GetDirectoriesOrDoDragDrop(paths);
-                    string? parentDirectory = Path.GetDirectoryName(directories[0]);
+                    if (directories.Any())
-                    if (parentDirectory is not null && parentDirectory != Path.GetPathRoot(directories[0]))
+                    {
-                        _ = IPath.DeleteEmptyDirectories(parentDirectory);
+                        RenameFilesInDirectories(directories);
+                        string? parentDirectory = Path.GetDirectoryName(directories[0]);
+                        if (parentDirectory is not null && parentDirectory != Path.GetPathRoot(directories[0]))
+                            _ = IPath.DeleteEmptyDirectories(parentDirectory);
+                    }
                 }
             }
         }

Instance/DlibDotNet.cs

@@ -275,6 +275,7 @@ public partial class DlibDotNet
             configuration.PersonCharacters,
             configuration.RangeDaysDeltaTolerance,
             configuration.RangeDistanceTolerance,
+            configuration.SaveSortingWithoutPerson,
             configuration.SortingMaximumPerKey,
             configuration.SortingMinimumToUseSigma,
             facesFileNameExtension,
@@ -756,7 +757,6 @@ public partial class DlibDotNet
         Item[] filteredItems;
         int confidencePercent;
         int normalizedRectangle;
-        bool isIgnoreRelativePath;
         DateTime[] containerDateTimes;
         string deterministicHashCodeKey;
         MappingFromItem mappingFromItem;
@@ -772,7 +772,6 @@ public partial class DlibDotNet
             if (!filteredItems.Any())
                 continue;
             containerDateTimes = Shared.Models.Stateless.Methods.IContainer.GetContainerDateTimes(filteredItems);
-            isIgnoreRelativePath = _Configuration.IgnoreRelativePaths.Any(l => container.SourceDirectory.Contains(l)) && Shared.Models.Stateless.Methods.IContainer.IsIgnoreRelativePath(_Configuration.PropertyConfiguration, _Configuration.IgnoreRelativePaths, container.SourceDirectory);
             foreach (Item item in filteredItems)
             {
                 if (item.Property?.Id is null || item.ResizedFileHolder is null)
@@ -887,14 +886,15 @@ public partial class DlibDotNet
         {
             mapLogic.UpdatedPersonKeyToRanges(_MapConfiguration, ticks, mappingCollection);
             MapLogicSupport.SetFaceDistances(_AppSettings.MaxDegreeOfParallelism, ticks, distinctFilteredFaces);
+            List<Shared.Models.Face> distinctFurtherFilteredFaces = mapLogic.GetFurtherFilterBySkipCollection(distinctFilteredFaces);
             Dictionary<int, Dictionary<int, PersonContainer[]>> missingIdThenNormalizedRectangleToPersonContainers = mapLogic.GetMissing(idToNormalizedRectangleToMapping);
             List<FaceDistanceContainer> missingFaceDistanceContainers = _Distance.GetMissingFaceDistanceContainer(_AppSettings.MaxDegreeOfParallelism, ticks, dFacesCollectionDirectory, missingIdThenNormalizedRectangleToPersonContainers);
-            sortingContainers = mapLogicSupport.SetFaceMappingSortingCollectionThenGetSortingContainers(_AppSettings.MaxDegreeOfParallelism, ticks, mapLogic, distinctFilteredFaces, missingFaceDistanceContainers, useFiltersCounter);
+            sortingContainers = mapLogicSupport.SetFaceMappingSortingCollectionThenGetSortingContainers(_AppSettings.MaxDegreeOfParallelism, _MapConfiguration, ticks, mapLogic, distinctFurtherFilteredFaces, missingFaceDistanceContainers, useFiltersCounter);
             if (!sortingContainers.Any())
             {
                 for (useFiltersCounter = 1; useFiltersCounter < 17; useFiltersCounter++)
                 {
-                    sortingContainers = mapLogicSupport.SetFaceMappingSortingCollectionThenGetSortingContainers(_AppSettings.MaxDegreeOfParallelism, ticks, mapLogic, distinctFilteredFaces, missingFaceDistanceContainers, useFiltersCounter);
+                    sortingContainers = mapLogicSupport.SetFaceMappingSortingCollectionThenGetSortingContainers(_AppSettings.MaxDegreeOfParallelism, _MapConfiguration, ticks, mapLogic, distinctFurtherFilteredFaces, missingFaceDistanceContainers, useFiltersCounter);
                     if (sortingContainers.Any())
                         break;
                 }
@@ -902,9 +902,8 @@ public partial class DlibDotNet
             MapLogicSupport.SaveFaceDistances(_Configuration.PropertyConfiguration, sortingContainers);
             if (totalNotMapped > 0)
             {
-                bool saveNullPerson = !personKeyToCount.Any() || _Configuration.RangeDistanceTolerance[1] < (_Configuration.RangeDistanceTolerance[2] * .66);
+                int updated = mapLogic.UpdateFromSortingContainers(sortingContainers);
-                int updated = mapLogic.UpdateFromSortingContainers(sortingContainers, saveNullPerson);
+                List<SaveContainer> saveContainers = mapLogic.GetSaveContainers(dFacesContentDirectory, d2FacePartsContentDirectory, mappingCollection, idToNormalizedRectangleToMapping, useFiltersCounter, sortingContainers.Any());
-                List<SaveContainer> saveContainers = mapLogic.GetSaveContainers(dFacesContentDirectory, d2FacePartsContentDirectory, mappingCollection, idToNormalizedRectangleToMapping, useFiltersCounter, saveNullPerson);
                 mapLogic.SaveContainers(totalNotMapped, updated, saveContainers);
             }
         }
@@ -1131,20 +1130,16 @@ public partial class DlibDotNet
                 && outputResolution == _Configuration.OutputResolutions[0]
                 && _Configuration.LoadOrCreateThenSaveDistanceResultsForOutputResolutions.Contains(outputResolution)
                 && _Exceptions.Count == 0)
-            {
-                if (!_Configuration.LoadOrCreateThenSaveImageFacesResultsForOutputResolutions.Any())
-                    break;
                 MapLogic(argZero, ticks, containers, a2PeopleSingletonDirectory, dResultsFullGroupDirectory, d2ResultsFullGroupDirectory, fPhotoPrismContentDirectory, mapLogicSupport, mapLogic, outputResolution, distinctFilteredFaces, mappingCollection, totalNotMapped);
-                if (_IsEnvironment.Development)
-                    continue;
-                G2_Identify identify = new(_Configuration);
-                List<G2_Identify> identifiedCollection = identify.GetIdentifiedCollection(_IsEnvironment, _Configuration.PropertyConfiguration, _Faces.FileNameExtension);
-                identify.WriteAllText(_Configuration.PropertyConfiguration, _Configuration.OutputResolutions[0], identifiedCollection);
-                if (_Configuration.LoadOrCreateThenSaveIndex)
-                    _Index.SetIndex(_Configuration.PropertyConfiguration, _Configuration.OutputResolutions[0]);
-            }
             if (_Configuration.SaveRandomForOutputResolutions.Contains(outputResolution))
                 _Random.Random(_Configuration.PropertyConfiguration, mapLogic, outputResolution, mappingCollection);
+            if (_IsEnvironment.Development)
+                continue;
+            G2_Identify identify = new(_Configuration);
+            List<G2_Identify> identifiedCollection = identify.GetIdentifiedCollection(_IsEnvironment, _Configuration.PropertyConfiguration, _Faces.FileNameExtension);
+            identify.WriteAllText(_Configuration.PropertyConfiguration, _Configuration.OutputResolutions[0], identifiedCollection);
+            if (_Configuration.LoadOrCreateThenSaveIndex)
+                _Index.SetIndex(_Configuration.PropertyConfiguration, _Configuration.OutputResolutions[0]);
             if (!_IsEnvironment.Development)
             {
                 _ = Shared.Models.Stateless.Methods.IPath.DeleteEmptyDirectories(Path.Combine(aResultsFullGroupDirectory, "{}"));

Instance/Models/Binder/Configuration.cs

@@ -73,6 +73,7 @@ public class Configuration
     [Display(Name = "Save Random For Output Resolutions"), Required] public string[] SaveRandomForOutputResolutions { get; set; }
     [Display(Name = "Save Resized Subfiles"), Required] public bool? SaveResizedSubfiles { get; set; }
     [Display(Name = "Save Shortcuts"), Required] public string[] SaveShortcutsForOutputResolutions { get; set; }
+    [Display(Name = "Save Sorting Without Person"), Required] public bool? SaveSortingWithoutPerson { get; set; }
     [Display(Name = "Skip Search"), Required] public bool? SkipSearch { get; set; }
     [Display(Name = "SortingMaximumPerFaceShould be High"), Required] public int? SortingMaximumPerFaceShouldBeHigh { get; set; }
     [Display(Name = "Sorting Maximum Per Key"), Required] public int? SortingMaximumPerKey { get; set; }
@@ -197,6 +198,8 @@ public class Configuration
             throw new NullReferenceException(nameof(configuration.SaveResizedSubfiles));
         configuration.SaveShortcutsForOutputResolutions ??= Array.Empty<string>();
         configuration.SaveShortcutsForOutputResolutions ??= Array.Empty<string>();
+        if (configuration.SaveSortingWithoutPerson is null)
+            throw new NullReferenceException(nameof(configuration.SaveSortingWithoutPerson));
         if (configuration.SkipSearch is null)
             throw new NullReferenceException(nameof(configuration.SkipSearch));
         if (configuration.SortingMaximumPerFaceShouldBeHigh is null)
@@ -271,6 +274,7 @@ public class Configuration
                      configuration.SaveRandomForOutputResolutions,
                      configuration.SaveResizedSubfiles.Value,
                      configuration.SaveShortcutsForOutputResolutions,
+                     configuration.SaveSortingWithoutPerson.Value,
                      configuration.SkipSearch.Value,
                      configuration.SortingMaximumPerFaceShouldBeHigh.Value,
                      configuration.SortingMaximumPerKey.Value,

Instance/Models/Configuration.cs

@@ -69,6 +69,7 @@ public class Configuration
     public string[] SaveRandomForOutputResolutions { init; get; }
     public bool SaveResizedSubfiles { init; get; }
     public string[] SaveShortcutsForOutputResolutions { init; get; }
+    public bool SaveSortingWithoutPerson { init; get; }
     public bool SkipSearch { init; get; }
     public int SortingMaximumPerFaceShouldBeHigh { init; get; }
     public int SortingMaximumPerKey { init; get; }
@@ -138,6 +139,7 @@ public class Configuration
                          string[] saveRandomForOutputResolutions,
                          bool saveResizedSubfiles,
                          string[] saveShortcutsForOutputResolutions,
+                         bool saveSortingWithoutPerson,
                          bool skipSearch,
                          int sortingMaximumPerFaceShouldBeHigh,
                          int sortingMaximumPerKey,
@@ -206,6 +208,7 @@ public class Configuration
         SaveResizedSubfiles = saveResizedSubfiles;
         SaveRandomForOutputResolutions = saveRandomForOutputResolutions;
         SaveShortcutsForOutputResolutions = saveShortcutsForOutputResolutions;
+        SaveSortingWithoutPerson = saveSortingWithoutPerson;
         SkipSearch = skipSearch;
         SortingMaximumPerFaceShouldBeHigh = sortingMaximumPerFaceShouldBeHigh;
         SortingMaximumPerKey = sortingMaximumPerKey;

Instance/appsettings.Development.json

@@ -24,9 +24,10 @@
       "xxxxxxxxPersonCharactersToCopyTo": "+",
       "xRootDirectory": "D:/Tmp/phares/Pictures",
       "xxRootDirectory": "D:/Tmp/Phares/Compare/Corrupt",
-      "RootDirectory": "D:/Tmp/Phares/Compare/Not-Copy-Copy-37c7b67",
+      "xxxRootDirectory": "D:/2) Images B/Not-Copy-Copy-37c7b67",
-      "xxxxRootDirectory": "D:/1) Images A/Images-37c7b67",
+      "RootDirectory": "D:/1) Images A/Images-37c7b67",
       "xxxxxRootDirectory": "D:/1) Images A/Images-37c7b67/Facebook/=2022.3 Facebook",
+      "SaveSortingWithoutPerson": true,
       "JLinks": [
         "Julie"
       ],

Instance/appsettings.json

@@ -106,6 +106,7 @@
       "RootDirectory": "D:/Images",
       "SaveFullYearOfRandomFiles": true,
       "SaveResizedSubFiles": true,
+      "SaveSortingWithoutPerson": false,
       "SkipSearch": false,
       "SortingMaximumPerFaceShouldBeHigh": 3000,
       "SortingMaximumPerKey": 7,

Map/Models/Configuration.cs

@@ -17,6 +17,7 @@ public class Configuration
     public string PersonBirthdayFormat { init; get; }
     public int RangeDaysDeltaTolerance { init; get; }
     public double RangeDistanceTolerance { init; get; }
+    public bool SaveSortingWithoutPerson { init; get; }
     public int SortingMaximumPerKey { init; get; }
     public int SortingMinimumToUseSigma { init; get; }
 
@@ -29,6 +30,7 @@ public class Configuration
                          string personCharacters,
                          int[] rangeDaysDeltaTolerance,
                          double[] rangeDistanceTolerance,
+                         bool saveSortingWithoutPerson,
                          int sortingMaximumPerKey,
                          int sortingMinimumToUseSigma,
                          string facesFileNameExtension,
@@ -44,6 +46,7 @@ public class Configuration
         FacesFileNameExtension = facesFileNameExtension;
         PersonBirthdayFirstYear = personBirthdayFirstYear;
         RangeDistanceTolerance = rangeDistanceTolerance[1];
+        SaveSortingWithoutPerson = saveSortingWithoutPerson;
         SortingMinimumToUseSigma = sortingMinimumToUseSigma;
         RangeDaysDeltaTolerance = rangeDaysDeltaTolerance[1];
         FacePartsFileNameExtension = facePartsFileNameExtension;

Map/Models/MapLogic.cs

@@ -174,17 +174,22 @@ public class MapLogic : Shared.Models.Methods.IMapLogic
         const int zero = 0;
         string mappingSegmentB;
         PersonBirthday personBirthday;
+        List<int>? normalizedRectangles;
         PersonContainer[]? personContainers;
         Dictionary<int, PersonContainer[]>? normalizedRectangleToPersonContainers;
         foreach (Mapping mapping in mappingCollection)
         {
             if (!_IdThenNormalizedRectangleToPersonContainers.TryGetValue(mapping.MappingFromItem.Id, out normalizedRectangleToPersonContainers))
             {
+                if (_SkipCollection.TryGetValue(mapping.MappingFromItem.Id, out normalizedRectangles) && normalizedRectangles.Contains(mapping.MappingFromLocation.NormalizedRectangle))
+                    continue;
                 result += 1;
                 continue;
             }
             if (!normalizedRectangleToPersonContainers.TryGetValue(mapping.MappingFromLocation.NormalizedRectangle, out personContainers))
             {
+                if (_SkipCollection.TryGetValue(mapping.MappingFromItem.Id, out normalizedRectangles) && normalizedRectangles.Contains(mapping.MappingFromLocation.NormalizedRectangle))
+                    continue;
                 result += 1;
                 continue;
             }
@@ -378,7 +383,7 @@ public class MapLogic : Shared.Models.Methods.IMapLogic
         return result;
     }
 
-    private static (string, bool, bool) Get(int? useFiltersCounter, string forceSingleImageHumanized, Mapping mapping)
+    private static (string, bool, bool) Get(int? useFiltersCounter, bool sortingContainersAny, string forceSingleImageHumanized, Mapping mapping)
     {
         string by;
         bool isByMapping;
@@ -386,7 +391,7 @@ public class MapLogic : Shared.Models.Methods.IMapLogic
         if (mapping.By is null)
         {
             isByMapping = false;
-            isBySorting = false;
+            isBySorting = !sortingContainersAny;
             by = $"{nameof(Shared.Models.Stateless.IMapLogic.Mapping)}Null";
         }
         else
@@ -437,7 +442,7 @@ public class MapLogic : Shared.Models.Methods.IMapLogic
         return result;
     }
 
-    private List<SaveContainer> GetSaveContainers(string dFacesContentDirectory, string d2FacePartsContentDirectory, Mapping[] mappingCollection, Dictionary<int, Dictionary<int, Mapping>> idToNormalizedRectangleToMapping, Dictionary<long, int> personKeyToCount, int? useFiltersCounter, bool saveNullPerson, bool saveMapped)
+    private List<SaveContainer> GetSaveContainers(string dFacesContentDirectory, string d2FacePartsContentDirectory, Mapping[] mappingCollection, Dictionary<int, Dictionary<int, Mapping>> idToNormalizedRectangleToMapping, Dictionary<long, int> personKeyToCount, int? useFiltersCounter, bool saveMapped, bool sortingContainersAny)
     {
         if (_Configuration is null)
             throw new NullReferenceException(nameof(_Configuration));
@@ -459,6 +464,7 @@ public class MapLogic : Shared.Models.Methods.IMapLogic
         SaveContainer? saveContainer;
         FileHolder facePartsFileHolder;
         FileHolder hiddenFaceFileHolder;
+        List<int>? normalizedRectangles;
         Dictionary<int, Mapping>? normalizedRectangleToMapping;
         string forceSingleImageHumanized = nameof(Shared.Models.Stateless.IMapLogic.ForceSingleImage).Humanize(LetterCasing.Title);
         foreach (Mapping mapping in mappingCollection)
@@ -466,15 +472,23 @@ public class MapLogic : Shared.Models.Methods.IMapLogic
             directoryName = Path.GetDirectoryName(mapping.MappingFromItem.RelativePath);
             if (directoryName is null)
                 throw new NotSupportedException();
-            (by, isByMapping, isBySorting) = Get(useFiltersCounter, forceSingleImageHumanized, mapping);
+            if (_SkipCollection.TryGetValue(mapping.MappingFromItem.Id, out normalizedRectangles) && normalizedRectangles.Contains(mapping.MappingFromLocation.NormalizedRectangle))
+                continue;
+            (by, isByMapping, isBySorting) = Get(useFiltersCounter, sortingContainersAny, forceSingleImageHumanized, mapping);
             if (isByMapping && !saveMapped)
                 continue;
             if (mapping.MappingFromPerson is null)
             {
-                if (!saveNullPerson)
+                if (!_Configuration.SaveSortingWithoutPerson)
                     continue;
                 if (mapping.SortingContainer is null)
-                    continue;
+                {
+                    if (sortingContainersAny)
+                        continue;
+                    mapping.UpdateMappingFromUnknownPerson(new(mapping, new(mapping)));
+                    if (mapping.SortingContainer is null)
+                        continue;
+                }
                 if (distinct.Contains(mapping.MappingFromItem.Id))
                     continue;
                 if (distinct.Contains(mapping.SortingContainer.Sorting.Id))
@@ -554,14 +568,14 @@ public class MapLogic : Shared.Models.Methods.IMapLogic
         return results;
     }
 
-    public List<SaveContainer> GetSaveContainers(string dFacesContentDirectory, string d2FacePartsContentDirectory, Mapping[] mappingCollection, Dictionary<int, Dictionary<int, Mapping>> idToNormalizedRectangleToMapping, int? useFiltersCounter, bool saveNullPerson)
+    public List<SaveContainer> GetSaveContainers(string dFacesContentDirectory, string d2FacePartsContentDirectory, Mapping[] mappingCollection, Dictionary<int, Dictionary<int, Mapping>> idToNormalizedRectangleToMapping, int? useFiltersCounter, bool sortingContainersAny)
     {
         if (_Configuration is null)
             throw new NullReferenceException(nameof(_Configuration));
         List<SaveContainer> results;
         bool saveMapped = false;
         Dictionary<long, int> personKeyToCount = new();
-        results = GetSaveContainers(dFacesContentDirectory, d2FacePartsContentDirectory, mappingCollection, idToNormalizedRectangleToMapping, personKeyToCount, useFiltersCounter, saveNullPerson, saveMapped);
+        results = GetSaveContainers(dFacesContentDirectory, d2FacePartsContentDirectory, mappingCollection, idToNormalizedRectangleToMapping, personKeyToCount, useFiltersCounter, saveMapped, sortingContainersAny);
         return results;
     }
 
@@ -571,10 +585,9 @@ public class MapLogic : Shared.Models.Methods.IMapLogic
             throw new NullReferenceException(nameof(_Configuration));
         int? updated = null;
         bool saveMapped = true;
-        bool saveNullPerson = false;
         int? useFiltersCounter = null;
         string mappingDirectory = Path.Combine(_EDistanceContentTicksDirectory, nameof(Shared.Models.Stateless.IMapLogic.Mapping));
-        List<SaveContainer> saveContainers = GetSaveContainers(dFacesContentDirectory, d2FacePartsContentDirectory, mappingCollection, idToNormalizedRectangleToMapping, personKeyToCount, useFiltersCounter, saveNullPerson, saveMapped);
+        List<SaveContainer> saveContainers = GetSaveContainers(dFacesContentDirectory, d2FacePartsContentDirectory, mappingCollection, idToNormalizedRectangleToMapping, personKeyToCount, useFiltersCounter, saveMapped, sortingContainersAny: true);
         SaveContainers(totalNotMapped, updated, saveContainers);
         if (!string.IsNullOrEmpty(_EDistanceContentTicksDirectory) && Directory.Exists(mappingDirectory))
             Stateless.MapLogic.SaveMappingShortcuts(mappingDirectory);
@@ -604,11 +617,8 @@ public class MapLogic : Shared.Models.Methods.IMapLogic
             throw new NotSupportedException();
         List<int>? normalizedRectangles;
         Dictionary<int, PersonContainer[]>? normalizedRectangleToPersonContainers;
-        if (_SkipCollection.TryGetValue(faceDistanceEncoding.Id, out normalizedRectangles))
+        if (_SkipCollection.TryGetValue(faceDistanceEncoding.Id, out normalizedRectangles) && normalizedRectangles.Contains(faceDistanceEncoding.NormalizedRectangle.Value))
-        {
+            result = true;
-            if (normalizedRectangles.Contains(faceDistanceEncoding.NormalizedRectangle.Value))
-                result = true;
-        }
         if (!result && _IdThenNormalizedRectangleToPersonContainers.TryGetValue(faceDistanceEncoding.Id, out normalizedRectangleToPersonContainers))
         {
             if (normalizedRectangleToPersonContainers.ContainsKey(faceDistanceEncoding.NormalizedRectangle.Value))
@@ -633,11 +643,8 @@ public class MapLogic : Shared.Models.Methods.IMapLogic
                 throw new NotSupportedException();
             if (j == i)
                 continue;
-            if (_SkipCollection.TryGetValue(faceDistanceEncoding.Id, out normalizedRectangles))
+            if (_SkipCollection.TryGetValue(faceDistanceEncoding.Id, out normalizedRectangles) && normalizedRectangles.Contains(faceDistanceEncoding.NormalizedRectangle.Value))
-            {
+                continue;
-                if (normalizedRectangles.Contains(faceDistanceEncoding.NormalizedRectangle.Value))
-                    continue;
-            }
             if (_IdThenNormalizedRectangleToPersonContainers.TryGetValue(faceDistanceEncoding.Id, out normalizedRectangleToPersonContainers))
             {
                 if (normalizedRectangleToPersonContainers.ContainsKey(faceDistanceEncoding.NormalizedRectangle.Value))
@@ -671,7 +678,7 @@ public class MapLogic : Shared.Models.Methods.IMapLogic
         return results;
     }
 
-    public int UpdateFromSortingContainers(SortingContainer[] sortingContainers, bool saveNullPerson)
+    public int UpdateFromSortingContainers(SortingContainer[] sortingContainers)
     {
         if (_Configuration is null)
             throw new NullReferenceException(nameof(_Configuration));
@@ -711,7 +718,7 @@ public class MapLogic : Shared.Models.Methods.IMapLogic
             normalizedRectangleCollectionForB = idToNormalizedRectangleCollectionForB[sortingContainer.Mapping.MappingFromItem.Id];
             if (!_IdThenNormalizedRectangleToPersonContainers.TryGetValue(sortingContainer.Sorting.Id, out normalizedRectangleToPersonContainers) || !normalizedRectangleToPersonContainers.TryGetValue(sortingContainer.Sorting.NormalizedRectangle, out personContainers))
             {
-                if (!saveNullPerson)
+                if (!_Configuration.SaveSortingWithoutPerson)
                     continue;
                 if (normalizedRectangleCollectionForA.Contains(sortingContainer.Mapping.MappingFromLocation.NormalizedRectangle))
                     continue;
@@ -1299,4 +1306,19 @@ public class MapLogic : Shared.Models.Methods.IMapLogic
         _PersonKeyToRanges = personKeyToRanges;
     }
 
+    public List<Face> GetFurtherFilterBySkipCollection(List<Face> distinctFilteredFaces)
+    {
+        List<Face> results = new();
+        List<int>? normalizedRectangles;
+        foreach (Face face in distinctFilteredFaces)
+        {
+            if (face.Mapping is null)
+                continue;
+            if (_SkipCollection.TryGetValue(face.Mapping.MappingFromItem.Id, out normalizedRectangles) && normalizedRectangles.Contains(face.Mapping.MappingFromLocation.NormalizedRectangle))
+                continue;
+            results.Add(face);
+        }
+        return results;
+    }
+
 }

Map/Models/Stateless/MapLogic.cs

@@ -87,6 +87,7 @@ internal abstract class MapLogic
         string ticksDirectoryName;
         string? personFirstInitial;
         DirectoryInfo directoryInfo;
+        bool isReservedDirectoryName;
         string[] personKeyDirectories;
         string[] personNameDirectories;
         string[] personNameLinkDirectories;
@@ -116,6 +117,7 @@ internal abstract class MapLogic
             foreach (string personKeyDirectory in personKeyDirectories)
             {
                 personKeyFormatted = Path.GetFileName(personKeyDirectory);
+                isReservedDirectoryName = personKeyFormatted.StartsWith(nameof(Shared.Models.Stateless.IMapLogic.Sorting)) || personKeyFormatted.StartsWith(nameof(Shared.Models.Stateless.IMapLogic.Mapping)) || personKeyFormatted.StartsWith(nameof(Shared.Models.Stateless.IMapLogic.ManualCopy));
                 yearDirectories = Directory.GetDirectories(personKeyDirectory, "*", SearchOption.TopDirectoryOnly);
                 foreach (string yearDirectory in yearDirectories)
                 {
@@ -129,7 +131,7 @@ internal abstract class MapLogic
                         if (!personDisplayDirectoryNames.Any())
                             continue;
                         files = Directory.GetFiles(personNameDirectory, "*", SearchOption.TopDirectoryOnly);
-                        if (personKeyFormatted == nameof(Shared.Models.Stateless.IMapLogic.Sorting) && files.Any())
+                        if (isReservedDirectoryName && files.Any())
                             throw new Exception($"Move personKey directories up one from {nameof(Shared.Models.Stateless.IMapLogic.Sorting)} and delete {nameof(Shared.Models.Stateless.IMapLogic.Sorting)} directory!");
                         if (personKeyFormatted == manualCopyHumanized && files.Any())
                             throw new Exception($"Move personKey directories up one from {manualCopyHumanized} and delete {manualCopyHumanized} directory!");

PhotoPrism/Models/_F_PhotoPrism.cs

@@ -68,22 +68,23 @@ public class F_PhotoPrism
         MappingFromPhotoPrism mappingFromPhotoPrism;
         List<MappingFromPhotoPrism>? mappingFromPhotoPrismCollection;
         DatabaseFile[]? databaseFiles = GetDatabaseFiles(fPhotoPrismSingletonDirectory);
-        if (databaseFiles is null)
+        if (databaseFiles is not null)
-            throw new NullReferenceException(nameof(databaseFiles));
-        Dictionary<string, List<Marker>> fileUIdToMarkers = GetFileUIdToMarkers(fPhotoPrismSingletonDirectory);
-        foreach (DatabaseFile databaseFile in databaseFiles)
         {
-            if (!results.TryGetValue(databaseFile.FileName, out mappingFromPhotoPrismCollection))
+            Dictionary<string, List<Marker>> fileUIdToMarkers = GetFileUIdToMarkers(fPhotoPrismSingletonDirectory);
+            foreach (DatabaseFile databaseFile in databaseFiles)
             {
-                results.Add(databaseFile.FileName, new());
                 if (!results.TryGetValue(databaseFile.FileName, out mappingFromPhotoPrismCollection))
-                    throw new Exception();
+                {
+                    results.Add(databaseFile.FileName, new());
+                    if (!results.TryGetValue(databaseFile.FileName, out mappingFromPhotoPrismCollection))
+                        throw new Exception();
+                }
+                if (!fileUIdToMarkers.TryGetValue(databaseFile.FileUid, out makers))
+                    mappingFromPhotoPrism = new(databaseFile, new());
+                else
+                    mappingFromPhotoPrism = new(databaseFile, makers);
+                mappingFromPhotoPrismCollection.Add(mappingFromPhotoPrism);
             }
-            if (!fileUIdToMarkers.TryGetValue(databaseFile.FileUid, out makers))
-                mappingFromPhotoPrism = new(databaseFile, new());
-            else
-                mappingFromPhotoPrism = new(databaseFile, makers);
-            mappingFromPhotoPrismCollection.Add(mappingFromPhotoPrism);
         }
         return results;
     }

Property/Models/Stateless/Container.cs

@@ -50,6 +50,8 @@ public class Container
         foreach (string sourceDirectoryFile in sourceDirectoryFiles)
         {
             json = File.ReadAllText(sourceDirectoryFile);
+            if (string.IsNullOrEmpty(json))
+                continue;
             key = Shared.Models.Stateless.Methods.IPath.GetRelativePath(sourceDirectoryFile, length);
             property = JsonSerializer.Deserialize<Shared.Models.Property>(json);
             collection.Add(new(sourceDirectoryFile, property));

Shared/Models/Sorting.cs

@@ -24,6 +24,10 @@ public record class Sorting : Properties.ISorting
         WithinRange = withinRange;
     }
 
+    public Sorting(Mapping mapping) :
+        this(0, 0, mapping.MappingFromItem.Id, mapping.MappingFromLocation.NormalizedRectangle, false, 0)
+    { }
+
     public override string ToString()
     {
         string result = JsonSerializer.Serialize(this, new JsonSerializerOptions() { WriteIndented = true });