aboutsummaryrefslogtreecommitdiff
path: root/Emby.Server.Implementations/Library/MediaStreamSelector.cs
diff options
context:
space:
mode:
authorShadowghost <Shadowghost@users.noreply.github.com>2026-11-20 07:25:01 -0500
committerCody Robibero <cody@robibe.ro>2026-11-20 07:25:01 -0500
commita2ca4a7b84e89957547a9fb04a190b139c86e72f (patch)
tree091f14663fde79259a0539e25a73c8893264c1fb /Emby.Server.Implementations/Library/MediaStreamSelector.cs
parent511f1ef882d594df64810d2c36b59ad381fd6e17 (diff)
Backport pull request #18072 from jellyfin/release-12.z
Keep language variants distinguishable Original-merge: 060233101dc336560b2f97d251fe7a9f8241b763 Merged-by: crobibero <cody@robibe.ro> Backported-by: Cody Robibero <cody@robibe.ro>
Diffstat (limited to 'Emby.Server.Implementations/Library/MediaStreamSelector.cs')
-rw-r--r--Emby.Server.Implementations/Library/MediaStreamSelector.cs8
1 files changed, 8 insertions, 0 deletions
diff --git a/Emby.Server.Implementations/Library/MediaStreamSelector.cs b/Emby.Server.Implementations/Library/MediaStreamSelector.cs
index 631179ffcf..31e36af3b8 100644
--- a/Emby.Server.Implementations/Library/MediaStreamSelector.cs
+++ b/Emby.Server.Implementations/Library/MediaStreamSelector.cs
@@ -46,6 +46,7 @@ namespace Emby.Server.Implementations.Library
.ThenByDescending(x => x.IsDefault)
.ThenByDescending(x => !x.IsForced && MatchesPreferredLanguage(x.Language, preferredLanguages))
.ThenByDescending(x => x.IsForced && MatchesPreferredLanguage(x.Language, preferredLanguages))
+ .ThenBy(x => GetLanguageRank(x.Language, preferredLanguages))
.ThenByDescending(x => x.IsForced && IsLanguageUndefined(x.Language))
.ThenByDescending(x => x.IsForced)
.ToList();
@@ -158,6 +159,13 @@ namespace Emby.Server.Implementations.Library
preferredLanguages.Contains(language, StringComparison.OrdinalIgnoreCase);
}
+ // Earlier preferences win among matches: a pt-br preference lists [pt-br, por] and must pick the pt-br track.
+ private static int GetLanguageRank(string language, IReadOnlyList<string> preferredLanguages)
+ {
+ var index = preferredLanguages.FindIndex(x => string.Equals(x, language, StringComparison.OrdinalIgnoreCase));
+ return index == -1 ? int.MaxValue : index;
+ }
+
private static bool IsLanguageUndefined(string language)
{
// Check for null, empty, or known placeholders