Made useable by Helpers

This commit is contained in:
2025-07-20 08:31:03 -07:00
parent d67d423ef3
commit 518af493a8
133 changed files with 417 additions and 372 deletions

View File

@ -1,3 +1,3 @@
namespace View_by_Distance.Metadata.Models;
namespace Phares.Metadata.Models;
public class C_Resize() { }

View File

@ -1,3 +1,3 @@
namespace View_by_Distance.Metadata.Models;
namespace Phares.Metadata.Models;
public class D2_FaceParts() { }

View File

@ -1,7 +1,7 @@
using View_by_Distance.Shared.Models;
using View_by_Distance.Shared.Models.Methods;
using Phares.Shared.Models;
using Phares.Shared.Models.Methods;
namespace View_by_Distance.Metadata.Models;
namespace Phares.Metadata.Models;
public class DistanceLimits : IDistanceLimits
{

View File

@ -1,3 +1,3 @@
namespace View_by_Distance.Metadata.Models;
namespace Phares.Metadata.Models;
public class E_Distance() { }

View File

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

View File

@ -1,8 +1,7 @@
using Phares.Shared.Models;
using Phares.Shared.Models.Properties;
using Phares.Shared.Models.Stateless;
using System.Collections.ObjectModel;
using System.Text.Json;
using View_by_Distance.Shared.Models;
using View_by_Distance.Shared.Models.Properties;
using View_by_Distance.Shared.Models.Stateless;
namespace View_by_Distance.Distance.Models.Stateless;
@ -49,7 +48,6 @@ internal static class FaceEncodingLogic
internal static LocationContainer? GetLocationContainer(DistanceSettings distanceSettings, ICompareSettings compareSettings, ExifDirectory exifDirectory)
{
LocationContainer? result;
string? json;
DateOnly dateOnly;
FaceFile? faceFile;
int? wholePercentages;
@ -70,8 +68,7 @@ internal static class FaceEncodingLogic
else
{
dateOnly = DateOnly.FromDateTime(new DateTime(exifDirectory.FilePath.CreationTicks));
json = Metadata.Models.Stateless.IMetadata.GetFaceEncoding(exifDirectory);
faceEncoding = json is null ? null : JsonSerializer.Deserialize(json, FaceEncodingGenerationContext.Default.FaceEncoding);
faceEncoding = Phares.Metadata.Models.Stateless.IMetadata.GetFaceEncoding(exifDirectory);
if (faceEncoding is null)
result = null;
else
@ -94,24 +91,13 @@ internal static class FaceEncodingLogic
private static FaceFile? GetFaceFile(DistanceSettings distanceSettings, ExifDirectory exifDirectory)
{
FaceFile? result;
string? json = Metadata.Models.Stateless.IMetadata.GetOutputResolution(exifDirectory);
if (json is null || !json.Contains(nameof(DateTime)))
FaceFile? result = Phares.Metadata.Models.Stateless.IMetadata.GetFaceFile(exifDirectory);
if (result is null || result.Location is null)
{
if (distanceSettings.DistanceMoveUnableToMatch)
MoveUnableToMatch(exifDirectory.FilePath);
result = null;
}
else
{
result = JsonSerializer.Deserialize(json, FaceFileGenerationContext.Default.FaceFile);
if (result is null || result.Location is null)
{
if (distanceSettings.DistanceMoveUnableToMatch)
MoveUnableToMatch(exifDirectory.FilePath);
result = null;
}
}
return result;
}

View File

@ -1,8 +1,7 @@
using System.Collections.ObjectModel;
using System.Text.Json;
using View_by_Distance.Shared.Models;
using View_by_Distance.Shared.Models.Properties;
using View_by_Distance.Shared.Models.Stateless;
using Phares.Shared.Models;
using Phares.Shared.Models.Properties;
using Phares.Shared.Models.Stateless;
namespace View_by_Distance.Distance.Models.Stateless;
@ -35,7 +34,6 @@ internal static class FilterLogicA
internal static ReadOnlyCollection<LocationContainer> GetPreFilterLocationContainer(DistanceSettings distanceSettings, ICompareSettings compareSettings, ICompare compare, ReadOnlyCollections readOnlyCollections, ReadOnlyDictionary<int, ReadOnlyDictionary<int, LocationContainer>> mappedIdsThenWholePercentagesToLocationContainer, ReadOnlyCollection<ExifDirectory> exifDirectories)
{
List<LocationContainer> results = [];
string? json;
string? model;
bool? canReMap;
bool? isFocusPerson;
@ -80,8 +78,7 @@ internal static class FilterLogicA
if (!locationContainer.FilePath.DirectoryFullPath.Contains(distanceSettings.FocusDirectory))
continue;
}
json = Metadata.Models.Stateless.IMetadata.GetFaceEncoding(locationContainer.ExifDirectory);
faceEncoding = json is null ? null : JsonSerializer.Deserialize(json, FaceEncodingGenerationContext.Default.FaceEncoding);
faceEncoding = Phares.Metadata.Models.Stateless.IMetadata.GetFaceEncoding(locationContainer.ExifDirectory);
if (faceEncoding is null)
continue;
encoding = FaceRecognitionDotNet.Models.FaceRecognition.LoadFaceEncoding(faceEncoding.RawEncoding);

View File

@ -1,7 +1,7 @@
using System.Collections.ObjectModel;
using View_by_Distance.Shared.Models;
using View_by_Distance.Shared.Models.Properties;
using View_by_Distance.Shared.Models.Stateless;
using Phares.Shared.Models;
using Phares.Shared.Models.Properties;
using Phares.Shared.Models.Stateless;
namespace View_by_Distance.Distance.Models.Stateless;

View File

@ -1,7 +1,7 @@
using System.Collections.ObjectModel;
using View_by_Distance.Metadata.Models;
using View_by_Distance.Shared.Models;
using View_by_Distance.Shared.Models.Stateless;
using Phares.Metadata.Models;
using Phares.Shared.Models;
using Phares.Shared.Models.Stateless;
namespace View_by_Distance.Distance.Models.Stateless;

View File

@ -1,9 +1,9 @@
using Humanizer;
using System.Collections.ObjectModel;
using View_by_Distance.Metadata.Models;
using View_by_Distance.Shared.Models;
using View_by_Distance.Shared.Models.Properties;
using View_by_Distance.Shared.Models.Stateless;
using Phares.Metadata.Models;
using Phares.Shared.Models;
using Phares.Shared.Models.Properties;
using Phares.Shared.Models.Stateless;
using WindowsShortcutFactory;
namespace View_by_Distance.Distance.Models.Stateless;

View File

@ -1,8 +1,8 @@
using System.Collections.ObjectModel;
using View_by_Distance.Metadata.Models;
using View_by_Distance.Shared.Models;
using View_by_Distance.Shared.Models.Properties;
using View_by_Distance.Shared.Models.Stateless;
using Phares.Metadata.Models;
using Phares.Shared.Models;
using Phares.Shared.Models.Properties;
using Phares.Shared.Models.Stateless;
namespace View_by_Distance.Distance.Models.Stateless;

View File

@ -1,9 +1,9 @@
using System.Collections.ObjectModel;
using View_by_Distance.Metadata.Models;
using View_by_Distance.Metadata.Models.Stateless;
using View_by_Distance.Shared.Models;
using View_by_Distance.Shared.Models.Properties;
using View_by_Distance.Shared.Models.Stateless;
using Phares.Metadata.Models;
using Phares.Metadata.Models.Stateless;
using Phares.Shared.Models;
using Phares.Shared.Models.Properties;
using Phares.Shared.Models.Stateless;
namespace View_by_Distance.Distance.Models.Stateless;

View File

@ -2,9 +2,9 @@ using Humanizer;
using System.Collections.ObjectModel;
using System.Diagnostics;
using System.Globalization;
using View_by_Distance.Shared.Models;
using View_by_Distance.Shared.Models.Properties;
using View_by_Distance.Shared.Models.Stateless;
using Phares.Shared.Models;
using Phares.Shared.Models.Properties;
using Phares.Shared.Models.Stateless;
namespace View_by_Distance.Distance.Models.Stateless;