phares3757/view-by-distance-mklink-console
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Alignment with Phares 8.0.118.14751 for Shared and Metadata

Browse Source 
A_Metadata

House Cleaning
This commit is contained in:
Mike Phares
2025-07-20 08:41:45 -07:00
parent 30d8a270f9
commit 39e5e6c5b3
29 changed files with 702 additions and 361 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Distance/Models/_E_Distance.cs
View File

@ -229,7 +229,7 @@ public partial class E_Distance : IDistance
throw new NullReferenceException(nameof(locationContainer.ExifDirectory));
continue;
}
json = Metadata.Models.Stateless.Methods.IMetadata.GetFaceEncoding(locationContainer.ExifDirectory);
json = Metadata.Models.Stateless.Methods.IMetadata.GetRawFaceEncoding(locationContainer.ExifDirectory);
if (json is null)
{
if (_DistanceMoveUnableToMatch)
@ -338,7 +338,6 @@ public partial class E_Distance : IDistance
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;
@ -348,8 +347,7 @@ public partial class E_Distance : IDistance
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);
faceEncoding = Metadata.Models.Stateless.Methods.IMetadata.GetFaceEncoding(keyValue.Value.ExifDirectory);
if (faceEncoding is null)
continue;
encoding = FaceRecognition.LoadFaceEncoding(faceEncoding.RawEncoding);
@ -364,7 +362,6 @@ public partial class E_Distance : IDistance
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;
@ -403,8 +400,7 @@ public partial class E_Distance : IDistance
if (!locationContainer.FilePath.DirectoryFullPath.Contains(focusDirectory))
continue;
}
json = Metadata.Models.Stateless.Methods.IMetadata.GetFaceEncoding(locationContainer.ExifDirectory);
faceEncoding = json is null ? null : JsonSerializer.Deserialize<Shared.Models.FaceEncoding>(json);
faceEncoding = Metadata.Models.Stateless.Methods.IMetadata.GetFaceEncoding(locationContainer.ExifDirectory);
if (faceEncoding is null)
continue;
encoding = FaceRecognition.LoadFaceEncoding(faceEncoding.RawEncoding);
@ -678,16 +674,12 @@ public partial class E_Distance : IDistance
ReadOnlyCollection<RelationContainer> IDistance.GetRelationContainers(IDistanceLimits distanceLimits, int faceDistancePermyriad, int locationContainerDistanceTake, float locationContainerDistanceTolerance, ReadOnlyCollection<LocationContainer> locationContainers)
{
ReadOnlyCollection<RelationContainer> result;
string? json;
List<Record> records = [];
Shared.Models.FaceEncoding? modelsFaceEncoding;
FaceRecognitionDotNet.FaceEncoding faceRecognitionDotNetFaceEncoding;
foreach (LocationContainer locationContainer in locationContainers)
{
json = Metadata.Models.Stateless.Methods.IMetadata.GetFaceEncoding(locationContainer.ExifDirectory);
if (json is null)
continue;
modelsFaceEncoding = JsonSerializer.Deserialize<Shared.Models.FaceEncoding>(json);
modelsFaceEncoding = Metadata.Models.Stateless.Methods.IMetadata.GetFaceEncoding(locationContainer.ExifDirectory);
if (modelsFaceEncoding is null)
throw new NotSupportedException();
faceRecognitionDotNetFaceEncoding = FaceRecognition.LoadFaceEncoding(modelsFaceEncoding.RawEncoding);