Cutlery/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-07-09 03:04:24 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9505 from Bond-009/theaan

Browse Source
This commit is contained in:
Bond-009 2023-03-17 21:28:17 +01:00 committed by GitHub
commit ce0e85c230
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -893,16 +893,6 @@ namespace MediaBrowser.Controller.Entities
var sortable = Name.Trim().ToLowerInvariant(); var sortable = Name.Trim().ToLowerInvariant();
foreach (var removeChar in ConfigurationManager.Configuration.SortRemoveCharacters)
{
sortable = sortable.Replace(removeChar, string.Empty, StringComparison.Ordinal);
}
foreach (var replaceChar in ConfigurationManager.Configuration.SortReplaceCharacters)
{
sortable = sortable.Replace(replaceChar, " ", StringComparison.Ordinal);
}
foreach (var search in ConfigurationManager.Configuration.SortRemoveWords) foreach (var search in ConfigurationManager.Configuration.SortRemoveWords)
{ {
// Remove from beginning if a space follows // Remove from beginning if a space follows
@ -921,12 +911,22 @@ namespace MediaBrowser.Controller.Entities
} }
} }
foreach (var removeChar in ConfigurationManager.Configuration.SortRemoveCharacters)
{
sortable = sortable.Replace(removeChar, string.Empty, StringComparison.Ordinal);
}
foreach (var replaceChar in ConfigurationManager.Configuration.SortReplaceCharacters)
{
sortable = sortable.Replace(replaceChar, " ", StringComparison.Ordinal);
}
return ModifySortChunks(sortable); return ModifySortChunks(sortable);
} }
internal static string ModifySortChunks(string name) internal static string ModifySortChunks(ReadOnlySpan<char> name)
{ {
void AppendChunk(StringBuilder builder, bool isDigitChunk, ReadOnlySpan<char> chunk) static void AppendChunk(StringBuilder builder, bool isDigitChunk, ReadOnlySpan<char> chunk)
{ {
if (isDigitChunk && chunk.Length < 10) if (isDigitChunk && chunk.Length < 10)
{ {
@ -936,7 +936,7 @@ namespace MediaBrowser.Controller.Entities
builder.Append(chunk); builder.Append(chunk);
} }
if (name.Length == 0) if (name.IsEmpty)
{ {
return string.Empty; return string.Empty;
} }
@ -950,13 +950,13 @@ namespace MediaBrowser.Controller.Entities
var isDigit = char.IsDigit(name[i]); var isDigit = char.IsDigit(name[i]);
if (isDigit != isDigitChunk) if (isDigit != isDigitChunk)
{ {
AppendChunk(builder, isDigitChunk, name.AsSpan(chunkStart, i - chunkStart)); AppendChunk(builder, isDigitChunk, name.Slice(chunkStart, i - chunkStart));
chunkStart = i; chunkStart = i;
isDigitChunk = isDigit; isDigitChunk = isDigit;
} }
} }
AppendChunk(builder, isDigitChunk, name.AsSpan(chunkStart)); AppendChunk(builder, isDigitChunk, name.Slice(chunkStart));
// logger.LogDebug("ModifySortChunks Start: {0} End: {1}", name, builder.ToString()); // logger.LogDebug("ModifySortChunks Start: {0} End: {1}", name, builder.ToString());
return builder.ToString().RemoveDiacritics(); return builder.ToString().RemoveDiacritics();