Made useable by Helpers
This commit is contained in:
@ -5,10 +5,10 @@ using System.Drawing;
|
||||
using View_by_Distance.Compare.Models;
|
||||
using View_by_Distance.Distance.Models.Stateless;
|
||||
using View_by_Distance.Face.Models.Stateless;
|
||||
using View_by_Distance.Metadata.Models;
|
||||
using Phares.Metadata.Models;
|
||||
using View_by_Distance.People.Models.Stateless;
|
||||
using View_by_Distance.Shared.Models;
|
||||
using View_by_Distance.Shared.Models.Stateless;
|
||||
using Phares.Shared.Models;
|
||||
using Phares.Shared.Models.Stateless;
|
||||
|
||||
namespace View_by_Distance.Compare;
|
||||
|
||||
|
@ -1,7 +1,7 @@
|
||||
using Microsoft.Extensions.Configuration;
|
||||
using System.Text.Json;
|
||||
using System.Text.Json.Serialization;
|
||||
using View_by_Distance.Shared.Models;
|
||||
using Phares.Shared.Models;
|
||||
|
||||
namespace View_by_Distance.Compare.Models;
|
||||
|
||||
|
@ -1,4 +1,5 @@
|
||||
|
||||
using Phares.Shared.Models.Properties;
|
||||
using System.Text.Json;
|
||||
using System.Text.Json.Serialization;
|
||||
|
||||
@ -11,7 +12,7 @@ public record CompareSettings(string Company,
|
||||
int MaxDegreeOfParallelism,
|
||||
string[] OutputResolutions,
|
||||
bool SaveExtractedFaces,
|
||||
bool SaveExtractedJavaScriptObjectNotation) : Shared.Models.Properties.ICompareSettings
|
||||
bool SaveExtractedJavaScriptObjectNotation) : ICompareSettings
|
||||
{
|
||||
|
||||
public override string ToString()
|
||||
|
@ -23,7 +23,7 @@ public class Program
|
||||
{
|
||||
if (args is null)
|
||||
throw new Exception("args is null!");
|
||||
Shared.Models.Console console = new();
|
||||
Phares.Shared.Models.Console console = new();
|
||||
_ = new Compare(args, logger, appSettings, silentIndex > -1, console);
|
||||
}
|
||||
catch (Exception ex)
|
||||
|
@ -10,7 +10,7 @@
|
||||
<HoursSinceNovember122024>$([System.Math]::Floor($([MSBuild]::Divide($([MSBuild]::Subtract($([System.DateTimeOffset]::UtcNow.ToUnixTimeSeconds()), 1731369600)), 3600))))</HoursSinceNovember122024>
|
||||
</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>
|
||||
<Company>Phares</Company>
|
||||
<Authors>Mike Phares</Authors>
|
||||
|
@ -1,3 +1,3 @@
|
||||
namespace View_by_Distance.Metadata.Models;
|
||||
namespace Phares.Metadata.Models;
|
||||
|
||||
public class C_Resize() { }
|
@ -1,3 +1,3 @@
|
||||
namespace View_by_Distance.Metadata.Models;
|
||||
namespace Phares.Metadata.Models;
|
||||
|
||||
public class D2_FaceParts() { }
|
@ -1,7 +1,7 @@
|
||||
using View_by_Distance.Shared.Models;
|
||||
using View_by_Distance.Shared.Models.Methods;
|
||||
using Phares.Shared.Models;
|
||||
using Phares.Shared.Models.Methods;
|
||||
|
||||
namespace View_by_Distance.Metadata.Models;
|
||||
namespace Phares.Metadata.Models;
|
||||
|
||||
public class DistanceLimits : IDistanceLimits
|
||||
{
|
||||
|
@ -1,3 +1,3 @@
|
||||
namespace View_by_Distance.Metadata.Models;
|
||||
namespace Phares.Metadata.Models;
|
||||
|
||||
public class E_Distance() { }
|
@ -1,4 +1,4 @@
|
||||
namespace View_by_Distance.Shared.Models.Methods;
|
||||
namespace Phares.Shared.Models.Methods;
|
||||
|
||||
public interface IDistanceLimits
|
||||
{
|
||||
|
@ -1,8 +1,7 @@
|
||||
using Phares.Shared.Models;
|
||||
using Phares.Shared.Models.Properties;
|
||||
using Phares.Shared.Models.Stateless;
|
||||
using System.Collections.ObjectModel;
|
||||
using System.Text.Json;
|
||||
using View_by_Distance.Shared.Models;
|
||||
using View_by_Distance.Shared.Models.Properties;
|
||||
using View_by_Distance.Shared.Models.Stateless;
|
||||
|
||||
namespace View_by_Distance.Distance.Models.Stateless;
|
||||
|
||||
@ -49,7 +48,6 @@ internal static class FaceEncodingLogic
|
||||
internal static LocationContainer? GetLocationContainer(DistanceSettings distanceSettings, ICompareSettings compareSettings, ExifDirectory exifDirectory)
|
||||
{
|
||||
LocationContainer? result;
|
||||
string? json;
|
||||
DateOnly dateOnly;
|
||||
FaceFile? faceFile;
|
||||
int? wholePercentages;
|
||||
@ -70,8 +68,7 @@ internal static class FaceEncodingLogic
|
||||
else
|
||||
{
|
||||
dateOnly = DateOnly.FromDateTime(new DateTime(exifDirectory.FilePath.CreationTicks));
|
||||
json = Metadata.Models.Stateless.IMetadata.GetFaceEncoding(exifDirectory);
|
||||
faceEncoding = json is null ? null : JsonSerializer.Deserialize(json, FaceEncodingGenerationContext.Default.FaceEncoding);
|
||||
faceEncoding = Phares.Metadata.Models.Stateless.IMetadata.GetFaceEncoding(exifDirectory);
|
||||
if (faceEncoding is null)
|
||||
result = null;
|
||||
else
|
||||
@ -94,24 +91,13 @@ internal static class FaceEncodingLogic
|
||||
|
||||
private static FaceFile? GetFaceFile(DistanceSettings distanceSettings, ExifDirectory exifDirectory)
|
||||
{
|
||||
FaceFile? result;
|
||||
string? json = Metadata.Models.Stateless.IMetadata.GetOutputResolution(exifDirectory);
|
||||
if (json is null || !json.Contains(nameof(DateTime)))
|
||||
FaceFile? result = Phares.Metadata.Models.Stateless.IMetadata.GetFaceFile(exifDirectory);
|
||||
if (result is null || result.Location is null)
|
||||
{
|
||||
if (distanceSettings.DistanceMoveUnableToMatch)
|
||||
MoveUnableToMatch(exifDirectory.FilePath);
|
||||
result = null;
|
||||
}
|
||||
else
|
||||
{
|
||||
result = JsonSerializer.Deserialize(json, FaceFileGenerationContext.Default.FaceFile);
|
||||
if (result is null || result.Location is null)
|
||||
{
|
||||
if (distanceSettings.DistanceMoveUnableToMatch)
|
||||
MoveUnableToMatch(exifDirectory.FilePath);
|
||||
result = null;
|
||||
}
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
|
@ -1,8 +1,7 @@
|
||||
using System.Collections.ObjectModel;
|
||||
using System.Text.Json;
|
||||
using View_by_Distance.Shared.Models;
|
||||
using View_by_Distance.Shared.Models.Properties;
|
||||
using View_by_Distance.Shared.Models.Stateless;
|
||||
using Phares.Shared.Models;
|
||||
using Phares.Shared.Models.Properties;
|
||||
using Phares.Shared.Models.Stateless;
|
||||
|
||||
namespace View_by_Distance.Distance.Models.Stateless;
|
||||
|
||||
@ -35,7 +34,6 @@ internal static class FilterLogicA
|
||||
internal static ReadOnlyCollection<LocationContainer> GetPreFilterLocationContainer(DistanceSettings distanceSettings, ICompareSettings compareSettings, ICompare compare, ReadOnlyCollections readOnlyCollections, ReadOnlyDictionary<int, ReadOnlyDictionary<int, LocationContainer>> mappedIdsThenWholePercentagesToLocationContainer, ReadOnlyCollection<ExifDirectory> exifDirectories)
|
||||
{
|
||||
List<LocationContainer> results = [];
|
||||
string? json;
|
||||
string? model;
|
||||
bool? canReMap;
|
||||
bool? isFocusPerson;
|
||||
@ -80,8 +78,7 @@ internal static class FilterLogicA
|
||||
if (!locationContainer.FilePath.DirectoryFullPath.Contains(distanceSettings.FocusDirectory))
|
||||
continue;
|
||||
}
|
||||
json = Metadata.Models.Stateless.IMetadata.GetFaceEncoding(locationContainer.ExifDirectory);
|
||||
faceEncoding = json is null ? null : JsonSerializer.Deserialize(json, FaceEncodingGenerationContext.Default.FaceEncoding);
|
||||
faceEncoding = Phares.Metadata.Models.Stateless.IMetadata.GetFaceEncoding(locationContainer.ExifDirectory);
|
||||
if (faceEncoding is null)
|
||||
continue;
|
||||
encoding = FaceRecognitionDotNet.Models.FaceRecognition.LoadFaceEncoding(faceEncoding.RawEncoding);
|
||||
|
@ -1,7 +1,7 @@
|
||||
using System.Collections.ObjectModel;
|
||||
using View_by_Distance.Shared.Models;
|
||||
using View_by_Distance.Shared.Models.Properties;
|
||||
using View_by_Distance.Shared.Models.Stateless;
|
||||
using Phares.Shared.Models;
|
||||
using Phares.Shared.Models.Properties;
|
||||
using Phares.Shared.Models.Stateless;
|
||||
|
||||
namespace View_by_Distance.Distance.Models.Stateless;
|
||||
|
||||
|
@ -1,7 +1,7 @@
|
||||
using System.Collections.ObjectModel;
|
||||
using View_by_Distance.Metadata.Models;
|
||||
using View_by_Distance.Shared.Models;
|
||||
using View_by_Distance.Shared.Models.Stateless;
|
||||
using Phares.Metadata.Models;
|
||||
using Phares.Shared.Models;
|
||||
using Phares.Shared.Models.Stateless;
|
||||
|
||||
namespace View_by_Distance.Distance.Models.Stateless;
|
||||
|
||||
|
@ -1,9 +1,9 @@
|
||||
using Humanizer;
|
||||
using System.Collections.ObjectModel;
|
||||
using View_by_Distance.Metadata.Models;
|
||||
using View_by_Distance.Shared.Models;
|
||||
using View_by_Distance.Shared.Models.Properties;
|
||||
using View_by_Distance.Shared.Models.Stateless;
|
||||
using Phares.Metadata.Models;
|
||||
using Phares.Shared.Models;
|
||||
using Phares.Shared.Models.Properties;
|
||||
using Phares.Shared.Models.Stateless;
|
||||
using WindowsShortcutFactory;
|
||||
|
||||
namespace View_by_Distance.Distance.Models.Stateless;
|
||||
|
@ -1,8 +1,8 @@
|
||||
using System.Collections.ObjectModel;
|
||||
using View_by_Distance.Metadata.Models;
|
||||
using View_by_Distance.Shared.Models;
|
||||
using View_by_Distance.Shared.Models.Properties;
|
||||
using View_by_Distance.Shared.Models.Stateless;
|
||||
using Phares.Metadata.Models;
|
||||
using Phares.Shared.Models;
|
||||
using Phares.Shared.Models.Properties;
|
||||
using Phares.Shared.Models.Stateless;
|
||||
|
||||
namespace View_by_Distance.Distance.Models.Stateless;
|
||||
|
||||
|
@ -1,9 +1,9 @@
|
||||
using System.Collections.ObjectModel;
|
||||
using View_by_Distance.Metadata.Models;
|
||||
using View_by_Distance.Metadata.Models.Stateless;
|
||||
using View_by_Distance.Shared.Models;
|
||||
using View_by_Distance.Shared.Models.Properties;
|
||||
using View_by_Distance.Shared.Models.Stateless;
|
||||
using Phares.Metadata.Models;
|
||||
using Phares.Metadata.Models.Stateless;
|
||||
using Phares.Shared.Models;
|
||||
using Phares.Shared.Models.Properties;
|
||||
using Phares.Shared.Models.Stateless;
|
||||
|
||||
namespace View_by_Distance.Distance.Models.Stateless;
|
||||
|
||||
|
@ -2,9 +2,9 @@ using Humanizer;
|
||||
using System.Collections.ObjectModel;
|
||||
using System.Diagnostics;
|
||||
using System.Globalization;
|
||||
using View_by_Distance.Shared.Models;
|
||||
using View_by_Distance.Shared.Models.Properties;
|
||||
using View_by_Distance.Shared.Models.Stateless;
|
||||
using Phares.Shared.Models;
|
||||
using Phares.Shared.Models.Properties;
|
||||
using Phares.Shared.Models.Stateless;
|
||||
|
||||
namespace View_by_Distance.Distance.Models.Stateless;
|
||||
|
||||
|
@ -10,7 +10,7 @@
|
||||
<HoursSinceNovember122024>$([System.Math]::Floor($([MSBuild]::Divide($([MSBuild]::Subtract($([System.DateTimeOffset]::UtcNow.ToUnixTimeSeconds()), 1731369600)), 3600))))</HoursSinceNovember122024>
|
||||
</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>
|
||||
<Company>Phares</Company>
|
||||
<Authors>Mike Phares</Authors>
|
||||
|
@ -1,3 +1,3 @@
|
||||
namespace View_by_Distance.Metadata.Models;
|
||||
namespace Phares.Metadata.Models;
|
||||
|
||||
public class D_Face() { }
|
@ -1,9 +1,9 @@
|
||||
using System.Collections.ObjectModel;
|
||||
using View_by_Distance.Metadata.Models;
|
||||
using View_by_Distance.Metadata.Models.Stateless;
|
||||
using View_by_Distance.Shared.Models;
|
||||
using View_by_Distance.Shared.Models.Properties;
|
||||
using View_by_Distance.Shared.Models.Stateless;
|
||||
using Phares.Metadata.Models;
|
||||
using Phares.Metadata.Models.Stateless;
|
||||
using Phares.Shared.Models;
|
||||
using Phares.Shared.Models.Properties;
|
||||
using Phares.Shared.Models.Stateless;
|
||||
|
||||
namespace View_by_Distance.Face.Models.Stateless;
|
||||
|
||||
|
@ -1,7 +1,7 @@
|
||||
using System.Collections.ObjectModel;
|
||||
using View_by_Distance.Shared.Models;
|
||||
using View_by_Distance.Shared.Models.Properties;
|
||||
using View_by_Distance.Shared.Models.Stateless;
|
||||
using Phares.Shared.Models;
|
||||
using Phares.Shared.Models.Properties;
|
||||
using Phares.Shared.Models.Stateless;
|
||||
|
||||
namespace View_by_Distance.Face.Models.Stateless;
|
||||
|
||||
|
@ -10,7 +10,7 @@
|
||||
<HoursSinceNovember122024>$([System.Math]::Floor($([MSBuild]::Divide($([MSBuild]::Subtract($([System.DateTimeOffset]::UtcNow.ToUnixTimeSeconds()), 1731369600)), 3600))))</HoursSinceNovember122024>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<PackageId>Phares.AA.FaceRecognitionDotNet</PackageId>
|
||||
<PackageId>Phares.FaceRecognitionDotNet</PackageId>
|
||||
<GeneratePackageOnBuild>false</GeneratePackageOnBuild>
|
||||
<Version>9.0.104.$([System.Math]::Floor($([MSBuild]::Divide($([MSBuild]::Subtract($([System.DateTimeOffset]::UtcNow.ToUnixTimeSeconds()), 1731369600)), 3600))))</Version>
|
||||
<Authors>Mike Phares</Authors>
|
||||
|
@ -1,7 +1,7 @@
|
||||
using DlibDotNet;
|
||||
using DlibDotNet.Dnn;
|
||||
using View_by_Distance.FaceRecognitionDotNet.Models;
|
||||
using View_by_Distance.Shared.Models.Stateless;
|
||||
using Phares.Shared.Models.Stateless;
|
||||
|
||||
namespace View_by_Distance.FaceRecognitionDotNet.Dlib.Python;
|
||||
|
||||
|
@ -1,6 +1,6 @@
|
||||
using DlibDotNet;
|
||||
using View_by_Distance.FaceRecognitionDotNet.Models;
|
||||
using View_by_Distance.Shared.Models.Stateless;
|
||||
using Phares.Shared.Models.Stateless;
|
||||
|
||||
namespace View_by_Distance.FaceRecognitionDotNet.Dlib.Python;
|
||||
|
||||
|
@ -1,6 +1,6 @@
|
||||
using DlibDotNet;
|
||||
using View_by_Distance.FaceRecognitionDotNet.Models;
|
||||
using View_by_Distance.Shared.Models;
|
||||
using Phares.Shared.Models;
|
||||
|
||||
namespace View_by_Distance.FaceRecognitionDotNet.Extensions;
|
||||
|
||||
|
@ -1,7 +1,7 @@
|
||||
using DlibDotNet;
|
||||
using View_by_Distance.FaceRecognitionDotNet.Models;
|
||||
using View_by_Distance.Shared.Models;
|
||||
using View_by_Distance.Shared.Models.Stateless;
|
||||
using Phares.Shared.Models;
|
||||
using Phares.Shared.Models.Stateless;
|
||||
|
||||
namespace View_by_Distance.FaceRecognitionDotNet.Extensions;
|
||||
|
||||
|
@ -6,8 +6,8 @@ using System.Drawing.Imaging;
|
||||
using System.Runtime.InteropServices;
|
||||
using View_by_Distance.FaceRecognitionDotNet.Dlib.Python;
|
||||
using View_by_Distance.FaceRecognitionDotNet.Extensions;
|
||||
using View_by_Distance.Shared.Models;
|
||||
using View_by_Distance.Shared.Models.Stateless;
|
||||
using Phares.Shared.Models;
|
||||
using Phares.Shared.Models.Stateless;
|
||||
|
||||
namespace View_by_Distance.FaceRecognitionDotNet.Models;
|
||||
|
||||
|
@ -1,5 +1,5 @@
|
||||
using View_by_Distance.Shared.Models;
|
||||
using View_by_Distance.Shared.Models.Stateless;
|
||||
using Phares.Shared.Models;
|
||||
using Phares.Shared.Models.Stateless;
|
||||
|
||||
namespace View_by_Distance.FaceRecognitionDotNet.Models;
|
||||
|
||||
|
@ -1,7 +1,7 @@
|
||||
using DlibDotNet;
|
||||
using DlibDotNet.Extensions;
|
||||
using System.Drawing;
|
||||
using View_by_Distance.Shared.Models.Stateless;
|
||||
using Phares.Shared.Models.Stateless;
|
||||
|
||||
namespace View_by_Distance.FaceRecognitionDotNet.Models;
|
||||
|
||||
|
@ -10,7 +10,7 @@
|
||||
<HoursSinceNovember142023>$([System.Math]::Floor($([MSBuild]::Divide($([MSBuild]::Subtract($([System.DateTimeOffset]::UtcNow.ToUnixTimeSeconds()), 1699920000)), 3600))))</HoursSinceNovember142023>
|
||||
</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>
|
||||
<Company>Phares</Company>
|
||||
<Authors>Mike Phares</Authors>
|
||||
|
@ -1,10 +1,10 @@
|
||||
using System.Collections.ObjectModel;
|
||||
using System.Text.Json;
|
||||
using View_by_Distance.Metadata.Models.Stateless;
|
||||
using View_by_Distance.Shared.Models;
|
||||
using View_by_Distance.Shared.Models.Stateless;
|
||||
using Phares.Metadata.Models.Stateless;
|
||||
using Phares.Shared.Models;
|
||||
using Phares.Shared.Models.Stateless;
|
||||
|
||||
namespace View_by_Distance.Metadata.Models;
|
||||
namespace Phares.Metadata.Models;
|
||||
|
||||
public class A_Metadata
|
||||
{
|
||||
|
@ -1,6 +1,6 @@
|
||||
using System.Drawing;
|
||||
|
||||
namespace View_by_Distance.Metadata.Models.Stateless;
|
||||
namespace Phares.Metadata.Models.Stateless;
|
||||
|
||||
internal static class Dimensions
|
||||
{
|
||||
|
@ -1,9 +1,10 @@
|
||||
using MetadataExtractor;
|
||||
using MetadataExtractor.Formats.Exif;
|
||||
using MetadataExtractor.Formats.Exif.Makernotes;
|
||||
using System.Globalization;
|
||||
using Phares.Shared.Models;
|
||||
using Phares.Shared.Models.Stateless;
|
||||
|
||||
namespace View_by_Distance.Metadata.Models.Stateless;
|
||||
namespace Phares.Metadata.Models.Stateless;
|
||||
|
||||
internal abstract class Exif
|
||||
{
|
||||
@ -24,10 +25,10 @@ internal abstract class Exif
|
||||
return result;
|
||||
}
|
||||
|
||||
private static Shared.Models.AviDirectory[] GetAviDirectories(IReadOnlyList<MetadataExtractor.Directory> directories)
|
||||
private static AviDirectory[] GetAviDirectories(IReadOnlyList<MetadataExtractor.Directory> directories)
|
||||
{
|
||||
List<Shared.Models.AviDirectory> results = [];
|
||||
Shared.Models.AviDirectory aviDirectory;
|
||||
List<AviDirectory> results = [];
|
||||
AviDirectory aviDirectory;
|
||||
IEnumerable<MetadataExtractor.Formats.Avi.AviDirectory> aviDirectories = directories.OfType<MetadataExtractor.Formats.Avi.AviDirectory>();
|
||||
foreach (MetadataExtractor.Formats.Avi.AviDirectory a in aviDirectories)
|
||||
{
|
||||
@ -49,12 +50,12 @@ internal abstract class Exif
|
||||
return results.ToArray();
|
||||
}
|
||||
|
||||
private static Shared.Models.ExifDirectoryBase[] GetExifBaseDirectories(IReadOnlyList<MetadataExtractor.Directory> directories)
|
||||
private static ExifDirectoryBase[] GetExifBaseDirectories(IReadOnlyList<MetadataExtractor.Directory> directories)
|
||||
{
|
||||
List<Shared.Models.ExifDirectoryBase> results = [];
|
||||
Shared.Models.ExifDirectoryBase exifDirectoryBase;
|
||||
IEnumerable<ExifDirectoryBase> exifBaseDirectories = directories.OfType<ExifDirectoryBase>();
|
||||
foreach (ExifDirectoryBase e in exifBaseDirectories)
|
||||
List<ExifDirectoryBase> results = [];
|
||||
ExifDirectoryBase exifDirectoryBase;
|
||||
IEnumerable<MetadataExtractor.Formats.Exif.ExifDirectoryBase> exifBaseDirectories = directories.OfType<MetadataExtractor.Formats.Exif.ExifDirectoryBase>();
|
||||
foreach (MetadataExtractor.Formats.Exif.ExifDirectoryBase e in exifBaseDirectories)
|
||||
{
|
||||
if (e.Tags.Count == 0)
|
||||
continue;
|
||||
@ -62,63 +63,63 @@ internal abstract class Exif
|
||||
DateTime checkDateTime;
|
||||
DateTime? dateTimeOriginal;
|
||||
DateTime? dateTimeDigitized;
|
||||
string? aperture = e.GetDescription(ExifDirectoryBase.TagAperture);
|
||||
string? applicationNotes = e.GetDescription(ExifDirectoryBase.TagApplicationNotes);
|
||||
string? artist = e.GetDescription(ExifDirectoryBase.TagArtist);
|
||||
string? bitsPerSample = e.GetDescription(ExifDirectoryBase.TagBitsPerSample);
|
||||
string? bodySerialNumber = e.GetDescription(ExifDirectoryBase.TagBodySerialNumber);
|
||||
string? cameraOwnerName = e.GetDescription(ExifDirectoryBase.TagCameraOwnerName);
|
||||
string? compressedAverageBitsPerPixel = e.GetDescription(ExifDirectoryBase.TagCompressedAverageBitsPerPixel);
|
||||
string? compression = e.GetDescription(ExifDirectoryBase.TagCompression);
|
||||
string? copyright = e.GetDescription(ExifDirectoryBase.TagCopyright);
|
||||
string? documentName = e.GetDescription(ExifDirectoryBase.TagDocumentName);
|
||||
string? exifVersion = e.GetDescription(ExifDirectoryBase.TagExifVersion);
|
||||
string? exposureTime = e.GetDescription(ExifDirectoryBase.TagExposureTime);
|
||||
string? fileSource = e.GetDescription(ExifDirectoryBase.TagFileSource);
|
||||
string? imageDescription = e.GetDescription(ExifDirectoryBase.TagImageDescription);
|
||||
string? imageHeight = e.GetDescription(ExifDirectoryBase.TagImageHeight);
|
||||
int? imageHeightValue = imageHeight is null ? null : e.GetInt32(ExifDirectoryBase.TagImageHeight);
|
||||
string? imageNumber = e.GetDescription(ExifDirectoryBase.TagImageNumber);
|
||||
string? imageUniqueId = e.GetDescription(ExifDirectoryBase.TagImageUniqueId);
|
||||
string? imageWidth = e.GetDescription(ExifDirectoryBase.TagImageWidth);
|
||||
int? imageWidthValue = imageWidth is null ? null : e.GetInt32(ExifDirectoryBase.TagImageWidth);
|
||||
string? isoSpeed = e.GetDescription(ExifDirectoryBase.TagIsoSpeed);
|
||||
string? lensMake = e.GetDescription(ExifDirectoryBase.TagLensMake);
|
||||
string? lensModel = e.GetDescription(ExifDirectoryBase.TagLensModel);
|
||||
string? lensSerialNumber = e.GetDescription(ExifDirectoryBase.TagLensSerialNumber);
|
||||
string? make = e.GetDescription(ExifDirectoryBase.TagMake);
|
||||
string? makerNote = e.GetDescription(ExifDirectoryBase.TagMakernote);
|
||||
string? model = e.GetDescription(ExifDirectoryBase.TagModel);
|
||||
string? orientation = e.GetDescription(ExifDirectoryBase.TagOrientation);
|
||||
int? orientationValue = orientation is null ? null : e.GetInt32(ExifDirectoryBase.TagOrientation);
|
||||
string? rating = e.GetDescription(ExifDirectoryBase.TagRating);
|
||||
string? ratingPercent = e.GetDescription(ExifDirectoryBase.TagRatingPercent);
|
||||
string? securityClassification = e.GetDescription(ExifDirectoryBase.TagSecurityClassification);
|
||||
string? shutterSpeed = e.GetDescription(ExifDirectoryBase.TagShutterSpeed);
|
||||
string? software = e.GetDescription(ExifDirectoryBase.TagSoftware);
|
||||
string? timeZone = e.GetDescription(ExifDirectoryBase.TagTimeZone);
|
||||
string? timeZoneDigitized = e.GetDescription(ExifDirectoryBase.TagTimeZoneDigitized);
|
||||
string? timeZoneOriginal = e.GetDescription(ExifDirectoryBase.TagTimeZoneOriginal);
|
||||
string? userComment = e.GetDescription(ExifDirectoryBase.TagUserComment);
|
||||
string? winAuthor = e.GetDescription(ExifDirectoryBase.TagWinAuthor);
|
||||
string? winComment = e.GetDescription(ExifDirectoryBase.TagWinComment);
|
||||
string? winKeywords = e.GetDescription(ExifDirectoryBase.TagWinKeywords);
|
||||
string? winSubject = e.GetDescription(ExifDirectoryBase.TagWinSubject);
|
||||
string? winTitle = e.GetDescription(ExifDirectoryBase.TagWinTitle);
|
||||
string? xResolution = e.GetDescription(ExifDirectoryBase.TagXResolution);
|
||||
string? yResolution = e.GetDescription(ExifDirectoryBase.TagYResolution);
|
||||
if (e.TryGetDateTime(ExifDirectoryBase.TagDateTime, out checkDateTime))
|
||||
string? aperture = e.GetDescription(MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagAperture);
|
||||
string? applicationNotes = e.GetDescription(MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagApplicationNotes);
|
||||
string? artist = e.GetDescription(MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagArtist);
|
||||
string? bitsPerSample = e.GetDescription(MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagBitsPerSample);
|
||||
string? bodySerialNumber = e.GetDescription(MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagBodySerialNumber);
|
||||
string? cameraOwnerName = e.GetDescription(MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagCameraOwnerName);
|
||||
string? compressedAverageBitsPerPixel = e.GetDescription(MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagCompressedAverageBitsPerPixel);
|
||||
string? compression = e.GetDescription(MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagCompression);
|
||||
string? copyright = e.GetDescription(MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagCopyright);
|
||||
string? documentName = e.GetDescription(MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagDocumentName);
|
||||
string? exifVersion = e.GetDescription(MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagExifVersion);
|
||||
string? exposureTime = e.GetDescription(MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagExposureTime);
|
||||
string? fileSource = e.GetDescription(MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagFileSource);
|
||||
string? imageDescription = e.GetDescription(MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagImageDescription);
|
||||
string? imageHeight = e.GetDescription(MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagImageHeight);
|
||||
int? imageHeightValue = imageHeight is null ? null : e.GetInt32(MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagImageHeight);
|
||||
string? imageNumber = e.GetDescription(MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagImageNumber);
|
||||
string? imageUniqueId = e.GetDescription(MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagImageUniqueId);
|
||||
string? imageWidth = e.GetDescription(MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagImageWidth);
|
||||
int? imageWidthValue = imageWidth is null ? null : e.GetInt32(MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagImageWidth);
|
||||
string? isoSpeed = e.GetDescription(MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagIsoSpeed);
|
||||
string? lensMake = e.GetDescription(MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagLensMake);
|
||||
string? lensModel = e.GetDescription(MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagLensModel);
|
||||
string? lensSerialNumber = e.GetDescription(MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagLensSerialNumber);
|
||||
string? make = e.GetDescription(MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagMake);
|
||||
string? makerNote = e.GetDescription(MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagMakernote);
|
||||
string? model = e.GetDescription(MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagModel);
|
||||
string? orientation = e.GetDescription(MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagOrientation);
|
||||
int? orientationValue = orientation is null ? null : e.GetInt32(MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagOrientation);
|
||||
string? rating = e.GetDescription(MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagRating);
|
||||
string? ratingPercent = e.GetDescription(MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagRatingPercent);
|
||||
string? securityClassification = e.GetDescription(MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagSecurityClassification);
|
||||
string? shutterSpeed = e.GetDescription(MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagShutterSpeed);
|
||||
string? software = e.GetDescription(MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagSoftware);
|
||||
string? timeZone = e.GetDescription(MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagTimeZone);
|
||||
string? timeZoneDigitized = e.GetDescription(MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagTimeZoneDigitized);
|
||||
string? timeZoneOriginal = e.GetDescription(MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagTimeZoneOriginal);
|
||||
string? userComment = e.GetDescription(MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagUserComment);
|
||||
string? winAuthor = e.GetDescription(MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagWinAuthor);
|
||||
string? winComment = e.GetDescription(MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagWinComment);
|
||||
string? winKeywords = e.GetDescription(MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagWinKeywords);
|
||||
string? winSubject = e.GetDescription(MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagWinSubject);
|
||||
string? winTitle = e.GetDescription(MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagWinTitle);
|
||||
string? xResolution = e.GetDescription(MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagXResolution);
|
||||
string? yResolution = e.GetDescription(MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagYResolution);
|
||||
if (e.TryGetDateTime(MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagDateTime, out checkDateTime))
|
||||
dateTime = checkDateTime;
|
||||
else
|
||||
dateTime = GetDateTime(e.GetString(ExifDirectoryBase.TagDateTime));
|
||||
if (e.TryGetDateTime(ExifDirectoryBase.TagDateTimeOriginal, out checkDateTime))
|
||||
dateTime = GetDateTime(e.GetString(MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagDateTime));
|
||||
if (e.TryGetDateTime(MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagDateTimeOriginal, out checkDateTime))
|
||||
dateTimeOriginal = checkDateTime;
|
||||
else
|
||||
dateTimeOriginal = GetDateTime(e.GetString(ExifDirectoryBase.TagDateTimeOriginal));
|
||||
if (e.TryGetDateTime(ExifDirectoryBase.TagDateTimeDigitized, out checkDateTime))
|
||||
dateTimeOriginal = GetDateTime(e.GetString(MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagDateTimeOriginal));
|
||||
if (e.TryGetDateTime(MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagDateTimeDigitized, out checkDateTime))
|
||||
dateTimeDigitized = checkDateTime;
|
||||
else
|
||||
dateTimeDigitized = GetDateTime(e.GetString(ExifDirectoryBase.TagDateTimeDigitized));
|
||||
dateTimeDigitized = GetDateTime(e.GetString(MetadataExtractor.Formats.Exif.ExifDirectoryBase.TagDateTimeDigitized));
|
||||
if (userComment is not null && userComment.Length > 255)
|
||||
userComment = "...";
|
||||
if (aperture is null
|
||||
@ -221,10 +222,10 @@ internal abstract class Exif
|
||||
return results.ToArray();
|
||||
}
|
||||
|
||||
private static Shared.Models.FileMetadataDirectory[] GetFileMetadataDirectories(string file, IReadOnlyList<MetadataExtractor.Directory> directories)
|
||||
private static FileMetadataDirectory[] GetFileMetadataDirectories(string file, IReadOnlyList<MetadataExtractor.Directory> directories)
|
||||
{
|
||||
List<Shared.Models.FileMetadataDirectory> results = [];
|
||||
Shared.Models.FileMetadataDirectory fileMetadataDirectory;
|
||||
List<FileMetadataDirectory> results = [];
|
||||
FileMetadataDirectory fileMetadataDirectory;
|
||||
IEnumerable<MetadataExtractor.Formats.FileSystem.FileMetadataDirectory> fileMetadataDirectories = directories.OfType<MetadataExtractor.Formats.FileSystem.FileMetadataDirectory>();
|
||||
foreach (MetadataExtractor.Formats.FileSystem.FileMetadataDirectory f in fileMetadataDirectories)
|
||||
{
|
||||
@ -247,10 +248,10 @@ internal abstract class Exif
|
||||
return results.ToArray();
|
||||
}
|
||||
|
||||
private static Shared.Models.GifHeaderDirectory[] GetGifHeaderDirectories(IReadOnlyList<MetadataExtractor.Directory> directories)
|
||||
private static GifHeaderDirectory[] GetGifHeaderDirectories(IReadOnlyList<MetadataExtractor.Directory> directories)
|
||||
{
|
||||
List<Shared.Models.GifHeaderDirectory> results = [];
|
||||
Shared.Models.GifHeaderDirectory gifHeaderDirectory;
|
||||
List<GifHeaderDirectory> results = [];
|
||||
GifHeaderDirectory gifHeaderDirectory;
|
||||
IEnumerable<MetadataExtractor.Formats.Gif.GifHeaderDirectory> gifHeaderDirectories = directories.OfType<MetadataExtractor.Formats.Gif.GifHeaderDirectory>();
|
||||
foreach (MetadataExtractor.Formats.Gif.GifHeaderDirectory g in gifHeaderDirectories)
|
||||
{
|
||||
@ -266,25 +267,25 @@ internal abstract class Exif
|
||||
return results.ToArray();
|
||||
}
|
||||
|
||||
private static Shared.Models.GpsDirectory[] GetGpsDirectories(IReadOnlyList<MetadataExtractor.Directory> directories)
|
||||
private static GpsDirectory[] GetGpsDirectories(IReadOnlyList<MetadataExtractor.Directory> directories)
|
||||
{
|
||||
List<Shared.Models.GpsDirectory> results = [];
|
||||
Shared.Models.GpsDirectory gpsDirectory;
|
||||
IEnumerable<GpsDirectory> gpsDirectories = directories.OfType<GpsDirectory>();
|
||||
foreach (GpsDirectory g in gpsDirectories)
|
||||
List<GpsDirectory> results = [];
|
||||
GpsDirectory gpsDirectory;
|
||||
IEnumerable<MetadataExtractor.Formats.Exif.GpsDirectory> gpsDirectories = directories.OfType<MetadataExtractor.Formats.Exif.GpsDirectory>();
|
||||
foreach (MetadataExtractor.Formats.Exif.GpsDirectory g in gpsDirectories)
|
||||
{
|
||||
if (g.Tags.Count == 0)
|
||||
continue;
|
||||
DateTime? timeStamp;
|
||||
string? altitude = g.GetDescription(GpsDirectory.TagAltitude);
|
||||
string? latitude = g.GetDescription(GpsDirectory.TagLatitude);
|
||||
string? latitudeRef = g.GetDescription(GpsDirectory.TagLatitudeRef);
|
||||
string? longitude = g.GetDescription(GpsDirectory.TagLongitude);
|
||||
string? longitudeRef = g.GetDescription(GpsDirectory.TagLongitudeRef);
|
||||
if (g.TryGetDateTime(GpsDirectory.TagTimeStamp, out DateTime checkDateTime))
|
||||
string? altitude = g.GetDescription(MetadataExtractor.Formats.Exif.GpsDirectory.TagAltitude);
|
||||
string? latitude = g.GetDescription(MetadataExtractor.Formats.Exif.GpsDirectory.TagLatitude);
|
||||
string? latitudeRef = g.GetDescription(MetadataExtractor.Formats.Exif.GpsDirectory.TagLatitudeRef);
|
||||
string? longitude = g.GetDescription(MetadataExtractor.Formats.Exif.GpsDirectory.TagLongitude);
|
||||
string? longitudeRef = g.GetDescription(MetadataExtractor.Formats.Exif.GpsDirectory.TagLongitudeRef);
|
||||
if (g.TryGetDateTime(MetadataExtractor.Formats.Exif.GpsDirectory.TagTimeStamp, out DateTime checkDateTime))
|
||||
timeStamp = checkDateTime;
|
||||
else
|
||||
timeStamp = GetDateTime(g.GetString(GpsDirectory.TagTimeStamp));
|
||||
timeStamp = GetDateTime(g.GetString(MetadataExtractor.Formats.Exif.GpsDirectory.TagTimeStamp));
|
||||
if (altitude is null && latitude is null && latitudeRef is null && longitude is null && longitudeRef is null && timeStamp is null)
|
||||
continue;
|
||||
gpsDirectory = new(Altitude: altitude,
|
||||
@ -298,10 +299,10 @@ internal abstract class Exif
|
||||
return results.ToArray();
|
||||
}
|
||||
|
||||
private static Shared.Models.JpegDirectory[] GetJpegDirectories(IReadOnlyList<MetadataExtractor.Directory> directories)
|
||||
private static JpegDirectory[] GetJpegDirectories(IReadOnlyList<MetadataExtractor.Directory> directories)
|
||||
{
|
||||
List<Shared.Models.JpegDirectory> results = [];
|
||||
Shared.Models.JpegDirectory jpegDirectory;
|
||||
List<JpegDirectory> results = [];
|
||||
JpegDirectory jpegDirectory;
|
||||
IEnumerable<MetadataExtractor.Formats.Jpeg.JpegDirectory> jpegDirectories = directories.OfType<MetadataExtractor.Formats.Jpeg.JpegDirectory>();
|
||||
foreach (MetadataExtractor.Formats.Jpeg.JpegDirectory j in jpegDirectories)
|
||||
{
|
||||
@ -317,10 +318,10 @@ internal abstract class Exif
|
||||
return results.ToArray();
|
||||
}
|
||||
|
||||
private static Shared.Models.MakernoteDirectory[] GetMakernoteDirectories(IReadOnlyList<MetadataExtractor.Directory> directories)
|
||||
private static MakernoteDirectory[] GetMakernoteDirectories(IReadOnlyList<MetadataExtractor.Directory> directories)
|
||||
{
|
||||
List<Shared.Models.MakernoteDirectory> results = [];
|
||||
Shared.Models.MakernoteDirectory makernoteDirectory;
|
||||
List<MakernoteDirectory> results = [];
|
||||
MakernoteDirectory makernoteDirectory;
|
||||
IEnumerable<AppleMakernoteDirectory> appleMakernoteDirectories = directories.OfType<AppleMakernoteDirectory>();
|
||||
foreach (AppleMakernoteDirectory appleMakernoteDirectory in appleMakernoteDirectories)
|
||||
{
|
||||
@ -415,10 +416,10 @@ internal abstract class Exif
|
||||
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 = [];
|
||||
Shared.Models.PhotoshopDirectory photoshopDirectory;
|
||||
List<PhotoshopDirectory> results = [];
|
||||
PhotoshopDirectory photoshopDirectory;
|
||||
IEnumerable<MetadataExtractor.Formats.Photoshop.PhotoshopDirectory> photoshopDirectories = directories.OfType<MetadataExtractor.Formats.Photoshop.PhotoshopDirectory>();
|
||||
foreach (MetadataExtractor.Formats.Photoshop.PhotoshopDirectory p in photoshopDirectories)
|
||||
{
|
||||
@ -434,10 +435,10 @@ internal abstract class Exif
|
||||
return results.ToArray();
|
||||
}
|
||||
|
||||
private static Shared.Models.PngDirectory[] GetPngDirectories(IReadOnlyList<MetadataExtractor.Directory> directories)
|
||||
private static PngDirectory[] GetPngDirectories(IReadOnlyList<MetadataExtractor.Directory> directories)
|
||||
{
|
||||
List<Shared.Models.PngDirectory> results = [];
|
||||
Shared.Models.PngDirectory pngDirectory;
|
||||
List<PngDirectory> results = [];
|
||||
PngDirectory pngDirectory;
|
||||
IEnumerable<MetadataExtractor.Formats.Png.PngDirectory> pngDirectories = directories.OfType<MetadataExtractor.Formats.Png.PngDirectory>();
|
||||
foreach (MetadataExtractor.Formats.Png.PngDirectory p in pngDirectories)
|
||||
{
|
||||
@ -454,10 +455,10 @@ internal abstract class Exif
|
||||
return results.ToArray();
|
||||
}
|
||||
|
||||
private static Shared.Models.QuickTimeMovieHeaderDirectory[] GetQuickTimeMovieHeaderDirectoryDirectories(IReadOnlyList<MetadataExtractor.Directory> directories)
|
||||
private static QuickTimeMovieHeaderDirectory[] GetQuickTimeMovieHeaderDirectoryDirectories(IReadOnlyList<MetadataExtractor.Directory> directories)
|
||||
{
|
||||
List<Shared.Models.QuickTimeMovieHeaderDirectory> results = [];
|
||||
Shared.Models.QuickTimeMovieHeaderDirectory quickTimeMovieHeaderDirectory;
|
||||
List<QuickTimeMovieHeaderDirectory> results = [];
|
||||
QuickTimeMovieHeaderDirectory quickTimeMovieHeaderDirectory;
|
||||
IEnumerable<MetadataExtractor.Formats.QuickTime.QuickTimeMovieHeaderDirectory> quickTimeMovieHeaderDirectories = directories.OfType<MetadataExtractor.Formats.QuickTime.QuickTimeMovieHeaderDirectory>();
|
||||
foreach (MetadataExtractor.Formats.QuickTime.QuickTimeMovieHeaderDirectory q in quickTimeMovieHeaderDirectories)
|
||||
{
|
||||
@ -476,10 +477,10 @@ internal abstract class Exif
|
||||
return results.ToArray();
|
||||
}
|
||||
|
||||
private static Shared.Models.QuickTimeTrackHeaderDirectory[] GetQuickTimeTrackHeaderDirectoryDirectories(IReadOnlyList<MetadataExtractor.Directory> directories)
|
||||
private static QuickTimeTrackHeaderDirectory[] GetQuickTimeTrackHeaderDirectoryDirectories(IReadOnlyList<MetadataExtractor.Directory> directories)
|
||||
{
|
||||
List<Shared.Models.QuickTimeTrackHeaderDirectory> results = [];
|
||||
Shared.Models.QuickTimeTrackHeaderDirectory quickTimeTrackHeaderDirectory;
|
||||
List<QuickTimeTrackHeaderDirectory> results = [];
|
||||
QuickTimeTrackHeaderDirectory quickTimeTrackHeaderDirectory;
|
||||
IEnumerable<MetadataExtractor.Formats.QuickTime.QuickTimeTrackHeaderDirectory> quickTimeTrackHeaderDirectories = directories.OfType<MetadataExtractor.Formats.QuickTime.QuickTimeTrackHeaderDirectory>();
|
||||
foreach (MetadataExtractor.Formats.QuickTime.QuickTimeTrackHeaderDirectory q in quickTimeTrackHeaderDirectories)
|
||||
{
|
||||
@ -498,10 +499,10 @@ internal abstract class Exif
|
||||
return results.ToArray();
|
||||
}
|
||||
|
||||
private static Shared.Models.WebPDirectory[] GetWebPDirectories(IReadOnlyList<MetadataExtractor.Directory> directories)
|
||||
private static WebPDirectory[] GetWebPDirectories(IReadOnlyList<MetadataExtractor.Directory> directories)
|
||||
{
|
||||
List<Shared.Models.WebPDirectory> results = [];
|
||||
Shared.Models.WebPDirectory webPDirectory;
|
||||
List<WebPDirectory> results = [];
|
||||
WebPDirectory webPDirectory;
|
||||
IEnumerable<MetadataExtractor.Formats.WebP.WebPDirectory> webPDirectories = directories.OfType<MetadataExtractor.Formats.WebP.WebPDirectory>();
|
||||
foreach (MetadataExtractor.Formats.WebP.WebPDirectory w in webPDirectories)
|
||||
{
|
||||
@ -517,28 +518,28 @@ internal abstract class Exif
|
||||
return results.ToArray();
|
||||
}
|
||||
|
||||
private static Shared.Models.ExifDirectory Covert(Shared.Models.FilePath filePath, Shared.Models.PersonKeyFormattedAndKeyTicksAndDisplayDirectoryName? personKeyFormattedAndKeyTicksAndDisplayDirectoryName, IReadOnlyList<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;
|
||||
Shared.Models.AviDirectory[] aviDirectories = GetAviDirectories(directories);
|
||||
Shared.Models.GpsDirectory[] gpsDirectories = GetGpsDirectories(directories);
|
||||
Shared.Models.PngDirectory[] pngDirectories = GetPngDirectories(directories);
|
||||
Shared.Models.JpegDirectory[] jpegDirectories = GetJpegDirectories(directories);
|
||||
Shared.Models.WebPDirectory[] webPDirectories = GetWebPDirectories(directories);
|
||||
Shared.Models.ExifDirectoryBase[] exifBaseDirectories = GetExifBaseDirectories(directories);
|
||||
Shared.Models.GifHeaderDirectory[] gifHeaderDirectories = GetGifHeaderDirectories(directories);
|
||||
Shared.Models.MakernoteDirectory[] makernoteDirectories = GetMakernoteDirectories(directories);
|
||||
Shared.Models.PhotoshopDirectory[] photoshopDirectories = GetPhotoshopDirectories(directories);
|
||||
Shared.Models.FileMetadataDirectory[] fileMetadataDirectories = GetFileMetadataDirectories(filePath.FullName, directories);
|
||||
Shared.Models.QuickTimeMovieHeaderDirectory[] quickTimeMovieHeaderDirectories = GetQuickTimeMovieHeaderDirectoryDirectories(directories);
|
||||
Shared.Models.QuickTimeTrackHeaderDirectory[] quickTimeTrackHeaderDirectories = GetQuickTimeTrackHeaderDirectoryDirectories(directories);
|
||||
ExifDirectory result;
|
||||
AviDirectory[] aviDirectories = GetAviDirectories(directories);
|
||||
GpsDirectory[] gpsDirectories = GetGpsDirectories(directories);
|
||||
PngDirectory[] pngDirectories = GetPngDirectories(directories);
|
||||
JpegDirectory[] jpegDirectories = GetJpegDirectories(directories);
|
||||
WebPDirectory[] webPDirectories = GetWebPDirectories(directories);
|
||||
ExifDirectoryBase[] exifBaseDirectories = GetExifBaseDirectories(directories);
|
||||
GifHeaderDirectory[] gifHeaderDirectories = GetGifHeaderDirectories(directories);
|
||||
MakernoteDirectory[] makernoteDirectories = GetMakernoteDirectories(directories);
|
||||
PhotoshopDirectory[] photoshopDirectories = GetPhotoshopDirectories(directories);
|
||||
FileMetadataDirectory[] fileMetadataDirectories = GetFileMetadataDirectories(filePath.FullName, directories);
|
||||
QuickTimeMovieHeaderDirectory[] quickTimeMovieHeaderDirectories = GetQuickTimeMovieHeaderDirectoryDirectories(directories);
|
||||
QuickTimeTrackHeaderDirectory[] quickTimeTrackHeaderDirectories = GetQuickTimeTrackHeaderDirectoryDirectories(directories);
|
||||
result = new(AviDirectories: aviDirectories,
|
||||
ExifBaseDirectories: exifBaseDirectories,
|
||||
FileMetadataDirectories: fileMetadataDirectories,
|
||||
FilePath: filePath,
|
||||
GifHeaderDirectories: gifHeaderDirectories,
|
||||
GpsDirectories: gpsDirectories,
|
||||
Height: size?.Height ?? Shared.Models.Stateless.IMetaBase.GetHeight(exifBaseDirectories),
|
||||
Height: size?.Height ?? IMetaBase.GetHeight(exifBaseDirectories),
|
||||
JpegDirectories: jpegDirectories,
|
||||
MakernoteDirectories: makernoteDirectories,
|
||||
PersonKeyFormattedAndKeyTicksAndDisplayDirectoryName: personKeyFormattedAndKeyTicksAndDisplayDirectoryName,
|
||||
@ -547,13 +548,13 @@ internal abstract class Exif
|
||||
QuickTimeMovieHeaderDirectories: quickTimeMovieHeaderDirectories,
|
||||
QuickTimeTrackHeaderDirectories: quickTimeTrackHeaderDirectories,
|
||||
WebPDirectories: webPDirectories,
|
||||
Width: size?.Width ?? Shared.Models.Stateless.IMetaBase.GetWidth(exifBaseDirectories));
|
||||
Width: size?.Width ?? IMetaBase.GetWidth(exifBaseDirectories));
|
||||
return result;
|
||||
}
|
||||
|
||||
internal static Shared.Models.ExifDirectory GetExifDirectory(Shared.Models.FilePath filePath, Stream stream, Shared.Models.PersonKeyFormattedAndKeyTicksAndDisplayDirectoryName? personKeyFormattedAndKeyTicksAndDisplayDirectoryName)
|
||||
internal static ExifDirectory GetExifDirectory(FilePath filePath, Stream stream, PersonKeyFormattedAndKeyTicksAndDisplayDirectoryName? personKeyFormattedAndKeyTicksAndDisplayDirectoryName)
|
||||
{
|
||||
Shared.Models.ExifDirectory result;
|
||||
ExifDirectory result;
|
||||
IReadOnlyList<MetadataExtractor.Directory> directories = ImageMetadataReader.ReadMetadata(stream);
|
||||
System.Drawing.Size? size;
|
||||
try
|
||||
@ -564,4 +565,15 @@ internal abstract class Exif
|
||||
return result;
|
||||
}
|
||||
|
||||
internal static ExifDirectory? GetExifDirectory(ResultSettings resultSettings, MetadataSettings metadataSettings, FileInfo fileInfo)
|
||||
{
|
||||
ExifDirectory? result;
|
||||
FileHolder fileHolder = FileHolder.Get(fileInfo, id: null);
|
||||
const PersonKeyFormattedAndKeyTicksAndDisplayDirectoryName? p = null;
|
||||
FilePath filePath = FilePath.Get(resultSettings, metadataSettings, fileHolder, index: fileHolder.Id);
|
||||
using Stream stream = File.OpenRead(filePath.FullName);
|
||||
result = GetExifDirectory(filePath, stream, p);
|
||||
return result;
|
||||
}
|
||||
|
||||
}
|
@ -1,10 +1,19 @@
|
||||
using View_by_Distance.Shared.Models;
|
||||
using System.Text.Json;
|
||||
using Phares.Shared.Models;
|
||||
|
||||
namespace View_by_Distance.Metadata.Models.Stateless;
|
||||
namespace Phares.Metadata.Models.Stateless;
|
||||
|
||||
internal static class Face
|
||||
{
|
||||
|
||||
internal static FaceEncoding? GetFaceEncoding(ExifDirectory? exifDirectory)
|
||||
{
|
||||
FaceEncoding? result;
|
||||
string? json = GetFaceEncoding(exifDirectory?.PngDirectories);
|
||||
result = string.IsNullOrEmpty(json) ? null : JsonSerializer.Deserialize(json, FaceEncodingGenerationContext.Default.FaceEncoding);
|
||||
return result;
|
||||
}
|
||||
|
||||
internal static string? GetFaceEncoding(PngDirectory[]? pngDirectories)
|
||||
{
|
||||
string? result = null;
|
||||
@ -22,7 +31,15 @@ internal static class Face
|
||||
return result;
|
||||
}
|
||||
|
||||
internal static string? GetOutputResolution(PngDirectory[]? pngDirectories)
|
||||
internal static FaceFile? GetFaceFile(ExifDirectory? exifDirectory)
|
||||
{
|
||||
FaceFile? result;
|
||||
string? json = GetOutputResolution(exifDirectory?.PngDirectories);
|
||||
result = string.IsNullOrEmpty(json) ? null : JsonSerializer.Deserialize(json, FaceFileGenerationContext.Default.FaceFile);
|
||||
return result;
|
||||
}
|
||||
|
||||
private static string? GetOutputResolution(PngDirectory[]? pngDirectories)
|
||||
{
|
||||
string? result = null;
|
||||
if (pngDirectories is not null)
|
||||
|
@ -1,8 +1,7 @@
|
||||
using MetadataExtractor;
|
||||
using View_by_Distance.Metadata.Models.Stateless;
|
||||
using View_by_Distance.Shared.Models;
|
||||
using Phares.Shared.Models;
|
||||
|
||||
namespace View_by_Distance.Metadata.Models.Stateless;
|
||||
namespace Phares.Metadata.Models.Stateless;
|
||||
|
||||
internal abstract class GPS
|
||||
{
|
||||
|
@ -1,9 +1,9 @@
|
||||
using System.Collections.ObjectModel;
|
||||
using View_by_Distance.Shared.Models;
|
||||
using View_by_Distance.Shared.Models.Properties;
|
||||
using View_by_Distance.Shared.Models.Stateless;
|
||||
using Phares.Shared.Models;
|
||||
using Phares.Shared.Models.Properties;
|
||||
using Phares.Shared.Models.Stateless;
|
||||
|
||||
namespace View_by_Distance.Metadata.Models.Stateless;
|
||||
namespace Phares.Metadata.Models.Stateless;
|
||||
|
||||
internal static class Get
|
||||
{
|
||||
|
@ -1,10 +1,10 @@
|
||||
using MetadataExtractor;
|
||||
using System.Collections.ObjectModel;
|
||||
using View_by_Distance.Shared.Models;
|
||||
using View_by_Distance.Shared.Models.Properties;
|
||||
using View_by_Distance.Shared.Models.Stateless;
|
||||
using Phares.Shared.Models;
|
||||
using Phares.Shared.Models.Properties;
|
||||
using Phares.Shared.Models.Stateless;
|
||||
|
||||
namespace View_by_Distance.Metadata.Models.Stateless;
|
||||
namespace Phares.Metadata.Models.Stateless;
|
||||
|
||||
public interface IMetadata
|
||||
{
|
||||
@ -17,49 +17,70 @@ public interface IMetadata
|
||||
Meters
|
||||
}
|
||||
|
||||
ExifDirectory TestStatic_GetExifDirectory(FilePath filePath, Stream stream, PersonKeyFormattedAndKeyTicksAndDisplayDirectoryName? personKeyFormattedAndKeyTicksAndDisplayDirectoryName) =>
|
||||
GetExifDirectory(filePath, stream, personKeyFormattedAndKeyTicksAndDisplayDirectoryName);
|
||||
static ExifDirectory GetExifDirectory(FilePath filePath, Stream stream, PersonKeyFormattedAndKeyTicksAndDisplayDirectoryName? personKeyFormattedAndKeyTicksAndDisplayDirectoryName) =>
|
||||
Exif.GetExifDirectory(filePath, stream, personKeyFormattedAndKeyTicksAndDisplayDirectoryName);
|
||||
public static FaceFile? GetFaceFile(ExifDirectory? exifDirectory) =>
|
||||
Face.GetFaceFile(exifDirectory);
|
||||
|
||||
string? TestStatic_GetOutputResolution(ExifDirectory? exifDirectory) =>
|
||||
GetOutputResolution(exifDirectory);
|
||||
static string? GetOutputResolution(ExifDirectory? exifDirectory) =>
|
||||
Face.GetOutputResolution(exifDirectory?.PngDirectories);
|
||||
|
||||
string? TestStatic_GetFaceEncoding(ExifDirectory? exifDirectory) =>
|
||||
GetFaceEncoding(exifDirectory);
|
||||
static string? GetFaceEncoding(ExifDirectory? exifDirectory) =>
|
||||
Face.GetFaceEncoding(exifDirectory?.PngDirectories);
|
||||
|
||||
GeoLocation? TestStatic_GeoLocation(ExifDirectory? exifDirectory) =>
|
||||
GeoLocation(exifDirectory);
|
||||
static GeoLocation? GeoLocation(ExifDirectory? exifDirectory) =>
|
||||
public static GeoLocation? GeoLocation(ExifDirectory? exifDirectory) =>
|
||||
GPS.GeoLocation(exifDirectory?.GpsDirectories);
|
||||
|
||||
double? TestStatic_GetDistance(double originLatitude, double originLongitude, double destinationLatitude, double destinationLongitude, int decimalPlaces = 1, DistanceUnit distanceUnit = DistanceUnit.Miles) =>
|
||||
GetDistance(originLatitude, originLongitude, destinationLatitude, destinationLongitude, decimalPlaces, distanceUnit);
|
||||
static double? GetDistance(double originLatitude, double originLongitude, double destinationLatitude, double destinationLongitude, int decimalPlaces = 1, DistanceUnit distanceUnit = DistanceUnit.Miles) =>
|
||||
GPS.GetDistance(originLatitude, originLongitude, destinationLatitude, destinationLongitude, decimalPlaces, distanceUnit);
|
||||
public static string? GetRawFaceEncoding(ExifDirectory? exifDirectory) =>
|
||||
Face.GetFaceEncoding(exifDirectory?.PngDirectories);
|
||||
|
||||
Action<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);
|
||||
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 FaceEncoding? GetFaceEncoding(ExifDirectory? exifDirectory) =>
|
||||
Face.GetFaceEncoding(exifDirectory);
|
||||
|
||||
ReadOnlyDictionary<string, List<FileHolder>> TestStatic_GetKeyValuePairs(IEnumerable<string> files) =>
|
||||
GetKeyValuePairs(files);
|
||||
static ReadOnlyDictionary<string, List<FileHolder>> GetKeyValuePairs(IEnumerable<string> files) =>
|
||||
public static ReadOnlyDictionary<string, List<FileHolder>> GetKeyValuePairs(IEnumerable<string> files) =>
|
||||
Get.GetKeyValuePairs(files);
|
||||
|
||||
ReadOnlyDictionary<string, List<FileHolder>> TestStatic_GetKeyValuePairs(IEnumerable<NginxFileSystem> collection) =>
|
||||
GetKeyValuePairs(collection);
|
||||
static ReadOnlyDictionary<string, List<FileHolder>> GetKeyValuePairs(IEnumerable<NginxFileSystem> collection) =>
|
||||
public static ReadOnlyDictionary<string, List<FileHolder>> GetKeyValuePairs(IEnumerable<NginxFileSystem> collection) =>
|
||||
Get.GetKeyValuePairs(collection);
|
||||
|
||||
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);
|
||||
static Action<string> 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) =>
|
||||
Exif.GetExifDirectory(resultSettings, metadataSettings, fileInfo);
|
||||
|
||||
public static ExifDirectory GetExifDirectory(FilePath filePath, Stream stream, PersonKeyFormattedAndKeyTicksAndDisplayDirectoryName? personKeyFormattedAndKeyTicksAndDisplayDirectoryName) =>
|
||||
Exif.GetExifDirectory(filePath, stream, personKeyFormattedAndKeyTicksAndDisplayDirectoryName);
|
||||
|
||||
public static double? GetDistance(double originLatitude, double originLongitude, double destinationLatitude, double destinationLongitude, int decimalPlaces = 1, DistanceUnit distanceUnit = DistanceUnit.Miles) =>
|
||||
GPS.GetDistance(originLatitude, originLongitude, destinationLatitude, destinationLongitude, decimalPlaces, distanceUnit);
|
||||
|
||||
public static Action<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);
|
||||
|
||||
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);
|
||||
|
||||
}
|
@ -10,7 +10,7 @@
|
||||
<HoursSinceNovember122024>$([System.Math]::Floor($([MSBuild]::Divide($([MSBuild]::Subtract($([System.DateTimeOffset]::UtcNow.ToUnixTimeSeconds()), 1731369600)), 3600))))</HoursSinceNovember122024>
|
||||
</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>
|
||||
<Company>Phares</Company>
|
||||
<Authors>Mike Phares</Authors>
|
||||
|
@ -1,3 +1,3 @@
|
||||
namespace View_by_Distance.Metadata.Models;
|
||||
namespace Phares.Metadata.Models;
|
||||
|
||||
public class A2_People() { }
|
@ -1,6 +1,6 @@
|
||||
using System.Collections.ObjectModel;
|
||||
using View_by_Distance.Shared.Models;
|
||||
using View_by_Distance.Shared.Models.Properties;
|
||||
using Phares.Shared.Models;
|
||||
using Phares.Shared.Models.Properties;
|
||||
|
||||
namespace View_by_Distance.People.Models.Stateless;
|
||||
|
||||
|
@ -1,9 +1,9 @@
|
||||
using System.Collections.ObjectModel;
|
||||
using System.Globalization;
|
||||
using View_by_Distance.Metadata.Models;
|
||||
using View_by_Distance.Shared.Models;
|
||||
using View_by_Distance.Shared.Models.Properties;
|
||||
using View_by_Distance.Shared.Models.Stateless;
|
||||
using Phares.Metadata.Models;
|
||||
using Phares.Shared.Models;
|
||||
using Phares.Shared.Models.Properties;
|
||||
using Phares.Shared.Models.Stateless;
|
||||
using WindowsShortcutFactory;
|
||||
|
||||
namespace View_by_Distance.People.Models.Stateless;
|
||||
|
@ -1,8 +1,8 @@
|
||||
using System.Collections.ObjectModel;
|
||||
using View_by_Distance.Metadata.Models;
|
||||
using View_by_Distance.Shared.Models;
|
||||
using View_by_Distance.Shared.Models.Properties;
|
||||
using View_by_Distance.Shared.Models.Stateless;
|
||||
using Phares.Metadata.Models;
|
||||
using Phares.Shared.Models;
|
||||
using Phares.Shared.Models.Properties;
|
||||
using Phares.Shared.Models.Stateless;
|
||||
|
||||
namespace View_by_Distance.People.Models.Stateless;
|
||||
|
||||
|
@ -1,7 +1,7 @@
|
||||
using Microsoft.Extensions.Configuration;
|
||||
using System.Text.Json;
|
||||
using System.Text.Json.Serialization;
|
||||
using View_by_Distance.Shared.Models;
|
||||
using Phares.Shared.Models;
|
||||
|
||||
namespace View_by_Distance.Rename.Models;
|
||||
|
||||
|
@ -1,4 +1,5 @@
|
||||
|
||||
using Phares.Shared.Models.Properties;
|
||||
using System.Text.Json;
|
||||
using System.Text.Json.Serialization;
|
||||
|
||||
@ -21,7 +22,7 @@ public record RenameSettings(string Company,
|
||||
string[] SidecarExtensions,
|
||||
bool SkipIdFiles,
|
||||
int ValidationImageDeterministicHashCodeId,
|
||||
string ValidationImageFile) : Shared.Models.Properties.IRenameSettings
|
||||
string ValidationImageFile) : IRenameSettings
|
||||
{
|
||||
|
||||
public override string ToString()
|
||||
|
@ -23,7 +23,7 @@ public class Program
|
||||
{
|
||||
if (args is null)
|
||||
throw new Exception("args is null!");
|
||||
Shared.Models.Console console = new();
|
||||
Phares.Shared.Models.Console console = new();
|
||||
_ = new Rename(args, logger, appSettings, silentIndex > -1, console);
|
||||
}
|
||||
catch (Exception ex)
|
||||
|
@ -7,11 +7,11 @@ using System.Drawing;
|
||||
using System.Drawing.Imaging;
|
||||
using System.Runtime.InteropServices;
|
||||
using System.Text.Json;
|
||||
using View_by_Distance.Metadata.Models;
|
||||
using View_by_Distance.Metadata.Models.Stateless;
|
||||
using Phares.Metadata.Models;
|
||||
using Phares.Metadata.Models.Stateless;
|
||||
using View_by_Distance.Rename.Models;
|
||||
using View_by_Distance.Shared.Models;
|
||||
using View_by_Distance.Shared.Models.Stateless;
|
||||
using Phares.Shared.Models;
|
||||
using Phares.Shared.Models.Stateless;
|
||||
|
||||
namespace View_by_Distance.Rename;
|
||||
|
||||
@ -152,14 +152,19 @@ public partial class Rename : IRename, IDisposable
|
||||
long epoch = new DateTime(1970, 1, 1).Ticks;
|
||||
long net8ReleaseDate = new DateTime(2023, 11, 14).Ticks;
|
||||
long net9ReleaseDate = new DateTime(2024, 11, 12).Ticks;
|
||||
long net10ReleaseDate = new DateTime(2026, 01, 01).Ticks;
|
||||
double net8TotalSeconds = new TimeSpan(net8ReleaseDate - epoch).TotalSeconds;
|
||||
double net9TotalSeconds = new TimeSpan(net9ReleaseDate - epoch).TotalSeconds;
|
||||
double net10TotalSeconds = new TimeSpan(net10ReleaseDate - epoch).TotalSeconds;
|
||||
logger?.LogInformation("It has been {net8TotalSeconds} seconds since net8 was released", net8TotalSeconds);
|
||||
logger?.LogInformation("It has been {net9TotalSeconds} seconds since net9 was released", net9TotalSeconds);
|
||||
logger?.LogInformation("It has been {net10TotalSeconds} seconds since net10 was released", net10TotalSeconds);
|
||||
double net8TotalHours = Math.Floor((DateTimeOffset.UtcNow.ToUnixTimeSeconds() - net8TotalSeconds) / secondsInAHour);
|
||||
double net9TotalHours = Math.Floor((DateTimeOffset.UtcNow.ToUnixTimeSeconds() - net9TotalSeconds) / secondsInAHour);
|
||||
double net10TotalHours = Math.Floor((DateTimeOffset.UtcNow.ToUnixTimeSeconds() - net10TotalSeconds) / secondsInAHour);
|
||||
logger?.LogInformation("It has been {net8TotalHours} hours since net8 was released", net8TotalHours);
|
||||
logger?.LogInformation("It has been {net9TotalHours} hours since net9 was released", net9TotalHours);
|
||||
logger?.LogInformation("It has been {net10TotalHours} hours since net10 was released", net10TotalHours);
|
||||
}
|
||||
|
||||
private void RenameWork(ILogger<Program>? logger, AppSettings appSettings, IRename rename)
|
||||
|
@ -9,7 +9,7 @@
|
||||
<HoursSinceNovember142023>$([System.Math]::Floor($([MSBuild]::Divide($([MSBuild]::Subtract($([System.DateTimeOffset]::UtcNow.ToUnixTimeSeconds()), 1699920000)), 3600))))</HoursSinceNovember142023>
|
||||
</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>
|
||||
<Company>Phares</Company>
|
||||
<Authors>Mike Phares</Authors>
|
||||
|
@ -1,7 +1,7 @@
|
||||
using System.Text.Json;
|
||||
using System.Text.Json.Serialization;
|
||||
|
||||
namespace View_by_Distance.Shared.Models;
|
||||
namespace Phares.Shared.Models;
|
||||
|
||||
public record AviDirectory(DateTime? DateTimeOriginal,
|
||||
string? Duration,
|
||||
|
@ -1,7 +1,7 @@
|
||||
using System.Text.Json;
|
||||
using System.Text.Json.Serialization;
|
||||
|
||||
namespace View_by_Distance.Shared.Models;
|
||||
namespace Phares.Shared.Models;
|
||||
|
||||
public record CombinedEnumAndIndex(string Combined,
|
||||
byte Enum,
|
||||
|
@ -1,7 +1,7 @@
|
||||
using System.Text.Json;
|
||||
using System.Text.Json.Serialization;
|
||||
|
||||
namespace View_by_Distance.Shared.Models;
|
||||
namespace Phares.Shared.Models;
|
||||
|
||||
public record DeterministicHashCode(int? Height,
|
||||
int? Id,
|
||||
|
@ -1,7 +1,7 @@
|
||||
using System.Text.Json;
|
||||
using System.Text.Json.Serialization;
|
||||
|
||||
namespace View_by_Distance.Shared.Models;
|
||||
namespace Phares.Shared.Models;
|
||||
|
||||
public record DistanceSettings(bool DistanceMoveUnableToMatch,
|
||||
int FaceAreaPermyriad,
|
||||
|
@ -1,7 +1,7 @@
|
||||
using System.Text.Json;
|
||||
using System.Text.Json.Serialization;
|
||||
|
||||
namespace View_by_Distance.Shared.Models;
|
||||
namespace Phares.Shared.Models;
|
||||
|
||||
public record ExifDirectory(AviDirectory[] AviDirectories,
|
||||
ExifDirectoryBase[] ExifBaseDirectories,
|
||||
|
@ -1,7 +1,7 @@
|
||||
using System.Text.Json;
|
||||
using System.Text.Json.Serialization;
|
||||
|
||||
namespace View_by_Distance.Shared.Models;
|
||||
namespace Phares.Shared.Models;
|
||||
|
||||
public record ExifDirectoryBase(string? Aperture,
|
||||
string? ApplicationNotes,
|
||||
|
@ -1,7 +1,7 @@
|
||||
using System.Text.Json;
|
||||
using System.Text.Json.Serialization;
|
||||
|
||||
namespace View_by_Distance.Shared.Models;
|
||||
namespace Phares.Shared.Models;
|
||||
|
||||
public record class FaceDistance : Properties.IFaceDistance
|
||||
{
|
||||
|
@ -1,6 +1,6 @@
|
||||
using System.Text.Json.Serialization;
|
||||
|
||||
namespace View_by_Distance.Shared.Models;
|
||||
namespace Phares.Shared.Models;
|
||||
|
||||
public record FaceEncoding(double[] RawEncoding, int Size);
|
||||
|
||||
|
@ -1,6 +1,6 @@
|
||||
using System.Text.Json.Serialization;
|
||||
|
||||
namespace View_by_Distance.Shared.Models;
|
||||
namespace Phares.Shared.Models;
|
||||
|
||||
public record FaceFile(int? AreaPermyriad,
|
||||
int? ConfidencePercent,
|
||||
|
@ -1,8 +1,8 @@
|
||||
using System.Text.Json;
|
||||
using System.Text.Json.Serialization;
|
||||
using View_by_Distance.Shared.Models.Stateless;
|
||||
using Phares.Shared.Models.Stateless;
|
||||
|
||||
namespace View_by_Distance.Shared.Models;
|
||||
namespace Phares.Shared.Models;
|
||||
|
||||
public record FacePartAndFacePointArray(FacePart FacePart, FacePoint[] FacePoints)
|
||||
{
|
||||
|
@ -1,7 +1,7 @@
|
||||
using System.Drawing;
|
||||
using System.Text.Json.Serialization;
|
||||
|
||||
namespace View_by_Distance.Shared.Models;
|
||||
namespace Phares.Shared.Models;
|
||||
|
||||
[method: JsonConstructor]
|
||||
public class FacePoint(int index, int x, int y) : Properties.IFacePoint
|
||||
|
@ -2,7 +2,7 @@ using System.Collections.ObjectModel;
|
||||
using System.Text.Json;
|
||||
using System.Text.Json.Serialization;
|
||||
|
||||
namespace View_by_Distance.Shared.Models;
|
||||
namespace Phares.Shared.Models;
|
||||
|
||||
public record FaceRecognitionGroup(Location Location, ReadOnlyCollection<FaceEncoding?> FaceEncodings, ReadOnlyCollection<ReadOnlyCollection<FacePartAndFacePointArray>> FaceParts)
|
||||
{
|
||||
|
@ -1,7 +1,7 @@
|
||||
using System.Text.Json;
|
||||
using System.Text.Json.Serialization;
|
||||
|
||||
namespace View_by_Distance.Shared.Models;
|
||||
namespace Phares.Shared.Models;
|
||||
|
||||
public record FileHolder(DateTime? CreationTime,
|
||||
string? DirectoryFullPath,
|
||||
|
@ -1,7 +1,7 @@
|
||||
using System.Text.Json;
|
||||
using System.Text.Json.Serialization;
|
||||
|
||||
namespace View_by_Distance.Shared.Models;
|
||||
namespace Phares.Shared.Models;
|
||||
|
||||
public record FileMetadataDirectory(DateTime? FileModifiedDate,
|
||||
string? FileName,
|
||||
|
@ -1,8 +1,8 @@
|
||||
using System.Text.Json;
|
||||
using System.Text.Json.Serialization;
|
||||
using View_by_Distance.Shared.Models.Stateless;
|
||||
using Phares.Shared.Models.Stateless;
|
||||
|
||||
namespace View_by_Distance.Shared.Models;
|
||||
namespace Phares.Shared.Models;
|
||||
|
||||
public record FilePath(long CreationTicks,
|
||||
string DirectoryFullPath,
|
||||
|
@ -1,7 +1,7 @@
|
||||
using System.Text.Json;
|
||||
using System.Text.Json.Serialization;
|
||||
|
||||
namespace View_by_Distance.Shared.Models;
|
||||
namespace Phares.Shared.Models;
|
||||
|
||||
public record FilePathAndWholePercentages(FilePath FilePath, int WholePercentages)
|
||||
{
|
||||
|
@ -1,7 +1,7 @@
|
||||
using System.Text.Json;
|
||||
using System.Text.Json.Serialization;
|
||||
|
||||
namespace View_by_Distance.Shared.Models;
|
||||
namespace Phares.Shared.Models;
|
||||
|
||||
public record FirstPass(ExifDirectory ExifDirectory,
|
||||
bool FastForwardMovingPictureExpertsGroupUsed,
|
||||
|
@ -1,7 +1,7 @@
|
||||
using System.Text.Json;
|
||||
using System.Text.Json.Serialization;
|
||||
|
||||
namespace View_by_Distance.Shared.Models;
|
||||
namespace Phares.Shared.Models;
|
||||
|
||||
public record GifHeaderDirectory(string? ImageHeight,
|
||||
string? ImageWidth)
|
||||
|
@ -1,7 +1,7 @@
|
||||
using System.Text.Json;
|
||||
using System.Text.Json.Serialization;
|
||||
|
||||
namespace View_by_Distance.Shared.Models;
|
||||
namespace Phares.Shared.Models;
|
||||
|
||||
public record GpsDirectory(string? Altitude,
|
||||
string? Latitude,
|
||||
|
@ -1,7 +1,7 @@
|
||||
using System.Text.Json;
|
||||
using System.Text.Json.Serialization;
|
||||
|
||||
namespace View_by_Distance.Shared.Models;
|
||||
namespace Phares.Shared.Models;
|
||||
|
||||
public record JpegDirectory(string? ImageHeight,
|
||||
string? ImageWidth)
|
||||
|
@ -1,6 +1,6 @@
|
||||
using System.Text.Json.Serialization;
|
||||
|
||||
namespace View_by_Distance.Shared.Models;
|
||||
namespace Phares.Shared.Models;
|
||||
|
||||
[method: JsonConstructor]
|
||||
public class Location(int bottom, double confidence, int left, int right, int top) : Properties.ILocation, IEquatable<Location>
|
||||
|
@ -1,7 +1,7 @@
|
||||
using System.Text.Json;
|
||||
using System.Text.Json.Serialization;
|
||||
|
||||
namespace View_by_Distance.Shared.Models;
|
||||
namespace Phares.Shared.Models;
|
||||
|
||||
public record LocationContainer(DateOnly? CreationDateOnly,
|
||||
ExifDirectory? ExifDirectory,
|
||||
|
@ -1,7 +1,7 @@
|
||||
using System.Text.Json;
|
||||
using System.Text.Json.Serialization;
|
||||
|
||||
namespace View_by_Distance.Shared.Models;
|
||||
namespace Phares.Shared.Models;
|
||||
|
||||
public record MakernoteDirectory(string? CameraSerialNumber,
|
||||
string? FirmwareVersion,
|
||||
|
@ -1,7 +1,7 @@
|
||||
using System.Text.Json;
|
||||
using System.Text.Json.Serialization;
|
||||
|
||||
namespace View_by_Distance.Shared.Models;
|
||||
namespace Phares.Shared.Models;
|
||||
|
||||
public record MappingFromFilter(bool? IsFocusModel,
|
||||
bool? IsFocusPerson,
|
||||
|
@ -1,7 +1,7 @@
|
||||
using System.Text.Json;
|
||||
using System.Text.Json.Serialization;
|
||||
|
||||
namespace View_by_Distance.Shared.Models;
|
||||
namespace Phares.Shared.Models;
|
||||
|
||||
public record MappingFromFilterPost(bool? CanReMap,
|
||||
bool? InSkipCollection,
|
||||
|
@ -1,7 +1,7 @@
|
||||
using System.Text.Json;
|
||||
using System.Text.Json.Serialization;
|
||||
|
||||
namespace View_by_Distance.Shared.Models;
|
||||
namespace Phares.Shared.Models;
|
||||
|
||||
public record MappingFromPerson(int? ApproximateYears,
|
||||
string DisplayDirectoryName,
|
||||
|
@ -1,7 +1,7 @@
|
||||
using System.Collections.ObjectModel;
|
||||
using System.Globalization;
|
||||
|
||||
namespace View_by_Distance.Shared.Models;
|
||||
namespace Phares.Shared.Models;
|
||||
|
||||
internal static class MetaBase
|
||||
{
|
||||
|
@ -2,7 +2,7 @@ using System.Collections.ObjectModel;
|
||||
using System.Text.Json;
|
||||
using System.Text.Json.Serialization;
|
||||
|
||||
namespace View_by_Distance.Shared.Models;
|
||||
namespace Phares.Shared.Models;
|
||||
|
||||
public record MetadataGroup(bool FastForwardMovingPictureExpertsGroupUsed, FilePath FilePath, MinimumYearAndPathCombined MinimumYearAndPathCombined, ExifDirectory ExifDirectory, ReadOnlyCollection<FileHolder> SidecarFiles)
|
||||
{
|
||||
|
@ -1,7 +1,7 @@
|
||||
using System.Text.Json;
|
||||
using System.Text.Json.Serialization;
|
||||
|
||||
namespace View_by_Distance.Shared.Models;
|
||||
namespace Phares.Shared.Models;
|
||||
|
||||
public record MetadataSettings(bool ForceMetadataLastWriteTimeToCreationTime,
|
||||
string[] IgnoreRulesKeyWords,
|
||||
@ -20,6 +20,6 @@ public record MetadataSettings(bool ForceMetadataLastWriteTimeToCreationTime,
|
||||
|
||||
[JsonSourceGenerationOptions(WriteIndented = true)]
|
||||
[JsonSerializable(typeof(MetadataSettings))]
|
||||
internal partial class MetadataSettingsSourceGenerationContext : JsonSerializerContext
|
||||
public partial class MetadataSettingsSourceGenerationContext : JsonSerializerContext
|
||||
{
|
||||
}
|
@ -1,7 +1,7 @@
|
||||
using System.Text.Json;
|
||||
using System.Text.Json.Serialization;
|
||||
|
||||
namespace View_by_Distance.Shared.Models;
|
||||
namespace Phares.Shared.Models;
|
||||
|
||||
public record MinimumYearAndPathCombined(int MinimumYear,
|
||||
string PathCombined)
|
||||
|
@ -2,7 +2,7 @@ using System.Globalization;
|
||||
using System.Text.Json;
|
||||
using System.Text.Json.Serialization;
|
||||
|
||||
namespace View_by_Distance.Shared.Models;
|
||||
namespace Phares.Shared.Models;
|
||||
|
||||
public record NginxFileSystem([property: JsonPropertyName("name")] string Name,
|
||||
DateTime? LastModified,
|
||||
|
@ -1,4 +1,4 @@
|
||||
namespace View_by_Distance.Shared.Models;
|
||||
namespace Phares.Shared.Models;
|
||||
|
||||
public record OutputResolution(int Height,
|
||||
int Orientation,
|
||||
|
@ -1,7 +1,7 @@
|
||||
using System.Text.Json;
|
||||
using System.Text.Json.Serialization;
|
||||
|
||||
namespace View_by_Distance.Shared.Models;
|
||||
namespace Phares.Shared.Models;
|
||||
|
||||
public record PeopleSettings(string GenealogicalDataCommunicationFile,
|
||||
string[] JLinks,
|
||||
|
@ -1,7 +1,7 @@
|
||||
using System.Text.Json;
|
||||
using System.Text.Json.Serialization;
|
||||
|
||||
namespace View_by_Distance.Shared.Models;
|
||||
namespace Phares.Shared.Models;
|
||||
|
||||
public record PersonBirthday(DateTime Value)
|
||||
{
|
||||
|
@ -1,9 +1,9 @@
|
||||
using System.Collections.ObjectModel;
|
||||
using System.Text.Json;
|
||||
using System.Text.Json.Serialization;
|
||||
using View_by_Distance.Shared.Models.Stateless;
|
||||
using Phares.Shared.Models.Stateless;
|
||||
|
||||
namespace View_by_Distance.Shared.Models;
|
||||
namespace Phares.Shared.Models;
|
||||
|
||||
public record PersonContainer(int? ApproximateYears,
|
||||
PersonBirthday[]? Birthdays,
|
||||
|
@ -1,7 +1,7 @@
|
||||
using System.Text.Json;
|
||||
using System.Text.Json.Serialization;
|
||||
|
||||
namespace View_by_Distance.Shared.Models;
|
||||
namespace Phares.Shared.Models;
|
||||
|
||||
public record PersonDirectory(char Char, string Group, char Status, char Sex, char First)
|
||||
{
|
||||
|
@ -1,7 +1,7 @@
|
||||
using System.Text.Json;
|
||||
using System.Text.Json.Serialization;
|
||||
|
||||
namespace View_by_Distance.Shared.Models;
|
||||
namespace Phares.Shared.Models;
|
||||
|
||||
public record PersonKeyFormattedAndPersonBirthday(string PersonKeyFormatted, PersonBirthday PersonBirthday)
|
||||
{
|
||||
|
@ -1,7 +1,7 @@
|
||||
using System.Text.Json;
|
||||
using System.Text.Json.Serialization;
|
||||
|
||||
namespace View_by_Distance.Shared.Models;
|
||||
namespace Phares.Shared.Models;
|
||||
|
||||
public record PersonKeyFormattedAndKeyTicksAndDisplayDirectoryName(string KeyFormatted,
|
||||
long KeyTicks,
|
||||
|
@ -1,7 +1,7 @@
|
||||
using System.Text.Json;
|
||||
using System.Text.Json.Serialization;
|
||||
|
||||
namespace View_by_Distance.Shared.Models;
|
||||
namespace Phares.Shared.Models;
|
||||
|
||||
public record PhotoshopDirectory(string? JpegQuality,
|
||||
string? Url)
|
||||
|
@ -1,7 +1,7 @@
|
||||
using System.Text.Json;
|
||||
using System.Text.Json.Serialization;
|
||||
|
||||
namespace View_by_Distance.Shared.Models;
|
||||
namespace Phares.Shared.Models;
|
||||
|
||||
public record PngDirectory(string? ImageHeight,
|
||||
string? ImageWidth,
|
||||
|
@ -1,4 +1,4 @@
|
||||
namespace View_by_Distance.Shared.Models.Properties;
|
||||
namespace Phares.Shared.Models.Properties;
|
||||
|
||||
public interface ICompareSettings
|
||||
{
|
||||
|
@ -1,4 +1,4 @@
|
||||
namespace View_by_Distance.Shared.Models.Properties;
|
||||
namespace Phares.Shared.Models.Properties;
|
||||
|
||||
public interface IFaceDistance
|
||||
{
|
||||
|
@ -1,4 +1,4 @@
|
||||
namespace View_by_Distance.Shared.Models.Properties;
|
||||
namespace Phares.Shared.Models.Properties;
|
||||
|
||||
public interface IFacePoint
|
||||
{
|
||||
|
@ -1,4 +1,4 @@
|
||||
namespace View_by_Distance.Shared.Models.Properties;
|
||||
namespace Phares.Shared.Models.Properties;
|
||||
|
||||
public interface ILocation
|
||||
{
|
||||
|
@ -1,4 +1,4 @@
|
||||
namespace View_by_Distance.Shared.Models.Properties;
|
||||
namespace Phares.Shared.Models.Properties;
|
||||
|
||||
public interface IRenameSettings
|
||||
{
|
||||
|
@ -1,4 +1,4 @@
|
||||
namespace View_by_Distance.Shared.Models.Properties;
|
||||
namespace Phares.Shared.Models.Properties;
|
||||
|
||||
public interface IWindowsSettings
|
||||
{
|
||||
|
@ -1,7 +1,7 @@
|
||||
using System.Text.Json;
|
||||
using System.Text.Json.Serialization;
|
||||
|
||||
namespace View_by_Distance.Shared.Models;
|
||||
namespace Phares.Shared.Models;
|
||||
|
||||
public record QuickTimeMovieHeaderDirectory(DateTime? Created)
|
||||
{
|
||||
|
@ -1,7 +1,7 @@
|
||||
using System.Text.Json;
|
||||
using System.Text.Json.Serialization;
|
||||
|
||||
namespace View_by_Distance.Shared.Models;
|
||||
namespace Phares.Shared.Models;
|
||||
|
||||
public record QuickTimeTrackHeaderDirectory(DateTime? Created)
|
||||
{
|
||||
|
@ -2,7 +2,7 @@ using System.Collections.ObjectModel;
|
||||
using System.Text.Json;
|
||||
using System.Text.Json.Serialization;
|
||||
|
||||
namespace View_by_Distance.Shared.Models;
|
||||
namespace Phares.Shared.Models;
|
||||
|
||||
public record ReadOnlyCollections(ReadOnlyCollection<long> JLinkResolvedPersonKeys,
|
||||
ReadOnlyCollection<PersonContainer> PersonContainers,
|
||||
|
@ -1,7 +1,7 @@
|
||||
using System.Text.Json;
|
||||
using System.Text.Json.Serialization;
|
||||
|
||||
namespace View_by_Distance.Shared.Models;
|
||||
namespace Phares.Shared.Models;
|
||||
|
||||
public record ResultSettings(string DateGroup,
|
||||
int EpicYear,
|
||||
@ -29,6 +29,6 @@ public record ResultSettings(string DateGroup,
|
||||
|
||||
[JsonSourceGenerationOptions(WriteIndented = true)]
|
||||
[JsonSerializable(typeof(ResultSettings))]
|
||||
internal partial class ResultSettingsSourceGenerationContext : JsonSerializerContext
|
||||
public partial class ResultSettingsSourceGenerationContext : JsonSerializerContext
|
||||
{
|
||||
}
|
@ -1,7 +1,7 @@
|
||||
using System.Text.Json;
|
||||
using System.Text.Json.Serialization;
|
||||
|
||||
namespace View_by_Distance.Shared.Models;
|
||||
namespace Phares.Shared.Models;
|
||||
|
||||
public record SaveContainer(string CheckFile,
|
||||
string Directory,
|
||||
|
@ -1,4 +1,4 @@
|
||||
namespace View_by_Distance.Shared.Models.Stateless;
|
||||
namespace Phares.Shared.Models.Stateless;
|
||||
|
||||
internal abstract class Age
|
||||
{
|
||||
|
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user