Revert "Refactor LocalizationManager and remove dead method"

This reverts commit db2b53a4b5.

Emby.Server.Implementations/Localization/LocalizationManager.cs

@@ -25,19 +25,19 @@ namespace Emby.Server.Implementations.Localization
         private static readonly Assembly _assembly = typeof(LocalizationManager).Assembly;
         private static readonly string[] _unratedValues = { "n/a", "unrated", "not rated" };
 
+        private readonly IServerConfigurationManager _configurationManager;
+        private readonly ILogger<LocalizationManager> _logger;
+
         private readonly Dictionary<string, Dictionary<string, ParentalRating>> _allParentalRatings =
             new Dictionary<string, Dictionary<string, ParentalRating>>(StringComparer.OrdinalIgnoreCase);
 
-        private readonly IServerConfigurationManager _configurationManager;
-
         private readonly ConcurrentDictionary<string, Dictionary<string, string>> _dictionaries =
             new ConcurrentDictionary<string, Dictionary<string, string>>(StringComparer.OrdinalIgnoreCase);
 
-        private readonly JsonSerializerOptions _jsonOptions = JsonDefaults.Options;
-        private readonly ILogger<LocalizationManager> _logger;
-
         private List<CultureDto> _cultures;
 
+        private readonly JsonSerializerOptions _jsonOptions = JsonDefaults.Options;
+
         /// <summary>
         /// Initializes a new instance of the <see cref="LocalizationManager" /> class.
         /// </summary>
@@ -51,6 +51,57 @@ namespace Emby.Server.Implementations.Localization
             _logger = logger;
         }
 
+        /// <summary>
+        /// Loads all resources into memory.
+        /// </summary>
+        /// <returns><see cref="Task" />.</returns>
+        public async Task LoadAll()
+        {
+            const string RatingsResource = "Emby.Server.Implementations.Localization.Ratings.";
+
+            // Extract from the assembly
+            foreach (var resource in _assembly.GetManifestResourceNames())
+            {
+                if (!resource.StartsWith(RatingsResource, StringComparison.Ordinal))
+                {
+                    continue;
+                }
+
+                string countryCode = resource.Substring(RatingsResource.Length, 2);
+                var dict = new Dictionary<string, ParentalRating>(StringComparer.OrdinalIgnoreCase);
+
+                using (var str = _assembly.GetManifestResourceStream(resource))
+                using (var reader = new StreamReader(str))
+                {
+                    await foreach (var line in reader.ReadAllLinesAsync().ConfigureAwait(false))
+                    {
+                        if (string.IsNullOrWhiteSpace(line))
+                        {
+                            continue;
+                        }
+
+                        string[] parts = line.Split(',');
+                        if (parts.Length == 2
+                            && int.TryParse(parts[1], NumberStyles.Integer, CultureInfo.InvariantCulture, out var value))
+                        {
+                            var name = parts[0];
+                            dict.Add(name, new ParentalRating(name, value));
+                        }
+#if DEBUG
+                        else
+                        {
+                            _logger.LogWarning("Malformed line in ratings file for country {CountryCode}", countryCode);
+                        }
+#endif
+                    }
+                }
+
+                _allParentalRatings[countryCode] = dict;
+            }
+
+            await LoadCultures().ConfigureAwait(false);
+        }
+
         /// <summary>
         /// Gets the cultures.
         /// </summary>
@@ -58,6 +109,62 @@ namespace Emby.Server.Implementations.Localization
         public IEnumerable<CultureDto> GetCultures()
             => _cultures;
 
+        private async Task LoadCultures()
+        {
+            List<CultureDto> list = new List<CultureDto>();
+
+            const string ResourcePath = "Emby.Server.Implementations.Localization.iso6392.txt";
+
+            using (var stream = _assembly.GetManifestResourceStream(ResourcePath))
+            using (var reader = new StreamReader(stream))
+            {
+                await foreach (var line in reader.ReadAllLinesAsync().ConfigureAwait(false))
+                {
+                    if (string.IsNullOrWhiteSpace(line))
+                    {
+                        continue;
+                    }
+
+                    var parts = line.Split('|');
+
+                    if (parts.Length == 5)
+                    {
+                        string name = parts[3];
+                        if (string.IsNullOrWhiteSpace(name))
+                        {
+                            continue;
+                        }
+
+                        string twoCharName = parts[2];
+                        if (string.IsNullOrWhiteSpace(twoCharName))
+                        {
+                            continue;
+                        }
+
+                        string[] threeletterNames;
+                        if (string.IsNullOrWhiteSpace(parts[1]))
+                        {
+                            threeletterNames = new[] { parts[0] };
+                        }
+                        else
+                        {
+                            threeletterNames = new[] { parts[0], parts[1] };
+                        }
+
+                        list.Add(new CultureDto
+                        {
+                            DisplayName = name,
+                            Name = name,
+                            ThreeLetterISOLanguageNames = threeletterNames,
+                            TwoLetterISOLanguageName = twoCharName
+                        });
+                    }
+                }
+            }
+
+            _cultures = list;
+        }
+
         /// <inheritdoc />
         public CultureDto FindLanguageInfo(string language)
             => GetCultures()
@@ -79,6 +186,34 @@ namespace Emby.Server.Implementations.Localization
         public IEnumerable<ParentalRating> GetParentalRatings()
             => GetParentalRatingsDictionary().Values;
 
+        /// <summary>
+        /// Gets the parental ratings dictionary.
+        /// </summary>
+        /// <returns><see cref="Dictionary{String, ParentalRating}" />.</returns>
+        private Dictionary<string, ParentalRating> GetParentalRatingsDictionary()
+        {
+            var countryCode = _configurationManager.Configuration.MetadataCountryCode;
+
+            if (string.IsNullOrEmpty(countryCode))
+            {
+                countryCode = "us";
+            }
+
+            return GetRatings(countryCode) ?? GetRatings("us");
+        }
+
+        /// <summary>
+        /// Gets the ratings.
+        /// </summary>
+        /// <param name="countryCode">The country code.</param>
+        /// <returns>The ratings.</returns>
+        private Dictionary<string, ParentalRating> GetRatings(string countryCode)
+        {
+            _allParentalRatings.TryGetValue(countryCode, out var value);
+
+            return value;
+        }
+
         /// <inheritdoc />
         public int? GetRatingLevel(string rating)
         {
@@ -115,7 +250,7 @@ namespace Emby.Server.Implementations.Localization
             var index = rating.IndexOf(':', StringComparison.Ordinal);
             if (index != -1)
             {
-                rating = rating.Substring(index + 1).Trim();
+                rating = rating.Substring(index).TrimStart(':').Trim();
 
                 if (!string.IsNullOrWhiteSpace(rating))
                 {
@@ -127,6 +262,20 @@ namespace Emby.Server.Implementations.Localization
             return null;
         }
 
+        /// <inheritdoc />
+        public bool HasUnicodeCategory(string value, UnicodeCategory category)
+        {
+            foreach (var chr in value)
+            {
+                if (char.GetUnicodeCategory(chr) == category)
+                {
+                    return true;
+                }
+            }
+
+            return false;
+        }
+
         /// <inheritdoc />
         public string GetLocalizedString(string phrase)
         {
@@ -156,6 +305,74 @@ namespace Emby.Server.Implementations.Localization
             return phrase;
         }
 
+        private Dictionary<string, string> GetLocalizationDictionary(string culture)
+        {
+            if (string.IsNullOrEmpty(culture))
+            {
+                throw new ArgumentNullException(nameof(culture));
+            }
+
+            const string Prefix = "Core";
+
+            return _dictionaries.GetOrAdd(
+                culture,
+                f => GetDictionary(Prefix, culture, DefaultCulture + ".json").GetAwaiter().GetResult());
+        }
+
+        private async Task<Dictionary<string, string>> GetDictionary(string prefix, string culture, string baseFilename)
+        {
+            if (string.IsNullOrEmpty(culture))
+            {
+                throw new ArgumentNullException(nameof(culture));
+            }
+
+            var dictionary = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);
+
+            var namespaceName = GetType().Namespace + "." + prefix;
+
+            await CopyInto(dictionary, namespaceName + "." + baseFilename).ConfigureAwait(false);
+            await CopyInto(dictionary, namespaceName + "." + GetResourceFilename(culture)).ConfigureAwait(false);
+
+            return dictionary;
+        }
+
+        private async Task CopyInto(IDictionary<string, string> dictionary, string resourcePath)
+        {
+            using (var stream = _assembly.GetManifestResourceStream(resourcePath))
+            {
+                // If a Culture doesn't have a translation the stream will be null and it defaults to en-us further up the chain
+                if (stream != null)
+                {
+                    var dict = await JsonSerializer.DeserializeAsync<Dictionary<string, string>>(stream, _jsonOptions).ConfigureAwait(false);
+
+                    foreach (var key in dict.Keys)
+                    {
+                        dictionary[key] = dict[key];
+                    }
+                }
+                else
+                {
+                    _logger.LogError("Missing translation/culture resource: {ResourcePath}", resourcePath);
+                }
+            }
+        }
+
+        private static string GetResourceFilename(string culture)
+        {
+            var parts = culture.Split('-');
+
+            if (parts.Length == 2)
+            {
+                culture = parts[0].ToLowerInvariant() + "-" + parts[1].ToUpperInvariant();
+            }
+            else
+            {
+                culture = culture.ToLowerInvariant();
+            }
+
+            return culture + ".json";
+        }
+
         /// <inheritdoc />
         public IEnumerable<LocalizationOption> GetLocalizationOptions()
         {
@@ -197,202 +414,5 @@ namespace Emby.Server.Implementations.Localization
             yield return new LocalizationOption("Turkish", "tr");
             yield return new LocalizationOption("Tiếng Việt", "vi");
         }
-
-        /// <summary>
-        /// Loads all resources into memory.
-        /// </summary>
-        /// <returns><see cref="Task" />.</returns>
-        public async Task LoadAll()
-        {
-            const string RatingsResource = "Emby.Server.Implementations.Localization.Ratings.";
-
-            // Extract from the assembly
-            foreach (var resource in _assembly.GetManifestResourceNames())
-            {
-                if (!resource.StartsWith(RatingsResource, StringComparison.Ordinal))
-                {
-                    continue;
-                }
-
-                string countryCode = resource.Substring(RatingsResource.Length, 2);
-                var dict = new Dictionary<string, ParentalRating>(StringComparer.OrdinalIgnoreCase);
-
-                await using var str = _assembly.GetManifestResourceStream(resource);
-                using var reader = new StreamReader(str);
-                await foreach (var line in reader.ReadAllLinesAsync().ConfigureAwait(false))
-                {
-                    if (string.IsNullOrWhiteSpace(line))
-                    {
-                        continue;
-                    }
-
-                    string[] parts = line.Split(',');
-                    if (parts.Length == 2
-                        && int.TryParse(parts[1], NumberStyles.Integer, CultureInfo.InvariantCulture, out var value))
-                    {
-                        var name = parts[0];
-                        dict.Add(name, new ParentalRating(name, value));
-                    }
-#if DEBUG
-                    else
-                    {
-                        _logger.LogWarning("Malformed line in ratings file for country {CountryCode}", countryCode);
-                    }
-#endif
-                }
-
-                _allParentalRatings[countryCode] = dict;
-            }
-
-            await LoadCultures().ConfigureAwait(false);
-        }
-
-        private async Task LoadCultures()
-        {
-            List<CultureDto> list = new List<CultureDto>();
-
-            const string ResourcePath = "Emby.Server.Implementations.Localization.iso6392.txt";
-
-            await using var stream = _assembly.GetManifestResourceStream(ResourcePath);
-            using var reader = new StreamReader(stream);
-            await foreach (var line in reader.ReadAllLinesAsync().ConfigureAwait(false))
-            {
-                if (string.IsNullOrWhiteSpace(line))
-                {
-                    continue;
-                }
-
-                var parts = line.Split('|');
-
-                if (parts.Length == 5)
-                {
-                    string name = parts[3];
-                    if (string.IsNullOrWhiteSpace(name))
-                    {
-                        continue;
-                    }
-
-                    string twoCharName = parts[2];
-                    if (string.IsNullOrWhiteSpace(twoCharName))
-                    {
-                        continue;
-                    }
-
-                    string[] threeletterNames;
-                    if (string.IsNullOrWhiteSpace(parts[1]))
-                    {
-                        threeletterNames = new[] { parts[0] };
-                    }
-                    else
-                    {
-                        threeletterNames = new[] { parts[0], parts[1] };
-                    }
-
-                    list.Add(new CultureDto
-                    {
-                        DisplayName = name,
-                        Name = name,
-                        ThreeLetterISOLanguageNames = threeletterNames,
-                        TwoLetterISOLanguageName = twoCharName
-                    });
-                }
-            }
-
-            _cultures = list;
-        }
-
-        /// <summary>
-        /// Gets the parental ratings dictionary.
-        /// </summary>
-        /// <returns><see cref="Dictionary{String, ParentalRating}" />.</returns>
-        private Dictionary<string, ParentalRating> GetParentalRatingsDictionary()
-        {
-            var countryCode = _configurationManager.Configuration.MetadataCountryCode;
-
-            if (string.IsNullOrEmpty(countryCode))
-            {
-                countryCode = "us";
-            }
-
-            return GetRatings(countryCode) ?? GetRatings("us");
-        }
-
-        /// <summary>
-        /// Gets the ratings.
-        /// </summary>
-        /// <param name="countryCode">The country code.</param>
-        /// <returns>The ratings.</returns>
-        private Dictionary<string, ParentalRating> GetRatings(string countryCode)
-        {
-            _allParentalRatings.TryGetValue(countryCode, out var value);
-
-            return value;
-        }
-
-        private Dictionary<string, string> GetLocalizationDictionary(string culture)
-        {
-            if (string.IsNullOrEmpty(culture))
-            {
-                throw new ArgumentNullException(nameof(culture));
-            }
-
-            const string Prefix = "Core";
-
-            return _dictionaries.GetOrAdd(
-                culture,
-                _ => GetDictionary(Prefix, culture, DefaultCulture + ".json").GetAwaiter().GetResult());
-        }
-
-        private async Task<Dictionary<string, string>> GetDictionary(string prefix, string culture, string baseFilename)
-        {
-            if (string.IsNullOrEmpty(culture))
-            {
-                throw new ArgumentNullException(nameof(culture));
-            }
-
-            var dictionary = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);
-
-            var namespaceName = GetType().Namespace + "." + prefix;
-
-            await CopyInto(dictionary, namespaceName + "." + baseFilename).ConfigureAwait(false);
-            await CopyInto(dictionary, namespaceName + "." + GetResourceFilename(culture)).ConfigureAwait(false);
-
-            return dictionary;
-        }
-
-        private async Task CopyInto(IDictionary<string, string> dictionary, string resourcePath)
-        {
-            await using var stream = _assembly.GetManifestResourceStream(resourcePath);
-            // If a Culture doesn't have a translation the stream will be null and it defaults to en-us further up the chain
-            if (stream != null)
-            {
-                var dict = await JsonSerializer.DeserializeAsync<Dictionary<string, string>>(stream, _jsonOptions).ConfigureAwait(false);
-
-                foreach (var key in dict.Keys)
-                {
-                    dictionary[key] = dict[key];
-                }
-            }
-            else
-            {
-                _logger.LogError("Missing translation/culture resource: {ResourcePath}", resourcePath);
-            }
-        }
-
-        private static string GetResourceFilename(string culture)
-        {
-            var parts = culture.Split('-');
-
-            if (parts.Length == 2)
-            {
-                culture = parts[0].ToLowerInvariant() + "-" + parts[1].ToUpperInvariant();
-            }
-            else
-            {
-                culture = culture.ToLowerInvariant();
-            }
-
-            return culture + ".json";
-        }
     }
 }

MediaBrowser.Model/Globalization/ILocalizationManager.cs

@@ -56,6 +56,14 @@ namespace MediaBrowser.Model.Globalization
         /// <returns><see cref="IEnumerable{LocalizatonOption}" />.</returns>
         IEnumerable<LocalizationOption> GetLocalizationOptions();
 
+        /// <summary>
+        /// Checks if the string contains a character with the specified unicode category.
+        /// </summary>
+        /// <param name="value">The string.</param>
+        /// <param name="category">The unicode category.</param>
+        /// <returns>Wether or not the string contains a character with the specified unicode category.</returns>
+        bool HasUnicodeCategory(string value, UnicodeCategory category);
+
         /// <summary>
         /// Returns the correct <see cref="CultureInfo" /> for the given language.
         /// </summary>