diff --git a/Directory.Packages.props b/Directory.Packages.props index 093193e608..1f853ef73d 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -19,6 +19,7 @@ + @@ -88,4 +89,4 @@ - + \ No newline at end of file diff --git a/MediaBrowser.Controller/Entities/BaseItem.cs b/MediaBrowser.Controller/Entities/BaseItem.cs index 0867cafb94..cb9a8cad88 100644 --- a/MediaBrowser.Controller/Entities/BaseItem.cs +++ b/MediaBrowser.Controller/Entities/BaseItem.cs @@ -964,7 +964,13 @@ namespace MediaBrowser.Controller.Entities AppendChunk(builder, isDigitChunk, name.Slice(chunkStart)); // logger.LogDebug("ModifySortChunks Start: {0} End: {1}", name, builder.ToString()); - return builder.ToString().RemoveDiacritics(); + var result = builder.ToString().RemoveDiacritics(); + if (!result.All(char.IsAscii)) + { + result = result.Transliterated(); + } + + return result; } public BaseItem GetParent() diff --git a/src/Jellyfin.Extensions/Jellyfin.Extensions.csproj b/src/Jellyfin.Extensions/Jellyfin.Extensions.csproj index c91f5d008e..98b567e308 100644 --- a/src/Jellyfin.Extensions/Jellyfin.Extensions.csproj +++ b/src/Jellyfin.Extensions/Jellyfin.Extensions.csproj @@ -29,6 +29,7 @@ + diff --git a/src/Jellyfin.Extensions/StringExtensions.cs b/src/Jellyfin.Extensions/StringExtensions.cs index 9d8afc23c7..8cfebd594d 100644 --- a/src/Jellyfin.Extensions/StringExtensions.cs +++ b/src/Jellyfin.Extensions/StringExtensions.cs @@ -1,5 +1,6 @@ using System; using System.Text.RegularExpressions; +using ICU4N.Text; namespace Jellyfin.Extensions { @@ -8,6 +9,9 @@ namespace Jellyfin.Extensions /// public static partial class StringExtensions { + private static readonly Lazy _transliterator = new(() => Transliterator.GetInstance( + "Any-Latin; Latin-Ascii; Lower; NFD; [:Nonspacing Mark:] Remove; [:Punctuation:] Remove;")); + // Matches non-conforming unicode chars // https://mnaoumov.wordpress.com/2014/06/14/stripping-invalid-characters-from-utf-16-strings/ @@ -96,5 +100,15 @@ namespace Jellyfin.Extensions return haystack[(pos + 1)..]; } + + /// + /// Returns a transliterated string which only contain ascii characters. + /// + /// The string to act on. + /// The transliterated string. + public static string Transliterated(this string text) + { + return _transliterator.Value.Transliterate(text); + } } }