From ac855efec39581f7785932d9891f1c390fd932da Mon Sep 17 00:00:00 2001
From: Sebastian <sebastian@squidex.io>
Date: Wed, 4 Aug 2021 20:23:20 +0200
Subject: [PATCH] Made test green.

---
 .../Assets/AssetMetadata.cs                   | 24 +++++++++++++------
 .../Assets/FileTagAssetMetadataSource.cs      |  8 +++----
 .../Assets/ImageAssetMetadataSource.cs        |  8 +++----
 3 files changed, 25 insertions(+), 15 deletions(-)

diff --git a/backend/src/Squidex.Domain.Apps.Core.Model/Assets/AssetMetadata.cs b/backend/src/Squidex.Domain.Apps.Core.Model/Assets/AssetMetadata.cs
index 6d534de05..77d513721 100644
--- a/backend/src/Squidex.Domain.Apps.Core.Model/Assets/AssetMetadata.cs
+++ b/backend/src/Squidex.Domain.Apps.Core.Model/Assets/AssetMetadata.cs
@@ -68,35 +68,35 @@ namespace Squidex.Domain.Apps.Core.Assets
 
         public float? GetFocusX()
         {
-            return GetNumber(FocusX);
+            return GetSingle(FocusX);
         }
 
         public float? GetFocusY()
         {
-            return GetNumber(FocusY);
+            return GetSingle(FocusY);
         }
 
         public int? GetPixelWidth()
         {
-            return GetNumber(PixelWidth);
+            return GetIn32(PixelWidth);
         }
 
         public int? GetPixelHeight()
         {
-            return GetNumber(PixelHeight);
+            return GetIn32(PixelHeight);
         }
 
         public int? GetVideoWidth()
         {
-            return GetNumber(VideoWidth);
+            return GetIn32(VideoWidth);
         }
 
         public int? GetVideoHeight()
         {
-            return GetNumber(VideoHeight);
+            return GetIn32(VideoHeight);
         }
 
-        public int? GetNumber(string name)
+        public int? GetIn32(string name)
         {
             if (TryGetValue(name, out var n) && n is JsonNumber number)
             {
@@ -106,6 +106,16 @@ namespace Squidex.Domain.Apps.Core.Assets
             return null;
         }
 
+        public float? GetSingle(string name)
+        {
+            if (TryGetValue(name, out var n) && n is JsonNumber number)
+            {
+                return (float)number.Value;
+            }
+
+            return null;
+        }
+
         public bool TryGetNumber(string name, out double result)
         {
             if (TryGetValue(name, out var v) && v is JsonNumber n)
diff --git a/backend/src/Squidex.Domain.Apps.Entities/Assets/FileTagAssetMetadataSource.cs b/backend/src/Squidex.Domain.Apps.Entities/Assets/FileTagAssetMetadataSource.cs
index 406ef6338..7a51abf40 100644
--- a/backend/src/Squidex.Domain.Apps.Entities/Assets/FileTagAssetMetadataSource.cs
+++ b/backend/src/Squidex.Domain.Apps.Entities/Assets/FileTagAssetMetadataSource.cs
@@ -153,12 +153,12 @@ namespace Squidex.Domain.Apps.Entities.Assets
         {
             if (asset.Type == AssetType.Video)
             {
-                var videoWidth = asset.Metadata.GetVideoWidth();
-                var videoHeight = asset.Metadata.GetVideoWidth();
+                var w = asset.Metadata.GetVideoWidth();
+                var h = asset.Metadata.GetVideoHeight();
 
-                if (videoWidth != null && videoHeight != null)
+                if (w != null && h != null)
                 {
-                    yield return $"{videoHeight}x{videoHeight}pt";
+                    yield return $"{w}x{h}pt";
                 }
 
                 if (asset.Metadata.TryGetString("duration", out var duration))
diff --git a/backend/src/Squidex.Domain.Apps.Entities/Assets/ImageAssetMetadataSource.cs b/backend/src/Squidex.Domain.Apps.Entities/Assets/ImageAssetMetadataSource.cs
index e2452be8c..e2c0ecf28 100644
--- a/backend/src/Squidex.Domain.Apps.Entities/Assets/ImageAssetMetadataSource.cs
+++ b/backend/src/Squidex.Domain.Apps.Entities/Assets/ImageAssetMetadataSource.cs
@@ -123,12 +123,12 @@ namespace Squidex.Domain.Apps.Entities.Assets
         {
             if (asset.Type == AssetType.Image)
             {
-                var pixelWidth = asset.Metadata.GetVideoWidth();
-                var pixelHeight = asset.Metadata.GetVideoHeight();
+                var w = asset.Metadata.GetPixelWidth();
+                var h = asset.Metadata.GetPixelHeight();
 
-                if (pixelWidth != null && pixelHeight != null)
+                if (w != null && h != null)
                 {
-                    yield return $"{pixelWidth}x{pixelHeight}px";
+                    yield return $"{w}x{h}px";
                 }
             }
         }