Alignment with Phares 8.0.118.14751 for Shared and Metadata
A_Metadata House Cleaning
This commit is contained in:
@ -89,10 +89,32 @@
|
|||||||
"PropertiesChangedForProperty": false,
|
"PropertiesChangedForProperty": false,
|
||||||
"RootDirectory": "C:/Tmp/Phares/Compare/Images-dd514b88",
|
"RootDirectory": "C:/Tmp/Phares/Compare/Images-dd514b88",
|
||||||
"IgnoreExtensions": [
|
"IgnoreExtensions": [
|
||||||
|
".ffs_db",
|
||||||
|
".FFS_DB",
|
||||||
".gif",
|
".gif",
|
||||||
".GIF",
|
".GIF",
|
||||||
|
".html",
|
||||||
|
".HTML",
|
||||||
|
".ico",
|
||||||
|
".ICO",
|
||||||
|
".json",
|
||||||
|
".JSON",
|
||||||
|
".lnk",
|
||||||
|
".LNK",
|
||||||
|
".lsv",
|
||||||
|
".LSV",
|
||||||
|
".nef",
|
||||||
|
".NEF",
|
||||||
".pdf",
|
".pdf",
|
||||||
".PDF"
|
".PDF",
|
||||||
|
".ts",
|
||||||
|
".TS",
|
||||||
|
".txt",
|
||||||
|
".TXT",
|
||||||
|
".webp",
|
||||||
|
".WEBP",
|
||||||
|
".xmp",
|
||||||
|
".XMP"
|
||||||
],
|
],
|
||||||
"PropertyContentCollectionFiles": [
|
"PropertyContentCollectionFiles": [
|
||||||
"/Images-ec5a909 - Results/A) Property/2022-12-30/[()]/637869381676042455.json",
|
"/Images-ec5a909 - Results/A) Property/2022-12-30/[()]/637869381676042455.json",
|
||||||
@ -117,7 +139,9 @@
|
|||||||
".tiff",
|
".tiff",
|
||||||
".TIFF",
|
".TIFF",
|
||||||
".tif",
|
".tif",
|
||||||
".TIF"
|
".TIF",
|
||||||
|
".webp",
|
||||||
|
".WEBP"
|
||||||
],
|
],
|
||||||
"VerifyToSeason": [
|
"VerifyToSeason": [
|
||||||
". 2000",
|
". 2000",
|
||||||
|
|||||||
@ -90,12 +90,32 @@
|
|||||||
"/zzz Phares Slides/Slides 2015-06-10/Magazine 01"
|
"/zzz Phares Slides/Slides 2015-06-10/Magazine 01"
|
||||||
],
|
],
|
||||||
"IgnoreExtensions": [
|
"IgnoreExtensions": [
|
||||||
|
".ffs_db",
|
||||||
|
".FFS_DB",
|
||||||
".gif",
|
".gif",
|
||||||
".GIF",
|
".GIF",
|
||||||
|
".html",
|
||||||
|
".HTML",
|
||||||
|
".ico",
|
||||||
|
".ICO",
|
||||||
|
".json",
|
||||||
|
".JSON",
|
||||||
|
".lnk",
|
||||||
|
".LNK",
|
||||||
|
".lsv",
|
||||||
|
".LSV",
|
||||||
".nef",
|
".nef",
|
||||||
".NEF",
|
".NEF",
|
||||||
".pdf",
|
".pdf",
|
||||||
".PDF"
|
".PDF",
|
||||||
|
".ts",
|
||||||
|
".TS",
|
||||||
|
".txt",
|
||||||
|
".TXT",
|
||||||
|
".webp",
|
||||||
|
".WEBP",
|
||||||
|
".xmp",
|
||||||
|
".XMP"
|
||||||
],
|
],
|
||||||
"PropertyContentCollectionFiles": [
|
"PropertyContentCollectionFiles": [
|
||||||
"/Images-ec5a909 - Results/A) Property/2022-12-30/[()]/637869381676042455.json",
|
"/Images-ec5a909 - Results/A) Property/2022-12-30/[()]/637869381676042455.json",
|
||||||
@ -120,7 +140,9 @@
|
|||||||
".tiff",
|
".tiff",
|
||||||
".TIFF",
|
".TIFF",
|
||||||
".tif",
|
".tif",
|
||||||
".TIF"
|
".TIF",
|
||||||
|
".webp",
|
||||||
|
".WEBP"
|
||||||
],
|
],
|
||||||
"VerifyToSeason": [
|
"VerifyToSeason": [
|
||||||
". 2000",
|
". 2000",
|
||||||
|
|||||||
@ -71,12 +71,32 @@
|
|||||||
"ResultSingleton": "{}",
|
"ResultSingleton": "{}",
|
||||||
"RootDirectory": "D:/Images",
|
"RootDirectory": "D:/Images",
|
||||||
"IgnoreExtensions": [
|
"IgnoreExtensions": [
|
||||||
|
".ffs_db",
|
||||||
|
".FFS_DB",
|
||||||
".gif",
|
".gif",
|
||||||
".GIF",
|
".GIF",
|
||||||
|
".html",
|
||||||
|
".HTML",
|
||||||
|
".ico",
|
||||||
|
".ICO",
|
||||||
|
".json",
|
||||||
|
".JSON",
|
||||||
|
".lnk",
|
||||||
|
".LNK",
|
||||||
|
".lsv",
|
||||||
|
".LSV",
|
||||||
".nef",
|
".nef",
|
||||||
".NEF",
|
".NEF",
|
||||||
".pdf",
|
".pdf",
|
||||||
".PDF"
|
".PDF",
|
||||||
|
".ts",
|
||||||
|
".TS",
|
||||||
|
".txt",
|
||||||
|
".TXT",
|
||||||
|
".webp",
|
||||||
|
".WEBP",
|
||||||
|
".xmp",
|
||||||
|
".XMP"
|
||||||
],
|
],
|
||||||
"ValidImageFormatExtensions": [
|
"ValidImageFormatExtensions": [
|
||||||
".bmp",
|
".bmp",
|
||||||
@ -92,7 +112,9 @@
|
|||||||
".tiff",
|
".tiff",
|
||||||
".TIFF",
|
".TIFF",
|
||||||
".tif",
|
".tif",
|
||||||
".TIF"
|
".TIF",
|
||||||
|
".webp",
|
||||||
|
".WEBP"
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -70,12 +70,32 @@
|
|||||||
"ResultSingleton": "{}",
|
"ResultSingleton": "{}",
|
||||||
"RootDirectory": "C:/Tmp/phares/Pictures",
|
"RootDirectory": "C:/Tmp/phares/Pictures",
|
||||||
"IgnoreExtensions": [
|
"IgnoreExtensions": [
|
||||||
|
".ffs_db",
|
||||||
|
".FFS_DB",
|
||||||
".gif",
|
".gif",
|
||||||
".GIF",
|
".GIF",
|
||||||
|
".html",
|
||||||
|
".HTML",
|
||||||
|
".ico",
|
||||||
|
".ICO",
|
||||||
|
".json",
|
||||||
|
".JSON",
|
||||||
|
".lnk",
|
||||||
|
".LNK",
|
||||||
|
".lsv",
|
||||||
|
".LSV",
|
||||||
".nef",
|
".nef",
|
||||||
".NEF",
|
".NEF",
|
||||||
".pdf",
|
".pdf",
|
||||||
".PDF"
|
".PDF",
|
||||||
|
".ts",
|
||||||
|
".TS",
|
||||||
|
".txt",
|
||||||
|
".TXT",
|
||||||
|
".webp",
|
||||||
|
".WEBP",
|
||||||
|
".xmp",
|
||||||
|
".XMP"
|
||||||
],
|
],
|
||||||
"PropertyContentCollectionFiles": [],
|
"PropertyContentCollectionFiles": [],
|
||||||
"ValidImageFormatExtensions": [
|
"ValidImageFormatExtensions": [
|
||||||
@ -92,7 +112,9 @@
|
|||||||
".tiff",
|
".tiff",
|
||||||
".TIFF",
|
".TIFF",
|
||||||
".tif",
|
".tif",
|
||||||
".TIF"
|
".TIF",
|
||||||
|
".webp",
|
||||||
|
".WEBP"
|
||||||
],
|
],
|
||||||
"VerifyToSeason": [
|
"VerifyToSeason": [
|
||||||
". 2000",
|
". 2000",
|
||||||
|
|||||||
@ -72,12 +72,32 @@
|
|||||||
"ResultSingleton": "{}",
|
"ResultSingleton": "{}",
|
||||||
"RootDirectory": "C:/Tmp/Phares/Compare/Images-dd514b88",
|
"RootDirectory": "C:/Tmp/Phares/Compare/Images-dd514b88",
|
||||||
"IgnoreExtensions": [
|
"IgnoreExtensions": [
|
||||||
|
".ffs_db",
|
||||||
|
".FFS_DB",
|
||||||
".gif",
|
".gif",
|
||||||
".GIF",
|
".GIF",
|
||||||
|
".html",
|
||||||
|
".HTML",
|
||||||
|
".ico",
|
||||||
|
".ICO",
|
||||||
|
".json",
|
||||||
|
".JSON",
|
||||||
|
".lnk",
|
||||||
|
".LNK",
|
||||||
|
".lsv",
|
||||||
|
".LSV",
|
||||||
".nef",
|
".nef",
|
||||||
".NEF",
|
".NEF",
|
||||||
".pdf",
|
".pdf",
|
||||||
".PDF"
|
".PDF",
|
||||||
|
".ts",
|
||||||
|
".TS",
|
||||||
|
".txt",
|
||||||
|
".TXT",
|
||||||
|
".webp",
|
||||||
|
".WEBP",
|
||||||
|
".xmp",
|
||||||
|
".XMP"
|
||||||
],
|
],
|
||||||
"ValidImageFormatExtensions": [
|
"ValidImageFormatExtensions": [
|
||||||
".bmp",
|
".bmp",
|
||||||
@ -93,7 +113,9 @@
|
|||||||
".tiff",
|
".tiff",
|
||||||
".TIFF",
|
".TIFF",
|
||||||
".tif",
|
".tif",
|
||||||
".TIF"
|
".TIF",
|
||||||
|
".webp",
|
||||||
|
".WEBP"
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -67,12 +67,32 @@
|
|||||||
"ResultSingleton": "{}",
|
"ResultSingleton": "{}",
|
||||||
"RootDirectory": "C:/Tmp/Phares/Compare/Images-dd514b88",
|
"RootDirectory": "C:/Tmp/Phares/Compare/Images-dd514b88",
|
||||||
"IgnoreExtensions": [
|
"IgnoreExtensions": [
|
||||||
|
".ffs_db",
|
||||||
|
".FFS_DB",
|
||||||
".gif",
|
".gif",
|
||||||
".GIF",
|
".GIF",
|
||||||
|
".html",
|
||||||
|
".HTML",
|
||||||
|
".ico",
|
||||||
|
".ICO",
|
||||||
|
".json",
|
||||||
|
".JSON",
|
||||||
|
".lnk",
|
||||||
|
".LNK",
|
||||||
|
".lsv",
|
||||||
|
".LSV",
|
||||||
".nef",
|
".nef",
|
||||||
".NEF",
|
".NEF",
|
||||||
".pdf",
|
".pdf",
|
||||||
".PDF"
|
".PDF",
|
||||||
|
".ts",
|
||||||
|
".TS",
|
||||||
|
".txt",
|
||||||
|
".TXT",
|
||||||
|
".webp",
|
||||||
|
".WEBP",
|
||||||
|
".xmp",
|
||||||
|
".XMP"
|
||||||
],
|
],
|
||||||
"ValidImageFormatExtensions": [
|
"ValidImageFormatExtensions": [
|
||||||
".bmp",
|
".bmp",
|
||||||
@ -88,7 +108,9 @@
|
|||||||
".tiff",
|
".tiff",
|
||||||
".TIFF",
|
".TIFF",
|
||||||
".tif",
|
".tif",
|
||||||
".TIF"
|
".TIF",
|
||||||
|
".webp",
|
||||||
|
".WEBP"
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -229,7 +229,7 @@ public partial class E_Distance : IDistance
|
|||||||
throw new NullReferenceException(nameof(locationContainer.ExifDirectory));
|
throw new NullReferenceException(nameof(locationContainer.ExifDirectory));
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
json = Metadata.Models.Stateless.Methods.IMetadata.GetFaceEncoding(locationContainer.ExifDirectory);
|
json = Metadata.Models.Stateless.Methods.IMetadata.GetRawFaceEncoding(locationContainer.ExifDirectory);
|
||||||
if (json is null)
|
if (json is null)
|
||||||
{
|
{
|
||||||
if (_DistanceMoveUnableToMatch)
|
if (_DistanceMoveUnableToMatch)
|
||||||
@ -338,7 +338,6 @@ public partial class E_Distance : IDistance
|
|||||||
public static ReadOnlyDictionary<int, ReadOnlyDictionary<int, LocationContainer>> GetMappedWithEncoding(ReadOnlyDictionary<int, ReadOnlyDictionary<int, LocationContainer>> mapped)
|
public static ReadOnlyDictionary<int, ReadOnlyDictionary<int, LocationContainer>> GetMappedWithEncoding(ReadOnlyDictionary<int, ReadOnlyDictionary<int, LocationContainer>> mapped)
|
||||||
{
|
{
|
||||||
Dictionary<int, ReadOnlyDictionary<int, LocationContainer>> results = [];
|
Dictionary<int, ReadOnlyDictionary<int, LocationContainer>> results = [];
|
||||||
string? json;
|
|
||||||
LocationContainer? locationContainer;
|
LocationContainer? locationContainer;
|
||||||
Shared.Models.FaceEncoding? faceEncoding;
|
Shared.Models.FaceEncoding? faceEncoding;
|
||||||
FaceRecognitionDotNet.FaceEncoding? encoding;
|
FaceRecognitionDotNet.FaceEncoding? encoding;
|
||||||
@ -348,8 +347,7 @@ public partial class E_Distance : IDistance
|
|||||||
keyValuePairs = [];
|
keyValuePairs = [];
|
||||||
foreach (KeyValuePair<int, LocationContainer> keyValue in keyValuePair.Value)
|
foreach (KeyValuePair<int, LocationContainer> keyValue in keyValuePair.Value)
|
||||||
{
|
{
|
||||||
json = Metadata.Models.Stateless.Methods.IMetadata.GetFaceEncoding(keyValue.Value.ExifDirectory);
|
faceEncoding = Metadata.Models.Stateless.Methods.IMetadata.GetFaceEncoding(keyValue.Value.ExifDirectory);
|
||||||
faceEncoding = json is null ? null : JsonSerializer.Deserialize<Shared.Models.FaceEncoding>(json);
|
|
||||||
if (faceEncoding is null)
|
if (faceEncoding is null)
|
||||||
continue;
|
continue;
|
||||||
encoding = FaceRecognition.LoadFaceEncoding(faceEncoding.RawEncoding);
|
encoding = FaceRecognition.LoadFaceEncoding(faceEncoding.RawEncoding);
|
||||||
@ -364,7 +362,6 @@ public partial class E_Distance : IDistance
|
|||||||
public static List<LocationContainer> GetPreFilterLocationContainer(int maxDegreeOfParallelism, Configuration configuration, string focusDirectory, string focusModel, int? skipPersonWithMoreThen, long ticks, MapLogic mapLogic, long[] jLinkResolvedPersonKeys, ReadOnlyDictionary<int, ReadOnlyDictionary<int, LocationContainer>> mapped, List<LocationContainer> available)
|
public static List<LocationContainer> GetPreFilterLocationContainer(int maxDegreeOfParallelism, Configuration configuration, string focusDirectory, string focusModel, int? skipPersonWithMoreThen, long ticks, MapLogic mapLogic, long[] jLinkResolvedPersonKeys, ReadOnlyDictionary<int, ReadOnlyDictionary<int, LocationContainer>> mapped, List<LocationContainer> available)
|
||||||
{
|
{
|
||||||
List<LocationContainer> results = [];
|
List<LocationContainer> results = [];
|
||||||
string? json;
|
|
||||||
string? model;
|
string? model;
|
||||||
bool? canReMap;
|
bool? canReMap;
|
||||||
bool? isFocusPerson;
|
bool? isFocusPerson;
|
||||||
@ -403,8 +400,7 @@ public partial class E_Distance : IDistance
|
|||||||
if (!locationContainer.FilePath.DirectoryFullPath.Contains(focusDirectory))
|
if (!locationContainer.FilePath.DirectoryFullPath.Contains(focusDirectory))
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
json = Metadata.Models.Stateless.Methods.IMetadata.GetFaceEncoding(locationContainer.ExifDirectory);
|
faceEncoding = Metadata.Models.Stateless.Methods.IMetadata.GetFaceEncoding(locationContainer.ExifDirectory);
|
||||||
faceEncoding = json is null ? null : JsonSerializer.Deserialize<Shared.Models.FaceEncoding>(json);
|
|
||||||
if (faceEncoding is null)
|
if (faceEncoding is null)
|
||||||
continue;
|
continue;
|
||||||
encoding = FaceRecognition.LoadFaceEncoding(faceEncoding.RawEncoding);
|
encoding = FaceRecognition.LoadFaceEncoding(faceEncoding.RawEncoding);
|
||||||
@ -678,16 +674,12 @@ public partial class E_Distance : IDistance
|
|||||||
ReadOnlyCollection<RelationContainer> IDistance.GetRelationContainers(IDistanceLimits distanceLimits, int faceDistancePermyriad, int locationContainerDistanceTake, float locationContainerDistanceTolerance, ReadOnlyCollection<LocationContainer> locationContainers)
|
ReadOnlyCollection<RelationContainer> IDistance.GetRelationContainers(IDistanceLimits distanceLimits, int faceDistancePermyriad, int locationContainerDistanceTake, float locationContainerDistanceTolerance, ReadOnlyCollection<LocationContainer> locationContainers)
|
||||||
{
|
{
|
||||||
ReadOnlyCollection<RelationContainer> result;
|
ReadOnlyCollection<RelationContainer> result;
|
||||||
string? json;
|
|
||||||
List<Record> records = [];
|
List<Record> records = [];
|
||||||
Shared.Models.FaceEncoding? modelsFaceEncoding;
|
Shared.Models.FaceEncoding? modelsFaceEncoding;
|
||||||
FaceRecognitionDotNet.FaceEncoding faceRecognitionDotNetFaceEncoding;
|
FaceRecognitionDotNet.FaceEncoding faceRecognitionDotNetFaceEncoding;
|
||||||
foreach (LocationContainer locationContainer in locationContainers)
|
foreach (LocationContainer locationContainer in locationContainers)
|
||||||
{
|
{
|
||||||
json = Metadata.Models.Stateless.Methods.IMetadata.GetFaceEncoding(locationContainer.ExifDirectory);
|
modelsFaceEncoding = Metadata.Models.Stateless.Methods.IMetadata.GetFaceEncoding(locationContainer.ExifDirectory);
|
||||||
if (json is null)
|
|
||||||
continue;
|
|
||||||
modelsFaceEncoding = JsonSerializer.Deserialize<Shared.Models.FaceEncoding>(json);
|
|
||||||
if (modelsFaceEncoding is null)
|
if (modelsFaceEncoding is null)
|
||||||
throw new NotSupportedException();
|
throw new NotSupportedException();
|
||||||
faceRecognitionDotNetFaceEncoding = FaceRecognition.LoadFaceEncoding(modelsFaceEncoding.RawEncoding);
|
faceRecognitionDotNetFaceEncoding = FaceRecognition.LoadFaceEncoding(modelsFaceEncoding.RawEncoding);
|
||||||
|
|||||||
@ -68,12 +68,32 @@
|
|||||||
"ResultSingleton": "{}",
|
"ResultSingleton": "{}",
|
||||||
"RootDirectory": "C:/Tmp/Phares/Compare/Images-dd514b88",
|
"RootDirectory": "C:/Tmp/Phares/Compare/Images-dd514b88",
|
||||||
"IgnoreExtensions": [
|
"IgnoreExtensions": [
|
||||||
|
".ffs_db",
|
||||||
|
".FFS_DB",
|
||||||
".gif",
|
".gif",
|
||||||
".GIF",
|
".GIF",
|
||||||
|
".html",
|
||||||
|
".HTML",
|
||||||
|
".ico",
|
||||||
|
".ICO",
|
||||||
|
".json",
|
||||||
|
".JSON",
|
||||||
|
".lnk",
|
||||||
|
".LNK",
|
||||||
|
".lsv",
|
||||||
|
".LSV",
|
||||||
".nef",
|
".nef",
|
||||||
".NEF",
|
".NEF",
|
||||||
".pdf",
|
".pdf",
|
||||||
".PDF"
|
".PDF",
|
||||||
|
".ts",
|
||||||
|
".TS",
|
||||||
|
".txt",
|
||||||
|
".TXT",
|
||||||
|
".webp",
|
||||||
|
".WEBP",
|
||||||
|
".xmp",
|
||||||
|
".XMP"
|
||||||
],
|
],
|
||||||
"ValidImageFormatExtensions": [
|
"ValidImageFormatExtensions": [
|
||||||
".bmp",
|
".bmp",
|
||||||
@ -89,7 +109,9 @@
|
|||||||
".tiff",
|
".tiff",
|
||||||
".TIFF",
|
".TIFF",
|
||||||
".tif",
|
".tif",
|
||||||
".TIF"
|
".TIF",
|
||||||
|
".webp",
|
||||||
|
".WEBP"
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -475,7 +475,7 @@ public class D_Face : IFaceD
|
|||||||
dFace.ReSaveFace(exifDirectory, filePath, face, mappedFile: false);
|
dFace.ReSaveFace(exifDirectory, filePath, face, mappedFile: false);
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
location = Shared.Models.Stateless.Methods.ILocation.GetLocation(face.Location, Shared.Models.Stateless.ILocation.Digits, Shared.Models.Stateless.ILocation.Factor, source.Height, source.Width, collection.Count);
|
location = Shared.Models.Stateless.Methods.ILocation.GetLocation(face.Location, source.Height, source.Width, collection.Count);
|
||||||
if (location is null)
|
if (location is null)
|
||||||
continue;
|
continue;
|
||||||
width = location.Right - location.Left;
|
width = location.Right - location.Left;
|
||||||
@ -506,7 +506,7 @@ public class D_Face : IFaceD
|
|||||||
}
|
}
|
||||||
if (File.Exists(fileName))
|
if (File.Exists(fileName))
|
||||||
File.Delete(fileName);
|
File.Delete(fileName);
|
||||||
location = Shared.Models.Stateless.Methods.ILocation.GetLocation(_FaceDistanceHiddenImageFactor, face.Location, Shared.Models.Stateless.ILocation.Digits, Shared.Models.Stateless.ILocation.Factor, source.Height, source.Width, collection.Count);
|
location = Shared.Models.Stateless.Methods.ILocation.GetLocation(_FaceDistanceHiddenImageFactor, face.Location, source.Height, source.Width, collection.Count);
|
||||||
if (location is null)
|
if (location is null)
|
||||||
continue;
|
continue;
|
||||||
width = location.Right - location.Left;
|
width = location.Right - location.Left;
|
||||||
|
|||||||
@ -31,6 +31,8 @@ public partial class DlibDotNet : IDlibDotNet, IDisposable
|
|||||||
ReadOnlyCollection<ReadOnlyCollection<FilePath>> FilePathsCollection,
|
ReadOnlyCollection<ReadOnlyCollection<FilePath>> FilePathsCollection,
|
||||||
ReadOnlyDictionary<int, Identifier>? SplatNineIdentifiers);
|
ReadOnlyDictionary<int, Identifier>? SplatNineIdentifiers);
|
||||||
|
|
||||||
|
public int? CurrentTick =>
|
||||||
|
_ProgressBar?.CurrentTick;
|
||||||
public long Ticks { get; init; }
|
public long Ticks { get; init; }
|
||||||
|
|
||||||
private readonly D_Face _Faces;
|
private readonly D_Face _Faces;
|
||||||
@ -1314,7 +1316,7 @@ public partial class DlibDotNet : IDlibDotNet, IDisposable
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (items.Count > 0)
|
if (items.Count > 0)
|
||||||
throw new Exception($"{items.Count} item(s) of {count} item(s) are not setup!");
|
throw new Exception($"{items.Count} item(s) of {count} item(s) are not setup!{Environment.NewLine}{string.Join(Environment.NewLine, items.Select(l => l.FilePath.FileNameFirstSegment))}");
|
||||||
}
|
}
|
||||||
|
|
||||||
private Record GetFilesCollectionThenCopyOrMove(IDlibDotNet dlibDotNet, B_Metadata metadata, string fileSearchFilter, string directorySearchFilter, string bResultsFullGroupDirectory, string outputResolution)
|
private Record GetFilesCollectionThenCopyOrMove(IDlibDotNet dlibDotNet, B_Metadata metadata, string fileSearchFilter, string directorySearchFilter, string bResultsFullGroupDirectory, string outputResolution)
|
||||||
|
|||||||
@ -64,20 +64,19 @@ internal abstract class FaceFileLogic
|
|||||||
exifDirectory = Metadata.Models.Stateless.Methods.IMetadata.GetExifDirectory(mappedFile.FilePath);
|
exifDirectory = Metadata.Models.Stateless.Methods.IMetadata.GetExifDirectory(mappedFile.FilePath);
|
||||||
RectangleF? rectangle = ILocation.GetPercentagesRectangle(configuration.LocationDigits, wholePercentages.Value);
|
RectangleF? rectangle = ILocation.GetPercentagesRectangle(configuration.LocationDigits, wholePercentages.Value);
|
||||||
personDisplayDirectoryName = mappedFile.PersonDisplayDirectoryName is null ? configuration.MappingDefaultName : mappedFile.PersonDisplayDirectoryName;
|
personDisplayDirectoryName = mappedFile.PersonDisplayDirectoryName is null ? configuration.MappingDefaultName : mappedFile.PersonDisplayDirectoryName;
|
||||||
LocationContainer locationContainer = new(dateOnly,
|
LocationContainer locationContainer = new(CreationDateOnly: dateOnly,
|
||||||
exifDirectory,
|
ExifDirectory: exifDirectory,
|
||||||
mappedFile.DirectoryNumber,
|
DirectoryNumber: mappedFile.DirectoryNumber,
|
||||||
personDisplayDirectoryName,
|
DisplayDirectoryName: personDisplayDirectoryName,
|
||||||
null,
|
Encoding: null,
|
||||||
null,
|
FaceFile: null,
|
||||||
mappedFile.FilePath,
|
FilePath: mappedFile.FilePath,
|
||||||
fromDistanceContent,
|
FromDistanceContent: fromDistanceContent,
|
||||||
id.Value,
|
Id: id.Value,
|
||||||
null,
|
LengthPermyriad: null,
|
||||||
null,
|
LengthSource: null,
|
||||||
mappedFile.PersonKey,
|
PersonKey: mappedFile.PersonKey,
|
||||||
rectangle,
|
WholePercentages: wholePercentages.Value);
|
||||||
wholePercentages.Value);
|
|
||||||
lock (locationContainers)
|
lock (locationContainers)
|
||||||
locationContainers.Add(locationContainer);
|
locationContainers.Add(locationContainer);
|
||||||
}
|
}
|
||||||
@ -167,23 +166,19 @@ internal abstract class FaceFileLogic
|
|||||||
MoveUnableToMatch(filePath);
|
MoveUnableToMatch(filePath);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
RectangleF? rectangle = ILocation.GetPercentagesRectangle(configuration.LocationDigits, wholePercentages.Value);
|
LocationContainer locationContainer = new(CreationDateOnly: dateOnly,
|
||||||
if (rectangle is null)
|
ExifDirectory: exifDirectory,
|
||||||
return;
|
DirectoryNumber: null,
|
||||||
LocationContainer locationContainer = new(dateOnly,
|
DisplayDirectoryName: null,
|
||||||
exifDirectory,
|
Encoding: null,
|
||||||
null,
|
FaceFile: faceFile,
|
||||||
null,
|
FilePath: filePath,
|
||||||
null,
|
FromDistanceContent: fromDistanceContent,
|
||||||
faceFile,
|
Id: filePath.Id.Value,
|
||||||
filePath,
|
LengthPermyriad: null,
|
||||||
fromDistanceContent,
|
LengthSource: null,
|
||||||
filePath.Id.Value,
|
PersonKey: null,
|
||||||
null,
|
WholePercentages: wholePercentages.Value);
|
||||||
null,
|
|
||||||
null,
|
|
||||||
rectangle,
|
|
||||||
wholePercentages.Value);
|
|
||||||
lock (locationContainers)
|
lock (locationContainers)
|
||||||
locationContainers.Add(locationContainer);
|
locationContainers.Add(locationContainer);
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1152,22 +1152,20 @@ internal abstract class MapLogic
|
|||||||
exifDirectory = null;
|
exifDirectory = null;
|
||||||
else
|
else
|
||||||
exifDirectory = Metadata.Models.Stateless.Methods.IMetadata.GetExifDirectory(mappedFile.FilePath);
|
exifDirectory = Metadata.Models.Stateless.Methods.IMetadata.GetExifDirectory(mappedFile.FilePath);
|
||||||
RectangleF? rectangle = ILocation.GetPercentagesRectangle(configuration.LocationDigits, wholePercentages.Value);
|
|
||||||
personDisplayDirectoryName = mappedFile.PersonDisplayDirectoryName is null ? configuration.MappingDefaultName : mappedFile.PersonDisplayDirectoryName;
|
personDisplayDirectoryName = mappedFile.PersonDisplayDirectoryName is null ? configuration.MappingDefaultName : mappedFile.PersonDisplayDirectoryName;
|
||||||
LocationContainer locationContainer = new(dateOnly,
|
LocationContainer locationContainer = new(CreationDateOnly: dateOnly,
|
||||||
exifDirectory,
|
ExifDirectory: exifDirectory,
|
||||||
mappedFile.DirectoryNumber,
|
DirectoryNumber: mappedFile.DirectoryNumber,
|
||||||
personDisplayDirectoryName,
|
DisplayDirectoryName: personDisplayDirectoryName,
|
||||||
null,
|
Encoding: null,
|
||||||
null,
|
FaceFile: null,
|
||||||
mappedFile.FilePath,
|
FilePath: mappedFile.FilePath,
|
||||||
fromDistanceContent,
|
FromDistanceContent: fromDistanceContent,
|
||||||
id.Value,
|
Id: id.Value,
|
||||||
null,
|
LengthPermyriad: null,
|
||||||
null,
|
LengthSource: null,
|
||||||
mappedFile.PersonKey,
|
PersonKey: mappedFile.PersonKey,
|
||||||
rectangle,
|
WholePercentages: wholePercentages.Value);
|
||||||
wholePercentages.Value);
|
|
||||||
lock (locationContainers)
|
lock (locationContainers)
|
||||||
locationContainers.Add(locationContainer);
|
locationContainers.Add(locationContainer);
|
||||||
}
|
}
|
||||||
@ -1192,12 +1190,18 @@ internal abstract class MapLogic
|
|||||||
if (item.WholePercentages == locationContainer.WholePercentages)
|
if (item.WholePercentages == locationContainer.WholePercentages)
|
||||||
continue;
|
continue;
|
||||||
itemPercentagesRectangle = ILocation.GetPercentagesRectangle(configuration.LocationDigits, item.WholePercentages);
|
itemPercentagesRectangle = ILocation.GetPercentagesRectangle(configuration.LocationDigits, item.WholePercentages);
|
||||||
if (itemPercentagesRectangle is null || locationContainer.Rectangle is null)
|
if (itemPercentagesRectangle is null)
|
||||||
percent = null;
|
percent = null;
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
itemPercentagesArea = itemPercentagesRectangle.Value.Width * itemPercentagesRectangle.Value.Height;
|
RectangleF? rectangle = ILocation.GetPercentagesRectangle(configuration.LocationDigits, item.WholePercentages);
|
||||||
percent = ILocation.GetIntersectPercent(itemPercentagesRectangle.Value, itemPercentagesArea, locationContainer.Rectangle.Value);
|
if (rectangle is null)
|
||||||
|
percent = null;
|
||||||
|
else
|
||||||
|
{
|
||||||
|
itemPercentagesArea = itemPercentagesRectangle.Value.Width * itemPercentagesRectangle.Value.Height;
|
||||||
|
percent = ILocation.GetIntersectPercent(itemPercentagesRectangle.Value, itemPercentagesArea, rectangle.Value);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
delete.Add(item.FilePath);
|
delete.Add(item.FilePath);
|
||||||
delete.Add(locationContainer.FilePath);
|
delete.Add(locationContainer.FilePath);
|
||||||
|
|||||||
@ -68,12 +68,32 @@
|
|||||||
"ResultSingleton": "{}",
|
"ResultSingleton": "{}",
|
||||||
"RootDirectory": "D:/Images",
|
"RootDirectory": "D:/Images",
|
||||||
"IgnoreExtensions": [
|
"IgnoreExtensions": [
|
||||||
|
".ffs_db",
|
||||||
|
".FFS_DB",
|
||||||
".gif",
|
".gif",
|
||||||
".GIF",
|
".GIF",
|
||||||
|
".html",
|
||||||
|
".HTML",
|
||||||
|
".ico",
|
||||||
|
".ICO",
|
||||||
|
".json",
|
||||||
|
".JSON",
|
||||||
|
".lnk",
|
||||||
|
".LNK",
|
||||||
|
".lsv",
|
||||||
|
".LSV",
|
||||||
".nef",
|
".nef",
|
||||||
".NEF",
|
".NEF",
|
||||||
".pdf",
|
".pdf",
|
||||||
".PDF"
|
".PDF",
|
||||||
|
".ts",
|
||||||
|
".TS",
|
||||||
|
".txt",
|
||||||
|
".TXT",
|
||||||
|
".webp",
|
||||||
|
".WEBP",
|
||||||
|
".xmp",
|
||||||
|
".XMP"
|
||||||
],
|
],
|
||||||
"ValidImageFormatExtensions": [
|
"ValidImageFormatExtensions": [
|
||||||
".bmp",
|
".bmp",
|
||||||
@ -89,7 +109,9 @@
|
|||||||
".tiff",
|
".tiff",
|
||||||
".TIFF",
|
".TIFF",
|
||||||
".tif",
|
".tif",
|
||||||
".TIF"
|
".TIF",
|
||||||
|
".webp",
|
||||||
|
".WEBP"
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -28,22 +28,24 @@ internal abstract class Exif
|
|||||||
private static Shared.Models.AviDirectory[] GetAviDirectories(IReadOnlyList<MetadataExtractor.Directory> directories)
|
private static Shared.Models.AviDirectory[] GetAviDirectories(IReadOnlyList<MetadataExtractor.Directory> directories)
|
||||||
{
|
{
|
||||||
List<Shared.Models.AviDirectory> results = [];
|
List<Shared.Models.AviDirectory> results = [];
|
||||||
|
Shared.Models.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();
|
||||||
}
|
}
|
||||||
@ -51,72 +53,73 @@ internal abstract class Exif
|
|||||||
private static Shared.Models.ExifDirectoryBase[] GetExifBaseDirectories(IReadOnlyList<MetadataExtractor.Directory> directories)
|
private static Shared.Models.ExifDirectoryBase[] GetExifBaseDirectories(IReadOnlyList<MetadataExtractor.Directory> directories)
|
||||||
{
|
{
|
||||||
List<Shared.Models.ExifDirectoryBase> results = [];
|
List<Shared.Models.ExifDirectoryBase> results = [];
|
||||||
|
Shared.Models.ExifDirectoryBase exifDirectoryBase;
|
||||||
IEnumerable<ExifDirectoryBase> exifBaseDirectories = directories.OfType<ExifDirectoryBase>();
|
IEnumerable<ExifDirectoryBase> exifBaseDirectories = directories.OfType<ExifDirectoryBase>();
|
||||||
foreach (ExifDirectoryBase exifDirectoryBase in exifBaseDirectories)
|
foreach (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(ExifDirectoryBase.TagAperture);
|
||||||
string? applicationNotes = exifDirectoryBase.GetDescription(ExifDirectoryBase.TagApplicationNotes);
|
string? applicationNotes = e.GetDescription(ExifDirectoryBase.TagApplicationNotes);
|
||||||
string? artist = exifDirectoryBase.GetDescription(ExifDirectoryBase.TagArtist);
|
string? artist = e.GetDescription(ExifDirectoryBase.TagArtist);
|
||||||
string? bitsPerSample = exifDirectoryBase.GetDescription(ExifDirectoryBase.TagBitsPerSample);
|
string? bitsPerSample = e.GetDescription(ExifDirectoryBase.TagBitsPerSample);
|
||||||
string? bodySerialNumber = exifDirectoryBase.GetDescription(ExifDirectoryBase.TagBodySerialNumber);
|
string? bodySerialNumber = e.GetDescription(ExifDirectoryBase.TagBodySerialNumber);
|
||||||
string? cameraOwnerName = exifDirectoryBase.GetDescription(ExifDirectoryBase.TagCameraOwnerName);
|
string? cameraOwnerName = e.GetDescription(ExifDirectoryBase.TagCameraOwnerName);
|
||||||
string? compressedAverageBitsPerPixel = exifDirectoryBase.GetDescription(ExifDirectoryBase.TagCompressedAverageBitsPerPixel);
|
string? compressedAverageBitsPerPixel = e.GetDescription(ExifDirectoryBase.TagCompressedAverageBitsPerPixel);
|
||||||
string? compression = exifDirectoryBase.GetDescription(ExifDirectoryBase.TagCompression);
|
string? compression = e.GetDescription(ExifDirectoryBase.TagCompression);
|
||||||
string? copyright = exifDirectoryBase.GetDescription(ExifDirectoryBase.TagCopyright);
|
string? copyright = e.GetDescription(ExifDirectoryBase.TagCopyright);
|
||||||
string? documentName = exifDirectoryBase.GetDescription(ExifDirectoryBase.TagDocumentName);
|
string? documentName = e.GetDescription(ExifDirectoryBase.TagDocumentName);
|
||||||
string? exifVersion = exifDirectoryBase.GetDescription(ExifDirectoryBase.TagExifVersion);
|
string? exifVersion = e.GetDescription(ExifDirectoryBase.TagExifVersion);
|
||||||
string? exposureTime = exifDirectoryBase.GetDescription(ExifDirectoryBase.TagExposureTime);
|
string? exposureTime = e.GetDescription(ExifDirectoryBase.TagExposureTime);
|
||||||
string? fileSource = exifDirectoryBase.GetDescription(ExifDirectoryBase.TagFileSource);
|
string? fileSource = e.GetDescription(ExifDirectoryBase.TagFileSource);
|
||||||
string? imageDescription = exifDirectoryBase.GetDescription(ExifDirectoryBase.TagImageDescription);
|
string? imageDescription = e.GetDescription(ExifDirectoryBase.TagImageDescription);
|
||||||
string? imageHeight = exifDirectoryBase.GetDescription(ExifDirectoryBase.TagImageHeight);
|
string? imageHeight = e.GetDescription(ExifDirectoryBase.TagImageHeight);
|
||||||
int? imageHeightValue = imageHeight is null ? null : exifDirectoryBase.GetInt32(ExifDirectoryBase.TagImageHeight);
|
int? imageHeightValue = imageHeight is null ? null : e.GetInt32(ExifDirectoryBase.TagImageHeight);
|
||||||
string? imageNumber = exifDirectoryBase.GetDescription(ExifDirectoryBase.TagImageNumber);
|
string? imageNumber = e.GetDescription(ExifDirectoryBase.TagImageNumber);
|
||||||
string? imageUniqueId = exifDirectoryBase.GetDescription(ExifDirectoryBase.TagImageUniqueId);
|
string? imageUniqueId = e.GetDescription(ExifDirectoryBase.TagImageUniqueId);
|
||||||
string? imageWidth = exifDirectoryBase.GetDescription(ExifDirectoryBase.TagImageWidth);
|
string? imageWidth = e.GetDescription(ExifDirectoryBase.TagImageWidth);
|
||||||
int? imageWidthValue = imageWidth is null ? null : exifDirectoryBase.GetInt32(ExifDirectoryBase.TagImageWidth);
|
int? imageWidthValue = imageWidth is null ? null : e.GetInt32(ExifDirectoryBase.TagImageWidth);
|
||||||
string? isoSpeed = exifDirectoryBase.GetDescription(ExifDirectoryBase.TagIsoSpeed);
|
string? isoSpeed = e.GetDescription(ExifDirectoryBase.TagIsoSpeed);
|
||||||
string? lensMake = exifDirectoryBase.GetDescription(ExifDirectoryBase.TagLensMake);
|
string? lensMake = e.GetDescription(ExifDirectoryBase.TagLensMake);
|
||||||
string? lensModel = exifDirectoryBase.GetDescription(ExifDirectoryBase.TagLensModel);
|
string? lensModel = e.GetDescription(ExifDirectoryBase.TagLensModel);
|
||||||
string? lensSerialNumber = exifDirectoryBase.GetDescription(ExifDirectoryBase.TagLensSerialNumber);
|
string? lensSerialNumber = e.GetDescription(ExifDirectoryBase.TagLensSerialNumber);
|
||||||
string? make = exifDirectoryBase.GetDescription(ExifDirectoryBase.TagMake);
|
string? make = e.GetDescription(ExifDirectoryBase.TagMake);
|
||||||
string? makerNote = exifDirectoryBase.GetDescription(ExifDirectoryBase.TagMakernote);
|
string? makerNote = e.GetDescription(ExifDirectoryBase.TagMakernote);
|
||||||
string? model = exifDirectoryBase.GetDescription(ExifDirectoryBase.TagModel);
|
string? model = e.GetDescription(ExifDirectoryBase.TagModel);
|
||||||
string? orientation = exifDirectoryBase.GetDescription(ExifDirectoryBase.TagOrientation);
|
string? orientation = e.GetDescription(ExifDirectoryBase.TagOrientation);
|
||||||
int? orientationValue = orientation is null ? null : exifDirectoryBase.GetInt32(ExifDirectoryBase.TagOrientation);
|
int? orientationValue = orientation is null ? null : e.GetInt32(ExifDirectoryBase.TagOrientation);
|
||||||
string? rating = exifDirectoryBase.GetDescription(ExifDirectoryBase.TagRating);
|
string? rating = e.GetDescription(ExifDirectoryBase.TagRating);
|
||||||
string? ratingPercent = exifDirectoryBase.GetDescription(ExifDirectoryBase.TagRatingPercent);
|
string? ratingPercent = e.GetDescription(ExifDirectoryBase.TagRatingPercent);
|
||||||
string? securityClassification = exifDirectoryBase.GetDescription(ExifDirectoryBase.TagSecurityClassification);
|
string? securityClassification = e.GetDescription(ExifDirectoryBase.TagSecurityClassification);
|
||||||
string? shutterSpeed = exifDirectoryBase.GetDescription(ExifDirectoryBase.TagShutterSpeed);
|
string? shutterSpeed = e.GetDescription(ExifDirectoryBase.TagShutterSpeed);
|
||||||
string? software = exifDirectoryBase.GetDescription(ExifDirectoryBase.TagSoftware);
|
string? software = e.GetDescription(ExifDirectoryBase.TagSoftware);
|
||||||
string? timeZone = exifDirectoryBase.GetDescription(ExifDirectoryBase.TagTimeZone);
|
string? timeZone = e.GetDescription(ExifDirectoryBase.TagTimeZone);
|
||||||
string? timeZoneDigitized = exifDirectoryBase.GetDescription(ExifDirectoryBase.TagTimeZoneDigitized);
|
string? timeZoneDigitized = e.GetDescription(ExifDirectoryBase.TagTimeZoneDigitized);
|
||||||
string? timeZoneOriginal = exifDirectoryBase.GetDescription(ExifDirectoryBase.TagTimeZoneOriginal);
|
string? timeZoneOriginal = e.GetDescription(ExifDirectoryBase.TagTimeZoneOriginal);
|
||||||
string? userComment = exifDirectoryBase.GetDescription(ExifDirectoryBase.TagUserComment);
|
string? userComment = e.GetDescription(ExifDirectoryBase.TagUserComment);
|
||||||
string? winAuthor = exifDirectoryBase.GetDescription(ExifDirectoryBase.TagWinAuthor);
|
string? winAuthor = e.GetDescription(ExifDirectoryBase.TagWinAuthor);
|
||||||
string? winComment = exifDirectoryBase.GetDescription(ExifDirectoryBase.TagWinComment);
|
string? winComment = e.GetDescription(ExifDirectoryBase.TagWinComment);
|
||||||
string? winKeywords = exifDirectoryBase.GetDescription(ExifDirectoryBase.TagWinKeywords);
|
string? winKeywords = e.GetDescription(ExifDirectoryBase.TagWinKeywords);
|
||||||
string? winSubject = exifDirectoryBase.GetDescription(ExifDirectoryBase.TagWinSubject);
|
string? winSubject = e.GetDescription(ExifDirectoryBase.TagWinSubject);
|
||||||
string? winTitle = exifDirectoryBase.GetDescription(ExifDirectoryBase.TagWinTitle);
|
string? winTitle = e.GetDescription(ExifDirectoryBase.TagWinTitle);
|
||||||
string? xResolution = exifDirectoryBase.GetDescription(ExifDirectoryBase.TagXResolution);
|
string? xResolution = e.GetDescription(ExifDirectoryBase.TagXResolution);
|
||||||
string? yResolution = exifDirectoryBase.GetDescription(ExifDirectoryBase.TagYResolution);
|
string? yResolution = e.GetDescription(ExifDirectoryBase.TagYResolution);
|
||||||
if (exifDirectoryBase.TryGetDateTime(ExifDirectoryBase.TagDateTime, out checkDateTime))
|
if (e.TryGetDateTime(ExifDirectoryBase.TagDateTime, out checkDateTime))
|
||||||
dateTime = checkDateTime;
|
dateTime = checkDateTime;
|
||||||
else
|
else
|
||||||
dateTime = GetDateTime(exifDirectoryBase.GetString(ExifDirectoryBase.TagDateTime));
|
dateTime = GetDateTime(e.GetString(ExifDirectoryBase.TagDateTime));
|
||||||
if (exifDirectoryBase.TryGetDateTime(ExifDirectoryBase.TagDateTimeOriginal, out checkDateTime))
|
if (e.TryGetDateTime(ExifDirectoryBase.TagDateTimeOriginal, out checkDateTime))
|
||||||
dateTimeOriginal = checkDateTime;
|
dateTimeOriginal = checkDateTime;
|
||||||
else
|
else
|
||||||
dateTimeOriginal = GetDateTime(exifDirectoryBase.GetString(ExifDirectoryBase.TagDateTimeOriginal));
|
dateTimeOriginal = GetDateTime(e.GetString(ExifDirectoryBase.TagDateTimeOriginal));
|
||||||
if (exifDirectoryBase.TryGetDateTime(ExifDirectoryBase.TagDateTimeDigitized, out checkDateTime))
|
if (e.TryGetDateTime(ExifDirectoryBase.TagDateTimeDigitized, out checkDateTime))
|
||||||
dateTimeDigitized = checkDateTime;
|
dateTimeDigitized = checkDateTime;
|
||||||
else
|
else
|
||||||
dateTimeDigitized = GetDateTime(exifDirectoryBase.GetString(ExifDirectoryBase.TagDateTimeDigitized));
|
dateTimeDigitized = GetDateTime(e.GetString(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
|
||||||
@ -166,54 +169,55 @@ 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,
|
||||||
BodySerialNumber: bodySerialNumber,
|
BodySerialNumber: bodySerialNumber,
|
||||||
CameraOwnerName: cameraOwnerName,
|
CameraOwnerName: cameraOwnerName,
|
||||||
CompressedAverageBitsPerPixel: compressedAverageBitsPerPixel,
|
CompressedAverageBitsPerPixel: compressedAverageBitsPerPixel,
|
||||||
Compression: compression,
|
Compression: compression,
|
||||||
Copyright: copyright,
|
Copyright: copyright,
|
||||||
DateTime: dateTime,
|
DateTime: dateTime,
|
||||||
DateTimeDigitized: dateTimeDigitized,
|
DateTimeDigitized: dateTimeDigitized,
|
||||||
DateTimeOriginal: dateTimeOriginal,
|
DateTimeOriginal: dateTimeOriginal,
|
||||||
DocumentName: documentName,
|
DocumentName: documentName,
|
||||||
ExifVersion: exifVersion,
|
ExifVersion: exifVersion,
|
||||||
ExposureTime: exposureTime,
|
ExposureTime: exposureTime,
|
||||||
FileSource: fileSource,
|
FileSource: fileSource,
|
||||||
ImageDescription: imageDescription,
|
ImageDescription: imageDescription,
|
||||||
ImageHeight: imageHeight,
|
ImageHeight: imageHeight,
|
||||||
ImageHeightValue: imageHeightValue,
|
ImageHeightValue: imageHeightValue,
|
||||||
ImageNumber: imageNumber,
|
ImageNumber: imageNumber,
|
||||||
ImageUniqueId: imageUniqueId,
|
ImageUniqueId: imageUniqueId,
|
||||||
ImageWidth: imageWidth,
|
ImageWidth: imageWidth,
|
||||||
ImageWidthValue: imageWidthValue,
|
ImageWidthValue: imageWidthValue,
|
||||||
IsoSpeed: isoSpeed,
|
IsoSpeed: isoSpeed,
|
||||||
LensMake: lensMake,
|
LensMake: lensMake,
|
||||||
LensModel: lensModel,
|
LensModel: lensModel,
|
||||||
LensSerialNumber: lensSerialNumber,
|
LensSerialNumber: lensSerialNumber,
|
||||||
Make: make,
|
Make: make,
|
||||||
MakerNote: makerNote,
|
MakerNote: makerNote,
|
||||||
Model: model,
|
Model: model,
|
||||||
Orientation: orientation,
|
Orientation: orientation,
|
||||||
OrientationValue: orientationValue,
|
OrientationValue: orientationValue,
|
||||||
Rating: rating,
|
Rating: rating,
|
||||||
RatingPercent: ratingPercent,
|
RatingPercent: ratingPercent,
|
||||||
SecurityClassification: securityClassification,
|
SecurityClassification: securityClassification,
|
||||||
ShutterSpeed: shutterSpeed,
|
ShutterSpeed: shutterSpeed,
|
||||||
Software: software,
|
Software: software,
|
||||||
TimeZone: timeZone,
|
TimeZone: timeZone,
|
||||||
TimeZoneDigitized: timeZoneDigitized,
|
TimeZoneDigitized: timeZoneDigitized,
|
||||||
TimeZoneOriginal: timeZoneOriginal,
|
TimeZoneOriginal: timeZoneOriginal,
|
||||||
UserComment: userComment,
|
UserComment: userComment,
|
||||||
WinAuthor: winAuthor,
|
WinAuthor: winAuthor,
|
||||||
WinComment: winComment,
|
WinComment: winComment,
|
||||||
WinKeywords: winKeywords,
|
WinKeywords: winKeywords,
|
||||||
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();
|
||||||
}
|
}
|
||||||
@ -221,23 +225,25 @@ internal abstract class Exif
|
|||||||
private static Shared.Models.FileMetadataDirectory[] GetFileMetadataDirectories(string file, IReadOnlyList<MetadataExtractor.Directory> directories)
|
private static Shared.Models.FileMetadataDirectory[] GetFileMetadataDirectories(string file, IReadOnlyList<MetadataExtractor.Directory> directories)
|
||||||
{
|
{
|
||||||
List<Shared.Models.FileMetadataDirectory> results = [];
|
List<Shared.Models.FileMetadataDirectory> results = [];
|
||||||
|
Shared.Models.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();
|
||||||
}
|
}
|
||||||
@ -245,16 +251,18 @@ internal abstract class Exif
|
|||||||
private static Shared.Models.GifHeaderDirectory[] GetGifHeaderDirectories(IReadOnlyList<MetadataExtractor.Directory> directories)
|
private static Shared.Models.GifHeaderDirectory[] GetGifHeaderDirectories(IReadOnlyList<MetadataExtractor.Directory> directories)
|
||||||
{
|
{
|
||||||
List<Shared.Models.GifHeaderDirectory> results = [];
|
List<Shared.Models.GifHeaderDirectory> results = [];
|
||||||
|
Shared.Models.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();
|
||||||
}
|
}
|
||||||
@ -262,29 +270,31 @@ internal abstract class Exif
|
|||||||
private static Shared.Models.GpsDirectory[] GetGpsDirectories(IReadOnlyList<MetadataExtractor.Directory> directories)
|
private static Shared.Models.GpsDirectory[] GetGpsDirectories(IReadOnlyList<MetadataExtractor.Directory> directories)
|
||||||
{
|
{
|
||||||
List<Shared.Models.GpsDirectory> results = [];
|
List<Shared.Models.GpsDirectory> results = [];
|
||||||
|
Shared.Models.GpsDirectory gpsDirectory;
|
||||||
IEnumerable<GpsDirectory> gpsDirectories = directories.OfType<GpsDirectory>();
|
IEnumerable<GpsDirectory> gpsDirectories = directories.OfType<GpsDirectory>();
|
||||||
foreach (GpsDirectory gpsDirectory in gpsDirectories)
|
foreach (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(GpsDirectory.TagAltitude);
|
||||||
string? latitude = gpsDirectory.GetDescription(GpsDirectory.TagLatitude);
|
string? latitude = g.GetDescription(GpsDirectory.TagLatitude);
|
||||||
string? latitudeRef = gpsDirectory.GetDescription(GpsDirectory.TagLatitudeRef);
|
string? latitudeRef = g.GetDescription(GpsDirectory.TagLatitudeRef);
|
||||||
string? longitude = gpsDirectory.GetDescription(GpsDirectory.TagLongitude);
|
string? longitude = g.GetDescription(GpsDirectory.TagLongitude);
|
||||||
string? longitudeRef = gpsDirectory.GetDescription(GpsDirectory.TagLongitudeRef);
|
string? longitudeRef = g.GetDescription(GpsDirectory.TagLongitudeRef);
|
||||||
if (gpsDirectory.TryGetDateTime(GpsDirectory.TagTimeStamp, out DateTime checkDateTime))
|
if (g.TryGetDateTime(GpsDirectory.TagTimeStamp, out DateTime checkDateTime))
|
||||||
timeStamp = checkDateTime;
|
timeStamp = checkDateTime;
|
||||||
else
|
else
|
||||||
timeStamp = GetDateTime(gpsDirectory.GetString(GpsDirectory.TagTimeStamp));
|
timeStamp = GetDateTime(g.GetString(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();
|
||||||
}
|
}
|
||||||
@ -292,16 +302,18 @@ internal abstract class Exif
|
|||||||
private static Shared.Models.JpegDirectory[] GetJpegDirectories(IReadOnlyList<MetadataExtractor.Directory> directories)
|
private static Shared.Models.JpegDirectory[] GetJpegDirectories(IReadOnlyList<MetadataExtractor.Directory> directories)
|
||||||
{
|
{
|
||||||
List<Shared.Models.JpegDirectory> results = [];
|
List<Shared.Models.JpegDirectory> results = [];
|
||||||
|
Shared.Models.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();
|
||||||
}
|
}
|
||||||
@ -309,6 +321,7 @@ internal abstract class Exif
|
|||||||
private static Shared.Models.MakernoteDirectory[] GetMakernoteDirectories(IReadOnlyList<MetadataExtractor.Directory> directories)
|
private static Shared.Models.MakernoteDirectory[] GetMakernoteDirectories(IReadOnlyList<MetadataExtractor.Directory> directories)
|
||||||
{
|
{
|
||||||
List<Shared.Models.MakernoteDirectory> results = [];
|
List<Shared.Models.MakernoteDirectory> results = [];
|
||||||
|
Shared.Models.MakernoteDirectory makernoteDirectory;
|
||||||
IEnumerable<AppleMakernoteDirectory> appleMakernoteDirectories = directories.OfType<AppleMakernoteDirectory>();
|
IEnumerable<AppleMakernoteDirectory> appleMakernoteDirectories = directories.OfType<AppleMakernoteDirectory>();
|
||||||
foreach (AppleMakernoteDirectory appleMakernoteDirectory in appleMakernoteDirectories)
|
foreach (AppleMakernoteDirectory appleMakernoteDirectory in appleMakernoteDirectories)
|
||||||
{
|
{
|
||||||
@ -319,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)
|
||||||
@ -331,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)
|
||||||
@ -343,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)
|
||||||
@ -355,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)
|
||||||
@ -367,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)
|
||||||
@ -379,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)
|
||||||
@ -391,7 +410,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: cameraSerialNumber, FirmwareVersion: firmwareVersion, QualityAndFileFormat: qualityAndFileFormat);
|
||||||
|
results.Add(makernoteDirectory);
|
||||||
}
|
}
|
||||||
return results.ToArray();
|
return results.ToArray();
|
||||||
}
|
}
|
||||||
@ -399,16 +419,18 @@ internal abstract class Exif
|
|||||||
private static Shared.Models.PhotoshopDirectory[] GetPhotoshopDirectories(IReadOnlyList<MetadataExtractor.Directory> directories)
|
private static Shared.Models.PhotoshopDirectory[] GetPhotoshopDirectories(IReadOnlyList<MetadataExtractor.Directory> directories)
|
||||||
{
|
{
|
||||||
List<Shared.Models.PhotoshopDirectory> results = [];
|
List<Shared.Models.PhotoshopDirectory> results = [];
|
||||||
|
Shared.Models.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();
|
||||||
}
|
}
|
||||||
@ -416,17 +438,19 @@ internal abstract class Exif
|
|||||||
private static Shared.Models.PngDirectory[] GetPngDirectories(IReadOnlyList<MetadataExtractor.Directory> directories)
|
private static Shared.Models.PngDirectory[] GetPngDirectories(IReadOnlyList<MetadataExtractor.Directory> directories)
|
||||||
{
|
{
|
||||||
List<Shared.Models.PngDirectory> results = [];
|
List<Shared.Models.PngDirectory> results = [];
|
||||||
|
Shared.Models.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();
|
||||||
}
|
}
|
||||||
@ -434,19 +458,21 @@ internal abstract class Exif
|
|||||||
private static Shared.Models.QuickTimeMovieHeaderDirectory[] GetQuickTimeMovieHeaderDirectoryDirectories(IReadOnlyList<MetadataExtractor.Directory> directories)
|
private static Shared.Models.QuickTimeMovieHeaderDirectory[] GetQuickTimeMovieHeaderDirectoryDirectories(IReadOnlyList<MetadataExtractor.Directory> directories)
|
||||||
{
|
{
|
||||||
List<Shared.Models.QuickTimeMovieHeaderDirectory> results = [];
|
List<Shared.Models.QuickTimeMovieHeaderDirectory> results = [];
|
||||||
|
Shared.Models.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();
|
||||||
}
|
}
|
||||||
@ -454,19 +480,21 @@ internal abstract class Exif
|
|||||||
private static Shared.Models.QuickTimeTrackHeaderDirectory[] GetQuickTimeTrackHeaderDirectoryDirectories(IReadOnlyList<MetadataExtractor.Directory> directories)
|
private static Shared.Models.QuickTimeTrackHeaderDirectory[] GetQuickTimeTrackHeaderDirectoryDirectories(IReadOnlyList<MetadataExtractor.Directory> directories)
|
||||||
{
|
{
|
||||||
List<Shared.Models.QuickTimeTrackHeaderDirectory> results = [];
|
List<Shared.Models.QuickTimeTrackHeaderDirectory> results = [];
|
||||||
|
Shared.Models.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();
|
||||||
}
|
}
|
||||||
@ -474,16 +502,18 @@ internal abstract class Exif
|
|||||||
private static Shared.Models.WebPDirectory[] GetWebPDirectories(IReadOnlyList<MetadataExtractor.Directory> directories)
|
private static Shared.Models.WebPDirectory[] GetWebPDirectories(IReadOnlyList<MetadataExtractor.Directory> directories)
|
||||||
{
|
{
|
||||||
List<Shared.Models.WebPDirectory> results = [];
|
List<Shared.Models.WebPDirectory> results = [];
|
||||||
|
Shared.Models.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();
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,3 +1,4 @@
|
|||||||
|
using System.Text.Json;
|
||||||
using View_by_Distance.Shared.Models;
|
using View_by_Distance.Shared.Models;
|
||||||
|
|
||||||
namespace View_by_Distance.Metadata.Models.Stateless.Methods;
|
namespace View_by_Distance.Metadata.Models.Stateless.Methods;
|
||||||
@ -5,6 +6,14 @@ namespace View_by_Distance.Metadata.Models.Stateless.Methods;
|
|||||||
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,6 +31,14 @@ internal static class Face
|
|||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
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;
|
||||||
|
}
|
||||||
|
|
||||||
internal static string? GetOutputResolution(PngDirectory[]? pngDirectories)
|
internal static string? GetOutputResolution(PngDirectory[]? pngDirectories)
|
||||||
{
|
{
|
||||||
string? result = null;
|
string? result = null;
|
||||||
|
|||||||
@ -14,44 +14,46 @@ public interface IMetadata
|
|||||||
Meters
|
Meters
|
||||||
}
|
}
|
||||||
|
|
||||||
ExifDirectory TestStatic_GetExifDirectory(FilePath filePath) =>
|
public static ExifDirectory GetExifDirectory(FilePath filePath) =>
|
||||||
GetExifDirectory(filePath);
|
|
||||||
static ExifDirectory GetExifDirectory(FilePath filePath) =>
|
|
||||||
Exif.GetExifDirectory(filePath);
|
Exif.GetExifDirectory(filePath);
|
||||||
|
|
||||||
string? TestStatic_GetOutputResolution(ExifDirectory? exifDirectory) =>
|
public static FaceFile? GetFaceFile(ExifDirectory? exifDirectory) =>
|
||||||
GetOutputResolution(exifDirectory);
|
Face.GetFaceFile(exifDirectory);
|
||||||
static string? GetOutputResolution(ExifDirectory? exifDirectory) =>
|
|
||||||
Face.GetOutputResolution(exifDirectory?.PngDirectories);
|
|
||||||
|
|
||||||
string? TestStatic_GetFaceEncoding(ExifDirectory? exifDirectory) =>
|
public static GeoLocation? GeoLocation(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? GetOutputResolution(ExifDirectory? exifDirectory) =>
|
||||||
GetDistance(originLatitude, originLongitude, destinationLatitude, destinationLongitude, decimalPlaces, distanceUnit);
|
Face.GetOutputResolution(exifDirectory?.PngDirectories);
|
||||||
static double? GetDistance(double originLatitude, double originLongitude, double destinationLatitude, double destinationLongitude, int decimalPlaces = 1, DistanceUnit distanceUnit = DistanceUnit.Miles) =>
|
|
||||||
|
public static string? GetRawFaceEncoding(ExifDirectory? exifDirectory) =>
|
||||||
|
Face.GetFaceEncoding(exifDirectory?.PngDirectories);
|
||||||
|
|
||||||
|
public static FaceEncoding? GetFaceEncoding(ExifDirectory? exifDirectory) =>
|
||||||
|
Face.GetFaceEncoding(exifDirectory);
|
||||||
|
|
||||||
|
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);
|
GPS.GetDistance(originLatitude, originLongitude, destinationLatitude, destinationLongitude, decimalPlaces, distanceUnit);
|
||||||
|
|
||||||
// string? TestStatic_GetFaceEncoding(IReadOnlyList<MetadataExtractor.Directory> directories) =>
|
internal ExifDirectory TestStatic_GetExifDirectory(FilePath filePath) =>
|
||||||
// GetFaceEncoding(directories);
|
GetExifDirectory(filePath);
|
||||||
// static string? GetFaceEncoding(IReadOnlyList<MetadataExtractor.Directory> directories) =>
|
|
||||||
// Metadata.GetFaceEncoding(directories);
|
|
||||||
|
|
||||||
// string? TestStatic_GetOutputResolution(IReadOnlyList<MetadataExtractor.Directory> directories) =>
|
internal GeoLocation? TestStatic_GeoLocation(ExifDirectory? exifDirectory) =>
|
||||||
// GetOutputResolution(directories);
|
GeoLocation(exifDirectory);
|
||||||
// static string? GetOutputResolution(IReadOnlyList<MetadataExtractor.Directory> directories) =>
|
|
||||||
// Metadata.GetOutputResolution(directories);
|
|
||||||
|
|
||||||
// Dictionary<string, MetadataExtractorDirectory> TestStatic_GetMetadataCollection(FileInfo fileInfo, List<Tuple<string, DateTime>> subFileTuples, List<string> parseExceptions) =>
|
internal string? TestStatic_GetRawFaceEncoding(ExifDirectory? exifDirectory) =>
|
||||||
// GetMetadataCollection(fileInfo, subFileTuples, parseExceptions);
|
GetRawFaceEncoding(exifDirectory);
|
||||||
// static Dictionary<string, MetadataExtractorDirectory> GetMetadataCollection(FileInfo fileInfo, List<Tuple<string, DateTime>> subFileTuples, List<string> parseExceptions) =>
|
|
||||||
// Metadata.GetMetadataCollection(fileInfo, subFileTuples, parseExceptions);
|
internal string? TestStatic_GetOutputResolution(ExifDirectory? exifDirectory) =>
|
||||||
|
GetOutputResolution(exifDirectory);
|
||||||
|
|
||||||
|
internal static FaceFile? TestStatic_GetFaceFile(ExifDirectory? exifDirectory) =>
|
||||||
|
GetFaceFile(exifDirectory);
|
||||||
|
|
||||||
|
internal FaceEncoding? TestStatic_GetFaceEncoding(ExifDirectory? exifDirectory) =>
|
||||||
|
GetFaceEncoding(exifDirectory);
|
||||||
|
|
||||||
|
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);
|
||||||
|
|
||||||
}
|
}
|
||||||
@ -68,12 +68,32 @@
|
|||||||
"ResultSingleton": "{}",
|
"ResultSingleton": "{}",
|
||||||
"RootDirectory": "D:/Images",
|
"RootDirectory": "D:/Images",
|
||||||
"IgnoreExtensions": [
|
"IgnoreExtensions": [
|
||||||
|
".ffs_db",
|
||||||
|
".FFS_DB",
|
||||||
".gif",
|
".gif",
|
||||||
".GIF",
|
".GIF",
|
||||||
|
".html",
|
||||||
|
".HTML",
|
||||||
|
".ico",
|
||||||
|
".ICO",
|
||||||
|
".json",
|
||||||
|
".JSON",
|
||||||
|
".lnk",
|
||||||
|
".LNK",
|
||||||
|
".lsv",
|
||||||
|
".LSV",
|
||||||
".nef",
|
".nef",
|
||||||
".NEF",
|
".NEF",
|
||||||
".pdf",
|
".pdf",
|
||||||
".PDF"
|
".PDF",
|
||||||
|
".ts",
|
||||||
|
".TS",
|
||||||
|
".txt",
|
||||||
|
".TXT",
|
||||||
|
".webp",
|
||||||
|
".WEBP",
|
||||||
|
".xmp",
|
||||||
|
".XMP"
|
||||||
],
|
],
|
||||||
"ValidImageFormatExtensions": [
|
"ValidImageFormatExtensions": [
|
||||||
".bmp",
|
".bmp",
|
||||||
@ -89,7 +109,9 @@
|
|||||||
".tiff",
|
".tiff",
|
||||||
".TIFF",
|
".TIFF",
|
||||||
".tif",
|
".tif",
|
||||||
".TIF"
|
".TIF",
|
||||||
|
".webp",
|
||||||
|
".WEBP"
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -67,12 +67,32 @@
|
|||||||
"ResultSingleton": "{}",
|
"ResultSingleton": "{}",
|
||||||
"RootDirectory": "D:/Images",
|
"RootDirectory": "D:/Images",
|
||||||
"IgnoreExtensions": [
|
"IgnoreExtensions": [
|
||||||
|
".ffs_db",
|
||||||
|
".FFS_DB",
|
||||||
".gif",
|
".gif",
|
||||||
".GIF",
|
".GIF",
|
||||||
|
".html",
|
||||||
|
".HTML",
|
||||||
|
".ico",
|
||||||
|
".ICO",
|
||||||
|
".json",
|
||||||
|
".JSON",
|
||||||
|
".lnk",
|
||||||
|
".LNK",
|
||||||
|
".lsv",
|
||||||
|
".LSV",
|
||||||
".nef",
|
".nef",
|
||||||
".NEF",
|
".NEF",
|
||||||
".pdf",
|
".pdf",
|
||||||
".PDF"
|
".PDF",
|
||||||
|
".ts",
|
||||||
|
".TS",
|
||||||
|
".txt",
|
||||||
|
".TXT",
|
||||||
|
".webp",
|
||||||
|
".WEBP",
|
||||||
|
".xmp",
|
||||||
|
".XMP"
|
||||||
],
|
],
|
||||||
"ValidImageFormatExtensions": [
|
"ValidImageFormatExtensions": [
|
||||||
".bmp",
|
".bmp",
|
||||||
@ -88,7 +108,9 @@
|
|||||||
".tiff",
|
".tiff",
|
||||||
".TIFF",
|
".TIFF",
|
||||||
".tif",
|
".tif",
|
||||||
".TIF"
|
".TIF",
|
||||||
|
".webp",
|
||||||
|
".WEBP"
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -60,12 +60,32 @@
|
|||||||
"PropertiesChangedForProperty": false,
|
"PropertiesChangedForProperty": false,
|
||||||
"RootDirectory": "C:/Tmp/Phares/Pictures",
|
"RootDirectory": "C:/Tmp/Phares/Pictures",
|
||||||
"IgnoreExtensions": [
|
"IgnoreExtensions": [
|
||||||
|
".ffs_db",
|
||||||
|
".FFS_DB",
|
||||||
".gif",
|
".gif",
|
||||||
".GIF",
|
".GIF",
|
||||||
|
".html",
|
||||||
|
".HTML",
|
||||||
|
".ico",
|
||||||
|
".ICO",
|
||||||
|
".json",
|
||||||
|
".JSON",
|
||||||
|
".lnk",
|
||||||
|
".LNK",
|
||||||
|
".lsv",
|
||||||
|
".LSV",
|
||||||
".nef",
|
".nef",
|
||||||
".NEF",
|
".NEF",
|
||||||
".pdf",
|
".pdf",
|
||||||
".PDF"
|
".PDF",
|
||||||
|
".ts",
|
||||||
|
".TS",
|
||||||
|
".txt",
|
||||||
|
".TXT",
|
||||||
|
".webp",
|
||||||
|
".WEBP",
|
||||||
|
".xmp",
|
||||||
|
".XMP"
|
||||||
],
|
],
|
||||||
"PropertyContentCollectionFiles": [],
|
"PropertyContentCollectionFiles": [],
|
||||||
"Spelling": [
|
"Spelling": [
|
||||||
@ -108,7 +128,9 @@
|
|||||||
".tiff",
|
".tiff",
|
||||||
".TIFF",
|
".TIFF",
|
||||||
".tif",
|
".tif",
|
||||||
".TIF"
|
".TIF",
|
||||||
|
".webp",
|
||||||
|
".WEBP"
|
||||||
],
|
],
|
||||||
"VerifyToSeason": [
|
"VerifyToSeason": [
|
||||||
". 2000",
|
". 2000",
|
||||||
|
|||||||
26
Rename/.vscode/appsettings.example.json
vendored
26
Rename/.vscode/appsettings.example.json
vendored
@ -82,12 +82,32 @@
|
|||||||
"xxxRootDirectory": "D:/1-Images-A/Images-dd514b88/Facebook/2023.3 Facebook",
|
"xxxRootDirectory": "D:/1-Images-A/Images-dd514b88/Facebook/2023.3 Facebook",
|
||||||
"RootDirectory": "D:/7-Question/California",
|
"RootDirectory": "D:/7-Question/California",
|
||||||
"IgnoreExtensions": [
|
"IgnoreExtensions": [
|
||||||
|
".ffs_db",
|
||||||
|
".FFS_DB",
|
||||||
".gif",
|
".gif",
|
||||||
".GIF",
|
".GIF",
|
||||||
|
".html",
|
||||||
|
".HTML",
|
||||||
|
".ico",
|
||||||
|
".ICO",
|
||||||
|
".json",
|
||||||
|
".JSON",
|
||||||
|
".lnk",
|
||||||
|
".LNK",
|
||||||
|
".lsv",
|
||||||
|
".LSV",
|
||||||
".nef",
|
".nef",
|
||||||
".NEF",
|
".NEF",
|
||||||
".pdf",
|
".pdf",
|
||||||
".PDF"
|
".PDF",
|
||||||
|
".ts",
|
||||||
|
".TS",
|
||||||
|
".txt",
|
||||||
|
".TXT",
|
||||||
|
".webp",
|
||||||
|
".WEBP",
|
||||||
|
".xmp",
|
||||||
|
".XMP"
|
||||||
],
|
],
|
||||||
"ValidImageFormatExtensions": [
|
"ValidImageFormatExtensions": [
|
||||||
".bmp",
|
".bmp",
|
||||||
@ -103,7 +123,9 @@
|
|||||||
".tiff",
|
".tiff",
|
||||||
".TIFF",
|
".TIFF",
|
||||||
".tif",
|
".tif",
|
||||||
".TIF"
|
".TIF",
|
||||||
|
".webp",
|
||||||
|
".WEBP"
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|||||||
@ -69,12 +69,32 @@
|
|||||||
"ResultSingleton": "{}",
|
"ResultSingleton": "{}",
|
||||||
"RootDirectory": "D:/Images",
|
"RootDirectory": "D:/Images",
|
||||||
"IgnoreExtensions": [
|
"IgnoreExtensions": [
|
||||||
|
".ffs_db",
|
||||||
|
".FFS_DB",
|
||||||
".gif",
|
".gif",
|
||||||
".GIF",
|
".GIF",
|
||||||
|
".html",
|
||||||
|
".HTML",
|
||||||
|
".ico",
|
||||||
|
".ICO",
|
||||||
|
".json",
|
||||||
|
".JSON",
|
||||||
|
".lnk",
|
||||||
|
".LNK",
|
||||||
|
".lsv",
|
||||||
|
".LSV",
|
||||||
".nef",
|
".nef",
|
||||||
".NEF",
|
".NEF",
|
||||||
".pdf",
|
".pdf",
|
||||||
".PDF"
|
".PDF",
|
||||||
|
".ts",
|
||||||
|
".TS",
|
||||||
|
".txt",
|
||||||
|
".TXT",
|
||||||
|
".webp",
|
||||||
|
".WEBP",
|
||||||
|
".xmp",
|
||||||
|
".XMP"
|
||||||
],
|
],
|
||||||
"ValidImageFormatExtensions": [
|
"ValidImageFormatExtensions": [
|
||||||
".bmp",
|
".bmp",
|
||||||
@ -90,7 +110,9 @@
|
|||||||
".tiff",
|
".tiff",
|
||||||
".TIFF",
|
".TIFF",
|
||||||
".tif",
|
".tif",
|
||||||
".TIF"
|
".TIF",
|
||||||
|
".webp",
|
||||||
|
".WEBP"
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -23,7 +23,7 @@ public class Location : Properties.ILocation, IEquatable<Location>
|
|||||||
_ = Stateless.Methods.Location.Check(bottom, left, right, top, zCount: 1, throwException: true);
|
_ = Stateless.Methods.Location.Check(bottom, left, right, top, zCount: 1, throwException: true);
|
||||||
}
|
}
|
||||||
|
|
||||||
public Location(double confidence, int height, Location location, int locationDigits, int locationFactor, int width, int zCount) :
|
public Location(double confidence, int height, Location location, int width, int zCount) :
|
||||||
this(
|
this(
|
||||||
location.Bottom,
|
location.Bottom,
|
||||||
confidence,
|
confidence,
|
||||||
@ -32,7 +32,7 @@ public class Location : Properties.ILocation, IEquatable<Location>
|
|||||||
location.Top) =>
|
location.Top) =>
|
||||||
Stateless.Methods.Location.Check(Bottom, height, Left, Right, Top, width, zCount, throwException: true);
|
Stateless.Methods.Location.Check(Bottom, height, Left, Right, Top, width, zCount, throwException: true);
|
||||||
|
|
||||||
public Location(int bottom, double confidence, int height, int left, int locationDigits, int locationFactor, int right, int top, int width, int zCount) :
|
public Location(int bottom, double confidence, int height, int left, int right, int top, int width, int zCount) :
|
||||||
this(
|
this(
|
||||||
bottom,
|
bottom,
|
||||||
confidence,
|
confidence,
|
||||||
@ -41,7 +41,7 @@ public class Location : Properties.ILocation, IEquatable<Location>
|
|||||||
top) =>
|
top) =>
|
||||||
Stateless.Methods.Location.Check(Bottom, height, Left, Right, Top, width, zCount, throwException: true);
|
Stateless.Methods.Location.Check(Bottom, height, Left, Right, Top, width, zCount, throwException: true);
|
||||||
|
|
||||||
public Location(int height, Location location, int locationDigits, int locationFactor, int width, int zCount) :
|
public Location(int height, Location location, int width, int zCount) :
|
||||||
this(
|
this(
|
||||||
location.Bottom,
|
location.Bottom,
|
||||||
location.Confidence,
|
location.Confidence,
|
||||||
@ -50,7 +50,7 @@ public class Location : Properties.ILocation, IEquatable<Location>
|
|||||||
location.Top) =>
|
location.Top) =>
|
||||||
Stateless.Methods.Location.Check(Bottom, height, Left, Right, Top, width, zCount, throwException: true);
|
Stateless.Methods.Location.Check(Bottom, height, Left, Right, Top, width, zCount, throwException: true);
|
||||||
|
|
||||||
public Location(double confidence, int factor, int height, Location location, int locationDigits, int locationFactor, int width, int zCount)
|
public Location(double confidence, int factor, int height, Location location, int width, int zCount)
|
||||||
{
|
{
|
||||||
int x = (location.Right - location.Left) / factor;
|
int x = (location.Right - location.Left) / factor;
|
||||||
int y = (location.Bottom - location.Top) / factor;
|
int y = (location.Bottom - location.Top) / factor;
|
||||||
|
|||||||
@ -1,5 +1,3 @@
|
|||||||
using System.Drawing;
|
|
||||||
|
|
||||||
namespace View_by_Distance.Shared.Models;
|
namespace View_by_Distance.Shared.Models;
|
||||||
|
|
||||||
public record LocationContainer(DateOnly CreationDateOnly,
|
public record LocationContainer(DateOnly CreationDateOnly,
|
||||||
@ -14,47 +12,44 @@ public record LocationContainer(DateOnly CreationDateOnly,
|
|||||||
int? LengthPermyriad,
|
int? LengthPermyriad,
|
||||||
FilePath? LengthSource,
|
FilePath? LengthSource,
|
||||||
long? PersonKey,
|
long? PersonKey,
|
||||||
RectangleF? Rectangle,
|
|
||||||
int WholePercentages)
|
int WholePercentages)
|
||||||
{
|
{
|
||||||
|
|
||||||
public static LocationContainer Get(LocationContainer locationContainer, object? encoding, bool keepExifDirectory)
|
public static LocationContainer Get(LocationContainer locationContainer, object? encoding, bool keepExifDirectory)
|
||||||
{
|
{
|
||||||
LocationContainer result;
|
LocationContainer result;
|
||||||
result = new(locationContainer.CreationDateOnly,
|
result = new(CreationDateOnly: locationContainer.CreationDateOnly,
|
||||||
keepExifDirectory ? locationContainer.ExifDirectory : null,
|
ExifDirectory: keepExifDirectory ? locationContainer.ExifDirectory : null,
|
||||||
locationContainer.DirectoryNumber,
|
DirectoryNumber: locationContainer.DirectoryNumber,
|
||||||
locationContainer.DisplayDirectoryName,
|
DisplayDirectoryName: locationContainer.DisplayDirectoryName,
|
||||||
encoding,
|
Encoding: encoding,
|
||||||
locationContainer.FaceFile,
|
FaceFile: locationContainer.FaceFile,
|
||||||
locationContainer.FilePath,
|
FilePath: locationContainer.FilePath,
|
||||||
locationContainer.FromDistanceContent,
|
FromDistanceContent: locationContainer.FromDistanceContent,
|
||||||
locationContainer.Id,
|
Id: locationContainer.Id,
|
||||||
locationContainer.LengthPermyriad,
|
LengthPermyriad: locationContainer.LengthPermyriad,
|
||||||
locationContainer.LengthSource,
|
LengthSource: locationContainer.LengthSource,
|
||||||
locationContainer.PersonKey,
|
PersonKey: locationContainer.PersonKey,
|
||||||
locationContainer.Rectangle,
|
WholePercentages: locationContainer.WholePercentages);
|
||||||
locationContainer.WholePercentages);
|
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
public static LocationContainer Get(LocationContainer source, LocationContainer locationContainer, int lengthPermyriad, bool keepExifDirectory, bool keepEncoding)
|
public static LocationContainer Get(LocationContainer source, LocationContainer locationContainer, int lengthPermyriad, bool keepExifDirectory, bool keepEncoding)
|
||||||
{
|
{
|
||||||
LocationContainer result;
|
LocationContainer result;
|
||||||
result = new(locationContainer.CreationDateOnly,
|
result = new(CreationDateOnly: locationContainer.CreationDateOnly,
|
||||||
keepExifDirectory ? locationContainer.ExifDirectory : null,
|
ExifDirectory: keepExifDirectory ? locationContainer.ExifDirectory : null,
|
||||||
locationContainer.DirectoryNumber,
|
DirectoryNumber: locationContainer.DirectoryNumber,
|
||||||
locationContainer.DisplayDirectoryName,
|
DisplayDirectoryName: locationContainer.DisplayDirectoryName,
|
||||||
keepEncoding ? locationContainer.Encoding : null,
|
Encoding: keepEncoding ? locationContainer.Encoding : null,
|
||||||
locationContainer.FaceFile,
|
FaceFile: locationContainer.FaceFile,
|
||||||
locationContainer.FilePath,
|
FilePath: locationContainer.FilePath,
|
||||||
locationContainer.FromDistanceContent,
|
FromDistanceContent: locationContainer.FromDistanceContent,
|
||||||
locationContainer.Id,
|
Id: locationContainer.Id,
|
||||||
lengthPermyriad,
|
LengthPermyriad: lengthPermyriad,
|
||||||
source.FilePath,
|
LengthSource: source.FilePath,
|
||||||
locationContainer.PersonKey,
|
PersonKey: locationContainer.PersonKey,
|
||||||
locationContainer.Rectangle,
|
WholePercentages: locationContainer.WholePercentages);
|
||||||
locationContainer.WholePercentages);
|
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -5,6 +5,7 @@ public interface IDlibDotNet
|
|||||||
|
|
||||||
void Tick();
|
void Tick();
|
||||||
long Ticks { get; }
|
long Ticks { get; }
|
||||||
|
int? CurrentTick { get; }
|
||||||
(string, string) GetResultsFullGroupDirectories();
|
(string, string) GetResultsFullGroupDirectories();
|
||||||
void ConstructProgressBar(int maxTicks, string message);
|
void ConstructProgressBar(int maxTicks, string message);
|
||||||
(string, string, string, string) GetResultsFullGroupDirectories(string outputResolution);
|
(string, string, string, string) GetResultsFullGroupDirectories(string outputResolution);
|
||||||
|
|||||||
@ -55,15 +55,15 @@ public interface ILocation
|
|||||||
static string GetLeftPadded(int locationDigits, int value) =>
|
static string GetLeftPadded(int locationDigits, int value) =>
|
||||||
GetLeftPadded(locationDigits, value.ToString());
|
GetLeftPadded(locationDigits, value.ToString());
|
||||||
|
|
||||||
Models.Location? TestStatic_GetLocation(Models.Location? location, int locationDigits, int locationFactor, int height, int width, int zCount) =>
|
Models.Location? TestStatic_GetLocation(Models.Location? location, int height, int width, int zCount) =>
|
||||||
GetLocation(location, locationDigits, locationFactor, height, width, zCount);
|
GetLocation(location, height, width, zCount);
|
||||||
static Models.Location? GetLocation(Models.Location? location, int locationDigits, int locationFactor, int height, int width, int zCount) =>
|
static Models.Location? GetLocation(Models.Location? location, int height, int width, int zCount) =>
|
||||||
location is null ? null : new(location.Confidence, height, location, locationDigits, locationFactor, width, zCount);
|
location is null ? null : new(location.Confidence, height, location, width, zCount);
|
||||||
|
|
||||||
Models.Location? TestStatic_GetLocation(int factor, Models.Location? location, int locationDigits, int locationFactor, int height, int width, int zCount) =>
|
Models.Location? TestStatic_GetLocation(int factor, Models.Location? location, int height, int width, int zCount) =>
|
||||||
GetLocation(factor, location, locationDigits, locationFactor, height, width, zCount);
|
GetLocation(factor, location, height, width, zCount);
|
||||||
static Models.Location? GetLocation(int factor, Models.Location? location, int locationDigits, int locationFactor, int height, int width, int zCount) =>
|
static Models.Location? GetLocation(int factor, Models.Location? location, int height, int width, int zCount) =>
|
||||||
location is null ? null : new(location.Confidence, factor, height, location, locationDigits, locationFactor, width, zCount);
|
location is null ? null : new(location.Confidence, factor, height, location, width, zCount);
|
||||||
|
|
||||||
(decimal?, decimal?, decimal?, decimal?) TestStatic_GetHeightLeftTopWidth(int bottom, int height, int left, int right, int top, int width) =>
|
(decimal?, decimal?, decimal?, decimal?) TestStatic_GetHeightLeftTopWidth(int bottom, int height, int left, int right, int top, int width) =>
|
||||||
GetHeightLeftTopWidth(bottom, height, left, right, top, width);
|
GetHeightLeftTopWidth(bottom, height, left, right, top, width);
|
||||||
@ -107,8 +107,6 @@ public interface ILocation
|
|||||||
detectionConfidence,
|
detectionConfidence,
|
||||||
height,
|
height,
|
||||||
Math.Max(rectangle.Left, 0),
|
Math.Max(rectangle.Left, 0),
|
||||||
Stateless.ILocation.Digits,
|
|
||||||
Stateless.ILocation.Factor,
|
|
||||||
Math.Min(rectangle.Right, width),
|
Math.Min(rectangle.Right, width),
|
||||||
Math.Max(rectangle.Top, 0),
|
Math.Max(rectangle.Top, 0),
|
||||||
width,
|
width,
|
||||||
|
|||||||
@ -1,4 +1,5 @@
|
|||||||
using System.Text;
|
using System.Text;
|
||||||
|
using View_by_Distance.Shared.Models.Properties;
|
||||||
|
|
||||||
namespace View_by_Distance.Shared.Models.Stateless.Methods;
|
namespace View_by_Distance.Shared.Models.Stateless.Methods;
|
||||||
|
|
||||||
@ -27,7 +28,20 @@ internal abstract class Id
|
|||||||
internal static byte GetHasIgnoreKeyword(FilePath filePath) =>
|
internal static byte GetHasIgnoreKeyword(FilePath filePath) =>
|
||||||
(byte)(filePath.Id > -1 ? 8 : 2);
|
(byte)(filePath.Id > -1 ? 8 : 2);
|
||||||
|
|
||||||
internal static int GetId(Properties.IPropertyConfiguration propertyConfiguration, string intelligentId)
|
internal static byte GetHasDateTimeOriginal(IPropertyConfiguration propertyConfiguration, FilePath filePath) =>
|
||||||
|
(byte)(IsIgnoreOrValidVideoFormatExtension(propertyConfiguration, filePath) ? filePath.Id > -1 ? 6 : 4 : filePath.Id > -1 ? 9 : 1);
|
||||||
|
|
||||||
|
private static bool IsIgnoreOrValidVideoFormatExtension(IPropertyConfiguration propertyConfiguration, FilePath filePath) =>
|
||||||
|
IsIgnoreOrValidVideoFormatExtension(propertyConfiguration, filePath.ExtensionLowered);
|
||||||
|
|
||||||
|
private static bool IsIgnoreOrValidVideoFormatExtension(IPropertyConfiguration propertyConfiguration, string extensionLowered) =>
|
||||||
|
propertyConfiguration.IgnoreExtensions.Contains(extensionLowered)
|
||||||
|
|| propertyConfiguration.ValidVideoFormatExtensions.Contains(extensionLowered);
|
||||||
|
|
||||||
|
internal static byte GetMissingDateTimeOriginal(IPropertyConfiguration propertyConfiguration, FilePath filePath) =>
|
||||||
|
(byte)(IsIgnoreOrValidVideoFormatExtension(propertyConfiguration, filePath) ? filePath.Id > -1 ? 5 : 0 : filePath.Id > -1 ? 7 : 3);
|
||||||
|
|
||||||
|
internal static int GetId(IPropertyConfiguration propertyConfiguration, string intelligentId)
|
||||||
{
|
{
|
||||||
int result;
|
int result;
|
||||||
StringBuilder results = new();
|
StringBuilder results = new();
|
||||||
@ -44,13 +58,7 @@ internal abstract class Id
|
|||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
internal static byte GetHasDateTimeOriginal(Properties.IPropertyConfiguration propertyConfiguration, FilePath filePath) =>
|
internal static bool NameWithoutExtensionIsIdFormat(IPropertyConfiguration propertyConfiguration, string fileNameWithoutExtension)
|
||||||
(byte)(propertyConfiguration.IgnoreExtensions.Contains(filePath.ExtensionLowered) || propertyConfiguration.ValidVideoFormatExtensions.Contains(filePath.ExtensionLowered) ? filePath.Id > -1 ? 6 : 4 : filePath.Id > -1 ? 9 : 1);
|
|
||||||
|
|
||||||
internal static byte GetMissingDateTimeOriginal(Properties.IPropertyConfiguration propertyConfiguration, FilePath filePath) =>
|
|
||||||
(byte)(propertyConfiguration.IgnoreExtensions.Contains(filePath.ExtensionLowered) || propertyConfiguration.ValidVideoFormatExtensions.Contains(filePath.ExtensionLowered) ? filePath.Id > -1 ? 5 : 0 : filePath.Id > -1 ? 7 : 3);
|
|
||||||
|
|
||||||
internal static bool NameWithoutExtensionIsIdFormat(Properties.IPropertyConfiguration propertyConfiguration, string fileNameWithoutExtension)
|
|
||||||
{
|
{
|
||||||
bool result;
|
bool result;
|
||||||
if (fileNameWithoutExtension.Length < 5 || fileNameWithoutExtension.Length > propertyConfiguration.IntMinValueLength)
|
if (fileNameWithoutExtension.Length < 5 || fileNameWithoutExtension.Length > propertyConfiguration.IntMinValueLength)
|
||||||
@ -63,7 +71,7 @@ internal abstract class Id
|
|||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
internal static string GetIntelligentId(Properties.IPropertyConfiguration propertyConfiguration, long id, string extensionLowered, bool? hasIgnoreKeyword, bool? hasDateTimeOriginal)
|
internal static string GetIntelligentId(IPropertyConfiguration propertyConfiguration, long id, string extensionLowered, bool? hasIgnoreKeyword, bool? hasDateTimeOriginal)
|
||||||
{
|
{
|
||||||
string result;
|
string result;
|
||||||
StringBuilder stringBuilder = new();
|
StringBuilder stringBuilder = new();
|
||||||
@ -79,18 +87,18 @@ internal abstract class Id
|
|||||||
}
|
}
|
||||||
else if (id > -1)
|
else if (id > -1)
|
||||||
{
|
{
|
||||||
if (!propertyConfiguration.ValidVideoFormatExtensions.Contains(extensionLowered))
|
if (IsIgnoreOrValidVideoFormatExtension(propertyConfiguration, extensionLowered))
|
||||||
key = hasIgnoreKeyword is not null && hasIgnoreKeyword.Value ? 8 : hasDateTimeOriginal.Value ? 9 : 7;
|
|
||||||
else
|
|
||||||
key = hasIgnoreKeyword is not null && hasIgnoreKeyword.Value ? throw new NotImplementedException() : hasDateTimeOriginal.Value ? 6 : 5;
|
key = hasIgnoreKeyword is not null && hasIgnoreKeyword.Value ? throw new NotImplementedException() : hasDateTimeOriginal.Value ? 6 : 5;
|
||||||
|
else
|
||||||
|
key = hasIgnoreKeyword is not null && hasIgnoreKeyword.Value ? 8 : hasDateTimeOriginal.Value ? 9 : 7;
|
||||||
value = id.ToString().PadLeft(propertyConfiguration.IntMinValueLength, '0');
|
value = id.ToString().PadLeft(propertyConfiguration.IntMinValueLength, '0');
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
if (!propertyConfiguration.ValidVideoFormatExtensions.Contains(extensionLowered))
|
if (IsIgnoreOrValidVideoFormatExtension(propertyConfiguration, extensionLowered))
|
||||||
key = hasIgnoreKeyword is not null && hasIgnoreKeyword.Value ? 2 : hasDateTimeOriginal.Value ? 1 : 3;
|
|
||||||
else
|
|
||||||
key = hasIgnoreKeyword is not null && hasIgnoreKeyword.Value ? throw new NotImplementedException() : hasDateTimeOriginal.Value ? 4 : 0;
|
key = hasIgnoreKeyword is not null && hasIgnoreKeyword.Value ? throw new NotImplementedException() : hasDateTimeOriginal.Value ? 4 : 0;
|
||||||
|
else
|
||||||
|
key = hasIgnoreKeyword is not null && hasIgnoreKeyword.Value ? 2 : hasDateTimeOriginal.Value ? 1 : 3;
|
||||||
value = id.ToString()[1..].PadLeft(propertyConfiguration.IntMinValueLength, '0');
|
value = id.ToString()[1..].PadLeft(propertyConfiguration.IntMinValueLength, '0');
|
||||||
}
|
}
|
||||||
for (int i = value.Length - propertyConfiguration.ResultAllInOneSubdirectoryLength - 1; i > -1; i--)
|
for (int i = value.Length - propertyConfiguration.ResultAllInOneSubdirectoryLength - 1; i > -1; i--)
|
||||||
@ -101,7 +109,7 @@ internal abstract class Id
|
|||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
internal static string GetPaddedId(Properties.IPropertyConfiguration propertyConfiguration, int id, string extensionLowered, bool? hasIgnoreKeyword, bool? hasDateTimeOriginal, int? index)
|
internal static string GetPaddedId(IPropertyConfiguration propertyConfiguration, int id, string extensionLowered, bool? hasIgnoreKeyword, bool? hasDateTimeOriginal, int? index)
|
||||||
{
|
{
|
||||||
string result;
|
string result;
|
||||||
if (propertyConfiguration.Offset < 0)
|
if (propertyConfiguration.Offset < 0)
|
||||||
|
|||||||
@ -136,7 +136,10 @@ internal abstract class Location
|
|||||||
result = null;
|
result = null;
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
if (!int.TryParse(segments[1], out int xWholePercent) || !int.TryParse(segments[2], out int yWholePercent) || !int.TryParse(segments[3], out int wWholePercent) || !int.TryParse(segments[4], out int hWholePercent))
|
if (!int.TryParse(segments[1], out int xWholePercent)
|
||||||
|
|| !int.TryParse(segments[2], out int yWholePercent)
|
||||||
|
|| !int.TryParse(segments[3], out int wWholePercent)
|
||||||
|
|| !int.TryParse(segments[4], out int hWholePercent))
|
||||||
result = null;
|
result = null;
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
|||||||
@ -1,4 +1,5 @@
|
|||||||
using System.Collections.ObjectModel;
|
using System.Collections.ObjectModel;
|
||||||
|
using System.Diagnostics;
|
||||||
|
|
||||||
namespace View_by_Distance.Shared.Models.Stateless.Methods;
|
namespace View_by_Distance.Shared.Models.Stateless.Methods;
|
||||||
|
|
||||||
@ -384,7 +385,12 @@ internal abstract partial class XDirectory
|
|||||||
else
|
else
|
||||||
{
|
{
|
||||||
if (filePath.Id is null)
|
if (filePath.Id is null)
|
||||||
throw new NullReferenceException(nameof(filePath.Id));
|
{
|
||||||
|
if (Debugger.IsAttached)
|
||||||
|
continue;
|
||||||
|
else
|
||||||
|
throw new NullReferenceException(nameof(filePath.Id));
|
||||||
|
}
|
||||||
intelligentId = IId.GetIntelligentId(propertyConfiguration, filePath.Id.Value, filePath.ExtensionLowered, filePath.HasIgnoreKeyword, filePath.HasDateTimeOriginal);
|
intelligentId = IId.GetIntelligentId(propertyConfiguration, filePath.Id.Value, filePath.ExtensionLowered, filePath.HasIgnoreKeyword, filePath.HasDateTimeOriginal);
|
||||||
if (!isOffsetDeterministicHashCode)
|
if (!isOffsetDeterministicHashCode)
|
||||||
checkFile = Path.Combine(directory, $"{intelligentId}{filePath.ExtensionLowered}");
|
checkFile = Path.Combine(directory, $"{intelligentId}{filePath.ExtensionLowered}");
|
||||||
|
|||||||
@ -162,8 +162,8 @@ public partial class UnitTestCalculations
|
|||||||
width = 100;
|
width = 100;
|
||||||
height = 100;
|
height = 100;
|
||||||
Location location = new(bottom, confidence, left, right, top);
|
Location location = new(bottom, confidence, left, right, top);
|
||||||
_ = new Location(confidence, height, location, Shared.Models.Stateless.ILocation.Digits, Shared.Models.Stateless.ILocation.Factor, width, 1);
|
_ = new Location(confidence, height, location, width, 1);
|
||||||
_ = new Location(bottom, confidence, height, left, Shared.Models.Stateless.ILocation.Digits, Shared.Models.Stateless.ILocation.Factor, right, top, width, 1);
|
_ = new Location(bottom, confidence, height, left, right, top, width, 1);
|
||||||
NonThrowTryCatch();
|
NonThrowTryCatch();
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -188,7 +188,7 @@ public partial class UnitTestCalculations
|
|||||||
bottom = 50;
|
bottom = 50;
|
||||||
width = 100;
|
width = 100;
|
||||||
height = 100;
|
height = 100;
|
||||||
location = new(bottom, confidence, height, left, Shared.Models.Stateless.ILocation.Digits, Shared.Models.Stateless.ILocation.Factor, right, top, width, 1);
|
location = new(bottom, confidence, height, left, right, top, width, 1);
|
||||||
areaPermyriad = IMapping.GetAreaPermyriad(faceAreaPermyriad, height, location, width);
|
areaPermyriad = IMapping.GetAreaPermyriad(faceAreaPermyriad, height, location, width);
|
||||||
Assert.IsTrue(areaPermyriad == 2500);
|
Assert.IsTrue(areaPermyriad == 2500);
|
||||||
left = 0;
|
left = 0;
|
||||||
@ -197,7 +197,7 @@ public partial class UnitTestCalculations
|
|||||||
bottom = 25;
|
bottom = 25;
|
||||||
width = 100;
|
width = 100;
|
||||||
height = 100;
|
height = 100;
|
||||||
location = new(bottom, confidence, height, left, Shared.Models.Stateless.ILocation.Digits, Shared.Models.Stateless.ILocation.Factor, right, top, width, 1);
|
location = new(bottom, confidence, height, left, right, top, width, 1);
|
||||||
OutputResolution outputResolution = new(height, 0, width);
|
OutputResolution outputResolution = new(height, 0, width);
|
||||||
areaPermyriad = IMapping.GetAreaPermyriad(faceAreaPermyriad, location, outputResolution);
|
areaPermyriad = IMapping.GetAreaPermyriad(faceAreaPermyriad, location, outputResolution);
|
||||||
Assert.IsTrue(areaPermyriad == 625);
|
Assert.IsTrue(areaPermyriad == 625);
|
||||||
|
|||||||
Reference in New Issue
Block a user