cotugno/jellyfin
2
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2024-11-15 09:59:06 -07:00
Code Issues Packages Projects Releases Wiki Activity

Fix image searching to prioritize explicit language match if searching in English (#8946)

Browse Source
This commit is contained in:
Brad Beattie 2022-12-29 09:15:48 -05:00 committed by GitHub
parent d7992bda67
commit 4ee1b78a80
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
MediaBrowser.Model/Extensions/EnumerableExtensions.cs
View File

@ -24,24 +24,27 @@ namespace MediaBrowser.Model.Extensions
requestedLanguage = "en"; requestedLanguage = "en";
} }
var isRequestedLanguageEn = string.Equals(requestedLanguage, "en", StringComparison.OrdinalIgnoreCase);
return remoteImageInfos.OrderByDescending(i => return remoteImageInfos.OrderByDescending(i =>
{ {
// Image priority ordering:
// - Images that match the requested language
// - Images with no language
// - TODO: Images that match the original language
// - Images in English
// - Images that don't match the requested language
if (string.Equals(requestedLanguage, i.Language, StringComparison.OrdinalIgnoreCase)) if (string.Equals(requestedLanguage, i.Language, StringComparison.OrdinalIgnoreCase))
{ {
return 3; return 4;
} }
if (string.IsNullOrEmpty(i.Language)) if (string.IsNullOrEmpty(i.Language))
{ {
// Assume empty image language is likely to be English. return 3;
return isRequestedLanguageEn ? 3 : 2;
} }
if (!isRequestedLanguageEn && string.Equals(i.Language, "en", StringComparison.OrdinalIgnoreCase)) if (string.Equals(i.Language, "en", StringComparison.OrdinalIgnoreCase))
{ {
// Prioritize English over non-requested languages.
return 2; return 2;
} }