michael.heier/jellyfin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rewrite BaseItem.ModifySortChunks

Browse Source
This commit is contained in:
Bond_009 2022-10-11 21:45:49 +02:00
parent 99e31846bf
commit 224bb355dd
3 changed files with 46 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -775,36 +775,6 @@ namespace MediaBrowser.Controller.Entities
return Id.ToString("N", CultureInfo.InvariantCulture);
}
private List<Tuple<StringBuilder, bool>> GetSortChunks(string s1)
{
var list = new List<Tuple<StringBuilder, bool>>();
int thisMarker = 0;
while (thisMarker < s1.Length)
{
char thisCh = s1[thisMarker];
var thisChunk = new StringBuilder();
bool isNumeric = char.IsDigit(thisCh);
while (thisMarker < s1.Length && char.IsDigit(thisCh) == isNumeric)
{
thisChunk.Append(thisCh);
thisMarker++;
if (thisMarker < s1.Length)
{
thisCh = s1[thisMarker];
}
}
list.Add(new Tuple<StringBuilder, bool>(thisChunk, isNumeric));
}
return list;
}
public virtual bool CanDelete()
{
if (SourceType == SourceType.Channel)
@ -951,28 +921,40 @@ namespace MediaBrowser.Controller.Entities
return ModifySortChunks(sortable);
}
private string ModifySortChunks(string name)
internal static string ModifySortChunks(string name)
{
var chunks = GetSortChunks(name);
var builder = new StringBuilder();
foreach (var chunk in chunks)
void AppendChunk(StringBuilder builder, bool isDigitChunk, ReadOnlySpan<char> chunk)
{
var chunkBuilder = chunk.Item1;
// This chunk is numeric
if (chunk.Item2)
if (isDigitChunk && chunk.Length < 10)
{
while (chunkBuilder.Length < 10)
{
chunkBuilder.Insert(0, '0');
}
builder.Append('0', 10 - chunk.Length);
}
builder.Append(chunkBuilder);
builder.Append(chunk);
}
if (name.Length == 0)
{
return string.Empty;
}
var builder = new StringBuilder(name.Length);
int chunkStart = 0;
bool isDigitChunk = char.IsDigit(name[0]);
for (int i = 0; i < name.Length; i++)
{
var isDigit = char.IsDigit(name[i]);
if (isDigit != isDigitChunk)
{
AppendChunk(builder, isDigitChunk, name.AsSpan(chunkStart, i - chunkStart));
chunkStart = i;
isDigitChunk = isDigit;
}
}
AppendChunk(builder, isDigitChunk, name.AsSpan(chunkStart));
// logger.LogDebug("ModifySortChunks Start: {0} End: {1}", name, builder.ToString());
return builder.ToString().RemoveDiacritics();
}

1
MediaBrowser.Controller/Properties/AssemblyInfo.cs
View File

@ -15,6 +15,7 @@ using System.Runtime.InteropServices;
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
[assembly: NeutralResourcesLanguage("en")]
[assembly: InternalsVisibleTo("Jellyfin.Controller.Tests")]
[assembly: InternalsVisibleTo("Jellyfin.Server.Implementations.Tests")]
// Setting ComVisible to false makes the types in this assembly not visible

18
tests/Jellyfin.Controller.Tests/Entities/BaseItemTests.cs Normal file
View File

@ -0,0 +1,18 @@
using MediaBrowser.Controller.Entities;
using Xunit;
namespace Jellyfin.Controller.Tests.Entities
{
public class BaseItemTests
{
[Theory]
[InlineData("", "")]
[InlineData("1", "0000000001")]
[InlineData("t", "t")]
[InlineData("test", "test")]
[InlineData("test1", "test0000000001")]
[InlineData("1test 2", "0000000001test 0000000002")]
public void BaseItem_ModifySortChunks_Valid(string input, string expected)
=> Assert.Equal(expected, BaseItem.ModifySortChunks(input));
}
}