The Free Software Media System - Server Backend & API
If we have a country code in the rating, treat as unrated if the country does not have the rating
Shadowghost3d4e4c457228
diff --git a/Emby.Server.Implementations/Localization/LocalizationManager.cs b/Emby.Server.Implementations/Localization/LocalizationManager.csindex bc80c2b405..f206b820fd 100644--- a/Emby.Server.Implementations/Localization/LocalizationManager.cs+++ b/Emby.Server.Implementations/Localization/LocalizationManager.cs@@ -345,33 +345,68 @@ namespace Emby.Server.Implementations.Localization}}- // Try splitting by : to handle "Germany: FSK-18"- if (rating.Contains(':', StringComparison.OrdinalIgnoreCase))+ // Try splitting by country prefix separator to handle "US:PG-13", "Germany: FSK-18", "DE-FSK-18"+ if (TryGetRatingScoreBySeparator(rating, ':', out var result)+ || TryGetRatingScoreBySeparator(rating, '-', out result)){- var ratingLevelRightPart = rating.AsSpan().RightPart(':');- if (ratingLevelRightPart.Length != 0)- {- return GetRatingScore(ratingLevelRightPart.ToString());- }+ return result;}- // Handle prefix country code to handle "DE-18"- if (rating.Contains('-', StringComparison.OrdinalIgnoreCase))+ return null;+ }++ private bool TryGetRatingScoreBySeparator(string rating, char separator, out ParentalRatingScore? result)+ {+ result = null;++ if (rating.IndexOf(separator, StringComparison.Ordinal) < 0){- var ratingSpan = rating.AsSpan();+ return false;+ }++ var ratingSpan = rating.AsSpan();+ var countryPart = ratingSpan.LeftPart(separator).Trim().ToString();+ var ratingPart = ratingSpan.RightPart(separator).Trim().ToString();+ if (ratingPart.Length == 0)+ {+ return false;+ }- // Extract culture from country prefix- var culture = FindLanguageInfo(ratingSpan.LeftPart('-').ToString());+ string? resolvedCountryCode = null;- var ratingLevelRightPart = ratingSpan.RightPart('-');- if (ratingLevelRightPart.Length != 0)+ if (_allParentalRatings.ContainsKey(countryPart))+ {+ resolvedCountryCode = countryPart;+ }+ else+ {+ var culture = FindLanguageInfo(countryPart);+ if (culture is not null){- // Check rating system of culture- return GetRatingScore(ratingLevelRightPart.ToString(), culture?.TwoLetterISOLanguageName);+ resolvedCountryCode = culture.TwoLetterISOLanguageName;}}- return null;+ if (resolvedCountryCode is not null+ && _allParentalRatings.TryGetValue(resolvedCountryCode, out var countryRatings))+ {+ if (countryRatings.TryGetValue(ratingPart, out result))+ {+ return true;+ }++ _logger.LogWarning(+ "Rating '{Rating}' not found in the '{CountryCode}' rating system, treating as unrated",+ rating,+ resolvedCountryCode);++ return true;+ }++ // Country not identified or no rating data available, try recursive lookup+ result = GetRatingScore(ratingPart, resolvedCountryCode);++ return true;}/// <inheritdoc />diff --git a/tests/Jellyfin.Server.Implementations.Tests/Localization/LocalizationManagerTests.cs b/tests/Jellyfin.Server.Implementations.Tests/Localization/LocalizationManagerTests.csindex e60522bf78..3e2df15ded 100644--- a/tests/Jellyfin.Server.Implementations.Tests/Localization/LocalizationManagerTests.cs+++ b/tests/Jellyfin.Server.Implementations.Tests/Localization/LocalizationManagerTests.cs@@ -222,6 +222,40 @@ namespace Jellyfin.Server.Implementations.Tests.LocalizationAssert.Equal(expectedSubScore, score.SubScore);}+ [Theory]+ [InlineData("US:INVALID", "US")] // Colon separator, known country code, unknown rating+ [InlineData("us:INVALID", "US")] // Colon separator, lowercase country code+ [InlineData("DE-INVALID", "US")] // Hyphen separator, known language prefix, unknown rating+ [InlineData("ca:INVALID", "US")] // Colon separator, known country code (Canada)+ public async Task GetRatingScore_UnknownRatingWithKnownCountry_ReturnsNull(string rating, string countryCode)+ {+ var localizationManager = Setup(new ServerConfiguration+ {+ MetadataCountryCode = countryCode+ });+ await localizationManager.LoadAll();++ Assert.Null(localizationManager.GetRatingScore(rating));+ }++ [Theory]+ [InlineData("us:R", "DE", 17, 0)] // Colon separator, explicit US country, valid US rating+ [InlineData("US:PG-13", "DE", 13, 0)] // Colon separator, explicit US country, valid US rating+ [InlineData("ca:R", "US", 18, 1)] // Colon separator, Canada country code, valid CA rating+ public async Task GetRatingScore_ValidRatingWithCountrySeparator_ReturnsScore(string rating, string countryCode, int expectedScore, int? expectedSubScore)+ {+ var localizationManager = Setup(new ServerConfiguration+ {+ MetadataCountryCode = countryCode+ });+ await localizationManager.LoadAll();++ var score = localizationManager.GetRatingScore(rating);+ Assert.NotNull(score);+ Assert.Equal(expectedScore, score.Score);+ Assert.Equal(expectedSubScore, score.SubScore);+ }+[Theory][InlineData("Default", "Default")][InlineData("HeaderLiveTV", "Live TV")]