Mass push

Face/Models/_D_Face.cs

@@ -31,12 +31,9 @@ public class D_Face
 
     private readonly Model _Model;
     private readonly string _ArgZero;
-    private readonly int _NumberOfJitters;
     private readonly Serilog.ILogger? _Log;
     private readonly bool _OverrideForFaceImages;
     private readonly Configuration _Configuration;
-    private readonly int _NumberOfTimesToUpsample;
-    private readonly bool _RetryImagesWithoutAFace;
     private readonly ImageCodecInfo _ImageCodecInfo;
     private readonly ModelParameter _ModelParameter;
     private readonly PredictorModel _PredictorModel;
@@ -46,6 +43,7 @@ public class D_Face
     private readonly int _FaceDistanceHiddenImageFactor;
     private readonly EncoderParameters _EncoderParameters;
     private readonly ImageCodecInfo _HiddenImageCodecInfo;
+    private readonly bool _RetryImagesWithoutAFaceLocation;
     private readonly bool _ForceFaceLastWriteTimeToCreationTime;
     private readonly EncoderParameters _HiddenEncoderParameters;
     private readonly JsonSerializerOptions _WriteIndentedAndWhenWritingNull;
@@ -64,30 +62,26 @@ public class D_Face
         ImageCodecInfo imageCodecInfo,
         string modelDirectory,
         string modelName,
-        int numberOfJitters,
-        int numberOfTimesToUpsample,
         bool overrideForFaceImages,
-        bool retryImagesWithoutAFace,
+        bool retryImagesWithoutAFaceLocation,
         string predictorModelName,
         bool propertiesChangedForFaces)
     {
         _ArgZero = argZero;
         _Configuration = configuration;
         _ImageCodecInfo = imageCodecInfo;
-        _NumberOfJitters = numberOfJitters;
         _EncoderParameters = encoderParameters;
         _FileNameExtension = filenameExtension;
         _Log = Serilog.Log.ForContext<D_Face>();
         AngleBracketCollection = new List<string>();
         _HiddenImageCodecInfo = hiddenImageCodecInfo;
         _OverrideForFaceImages = overrideForFaceImages;
-        _RetryImagesWithoutAFace = retryImagesWithoutAFace;
         _HiddenEncoderParameters = hiddenEncoderParameters;
         _HiddenFileNameExtension = hiddenFileNameExtension;
-        _NumberOfTimesToUpsample = numberOfTimesToUpsample;
         _CheckDFaceAndUpWriteDates = checkDFaceAndUpWriteDates;
         _PropertiesChangedForFaces = propertiesChangedForFaces;
         _FaceDistanceHiddenImageFactor = faceDistanceHiddenImageFactor;
+        _RetryImagesWithoutAFaceLocation = retryImagesWithoutAFaceLocation;
         _ForceFaceLastWriteTimeToCreationTime = forceFaceLastWriteTimeToCreationTime;
         (Model model, PredictorModel predictorModel, ModelParameter modelParameter) = GetModel(modelDirectory, modelName, predictorModelName);
         _Model = model;
@@ -149,19 +143,10 @@ public class D_Face
 
 #pragma warning disable CA1416
 
-    private static byte[] GetBytes(string value)
-    {
-        byte[] results = new byte[value.Length + 1];
-        for (int i = 0; i < value.Length; i++)
-            results[i] = (byte)value[i];
-        results[value.Length] = 0x00;
-        return results;
-    }
-
     private PropertyItem GetPropertyItem(int id, string value)
     {
         PropertyItem result = (PropertyItem)_ConstructorInfo.Invoke(null);
-        byte[] bytes = GetBytes(value);
+        byte[] bytes = C_Resize.GetBytes(value);
         result.Id = id;
         result.Len = value.Length + 1;
         result.Type = 2;
@@ -234,6 +219,10 @@ public class D_Face
     {
         if (_Log is null)
             throw new NullReferenceException(nameof(_Log));
+        if (_Configuration.NumberOfJitters is null)
+            throw new NullReferenceException(nameof(_Configuration.NumberOfJitters));
+        if (_Configuration.NumberOfTimesToUpsample is null)
+            throw new NullReferenceException(nameof(_Configuration.NumberOfTimesToUpsample));
         List<Shared.Models.Face> results = new();
         FaceRecognitionDotNet.Image? unknownImage;
         if (!mappingFromItem.ResizedFileHolder.Exists)
@@ -253,7 +242,7 @@ public class D_Face
         else
         {
             List<(Location Location, FaceRecognitionDotNet.FaceEncoding? FaceEncoding, Dictionary<FacePart, FacePoint[]>? FaceParts)> collection;
-            FaceRecognition faceRecognition = new(_NumberOfTimesToUpsample, _NumberOfJitters, _PredictorModel, _Model, _ModelParameter);
+            FaceRecognition faceRecognition = new(_Configuration.NumberOfJitters.Value, _Configuration.NumberOfTimesToUpsample.Value, _Model, _ModelParameter, _PredictorModel);
             collection = faceRecognition.GetCollection(unknownImage, includeFaceEncoding: true, includeFaceParts: true);
             if (!collection.Any())
                 results.Add(new(property, outputResolutionWidth, outputResolutionHeight, outputResolutionOrientation, location: null));
@@ -306,9 +295,9 @@ public class D_Face
                 throw new NullReferenceException(nameof(item.ImageFileHolder.DirectoryName));
             SetAngleBracketCollection(dResultsFullGroupDirectory, item.ImageFileHolder.DirectoryName);
         }
+        result = Path.Combine(AngleBracketCollection[0].Replace("<>", "()"), item.ImageFileHolder.NameWithoutExtension);
         if (!angleBracketCollectionAny)
             AngleBracketCollection.Clear();
-        result = Path.Combine(AngleBracketCollection[0].Replace("<>", "()"), item.ImageFileHolder.NameWithoutExtension);
         return result;
     }
 
@@ -324,17 +313,6 @@ public class D_Face
         List<DateTime> dateTimes = (from l in subFileTuples where changesFrom.Contains(l.Item1) select l.Item2).ToList();
         string dCollectionFile = Path.Combine(dResultsFullGroupDirectory, "[]", _Configuration.ResultAllInOne, $"{mappingFromItem.Id}{mappingFromItem.ImageFileHolder.ExtensionLowered}.json");
         FileInfo fileInfo = new(dCollectionFile);
-        if (!fileInfo.FullName.Contains(_Configuration.ResultAllInOne) && !fileInfo.Exists)
-        {
-            if (fileInfo.Directory?.Parent is null)
-                throw new Exception();
-            string parentCheck = Path.Combine(fileInfo.Directory.Parent.FullName, fileInfo.Name);
-            if (File.Exists(parentCheck))
-            {
-                File.Move(parentCheck, fileInfo.FullName);
-                fileInfo.Refresh();
-            }
-        }
         if (_ForceFaceLastWriteTimeToCreationTime && !fileInfo.Exists && File.Exists(Path.ChangeExtension(fileInfo.FullName, ".delete")))
         {
             File.Move(Path.ChangeExtension(fileInfo.FullName, ".delete"), fileInfo.FullName);
@@ -367,32 +345,148 @@ public class D_Face
                 parseExceptions.Add(nameof(D_Face));
             }
         }
-        if (results is null || (_RetryImagesWithoutAFace && results.Count == 1 && results[0].FaceEncoding is null))
+        if (results is null || (_RetryImagesWithoutAFaceLocation && results.Count == 1 && results[0].Location is null))
         {
             bool wasNull = results is null;
             results = GetFaces(property, mappingFromItem, outputResolutionWidth, outputResolutionHeight, outputResolutionOrientation);
-            if (wasNull || (!wasNull && results.Any(l => l.FaceEncoding is not null)))
+            if (wasNull || (!wasNull && results.Any(l => l.Location is not null)))
             {
                 json = JsonSerializer.Serialize(results, _WriteIndentedAndWhenWritingNull);
                 bool updateDateWhenMatches = dateTimes.Any() && fileInfo.Exists && dateTimes.Max() > fileInfo.LastWriteTime;
                 DateTime? dateTime = !updateDateWhenMatches ? null : dateTimes.Max();
                 if (Shared.Models.Stateless.Methods.IPath.WriteAllText(fileInfo.FullName, json, updateDateWhenMatches, compareBeforeWrite: true, updateToWhenMatches: dateTime))
-                    subFileTuples.Add(new Tuple<string, DateTime>(nameof(D_Face), DateTime.Now));
+                {
+                    if (!_ForceFaceLastWriteTimeToCreationTime && (!fileInfo.Exists || fileInfo.LastWriteTime == fileInfo.CreationTime))
+                        subFileTuples.Add(new Tuple<string, DateTime>(nameof(D_Face), DateTime.Now));
+                    else
+                    {
+                        File.SetLastWriteTime(fileInfo.FullName, fileInfo.CreationTime);
+                        fileInfo.Refresh();
+                        subFileTuples.Add(new Tuple<string, DateTime>(nameof(D_Face), fileInfo.CreationTime));
+                    }
+                }
             }
         }
-        if (_ForceFaceLastWriteTimeToCreationTime)
+        return results;
+    }
+
+    private void WriteAllText(Dictionary<string, List<RelativeLocation>>? results, List<DateTime> dateTimes, FileInfo fileInfo)
+    {
+        string json = JsonSerializer.Serialize(results, _WriteIndentedAndWhenWritingNull);
+        bool updateDateWhenMatches = dateTimes.Any() && fileInfo.Exists && dateTimes.Max() > fileInfo.LastWriteTime;
+        DateTime? dateTime = !updateDateWhenMatches ? null : dateTimes.Max();
+        if (Shared.Models.Stateless.Methods.IPath.WriteAllText(fileInfo.FullName, json, updateDateWhenMatches, compareBeforeWrite: true, updateToWhenMatches: dateTime))
         {
-            results = (from l in results select new Shared.Models.Face(ILocation.Digits, ILocation.Factor, results.Count, l)).ToList();
-            json = JsonSerializer.Serialize(results, _WriteIndentedAndWhenWritingNull);
-            bool updateDateWhenMatches = dateTimes.Any() && fileInfo.Exists && dateTimes.Max() > fileInfo.LastWriteTime;
-            DateTime? dateTime = !updateDateWhenMatches ? null : dateTimes.Max();
-            if (Shared.Models.Stateless.Methods.IPath.WriteAllText(fileInfo.FullName, json, updateDateWhenMatches, compareBeforeWrite: true, updateToWhenMatches: dateTime))
+            if (!_ForceFaceLastWriteTimeToCreationTime && (!fileInfo.Exists || fileInfo.LastWriteTime == fileInfo.CreationTime))
+                ; // subFileTuples.Add(new Tuple<string, DateTime>(nameof(D_Face), DateTime.Now));
+            else
             {
                 File.SetLastWriteTime(fileInfo.FullName, fileInfo.CreationTime);
                 fileInfo.Refresh();
-                subFileTuples.Add(new Tuple<string, DateTime>(nameof(D_Face), fileInfo.CreationTime));
+                // subFileTuples.Add(new Tuple<string, DateTime>(nameof(D_Face), fileInfo.CreationTime));
             }
         }
+    }
+
+    public Dictionary<string, List<RelativeLocation>> GetRelativeLocations(string outputResolution, string dResultsDateGroupDirectory, List<Tuple<string, DateTime>> subFileTuples, List<string> parseExceptions, Shared.Models.Property property, MappingFromItem mappingFromItem, int outputResolutionWidth, int outputResolutionHeight, int outputResolutionOrientation, string original, Dictionary<string, int[]> imageResizeKeyValuePairs, List<Shared.Models.Face> faces)
+    {
+        Dictionary<string, List<RelativeLocation>>? results;
+        if (string.IsNullOrEmpty(dResultsDateGroupDirectory))
+            throw new NullReferenceException(nameof(dResultsDateGroupDirectory));
+        if (!imageResizeKeyValuePairs.ContainsKey(original))
+            throw new Exception();
+        if (!imageResizeKeyValuePairs.ContainsKey(outputResolution))
+            throw new Exception();
+        string json;
+        decimal? h, l, t, w;
+        RelativeLocation relativeLocation;
+        List<RelativeLocation> relativeLocations = new();
+        int[] resize = imageResizeKeyValuePairs[outputResolution];
+        string key = $"{resize[0].ToString().PadLeft(6, '0')}.{resize[1].ToString().PadLeft(6, '0')}";
+        string[] changesFrom = new string[] { nameof(A_Property), nameof(B_Metadata), nameof(C_Resize), nameof(D_Face) };
+        List<DateTime> dateTimes = (from d in subFileTuples where changesFrom.Contains(d.Item1) select d.Item2).ToList();
+        string dCollectionDirectory = Path.Combine(dResultsDateGroupDirectory, "[]", _Configuration.ResultAllInOne);
+        string dCollectionFile = Path.Combine(dCollectionDirectory, $"{mappingFromItem.Id}{mappingFromItem.ImageFileHolder.ExtensionLowered}.json");
+        if (!Directory.Exists(dCollectionDirectory))
+            _ = Directory.CreateDirectory(dCollectionDirectory);
+        FileInfo fileInfo = new(dCollectionFile);
+        if (_ForceFaceLastWriteTimeToCreationTime && !fileInfo.Exists && File.Exists(Path.ChangeExtension(fileInfo.FullName, ".delete")))
+        {
+            File.Move(Path.ChangeExtension(fileInfo.FullName, ".delete"), fileInfo.FullName);
+            fileInfo.Refresh();
+        }
+        if (_ForceFaceLastWriteTimeToCreationTime && fileInfo.Exists && fileInfo.LastWriteTime != fileInfo.CreationTime)
+        {
+            File.SetLastWriteTime(fileInfo.FullName, fileInfo.CreationTime);
+            fileInfo.Refresh();
+        }
+        if (_PropertiesChangedForFaces)
+            results = null;
+        else if (!fileInfo.Exists)
+            results = null;
+        else if (_CheckDFaceAndUpWriteDates && dateTimes.Any() && dateTimes.Max() > fileInfo.LastWriteTime)
+            results = null;
+        else
+        {
+            json = Shared.Models.Stateless.Methods.IFace.GetJson(fileInfo.FullName);
+            try
+            {
+                results = JsonSerializer.Deserialize<Dictionary<string, List<RelativeLocation>>>(json);
+                if (results is null)
+                    throw new NullReferenceException(nameof(results));
+                bool added = false;
+                relativeLocations.Clear();
+                foreach (KeyValuePair<string, List<RelativeLocation>> keyValuePair in results)
+                    relativeLocations.AddRange(keyValuePair.Value);
+                if (!results.ContainsKey(key))
+                    results.Add(key, new());
+                foreach (Shared.Models.Face face in faces)
+                {
+                    if (face.Location is null || face.OutputResolution is null)
+                        continue;
+                    (h, l, t, w) = Shared.Models.Stateless.Methods.ILocation.GetHeightLeftTopWidth(face.Location, face.OutputResolution);
+                    if (h is null || l is null || t is null || w is null)
+                        continue;
+                    relativeLocation = new(face.Location.Confidence, h.Value.ToString(), l.Value.ToString(), t.Value.ToString(), w.Value.ToString());
+                    if (relativeLocations.Any(r => r.Match(h, l, t, w)))
+                        continue;
+                    if (!added)
+                        added = true;
+                    results[key].Add(relativeLocation);
+                }
+                if (added)
+                {
+                    List<(string Key, List<RelativeLocation> Value)> sort = new();
+                    foreach (KeyValuePair<string, List<RelativeLocation>> keyValuePair in results)
+                        sort.Add(new(keyValuePair.Key, keyValuePair.Value));
+                    results.Clear();
+                    foreach ((string k, List<RelativeLocation> v) in sort.OrderBy(l => l.Key))
+                        results.Add(k, v.OrderByDescending(l => l.Confidence).ToList());
+                    WriteAllText(results, dateTimes, fileInfo);
+                }
+                // subFileTuples.Add(new Tuple<string, DateTime>(nameof(D_Face), fileInfo.LastWriteTime));
+            }
+            catch (Exception)
+            {
+                results = null;
+                parseExceptions.Add(nameof(D_Face));
+            }
+        }
+        if (results is null)
+        {
+            results = new() { { key, new() } };
+            foreach (Shared.Models.Face face in faces)
+            {
+                if (face.Location is null || face.OutputResolution is null)
+                    continue;
+                (h, l, t, w) = Shared.Models.Stateless.Methods.ILocation.GetHeightLeftTopWidth(face.Location, face.OutputResolution);
+                if (h is null || l is null || t is null || w is null)
+                    continue;
+                relativeLocation = new(face.Location.Confidence, h.Value.ToString(), l.Value.ToString(), t.Value.ToString(), w.Value.ToString());
+                results[key].Add(relativeLocation);
+            }
+            WriteAllText(results, dateTimes, fileInfo);
+        }
         return results;
     }
 
@@ -400,7 +494,6 @@ public class D_Face
     {
         FileInfo fileInfo;
         bool result = false;
-        string parentCheck;
         string deterministicHashCodeKey;
         List<(Shared.Models.Face, FileInfo?, string)> collection = new();
         string[] changesFrom = new string[] { nameof(A_Property), nameof(B_Metadata), nameof(C_Resize) };
@@ -414,16 +507,8 @@ public class D_Face
                 collection.Add(new(face, null, string.Empty));
                 continue;
             }
-            deterministicHashCodeKey = Shared.Models.Stateless.Methods.IMapping.GetDeterministicHashCodeKey(mappingFromItem.Id, face.Location, ILocation.Digits, ILocation.Factor, face.OutputResolution);
+            deterministicHashCodeKey = Shared.Models.Stateless.Methods.IMapping.GetDeterministicHashCodeKey(mappingFromItem.Id, face.Location, ILocation.Digits, face.OutputResolution);
             fileInfo = new FileInfo(Path.Combine(facesDirectory, $"{deterministicHashCodeKey}{mappingFromItem.ImageFileHolder.ExtensionLowered}{_FileNameExtension}"));
-            if (!fileInfo.FullName.Contains(_Configuration.ResultAllInOne) && !fileInfo.Exists)
-            {
-                if (fileInfo.Directory?.Parent is null)
-                    throw new Exception();
-                parentCheck = Path.Combine(fileInfo.Directory.Parent.FullName, fileInfo.Name);
-                if (File.Exists(parentCheck))
-                    File.Delete(parentCheck);
-            }
             collection.Add(new(face, fileInfo, Path.Combine(facesDirectory, $"{deterministicHashCodeKey}{mappingFromItem.ImageFileHolder.ExtensionLowered}{_HiddenFileNameExtension}")));
             if (_OverrideForFaceImages)
                 result = true;