diff --git a/Compare/Compare.cs b/Compare/Compare.cs index 2b0f31c..f56c75d 100644 --- a/Compare/Compare.cs +++ b/Compare/Compare.cs @@ -5,10 +5,10 @@ using System.Drawing; using View_by_Distance.Compare.Models; using View_by_Distance.Distance.Models.Stateless; using View_by_Distance.Face.Models.Stateless; -using View_by_Distance.Metadata.Models; +using Phares.Metadata.Models; using View_by_Distance.People.Models.Stateless; -using View_by_Distance.Shared.Models; -using View_by_Distance.Shared.Models.Stateless; +using Phares.Shared.Models; +using Phares.Shared.Models.Stateless; namespace View_by_Distance.Compare; diff --git a/Compare/Models/AppSettings.cs b/Compare/Models/AppSettings.cs index 1cf28b4..70c2517 100644 --- a/Compare/Models/AppSettings.cs +++ b/Compare/Models/AppSettings.cs @@ -1,7 +1,7 @@ using Microsoft.Extensions.Configuration; using System.Text.Json; using System.Text.Json.Serialization; -using View_by_Distance.Shared.Models; +using Phares.Shared.Models; namespace View_by_Distance.Compare.Models; diff --git a/Compare/Models/CompareSettings.cs b/Compare/Models/CompareSettings.cs index 299a46c..7703c3b 100644 --- a/Compare/Models/CompareSettings.cs +++ b/Compare/Models/CompareSettings.cs @@ -1,4 +1,5 @@ +using Phares.Shared.Models.Properties; using System.Text.Json; using System.Text.Json.Serialization; @@ -11,7 +12,7 @@ public record CompareSettings(string Company, int MaxDegreeOfParallelism, string[] OutputResolutions, bool SaveExtractedFaces, - bool SaveExtractedJavaScriptObjectNotation) : Shared.Models.Properties.ICompareSettings + bool SaveExtractedJavaScriptObjectNotation) : ICompareSettings { public override string ToString() diff --git a/Compare/Program.cs b/Compare/Program.cs index 3aa6654..bc33f19 100644 --- a/Compare/Program.cs +++ b/Compare/Program.cs @@ -23,7 +23,7 @@ public class Program { if (args is null) throw new Exception("args is null!"); - Shared.Models.Console console = new(); + Phares.Shared.Models.Console console = new(); _ = new Compare(args, logger, appSettings, silentIndex > -1, console); } catch (Exception ex) diff --git a/Distance/AA.Distance.csproj b/Distance/AA.Distance.csproj index f288f82..2f7177a 100644 --- a/Distance/AA.Distance.csproj +++ b/Distance/AA.Distance.csproj @@ -10,7 +10,7 @@ $([System.Math]::Floor($([MSBuild]::Divide($([MSBuild]::Subtract($([System.DateTimeOffset]::UtcNow.ToUnixTimeSeconds()), 1731369600)), 3600)))) - Phares.AA.Distance + Phares.Distance 9.0.104.$([System.Math]::Floor($([MSBuild]::Divide($([MSBuild]::Subtract($([System.DateTimeOffset]::UtcNow.ToUnixTimeSeconds()), 1731369600)), 3600)))) Phares Mike Phares diff --git a/Distance/Models/C_Resize.cs b/Distance/Models/C_Resize.cs index d2aaa10..541ecb4 100644 --- a/Distance/Models/C_Resize.cs +++ b/Distance/Models/C_Resize.cs @@ -1,3 +1,3 @@ -namespace View_by_Distance.Metadata.Models; +namespace Phares.Metadata.Models; public class C_Resize() { } \ No newline at end of file diff --git a/Distance/Models/D2_FaceParts.cs b/Distance/Models/D2_FaceParts.cs index 77f7c75..1b8a552 100644 --- a/Distance/Models/D2_FaceParts.cs +++ b/Distance/Models/D2_FaceParts.cs @@ -1,3 +1,3 @@ -namespace View_by_Distance.Metadata.Models; +namespace Phares.Metadata.Models; public class D2_FaceParts() { } \ No newline at end of file diff --git a/Distance/Models/DistanceLimits.cs b/Distance/Models/DistanceLimits.cs index 8415138..83cf2ac 100644 --- a/Distance/Models/DistanceLimits.cs +++ b/Distance/Models/DistanceLimits.cs @@ -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 { diff --git a/Distance/Models/E_Distance.cs b/Distance/Models/E_Distance.cs index cadc3ce..a6ce5e3 100644 --- a/Distance/Models/E_Distance.cs +++ b/Distance/Models/E_Distance.cs @@ -1,3 +1,3 @@ -namespace View_by_Distance.Metadata.Models; +namespace Phares.Metadata.Models; public class E_Distance() { } \ No newline at end of file diff --git a/Distance/Models/IDistanceLimits.cs b/Distance/Models/IDistanceLimits.cs index 8990fa3..77b76a2 100644 --- a/Distance/Models/IDistanceLimits.cs +++ b/Distance/Models/IDistanceLimits.cs @@ -1,4 +1,4 @@ -namespace View_by_Distance.Shared.Models.Methods; +namespace Phares.Shared.Models.Methods; public interface IDistanceLimits { diff --git a/Distance/Models/Stateless/FaceEncodingLogic.cs b/Distance/Models/Stateless/FaceEncodingLogic.cs index 2d12908..bf26204 100644 --- a/Distance/Models/Stateless/FaceEncodingLogic.cs +++ b/Distance/Models/Stateless/FaceEncodingLogic.cs @@ -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; } diff --git a/Distance/Models/Stateless/FilterLogicA.cs b/Distance/Models/Stateless/FilterLogicA.cs index 1b75a19..29f94ef 100644 --- a/Distance/Models/Stateless/FilterLogicA.cs +++ b/Distance/Models/Stateless/FilterLogicA.cs @@ -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 GetPreFilterLocationContainer(DistanceSettings distanceSettings, ICompareSettings compareSettings, ICompare compare, ReadOnlyCollections readOnlyCollections, ReadOnlyDictionary> mappedIdsThenWholePercentagesToLocationContainer, ReadOnlyCollection exifDirectories) { List 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); diff --git a/Distance/Models/Stateless/FilterLogicB.cs b/Distance/Models/Stateless/FilterLogicB.cs index 52cf2dc..b24359f 100644 --- a/Distance/Models/Stateless/FilterLogicB.cs +++ b/Distance/Models/Stateless/FilterLogicB.cs @@ -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; diff --git a/Distance/Models/Stateless/FilterLogicC.cs b/Distance/Models/Stateless/FilterLogicC.cs index 6c6259c..fdf1373 100644 --- a/Distance/Models/Stateless/FilterLogicC.cs +++ b/Distance/Models/Stateless/FilterLogicC.cs @@ -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; diff --git a/Distance/Models/Stateless/FilterLogicD.cs b/Distance/Models/Stateless/FilterLogicD.cs index 568a1ac..c108c8f 100644 --- a/Distance/Models/Stateless/FilterLogicD.cs +++ b/Distance/Models/Stateless/FilterLogicD.cs @@ -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; diff --git a/Distance/Models/Stateless/IDistance.cs b/Distance/Models/Stateless/IDistance.cs index bc3fcc9..e3070a0 100644 --- a/Distance/Models/Stateless/IDistance.cs +++ b/Distance/Models/Stateless/IDistance.cs @@ -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; diff --git a/Distance/Models/Stateless/MappedLogicA.cs b/Distance/Models/Stateless/MappedLogicA.cs index 201959c..9def809 100644 --- a/Distance/Models/Stateless/MappedLogicA.cs +++ b/Distance/Models/Stateless/MappedLogicA.cs @@ -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; diff --git a/Distance/Models/Stateless/MappedLogicB.cs b/Distance/Models/Stateless/MappedLogicB.cs index 6db03dc..8119e9d 100644 --- a/Distance/Models/Stateless/MappedLogicB.cs +++ b/Distance/Models/Stateless/MappedLogicB.cs @@ -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; diff --git a/Face/AA.Face.csproj b/Face/AA.Face.csproj index ee6bd3e..ad62754 100644 --- a/Face/AA.Face.csproj +++ b/Face/AA.Face.csproj @@ -10,7 +10,7 @@ $([System.Math]::Floor($([MSBuild]::Divide($([MSBuild]::Subtract($([System.DateTimeOffset]::UtcNow.ToUnixTimeSeconds()), 1731369600)), 3600)))) - Phares.AA.Face + Phares.Face 9.0.104.$([System.Math]::Floor($([MSBuild]::Divide($([MSBuild]::Subtract($([System.DateTimeOffset]::UtcNow.ToUnixTimeSeconds()), 1731369600)), 3600)))) Phares Mike Phares diff --git a/Face/Models/D_Face.cs b/Face/Models/D_Face.cs index 6e13fdf..9d3864e 100644 --- a/Face/Models/D_Face.cs +++ b/Face/Models/D_Face.cs @@ -1,3 +1,3 @@ -namespace View_by_Distance.Metadata.Models; +namespace Phares.Metadata.Models; public class D_Face() { } \ No newline at end of file diff --git a/Face/Models/Stateless/Face.cs b/Face/Models/Stateless/Face.cs index e8b53d7..d38e3bf 100644 --- a/Face/Models/Stateless/Face.cs +++ b/Face/Models/Stateless/Face.cs @@ -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.Face.Models.Stateless; diff --git a/Face/Models/Stateless/IFace.cs b/Face/Models/Stateless/IFace.cs index 5c59a7b..d310a3e 100644 --- a/Face/Models/Stateless/IFace.cs +++ b/Face/Models/Stateless/IFace.cs @@ -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.Face.Models.Stateless; diff --git a/FaceRecognitionDotNet/AA.FaceRecognitionDotNet.csproj b/FaceRecognitionDotNet/AA.FaceRecognitionDotNet.csproj index b007c50..26eced3 100644 --- a/FaceRecognitionDotNet/AA.FaceRecognitionDotNet.csproj +++ b/FaceRecognitionDotNet/AA.FaceRecognitionDotNet.csproj @@ -10,7 +10,7 @@ $([System.Math]::Floor($([MSBuild]::Divide($([MSBuild]::Subtract($([System.DateTimeOffset]::UtcNow.ToUnixTimeSeconds()), 1731369600)), 3600)))) - Phares.AA.FaceRecognitionDotNet + Phares.FaceRecognitionDotNet false 9.0.104.$([System.Math]::Floor($([MSBuild]::Divide($([MSBuild]::Subtract($([System.DateTimeOffset]::UtcNow.ToUnixTimeSeconds()), 1731369600)), 3600)))) Mike Phares diff --git a/FaceRecognitionDotNet/Dlib/Python/CnnFaceDetectionModelV1.cs b/FaceRecognitionDotNet/Dlib/Python/CnnFaceDetectionModelV1.cs index ca41c75..1482b92 100644 --- a/FaceRecognitionDotNet/Dlib/Python/CnnFaceDetectionModelV1.cs +++ b/FaceRecognitionDotNet/Dlib/Python/CnnFaceDetectionModelV1.cs @@ -1,7 +1,7 @@ using DlibDotNet; using DlibDotNet.Dnn; using View_by_Distance.FaceRecognitionDotNet.Models; -using View_by_Distance.Shared.Models.Stateless; +using Phares.Shared.Models.Stateless; namespace View_by_Distance.FaceRecognitionDotNet.Dlib.Python; diff --git a/FaceRecognitionDotNet/Dlib/Python/SimpleObjectDetector.cs b/FaceRecognitionDotNet/Dlib/Python/SimpleObjectDetector.cs index 5bdeddf..b6725f2 100644 --- a/FaceRecognitionDotNet/Dlib/Python/SimpleObjectDetector.cs +++ b/FaceRecognitionDotNet/Dlib/Python/SimpleObjectDetector.cs @@ -1,6 +1,6 @@ using DlibDotNet; using View_by_Distance.FaceRecognitionDotNet.Models; -using View_by_Distance.Shared.Models.Stateless; +using Phares.Shared.Models.Stateless; namespace View_by_Distance.FaceRecognitionDotNet.Dlib.Python; diff --git a/FaceRecognitionDotNet/Extensions/FaceDetector.cs b/FaceRecognitionDotNet/Extensions/FaceDetector.cs index 7347dbc..0a506c8 100644 --- a/FaceRecognitionDotNet/Extensions/FaceDetector.cs +++ b/FaceRecognitionDotNet/Extensions/FaceDetector.cs @@ -1,6 +1,6 @@ using DlibDotNet; using View_by_Distance.FaceRecognitionDotNet.Models; -using View_by_Distance.Shared.Models; +using Phares.Shared.Models; namespace View_by_Distance.FaceRecognitionDotNet.Extensions; diff --git a/FaceRecognitionDotNet/Extensions/FaceLandmarkDetector.cs b/FaceRecognitionDotNet/Extensions/FaceLandmarkDetector.cs index 58fcc00..52ac8b1 100644 --- a/FaceRecognitionDotNet/Extensions/FaceLandmarkDetector.cs +++ b/FaceRecognitionDotNet/Extensions/FaceLandmarkDetector.cs @@ -1,7 +1,7 @@ using DlibDotNet; using View_by_Distance.FaceRecognitionDotNet.Models; -using View_by_Distance.Shared.Models; -using View_by_Distance.Shared.Models.Stateless; +using Phares.Shared.Models; +using Phares.Shared.Models.Stateless; namespace View_by_Distance.FaceRecognitionDotNet.Extensions; diff --git a/FaceRecognitionDotNet/Models/FaceRecognition.cs b/FaceRecognitionDotNet/Models/FaceRecognition.cs index 17da8bf..85368be 100644 --- a/FaceRecognitionDotNet/Models/FaceRecognition.cs +++ b/FaceRecognitionDotNet/Models/FaceRecognition.cs @@ -6,8 +6,8 @@ using System.Drawing.Imaging; using System.Runtime.InteropServices; using View_by_Distance.FaceRecognitionDotNet.Dlib.Python; using View_by_Distance.FaceRecognitionDotNet.Extensions; -using View_by_Distance.Shared.Models; -using View_by_Distance.Shared.Models.Stateless; +using Phares.Shared.Models; +using Phares.Shared.Models.Stateless; namespace View_by_Distance.FaceRecognitionDotNet.Models; diff --git a/FaceRecognitionDotNet/Models/FaceRecognitionGroup.cs b/FaceRecognitionDotNet/Models/FaceRecognitionGroup.cs index 5df5802..244c6e6 100644 --- a/FaceRecognitionDotNet/Models/FaceRecognitionGroup.cs +++ b/FaceRecognitionDotNet/Models/FaceRecognitionGroup.cs @@ -1,5 +1,5 @@ -using View_by_Distance.Shared.Models; -using View_by_Distance.Shared.Models.Stateless; +using Phares.Shared.Models; +using Phares.Shared.Models.Stateless; namespace View_by_Distance.FaceRecognitionDotNet.Models; diff --git a/FaceRecognitionDotNet/Models/Image.cs b/FaceRecognitionDotNet/Models/Image.cs index 4c96b71..46fe972 100644 --- a/FaceRecognitionDotNet/Models/Image.cs +++ b/FaceRecognitionDotNet/Models/Image.cs @@ -1,7 +1,7 @@ using DlibDotNet; using DlibDotNet.Extensions; using System.Drawing; -using View_by_Distance.Shared.Models.Stateless; +using Phares.Shared.Models.Stateless; namespace View_by_Distance.FaceRecognitionDotNet.Models; diff --git a/Metadata/AA.Metadata.csproj b/Metadata/AA.Metadata.csproj index 83ade6b..60c8149 100644 --- a/Metadata/AA.Metadata.csproj +++ b/Metadata/AA.Metadata.csproj @@ -10,7 +10,7 @@ $([System.Math]::Floor($([MSBuild]::Divide($([MSBuild]::Subtract($([System.DateTimeOffset]::UtcNow.ToUnixTimeSeconds()), 1699920000)), 3600)))) - Phares.AA.Metadata + Phares.Metadata 8.0.118.$([System.Math]::Floor($([MSBuild]::Divide($([MSBuild]::Subtract($([System.DateTimeOffset]::UtcNow.ToUnixTimeSeconds()), 1699920000)), 3600)))) Phares Mike Phares diff --git a/Metadata/Models/A_Metadata.cs b/Metadata/Models/A_Metadata.cs index ab2253c..34ebf66 100644 --- a/Metadata/Models/A_Metadata.cs +++ b/Metadata/Models/A_Metadata.cs @@ -1,10 +1,10 @@ using System.Collections.ObjectModel; using System.Text.Json; -using View_by_Distance.Metadata.Models.Stateless; -using View_by_Distance.Shared.Models; -using View_by_Distance.Shared.Models.Stateless; +using Phares.Metadata.Models.Stateless; +using Phares.Shared.Models; +using Phares.Shared.Models.Stateless; -namespace View_by_Distance.Metadata.Models; +namespace Phares.Metadata.Models; public class A_Metadata { diff --git a/Metadata/Models/Stateless/Dimensions.cs b/Metadata/Models/Stateless/Dimensions.cs index 0043539..19240ae 100644 --- a/Metadata/Models/Stateless/Dimensions.cs +++ b/Metadata/Models/Stateless/Dimensions.cs @@ -1,6 +1,6 @@ using System.Drawing; -namespace View_by_Distance.Metadata.Models.Stateless; +namespace Phares.Metadata.Models.Stateless; internal static class Dimensions { diff --git a/Metadata/Models/Stateless/Exif.cs b/Metadata/Models/Stateless/Exif.cs index cb9fba4..71a2a4a 100644 --- a/Metadata/Models/Stateless/Exif.cs +++ b/Metadata/Models/Stateless/Exif.cs @@ -1,9 +1,10 @@ using MetadataExtractor; -using MetadataExtractor.Formats.Exif; using MetadataExtractor.Formats.Exif.Makernotes; using System.Globalization; +using Phares.Shared.Models; +using Phares.Shared.Models.Stateless; -namespace View_by_Distance.Metadata.Models.Stateless; +namespace Phares.Metadata.Models.Stateless; internal abstract class Exif { @@ -24,10 +25,10 @@ internal abstract class Exif return result; } - private static Shared.Models.AviDirectory[] GetAviDirectories(IReadOnlyList directories) + private static AviDirectory[] GetAviDirectories(IReadOnlyList directories) { - List results = []; - Shared.Models.AviDirectory aviDirectory; + List results = []; + AviDirectory aviDirectory; IEnumerable aviDirectories = directories.OfType(); foreach (MetadataExtractor.Formats.Avi.AviDirectory a in aviDirectories) { @@ -49,12 +50,12 @@ internal abstract class Exif return results.ToArray(); } - private static Shared.Models.ExifDirectoryBase[] GetExifBaseDirectories(IReadOnlyList directories) + private static ExifDirectoryBase[] GetExifBaseDirectories(IReadOnlyList directories) { - List results = []; - Shared.Models.ExifDirectoryBase exifDirectoryBase; - IEnumerable exifBaseDirectories = directories.OfType(); - foreach (ExifDirectoryBase e in exifBaseDirectories) + List results = []; + ExifDirectoryBase exifDirectoryBase; + IEnumerable exifBaseDirectories = directories.OfType(); + foreach (MetadataExtractor.Formats.Exif.ExifDirectoryBase e in exifBaseDirectories) { if (e.Tags.Count == 0) continue; @@ -62,63 +63,63 @@ internal abstract class Exif DateTime checkDateTime; DateTime? dateTimeOriginal; DateTime? dateTimeDigitized; - string? aperture = e.GetDescription(ExifDirectoryBase.TagAperture); - string? applicationNotes = e.GetDescription(ExifDirectoryBase.TagApplicationNotes); - string? artist = e.GetDescription(ExifDirectoryBase.TagArtist); - string? bitsPerSample = e.GetDescription(ExifDirectoryBase.TagBitsPerSample); - string? bodySerialNumber = e.GetDescription(ExifDirectoryBase.TagBodySerialNumber); - string? cameraOwnerName = e.GetDescription(ExifDirectoryBase.TagCameraOwnerName); - string? compressedAverageBitsPerPixel = e.GetDescription(ExifDirectoryBase.TagCompressedAverageBitsPerPixel); - string? compression = e.GetDescription(ExifDirectoryBase.TagCompression); - string? copyright = e.GetDescription(ExifDirectoryBase.TagCopyright); - string? documentName = e.GetDescription(ExifDirectoryBase.TagDocumentName); - string? exifVersion = e.GetDescription(ExifDirectoryBase.TagExifVersion); - string? exposureTime = e.GetDescription(ExifDirectoryBase.TagExposureTime); - string? fileSource = e.GetDescription(ExifDirectoryBase.TagFileSource); - string? imageDescription = e.GetDescription(ExifDirectoryBase.TagImageDescription); - string? imageHeight = e.GetDescription(ExifDirectoryBase.TagImageHeight); - int? imageHeightValue = imageHeight is null ? null : e.GetInt32(ExifDirectoryBase.TagImageHeight); - string? imageNumber = e.GetDescription(ExifDirectoryBase.TagImageNumber); - string? imageUniqueId = e.GetDescription(ExifDirectoryBase.TagImageUniqueId); - string? imageWidth = e.GetDescription(ExifDirectoryBase.TagImageWidth); - int? imageWidthValue = imageWidth is null ? null : e.GetInt32(ExifDirectoryBase.TagImageWidth); - string? isoSpeed = e.GetDescription(ExifDirectoryBase.TagIsoSpeed); - string? lensMake = e.GetDescription(ExifDirectoryBase.TagLensMake); - string? lensModel = e.GetDescription(ExifDirectoryBase.TagLensModel); - string? lensSerialNumber = e.GetDescription(ExifDirectoryBase.TagLensSerialNumber); - string? make = e.GetDescription(ExifDirectoryBase.TagMake); - string? makerNote = e.GetDescription(ExifDirectoryBase.TagMakernote); - string? model = e.GetDescription(ExifDirectoryBase.TagModel); - string? orientation = e.GetDescription(ExifDirectoryBase.TagOrientation); - int? orientationValue = orientation is null ? null : e.GetInt32(ExifDirectoryBase.TagOrientation); - string? rating = e.GetDescription(ExifDirectoryBase.TagRating); - string? ratingPercent = e.GetDescription(ExifDirectoryBase.TagRatingPercent); - string? securityClassification = e.GetDescription(ExifDirectoryBase.TagSecurityClassification); - string? shutterSpeed = e.GetDescription(ExifDirectoryBase.TagShutterSpeed); - string? software = e.GetDescription(ExifDirectoryBase.TagSoftware); - string? timeZone = e.GetDescription(ExifDirectoryBase.TagTimeZone); - string? timeZoneDigitized = e.GetDescription(ExifDirectoryBase.TagTimeZoneDigitized); - string? timeZoneOriginal = e.GetDescription(ExifDirectoryBase.TagTimeZoneOriginal); - string? userComment = e.GetDescription(ExifDirectoryBase.TagUserComment); - string? winAuthor = e.GetDescription(ExifDirectoryBase.TagWinAuthor); - string? winComment = e.GetDescription(ExifDirectoryBase.TagWinComment); - string? winKeywords = e.GetDescription(ExifDirectoryBase.TagWinKeywords); - string? winSubject = e.GetDescription(ExifDirectoryBase.TagWinSubject); - string? winTitle = e.GetDescription(ExifDirectoryBase.TagWinTitle); - string? xResolution = e.GetDescription(ExifDirectoryBase.TagXResolution); - string? yResolution = e.GetDescription(ExifDirectoryBase.TagYResolution); - if (e.TryGetDateTime(ExifDirectoryBase.TagDateTime, out checkDateTime)) + string? aperture = e.GetDescription(MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagAperture); + string? applicationNotes = e.GetDescription(MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagApplicationNotes); + string? artist = e.GetDescription(MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagArtist); + string? bitsPerSample = e.GetDescription(MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagBitsPerSample); + string? bodySerialNumber = e.GetDescription(MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagBodySerialNumber); + string? cameraOwnerName = e.GetDescription(MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagCameraOwnerName); + string? compressedAverageBitsPerPixel = e.GetDescription(MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagCompressedAverageBitsPerPixel); + string? compression = e.GetDescription(MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagCompression); + string? copyright = e.GetDescription(MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagCopyright); + string? documentName = e.GetDescription(MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagDocumentName); + string? exifVersion = e.GetDescription(MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagExifVersion); + string? exposureTime = e.GetDescription(MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagExposureTime); + string? fileSource = e.GetDescription(MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagFileSource); + string? imageDescription = e.GetDescription(MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagImageDescription); + string? imageHeight = e.GetDescription(MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagImageHeight); + int? imageHeightValue = imageHeight is null ? null : e.GetInt32(MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagImageHeight); + string? imageNumber = e.GetDescription(MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagImageNumber); + string? imageUniqueId = e.GetDescription(MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagImageUniqueId); + string? imageWidth = e.GetDescription(MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagImageWidth); + int? imageWidthValue = imageWidth is null ? null : e.GetInt32(MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagImageWidth); + string? isoSpeed = e.GetDescription(MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagIsoSpeed); + string? lensMake = e.GetDescription(MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagLensMake); + string? lensModel = e.GetDescription(MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagLensModel); + string? lensSerialNumber = e.GetDescription(MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagLensSerialNumber); + string? make = e.GetDescription(MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagMake); + string? makerNote = e.GetDescription(MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagMakernote); + string? model = e.GetDescription(MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagModel); + string? orientation = e.GetDescription(MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagOrientation); + int? orientationValue = orientation is null ? null : e.GetInt32(MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagOrientation); + string? rating = e.GetDescription(MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagRating); + string? ratingPercent = e.GetDescription(MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagRatingPercent); + string? securityClassification = e.GetDescription(MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagSecurityClassification); + string? shutterSpeed = e.GetDescription(MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagShutterSpeed); + string? software = e.GetDescription(MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagSoftware); + string? timeZone = e.GetDescription(MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagTimeZone); + string? timeZoneDigitized = e.GetDescription(MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagTimeZoneDigitized); + string? timeZoneOriginal = e.GetDescription(MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagTimeZoneOriginal); + string? userComment = e.GetDescription(MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagUserComment); + string? winAuthor = e.GetDescription(MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagWinAuthor); + string? winComment = e.GetDescription(MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagWinComment); + string? winKeywords = e.GetDescription(MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagWinKeywords); + string? winSubject = e.GetDescription(MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagWinSubject); + string? winTitle = e.GetDescription(MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagWinTitle); + string? xResolution = e.GetDescription(MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagXResolution); + string? yResolution = e.GetDescription(MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagYResolution); + if (e.TryGetDateTime(MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagDateTime, out checkDateTime)) dateTime = checkDateTime; else - dateTime = GetDateTime(e.GetString(ExifDirectoryBase.TagDateTime)); - if (e.TryGetDateTime(ExifDirectoryBase.TagDateTimeOriginal, out checkDateTime)) + dateTime = GetDateTime(e.GetString(MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagDateTime)); + if (e.TryGetDateTime(MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagDateTimeOriginal, out checkDateTime)) dateTimeOriginal = checkDateTime; else - dateTimeOriginal = GetDateTime(e.GetString(ExifDirectoryBase.TagDateTimeOriginal)); - if (e.TryGetDateTime(ExifDirectoryBase.TagDateTimeDigitized, out checkDateTime)) + dateTimeOriginal = GetDateTime(e.GetString(MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagDateTimeOriginal)); + if (e.TryGetDateTime(MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagDateTimeDigitized, out checkDateTime)) dateTimeDigitized = checkDateTime; else - dateTimeDigitized = GetDateTime(e.GetString(ExifDirectoryBase.TagDateTimeDigitized)); + dateTimeDigitized = GetDateTime(e.GetString(MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagDateTimeDigitized)); if (userComment is not null && userComment.Length > 255) userComment = "..."; if (aperture is null @@ -221,10 +222,10 @@ internal abstract class Exif return results.ToArray(); } - private static Shared.Models.FileMetadataDirectory[] GetFileMetadataDirectories(string file, IReadOnlyList directories) + private static FileMetadataDirectory[] GetFileMetadataDirectories(string file, IReadOnlyList directories) { - List results = []; - Shared.Models.FileMetadataDirectory fileMetadataDirectory; + List results = []; + FileMetadataDirectory fileMetadataDirectory; IEnumerable fileMetadataDirectories = directories.OfType(); foreach (MetadataExtractor.Formats.FileSystem.FileMetadataDirectory f in fileMetadataDirectories) { @@ -247,10 +248,10 @@ internal abstract class Exif return results.ToArray(); } - private static Shared.Models.GifHeaderDirectory[] GetGifHeaderDirectories(IReadOnlyList directories) + private static GifHeaderDirectory[] GetGifHeaderDirectories(IReadOnlyList directories) { - List results = []; - Shared.Models.GifHeaderDirectory gifHeaderDirectory; + List results = []; + GifHeaderDirectory gifHeaderDirectory; IEnumerable gifHeaderDirectories = directories.OfType(); foreach (MetadataExtractor.Formats.Gif.GifHeaderDirectory g in gifHeaderDirectories) { @@ -266,25 +267,25 @@ internal abstract class Exif return results.ToArray(); } - private static Shared.Models.GpsDirectory[] GetGpsDirectories(IReadOnlyList directories) + private static GpsDirectory[] GetGpsDirectories(IReadOnlyList directories) { - List results = []; - Shared.Models.GpsDirectory gpsDirectory; - IEnumerable gpsDirectories = directories.OfType(); - foreach (GpsDirectory g in gpsDirectories) + List results = []; + GpsDirectory gpsDirectory; + IEnumerable gpsDirectories = directories.OfType(); + foreach (MetadataExtractor.Formats.Exif.GpsDirectory g in gpsDirectories) { if (g.Tags.Count == 0) continue; DateTime? timeStamp; - string? altitude = g.GetDescription(GpsDirectory.TagAltitude); - string? latitude = g.GetDescription(GpsDirectory.TagLatitude); - string? latitudeRef = g.GetDescription(GpsDirectory.TagLatitudeRef); - string? longitude = g.GetDescription(GpsDirectory.TagLongitude); - string? longitudeRef = g.GetDescription(GpsDirectory.TagLongitudeRef); - if (g.TryGetDateTime(GpsDirectory.TagTimeStamp, out DateTime checkDateTime)) + string? altitude = g.GetDescription(MetadataExtractor.Formats.Exif.GpsDirectory.TagAltitude); + string? latitude = g.GetDescription(MetadataExtractor.Formats.Exif.GpsDirectory.TagLatitude); + string? latitudeRef = g.GetDescription(MetadataExtractor.Formats.Exif.GpsDirectory.TagLatitudeRef); + string? longitude = g.GetDescription(MetadataExtractor.Formats.Exif.GpsDirectory.TagLongitude); + string? longitudeRef = g.GetDescription(MetadataExtractor.Formats.Exif.GpsDirectory.TagLongitudeRef); + if (g.TryGetDateTime(MetadataExtractor.Formats.Exif.GpsDirectory.TagTimeStamp, out DateTime checkDateTime)) timeStamp = checkDateTime; else - timeStamp = GetDateTime(g.GetString(GpsDirectory.TagTimeStamp)); + timeStamp = GetDateTime(g.GetString(MetadataExtractor.Formats.Exif.GpsDirectory.TagTimeStamp)); if (altitude is null && latitude is null && latitudeRef is null && longitude is null && longitudeRef is null && timeStamp is null) continue; gpsDirectory = new(Altitude: altitude, @@ -298,10 +299,10 @@ internal abstract class Exif return results.ToArray(); } - private static Shared.Models.JpegDirectory[] GetJpegDirectories(IReadOnlyList directories) + private static JpegDirectory[] GetJpegDirectories(IReadOnlyList directories) { - List results = []; - Shared.Models.JpegDirectory jpegDirectory; + List results = []; + JpegDirectory jpegDirectory; IEnumerable jpegDirectories = directories.OfType(); foreach (MetadataExtractor.Formats.Jpeg.JpegDirectory j in jpegDirectories) { @@ -317,10 +318,10 @@ internal abstract class Exif return results.ToArray(); } - private static Shared.Models.MakernoteDirectory[] GetMakernoteDirectories(IReadOnlyList directories) + private static MakernoteDirectory[] GetMakernoteDirectories(IReadOnlyList directories) { - List results = []; - Shared.Models.MakernoteDirectory makernoteDirectory; + List results = []; + MakernoteDirectory makernoteDirectory; IEnumerable appleMakernoteDirectories = directories.OfType(); foreach (AppleMakernoteDirectory appleMakernoteDirectory in appleMakernoteDirectories) { @@ -415,10 +416,10 @@ internal abstract class Exif return results.ToArray(); } - private static Shared.Models.PhotoshopDirectory[] GetPhotoshopDirectories(IReadOnlyList directories) + private static PhotoshopDirectory[] GetPhotoshopDirectories(IReadOnlyList directories) { - List results = []; - Shared.Models.PhotoshopDirectory photoshopDirectory; + List results = []; + PhotoshopDirectory photoshopDirectory; IEnumerable photoshopDirectories = directories.OfType(); foreach (MetadataExtractor.Formats.Photoshop.PhotoshopDirectory p in photoshopDirectories) { @@ -434,10 +435,10 @@ internal abstract class Exif return results.ToArray(); } - private static Shared.Models.PngDirectory[] GetPngDirectories(IReadOnlyList directories) + private static PngDirectory[] GetPngDirectories(IReadOnlyList directories) { - List results = []; - Shared.Models.PngDirectory pngDirectory; + List results = []; + PngDirectory pngDirectory; IEnumerable pngDirectories = directories.OfType(); foreach (MetadataExtractor.Formats.Png.PngDirectory p in pngDirectories) { @@ -454,10 +455,10 @@ internal abstract class Exif return results.ToArray(); } - private static Shared.Models.QuickTimeMovieHeaderDirectory[] GetQuickTimeMovieHeaderDirectoryDirectories(IReadOnlyList directories) + private static QuickTimeMovieHeaderDirectory[] GetQuickTimeMovieHeaderDirectoryDirectories(IReadOnlyList directories) { - List results = []; - Shared.Models.QuickTimeMovieHeaderDirectory quickTimeMovieHeaderDirectory; + List results = []; + QuickTimeMovieHeaderDirectory quickTimeMovieHeaderDirectory; IEnumerable quickTimeMovieHeaderDirectories = directories.OfType(); foreach (MetadataExtractor.Formats.QuickTime.QuickTimeMovieHeaderDirectory q in quickTimeMovieHeaderDirectories) { @@ -476,10 +477,10 @@ internal abstract class Exif return results.ToArray(); } - private static Shared.Models.QuickTimeTrackHeaderDirectory[] GetQuickTimeTrackHeaderDirectoryDirectories(IReadOnlyList directories) + private static QuickTimeTrackHeaderDirectory[] GetQuickTimeTrackHeaderDirectoryDirectories(IReadOnlyList directories) { - List results = []; - Shared.Models.QuickTimeTrackHeaderDirectory quickTimeTrackHeaderDirectory; + List results = []; + QuickTimeTrackHeaderDirectory quickTimeTrackHeaderDirectory; IEnumerable quickTimeTrackHeaderDirectories = directories.OfType(); foreach (MetadataExtractor.Formats.QuickTime.QuickTimeTrackHeaderDirectory q in quickTimeTrackHeaderDirectories) { @@ -498,10 +499,10 @@ internal abstract class Exif return results.ToArray(); } - private static Shared.Models.WebPDirectory[] GetWebPDirectories(IReadOnlyList directories) + private static WebPDirectory[] GetWebPDirectories(IReadOnlyList directories) { - List results = []; - Shared.Models.WebPDirectory webPDirectory; + List results = []; + WebPDirectory webPDirectory; IEnumerable webPDirectories = directories.OfType(); foreach (MetadataExtractor.Formats.WebP.WebPDirectory w in webPDirectories) { @@ -517,28 +518,28 @@ internal abstract class Exif return results.ToArray(); } - private static Shared.Models.ExifDirectory Covert(Shared.Models.FilePath filePath, Shared.Models.PersonKeyFormattedAndKeyTicksAndDisplayDirectoryName? personKeyFormattedAndKeyTicksAndDisplayDirectoryName, IReadOnlyList directories, System.Drawing.Size? size) + private static ExifDirectory Covert(FilePath filePath, PersonKeyFormattedAndKeyTicksAndDisplayDirectoryName? personKeyFormattedAndKeyTicksAndDisplayDirectoryName, IReadOnlyList directories, System.Drawing.Size? size) { - Shared.Models.ExifDirectory result; - Shared.Models.AviDirectory[] aviDirectories = GetAviDirectories(directories); - Shared.Models.GpsDirectory[] gpsDirectories = GetGpsDirectories(directories); - Shared.Models.PngDirectory[] pngDirectories = GetPngDirectories(directories); - Shared.Models.JpegDirectory[] jpegDirectories = GetJpegDirectories(directories); - Shared.Models.WebPDirectory[] webPDirectories = GetWebPDirectories(directories); - Shared.Models.ExifDirectoryBase[] exifBaseDirectories = GetExifBaseDirectories(directories); - Shared.Models.GifHeaderDirectory[] gifHeaderDirectories = GetGifHeaderDirectories(directories); - Shared.Models.MakernoteDirectory[] makernoteDirectories = GetMakernoteDirectories(directories); - Shared.Models.PhotoshopDirectory[] photoshopDirectories = GetPhotoshopDirectories(directories); - Shared.Models.FileMetadataDirectory[] fileMetadataDirectories = GetFileMetadataDirectories(filePath.FullName, directories); - Shared.Models.QuickTimeMovieHeaderDirectory[] quickTimeMovieHeaderDirectories = GetQuickTimeMovieHeaderDirectoryDirectories(directories); - Shared.Models.QuickTimeTrackHeaderDirectory[] quickTimeTrackHeaderDirectories = GetQuickTimeTrackHeaderDirectoryDirectories(directories); + ExifDirectory result; + AviDirectory[] aviDirectories = GetAviDirectories(directories); + GpsDirectory[] gpsDirectories = GetGpsDirectories(directories); + PngDirectory[] pngDirectories = GetPngDirectories(directories); + JpegDirectory[] jpegDirectories = GetJpegDirectories(directories); + WebPDirectory[] webPDirectories = GetWebPDirectories(directories); + ExifDirectoryBase[] exifBaseDirectories = GetExifBaseDirectories(directories); + GifHeaderDirectory[] gifHeaderDirectories = GetGifHeaderDirectories(directories); + MakernoteDirectory[] makernoteDirectories = GetMakernoteDirectories(directories); + PhotoshopDirectory[] photoshopDirectories = GetPhotoshopDirectories(directories); + FileMetadataDirectory[] fileMetadataDirectories = GetFileMetadataDirectories(filePath.FullName, directories); + QuickTimeMovieHeaderDirectory[] quickTimeMovieHeaderDirectories = GetQuickTimeMovieHeaderDirectoryDirectories(directories); + QuickTimeTrackHeaderDirectory[] quickTimeTrackHeaderDirectories = GetQuickTimeTrackHeaderDirectoryDirectories(directories); result = new(AviDirectories: aviDirectories, ExifBaseDirectories: exifBaseDirectories, FileMetadataDirectories: fileMetadataDirectories, FilePath: filePath, GifHeaderDirectories: gifHeaderDirectories, GpsDirectories: gpsDirectories, - Height: size?.Height ?? Shared.Models.Stateless.IMetaBase.GetHeight(exifBaseDirectories), + Height: size?.Height ?? IMetaBase.GetHeight(exifBaseDirectories), JpegDirectories: jpegDirectories, MakernoteDirectories: makernoteDirectories, PersonKeyFormattedAndKeyTicksAndDisplayDirectoryName: personKeyFormattedAndKeyTicksAndDisplayDirectoryName, @@ -547,13 +548,13 @@ internal abstract class Exif QuickTimeMovieHeaderDirectories: quickTimeMovieHeaderDirectories, QuickTimeTrackHeaderDirectories: quickTimeTrackHeaderDirectories, WebPDirectories: webPDirectories, - Width: size?.Width ?? Shared.Models.Stateless.IMetaBase.GetWidth(exifBaseDirectories)); + Width: size?.Width ?? IMetaBase.GetWidth(exifBaseDirectories)); return result; } - internal static Shared.Models.ExifDirectory GetExifDirectory(Shared.Models.FilePath filePath, Stream stream, Shared.Models.PersonKeyFormattedAndKeyTicksAndDisplayDirectoryName? personKeyFormattedAndKeyTicksAndDisplayDirectoryName) + internal static ExifDirectory GetExifDirectory(FilePath filePath, Stream stream, PersonKeyFormattedAndKeyTicksAndDisplayDirectoryName? personKeyFormattedAndKeyTicksAndDisplayDirectoryName) { - Shared.Models.ExifDirectory result; + ExifDirectory result; IReadOnlyList directories = ImageMetadataReader.ReadMetadata(stream); System.Drawing.Size? size; try @@ -564,4 +565,15 @@ internal abstract class Exif return result; } + internal static ExifDirectory? GetExifDirectory(ResultSettings resultSettings, MetadataSettings metadataSettings, FileInfo fileInfo) + { + ExifDirectory? result; + FileHolder fileHolder = FileHolder.Get(fileInfo, id: null); + const PersonKeyFormattedAndKeyTicksAndDisplayDirectoryName? p = null; + FilePath filePath = FilePath.Get(resultSettings, metadataSettings, fileHolder, index: fileHolder.Id); + using Stream stream = File.OpenRead(filePath.FullName); + result = GetExifDirectory(filePath, stream, p); + return result; + } + } \ No newline at end of file diff --git a/Metadata/Models/Stateless/Face.cs b/Metadata/Models/Stateless/Face.cs index 76667a9..cf41e25 100644 --- a/Metadata/Models/Stateless/Face.cs +++ b/Metadata/Models/Stateless/Face.cs @@ -1,10 +1,19 @@ -using View_by_Distance.Shared.Models; +using System.Text.Json; +using Phares.Shared.Models; -namespace View_by_Distance.Metadata.Models.Stateless; +namespace Phares.Metadata.Models.Stateless; internal static class Face { + internal static FaceEncoding? GetFaceEncoding(ExifDirectory? exifDirectory) + { + FaceEncoding? result; + string? json = GetFaceEncoding(exifDirectory?.PngDirectories); + result = string.IsNullOrEmpty(json) ? null : JsonSerializer.Deserialize(json, FaceEncodingGenerationContext.Default.FaceEncoding); + return result; + } + internal static string? GetFaceEncoding(PngDirectory[]? pngDirectories) { string? result = null; @@ -22,7 +31,15 @@ internal static class Face return result; } - internal static string? GetOutputResolution(PngDirectory[]? pngDirectories) + internal static FaceFile? GetFaceFile(ExifDirectory? exifDirectory) + { + FaceFile? result; + string? json = GetOutputResolution(exifDirectory?.PngDirectories); + result = string.IsNullOrEmpty(json) ? null : JsonSerializer.Deserialize(json, FaceFileGenerationContext.Default.FaceFile); + return result; + } + + private static string? GetOutputResolution(PngDirectory[]? pngDirectories) { string? result = null; if (pngDirectories is not null) diff --git a/Metadata/Models/Stateless/GPS.cs b/Metadata/Models/Stateless/GPS.cs index 1483ddd..2d44c8c 100644 --- a/Metadata/Models/Stateless/GPS.cs +++ b/Metadata/Models/Stateless/GPS.cs @@ -1,8 +1,7 @@ using MetadataExtractor; -using View_by_Distance.Metadata.Models.Stateless; -using View_by_Distance.Shared.Models; +using Phares.Shared.Models; -namespace View_by_Distance.Metadata.Models.Stateless; +namespace Phares.Metadata.Models.Stateless; internal abstract class GPS { diff --git a/Metadata/Models/Stateless/Get.cs b/Metadata/Models/Stateless/Get.cs index f9e0c7f..818323a 100644 --- a/Metadata/Models/Stateless/Get.cs +++ b/Metadata/Models/Stateless/Get.cs @@ -1,9 +1,9 @@ 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.Metadata.Models.Stateless; +namespace Phares.Metadata.Models.Stateless; internal static class Get { diff --git a/Metadata/Models/Stateless/IMetadata.cs b/Metadata/Models/Stateless/IMetadata.cs index 81e2563..6ac8ca0 100644 --- a/Metadata/Models/Stateless/IMetadata.cs +++ b/Metadata/Models/Stateless/IMetadata.cs @@ -1,10 +1,10 @@ using MetadataExtractor; 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.Metadata.Models.Stateless; +namespace Phares.Metadata.Models.Stateless; public interface IMetadata { @@ -17,49 +17,70 @@ public interface IMetadata Meters } - ExifDirectory TestStatic_GetExifDirectory(FilePath filePath, Stream stream, PersonKeyFormattedAndKeyTicksAndDisplayDirectoryName? personKeyFormattedAndKeyTicksAndDisplayDirectoryName) => - GetExifDirectory(filePath, stream, personKeyFormattedAndKeyTicksAndDisplayDirectoryName); - static ExifDirectory GetExifDirectory(FilePath filePath, Stream stream, PersonKeyFormattedAndKeyTicksAndDisplayDirectoryName? personKeyFormattedAndKeyTicksAndDisplayDirectoryName) => - Exif.GetExifDirectory(filePath, stream, personKeyFormattedAndKeyTicksAndDisplayDirectoryName); + public static FaceFile? GetFaceFile(ExifDirectory? exifDirectory) => + Face.GetFaceFile(exifDirectory); - string? TestStatic_GetOutputResolution(ExifDirectory? exifDirectory) => - GetOutputResolution(exifDirectory); - static string? GetOutputResolution(ExifDirectory? exifDirectory) => - Face.GetOutputResolution(exifDirectory?.PngDirectories); - - string? TestStatic_GetFaceEncoding(ExifDirectory? exifDirectory) => - GetFaceEncoding(exifDirectory); - static string? GetFaceEncoding(ExifDirectory? exifDirectory) => - Face.GetFaceEncoding(exifDirectory?.PngDirectories); - - GeoLocation? TestStatic_GeoLocation(ExifDirectory? exifDirectory) => - GeoLocation(exifDirectory); - static GeoLocation? GeoLocation(ExifDirectory? exifDirectory) => + public static GeoLocation? GeoLocation(ExifDirectory? exifDirectory) => GPS.GeoLocation(exifDirectory?.GpsDirectories); - double? TestStatic_GetDistance(double originLatitude, double originLongitude, double destinationLatitude, double destinationLongitude, int decimalPlaces = 1, DistanceUnit distanceUnit = DistanceUnit.Miles) => - GetDistance(originLatitude, originLongitude, destinationLatitude, destinationLongitude, decimalPlaces, distanceUnit); - static double? GetDistance(double originLatitude, double originLongitude, double destinationLatitude, double destinationLongitude, int decimalPlaces = 1, DistanceUnit distanceUnit = DistanceUnit.Miles) => - GPS.GetDistance(originLatitude, originLongitude, destinationLatitude, destinationLongitude, decimalPlaces, distanceUnit); + public static string? GetRawFaceEncoding(ExifDirectory? exifDirectory) => + Face.GetFaceEncoding(exifDirectory?.PngDirectories); - Action TestStatic_SetExifDirectoryCollection(IRename rename, ResultSettings resultSettings, MetadataSettings metadataSettings, IRenameSettings renameSettings, A_Metadata metadata, List distinct, List metadataGroups) => - SetExifDirectoryCollection(rename, resultSettings, metadataSettings, renameSettings, metadata, distinct, metadataGroups); - static Action SetExifDirectoryCollection(IRename rename, ResultSettings resultSettings, MetadataSettings metadataSettings, IRenameSettings renameSettings, A_Metadata metadata, List distinct, List metadataGroups) => - Get.SetExifDirectoryCollection(rename, resultSettings, metadataSettings, renameSettings, metadata, distinct, metadataGroups); + public static FaceEncoding? GetFaceEncoding(ExifDirectory? exifDirectory) => + Face.GetFaceEncoding(exifDirectory); - ReadOnlyDictionary> TestStatic_GetKeyValuePairs(IEnumerable files) => - GetKeyValuePairs(files); - static ReadOnlyDictionary> GetKeyValuePairs(IEnumerable files) => + public static ReadOnlyDictionary> GetKeyValuePairs(IEnumerable files) => Get.GetKeyValuePairs(files); - ReadOnlyDictionary> TestStatic_GetKeyValuePairs(IEnumerable collection) => - GetKeyValuePairs(collection); - static ReadOnlyDictionary> GetKeyValuePairs(IEnumerable collection) => + public static ReadOnlyDictionary> GetKeyValuePairs(IEnumerable collection) => Get.GetKeyValuePairs(collection); - Action TestStatic_SetExifDirectoryCollection(IWindows windows, ResultSettings resultSettings, MetadataSettings metadataSettings, A_Metadata metadata, List distinct, List metadataGroups) => - SetExifDirectoryCollection(windows, resultSettings, metadataSettings, metadata, distinct, metadataGroups); - static Action SetExifDirectoryCollection(IWindows windows, ResultSettings resultSettings, MetadataSettings metadataSettings, A_Metadata metadata, List distinct, List metadataGroups) => + public static ExifDirectory? GetExifDirectory(ResultSettings resultSettings, MetadataSettings metadataSettings, FileInfo fileInfo) => + Exif.GetExifDirectory(resultSettings, metadataSettings, fileInfo); + + public static ExifDirectory GetExifDirectory(FilePath filePath, Stream stream, PersonKeyFormattedAndKeyTicksAndDisplayDirectoryName? personKeyFormattedAndKeyTicksAndDisplayDirectoryName) => + Exif.GetExifDirectory(filePath, stream, personKeyFormattedAndKeyTicksAndDisplayDirectoryName); + + public static double? GetDistance(double originLatitude, double originLongitude, double destinationLatitude, double destinationLongitude, int decimalPlaces = 1, DistanceUnit distanceUnit = DistanceUnit.Miles) => + GPS.GetDistance(originLatitude, originLongitude, destinationLatitude, destinationLongitude, decimalPlaces, distanceUnit); + + public static Action SetExifDirectoryCollection(IRename rename, ResultSettings resultSettings, MetadataSettings metadataSettings, IRenameSettings renameSettings, A_Metadata metadata, List distinct, List metadataGroups) => + Get.SetExifDirectoryCollection(rename, resultSettings, metadataSettings, renameSettings, metadata, distinct, metadataGroups); + + public static Action SetExifDirectoryCollection(IWindows windows, ResultSettings resultSettings, MetadataSettings metadataSettings, A_Metadata metadata, List distinct, List metadataGroups) => Get.SetExifDirectoryCollection(windows, resultSettings, metadataSettings, metadata, distinct, metadataGroups); + internal GeoLocation? TestStatic_GeoLocation(ExifDirectory? exifDirectory) => + GeoLocation(exifDirectory); + + internal string? TestStatic_GetRawFaceEncoding(ExifDirectory? exifDirectory) => + GetRawFaceEncoding(exifDirectory); + + internal static FaceFile? TestStatic_GetFaceFile(ExifDirectory? exifDirectory) => + GetFaceFile(exifDirectory); + + internal static FaceEncoding? TestStatic_GetFaceEncoding(ExifDirectory? exifDirectory) => + GetFaceEncoding(exifDirectory); + + internal ReadOnlyDictionary> TestStatic_GetKeyValuePairs(IEnumerable files) => + GetKeyValuePairs(files); + + internal ReadOnlyDictionary> TestStatic_GetKeyValuePairs(IEnumerable collection) => + GetKeyValuePairs(collection); + + internal ExifDirectory? TestStatic_GetExifDirectory(ResultSettings resultSettings, MetadataSettings metadataSettings, FileInfo fileInfo) => + GetExifDirectory(resultSettings, metadataSettings, fileInfo); + + internal ExifDirectory TestStatic_GetExifDirectory(FilePath filePath, Stream stream, PersonKeyFormattedAndKeyTicksAndDisplayDirectoryName? personKeyFormattedAndKeyTicksAndDisplayDirectoryName) => + GetExifDirectory(filePath, stream, personKeyFormattedAndKeyTicksAndDisplayDirectoryName); + + internal double? TestStatic_GetDistance(double originLatitude, double originLongitude, double destinationLatitude, double destinationLongitude, int decimalPlaces = 1, DistanceUnit distanceUnit = DistanceUnit.Miles) => + GetDistance(originLatitude, originLongitude, destinationLatitude, destinationLongitude, decimalPlaces, distanceUnit); + + internal Action TestStatic_SetExifDirectoryCollection(IWindows windows, ResultSettings resultSettings, MetadataSettings metadataSettings, A_Metadata metadata, List distinct, List metadataGroups) => + SetExifDirectoryCollection(windows, resultSettings, metadataSettings, metadata, distinct, metadataGroups); + + internal Action TestStatic_SetExifDirectoryCollection(IRename rename, ResultSettings resultSettings, MetadataSettings metadataSettings, IRenameSettings renameSettings, A_Metadata metadata, List distinct, List metadataGroups) => + SetExifDirectoryCollection(rename, resultSettings, metadataSettings, renameSettings, metadata, distinct, metadataGroups); + } \ No newline at end of file diff --git a/People/AA.People.csproj b/People/AA.People.csproj index 1a7be9d..2ede372 100644 --- a/People/AA.People.csproj +++ b/People/AA.People.csproj @@ -10,7 +10,7 @@ $([System.Math]::Floor($([MSBuild]::Divide($([MSBuild]::Subtract($([System.DateTimeOffset]::UtcNow.ToUnixTimeSeconds()), 1731369600)), 3600)))) - Phares.AA.People + Phares.People 9.0.104.$([System.Math]::Floor($([MSBuild]::Divide($([MSBuild]::Subtract($([System.DateTimeOffset]::UtcNow.ToUnixTimeSeconds()), 1731369600)), 3600)))) Phares Mike Phares diff --git a/People/Models/A2_People.cs b/People/Models/A2_People.cs index f566987..c3ca9e3 100644 --- a/People/Models/A2_People.cs +++ b/People/Models/A2_People.cs @@ -1,3 +1,3 @@ -namespace View_by_Distance.Metadata.Models; +namespace Phares.Metadata.Models; public class A2_People() { } \ No newline at end of file diff --git a/People/Models/Stateless/IPeople.cs b/People/Models/Stateless/IPeople.cs index d67b506..399ccd4 100644 --- a/People/Models/Stateless/IPeople.cs +++ b/People/Models/Stateless/IPeople.cs @@ -1,6 +1,6 @@ using System.Collections.ObjectModel; -using View_by_Distance.Shared.Models; -using View_by_Distance.Shared.Models.Properties; +using Phares.Shared.Models; +using Phares.Shared.Models.Properties; namespace View_by_Distance.People.Models.Stateless; diff --git a/People/Models/Stateless/People.cs b/People/Models/Stateless/People.cs index 0b37a12..28d14d1 100644 --- a/People/Models/Stateless/People.cs +++ b/People/Models/Stateless/People.cs @@ -1,9 +1,9 @@ using System.Collections.ObjectModel; using System.Globalization; -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.People.Models.Stateless; diff --git a/People/Models/Stateless/ReadOnlyCollectionsLogic.cs b/People/Models/Stateless/ReadOnlyCollectionsLogic.cs index 01bf8ab..f89ab71 100644 --- a/People/Models/Stateless/ReadOnlyCollectionsLogic.cs +++ b/People/Models/Stateless/ReadOnlyCollectionsLogic.cs @@ -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.People.Models.Stateless; diff --git a/Rename/Models/AppSettings.cs b/Rename/Models/AppSettings.cs index 4f3ddd7..b1e0baf 100644 --- a/Rename/Models/AppSettings.cs +++ b/Rename/Models/AppSettings.cs @@ -1,7 +1,7 @@ using Microsoft.Extensions.Configuration; using System.Text.Json; using System.Text.Json.Serialization; -using View_by_Distance.Shared.Models; +using Phares.Shared.Models; namespace View_by_Distance.Rename.Models; diff --git a/Rename/Models/RenameSettings.cs b/Rename/Models/RenameSettings.cs index b1811fd..f6e9e4e 100644 --- a/Rename/Models/RenameSettings.cs +++ b/Rename/Models/RenameSettings.cs @@ -1,4 +1,5 @@ +using Phares.Shared.Models.Properties; using System.Text.Json; using System.Text.Json.Serialization; @@ -21,7 +22,7 @@ public record RenameSettings(string Company, string[] SidecarExtensions, bool SkipIdFiles, int ValidationImageDeterministicHashCodeId, - string ValidationImageFile) : Shared.Models.Properties.IRenameSettings + string ValidationImageFile) : IRenameSettings { public override string ToString() diff --git a/Rename/Program.cs b/Rename/Program.cs index 87bd86e..5b83c37 100644 --- a/Rename/Program.cs +++ b/Rename/Program.cs @@ -23,7 +23,7 @@ public class Program { if (args is null) throw new Exception("args is null!"); - Shared.Models.Console console = new(); + Phares.Shared.Models.Console console = new(); _ = new Rename(args, logger, appSettings, silentIndex > -1, console); } catch (Exception ex) diff --git a/Rename/Rename.cs b/Rename/Rename.cs index 7be7dc1..9eee465 100644 --- a/Rename/Rename.cs +++ b/Rename/Rename.cs @@ -7,11 +7,11 @@ using System.Drawing; using System.Drawing.Imaging; using System.Runtime.InteropServices; using System.Text.Json; -using View_by_Distance.Metadata.Models; -using View_by_Distance.Metadata.Models.Stateless; +using Phares.Metadata.Models; +using Phares.Metadata.Models.Stateless; using View_by_Distance.Rename.Models; -using View_by_Distance.Shared.Models; -using View_by_Distance.Shared.Models.Stateless; +using Phares.Shared.Models; +using Phares.Shared.Models.Stateless; namespace View_by_Distance.Rename; @@ -152,14 +152,19 @@ public partial class Rename : IRename, IDisposable long epoch = new DateTime(1970, 1, 1).Ticks; long net8ReleaseDate = new DateTime(2023, 11, 14).Ticks; long net9ReleaseDate = new DateTime(2024, 11, 12).Ticks; + long net10ReleaseDate = new DateTime(2026, 01, 01).Ticks; double net8TotalSeconds = new TimeSpan(net8ReleaseDate - epoch).TotalSeconds; double net9TotalSeconds = new TimeSpan(net9ReleaseDate - epoch).TotalSeconds; + double net10TotalSeconds = new TimeSpan(net10ReleaseDate - epoch).TotalSeconds; logger?.LogInformation("It has been {net8TotalSeconds} seconds since net8 was released", net8TotalSeconds); logger?.LogInformation("It has been {net9TotalSeconds} seconds since net9 was released", net9TotalSeconds); + logger?.LogInformation("It has been {net10TotalSeconds} seconds since net10 was released", net10TotalSeconds); double net8TotalHours = Math.Floor((DateTimeOffset.UtcNow.ToUnixTimeSeconds() - net8TotalSeconds) / secondsInAHour); double net9TotalHours = Math.Floor((DateTimeOffset.UtcNow.ToUnixTimeSeconds() - net9TotalSeconds) / secondsInAHour); + double net10TotalHours = Math.Floor((DateTimeOffset.UtcNow.ToUnixTimeSeconds() - net10TotalSeconds) / secondsInAHour); logger?.LogInformation("It has been {net8TotalHours} hours since net8 was released", net8TotalHours); logger?.LogInformation("It has been {net9TotalHours} hours since net9 was released", net9TotalHours); + logger?.LogInformation("It has been {net10TotalHours} hours since net10 was released", net10TotalHours); } private void RenameWork(ILogger? logger, AppSettings appSettings, IRename rename) diff --git a/Shared/AA.Shared.csproj b/Shared/AA.Shared.csproj index 523541b..eb2d56e 100644 --- a/Shared/AA.Shared.csproj +++ b/Shared/AA.Shared.csproj @@ -9,7 +9,7 @@ $([System.Math]::Floor($([MSBuild]::Divide($([MSBuild]::Subtract($([System.DateTimeOffset]::UtcNow.ToUnixTimeSeconds()), 1699920000)), 3600)))) - Phares.AA.Shared + Phares.Shared 8.0.118.$([System.Math]::Floor($([MSBuild]::Divide($([MSBuild]::Subtract($([System.DateTimeOffset]::UtcNow.ToUnixTimeSeconds()), 1699920000)), 3600)))) Phares Mike Phares diff --git a/Shared/Models/AviDirectory.cs b/Shared/Models/AviDirectory.cs index 745d8b3..a445a7a 100644 --- a/Shared/Models/AviDirectory.cs +++ b/Shared/Models/AviDirectory.cs @@ -1,7 +1,7 @@ using System.Text.Json; using System.Text.Json.Serialization; -namespace View_by_Distance.Shared.Models; +namespace Phares.Shared.Models; public record AviDirectory(DateTime? DateTimeOriginal, string? Duration, diff --git a/Shared/Models/CombinedEnumAndIndex.cs b/Shared/Models/CombinedEnumAndIndex.cs index 3b8e7d1..4789b50 100644 --- a/Shared/Models/CombinedEnumAndIndex.cs +++ b/Shared/Models/CombinedEnumAndIndex.cs @@ -1,7 +1,7 @@ using System.Text.Json; using System.Text.Json.Serialization; -namespace View_by_Distance.Shared.Models; +namespace Phares.Shared.Models; public record CombinedEnumAndIndex(string Combined, byte Enum, diff --git a/Shared/Models/DeterministicHashCode.cs b/Shared/Models/DeterministicHashCode.cs index 5f4da31..f8feca2 100644 --- a/Shared/Models/DeterministicHashCode.cs +++ b/Shared/Models/DeterministicHashCode.cs @@ -1,7 +1,7 @@ using System.Text.Json; using System.Text.Json.Serialization; -namespace View_by_Distance.Shared.Models; +namespace Phares.Shared.Models; public record DeterministicHashCode(int? Height, int? Id, diff --git a/Shared/Models/DistanceSettings.cs b/Shared/Models/DistanceSettings.cs index 2f7b975..4d8790f 100644 --- a/Shared/Models/DistanceSettings.cs +++ b/Shared/Models/DistanceSettings.cs @@ -1,7 +1,7 @@ using System.Text.Json; using System.Text.Json.Serialization; -namespace View_by_Distance.Shared.Models; +namespace Phares.Shared.Models; public record DistanceSettings(bool DistanceMoveUnableToMatch, int FaceAreaPermyriad, diff --git a/Shared/Models/ExifDirectory.cs b/Shared/Models/ExifDirectory.cs index 5bff7d2..12bcf84 100644 --- a/Shared/Models/ExifDirectory.cs +++ b/Shared/Models/ExifDirectory.cs @@ -1,7 +1,7 @@ using System.Text.Json; using System.Text.Json.Serialization; -namespace View_by_Distance.Shared.Models; +namespace Phares.Shared.Models; public record ExifDirectory(AviDirectory[] AviDirectories, ExifDirectoryBase[] ExifBaseDirectories, diff --git a/Shared/Models/ExifDirectoryBase.cs b/Shared/Models/ExifDirectoryBase.cs index 186d936..c6df89d 100644 --- a/Shared/Models/ExifDirectoryBase.cs +++ b/Shared/Models/ExifDirectoryBase.cs @@ -1,7 +1,7 @@ using System.Text.Json; using System.Text.Json.Serialization; -namespace View_by_Distance.Shared.Models; +namespace Phares.Shared.Models; public record ExifDirectoryBase(string? Aperture, string? ApplicationNotes, diff --git a/Shared/Models/FaceDistance.cs b/Shared/Models/FaceDistance.cs index 2507797..6de4a18 100644 --- a/Shared/Models/FaceDistance.cs +++ b/Shared/Models/FaceDistance.cs @@ -1,7 +1,7 @@ using System.Text.Json; using System.Text.Json.Serialization; -namespace View_by_Distance.Shared.Models; +namespace Phares.Shared.Models; public record class FaceDistance : Properties.IFaceDistance { diff --git a/Shared/Models/FaceEncoding.cs b/Shared/Models/FaceEncoding.cs index e5c5360..12b7b64 100644 --- a/Shared/Models/FaceEncoding.cs +++ b/Shared/Models/FaceEncoding.cs @@ -1,6 +1,6 @@ using System.Text.Json.Serialization; -namespace View_by_Distance.Shared.Models; +namespace Phares.Shared.Models; public record FaceEncoding(double[] RawEncoding, int Size); diff --git a/Shared/Models/FaceFile.cs b/Shared/Models/FaceFile.cs index 4f1a3ef..25d0833 100644 --- a/Shared/Models/FaceFile.cs +++ b/Shared/Models/FaceFile.cs @@ -1,6 +1,6 @@ using System.Text.Json.Serialization; -namespace View_by_Distance.Shared.Models; +namespace Phares.Shared.Models; public record FaceFile(int? AreaPermyriad, int? ConfidencePercent, diff --git a/Shared/Models/FacePartAndFacePointArray.cs b/Shared/Models/FacePartAndFacePointArray.cs index eeddd65..261a782 100644 --- a/Shared/Models/FacePartAndFacePointArray.cs +++ b/Shared/Models/FacePartAndFacePointArray.cs @@ -1,8 +1,8 @@ using System.Text.Json; using System.Text.Json.Serialization; -using View_by_Distance.Shared.Models.Stateless; +using Phares.Shared.Models.Stateless; -namespace View_by_Distance.Shared.Models; +namespace Phares.Shared.Models; public record FacePartAndFacePointArray(FacePart FacePart, FacePoint[] FacePoints) { diff --git a/Shared/Models/FacePoint.cs b/Shared/Models/FacePoint.cs index 094577a..293b80a 100644 --- a/Shared/Models/FacePoint.cs +++ b/Shared/Models/FacePoint.cs @@ -1,7 +1,7 @@ using System.Drawing; using System.Text.Json.Serialization; -namespace View_by_Distance.Shared.Models; +namespace Phares.Shared.Models; [method: JsonConstructor] public class FacePoint(int index, int x, int y) : Properties.IFacePoint diff --git a/Shared/Models/FaceRecognitionGroup.cs b/Shared/Models/FaceRecognitionGroup.cs index 9eadb02..8b85e5c 100644 --- a/Shared/Models/FaceRecognitionGroup.cs +++ b/Shared/Models/FaceRecognitionGroup.cs @@ -2,7 +2,7 @@ using System.Collections.ObjectModel; using System.Text.Json; using System.Text.Json.Serialization; -namespace View_by_Distance.Shared.Models; +namespace Phares.Shared.Models; public record FaceRecognitionGroup(Location Location, ReadOnlyCollection FaceEncodings, ReadOnlyCollection> FaceParts) { diff --git a/Shared/Models/FileHolder.cs b/Shared/Models/FileHolder.cs index fdf9a0d..93397e0 100644 --- a/Shared/Models/FileHolder.cs +++ b/Shared/Models/FileHolder.cs @@ -1,7 +1,7 @@ using System.Text.Json; using System.Text.Json.Serialization; -namespace View_by_Distance.Shared.Models; +namespace Phares.Shared.Models; public record FileHolder(DateTime? CreationTime, string? DirectoryFullPath, diff --git a/Shared/Models/FileMetadataDirectory.cs b/Shared/Models/FileMetadataDirectory.cs index 1249ef5..2f6be50 100644 --- a/Shared/Models/FileMetadataDirectory.cs +++ b/Shared/Models/FileMetadataDirectory.cs @@ -1,7 +1,7 @@ using System.Text.Json; using System.Text.Json.Serialization; -namespace View_by_Distance.Shared.Models; +namespace Phares.Shared.Models; public record FileMetadataDirectory(DateTime? FileModifiedDate, string? FileName, diff --git a/Shared/Models/FilePath.cs b/Shared/Models/FilePath.cs index 087ce77..5bfcdf2 100644 --- a/Shared/Models/FilePath.cs +++ b/Shared/Models/FilePath.cs @@ -1,8 +1,8 @@ using System.Text.Json; using System.Text.Json.Serialization; -using View_by_Distance.Shared.Models.Stateless; +using Phares.Shared.Models.Stateless; -namespace View_by_Distance.Shared.Models; +namespace Phares.Shared.Models; public record FilePath(long CreationTicks, string DirectoryFullPath, diff --git a/Shared/Models/FilePathAndWholePercentages.cs b/Shared/Models/FilePathAndWholePercentages.cs index 3a8702b..ac359d4 100644 --- a/Shared/Models/FilePathAndWholePercentages.cs +++ b/Shared/Models/FilePathAndWholePercentages.cs @@ -1,7 +1,7 @@ using System.Text.Json; using System.Text.Json.Serialization; -namespace View_by_Distance.Shared.Models; +namespace Phares.Shared.Models; public record FilePathAndWholePercentages(FilePath FilePath, int WholePercentages) { diff --git a/Shared/Models/FirstPass.cs b/Shared/Models/FirstPass.cs index a4f4101..4f4c851 100644 --- a/Shared/Models/FirstPass.cs +++ b/Shared/Models/FirstPass.cs @@ -1,7 +1,7 @@ using System.Text.Json; using System.Text.Json.Serialization; -namespace View_by_Distance.Shared.Models; +namespace Phares.Shared.Models; public record FirstPass(ExifDirectory ExifDirectory, bool FastForwardMovingPictureExpertsGroupUsed, diff --git a/Shared/Models/GifHeaderDirectory.cs b/Shared/Models/GifHeaderDirectory.cs index 11342d9..62e865a 100644 --- a/Shared/Models/GifHeaderDirectory.cs +++ b/Shared/Models/GifHeaderDirectory.cs @@ -1,7 +1,7 @@ using System.Text.Json; using System.Text.Json.Serialization; -namespace View_by_Distance.Shared.Models; +namespace Phares.Shared.Models; public record GifHeaderDirectory(string? ImageHeight, string? ImageWidth) diff --git a/Shared/Models/GpsDirectory.cs b/Shared/Models/GpsDirectory.cs index beef966..15e9f60 100644 --- a/Shared/Models/GpsDirectory.cs +++ b/Shared/Models/GpsDirectory.cs @@ -1,7 +1,7 @@ using System.Text.Json; using System.Text.Json.Serialization; -namespace View_by_Distance.Shared.Models; +namespace Phares.Shared.Models; public record GpsDirectory(string? Altitude, string? Latitude, diff --git a/Shared/Models/JpegDirectory.cs b/Shared/Models/JpegDirectory.cs index 10747bf..b2f0f30 100644 --- a/Shared/Models/JpegDirectory.cs +++ b/Shared/Models/JpegDirectory.cs @@ -1,7 +1,7 @@ using System.Text.Json; using System.Text.Json.Serialization; -namespace View_by_Distance.Shared.Models; +namespace Phares.Shared.Models; public record JpegDirectory(string? ImageHeight, string? ImageWidth) diff --git a/Shared/Models/Location.cs b/Shared/Models/Location.cs index 46ec648..69b6f4d 100644 --- a/Shared/Models/Location.cs +++ b/Shared/Models/Location.cs @@ -1,6 +1,6 @@ using System.Text.Json.Serialization; -namespace View_by_Distance.Shared.Models; +namespace Phares.Shared.Models; [method: JsonConstructor] public class Location(int bottom, double confidence, int left, int right, int top) : Properties.ILocation, IEquatable diff --git a/Shared/Models/LocationContainer.cs b/Shared/Models/LocationContainer.cs index 0f8231c..9fbbbb7 100644 --- a/Shared/Models/LocationContainer.cs +++ b/Shared/Models/LocationContainer.cs @@ -1,7 +1,7 @@ using System.Text.Json; using System.Text.Json.Serialization; -namespace View_by_Distance.Shared.Models; +namespace Phares.Shared.Models; public record LocationContainer(DateOnly? CreationDateOnly, ExifDirectory? ExifDirectory, diff --git a/Shared/Models/MakernoteDirectory.cs b/Shared/Models/MakernoteDirectory.cs index d5efe00..82a72e3 100644 --- a/Shared/Models/MakernoteDirectory.cs +++ b/Shared/Models/MakernoteDirectory.cs @@ -1,7 +1,7 @@ using System.Text.Json; using System.Text.Json.Serialization; -namespace View_by_Distance.Shared.Models; +namespace Phares.Shared.Models; public record MakernoteDirectory(string? CameraSerialNumber, string? FirmwareVersion, diff --git a/Shared/Models/MappingFromFilter.cs b/Shared/Models/MappingFromFilter.cs index 781a4b5..3f93335 100644 --- a/Shared/Models/MappingFromFilter.cs +++ b/Shared/Models/MappingFromFilter.cs @@ -1,7 +1,7 @@ using System.Text.Json; using System.Text.Json.Serialization; -namespace View_by_Distance.Shared.Models; +namespace Phares.Shared.Models; public record MappingFromFilter(bool? IsFocusModel, bool? IsFocusPerson, diff --git a/Shared/Models/MappingFromFilterPost.cs b/Shared/Models/MappingFromFilterPost.cs index 214ca8b..ac14240 100644 --- a/Shared/Models/MappingFromFilterPost.cs +++ b/Shared/Models/MappingFromFilterPost.cs @@ -1,7 +1,7 @@ using System.Text.Json; using System.Text.Json.Serialization; -namespace View_by_Distance.Shared.Models; +namespace Phares.Shared.Models; public record MappingFromFilterPost(bool? CanReMap, bool? InSkipCollection, diff --git a/Shared/Models/MappingFromPerson.cs b/Shared/Models/MappingFromPerson.cs index a66bd80..90b79e5 100644 --- a/Shared/Models/MappingFromPerson.cs +++ b/Shared/Models/MappingFromPerson.cs @@ -1,7 +1,7 @@ using System.Text.Json; using System.Text.Json.Serialization; -namespace View_by_Distance.Shared.Models; +namespace Phares.Shared.Models; public record MappingFromPerson(int? ApproximateYears, string DisplayDirectoryName, diff --git a/Shared/Models/MetaBase.cs b/Shared/Models/MetaBase.cs index aa71b87..ed280bc 100644 --- a/Shared/Models/MetaBase.cs +++ b/Shared/Models/MetaBase.cs @@ -1,7 +1,7 @@ using System.Collections.ObjectModel; using System.Globalization; -namespace View_by_Distance.Shared.Models; +namespace Phares.Shared.Models; internal static class MetaBase { diff --git a/Shared/Models/MetadataGroup.cs b/Shared/Models/MetadataGroup.cs index 1bed256..cdda18f 100644 --- a/Shared/Models/MetadataGroup.cs +++ b/Shared/Models/MetadataGroup.cs @@ -2,7 +2,7 @@ using System.Collections.ObjectModel; using System.Text.Json; using System.Text.Json.Serialization; -namespace View_by_Distance.Shared.Models; +namespace Phares.Shared.Models; public record MetadataGroup(bool FastForwardMovingPictureExpertsGroupUsed, FilePath FilePath, MinimumYearAndPathCombined MinimumYearAndPathCombined, ExifDirectory ExifDirectory, ReadOnlyCollection SidecarFiles) { diff --git a/Shared/Models/MetadataSettings.cs b/Shared/Models/MetadataSettings.cs index 3c0de05..5eb4854 100644 --- a/Shared/Models/MetadataSettings.cs +++ b/Shared/Models/MetadataSettings.cs @@ -1,7 +1,7 @@ using System.Text.Json; using System.Text.Json.Serialization; -namespace View_by_Distance.Shared.Models; +namespace Phares.Shared.Models; public record MetadataSettings(bool ForceMetadataLastWriteTimeToCreationTime, string[] IgnoreRulesKeyWords, @@ -20,6 +20,6 @@ public record MetadataSettings(bool ForceMetadataLastWriteTimeToCreationTime, [JsonSourceGenerationOptions(WriteIndented = true)] [JsonSerializable(typeof(MetadataSettings))] -internal partial class MetadataSettingsSourceGenerationContext : JsonSerializerContext +public partial class MetadataSettingsSourceGenerationContext : JsonSerializerContext { } \ No newline at end of file diff --git a/Shared/Models/MinimumYearAndFullPath.cs b/Shared/Models/MinimumYearAndFullPath.cs index 2bef02d..39dc784 100644 --- a/Shared/Models/MinimumYearAndFullPath.cs +++ b/Shared/Models/MinimumYearAndFullPath.cs @@ -1,7 +1,7 @@ using System.Text.Json; using System.Text.Json.Serialization; -namespace View_by_Distance.Shared.Models; +namespace Phares.Shared.Models; public record MinimumYearAndPathCombined(int MinimumYear, string PathCombined) diff --git a/Shared/Models/NginxFileSystem.cs b/Shared/Models/NginxFileSystem.cs index 93200d8..1e27c92 100644 --- a/Shared/Models/NginxFileSystem.cs +++ b/Shared/Models/NginxFileSystem.cs @@ -2,7 +2,7 @@ using System.Globalization; using System.Text.Json; using System.Text.Json.Serialization; -namespace View_by_Distance.Shared.Models; +namespace Phares.Shared.Models; public record NginxFileSystem([property: JsonPropertyName("name")] string Name, DateTime? LastModified, diff --git a/Shared/Models/OutputResolution.cs b/Shared/Models/OutputResolution.cs index 4a8c65b..9dcff3d 100644 --- a/Shared/Models/OutputResolution.cs +++ b/Shared/Models/OutputResolution.cs @@ -1,4 +1,4 @@ -namespace View_by_Distance.Shared.Models; +namespace Phares.Shared.Models; public record OutputResolution(int Height, int Orientation, diff --git a/Shared/Models/PeopleSettings.cs b/Shared/Models/PeopleSettings.cs index f06a232..2873ff2 100644 --- a/Shared/Models/PeopleSettings.cs +++ b/Shared/Models/PeopleSettings.cs @@ -1,7 +1,7 @@ using System.Text.Json; using System.Text.Json.Serialization; -namespace View_by_Distance.Shared.Models; +namespace Phares.Shared.Models; public record PeopleSettings(string GenealogicalDataCommunicationFile, string[] JLinks, diff --git a/Shared/Models/PersonBirthday.cs b/Shared/Models/PersonBirthday.cs index 1b5b053..67e3830 100644 --- a/Shared/Models/PersonBirthday.cs +++ b/Shared/Models/PersonBirthday.cs @@ -1,7 +1,7 @@ using System.Text.Json; using System.Text.Json.Serialization; -namespace View_by_Distance.Shared.Models; +namespace Phares.Shared.Models; public record PersonBirthday(DateTime Value) { diff --git a/Shared/Models/PersonContainer.cs b/Shared/Models/PersonContainer.cs index 514dae0..0a77717 100644 --- a/Shared/Models/PersonContainer.cs +++ b/Shared/Models/PersonContainer.cs @@ -1,9 +1,9 @@ using System.Collections.ObjectModel; using System.Text.Json; using System.Text.Json.Serialization; -using View_by_Distance.Shared.Models.Stateless; +using Phares.Shared.Models.Stateless; -namespace View_by_Distance.Shared.Models; +namespace Phares.Shared.Models; public record PersonContainer(int? ApproximateYears, PersonBirthday[]? Birthdays, diff --git a/Shared/Models/PersonDirectory.cs b/Shared/Models/PersonDirectory.cs index bb5838c..4e42fe4 100644 --- a/Shared/Models/PersonDirectory.cs +++ b/Shared/Models/PersonDirectory.cs @@ -1,7 +1,7 @@ using System.Text.Json; using System.Text.Json.Serialization; -namespace View_by_Distance.Shared.Models; +namespace Phares.Shared.Models; public record PersonDirectory(char Char, string Group, char Status, char Sex, char First) { diff --git a/Shared/Models/PersonKeyFormattedAndPersonBirthday.cs b/Shared/Models/PersonKeyFormattedAndPersonBirthday.cs index bd49d5e..cb08575 100644 --- a/Shared/Models/PersonKeyFormattedAndPersonBirthday.cs +++ b/Shared/Models/PersonKeyFormattedAndPersonBirthday.cs @@ -1,7 +1,7 @@ using System.Text.Json; using System.Text.Json.Serialization; -namespace View_by_Distance.Shared.Models; +namespace Phares.Shared.Models; public record PersonKeyFormattedAndPersonBirthday(string PersonKeyFormatted, PersonBirthday PersonBirthday) { diff --git a/Shared/Models/PersonKeyFormattedAndPersonKeyTicks.cs b/Shared/Models/PersonKeyFormattedAndPersonKeyTicks.cs index 340b393..41445b3 100644 --- a/Shared/Models/PersonKeyFormattedAndPersonKeyTicks.cs +++ b/Shared/Models/PersonKeyFormattedAndPersonKeyTicks.cs @@ -1,7 +1,7 @@ using System.Text.Json; using System.Text.Json.Serialization; -namespace View_by_Distance.Shared.Models; +namespace Phares.Shared.Models; public record PersonKeyFormattedAndKeyTicksAndDisplayDirectoryName(string KeyFormatted, long KeyTicks, diff --git a/Shared/Models/PhotoshopDirectory.cs b/Shared/Models/PhotoshopDirectory.cs index ee42850..7e7ffea 100644 --- a/Shared/Models/PhotoshopDirectory.cs +++ b/Shared/Models/PhotoshopDirectory.cs @@ -1,7 +1,7 @@ using System.Text.Json; using System.Text.Json.Serialization; -namespace View_by_Distance.Shared.Models; +namespace Phares.Shared.Models; public record PhotoshopDirectory(string? JpegQuality, string? Url) diff --git a/Shared/Models/PngDirectory.cs b/Shared/Models/PngDirectory.cs index de7f6a6..89ea5df 100644 --- a/Shared/Models/PngDirectory.cs +++ b/Shared/Models/PngDirectory.cs @@ -1,7 +1,7 @@ using System.Text.Json; using System.Text.Json.Serialization; -namespace View_by_Distance.Shared.Models; +namespace Phares.Shared.Models; public record PngDirectory(string? ImageHeight, string? ImageWidth, diff --git a/Shared/Models/Properties/ICompareSettings.cs b/Shared/Models/Properties/ICompareSettings.cs index 27b990e..6e8d0fd 100644 --- a/Shared/Models/Properties/ICompareSettings.cs +++ b/Shared/Models/Properties/ICompareSettings.cs @@ -1,4 +1,4 @@ -namespace View_by_Distance.Shared.Models.Properties; +namespace Phares.Shared.Models.Properties; public interface ICompareSettings { diff --git a/Shared/Models/Properties/IFaceDistance.cs b/Shared/Models/Properties/IFaceDistance.cs index 0ce82d9..1fb55e1 100644 --- a/Shared/Models/Properties/IFaceDistance.cs +++ b/Shared/Models/Properties/IFaceDistance.cs @@ -1,4 +1,4 @@ -namespace View_by_Distance.Shared.Models.Properties; +namespace Phares.Shared.Models.Properties; public interface IFaceDistance { diff --git a/Shared/Models/Properties/IFacePoint.cs b/Shared/Models/Properties/IFacePoint.cs index 90039cc..8e9fa5d 100644 --- a/Shared/Models/Properties/IFacePoint.cs +++ b/Shared/Models/Properties/IFacePoint.cs @@ -1,4 +1,4 @@ -namespace View_by_Distance.Shared.Models.Properties; +namespace Phares.Shared.Models.Properties; public interface IFacePoint { diff --git a/Shared/Models/Properties/ILocation.cs b/Shared/Models/Properties/ILocation.cs index cd8291f..a5f3aa8 100644 --- a/Shared/Models/Properties/ILocation.cs +++ b/Shared/Models/Properties/ILocation.cs @@ -1,4 +1,4 @@ -namespace View_by_Distance.Shared.Models.Properties; +namespace Phares.Shared.Models.Properties; public interface ILocation { diff --git a/Shared/Models/Properties/IRenameSettings.cs b/Shared/Models/Properties/IRenameSettings.cs index f4613df..fa6efb4 100644 --- a/Shared/Models/Properties/IRenameSettings.cs +++ b/Shared/Models/Properties/IRenameSettings.cs @@ -1,4 +1,4 @@ -namespace View_by_Distance.Shared.Models.Properties; +namespace Phares.Shared.Models.Properties; public interface IRenameSettings { diff --git a/Shared/Models/Properties/IWindowsSettings.cs b/Shared/Models/Properties/IWindowsSettings.cs index d04e74b..125094c 100644 --- a/Shared/Models/Properties/IWindowsSettings.cs +++ b/Shared/Models/Properties/IWindowsSettings.cs @@ -1,4 +1,4 @@ -namespace View_by_Distance.Shared.Models.Properties; +namespace Phares.Shared.Models.Properties; public interface IWindowsSettings { diff --git a/Shared/Models/QuickTimeMovieHeaderDirectory.cs b/Shared/Models/QuickTimeMovieHeaderDirectory.cs index 0601dbc..a741a8c 100644 --- a/Shared/Models/QuickTimeMovieHeaderDirectory.cs +++ b/Shared/Models/QuickTimeMovieHeaderDirectory.cs @@ -1,7 +1,7 @@ using System.Text.Json; using System.Text.Json.Serialization; -namespace View_by_Distance.Shared.Models; +namespace Phares.Shared.Models; public record QuickTimeMovieHeaderDirectory(DateTime? Created) { diff --git a/Shared/Models/QuickTimeTrackHeaderDirectory.cs b/Shared/Models/QuickTimeTrackHeaderDirectory.cs index 236c39c..7ec5de5 100644 --- a/Shared/Models/QuickTimeTrackHeaderDirectory.cs +++ b/Shared/Models/QuickTimeTrackHeaderDirectory.cs @@ -1,7 +1,7 @@ using System.Text.Json; using System.Text.Json.Serialization; -namespace View_by_Distance.Shared.Models; +namespace Phares.Shared.Models; public record QuickTimeTrackHeaderDirectory(DateTime? Created) { diff --git a/Shared/Models/ReadOnlyCollections.cs b/Shared/Models/ReadOnlyCollections.cs index 92f0661..74ebde0 100644 --- a/Shared/Models/ReadOnlyCollections.cs +++ b/Shared/Models/ReadOnlyCollections.cs @@ -2,7 +2,7 @@ using System.Collections.ObjectModel; using System.Text.Json; using System.Text.Json.Serialization; -namespace View_by_Distance.Shared.Models; +namespace Phares.Shared.Models; public record ReadOnlyCollections(ReadOnlyCollection JLinkResolvedPersonKeys, ReadOnlyCollection PersonContainers, diff --git a/Shared/Models/ResultSettings.cs b/Shared/Models/ResultSettings.cs index 3304dcd..7f09688 100644 --- a/Shared/Models/ResultSettings.cs +++ b/Shared/Models/ResultSettings.cs @@ -1,7 +1,7 @@ using System.Text.Json; using System.Text.Json.Serialization; -namespace View_by_Distance.Shared.Models; +namespace Phares.Shared.Models; public record ResultSettings(string DateGroup, int EpicYear, @@ -29,6 +29,6 @@ public record ResultSettings(string DateGroup, [JsonSourceGenerationOptions(WriteIndented = true)] [JsonSerializable(typeof(ResultSettings))] -internal partial class ResultSettingsSourceGenerationContext : JsonSerializerContext +public partial class ResultSettingsSourceGenerationContext : JsonSerializerContext { } \ No newline at end of file diff --git a/Shared/Models/SaveContainer.cs b/Shared/Models/SaveContainer.cs index 7d00005..f27f227 100644 --- a/Shared/Models/SaveContainer.cs +++ b/Shared/Models/SaveContainer.cs @@ -1,7 +1,7 @@ using System.Text.Json; using System.Text.Json.Serialization; -namespace View_by_Distance.Shared.Models; +namespace Phares.Shared.Models; public record SaveContainer(string CheckFile, string Directory, diff --git a/Shared/Models/Stateless/Age.cs b/Shared/Models/Stateless/Age.cs index 8de02b3..5aa3bf6 100644 --- a/Shared/Models/Stateless/Age.cs +++ b/Shared/Models/Stateless/Age.cs @@ -1,4 +1,4 @@ -namespace View_by_Distance.Shared.Models.Stateless; +namespace Phares.Shared.Models.Stateless; internal abstract class Age { diff --git a/Shared/Models/Stateless/Console.cs b/Shared/Models/Stateless/Console.cs index 0f526ce..0c56da5 100644 --- a/Shared/Models/Stateless/Console.cs +++ b/Shared/Models/Stateless/Console.cs @@ -1,6 +1,6 @@ -using View_by_Distance.Shared.Models.Stateless; +using Phares.Shared.Models.Stateless; -namespace View_by_Distance.Shared.Models; +namespace Phares.Shared.Models; public class Console : IConsole { diff --git a/Shared/Models/Stateless/FacePart.cs b/Shared/Models/Stateless/FacePart.cs index 5d07928..fc8e8e3 100644 --- a/Shared/Models/Stateless/FacePart.cs +++ b/Shared/Models/Stateless/FacePart.cs @@ -1,4 +1,4 @@ -namespace View_by_Distance.Shared.Models.Stateless; +namespace Phares.Shared.Models.Stateless; /// /// Specifies the part of face. diff --git a/Shared/Models/Stateless/IAge.cs b/Shared/Models/Stateless/IAge.cs index 9fd590c..8ce8a7d 100644 --- a/Shared/Models/Stateless/IAge.cs +++ b/Shared/Models/Stateless/IAge.cs @@ -1,4 +1,4 @@ -namespace View_by_Distance.Shared.Models.Stateless; +namespace Phares.Shared.Models.Stateless; public interface IAge { // ... diff --git a/Shared/Models/Stateless/ICompare.cs b/Shared/Models/Stateless/ICompare.cs index 57ffa1d..19f5f6e 100644 --- a/Shared/Models/Stateless/ICompare.cs +++ b/Shared/Models/Stateless/ICompare.cs @@ -1,4 +1,4 @@ -namespace View_by_Distance.Shared.Models.Stateless; +namespace Phares.Shared.Models.Stateless; public interface ICompare { diff --git a/Shared/Models/Stateless/IConsole.cs b/Shared/Models/Stateless/IConsole.cs index 4f204f3..cdd4464 100644 --- a/Shared/Models/Stateless/IConsole.cs +++ b/Shared/Models/Stateless/IConsole.cs @@ -1,4 +1,4 @@ -namespace View_by_Distance.Shared.Models.Stateless; +namespace Phares.Shared.Models.Stateless; public interface IConsole { diff --git a/Shared/Models/Stateless/IDate.cs b/Shared/Models/Stateless/IDate.cs index da5e2cc..0d5829c 100644 --- a/Shared/Models/Stateless/IDate.cs +++ b/Shared/Models/Stateless/IDate.cs @@ -1,4 +1,4 @@ -namespace View_by_Distance.Shared.Models.Stateless; +namespace Phares.Shared.Models.Stateless; public interface IDate { diff --git a/Shared/Models/Stateless/IId.cs b/Shared/Models/Stateless/IId.cs index 79d4a1d..aa77901 100644 --- a/Shared/Models/Stateless/IId.cs +++ b/Shared/Models/Stateless/IId.cs @@ -1,4 +1,4 @@ -namespace View_by_Distance.Shared.Models.Stateless; +namespace Phares.Shared.Models.Stateless; public interface IId { diff --git a/Shared/Models/Stateless/ILocation.cs b/Shared/Models/Stateless/ILocation.cs index 8514431..b41bb61 100644 --- a/Shared/Models/Stateless/ILocation.cs +++ b/Shared/Models/Stateless/ILocation.cs @@ -1,6 +1,6 @@ using System.Drawing; -namespace View_by_Distance.Shared.Models.Stateless; +namespace Phares.Shared.Models.Stateless; public interface ILocation { diff --git a/Shared/Models/Stateless/IMapLogic.cs b/Shared/Models/Stateless/IMapLogic.cs index 7470743..a4dec25 100644 --- a/Shared/Models/Stateless/IMapLogic.cs +++ b/Shared/Models/Stateless/IMapLogic.cs @@ -1,4 +1,4 @@ -namespace View_by_Distance.Shared.Models.Stateless; +namespace Phares.Shared.Models.Stateless; public interface IMapLogic { // ... diff --git a/Shared/Models/Stateless/IMapping.cs b/Shared/Models/Stateless/IMapping.cs index bc9cb8d..be90df4 100644 --- a/Shared/Models/Stateless/IMapping.cs +++ b/Shared/Models/Stateless/IMapping.cs @@ -1,6 +1,6 @@ -using View_by_Distance.Shared.Models.Properties; +using Phares.Shared.Models.Properties; -namespace View_by_Distance.Shared.Models.Stateless; +namespace Phares.Shared.Models.Stateless; public interface IMapping { // ... diff --git a/Shared/Models/Stateless/IMetaBase.cs b/Shared/Models/Stateless/IMetaBase.cs index f713a0c..033c196 100644 --- a/Shared/Models/Stateless/IMetaBase.cs +++ b/Shared/Models/Stateless/IMetaBase.cs @@ -1,6 +1,6 @@ using System.Collections.ObjectModel; -namespace View_by_Distance.Shared.Models.Stateless; +namespace Phares.Shared.Models.Stateless; public interface IMetaBase { diff --git a/Shared/Models/Stateless/IPath.cs b/Shared/Models/Stateless/IPath.cs index 64b01de..4782cce 100644 --- a/Shared/Models/Stateless/IPath.cs +++ b/Shared/Models/Stateless/IPath.cs @@ -1,6 +1,6 @@ using System.Collections.ObjectModel; -namespace View_by_Distance.Shared.Models.Stateless; +namespace Phares.Shared.Models.Stateless; public interface IPath { diff --git a/Shared/Models/Stateless/IPerson.cs b/Shared/Models/Stateless/IPerson.cs index 28af0de..408a880 100644 --- a/Shared/Models/Stateless/IPerson.cs +++ b/Shared/Models/Stateless/IPerson.cs @@ -1,4 +1,4 @@ -namespace View_by_Distance.Shared.Models.Stateless; +namespace Phares.Shared.Models.Stateless; public interface IPerson { diff --git a/Shared/Models/Stateless/IPersonBirthday.cs b/Shared/Models/Stateless/IPersonBirthday.cs index 4b9be43..969a1ec 100644 --- a/Shared/Models/Stateless/IPersonBirthday.cs +++ b/Shared/Models/Stateless/IPersonBirthday.cs @@ -1,6 +1,6 @@ using System.Globalization; -namespace View_by_Distance.Shared.Models.Stateless; +namespace Phares.Shared.Models.Stateless; public interface IPersonBirthday { diff --git a/Shared/Models/Stateless/IRename.cs b/Shared/Models/Stateless/IRename.cs index b677120..f16532e 100644 --- a/Shared/Models/Stateless/IRename.cs +++ b/Shared/Models/Stateless/IRename.cs @@ -1,6 +1,6 @@ using System.Collections.ObjectModel; -namespace View_by_Distance.Shared.Models.Stateless; +namespace Phares.Shared.Models.Stateless; public interface IRename { diff --git a/Shared/Models/Stateless/IResult.cs b/Shared/Models/Stateless/IResult.cs index c0b9090..553b307 100644 --- a/Shared/Models/Stateless/IResult.cs +++ b/Shared/Models/Stateless/IResult.cs @@ -1,4 +1,4 @@ -namespace View_by_Distance.Shared.Models.Stateless; +namespace Phares.Shared.Models.Stateless; public interface IResult { diff --git a/Shared/Models/Stateless/IWindows.cs b/Shared/Models/Stateless/IWindows.cs index 408b9fe..3759a08 100644 --- a/Shared/Models/Stateless/IWindows.cs +++ b/Shared/Models/Stateless/IWindows.cs @@ -1,6 +1,6 @@ using System.Collections.ObjectModel; -namespace View_by_Distance.Shared.Models.Stateless; +namespace Phares.Shared.Models.Stateless; public interface IWindows { diff --git a/Shared/Models/Stateless/Id.cs b/Shared/Models/Stateless/Id.cs index 29843ca..48fd8b5 100644 --- a/Shared/Models/Stateless/Id.cs +++ b/Shared/Models/Stateless/Id.cs @@ -1,6 +1,6 @@ using System.Text; -namespace View_by_Distance.Shared.Models.Stateless; +namespace Phares.Shared.Models.Stateless; internal abstract class Id { diff --git a/Shared/Models/Stateless/ImageFormat.cs b/Shared/Models/Stateless/ImageFormat.cs index b1024a7..68ba320 100644 --- a/Shared/Models/Stateless/ImageFormat.cs +++ b/Shared/Models/Stateless/ImageFormat.cs @@ -1,4 +1,4 @@ -namespace View_by_Distance.Shared.Models.Stateless; +namespace Phares.Shared.Models.Stateless; /// /// Specifies the file format of the image. diff --git a/Shared/Models/Stateless/Location.cs b/Shared/Models/Stateless/Location.cs index e04ebb0..98687be 100644 --- a/Shared/Models/Stateless/Location.cs +++ b/Shared/Models/Stateless/Location.cs @@ -1,4 +1,4 @@ -namespace View_by_Distance.Shared.Models.Stateless; +namespace Phares.Shared.Models.Stateless; internal abstract class Location { diff --git a/Shared/Models/Stateless/Mapping.cs b/Shared/Models/Stateless/Mapping.cs index bed6eb4..6c0cd6b 100644 --- a/Shared/Models/Stateless/Mapping.cs +++ b/Shared/Models/Stateless/Mapping.cs @@ -1,6 +1,6 @@ -using View_by_Distance.Shared.Models.Properties; +using Phares.Shared.Models.Properties; -namespace View_by_Distance.Shared.Models.Stateless; +namespace Phares.Shared.Models.Stateless; internal abstract class Mapping { diff --git a/Shared/Models/Stateless/Mode.cs b/Shared/Models/Stateless/Mode.cs index bf9f996..d4eb259 100644 --- a/Shared/Models/Stateless/Mode.cs +++ b/Shared/Models/Stateless/Mode.cs @@ -1,4 +1,4 @@ -namespace View_by_Distance.Shared.Models.Stateless; +namespace Phares.Shared.Models.Stateless; /// /// Specifies the image mode. diff --git a/Shared/Models/Stateless/Model.cs b/Shared/Models/Stateless/Model.cs index 96214dc..0c72bf6 100644 --- a/Shared/Models/Stateless/Model.cs +++ b/Shared/Models/Stateless/Model.cs @@ -1,4 +1,4 @@ -namespace View_by_Distance.Shared.Models.Stateless; +namespace Phares.Shared.Models.Stateless; /// /// Specifies the model of face detector. diff --git a/Shared/Models/Stateless/PersonBirthday.cs b/Shared/Models/Stateless/PersonBirthday.cs index bd61c5a..6bd24e6 100644 --- a/Shared/Models/Stateless/PersonBirthday.cs +++ b/Shared/Models/Stateless/PersonBirthday.cs @@ -1,6 +1,6 @@ using System.Globalization; -namespace View_by_Distance.Shared.Models.Stateless; +namespace Phares.Shared.Models.Stateless; internal abstract class PersonBirthday { diff --git a/Shared/Models/Stateless/PredictorModel.cs b/Shared/Models/Stateless/PredictorModel.cs index 8770e80..efc304e 100644 --- a/Shared/Models/Stateless/PredictorModel.cs +++ b/Shared/Models/Stateless/PredictorModel.cs @@ -1,4 +1,4 @@ -namespace View_by_Distance.Shared.Models.Stateless; +namespace Phares.Shared.Models.Stateless; /// /// Specifies the dimension of vector which be returned from detector. diff --git a/Shared/Models/Stateless/XDate.cs b/Shared/Models/Stateless/XDate.cs index 44d57e7..2c3b02c 100644 --- a/Shared/Models/Stateless/XDate.cs +++ b/Shared/Models/Stateless/XDate.cs @@ -2,7 +2,7 @@ using System.Collections.ObjectModel; using System.Globalization; using System.Text; -namespace View_by_Distance.Shared.Models.Stateless; +namespace Phares.Shared.Models.Stateless; internal abstract class XDate { diff --git a/Shared/Models/Stateless/XPath.cs b/Shared/Models/Stateless/XPath.cs index 5395e92..dfe8f16 100644 --- a/Shared/Models/Stateless/XPath.cs +++ b/Shared/Models/Stateless/XPath.cs @@ -1,6 +1,6 @@ using System.Collections.ObjectModel; -namespace View_by_Distance.Shared.Models.Stateless; +namespace Phares.Shared.Models.Stateless; internal abstract class XPath { diff --git a/Shared/Models/Stateless/XResult.cs b/Shared/Models/Stateless/XResult.cs index 4a61f49..03d6eb7 100644 --- a/Shared/Models/Stateless/XResult.cs +++ b/Shared/Models/Stateless/XResult.cs @@ -1,4 +1,4 @@ -namespace View_by_Distance.Shared.Models.Stateless; +namespace Phares.Shared.Models.Stateless; internal abstract class XResult { diff --git a/Shared/Models/WebPDirectory.cs b/Shared/Models/WebPDirectory.cs index 9e84df8..912289a 100644 --- a/Shared/Models/WebPDirectory.cs +++ b/Shared/Models/WebPDirectory.cs @@ -1,7 +1,7 @@ using System.Text.Json; using System.Text.Json.Serialization; -namespace View_by_Distance.Shared.Models; +namespace Phares.Shared.Models; public record WebPDirectory(string? ImageHeight, string? ImageWidth) diff --git a/Windows/Models/AppSettings.cs b/Windows/Models/AppSettings.cs index d167580..b0d95fd 100644 --- a/Windows/Models/AppSettings.cs +++ b/Windows/Models/AppSettings.cs @@ -1,7 +1,7 @@ using Microsoft.Extensions.Configuration; using System.Text.Json; using System.Text.Json.Serialization; -using View_by_Distance.Shared.Models; +using Phares.Shared.Models; namespace View_by_Distance.Windows.Models; diff --git a/Windows/Models/WindowsSettings.cs b/Windows/Models/WindowsSettings.cs index 4efcda9..8974716 100644 --- a/Windows/Models/WindowsSettings.cs +++ b/Windows/Models/WindowsSettings.cs @@ -1,4 +1,5 @@ +using Phares.Shared.Models.Properties; using System.Text.Json; using System.Text.Json.Serialization; @@ -9,7 +10,7 @@ public record WindowsSettings(string Company, int MaxDegreeOfParallelism, string? Page, string[] SidecarExtensions, - bool VerifyOnly) : Shared.Models.Properties.IWindowsSettings + bool VerifyOnly) : IWindowsSettings { public override string ToString() diff --git a/Windows/Program.cs b/Windows/Program.cs index 433b011..a6f64bf 100644 --- a/Windows/Program.cs +++ b/Windows/Program.cs @@ -23,7 +23,7 @@ public class Program { if (args is null) throw new Exception("args is null!"); - Shared.Models.Console console = new(); + Phares.Shared.Models.Console console = new(); _ = new Windows(args, logger, appSettings, silentIndex > -1, console); } catch (Exception ex) diff --git a/Windows/Windows.cs b/Windows/Windows.cs index f309537..3e6358d 100644 --- a/Windows/Windows.cs +++ b/Windows/Windows.cs @@ -6,10 +6,10 @@ using System.Drawing; using System.Drawing.Imaging; using System.Runtime.InteropServices; using System.Text.Json; -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.Stateless; +using Phares.Metadata.Models; +using Phares.Metadata.Models.Stateless; +using Phares.Shared.Models; +using Phares.Shared.Models.Stateless; using View_by_Distance.Windows.Models; namespace View_by_Distance.Windows; @@ -171,14 +171,19 @@ public partial class Windows : IWindows, IDisposable long epoch = new DateTime(1970, 1, 1).Ticks; long net8ReleaseDate = new DateTime(2023, 11, 14).Ticks; long net9ReleaseDate = new DateTime(2024, 11, 12).Ticks; + long net10ReleaseDate = new DateTime(2026, 01, 01).Ticks; double net8TotalSeconds = new TimeSpan(net8ReleaseDate - epoch).TotalSeconds; double net9TotalSeconds = new TimeSpan(net9ReleaseDate - epoch).TotalSeconds; + double net10TotalSeconds = new TimeSpan(net10ReleaseDate - epoch).TotalSeconds; logger?.LogInformation("It has been {net8TotalSeconds} seconds since net8 was released", net8TotalSeconds); logger?.LogInformation("It has been {net9TotalSeconds} seconds since net9 was released", net9TotalSeconds); + logger?.LogInformation("It has been {net10TotalSeconds} seconds since net10 was released", net10TotalSeconds); double net8TotalHours = Math.Floor((DateTimeOffset.UtcNow.ToUnixTimeSeconds() - net8TotalSeconds) / secondsInAHour); double net9TotalHours = Math.Floor((DateTimeOffset.UtcNow.ToUnixTimeSeconds() - net9TotalSeconds) / secondsInAHour); + double net10TotalHours = Math.Floor((DateTimeOffset.UtcNow.ToUnixTimeSeconds() - net10TotalSeconds) / secondsInAHour); logger?.LogInformation("It has been {net8TotalHours} hours since net8 was released", net8TotalHours); logger?.LogInformation("It has been {net9TotalHours} hours since net9 was released", net9TotalHours); + logger?.LogInformation("It has been {net10TotalHours} hours since net10 was released", net10TotalHours); } private void WindowsWork(ILogger? logger, AppSettings appSettings, IWindows windows)