The Free Software Media System - Server Backend & API
add support for more embedded metadata tags
Kirill Nikiforovac81ddd39ade
diff --git a/MediaBrowser.MediaEncoding/Probing/ProbeResultNormalizer.cs b/MediaBrowser.MediaEncoding/Probing/ProbeResultNormalizer.csindex eb312029a1..1823496bf1 100644--- a/MediaBrowser.MediaEncoding/Probing/ProbeResultNormalizer.cs+++ b/MediaBrowser.MediaEncoding/Probing/ProbeResultNormalizer.cs@@ -154,11 +154,12 @@ namespace MediaBrowser.MediaEncoding.Probinginfo.Name = tags.GetFirstNotNullNorWhiteSpaceValue("title", "title-eng");info.ForcedSortName = tags.GetFirstNotNullNorWhiteSpaceValue("sort_name", "title-sort", "titlesort");- info.Overview = tags.GetFirstNotNullNorWhiteSpaceValue("synopsis", "description", "desc");+ info.Overview = tags.GetFirstNotNullNorWhiteSpaceValue("synopsis", "description", "desc", "comment");- info.IndexNumber = FFProbeHelpers.GetDictionaryNumericValue(tags, "episode_sort");info.ParentIndexNumber = FFProbeHelpers.GetDictionaryNumericValue(tags, "season_number");- info.ShowName = tags.GetValueOrDefault("show_name");+ info.IndexNumber = FFProbeHelpers.GetDictionaryNumericValue(tags, "episode_sort") ??+ FFProbeHelpers.GetDictionaryNumericValue(tags, "episode_id");+ info.ShowName = tags.GetValueOrDefault("show_name", "show");info.ProductionYear = FFProbeHelpers.GetDictionaryNumericValue(tags, "date");// Several different forms of retail/premiere datediff --git a/src/Jellyfin.Extensions/DictionaryExtensions.cs b/src/Jellyfin.Extensions/DictionaryExtensions.csindex 5bb828d016..814297093d 100644--- a/src/Jellyfin.Extensions/DictionaryExtensions.cs+++ b/src/Jellyfin.Extensions/DictionaryExtensions.cs@@ -7,31 +7,6 @@ namespace Jellyfin.Extensions/// </summary>public static class DictionaryExtensions{- /// <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>- /// <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.@@ -40,8 +15,9 @@ namespace Jellyfin.Extensions/// <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.Extensionsreturn val;}+ if (!string.IsNullOrEmpty(key4) && dictionary.TryGetValue(key4, out val) && !string.IsNullOrWhiteSpace(val))+ {+ return val;+ }+return null;}}