alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-06-14 03:30:25 +01:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Merge pull request #16388 from theguymadmax/respect-library-country-code

Browse Source 
Respect library country code for parental ratings
This commit is contained in:
Bond-009
2026-03-13 20:25:08 +01:00
committed by GitHub
parent 8795ed4ebf 119b2e3d2f
commit 6c8a5dc104
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Emby.Server.Implementations/Sorting/OfficialRatingComparer.cs
View File

@@ -41,8 +41,8 @@ public class OfficialRatingComparer : IBaseItemComparer
ArgumentNullException.ThrowIfNull(y); ArgumentNullException.ThrowIfNull(y);
var zeroRating = new ParentalRatingScore(0, 0); var zeroRating = new ParentalRatingScore(0, 0);
var ratingX = string.IsNullOrEmpty(x.OfficialRating) ? zeroRating : _localizationManager.GetRatingScore(x.OfficialRating) ?? zeroRating; var ratingX = string.IsNullOrEmpty(x.OfficialRating) ? zeroRating : _localizationManager.GetRatingScore(x.OfficialRating, x.GetPreferredMetadataCountryCode()) ?? zeroRating;
var ratingY = string.IsNullOrEmpty(y.OfficialRating) ? zeroRating : _localizationManager.GetRatingScore(y.OfficialRating) ?? zeroRating; var ratingY = string.IsNullOrEmpty(y.OfficialRating) ? zeroRating : _localizationManager.GetRatingScore(y.OfficialRating, y.GetPreferredMetadataCountryCode()) ?? zeroRating;
var scoreCompare = ratingX.Score.CompareTo(ratingY.Score); var scoreCompare = ratingX.Score.CompareTo(ratingY.Score);
if (scoreCompare is 0) if (scoreCompare is 0)
{ {

6
MediaBrowser.Controller/Entities/BaseItem.cs
View File

@@ -1604,7 +1604,7 @@ namespace MediaBrowser.Controller.Entities
return !GetBlockUnratedValue(user); return !GetBlockUnratedValue(user);
} }
var ratingScore = LocalizationManager.GetRatingScore(rating); var ratingScore = LocalizationManager.GetRatingScore(rating, GetPreferredMetadataCountryCode());
// Could not determine rating level // Could not determine rating level
if (ratingScore is null) if (ratingScore is null)
@@ -1646,7 +1646,7 @@ namespace MediaBrowser.Controller.Entities
return null; return null;
} }
return LocalizationManager.GetRatingScore(rating); return LocalizationManager.GetRatingScore(rating, GetPreferredMetadataCountryCode());
} }
public List<string> GetInheritedTags() public List<string> GetInheritedTags()
@@ -2609,7 +2609,7 @@ namespace MediaBrowser.Controller.Entities
.Select(i => i.OfficialRating) .Select(i => i.OfficialRating)
.Where(i => !string.IsNullOrEmpty(i)) .Where(i => !string.IsNullOrEmpty(i))
.Distinct(StringComparer.OrdinalIgnoreCase) .Distinct(StringComparer.OrdinalIgnoreCase)
.Select(rating => (rating, LocalizationManager.GetRatingScore(rating))) .Select(rating => (rating, LocalizationManager.GetRatingScore(rating, GetPreferredMetadataCountryCode())))
.OrderBy(i => i.Item2 is null ? 1001 : i.Item2.Score) .OrderBy(i => i.Item2 is null ? 1001 : i.Item2.Score)
.ThenBy(i => i.Item2 is null ? 1001 : i.Item2.SubScore) .ThenBy(i => i.Item2 is null ? 1001 : i.Item2.SubScore)
.Select(i => i.rating); .Select(i => i.rating);