Pack and published 8.0.118.14728

Metadata alignment

Shared/Models/ExifDirectoryBase.cs

@@ -21,9 +21,11 @@ public record ExifDirectoryBase(string? Aperture,
                                 string? FileSource,
                                 string? ImageDescription,
                                 string? ImageHeight,
+                                int? ImageHeightValue,
                                 string? ImageNumber,
                                 string? ImageUniqueId,
                                 string? ImageWidth,
+                                int? ImageWidthValue,
                                 string? IsoSpeed,
                                 string? LensMake,
                                 string? LensModel,

Shared/Models/MetaBase.cs

@@ -0,0 +1,135 @@
+using System.Collections.ObjectModel;
+using System.Globalization;
+
+namespace View_by_Distance.Shared.Models;
+
+internal static class MetaBase
+{
+
+    internal static string? GetMaker(ExifDirectoryBase[]? exifBaseDirectories)
+    {
+        string? result = null;
+        if (exifBaseDirectories is not null)
+        {
+            string value;
+            foreach (ExifDirectoryBase exifDirectoryBase in exifBaseDirectories)
+            {
+                value = exifDirectoryBase?.Make is null ? string.Empty : exifDirectoryBase.Make.ToString().Trim();
+                if (string.IsNullOrEmpty(value))
+                    result = null;
+                else
+                {
+                    result = $"{value[0].ToString().ToUpper()}{value[1..].ToLower()}";
+                    break;
+                }
+            }
+        }
+        return result;
+    }
+
+    internal static string? GetModel(ExifDirectoryBase[]? exifBaseDirectories)
+    {
+        string? result = null;
+        if (exifBaseDirectories is not null)
+        {
+            string value;
+            foreach (ExifDirectoryBase exifDirectoryBase in exifBaseDirectories)
+            {
+                value = exifDirectoryBase?.Model is null ? string.Empty : exifDirectoryBase.Model.ToString().Trim();
+                if (string.IsNullOrEmpty(value))
+                    result = null;
+                else
+                {
+                    result = value;
+                    break;
+                }
+            }
+        }
+        return result;
+    }
+
+    internal static int? GetOrientation(ExifDirectoryBase[]? exifBaseDirectories)
+    {
+        int? result = null;
+        // public const int TagOrientation = 274;
+        if (exifBaseDirectories is not null)
+        {
+            foreach (ExifDirectoryBase exifDirectoryBase in exifBaseDirectories)
+            {
+                result = exifDirectoryBase?.OrientationValue;
+                if (result is not null)
+                    break;
+            }
+        }
+        return result;
+    }
+
+    internal static ReadOnlyCollection<string> GetKeywords(ExifDirectoryBase[]? exifBaseDirectories)
+    {
+        List<string> results = [];
+        if (exifBaseDirectories is not null)
+        {
+            string value;
+            foreach (ExifDirectoryBase exifDirectoryBase in exifBaseDirectories)
+            {
+                value = exifDirectoryBase?.WinKeywords is null ? string.Empty : exifDirectoryBase.WinKeywords.ToString().Trim();
+                if (string.IsNullOrEmpty(value))
+                    continue;
+                results.Add(value);
+            }
+        }
+        return results.AsReadOnly();
+    }
+
+    internal static int? GetWidth(ExifDirectoryBase[]? exifBaseDirectories)
+    {
+        int? result = null;
+        // public const int TagImageWidth = 256;
+        if (exifBaseDirectories is not null)
+        {
+            foreach (ExifDirectoryBase exifDirectoryBase in exifBaseDirectories)
+            {
+                result = exifDirectoryBase?.ImageWidthValue;
+                if (result is not null)
+                    break;
+            }
+        }
+        return result;
+    }
+
+    internal static int? GetHeight(ExifDirectoryBase[]? exifBaseDirectories)
+    {
+        int? result = null;
+        // public const int TagImageHeight = 257;
+        if (exifBaseDirectories is not null)
+        {
+            foreach (ExifDirectoryBase exifDirectoryBase in exifBaseDirectories)
+            {
+                result = exifDirectoryBase?.ImageHeightValue;
+                if (result is not null)
+                    break;
+            }
+        }
+        return result;
+    }
+
+#pragma warning disable CA1416
+
+    internal static DateTime? GetDateTime(string dateTimeFormat, string? value)
+    {
+        DateTime? result;
+        string alternateFormat = "ddd MMM dd HH:mm:ss yyyy";
+        if (value is not null && DateTime.TryParse(value, out DateTime dateTime))
+            result = dateTime;
+        else if (value is not null && value.Length == dateTimeFormat.Length && DateTime.TryParseExact(value, dateTimeFormat, CultureInfo.InvariantCulture, DateTimeStyles.None, out dateTime))
+            result = dateTime;
+        else if (value is not null && value.Length == alternateFormat.Length && DateTime.TryParseExact(value, alternateFormat, CultureInfo.InvariantCulture, DateTimeStyles.None, out dateTime))
+            result = dateTime;
+        else
+            result = null;
+        return result;
+    }
+
+#pragma warning restore CA1416
+
+}

Shared/Models/Stateless/IMetaBase.cs

@@ -0,0 +1,74 @@
+using System.Collections.ObjectModel;
+
+namespace View_by_Distance.Shared.Models.Stateless;
+
+public interface IMetaBase
+{
+
+    public static string DateTimeFormat() =>
+         "yyyy:MM:dd HH:mm:ss";
+
+    public static string? GetMaker(ExifDirectory? exifDirectory) =>
+        MetaBase.GetMaker(exifDirectory?.ExifBaseDirectories);
+
+    public static string? GetModel(ExifDirectory? exifDirectory) =>
+        MetaBase.GetModel(exifDirectory?.ExifBaseDirectories);
+
+    public static int? GetOrientation(ExifDirectory? exifDirectory) =>
+        MetaBase.GetOrientation(exifDirectory?.ExifBaseDirectories);
+
+    public static int? GetWidth(ExifDirectoryBase[]? exifBaseDirectories) =>
+        MetaBase.GetWidth(exifBaseDirectories);
+
+    public static int? GetHeight(ExifDirectoryBase[]? exifBaseDirectories) =>
+        MetaBase.GetHeight(exifBaseDirectories);
+
+    public static string? GetMaker(ExifDirectoryBase[]? exifBaseDirectories) =>
+        MetaBase.GetMaker(exifBaseDirectories);
+
+    public static string? GetModel(ExifDirectoryBase[]? exifBaseDirectories) =>
+        MetaBase.GetModel(exifBaseDirectories);
+
+    public static DateTime? GetDateTime(string dateTimeFormat, string? value) =>
+        MetaBase.GetDateTime(dateTimeFormat, value);
+
+    public static int? GetOrientation(ExifDirectoryBase[]? exifBaseDirectories) =>
+        MetaBase.GetOrientation(exifBaseDirectories);
+
+    public static ReadOnlyCollection<string> GetKeywords(ExifDirectory? exifDirectory) =>
+        MetaBase.GetKeywords(exifDirectory?.ExifBaseDirectories);
+
+    public static ReadOnlyCollection<string> GetKeywords(ExifDirectoryBase[]? exifBaseDirectories) =>
+        MetaBase.GetKeywords(exifBaseDirectories);
+
+    internal string TestStatic_DateTimeFormat() =>
+        DateTimeFormat();
+
+    internal string? TestStatic_GetMaker(ExifDirectory? exifDirectory) =>
+         GetMaker(exifDirectory);
+
+    internal string? TestStatic_GetModel(ExifDirectory? exifDirectory) =>
+         GetModel(exifDirectory);
+
+    internal static int? TestStatic_GetWidth(ExifDirectoryBase[]? exifBaseDirectories) =>
+        GetWidth(exifBaseDirectories);
+
+    internal static int? TestStatic_GetHeight(ExifDirectoryBase[]? exifBaseDirectories) =>
+        GetHeight(exifBaseDirectories);
+
+    internal static string? TestStatic_GetMaker(ExifDirectoryBase[]? exifBaseDirectories) =>
+        GetMaker(exifBaseDirectories);
+
+    internal static string? TestStatic_GetModel(ExifDirectoryBase[]? exifBaseDirectories) =>
+        GetModel(exifBaseDirectories);
+
+    internal static DateTime? TestStatic_GetDateTime(string dateTimeFormat, string? value) =>
+        GetDateTime(dateTimeFormat, value);
+
+    internal static int? TestStatic_GetOrientation(ExifDirectoryBase[]? exifBaseDirectories) =>
+        GetOrientation(exifBaseDirectories);
+
+    internal static ReadOnlyCollection<string> TestStatic_GetKeywords(ExifDirectoryBase[]? exifBaseDirectories) =>
+        GetKeywords(exifBaseDirectories);
+
+}