add support for more embedded metadata tags

1 files changed, 7 insertions, 26 deletions

diff --git a/src/Jellyfin.Extensions/DictionaryExtensions.cs b/src/Jellyfin.Extensions/DictionaryExtensions.cs
index 5bb828d01..814297093 100644
--- a/src/Jellyfin.Extensions/DictionaryExtensions.cs
+++ b/src/Jellyfin.Extensions/DictionaryExtensions.cs
@@ -13,35 +13,11 @@ namespace Jellyfin.Extensions
         /// </summary>
         /// <param name="dictionary">The dictionary.</param>
         /// <param name="key1">The first checked key.</param>
-        /// <returns>System.String.</returns>
-        public static string? GetFirstNotNullNorWhiteSpaceValue(this IReadOnlyDictionary<string, string> dictionary, string key1)
-        {
-            return dictionary.GetFirstNotNullNorWhiteSpaceValue(key1, string.Empty, string.Empty);
-        }
-
-        /// <summary>
-        /// Gets a string from a string dictionary, checking all keys sequentially,
-        /// stopping at the first key that returns a result that's neither null nor blank.
-        /// </summary>
-        /// <param name="dictionary">The dictionary.</param>
-        /// <param name="key1">The first checked key.</param>
-        /// <param name="key2">The second checked key.</param>
-        /// <returns>System.String.</returns>
-        public static string? GetFirstNotNullNorWhiteSpaceValue(this IReadOnlyDictionary<string, string> dictionary, string key1, string key2)
-        {
-            return dictionary.GetFirstNotNullNorWhiteSpaceValue(key1, key2, string.Empty);
-        }
-
-        /// <summary>
-        /// Gets a string from a string dictionary, checking all keys sequentially,
-        /// stopping at the first key that returns a result that's neither null nor blank.
-        /// </summary>
-        /// <param name="dictionary">The dictionary.</param>
-        /// <param name="key1">The first checked key.</param>
         /// <param name="key2">The second checked key.</param>
         /// <param name="key3">The third checked key.</param>
+        /// <param name="key4">The fourth checked key.</param>
         /// <returns>System.String.</returns>
-        public static string? GetFirstNotNullNorWhiteSpaceValue(this IReadOnlyDictionary<string, string> dictionary, string key1, string key2, string key3)
+        public static string? GetFirstNotNullNorWhiteSpaceValue(this IReadOnlyDictionary<string, string> dictionary, string key1, string? key2 = null, string? key3 = null, string? key4 = null)
         {
             if (dictionary.TryGetValue(key1, out var val) && !string.IsNullOrWhiteSpace(val))
             {
@@ -58,6 +34,11 @@ namespace Jellyfin.Extensions
                 return val;
             }
 
+            if (!string.IsNullOrEmpty(key4) && dictionary.TryGetValue(key4, out val) && !string.IsNullOrWhiteSpace(val))
+            {
+                return val;
+            }
+
             return null;
         }
     }