phares3757/aa
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: phares3757:8.0.118.14728
Branches Tags
phares3757:master phares3757:07-27-a
phares3757:8.0.118.14905 phares3757:8.0.118.14751 phares3757:8.0.118.14728 phares3757:8.0.114
...
compare: phares3757:8.0.118.14751
Branches Tags
phares3757:07-27-a phares3757:master
phares3757:8.0.118.14905 phares3757:8.0.118.14751 phares3757:8.0.118.14728 phares3757:8.0.114

2 Commits
8.0.118.14 ... 8.0.118.14

Author SHA1 Message Date
Mike Phares
518af493a8 Made useable by Helpers 2025-07-20 08:31:03 -07:00
Mike Phares
d67d423ef3 Parameter constructors 2025-07-19 09:46:19 -07:00
133 changed files with 549 additions and 474 deletions
Expand all files Collapse all files

6
Compare/Compare.cs
View File

@ -5,10 +5,10 @@ using System.Drawing;
using View_by_Distance.Compare.Models; using View_by_Distance.Compare.Models;
using View_by_Distance.Distance.Models.Stateless; using View_by_Distance.Distance.Models.Stateless;
using View_by_Distance.Face.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.People.Models.Stateless;
using View_by_Distance.Shared.Models; using Phares.Shared.Models;
using View_by_Distance.Shared.Models.Stateless; using Phares.Shared.Models.Stateless;
namespace View_by_Distance.Compare; namespace View_by_Distance.Compare;

2
Compare/Models/AppSettings.cs
View File

@ -1,7 +1,7 @@
using Microsoft.Extensions.Configuration; using Microsoft.Extensions.Configuration;
using System.Text.Json; using System.Text.Json;
using System.Text.Json.Serialization; using System.Text.Json.Serialization;
using View_by_Distance.Shared.Models; using Phares.Shared.Models;
namespace View_by_Distance.Compare.Models; namespace View_by_Distance.Compare.Models;

3
Compare/Models/CompareSettings.cs
View File

@ -1,4 +1,5 @@
using Phares.Shared.Models.Properties;
using System.Text.Json; using System.Text.Json;
using System.Text.Json.Serialization; using System.Text.Json.Serialization;
@ -11,7 +12,7 @@ public record CompareSettings(string Company,
int MaxDegreeOfParallelism, int MaxDegreeOfParallelism,
string[] OutputResolutions, string[] OutputResolutions,
bool SaveExtractedFaces, bool SaveExtractedFaces,
bool SaveExtractedJavaScriptObjectNotation) : Shared.Models.Properties.ICompareSettings bool SaveExtractedJavaScriptObjectNotation) : ICompareSettings
{ {
public override string ToString() public override string ToString()

2
Compare/Program.cs
View File

@ -23,7 +23,7 @@ public class Program
{ {
if (args is null) if (args is null)
throw new Exception("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); _ = new Compare(args, logger, appSettings, silentIndex > -1, console);
} }
catch (Exception ex) catch (Exception ex)

2
Distance/AA.Distance.csproj
View File

@ -10,7 +10,7 @@
<HoursSinceNovember122024>$([System.Math]::Floor($([MSBuild]::Divide($([MSBuild]::Subtract($([System.DateTimeOffset]::UtcNow.ToUnixTimeSeconds()), 1731369600)), 3600))))</HoursSinceNovember122024> <HoursSinceNovember122024>$([System.Math]::Floor($([MSBuild]::Divide($([MSBuild]::Subtract($([System.DateTimeOffset]::UtcNow.ToUnixTimeSeconds()), 1731369600)), 3600))))</HoursSinceNovember122024>
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<PackageId>Phares.AA.Distance</PackageId> <PackageId>Phares.Distance</PackageId>
<Version>9.0.104.$([System.Math]::Floor($([MSBuild]::Divide($([MSBuild]::Subtract($([System.DateTimeOffset]::UtcNow.ToUnixTimeSeconds()), 1731369600)), 3600))))</Version> <Version>9.0.104.$([System.Math]::Floor($([MSBuild]::Divide($([MSBuild]::Subtract($([System.DateTimeOffset]::UtcNow.ToUnixTimeSeconds()), 1731369600)), 3600))))</Version>
<Company>Phares</Company> <Company>Phares</Company>
<Authors>Mike Phares</Authors> <Authors>Mike Phares</Authors>

2
Distance/Models/C_Resize.cs
View File

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

2
Distance/Models/D2_FaceParts.cs
View File

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

6
Distance/Models/DistanceLimits.cs
View File

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

2
Distance/Models/E_Distance.cs
View File

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

2
Distance/Models/IDistanceLimits.cs
View File

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

24
Distance/Models/Stateless/FaceEncodingLogic.cs
View File

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

11
Distance/Models/Stateless/FilterLogicA.cs
View File

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

6
Distance/Models/Stateless/FilterLogicB.cs
View File

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

6
Distance/Models/Stateless/FilterLogicC.cs
View File

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

8
Distance/Models/Stateless/FilterLogicD.cs
View File

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

8
Distance/Models/Stateless/IDistance.cs
View File

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

10
Distance/Models/Stateless/MappedLogicA.cs
View File

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

6
Distance/Models/Stateless/MappedLogicB.cs
View File

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

2
Face/AA.Face.csproj
View File

@ -10,7 +10,7 @@
<HoursSinceNovember122024>$([System.Math]::Floor($([MSBuild]::Divide($([MSBuild]::Subtract($([System.DateTimeOffset]::UtcNow.ToUnixTimeSeconds()), 1731369600)), 3600))))</HoursSinceNovember122024> <HoursSinceNovember122024>$([System.Math]::Floor($([MSBuild]::Divide($([MSBuild]::Subtract($([System.DateTimeOffset]::UtcNow.ToUnixTimeSeconds()), 1731369600)), 3600))))</HoursSinceNovember122024>
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<PackageId>Phares.AA.Face</PackageId> <PackageId>Phares.Face</PackageId>
<Version>9.0.104.$([System.Math]::Floor($([MSBuild]::Divide($([MSBuild]::Subtract($([System.DateTimeOffset]::UtcNow.ToUnixTimeSeconds()), 1731369600)), 3600))))</Version> <Version>9.0.104.$([System.Math]::Floor($([MSBuild]::Divide($([MSBuild]::Subtract($([System.DateTimeOffset]::UtcNow.ToUnixTimeSeconds()), 1731369600)), 3600))))</Version>
<Company>Phares</Company> <Company>Phares</Company>
<Authors>Mike Phares</Authors> <Authors>Mike Phares</Authors>

2
Face/Models/D_Face.cs
View File

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

10
Face/Models/Stateless/Face.cs
View File

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

6
Face/Models/Stateless/IFace.cs
View File

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

2
FaceRecognitionDotNet/AA.FaceRecognitionDotNet.csproj
View File

@ -10,7 +10,7 @@
<HoursSinceNovember122024>$([System.Math]::Floor($([MSBuild]::Divide($([MSBuild]::Subtract($([System.DateTimeOffset]::UtcNow.ToUnixTimeSeconds()), 1731369600)), 3600))))</HoursSinceNovember122024> <HoursSinceNovember122024>$([System.Math]::Floor($([MSBuild]::Divide($([MSBuild]::Subtract($([System.DateTimeOffset]::UtcNow.ToUnixTimeSeconds()), 1731369600)), 3600))))</HoursSinceNovember122024>
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<PackageId>Phares.AA.FaceRecognitionDotNet</PackageId> <PackageId>Phares.FaceRecognitionDotNet</PackageId>
<GeneratePackageOnBuild>false</GeneratePackageOnBuild> <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
<Version>9.0.104.$([System.Math]::Floor($([MSBuild]::Divide($([MSBuild]::Subtract($([System.DateTimeOffset]::UtcNow.ToUnixTimeSeconds()), 1731369600)), 3600))))</Version> <Version>9.0.104.$([System.Math]::Floor($([MSBuild]::Divide($([MSBuild]::Subtract($([System.DateTimeOffset]::UtcNow.ToUnixTimeSeconds()), 1731369600)), 3600))))</Version>
<Authors>Mike Phares</Authors> <Authors>Mike Phares</Authors>

2
FaceRecognitionDotNet/Dlib/Python/CnnFaceDetectionModelV1.cs
View File

@ -1,7 +1,7 @@
using DlibDotNet; using DlibDotNet;
using DlibDotNet.Dnn; using DlibDotNet.Dnn;
using View_by_Distance.FaceRecognitionDotNet.Models; 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; namespace View_by_Distance.FaceRecognitionDotNet.Dlib.Python;

2
FaceRecognitionDotNet/Dlib/Python/SimpleObjectDetector.cs
View File

@ -1,6 +1,6 @@
using DlibDotNet; using DlibDotNet;
using View_by_Distance.FaceRecognitionDotNet.Models; 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; namespace View_by_Distance.FaceRecognitionDotNet.Dlib.Python;

2
FaceRecognitionDotNet/Extensions/FaceDetector.cs
View File

@ -1,6 +1,6 @@
using DlibDotNet; using DlibDotNet;
using View_by_Distance.FaceRecognitionDotNet.Models; using View_by_Distance.FaceRecognitionDotNet.Models;
using View_by_Distance.Shared.Models; using Phares.Shared.Models;
namespace View_by_Distance.FaceRecognitionDotNet.Extensions; namespace View_by_Distance.FaceRecognitionDotNet.Extensions;

4
FaceRecognitionDotNet/Extensions/FaceLandmarkDetector.cs
View File

@ -1,7 +1,7 @@
using DlibDotNet; using DlibDotNet;
using View_by_Distance.FaceRecognitionDotNet.Models; using View_by_Distance.FaceRecognitionDotNet.Models;
using View_by_Distance.Shared.Models; using Phares.Shared.Models;
using View_by_Distance.Shared.Models.Stateless; using Phares.Shared.Models.Stateless;
namespace View_by_Distance.FaceRecognitionDotNet.Extensions; namespace View_by_Distance.FaceRecognitionDotNet.Extensions;

4
FaceRecognitionDotNet/Models/FaceRecognition.cs
View File

@ -6,8 +6,8 @@ using System.Drawing.Imaging;
using System.Runtime.InteropServices; using System.Runtime.InteropServices;
using View_by_Distance.FaceRecognitionDotNet.Dlib.Python; using View_by_Distance.FaceRecognitionDotNet.Dlib.Python;
using View_by_Distance.FaceRecognitionDotNet.Extensions; using View_by_Distance.FaceRecognitionDotNet.Extensions;
using View_by_Distance.Shared.Models; using Phares.Shared.Models;
using View_by_Distance.Shared.Models.Stateless; using Phares.Shared.Models.Stateless;
namespace View_by_Distance.FaceRecognitionDotNet.Models; namespace View_by_Distance.FaceRecognitionDotNet.Models;

4
FaceRecognitionDotNet/Models/FaceRecognitionGroup.cs
View File

@ -1,5 +1,5 @@
using View_by_Distance.Shared.Models; using Phares.Shared.Models;
using View_by_Distance.Shared.Models.Stateless; using Phares.Shared.Models.Stateless;
namespace View_by_Distance.FaceRecognitionDotNet.Models; namespace View_by_Distance.FaceRecognitionDotNet.Models;

2
FaceRecognitionDotNet/Models/Image.cs
View File

@ -1,7 +1,7 @@
using DlibDotNet; using DlibDotNet;
using DlibDotNet.Extensions; using DlibDotNet.Extensions;
using System.Drawing; using System.Drawing;
using View_by_Distance.Shared.Models.Stateless; using Phares.Shared.Models.Stateless;
namespace View_by_Distance.FaceRecognitionDotNet.Models; namespace View_by_Distance.FaceRecognitionDotNet.Models;

2
Metadata/AA.Metadata.csproj
View File

@ -10,7 +10,7 @@
<HoursSinceNovember142023>$([System.Math]::Floor($([MSBuild]::Divide($([MSBuild]::Subtract($([System.DateTimeOffset]::UtcNow.ToUnixTimeSeconds()), 1699920000)), 3600))))</HoursSinceNovember142023> <HoursSinceNovember142023>$([System.Math]::Floor($([MSBuild]::Divide($([MSBuild]::Subtract($([System.DateTimeOffset]::UtcNow.ToUnixTimeSeconds()), 1699920000)), 3600))))</HoursSinceNovember142023>
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<PackageId>Phares.AA.Metadata</PackageId> <PackageId>Phares.Metadata</PackageId>
<Version>8.0.118.$([System.Math]::Floor($([MSBuild]::Divide($([MSBuild]::Subtract($([System.DateTimeOffset]::UtcNow.ToUnixTimeSeconds()), 1699920000)), 3600))))</Version> <Version>8.0.118.$([System.Math]::Floor($([MSBuild]::Divide($([MSBuild]::Subtract($([System.DateTimeOffset]::UtcNow.ToUnixTimeSeconds()), 1699920000)), 3600))))</Version>
<Company>Phares</Company> <Company>Phares</Company>
<Authors>Mike Phares</Authors> <Authors>Mike Phares</Authors>

8
Metadata/Models/A_Metadata.cs
View File

@ -1,10 +1,10 @@
using System.Collections.ObjectModel; using System.Collections.ObjectModel;
using System.Text.Json; using System.Text.Json;
using View_by_Distance.Metadata.Models.Stateless; using Phares.Metadata.Models.Stateless;
using View_by_Distance.Shared.Models; using Phares.Shared.Models;
using View_by_Distance.Shared.Models.Stateless; using Phares.Shared.Models.Stateless;
namespace View_by_Distance.Metadata.Models; namespace Phares.Metadata.Models;
public class A_Metadata public class A_Metadata
{ {

2
Metadata/Models/Stateless/Dimensions.cs
View File

@ -1,6 +1,6 @@
using System.Drawing; using System.Drawing;
namespace View_by_Distance.Metadata.Models.Stateless; namespace Phares.Metadata.Models.Stateless;
internal static class Dimensions internal static class Dimensions
{ {

390
Metadata/Models/Stateless/Exif.cs
View File

@ -1,9 +1,10 @@
using MetadataExtractor; using MetadataExtractor;
using MetadataExtractor.Formats.Exif;
using MetadataExtractor.Formats.Exif.Makernotes; using MetadataExtractor.Formats.Exif.Makernotes;
using System.Globalization; 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 internal abstract class Exif
{ {
@ -24,98 +25,101 @@ internal abstract class Exif
return result; return result;
} }
private static Shared.Models.AviDirectory[] GetAviDirectories(IReadOnlyList<MetadataExtractor.Directory> directories) private static AviDirectory[] GetAviDirectories(IReadOnlyList<MetadataExtractor.Directory> directories)
{ {
List<Shared.Models.AviDirectory> results = []; List<AviDirectory> results = [];
AviDirectory aviDirectory;
IEnumerable<MetadataExtractor.Formats.Avi.AviDirectory> aviDirectories = directories.OfType<MetadataExtractor.Formats.Avi.AviDirectory>(); IEnumerable<MetadataExtractor.Formats.Avi.AviDirectory> aviDirectories = directories.OfType<MetadataExtractor.Formats.Avi.AviDirectory>();
foreach (MetadataExtractor.Formats.Avi.AviDirectory aviDirectory in aviDirectories) foreach (MetadataExtractor.Formats.Avi.AviDirectory a in aviDirectories)
{ {
if (aviDirectory.Tags.Count == 0) if (a.Tags.Count == 0)
continue; continue;
DateTime? dateTimeOriginal; DateTime? dateTimeOriginal;
string? duration = aviDirectory.GetDescription(MetadataExtractor.Formats.Avi.AviDirectory.TagDuration); string? duration = a.GetDescription(MetadataExtractor.Formats.Avi.AviDirectory.TagDuration);
string? height = aviDirectory.GetDescription(MetadataExtractor.Formats.Avi.AviDirectory.TagHeight); string? height = a.GetDescription(MetadataExtractor.Formats.Avi.AviDirectory.TagHeight);
string? width = aviDirectory.GetDescription(MetadataExtractor.Formats.Avi.AviDirectory.TagWidth); string? width = a.GetDescription(MetadataExtractor.Formats.Avi.AviDirectory.TagWidth);
if (aviDirectory.TryGetDateTime(MetadataExtractor.Formats.Avi.AviDirectory.TagDateTimeOriginal, out DateTime checkDateTime)) if (a.TryGetDateTime(MetadataExtractor.Formats.Avi.AviDirectory.TagDateTimeOriginal, out DateTime checkDateTime))
dateTimeOriginal = checkDateTime; dateTimeOriginal = checkDateTime;
else else
dateTimeOriginal = GetDateTime(aviDirectory.GetString(MetadataExtractor.Formats.Avi.AviDirectory.TagDateTimeOriginal)); dateTimeOriginal = GetDateTime(a.GetString(MetadataExtractor.Formats.Avi.AviDirectory.TagDateTimeOriginal));
if (dateTimeOriginal is null && duration is null && height is null && width is null) if (dateTimeOriginal is null && duration is null && height is null && width is null)
continue; continue;
results.Add(new(dateTimeOriginal, duration, height, width)); aviDirectory = new(DateTimeOriginal: dateTimeOriginal, Duration: duration, Height: height, Width: width);
results.Add(aviDirectory);
} }
return results.ToArray(); return results.ToArray();
} }
private static Shared.Models.ExifDirectoryBase[] GetExifBaseDirectories(IReadOnlyList<MetadataExtractor.Directory> directories) private static ExifDirectoryBase[] GetExifBaseDirectories(IReadOnlyList<MetadataExtractor.Directory> directories)
{ {
List<Shared.Models.ExifDirectoryBase> results = []; List<ExifDirectoryBase> results = [];
IEnumerable<ExifDirectoryBase> exifBaseDirectories = directories.OfType<ExifDirectoryBase>(); ExifDirectoryBase exifDirectoryBase;
foreach (ExifDirectoryBase exifDirectoryBase in exifBaseDirectories) IEnumerable<MetadataExtractor.Formats.Exif.ExifDirectoryBase> exifBaseDirectories = directories.OfType<MetadataExtractor.Formats.Exif.ExifDirectoryBase>();
foreach (MetadataExtractor.Formats.Exif.ExifDirectoryBase e in exifBaseDirectories)
{ {
if (exifDirectoryBase.Tags.Count == 0) if (e.Tags.Count == 0)
continue; continue;
DateTime? dateTime; DateTime? dateTime;
DateTime checkDateTime; DateTime checkDateTime;
DateTime? dateTimeOriginal; DateTime? dateTimeOriginal;
DateTime? dateTimeDigitized; DateTime? dateTimeDigitized;
string? aperture = exifDirectoryBase.GetDescription(ExifDirectoryBase.TagAperture); string? aperture = e.GetDescription(MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagAperture);
string? applicationNotes = exifDirectoryBase.GetDescription(ExifDirectoryBase.TagApplicationNotes); string? applicationNotes = e.GetDescription(MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagApplicationNotes);
string? artist = exifDirectoryBase.GetDescription(ExifDirectoryBase.TagArtist); string? artist = e.GetDescription(MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagArtist);
string? bitsPerSample = exifDirectoryBase.GetDescription(ExifDirectoryBase.TagBitsPerSample); string? bitsPerSample = e.GetDescription(MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagBitsPerSample);
string? bodySerialNumber = exifDirectoryBase.GetDescription(ExifDirectoryBase.TagBodySerialNumber); string? bodySerialNumber = e.GetDescription(MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagBodySerialNumber);
string? cameraOwnerName = exifDirectoryBase.GetDescription(ExifDirectoryBase.TagCameraOwnerName); string? cameraOwnerName = e.GetDescription(MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagCameraOwnerName);
string? compressedAverageBitsPerPixel = exifDirectoryBase.GetDescription(ExifDirectoryBase.TagCompressedAverageBitsPerPixel); string? compressedAverageBitsPerPixel = e.GetDescription(MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagCompressedAverageBitsPerPixel);
string? compression = exifDirectoryBase.GetDescription(ExifDirectoryBase.TagCompression); string? compression = e.GetDescription(MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagCompression);
string? copyright = exifDirectoryBase.GetDescription(ExifDirectoryBase.TagCopyright); string? copyright = e.GetDescription(MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagCopyright);
string? documentName = exifDirectoryBase.GetDescription(ExifDirectoryBase.TagDocumentName); string? documentName = e.GetDescription(MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagDocumentName);
string? exifVersion = exifDirectoryBase.GetDescription(ExifDirectoryBase.TagExifVersion); string? exifVersion = e.GetDescription(MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagExifVersion);
string? exposureTime = exifDirectoryBase.GetDescription(ExifDirectoryBase.TagExposureTime); string? exposureTime = e.GetDescription(MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagExposureTime);
string? fileSource = exifDirectoryBase.GetDescription(ExifDirectoryBase.TagFileSource); string? fileSource = e.GetDescription(MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagFileSource);
string? imageDescription = exifDirectoryBase.GetDescription(ExifDirectoryBase.TagImageDescription); string? imageDescription = e.GetDescription(MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagImageDescription);
string? imageHeight = exifDirectoryBase.GetDescription(ExifDirectoryBase.TagImageHeight); string? imageHeight = e.GetDescription(MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagImageHeight);
int? imageHeightValue = imageHeight is null ? null : exifDirectoryBase.GetInt32(ExifDirectoryBase.TagImageHeight); int? imageHeightValue = imageHeight is null ? null : e.GetInt32(MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagImageHeight);
string? imageNumber = exifDirectoryBase.GetDescription(ExifDirectoryBase.TagImageNumber); string? imageNumber = e.GetDescription(MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagImageNumber);
string? imageUniqueId = exifDirectoryBase.GetDescription(ExifDirectoryBase.TagImageUniqueId); string? imageUniqueId = e.GetDescription(MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagImageUniqueId);
string? imageWidth = exifDirectoryBase.GetDescription(ExifDirectoryBase.TagImageWidth); string? imageWidth = e.GetDescription(MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagImageWidth);
int? imageWidthValue = imageWidth is null ? null : exifDirectoryBase.GetInt32(ExifDirectoryBase.TagImageWidth); int? imageWidthValue = imageWidth is null ? null : e.GetInt32(MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagImageWidth);
string? isoSpeed = exifDirectoryBase.GetDescription(ExifDirectoryBase.TagIsoSpeed); string? isoSpeed = e.GetDescription(MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagIsoSpeed);
string? lensMake = exifDirectoryBase.GetDescription(ExifDirectoryBase.TagLensMake); string? lensMake = e.GetDescription(MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagLensMake);
string? lensModel = exifDirectoryBase.GetDescription(ExifDirectoryBase.TagLensModel); string? lensModel = e.GetDescription(MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagLensModel);
string? lensSerialNumber = exifDirectoryBase.GetDescription(ExifDirectoryBase.TagLensSerialNumber); string? lensSerialNumber = e.GetDescription(MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagLensSerialNumber);
string? make = exifDirectoryBase.GetDescription(ExifDirectoryBase.TagMake); string? make = e.GetDescription(MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagMake);
string? makerNote = exifDirectoryBase.GetDescription(ExifDirectoryBase.TagMakernote); string? makerNote = e.GetDescription(MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagMakernote);
string? model = exifDirectoryBase.GetDescription(ExifDirectoryBase.TagModel); string? model = e.GetDescription(MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagModel);
string? orientation = exifDirectoryBase.GetDescription(ExifDirectoryBase.TagOrientation); string? orientation = e.GetDescription(MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagOrientation);
int? orientationValue = orientation is null ? null : exifDirectoryBase.GetInt32(ExifDirectoryBase.TagOrientation); int? orientationValue = orientation is null ? null : e.GetInt32(MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagOrientation);
string? rating = exifDirectoryBase.GetDescription(ExifDirectoryBase.TagRating); string? rating = e.GetDescription(MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagRating);
string? ratingPercent = exifDirectoryBase.GetDescription(ExifDirectoryBase.TagRatingPercent); string? ratingPercent = e.GetDescription(MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagRatingPercent);
string? securityClassification = exifDirectoryBase.GetDescription(ExifDirectoryBase.TagSecurityClassification); string? securityClassification = e.GetDescription(MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagSecurityClassification);
string? shutterSpeed = exifDirectoryBase.GetDescription(ExifDirectoryBase.TagShutterSpeed); string? shutterSpeed = e.GetDescription(MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagShutterSpeed);
string? software = exifDirectoryBase.GetDescription(ExifDirectoryBase.TagSoftware); string? software = e.GetDescription(MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagSoftware);
string? timeZone = exifDirectoryBase.GetDescription(ExifDirectoryBase.TagTimeZone); string? timeZone = e.GetDescription(MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagTimeZone);
string? timeZoneDigitized = exifDirectoryBase.GetDescription(ExifDirectoryBase.TagTimeZoneDigitized); string? timeZoneDigitized = e.GetDescription(MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagTimeZoneDigitized);
string? timeZoneOriginal = exifDirectoryBase.GetDescription(ExifDirectoryBase.TagTimeZoneOriginal); string? timeZoneOriginal = e.GetDescription(MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagTimeZoneOriginal);
string? userComment = exifDirectoryBase.GetDescription(ExifDirectoryBase.TagUserComment); string? userComment = e.GetDescription(MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagUserComment);
string? winAuthor = exifDirectoryBase.GetDescription(ExifDirectoryBase.TagWinAuthor); string? winAuthor = e.GetDescription(MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagWinAuthor);
string? winComment = exifDirectoryBase.GetDescription(ExifDirectoryBase.TagWinComment); string? winComment = e.GetDescription(MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagWinComment);
string? winKeywords = exifDirectoryBase.GetDescription(ExifDirectoryBase.TagWinKeywords); string? winKeywords = e.GetDescription(MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagWinKeywords);
string? winSubject = exifDirectoryBase.GetDescription(ExifDirectoryBase.TagWinSubject); string? winSubject = e.GetDescription(MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagWinSubject);
string? winTitle = exifDirectoryBase.GetDescription(ExifDirectoryBase.TagWinTitle); string? winTitle = e.GetDescription(MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagWinTitle);
string? xResolution = exifDirectoryBase.GetDescription(ExifDirectoryBase.TagXResolution); string? xResolution = e.GetDescription(MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagXResolution);
string? yResolution = exifDirectoryBase.GetDescription(ExifDirectoryBase.TagYResolution); string? yResolution = e.GetDescription(MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagYResolution);
if (exifDirectoryBase.TryGetDateTime(ExifDirectoryBase.TagDateTime, out checkDateTime)) if (e.TryGetDateTime(MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagDateTime, out checkDateTime))
dateTime = checkDateTime; dateTime = checkDateTime;
else else
dateTime = GetDateTime(exifDirectoryBase.GetString(ExifDirectoryBase.TagDateTime)); dateTime = GetDateTime(e.GetString(MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagDateTime));
if (exifDirectoryBase.TryGetDateTime(ExifDirectoryBase.TagDateTimeOriginal, out checkDateTime)) if (e.TryGetDateTime(MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagDateTimeOriginal, out checkDateTime))
dateTimeOriginal = checkDateTime; dateTimeOriginal = checkDateTime;
else else
dateTimeOriginal = GetDateTime(exifDirectoryBase.GetString(ExifDirectoryBase.TagDateTimeOriginal)); dateTimeOriginal = GetDateTime(e.GetString(MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagDateTimeOriginal));
if (exifDirectoryBase.TryGetDateTime(ExifDirectoryBase.TagDateTimeDigitized, out checkDateTime)) if (e.TryGetDateTime(MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagDateTimeDigitized, out checkDateTime))
dateTimeDigitized = checkDateTime; dateTimeDigitized = checkDateTime;
else else
dateTimeDigitized = GetDateTime(exifDirectoryBase.GetString(ExifDirectoryBase.TagDateTimeDigitized)); dateTimeDigitized = GetDateTime(e.GetString(MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagDateTimeDigitized));
if (userComment is not null && userComment.Length > 255) if (userComment is not null && userComment.Length > 255)
userComment = "..."; userComment = "...";
if (aperture is null if (aperture is null
@ -165,7 +169,7 @@ internal abstract class Exif
&& xResolution is not null && xResolution is not null
&& yResolution is null) && yResolution is null)
continue; continue;
results.Add(new(Aperture: aperture, exifDirectoryBase = new(Aperture: aperture,
ApplicationNotes: applicationNotes, ApplicationNotes: applicationNotes,
Artist: artist, Artist: artist,
BitsPerSample: bitsPerSample, BitsPerSample: bitsPerSample,
@ -212,102 +216,112 @@ internal abstract class Exif
WinSubject: winSubject, WinSubject: winSubject,
WinTitle: winTitle, WinTitle: winTitle,
XResolution: xResolution, XResolution: xResolution,
YResolution: yResolution)); YResolution: yResolution);
results.Add(exifDirectoryBase);
} }
return results.ToArray(); return results.ToArray();
} }
private static Shared.Models.FileMetadataDirectory[] GetFileMetadataDirectories(string file, IReadOnlyList<MetadataExtractor.Directory> directories) private static FileMetadataDirectory[] GetFileMetadataDirectories(string file, IReadOnlyList<MetadataExtractor.Directory> directories)
{ {
List<Shared.Models.FileMetadataDirectory> results = []; List<FileMetadataDirectory> results = [];
FileMetadataDirectory fileMetadataDirectory;
IEnumerable<MetadataExtractor.Formats.FileSystem.FileMetadataDirectory> fileMetadataDirectories = directories.OfType<MetadataExtractor.Formats.FileSystem.FileMetadataDirectory>(); IEnumerable<MetadataExtractor.Formats.FileSystem.FileMetadataDirectory> fileMetadataDirectories = directories.OfType<MetadataExtractor.Formats.FileSystem.FileMetadataDirectory>();
foreach (MetadataExtractor.Formats.FileSystem.FileMetadataDirectory fileMetadataDirectory in fileMetadataDirectories) foreach (MetadataExtractor.Formats.FileSystem.FileMetadataDirectory f in fileMetadataDirectories)
{ {
if (fileMetadataDirectory.Tags.Count == 0) if (f.Tags.Count == 0)
continue; continue;
DateTime? fileModifiedDate; DateTime? fileModifiedDate;
string? fileName = fileMetadataDirectory.GetDescription(MetadataExtractor.Formats.FileSystem.FileMetadataDirectory.TagFileName); string? fileName = f.GetDescription(MetadataExtractor.Formats.FileSystem.FileMetadataDirectory.TagFileName);
string? fileSize = fileMetadataDirectory.GetDescription(MetadataExtractor.Formats.FileSystem.FileMetadataDirectory.TagFileSize); string? fileSize = f.GetDescription(MetadataExtractor.Formats.FileSystem.FileMetadataDirectory.TagFileSize);
if (fileMetadataDirectory.TryGetDateTime(MetadataExtractor.Formats.FileSystem.FileMetadataDirectory.TagFileModifiedDate, out DateTime checkDateTime)) if (f.TryGetDateTime(MetadataExtractor.Formats.FileSystem.FileMetadataDirectory.TagFileModifiedDate, out DateTime checkDateTime))
fileModifiedDate = checkDateTime; fileModifiedDate = checkDateTime;
else else
fileModifiedDate = GetDateTime(fileMetadataDirectory.GetString(MetadataExtractor.Formats.FileSystem.FileMetadataDirectory.TagFileModifiedDate)); fileModifiedDate = GetDateTime(f.GetString(MetadataExtractor.Formats.FileSystem.FileMetadataDirectory.TagFileModifiedDate));
if (fileName is null || !file.EndsWith(fileName)) if (fileName is null || !file.EndsWith(fileName))
throw new NotSupportedException($"!{file}.EndsWith({fileName})"); throw new NotSupportedException($"!{file}.EndsWith({fileName})");
if (fileModifiedDate is null && fileName is null && fileSize is null) if (fileModifiedDate is null && fileName is null && fileSize is null)
continue; continue;
results.Add(new(fileModifiedDate, fileName, fileSize)); fileMetadataDirectory = new(FileModifiedDate: fileModifiedDate, FileName: fileName, FileSize: fileSize);
results.Add(fileMetadataDirectory);
} }
return results.ToArray(); return results.ToArray();
} }
private static Shared.Models.GifHeaderDirectory[] GetGifHeaderDirectories(IReadOnlyList<MetadataExtractor.Directory> directories) private static GifHeaderDirectory[] GetGifHeaderDirectories(IReadOnlyList<MetadataExtractor.Directory> directories)
{ {
List<Shared.Models.GifHeaderDirectory> results = []; List<GifHeaderDirectory> results = [];
GifHeaderDirectory gifHeaderDirectory;
IEnumerable<MetadataExtractor.Formats.Gif.GifHeaderDirectory> gifHeaderDirectories = directories.OfType<MetadataExtractor.Formats.Gif.GifHeaderDirectory>(); IEnumerable<MetadataExtractor.Formats.Gif.GifHeaderDirectory> gifHeaderDirectories = directories.OfType<MetadataExtractor.Formats.Gif.GifHeaderDirectory>();
foreach (MetadataExtractor.Formats.Gif.GifHeaderDirectory gifHeaderDirectory in gifHeaderDirectories) foreach (MetadataExtractor.Formats.Gif.GifHeaderDirectory g in gifHeaderDirectories)
{ {
if (gifHeaderDirectory.Tags.Count == 0) if (g.Tags.Count == 0)
continue; continue;
string? imageHeight = gifHeaderDirectory.GetDescription(MetadataExtractor.Formats.Gif.GifHeaderDirectory.TagImageHeight); string? imageHeight = g.GetDescription(MetadataExtractor.Formats.Gif.GifHeaderDirectory.TagImageHeight);
string? imageWidth = gifHeaderDirectory.GetDescription(MetadataExtractor.Formats.Gif.GifHeaderDirectory.TagImageWidth); string? imageWidth = g.GetDescription(MetadataExtractor.Formats.Gif.GifHeaderDirectory.TagImageWidth);
if (imageHeight is null && imageWidth is null) if (imageHeight is null && imageWidth is null)
continue; continue;
results.Add(new(imageHeight, imageWidth)); gifHeaderDirectory = new(ImageHeight: imageHeight, ImageWidth: imageWidth);
results.Add(gifHeaderDirectory);
} }
return results.ToArray(); return results.ToArray();
} }
private static Shared.Models.GpsDirectory[] GetGpsDirectories(IReadOnlyList<MetadataExtractor.Directory> directories) private static GpsDirectory[] GetGpsDirectories(IReadOnlyList<MetadataExtractor.Directory> directories)
{ {
List<Shared.Models.GpsDirectory> results = []; List<GpsDirectory> results = [];
IEnumerable<GpsDirectory> gpsDirectories = directories.OfType<GpsDirectory>(); GpsDirectory gpsDirectory;
foreach (GpsDirectory gpsDirectory in gpsDirectories) IEnumerable<MetadataExtractor.Formats.Exif.GpsDirectory> gpsDirectories = directories.OfType<MetadataExtractor.Formats.Exif.GpsDirectory>();
foreach (MetadataExtractor.Formats.Exif.GpsDirectory g in gpsDirectories)
{ {
if (gpsDirectory.Tags.Count == 0) if (g.Tags.Count == 0)
continue; continue;
DateTime? timeStamp; DateTime? timeStamp;
string? altitude = gpsDirectory.GetDescription(GpsDirectory.TagAltitude); string? altitude = g.GetDescription(MetadataExtractor.Formats.Exif.GpsDirectory.TagAltitude);
string? latitude = gpsDirectory.GetDescription(GpsDirectory.TagLatitude); string? latitude = g.GetDescription(MetadataExtractor.Formats.Exif.GpsDirectory.TagLatitude);
string? latitudeRef = gpsDirectory.GetDescription(GpsDirectory.TagLatitudeRef); string? latitudeRef = g.GetDescription(MetadataExtractor.Formats.Exif.GpsDirectory.TagLatitudeRef);
string? longitude = gpsDirectory.GetDescription(GpsDirectory.TagLongitude); string? longitude = g.GetDescription(MetadataExtractor.Formats.Exif.GpsDirectory.TagLongitude);
string? longitudeRef = gpsDirectory.GetDescription(GpsDirectory.TagLongitudeRef); string? longitudeRef = g.GetDescription(MetadataExtractor.Formats.Exif.GpsDirectory.TagLongitudeRef);
if (gpsDirectory.TryGetDateTime(GpsDirectory.TagTimeStamp, out DateTime checkDateTime)) if (g.TryGetDateTime(MetadataExtractor.Formats.Exif.GpsDirectory.TagTimeStamp, out DateTime checkDateTime))
timeStamp = checkDateTime; timeStamp = checkDateTime;
else else
timeStamp = GetDateTime(gpsDirectory.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) if (altitude is null && latitude is null && latitudeRef is null && longitude is null && longitudeRef is null && timeStamp is null)
continue; continue;
results.Add(new(altitude, gpsDirectory = new(Altitude: altitude,
latitude, Latitude: latitude,
latitudeRef, LatitudeRef: latitudeRef,
longitude, Longitude: longitude,
longitudeRef, LongitudeRef: longitudeRef,
timeStamp)); TimeStamp: timeStamp);
results.Add(gpsDirectory);
} }
return results.ToArray(); return results.ToArray();
} }
private static Shared.Models.JpegDirectory[] GetJpegDirectories(IReadOnlyList<MetadataExtractor.Directory> directories) private static JpegDirectory[] GetJpegDirectories(IReadOnlyList<MetadataExtractor.Directory> directories)
{ {
List<Shared.Models.JpegDirectory> results = []; List<JpegDirectory> results = [];
JpegDirectory jpegDirectory;
IEnumerable<MetadataExtractor.Formats.Jpeg.JpegDirectory> jpegDirectories = directories.OfType<MetadataExtractor.Formats.Jpeg.JpegDirectory>(); IEnumerable<MetadataExtractor.Formats.Jpeg.JpegDirectory> jpegDirectories = directories.OfType<MetadataExtractor.Formats.Jpeg.JpegDirectory>();
foreach (MetadataExtractor.Formats.Jpeg.JpegDirectory jpegDirectory in jpegDirectories) foreach (MetadataExtractor.Formats.Jpeg.JpegDirectory j in jpegDirectories)
{ {
if (jpegDirectory.Tags.Count == 0) if (j.Tags.Count == 0)
continue; continue;
string? imageHeight = jpegDirectory.GetDescription(MetadataExtractor.Formats.Jpeg.JpegDirectory.TagImageHeight); string? imageHeight = j.GetDescription(MetadataExtractor.Formats.Jpeg.JpegDirectory.TagImageHeight);
string? imageWidth = jpegDirectory.GetDescription(MetadataExtractor.Formats.Jpeg.JpegDirectory.TagImageWidth); string? imageWidth = j.GetDescription(MetadataExtractor.Formats.Jpeg.JpegDirectory.TagImageWidth);
if (imageHeight is null && imageWidth is null) if (imageHeight is null && imageWidth is null)
continue; continue;
results.Add(new(imageHeight, imageWidth)); jpegDirectory = new(ImageHeight: imageHeight, ImageWidth: imageWidth);
results.Add(jpegDirectory);
} }
return results.ToArray(); return results.ToArray();
} }
private static Shared.Models.MakernoteDirectory[] GetMakernoteDirectories(IReadOnlyList<MetadataExtractor.Directory> directories) private static MakernoteDirectory[] GetMakernoteDirectories(IReadOnlyList<MetadataExtractor.Directory> directories)
{ {
List<Shared.Models.MakernoteDirectory> results = []; List<MakernoteDirectory> results = [];
MakernoteDirectory makernoteDirectory;
IEnumerable<AppleMakernoteDirectory> appleMakernoteDirectories = directories.OfType<AppleMakernoteDirectory>(); IEnumerable<AppleMakernoteDirectory> appleMakernoteDirectories = directories.OfType<AppleMakernoteDirectory>();
foreach (AppleMakernoteDirectory appleMakernoteDirectory in appleMakernoteDirectories) foreach (AppleMakernoteDirectory appleMakernoteDirectory in appleMakernoteDirectories)
{ {
@ -318,7 +332,8 @@ internal abstract class Exif
string? qualityAndFileFormat = null; string? qualityAndFileFormat = null;
if (cameraSerialNumber is null && firmwareVersion is null && qualityAndFileFormat is null) if (cameraSerialNumber is null && firmwareVersion is null && qualityAndFileFormat is null)
continue; continue;
results.Add(new(cameraSerialNumber, firmwareVersion, qualityAndFileFormat)); makernoteDirectory = new(cameraSerialNumber, firmwareVersion, qualityAndFileFormat);
results.Add(makernoteDirectory);
} }
IEnumerable<CanonMakernoteDirectory> canonMakernoteDirectories = directories.OfType<CanonMakernoteDirectory>(); IEnumerable<CanonMakernoteDirectory> canonMakernoteDirectories = directories.OfType<CanonMakernoteDirectory>();
foreach (CanonMakernoteDirectory canonMakernoteDirectory in canonMakernoteDirectories) foreach (CanonMakernoteDirectory canonMakernoteDirectory in canonMakernoteDirectories)
@ -330,7 +345,8 @@ internal abstract class Exif
string? qualityAndFileFormat = canonMakernoteDirectory.GetDescription(CanonMakernoteDirectory.CameraSettings.TagQuality); string? qualityAndFileFormat = canonMakernoteDirectory.GetDescription(CanonMakernoteDirectory.CameraSettings.TagQuality);
if (cameraSerialNumber is null && firmwareVersion is null && qualityAndFileFormat is null) if (cameraSerialNumber is null && firmwareVersion is null && qualityAndFileFormat is null)
continue; continue;
results.Add(new(cameraSerialNumber, firmwareVersion, qualityAndFileFormat)); makernoteDirectory = new(cameraSerialNumber, firmwareVersion, qualityAndFileFormat);
results.Add(makernoteDirectory);
} }
IEnumerable<NikonType2MakernoteDirectory> nikonType2MakernoteDirectories = directories.OfType<NikonType2MakernoteDirectory>(); IEnumerable<NikonType2MakernoteDirectory> nikonType2MakernoteDirectories = directories.OfType<NikonType2MakernoteDirectory>();
foreach (NikonType2MakernoteDirectory nikonType2MakernoteDirectory in nikonType2MakernoteDirectories) foreach (NikonType2MakernoteDirectory nikonType2MakernoteDirectory in nikonType2MakernoteDirectories)
@ -342,7 +358,8 @@ internal abstract class Exif
string? qualityAndFileFormat = nikonType2MakernoteDirectory.GetDescription(NikonType2MakernoteDirectory.TagQualityAndFileFormat); string? qualityAndFileFormat = nikonType2MakernoteDirectory.GetDescription(NikonType2MakernoteDirectory.TagQualityAndFileFormat);
if (cameraSerialNumber is null && firmwareVersion is null && qualityAndFileFormat is null) if (cameraSerialNumber is null && firmwareVersion is null && qualityAndFileFormat is null)
continue; continue;
results.Add(new(cameraSerialNumber, firmwareVersion, qualityAndFileFormat)); makernoteDirectory = new(cameraSerialNumber, firmwareVersion, qualityAndFileFormat);
results.Add(makernoteDirectory);
} }
IEnumerable<OlympusMakernoteDirectory> olympusMakernoteDirectories = directories.OfType<OlympusMakernoteDirectory>(); IEnumerable<OlympusMakernoteDirectory> olympusMakernoteDirectories = directories.OfType<OlympusMakernoteDirectory>();
foreach (OlympusMakernoteDirectory olympusMakernoteDirectory in olympusMakernoteDirectories) foreach (OlympusMakernoteDirectory olympusMakernoteDirectory in olympusMakernoteDirectories)
@ -354,7 +371,8 @@ internal abstract class Exif
string? qualityAndFileFormat = olympusMakernoteDirectory.GetDescription(OlympusMakernoteDirectory.TagJpegQuality); string? qualityAndFileFormat = olympusMakernoteDirectory.GetDescription(OlympusMakernoteDirectory.TagJpegQuality);
if (cameraSerialNumber is null && firmwareVersion is null && qualityAndFileFormat is null) if (cameraSerialNumber is null && firmwareVersion is null && qualityAndFileFormat is null)
continue; continue;
results.Add(new(cameraSerialNumber, firmwareVersion, qualityAndFileFormat)); makernoteDirectory = new(cameraSerialNumber, firmwareVersion, qualityAndFileFormat);
results.Add(makernoteDirectory);
} }
IEnumerable<PanasonicMakernoteDirectory> panasonicMakernoteDirectories = directories.OfType<PanasonicMakernoteDirectory>(); IEnumerable<PanasonicMakernoteDirectory> panasonicMakernoteDirectories = directories.OfType<PanasonicMakernoteDirectory>();
foreach (PanasonicMakernoteDirectory panasonicMakernoteDirectory in panasonicMakernoteDirectories) foreach (PanasonicMakernoteDirectory panasonicMakernoteDirectory in panasonicMakernoteDirectories)
@ -366,7 +384,8 @@ internal abstract class Exif
string? qualityAndFileFormat = panasonicMakernoteDirectory.GetDescription(PanasonicMakernoteDirectory.TagQualityMode); string? qualityAndFileFormat = panasonicMakernoteDirectory.GetDescription(PanasonicMakernoteDirectory.TagQualityMode);
if (cameraSerialNumber is null && firmwareVersion is null && qualityAndFileFormat is null) if (cameraSerialNumber is null && firmwareVersion is null && qualityAndFileFormat is null)
continue; continue;
results.Add(new(cameraSerialNumber, firmwareVersion, qualityAndFileFormat)); makernoteDirectory = new(cameraSerialNumber, firmwareVersion, qualityAndFileFormat);
results.Add(makernoteDirectory);
} }
IEnumerable<SamsungType2MakernoteDirectory> samsungType2MakernoteDirectories = directories.OfType<SamsungType2MakernoteDirectory>(); IEnumerable<SamsungType2MakernoteDirectory> samsungType2MakernoteDirectories = directories.OfType<SamsungType2MakernoteDirectory>();
foreach (SamsungType2MakernoteDirectory samsungType2MakernoteDirectory in samsungType2MakernoteDirectories) foreach (SamsungType2MakernoteDirectory samsungType2MakernoteDirectory in samsungType2MakernoteDirectories)
@ -378,7 +397,8 @@ internal abstract class Exif
string? qualityAndFileFormat = null; string? qualityAndFileFormat = null;
if (cameraSerialNumber is null && firmwareVersion is null && qualityAndFileFormat is null) if (cameraSerialNumber is null && firmwareVersion is null && qualityAndFileFormat is null)
continue; continue;
results.Add(new(cameraSerialNumber, firmwareVersion, qualityAndFileFormat)); makernoteDirectory = new(cameraSerialNumber, firmwareVersion, qualityAndFileFormat);
results.Add(makernoteDirectory);
} }
IEnumerable<SonyType6MakernoteDirectory> sonyType6MakernoteDirectories = directories.OfType<SonyType6MakernoteDirectory>(); IEnumerable<SonyType6MakernoteDirectory> sonyType6MakernoteDirectories = directories.OfType<SonyType6MakernoteDirectory>();
foreach (SonyType6MakernoteDirectory sonyType6MakernoteDirectory in sonyType6MakernoteDirectories) foreach (SonyType6MakernoteDirectory sonyType6MakernoteDirectory in sonyType6MakernoteDirectories)
@ -390,125 +410,136 @@ internal abstract class Exif
string? qualityAndFileFormat = null; string? qualityAndFileFormat = null;
if (cameraSerialNumber is null && firmwareVersion is null && qualityAndFileFormat is null) if (cameraSerialNumber is null && firmwareVersion is null && qualityAndFileFormat is null)
continue; continue;
results.Add(new(cameraSerialNumber, firmwareVersion, qualityAndFileFormat)); makernoteDirectory = new(CameraSerialNumber: cameraSerialNumber, FirmwareVersion: firmwareVersion, QualityAndFileFormat: qualityAndFileFormat);
results.Add(makernoteDirectory);
} }
return results.ToArray(); return results.ToArray();
} }
private static Shared.Models.PhotoshopDirectory[] GetPhotoshopDirectories(IReadOnlyList<MetadataExtractor.Directory> directories) private static PhotoshopDirectory[] GetPhotoshopDirectories(IReadOnlyList<MetadataExtractor.Directory> directories)
{ {
List<Shared.Models.PhotoshopDirectory> results = []; List<PhotoshopDirectory> results = [];
PhotoshopDirectory photoshopDirectory;
IEnumerable<MetadataExtractor.Formats.Photoshop.PhotoshopDirectory> photoshopDirectories = directories.OfType<MetadataExtractor.Formats.Photoshop.PhotoshopDirectory>(); IEnumerable<MetadataExtractor.Formats.Photoshop.PhotoshopDirectory> photoshopDirectories = directories.OfType<MetadataExtractor.Formats.Photoshop.PhotoshopDirectory>();
foreach (MetadataExtractor.Formats.Photoshop.PhotoshopDirectory photoshopDirectory in photoshopDirectories) foreach (MetadataExtractor.Formats.Photoshop.PhotoshopDirectory p in photoshopDirectories)
{ {
if (photoshopDirectory.Tags.Count == 0) if (p.Tags.Count == 0)
continue; continue;
string? jpegQuality = photoshopDirectory.GetDescription(MetadataExtractor.Formats.Photoshop.PhotoshopDirectory.TagJpegQuality); string? jpegQuality = p.GetDescription(MetadataExtractor.Formats.Photoshop.PhotoshopDirectory.TagJpegQuality);
string? url = photoshopDirectory.GetDescription(MetadataExtractor.Formats.Photoshop.PhotoshopDirectory.TagUrl); string? url = p.GetDescription(MetadataExtractor.Formats.Photoshop.PhotoshopDirectory.TagUrl);
if (jpegQuality is null && url is null) if (jpegQuality is null && url is null)
continue; continue;
results.Add(new(jpegQuality, url)); photoshopDirectory = new(JpegQuality: jpegQuality, Url: url);
results.Add(photoshopDirectory);
} }
return results.ToArray(); return results.ToArray();
} }
private static Shared.Models.PngDirectory[] GetPngDirectories(IReadOnlyList<MetadataExtractor.Directory> directories) private static PngDirectory[] GetPngDirectories(IReadOnlyList<MetadataExtractor.Directory> directories)
{ {
List<Shared.Models.PngDirectory> results = []; List<PngDirectory> results = [];
PngDirectory pngDirectory;
IEnumerable<MetadataExtractor.Formats.Png.PngDirectory> pngDirectories = directories.OfType<MetadataExtractor.Formats.Png.PngDirectory>(); IEnumerable<MetadataExtractor.Formats.Png.PngDirectory> pngDirectories = directories.OfType<MetadataExtractor.Formats.Png.PngDirectory>();
foreach (MetadataExtractor.Formats.Png.PngDirectory pngDirectory in pngDirectories) foreach (MetadataExtractor.Formats.Png.PngDirectory p in pngDirectories)
{ {
if (pngDirectory.Tags.Count == 0) if (p.Tags.Count == 0)
continue; continue;
string? imageHeight = pngDirectory.GetDescription(MetadataExtractor.Formats.Png.PngDirectory.TagImageHeight); string? imageHeight = p.GetDescription(MetadataExtractor.Formats.Png.PngDirectory.TagImageHeight);
string? imageWidth = pngDirectory.GetDescription(MetadataExtractor.Formats.Png.PngDirectory.TagImageWidth); string? imageWidth = p.GetDescription(MetadataExtractor.Formats.Png.PngDirectory.TagImageWidth);
string? textualData = pngDirectory.GetDescription(MetadataExtractor.Formats.Png.PngDirectory.TagTextualData); string? textualData = p.GetDescription(MetadataExtractor.Formats.Png.PngDirectory.TagTextualData);
if (imageHeight is null && imageWidth is null && textualData is null) if (imageHeight is null && imageWidth is null && textualData is null)
continue; continue;
results.Add(new(imageHeight, imageWidth, textualData)); pngDirectory = new(ImageHeight: imageHeight, ImageWidth: imageWidth, TextualData: textualData);
results.Add(pngDirectory);
} }
return results.ToArray(); return results.ToArray();
} }
private static Shared.Models.QuickTimeMovieHeaderDirectory[] GetQuickTimeMovieHeaderDirectoryDirectories(IReadOnlyList<MetadataExtractor.Directory> directories) private static QuickTimeMovieHeaderDirectory[] GetQuickTimeMovieHeaderDirectoryDirectories(IReadOnlyList<MetadataExtractor.Directory> directories)
{ {
List<Shared.Models.QuickTimeMovieHeaderDirectory> results = []; List<QuickTimeMovieHeaderDirectory> results = [];
QuickTimeMovieHeaderDirectory quickTimeMovieHeaderDirectory;
IEnumerable<MetadataExtractor.Formats.QuickTime.QuickTimeMovieHeaderDirectory> quickTimeMovieHeaderDirectories = directories.OfType<MetadataExtractor.Formats.QuickTime.QuickTimeMovieHeaderDirectory>(); IEnumerable<MetadataExtractor.Formats.QuickTime.QuickTimeMovieHeaderDirectory> quickTimeMovieHeaderDirectories = directories.OfType<MetadataExtractor.Formats.QuickTime.QuickTimeMovieHeaderDirectory>();
foreach (MetadataExtractor.Formats.QuickTime.QuickTimeMovieHeaderDirectory quickTimeMovieHeaderDirectory in quickTimeMovieHeaderDirectories) foreach (MetadataExtractor.Formats.QuickTime.QuickTimeMovieHeaderDirectory q in quickTimeMovieHeaderDirectories)
{ {
if (quickTimeMovieHeaderDirectory.Tags.Count == 0) if (q.Tags.Count == 0)
continue; continue;
DateTime? created; DateTime? created;
if (quickTimeMovieHeaderDirectory.TryGetDateTime(MetadataExtractor.Formats.QuickTime.QuickTimeMovieHeaderDirectory.TagCreated, out DateTime checkDateTime)) if (q.TryGetDateTime(MetadataExtractor.Formats.QuickTime.QuickTimeMovieHeaderDirectory.TagCreated, out DateTime checkDateTime))
created = checkDateTime; created = checkDateTime;
else else
created = GetDateTime(quickTimeMovieHeaderDirectory.GetString(MetadataExtractor.Formats.QuickTime.QuickTimeMovieHeaderDirectory.TagCreated)); created = GetDateTime(q.GetString(MetadataExtractor.Formats.QuickTime.QuickTimeMovieHeaderDirectory.TagCreated));
if (created is null) if (created is null)
continue; continue;
results.Add(new(created)); quickTimeMovieHeaderDirectory = new(Created: created);
results.Add(quickTimeMovieHeaderDirectory);
} }
return results.ToArray(); return results.ToArray();
} }
private static Shared.Models.QuickTimeTrackHeaderDirectory[] GetQuickTimeTrackHeaderDirectoryDirectories(IReadOnlyList<MetadataExtractor.Directory> directories) private static QuickTimeTrackHeaderDirectory[] GetQuickTimeTrackHeaderDirectoryDirectories(IReadOnlyList<MetadataExtractor.Directory> directories)
{ {
List<Shared.Models.QuickTimeTrackHeaderDirectory> results = []; List<QuickTimeTrackHeaderDirectory> results = [];
QuickTimeTrackHeaderDirectory quickTimeTrackHeaderDirectory;
IEnumerable<MetadataExtractor.Formats.QuickTime.QuickTimeTrackHeaderDirectory> quickTimeTrackHeaderDirectories = directories.OfType<MetadataExtractor.Formats.QuickTime.QuickTimeTrackHeaderDirectory>(); IEnumerable<MetadataExtractor.Formats.QuickTime.QuickTimeTrackHeaderDirectory> quickTimeTrackHeaderDirectories = directories.OfType<MetadataExtractor.Formats.QuickTime.QuickTimeTrackHeaderDirectory>();
foreach (MetadataExtractor.Formats.QuickTime.QuickTimeTrackHeaderDirectory quickTimeTrackHeaderDirectory in quickTimeTrackHeaderDirectories) foreach (MetadataExtractor.Formats.QuickTime.QuickTimeTrackHeaderDirectory q in quickTimeTrackHeaderDirectories)
{ {
if (quickTimeTrackHeaderDirectory.Tags.Count == 0) if (q.Tags.Count == 0)
continue; continue;
DateTime? created; DateTime? created;
if (quickTimeTrackHeaderDirectory.TryGetDateTime(MetadataExtractor.Formats.QuickTime.QuickTimeTrackHeaderDirectory.TagCreated, out DateTime checkDateTime)) if (q.TryGetDateTime(MetadataExtractor.Formats.QuickTime.QuickTimeTrackHeaderDirectory.TagCreated, out DateTime checkDateTime))
created = checkDateTime; created = checkDateTime;
else else
created = GetDateTime(quickTimeTrackHeaderDirectory.GetString(MetadataExtractor.Formats.QuickTime.QuickTimeTrackHeaderDirectory.TagCreated)); created = GetDateTime(q.GetString(MetadataExtractor.Formats.QuickTime.QuickTimeTrackHeaderDirectory.TagCreated));
if (created is null) if (created is null)
continue; continue;
results.Add(new(created)); quickTimeTrackHeaderDirectory = new(Created: created);
results.Add(quickTimeTrackHeaderDirectory);
} }
return results.ToArray(); return results.ToArray();
} }
private static Shared.Models.WebPDirectory[] GetWebPDirectories(IReadOnlyList<MetadataExtractor.Directory> directories) private static WebPDirectory[] GetWebPDirectories(IReadOnlyList<MetadataExtractor.Directory> directories)
{ {
List<Shared.Models.WebPDirectory> results = []; List<WebPDirectory> results = [];
WebPDirectory webPDirectory;
IEnumerable<MetadataExtractor.Formats.WebP.WebPDirectory> webPDirectories = directories.OfType<MetadataExtractor.Formats.WebP.WebPDirectory>(); IEnumerable<MetadataExtractor.Formats.WebP.WebPDirectory> webPDirectories = directories.OfType<MetadataExtractor.Formats.WebP.WebPDirectory>();
foreach (MetadataExtractor.Formats.WebP.WebPDirectory webPDirectory in webPDirectories) foreach (MetadataExtractor.Formats.WebP.WebPDirectory w in webPDirectories)
{ {
if (webPDirectory.Tags.Count == 0) if (w.Tags.Count == 0)
continue; continue;
string? imageHeight = webPDirectory.GetDescription(MetadataExtractor.Formats.WebP.WebPDirectory.TagImageHeight); string? imageHeight = w.GetDescription(MetadataExtractor.Formats.WebP.WebPDirectory.TagImageHeight);
string? imageWidth = webPDirectory.GetDescription(MetadataExtractor.Formats.WebP.WebPDirectory.TagImageWidth); string? imageWidth = w.GetDescription(MetadataExtractor.Formats.WebP.WebPDirectory.TagImageWidth);
if (imageHeight is null && imageWidth is null) if (imageHeight is null && imageWidth is null)
continue; continue;
results.Add(new(imageHeight, imageWidth)); webPDirectory = new(ImageHeight: imageHeight, ImageWidth: imageWidth);
results.Add(webPDirectory);
} }
return results.ToArray(); return results.ToArray();
} }
private static Shared.Models.ExifDirectory Covert(Shared.Models.FilePath filePath, Shared.Models.PersonKeyFormattedAndKeyTicksAndDisplayDirectoryName? personKeyFormattedAndKeyTicksAndDisplayDirectoryName, IReadOnlyList<MetadataExtractor.Directory> directories, System.Drawing.Size? size) private static ExifDirectory Covert(FilePath filePath, PersonKeyFormattedAndKeyTicksAndDisplayDirectoryName? personKeyFormattedAndKeyTicksAndDisplayDirectoryName, IReadOnlyList<MetadataExtractor.Directory> directories, System.Drawing.Size? size)
{ {
Shared.Models.ExifDirectory result; ExifDirectory result;
Shared.Models.AviDirectory[] aviDirectories = GetAviDirectories(directories); AviDirectory[] aviDirectories = GetAviDirectories(directories);
Shared.Models.GpsDirectory[] gpsDirectories = GetGpsDirectories(directories); GpsDirectory[] gpsDirectories = GetGpsDirectories(directories);
Shared.Models.PngDirectory[] pngDirectories = GetPngDirectories(directories); PngDirectory[] pngDirectories = GetPngDirectories(directories);
Shared.Models.JpegDirectory[] jpegDirectories = GetJpegDirectories(directories); JpegDirectory[] jpegDirectories = GetJpegDirectories(directories);
Shared.Models.WebPDirectory[] webPDirectories = GetWebPDirectories(directories); WebPDirectory[] webPDirectories = GetWebPDirectories(directories);
Shared.Models.ExifDirectoryBase[] exifBaseDirectories = GetExifBaseDirectories(directories); ExifDirectoryBase[] exifBaseDirectories = GetExifBaseDirectories(directories);
Shared.Models.GifHeaderDirectory[] gifHeaderDirectories = GetGifHeaderDirectories(directories); GifHeaderDirectory[] gifHeaderDirectories = GetGifHeaderDirectories(directories);
Shared.Models.MakernoteDirectory[] makernoteDirectories = GetMakernoteDirectories(directories); MakernoteDirectory[] makernoteDirectories = GetMakernoteDirectories(directories);
Shared.Models.PhotoshopDirectory[] photoshopDirectories = GetPhotoshopDirectories(directories); PhotoshopDirectory[] photoshopDirectories = GetPhotoshopDirectories(directories);
Shared.Models.FileMetadataDirectory[] fileMetadataDirectories = GetFileMetadataDirectories(filePath.FullName, directories); FileMetadataDirectory[] fileMetadataDirectories = GetFileMetadataDirectories(filePath.FullName, directories);
Shared.Models.QuickTimeMovieHeaderDirectory[] quickTimeMovieHeaderDirectories = GetQuickTimeMovieHeaderDirectoryDirectories(directories); QuickTimeMovieHeaderDirectory[] quickTimeMovieHeaderDirectories = GetQuickTimeMovieHeaderDirectoryDirectories(directories);
Shared.Models.QuickTimeTrackHeaderDirectory[] quickTimeTrackHeaderDirectories = GetQuickTimeTrackHeaderDirectoryDirectories(directories); QuickTimeTrackHeaderDirectory[] quickTimeTrackHeaderDirectories = GetQuickTimeTrackHeaderDirectoryDirectories(directories);
result = new(AviDirectories: aviDirectories, result = new(AviDirectories: aviDirectories,
ExifBaseDirectories: exifBaseDirectories, ExifBaseDirectories: exifBaseDirectories,
FileMetadataDirectories: fileMetadataDirectories, FileMetadataDirectories: fileMetadataDirectories,
FilePath: filePath, FilePath: filePath,
GifHeaderDirectories: gifHeaderDirectories, GifHeaderDirectories: gifHeaderDirectories,
GpsDirectories: gpsDirectories, GpsDirectories: gpsDirectories,
Height: size?.Height ?? Shared.Models.Stateless.IMetaBase.GetHeight(exifBaseDirectories), Height: size?.Height ?? IMetaBase.GetHeight(exifBaseDirectories),
JpegDirectories: jpegDirectories, JpegDirectories: jpegDirectories,
MakernoteDirectories: makernoteDirectories, MakernoteDirectories: makernoteDirectories,
PersonKeyFormattedAndKeyTicksAndDisplayDirectoryName: personKeyFormattedAndKeyTicksAndDisplayDirectoryName, PersonKeyFormattedAndKeyTicksAndDisplayDirectoryName: personKeyFormattedAndKeyTicksAndDisplayDirectoryName,
@ -517,13 +548,13 @@ internal abstract class Exif
QuickTimeMovieHeaderDirectories: quickTimeMovieHeaderDirectories, QuickTimeMovieHeaderDirectories: quickTimeMovieHeaderDirectories,
QuickTimeTrackHeaderDirectories: quickTimeTrackHeaderDirectories, QuickTimeTrackHeaderDirectories: quickTimeTrackHeaderDirectories,
WebPDirectories: webPDirectories, WebPDirectories: webPDirectories,
Width: size?.Width ?? Shared.Models.Stateless.IMetaBase.GetWidth(exifBaseDirectories)); Width: size?.Width ?? IMetaBase.GetWidth(exifBaseDirectories));
return result; 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<MetadataExtractor.Directory> directories = ImageMetadataReader.ReadMetadata(stream); IReadOnlyList<MetadataExtractor.Directory> directories = ImageMetadataReader.ReadMetadata(stream);
System.Drawing.Size? size; System.Drawing.Size? size;
try try
@ -534,4 +565,15 @@ internal abstract class Exif
return result; 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;
}
} }

23
Metadata/Models/Stateless/Face.cs
View File

@ -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 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) internal static string? GetFaceEncoding(PngDirectory[]? pngDirectories)
{ {
string? result = null; string? result = null;
@ -22,7 +31,15 @@ internal static class Face
return result; 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; string? result = null;
if (pngDirectories is not null) if (pngDirectories is not null)

5
Metadata/Models/Stateless/GPS.cs
View File

@ -1,8 +1,7 @@
using MetadataExtractor; using MetadataExtractor;
using View_by_Distance.Metadata.Models.Stateless; using Phares.Shared.Models;
using View_by_Distance.Shared.Models;
namespace View_by_Distance.Metadata.Models.Stateless; namespace Phares.Metadata.Models.Stateless;
internal abstract class GPS internal abstract class GPS
{ {

8
Metadata/Models/Stateless/Get.cs
View File

@ -1,9 +1,9 @@
using System.Collections.ObjectModel; using System.Collections.ObjectModel;
using View_by_Distance.Shared.Models; using Phares.Shared.Models;
using View_by_Distance.Shared.Models.Properties; using Phares.Shared.Models.Properties;
using View_by_Distance.Shared.Models.Stateless; using Phares.Shared.Models.Stateless;
namespace View_by_Distance.Metadata.Models.Stateless; namespace Phares.Metadata.Models.Stateless;
internal static class Get internal static class Get
{ {

97
Metadata/Models/Stateless/IMetadata.cs
View File

@ -1,10 +1,10 @@
using MetadataExtractor; using MetadataExtractor;
using System.Collections.ObjectModel; using System.Collections.ObjectModel;
using View_by_Distance.Shared.Models; using Phares.Shared.Models;
using View_by_Distance.Shared.Models.Properties; using Phares.Shared.Models.Properties;
using View_by_Distance.Shared.Models.Stateless; using Phares.Shared.Models.Stateless;
namespace View_by_Distance.Metadata.Models.Stateless; namespace Phares.Metadata.Models.Stateless;
public interface IMetadata public interface IMetadata
{ {
@ -17,49 +17,70 @@ public interface IMetadata
Meters Meters
} }
ExifDirectory TestStatic_GetExifDirectory(FilePath filePath, Stream stream, PersonKeyFormattedAndKeyTicksAndDisplayDirectoryName? personKeyFormattedAndKeyTicksAndDisplayDirectoryName) => public static FaceFile? GetFaceFile(ExifDirectory? exifDirectory) =>
GetExifDirectory(filePath, stream, personKeyFormattedAndKeyTicksAndDisplayDirectoryName); Face.GetFaceFile(exifDirectory);
static ExifDirectory GetExifDirectory(FilePath filePath, Stream stream, PersonKeyFormattedAndKeyTicksAndDisplayDirectoryName? personKeyFormattedAndKeyTicksAndDisplayDirectoryName) =>
Exif.GetExifDirectory(filePath, stream, personKeyFormattedAndKeyTicksAndDisplayDirectoryName);
string? TestStatic_GetOutputResolution(ExifDirectory? exifDirectory) => public static GeoLocation? GeoLocation(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) =>
GPS.GeoLocation(exifDirectory?.GpsDirectories); GPS.GeoLocation(exifDirectory?.GpsDirectories);
double? TestStatic_GetDistance(double originLatitude, double originLongitude, double destinationLatitude, double destinationLongitude, int decimalPlaces = 1, DistanceUnit distanceUnit = DistanceUnit.Miles) => public static string? GetRawFaceEncoding(ExifDirectory? exifDirectory) =>
GetDistance(originLatitude, originLongitude, destinationLatitude, destinationLongitude, decimalPlaces, distanceUnit); Face.GetFaceEncoding(exifDirectory?.PngDirectories);
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);
Action<string> TestStatic_SetExifDirectoryCollection(IRename rename, ResultSettings resultSettings, MetadataSettings metadataSettings, IRenameSettings renameSettings, A_Metadata metadata, List<string> distinct, List<MetadataGroup> metadataGroups) => public static FaceEncoding? GetFaceEncoding(ExifDirectory? exifDirectory) =>
SetExifDirectoryCollection(rename, resultSettings, metadataSettings, renameSettings, metadata, distinct, metadataGroups); Face.GetFaceEncoding(exifDirectory);
static Action<string> SetExifDirectoryCollection(IRename rename, ResultSettings resultSettings, MetadataSettings metadataSettings, IRenameSettings renameSettings, A_Metadata metadata, List<string> distinct, List<MetadataGroup> metadataGroups) =>
Get.SetExifDirectoryCollection(rename, resultSettings, metadataSettings, renameSettings, metadata, distinct, metadataGroups);
ReadOnlyDictionary<string, List<FileHolder>> TestStatic_GetKeyValuePairs(IEnumerable<string> files) => public static ReadOnlyDictionary<string, List<FileHolder>> GetKeyValuePairs(IEnumerable<string> files) =>
GetKeyValuePairs(files);
static ReadOnlyDictionary<string, List<FileHolder>> GetKeyValuePairs(IEnumerable<string> files) =>
Get.GetKeyValuePairs(files); Get.GetKeyValuePairs(files);
ReadOnlyDictionary<string, List<FileHolder>> TestStatic_GetKeyValuePairs(IEnumerable<NginxFileSystem> collection) => public static ReadOnlyDictionary<string, List<FileHolder>> GetKeyValuePairs(IEnumerable<NginxFileSystem> collection) =>
GetKeyValuePairs(collection);
static ReadOnlyDictionary<string, List<FileHolder>> GetKeyValuePairs(IEnumerable<NginxFileSystem> collection) =>
Get.GetKeyValuePairs(collection); Get.GetKeyValuePairs(collection);
Action<string> TestStatic_SetExifDirectoryCollection(IWindows windows, ResultSettings resultSettings, MetadataSettings metadataSettings, A_Metadata metadata, List<string> distinct, List<MetadataGroup> metadataGroups) => public static ExifDirectory? GetExifDirectory(ResultSettings resultSettings, MetadataSettings metadataSettings, FileInfo fileInfo) =>
SetExifDirectoryCollection(windows, resultSettings, metadataSettings, metadata, distinct, metadataGroups); Exif.GetExifDirectory(resultSettings, metadataSettings, fileInfo);
static Action<string> SetExifDirectoryCollection(IWindows windows, ResultSettings resultSettings, MetadataSettings metadataSettings, A_Metadata metadata, List<string> distinct, List<MetadataGroup> metadataGroups) =>
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<string> SetExifDirectoryCollection(IRename rename, ResultSettings resultSettings, MetadataSettings metadataSettings, IRenameSettings renameSettings, A_Metadata metadata, List<string> distinct, List<MetadataGroup> metadataGroups) =>
Get.SetExifDirectoryCollection(rename, resultSettings, metadataSettings, renameSettings, metadata, distinct, metadataGroups);
public static Action<string> SetExifDirectoryCollection(IWindows windows, ResultSettings resultSettings, MetadataSettings metadataSettings, A_Metadata metadata, List<string> distinct, List<MetadataGroup> metadataGroups) =>
Get.SetExifDirectoryCollection(windows, resultSettings, metadataSettings, metadata, distinct, 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<string, List<FileHolder>> TestStatic_GetKeyValuePairs(IEnumerable<string> files) =>
GetKeyValuePairs(files);
internal ReadOnlyDictionary<string, List<FileHolder>> TestStatic_GetKeyValuePairs(IEnumerable<NginxFileSystem> 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<string> TestStatic_SetExifDirectoryCollection(IWindows windows, ResultSettings resultSettings, MetadataSettings metadataSettings, A_Metadata metadata, List<string> distinct, List<MetadataGroup> metadataGroups) =>
SetExifDirectoryCollection(windows, resultSettings, metadataSettings, metadata, distinct, metadataGroups);
internal Action<string> TestStatic_SetExifDirectoryCollection(IRename rename, ResultSettings resultSettings, MetadataSettings metadataSettings, IRenameSettings renameSettings, A_Metadata metadata, List<string> distinct, List<MetadataGroup> metadataGroups) =>
SetExifDirectoryCollection(rename, resultSettings, metadataSettings, renameSettings, metadata, distinct, metadataGroups);
} }

2
People/AA.People.csproj
View File

@ -10,7 +10,7 @@
<HoursSinceNovember122024>$([System.Math]::Floor($([MSBuild]::Divide($([MSBuild]::Subtract($([System.DateTimeOffset]::UtcNow.ToUnixTimeSeconds()), 1731369600)), 3600))))</HoursSinceNovember122024> <HoursSinceNovember122024>$([System.Math]::Floor($([MSBuild]::Divide($([MSBuild]::Subtract($([System.DateTimeOffset]::UtcNow.ToUnixTimeSeconds()), 1731369600)), 3600))))</HoursSinceNovember122024>
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<PackageId>Phares.AA.People</PackageId> <PackageId>Phares.People</PackageId>
<Version>9.0.104.$([System.Math]::Floor($([MSBuild]::Divide($([MSBuild]::Subtract($([System.DateTimeOffset]::UtcNow.ToUnixTimeSeconds()), 1731369600)), 3600))))</Version> <Version>9.0.104.$([System.Math]::Floor($([MSBuild]::Divide($([MSBuild]::Subtract($([System.DateTimeOffset]::UtcNow.ToUnixTimeSeconds()), 1731369600)), 3600))))</Version>
<Company>Phares</Company> <Company>Phares</Company>
<Authors>Mike Phares</Authors> <Authors>Mike Phares</Authors>

2
People/Models/A2_People.cs
View File

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

4
People/Models/Stateless/IPeople.cs
View File

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

8
People/Models/Stateless/People.cs
View File

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

8
People/Models/Stateless/ReadOnlyCollectionsLogic.cs
View File

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

2
Rename/Models/AppSettings.cs
View File

@ -1,7 +1,7 @@
using Microsoft.Extensions.Configuration; using Microsoft.Extensions.Configuration;
using System.Text.Json; using System.Text.Json;
using System.Text.Json.Serialization; using System.Text.Json.Serialization;
using View_by_Distance.Shared.Models; using Phares.Shared.Models;
namespace View_by_Distance.Rename.Models; namespace View_by_Distance.Rename.Models;

3
Rename/Models/RenameSettings.cs
View File

@ -1,4 +1,5 @@
using Phares.Shared.Models.Properties;
using System.Text.Json; using System.Text.Json;
using System.Text.Json.Serialization; using System.Text.Json.Serialization;
@ -21,7 +22,7 @@ public record RenameSettings(string Company,
string[] SidecarExtensions, string[] SidecarExtensions,
bool SkipIdFiles, bool SkipIdFiles,
int ValidationImageDeterministicHashCodeId, int ValidationImageDeterministicHashCodeId,
string ValidationImageFile) : Shared.Models.Properties.IRenameSettings string ValidationImageFile) : IRenameSettings
{ {
public override string ToString() public override string ToString()

2
Rename/Program.cs
View File

@ -23,7 +23,7 @@ public class Program
{ {
if (args is null) if (args is null)
throw new Exception("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); _ = new Rename(args, logger, appSettings, silentIndex > -1, console);
} }
catch (Exception ex) catch (Exception ex)

13
Rename/Rename.cs
View File

@ -7,11 +7,11 @@ using System.Drawing;
using System.Drawing.Imaging; using System.Drawing.Imaging;
using System.Runtime.InteropServices; using System.Runtime.InteropServices;
using System.Text.Json; using System.Text.Json;
using View_by_Distance.Metadata.Models; using Phares.Metadata.Models;
using View_by_Distance.Metadata.Models.Stateless; using Phares.Metadata.Models.Stateless;
using View_by_Distance.Rename.Models; using View_by_Distance.Rename.Models;
using View_by_Distance.Shared.Models; using Phares.Shared.Models;
using View_by_Distance.Shared.Models.Stateless; using Phares.Shared.Models.Stateless;
namespace View_by_Distance.Rename; namespace View_by_Distance.Rename;
@ -152,14 +152,19 @@ public partial class Rename : IRename, IDisposable
long epoch = new DateTime(1970, 1, 1).Ticks; long epoch = new DateTime(1970, 1, 1).Ticks;
long net8ReleaseDate = new DateTime(2023, 11, 14).Ticks; long net8ReleaseDate = new DateTime(2023, 11, 14).Ticks;
long net9ReleaseDate = new DateTime(2024, 11, 12).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 net8TotalSeconds = new TimeSpan(net8ReleaseDate - epoch).TotalSeconds;
double net9TotalSeconds = new TimeSpan(net9ReleaseDate - 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 {net8TotalSeconds} seconds since net8 was released", net8TotalSeconds);
logger?.LogInformation("It has been {net9TotalSeconds} seconds since net9 was released", net9TotalSeconds); 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 net8TotalHours = Math.Floor((DateTimeOffset.UtcNow.ToUnixTimeSeconds() - net8TotalSeconds) / secondsInAHour);
double net9TotalHours = Math.Floor((DateTimeOffset.UtcNow.ToUnixTimeSeconds() - net9TotalSeconds) / 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 {net8TotalHours} hours since net8 was released", net8TotalHours);
logger?.LogInformation("It has been {net9TotalHours} hours since net9 was released", net9TotalHours); 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<Program>? logger, AppSettings appSettings, IRename rename) private void RenameWork(ILogger<Program>? logger, AppSettings appSettings, IRename rename)

2
Shared/AA.Shared.csproj
View File

@ -9,7 +9,7 @@
<HoursSinceNovember142023>$([System.Math]::Floor($([MSBuild]::Divide($([MSBuild]::Subtract($([System.DateTimeOffset]::UtcNow.ToUnixTimeSeconds()), 1699920000)), 3600))))</HoursSinceNovember142023> <HoursSinceNovember142023>$([System.Math]::Floor($([MSBuild]::Divide($([MSBuild]::Subtract($([System.DateTimeOffset]::UtcNow.ToUnixTimeSeconds()), 1699920000)), 3600))))</HoursSinceNovember142023>
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<PackageId>Phares.AA.Shared</PackageId> <PackageId>Phares.Shared</PackageId>
<Version>8.0.118.$([System.Math]::Floor($([MSBuild]::Divide($([MSBuild]::Subtract($([System.DateTimeOffset]::UtcNow.ToUnixTimeSeconds()), 1699920000)), 3600))))</Version> <Version>8.0.118.$([System.Math]::Floor($([MSBuild]::Divide($([MSBuild]::Subtract($([System.DateTimeOffset]::UtcNow.ToUnixTimeSeconds()), 1699920000)), 3600))))</Version>
<Company>Phares</Company> <Company>Phares</Company>
<Authors>Mike Phares</Authors> <Authors>Mike Phares</Authors>

2
Shared/Models/AviDirectory.cs
View File

@ -1,7 +1,7 @@
using System.Text.Json; using System.Text.Json;
using System.Text.Json.Serialization; using System.Text.Json.Serialization;
namespace View_by_Distance.Shared.Models; namespace Phares.Shared.Models;
public record AviDirectory(DateTime? DateTimeOriginal, public record AviDirectory(DateTime? DateTimeOriginal,
string? Duration, string? Duration,

2
Shared/Models/CombinedEnumAndIndex.cs
View File

@ -1,7 +1,7 @@
using System.Text.Json; using System.Text.Json;
using System.Text.Json.Serialization; using System.Text.Json.Serialization;
namespace View_by_Distance.Shared.Models; namespace Phares.Shared.Models;
public record CombinedEnumAndIndex(string Combined, public record CombinedEnumAndIndex(string Combined,
byte Enum, byte Enum,

2
Shared/Models/DeterministicHashCode.cs
View File

@ -1,7 +1,7 @@
using System.Text.Json; using System.Text.Json;
using System.Text.Json.Serialization; using System.Text.Json.Serialization;
namespace View_by_Distance.Shared.Models; namespace Phares.Shared.Models;
public record DeterministicHashCode(int? Height, public record DeterministicHashCode(int? Height,
int? Id, int? Id,

2
Shared/Models/DistanceSettings.cs
View File

@ -1,7 +1,7 @@
using System.Text.Json; using System.Text.Json;
using System.Text.Json.Serialization; using System.Text.Json.Serialization;
namespace View_by_Distance.Shared.Models; namespace Phares.Shared.Models;
public record DistanceSettings(bool DistanceMoveUnableToMatch, public record DistanceSettings(bool DistanceMoveUnableToMatch,
int FaceAreaPermyriad, int FaceAreaPermyriad,

2
Shared/Models/ExifDirectory.cs
View File

@ -1,7 +1,7 @@
using System.Text.Json; using System.Text.Json;
using System.Text.Json.Serialization; using System.Text.Json.Serialization;
namespace View_by_Distance.Shared.Models; namespace Phares.Shared.Models;
public record ExifDirectory(AviDirectory[] AviDirectories, public record ExifDirectory(AviDirectory[] AviDirectories,
ExifDirectoryBase[] ExifBaseDirectories, ExifDirectoryBase[] ExifBaseDirectories,

2
Shared/Models/ExifDirectoryBase.cs
View File

@ -1,7 +1,7 @@
using System.Text.Json; using System.Text.Json;
using System.Text.Json.Serialization; using System.Text.Json.Serialization;
namespace View_by_Distance.Shared.Models; namespace Phares.Shared.Models;
public record ExifDirectoryBase(string? Aperture, public record ExifDirectoryBase(string? Aperture,
string? ApplicationNotes, string? ApplicationNotes,

2
Shared/Models/FaceDistance.cs
View File

@ -1,7 +1,7 @@
using System.Text.Json; using System.Text.Json;
using System.Text.Json.Serialization; using System.Text.Json.Serialization;
namespace View_by_Distance.Shared.Models; namespace Phares.Shared.Models;
public record class FaceDistance : Properties.IFaceDistance public record class FaceDistance : Properties.IFaceDistance
{ {

2
Shared/Models/FaceEncoding.cs
View File

@ -1,6 +1,6 @@
using System.Text.Json.Serialization; using System.Text.Json.Serialization;
namespace View_by_Distance.Shared.Models; namespace Phares.Shared.Models;
public record FaceEncoding(double[] RawEncoding, int Size); public record FaceEncoding(double[] RawEncoding, int Size);

2
Shared/Models/FaceFile.cs
View File

@ -1,6 +1,6 @@
using System.Text.Json.Serialization; using System.Text.Json.Serialization;
namespace View_by_Distance.Shared.Models; namespace Phares.Shared.Models;
public record FaceFile(int? AreaPermyriad, public record FaceFile(int? AreaPermyriad,
int? ConfidencePercent, int? ConfidencePercent,

4
Shared/Models/FacePartAndFacePointArray.cs
View File

@ -1,8 +1,8 @@
using System.Text.Json; using System.Text.Json;
using System.Text.Json.Serialization; 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) public record FacePartAndFacePointArray(FacePart FacePart, FacePoint[] FacePoints)
{ {

2
Shared/Models/FacePoint.cs
View File

@ -1,7 +1,7 @@
using System.Drawing; using System.Drawing;
using System.Text.Json.Serialization; using System.Text.Json.Serialization;
namespace View_by_Distance.Shared.Models; namespace Phares.Shared.Models;
[method: JsonConstructor] [method: JsonConstructor]
public class FacePoint(int index, int x, int y) : Properties.IFacePoint public class FacePoint(int index, int x, int y) : Properties.IFacePoint

2
Shared/Models/FaceRecognitionGroup.cs
View File

@ -2,7 +2,7 @@ using System.Collections.ObjectModel;
using System.Text.Json; using System.Text.Json;
using System.Text.Json.Serialization; using System.Text.Json.Serialization;
namespace View_by_Distance.Shared.Models; namespace Phares.Shared.Models;
public record FaceRecognitionGroup(Location Location, ReadOnlyCollection<FaceEncoding?> FaceEncodings, ReadOnlyCollection<ReadOnlyCollection<FacePartAndFacePointArray>> FaceParts) public record FaceRecognitionGroup(Location Location, ReadOnlyCollection<FaceEncoding?> FaceEncodings, ReadOnlyCollection<ReadOnlyCollection<FacePartAndFacePointArray>> FaceParts)
{ {

2
Shared/Models/FileHolder.cs
View File

@ -1,7 +1,7 @@
using System.Text.Json; using System.Text.Json;
using System.Text.Json.Serialization; using System.Text.Json.Serialization;
namespace View_by_Distance.Shared.Models; namespace Phares.Shared.Models;
public record FileHolder(DateTime? CreationTime, public record FileHolder(DateTime? CreationTime,
string? DirectoryFullPath, string? DirectoryFullPath,

2
Shared/Models/FileMetadataDirectory.cs
View File

@ -1,7 +1,7 @@
using System.Text.Json; using System.Text.Json;
using System.Text.Json.Serialization; using System.Text.Json.Serialization;
namespace View_by_Distance.Shared.Models; namespace Phares.Shared.Models;
public record FileMetadataDirectory(DateTime? FileModifiedDate, public record FileMetadataDirectory(DateTime? FileModifiedDate,
string? FileName, string? FileName,

4
Shared/Models/FilePath.cs
View File

@ -1,8 +1,8 @@
using System.Text.Json; using System.Text.Json;
using System.Text.Json.Serialization; 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, public record FilePath(long CreationTicks,
string DirectoryFullPath, string DirectoryFullPath,

2
Shared/Models/FilePathAndWholePercentages.cs
View File

@ -1,7 +1,7 @@
using System.Text.Json; using System.Text.Json;
using System.Text.Json.Serialization; using System.Text.Json.Serialization;
namespace View_by_Distance.Shared.Models; namespace Phares.Shared.Models;
public record FilePathAndWholePercentages(FilePath FilePath, int WholePercentages) public record FilePathAndWholePercentages(FilePath FilePath, int WholePercentages)
{ {

2
Shared/Models/FirstPass.cs
View File

@ -1,7 +1,7 @@
using System.Text.Json; using System.Text.Json;
using System.Text.Json.Serialization; using System.Text.Json.Serialization;
namespace View_by_Distance.Shared.Models; namespace Phares.Shared.Models;
public record FirstPass(ExifDirectory ExifDirectory, public record FirstPass(ExifDirectory ExifDirectory,
bool FastForwardMovingPictureExpertsGroupUsed, bool FastForwardMovingPictureExpertsGroupUsed,

2
Shared/Models/GifHeaderDirectory.cs
View File

@ -1,7 +1,7 @@
using System.Text.Json; using System.Text.Json;
using System.Text.Json.Serialization; using System.Text.Json.Serialization;
namespace View_by_Distance.Shared.Models; namespace Phares.Shared.Models;
public record GifHeaderDirectory(string? ImageHeight, public record GifHeaderDirectory(string? ImageHeight,
string? ImageWidth) string? ImageWidth)

2
Shared/Models/GpsDirectory.cs
View File

@ -1,7 +1,7 @@
using System.Text.Json; using System.Text.Json;
using System.Text.Json.Serialization; using System.Text.Json.Serialization;
namespace View_by_Distance.Shared.Models; namespace Phares.Shared.Models;
public record GpsDirectory(string? Altitude, public record GpsDirectory(string? Altitude,
string? Latitude, string? Latitude,

2
Shared/Models/JpegDirectory.cs
View File

@ -1,7 +1,7 @@
using System.Text.Json; using System.Text.Json;
using System.Text.Json.Serialization; using System.Text.Json.Serialization;
namespace View_by_Distance.Shared.Models; namespace Phares.Shared.Models;
public record JpegDirectory(string? ImageHeight, public record JpegDirectory(string? ImageHeight,
string? ImageWidth) string? ImageWidth)

2
Shared/Models/Location.cs
View File

@ -1,6 +1,6 @@
using System.Text.Json.Serialization; using System.Text.Json.Serialization;
namespace View_by_Distance.Shared.Models; namespace Phares.Shared.Models;
[method: JsonConstructor] [method: JsonConstructor]
public class Location(int bottom, double confidence, int left, int right, int top) : Properties.ILocation, IEquatable<Location> public class Location(int bottom, double confidence, int left, int right, int top) : Properties.ILocation, IEquatable<Location>

2
Shared/Models/LocationContainer.cs
View File

@ -1,7 +1,7 @@
using System.Text.Json; using System.Text.Json;
using System.Text.Json.Serialization; using System.Text.Json.Serialization;
namespace View_by_Distance.Shared.Models; namespace Phares.Shared.Models;
public record LocationContainer(DateOnly? CreationDateOnly, public record LocationContainer(DateOnly? CreationDateOnly,
ExifDirectory? ExifDirectory, ExifDirectory? ExifDirectory,

2
Shared/Models/MakernoteDirectory.cs
View File

@ -1,7 +1,7 @@
using System.Text.Json; using System.Text.Json;
using System.Text.Json.Serialization; using System.Text.Json.Serialization;
namespace View_by_Distance.Shared.Models; namespace Phares.Shared.Models;
public record MakernoteDirectory(string? CameraSerialNumber, public record MakernoteDirectory(string? CameraSerialNumber,
string? FirmwareVersion, string? FirmwareVersion,

2
Shared/Models/MappingFromFilter.cs
View File

@ -1,7 +1,7 @@
using System.Text.Json; using System.Text.Json;
using System.Text.Json.Serialization; using System.Text.Json.Serialization;
namespace View_by_Distance.Shared.Models; namespace Phares.Shared.Models;
public record MappingFromFilter(bool? IsFocusModel, public record MappingFromFilter(bool? IsFocusModel,
bool? IsFocusPerson, bool? IsFocusPerson,

2
Shared/Models/MappingFromFilterPost.cs
View File

@ -1,7 +1,7 @@
using System.Text.Json; using System.Text.Json;
using System.Text.Json.Serialization; using System.Text.Json.Serialization;
namespace View_by_Distance.Shared.Models; namespace Phares.Shared.Models;
public record MappingFromFilterPost(bool? CanReMap, public record MappingFromFilterPost(bool? CanReMap,
bool? InSkipCollection, bool? InSkipCollection,

2
Shared/Models/MappingFromPerson.cs
View File

@ -1,7 +1,7 @@
using System.Text.Json; using System.Text.Json;
using System.Text.Json.Serialization; using System.Text.Json.Serialization;
namespace View_by_Distance.Shared.Models; namespace Phares.Shared.Models;
public record MappingFromPerson(int? ApproximateYears, public record MappingFromPerson(int? ApproximateYears,
string DisplayDirectoryName, string DisplayDirectoryName,

2
Shared/Models/MetaBase.cs
View File

@ -1,7 +1,7 @@
using System.Collections.ObjectModel; using System.Collections.ObjectModel;
using System.Globalization; using System.Globalization;
namespace View_by_Distance.Shared.Models; namespace Phares.Shared.Models;
internal static class MetaBase internal static class MetaBase
{ {

2
Shared/Models/MetadataGroup.cs
View File

@ -2,7 +2,7 @@ using System.Collections.ObjectModel;
using System.Text.Json; using System.Text.Json;
using System.Text.Json.Serialization; 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<FileHolder> SidecarFiles) public record MetadataGroup(bool FastForwardMovingPictureExpertsGroupUsed, FilePath FilePath, MinimumYearAndPathCombined MinimumYearAndPathCombined, ExifDirectory ExifDirectory, ReadOnlyCollection<FileHolder> SidecarFiles)
{ {

4
Shared/Models/MetadataSettings.cs
View File

@ -1,7 +1,7 @@
using System.Text.Json; using System.Text.Json;
using System.Text.Json.Serialization; using System.Text.Json.Serialization;
namespace View_by_Distance.Shared.Models; namespace Phares.Shared.Models;
public record MetadataSettings(bool ForceMetadataLastWriteTimeToCreationTime, public record MetadataSettings(bool ForceMetadataLastWriteTimeToCreationTime,
string[] IgnoreRulesKeyWords, string[] IgnoreRulesKeyWords,
@ -20,6 +20,6 @@ public record MetadataSettings(bool ForceMetadataLastWriteTimeToCreationTime,
[JsonSourceGenerationOptions(WriteIndented = true)] [JsonSourceGenerationOptions(WriteIndented = true)]
[JsonSerializable(typeof(MetadataSettings))] [JsonSerializable(typeof(MetadataSettings))]
internal partial class MetadataSettingsSourceGenerationContext : JsonSerializerContext public partial class MetadataSettingsSourceGenerationContext : JsonSerializerContext
{ {
} }

2
Shared/Models/MinimumYearAndFullPath.cs
View File

@ -1,7 +1,7 @@
using System.Text.Json; using System.Text.Json;
using System.Text.Json.Serialization; using System.Text.Json.Serialization;
namespace View_by_Distance.Shared.Models; namespace Phares.Shared.Models;
public record MinimumYearAndPathCombined(int MinimumYear, public record MinimumYearAndPathCombined(int MinimumYear,
string PathCombined) string PathCombined)

2
Shared/Models/NginxFileSystem.cs
View File

@ -2,7 +2,7 @@ using System.Globalization;
using System.Text.Json; using System.Text.Json;
using System.Text.Json.Serialization; using System.Text.Json.Serialization;
namespace View_by_Distance.Shared.Models; namespace Phares.Shared.Models;
public record NginxFileSystem([property: JsonPropertyName("name")] string Name, public record NginxFileSystem([property: JsonPropertyName("name")] string Name,
DateTime? LastModified, DateTime? LastModified,

2
Shared/Models/OutputResolution.cs
View File

@ -1,4 +1,4 @@
namespace View_by_Distance.Shared.Models; namespace Phares.Shared.Models;
public record OutputResolution(int Height, public record OutputResolution(int Height,
int Orientation, int Orientation,

2
Shared/Models/PeopleSettings.cs
View File

@ -1,7 +1,7 @@
using System.Text.Json; using System.Text.Json;
using System.Text.Json.Serialization; using System.Text.Json.Serialization;
namespace View_by_Distance.Shared.Models; namespace Phares.Shared.Models;
public record PeopleSettings(string GenealogicalDataCommunicationFile, public record PeopleSettings(string GenealogicalDataCommunicationFile,
string[] JLinks, string[] JLinks,

2
Shared/Models/PersonBirthday.cs
View File

@ -1,7 +1,7 @@
using System.Text.Json; using System.Text.Json;
using System.Text.Json.Serialization; using System.Text.Json.Serialization;
namespace View_by_Distance.Shared.Models; namespace Phares.Shared.Models;
public record PersonBirthday(DateTime Value) public record PersonBirthday(DateTime Value)
{ {

4
Shared/Models/PersonContainer.cs
View File

@ -1,9 +1,9 @@
using System.Collections.ObjectModel; using System.Collections.ObjectModel;
using System.Text.Json; using System.Text.Json;
using System.Text.Json.Serialization; 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, public record PersonContainer(int? ApproximateYears,
PersonBirthday[]? Birthdays, PersonBirthday[]? Birthdays,

2
Shared/Models/PersonDirectory.cs
View File

@ -1,7 +1,7 @@
using System.Text.Json; using System.Text.Json;
using System.Text.Json.Serialization; 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) public record PersonDirectory(char Char, string Group, char Status, char Sex, char First)
{ {

2
Shared/Models/PersonKeyFormattedAndPersonBirthday.cs
View File

@ -1,7 +1,7 @@
using System.Text.Json; using System.Text.Json;
using System.Text.Json.Serialization; using System.Text.Json.Serialization;
namespace View_by_Distance.Shared.Models; namespace Phares.Shared.Models;
public record PersonKeyFormattedAndPersonBirthday(string PersonKeyFormatted, PersonBirthday PersonBirthday) public record PersonKeyFormattedAndPersonBirthday(string PersonKeyFormatted, PersonBirthday PersonBirthday)
{ {

2
Shared/Models/PersonKeyFormattedAndPersonKeyTicks.cs
View File

@ -1,7 +1,7 @@
using System.Text.Json; using System.Text.Json;
using System.Text.Json.Serialization; using System.Text.Json.Serialization;
namespace View_by_Distance.Shared.Models; namespace Phares.Shared.Models;
public record PersonKeyFormattedAndKeyTicksAndDisplayDirectoryName(string KeyFormatted, public record PersonKeyFormattedAndKeyTicksAndDisplayDirectoryName(string KeyFormatted,
long KeyTicks, long KeyTicks,

2
Shared/Models/PhotoshopDirectory.cs
View File

@ -1,7 +1,7 @@
using System.Text.Json; using System.Text.Json;
using System.Text.Json.Serialization; using System.Text.Json.Serialization;
namespace View_by_Distance.Shared.Models; namespace Phares.Shared.Models;
public record PhotoshopDirectory(string? JpegQuality, public record PhotoshopDirectory(string? JpegQuality,
string? Url) string? Url)

2
Shared/Models/PngDirectory.cs
View File

@ -1,7 +1,7 @@
using System.Text.Json; using System.Text.Json;
using System.Text.Json.Serialization; using System.Text.Json.Serialization;
namespace View_by_Distance.Shared.Models; namespace Phares.Shared.Models;
public record PngDirectory(string? ImageHeight, public record PngDirectory(string? ImageHeight,
string? ImageWidth, string? ImageWidth,

2
Shared/Models/Properties/ICompareSettings.cs
View File

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

2
Shared/Models/Properties/IFaceDistance.cs
View File

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

2
Shared/Models/Properties/IFacePoint.cs
View File

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

2
Shared/Models/Properties/ILocation.cs
View File

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

2
Shared/Models/Properties/IRenameSettings.cs
View File

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

2
Shared/Models/Properties/IWindowsSettings.cs
View File

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

2
Shared/Models/QuickTimeMovieHeaderDirectory.cs
View File

@ -1,7 +1,7 @@
using System.Text.Json; using System.Text.Json;
using System.Text.Json.Serialization; using System.Text.Json.Serialization;
namespace View_by_Distance.Shared.Models; namespace Phares.Shared.Models;
public record QuickTimeMovieHeaderDirectory(DateTime? Created) public record QuickTimeMovieHeaderDirectory(DateTime? Created)
{ {

2
Shared/Models/QuickTimeTrackHeaderDirectory.cs
View File

@ -1,7 +1,7 @@
using System.Text.Json; using System.Text.Json;
using System.Text.Json.Serialization; using System.Text.Json.Serialization;
namespace View_by_Distance.Shared.Models; namespace Phares.Shared.Models;
public record QuickTimeTrackHeaderDirectory(DateTime? Created) public record QuickTimeTrackHeaderDirectory(DateTime? Created)
{ {

2
Shared/Models/ReadOnlyCollections.cs
View File

@ -2,7 +2,7 @@ using System.Collections.ObjectModel;
using System.Text.Json; using System.Text.Json;
using System.Text.Json.Serialization; using System.Text.Json.Serialization;
namespace View_by_Distance.Shared.Models; namespace Phares.Shared.Models;
public record ReadOnlyCollections(ReadOnlyCollection<long> JLinkResolvedPersonKeys, public record ReadOnlyCollections(ReadOnlyCollection<long> JLinkResolvedPersonKeys,
ReadOnlyCollection<PersonContainer> PersonContainers, ReadOnlyCollection<PersonContainer> PersonContainers,

4
Shared/Models/ResultSettings.cs
View File

@ -1,7 +1,7 @@
using System.Text.Json; using System.Text.Json;
using System.Text.Json.Serialization; using System.Text.Json.Serialization;
namespace View_by_Distance.Shared.Models; namespace Phares.Shared.Models;
public record ResultSettings(string DateGroup, public record ResultSettings(string DateGroup,
int EpicYear, int EpicYear,
@ -29,6 +29,6 @@ public record ResultSettings(string DateGroup,
[JsonSourceGenerationOptions(WriteIndented = true)] [JsonSourceGenerationOptions(WriteIndented = true)]
[JsonSerializable(typeof(ResultSettings))] [JsonSerializable(typeof(ResultSettings))]
internal partial class ResultSettingsSourceGenerationContext : JsonSerializerContext public partial class ResultSettingsSourceGenerationContext : JsonSerializerContext
{ {
} }

2
Shared/Models/SaveContainer.cs
View File

@ -1,7 +1,7 @@
using System.Text.Json; using System.Text.Json;
using System.Text.Json.Serialization; using System.Text.Json.Serialization;
namespace View_by_Distance.Shared.Models; namespace Phares.Shared.Models;
public record SaveContainer(string CheckFile, public record SaveContainer(string CheckFile,
string Directory, string Directory,

2
Shared/Models/Stateless/Age.cs
View File

@ -1,4 +1,4 @@
namespace View_by_Distance.Shared.Models.Stateless; namespace Phares.Shared.Models.Stateless;
internal abstract class Age internal abstract class Age
{ {

Some files were not shown because too many files have changed in this diff Show More