From 5f98ffdcd998287e86c7ea750712753108480efd Mon Sep 17 00:00:00 2001 From: LJQ Date: Sat, 23 Mar 2024 15:03:01 +0800 Subject: [PATCH] TvdbCultureInfo back to static class --- Jellyfin.Plugin.Tvdb/TvdbClientManager.cs | 5 +++-- Jellyfin.Plugin.Tvdb/TvdbCultureInfo.cs | 22 ++++++++++------------ 2 files changed, 13 insertions(+), 14 deletions(-) diff --git a/Jellyfin.Plugin.Tvdb/TvdbClientManager.cs b/Jellyfin.Plugin.Tvdb/TvdbClientManager.cs index a850753..9f7908a 100644 --- a/Jellyfin.Plugin.Tvdb/TvdbClientManager.cs +++ b/Jellyfin.Plugin.Tvdb/TvdbClientManager.cs @@ -46,8 +46,9 @@ public TvdbClientManager(IApplicationHost applicationHost, ILocalizationManager _tokenUpdatedAt = DateTime.MinValue; - // Creates a new instance of the TvdbCultureInfo class to popluate the _cultures and _countries fields. - _ = new TvdbCultureInfo(localizationManager); + // Set the cultures and countries for the TvdbCultureInfo + TvdbCultureInfo.SetCultures(localizationManager.GetCultures()); + TvdbCultureInfo.SetCountries(localizationManager.GetCountries()); } private static string? UserPin => TvdbPlugin.Instance?.Configuration.SubscriberPIN; diff --git a/Jellyfin.Plugin.Tvdb/TvdbCultureInfo.cs b/Jellyfin.Plugin.Tvdb/TvdbCultureInfo.cs index f2db6e6..e192259 100644 --- a/Jellyfin.Plugin.Tvdb/TvdbCultureInfo.cs +++ b/Jellyfin.Plugin.Tvdb/TvdbCultureInfo.cs @@ -9,21 +9,19 @@ namespace Jellyfin.Plugin.Tvdb /// /// Tvdb culture info. /// - public class TvdbCultureInfo + internal static class TvdbCultureInfo { private static IEnumerable _cultures = new List(); private static IEnumerable _countries = new List(); - private readonly ILocalizationManager _localizationManager; - /// - /// Initializes a new instance of the class. - /// - /// Instance of the interface. - public TvdbCultureInfo(ILocalizationManager localizationManager) + internal static void SetCultures(IEnumerable cultures) + { + _cultures = cultures; + } + + internal static void SetCountries(IEnumerable countries) { - _localizationManager = localizationManager; - _countries = _localizationManager.GetCountries(); - _cultures = _localizationManager.GetCultures(); + _countries = countries; } /// @@ -31,7 +29,7 @@ public TvdbCultureInfo(ILocalizationManager localizationManager) /// /// Language. /// CultureInfo. - public static CultureDto? GetCultureInfo(string language) + internal static CultureDto? GetCultureInfo(string language) { foreach (var culture in _cultures) { @@ -52,7 +50,7 @@ public TvdbCultureInfo(ILocalizationManager localizationManager) /// /// Country. /// CountryInfo. - public static CountryInfo? GetCountryInfo(string country) + internal static CountryInfo? GetCountryInfo(string country) { foreach (var countryInfo in _countries) {