The Free Software Media System - Server Backend & API
Backport pull request #15826 from jellyfin/release-10.11.z
cvium45e881c93e69
diff --git a/Emby.Server.Implementations/Localization/LocalizationManager.cs b/Emby.Server.Implementations/Localization/LocalizationManager.csindex d99ad4665e..bc80c2b405 100644--- a/Emby.Server.Implementations/Localization/LocalizationManager.cs+++ b/Emby.Server.Implementations/Localization/LocalizationManager.cs@@ -38,6 +38,7 @@ namespace Emby.Server.Implementations.Localizationprivate readonly JsonSerializerOptions _jsonOptions = JsonDefaults.Options;+ private readonly ConcurrentDictionary<string, CultureDto?> _cultureCache = new(StringComparer.OrdinalIgnoreCase);private List<CultureDto> _cultures = [];private FrozenDictionary<string, string> _iso6392BtoT = null!;@@ -161,6 +162,7 @@ namespace Emby.Server.Implementations.Localizationlist.Add(new CultureDto(name, displayname, twoCharName, threeLetterNames));}+ _cultureCache.Clear();_cultures = list;_iso6392BtoT = iso6392BtoTdict.ToFrozenDictionary(StringComparer.OrdinalIgnoreCase);}@@ -169,20 +171,31 @@ namespace Emby.Server.Implementations.Localization/// <inheritdoc />public CultureDto? FindLanguageInfo(string language){- // TODO language should ideally be a ReadOnlySpan but moq cannot mock ref structs- for (var i = 0; i < _cultures.Count; i++)+ if (string.IsNullOrEmpty(language)){- var culture = _cultures[i];- if (language.Equals(culture.DisplayName, StringComparison.OrdinalIgnoreCase)- || language.Equals(culture.Name, StringComparison.OrdinalIgnoreCase)- || culture.ThreeLetterISOLanguageNames.Contains(language, StringComparison.OrdinalIgnoreCase)- || language.Equals(culture.TwoLetterISOLanguageName, StringComparison.OrdinalIgnoreCase))- {- return culture;- }+ return null;}- return default;+ return _cultureCache.GetOrAdd(+ language,+ static (lang, cultures) =>+ {+ // TODO language should ideally be a ReadOnlySpan but moq cannot mock ref structs+ for (var i = 0; i < cultures.Count; i++)+ {+ var culture = cultures[i];+ if (lang.Equals(culture.DisplayName, StringComparison.OrdinalIgnoreCase)+ || lang.Equals(culture.Name, StringComparison.OrdinalIgnoreCase)+ || culture.ThreeLetterISOLanguageNames.Contains(lang, StringComparison.OrdinalIgnoreCase)+ || lang.Equals(culture.TwoLetterISOLanguageName, StringComparison.OrdinalIgnoreCase))+ {+ return culture;+ }+ }++ return null;+ },+ _cultures);}/// <inheritdoc />