lgladsden/jellyfin-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2474 from JustAMan/simplify-sorting

Browse Source 
Simplify AlphanumericComparer, reduce code duplication
This commit is contained in:
Bond-009 2020-03-02 12:28:31 +01:00 committed by GitHub
commit 1c21248e2e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 22 additions and 165 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -387,15 +387,12 @@ namespace MediaBrowser.Controller.Entities
while (thisMarker < s1.Length) while (thisMarker < s1.Length)
{ {
if (thisMarker >= s1.Length)
{
break;
}
char thisCh = s1[thisMarker]; char thisCh = s1[thisMarker];
var thisChunk = new StringBuilder(); var thisChunk = new StringBuilder();
bool isNumeric = char.IsDigit(thisCh);
while ((thisMarker < s1.Length) && (thisChunk.Length == 0 || SortHelper.InChunk(thisCh, thisChunk[0]))) while (thisMarker < s1.Length && char.IsDigit(thisCh) == isNumeric)
{ {
thisChunk.Append(thisCh); thisChunk.Append(thisCh);
thisMarker++; thisMarker++;
@ -406,7 +403,6 @@ namespace MediaBrowser.Controller.Entities
} }
} }
var isNumeric = thisChunk.Length > 0 && char.IsDigit(thisChunk[0]);
list.Add(new Tuple<StringBuilder, bool>(thisChunk, isNumeric)); list.Add(new Tuple<StringBuilder, bool>(thisChunk, isNumeric));
} }

28
Emby.Server.Implementations/Sorting/AlphanumComparator.cs → MediaBrowser.Controller/Sorting/AlphanumComparator.cs
View File

@ -2,7 +2,7 @@ using System.Collections.Generic;
using System.Text; using System.Text;
using MediaBrowser.Controller.Sorting; using MediaBrowser.Controller.Sorting;
namespace Emby.Server.Implementations.Sorting namespace MediaBrowser.Controller.Sorting
{ {
public class AlphanumComparator : IComparer<string> public class AlphanumComparator : IComparer<string>
{ {
@ -31,8 +31,9 @@ namespace Emby.Server.Implementations.Sorting
var thisChunk = new StringBuilder(); var thisChunk = new StringBuilder();
var thatChunk = new StringBuilder(); var thatChunk = new StringBuilder();
bool thisNumeric = char.IsDigit(thisCh), thatNumeric = char.IsDigit(thatCh);
while ((thisMarker < s1.Length) && (thisChunk.Length == 0 || SortHelper.InChunk(thisCh, thisChunk[0]))) while (thisMarker < s1.Length && char.IsDigit(thisCh) == thisNumeric)
{ {
thisChunk.Append(thisCh); thisChunk.Append(thisCh);
thisMarker++; thisMarker++;
@ -43,7 +44,7 @@ namespace Emby.Server.Implementations.Sorting
} }
} }
while ((thatMarker < s2.Length) && (thatChunk.Length == 0 || SortHelper.InChunk(thatCh, thatChunk[0]))) while (thatMarker < s2.Length && char.IsDigit(thatCh) == thatNumeric)
{ {
thatChunk.Append(thatCh); thatChunk.Append(thatCh);
thatMarker++; thatMarker++;
@ -54,40 +55,37 @@ namespace Emby.Server.Implementations.Sorting
} }
} }
int result = 0;
// If both chunks contain numeric characters, sort them numerically // If both chunks contain numeric characters, sort them numerically
if (char.IsDigit(thisChunk[0]) && char.IsDigit(thatChunk[0])) if (thisNumeric && thatNumeric)
{ {
if (!int.TryParse(thisChunk.ToString(), out thisNumericChunk)) if (!int.TryParse(thisChunk.ToString(), out thisNumericChunk)
{ || !int.TryParse(thatChunk.ToString(), out thatNumericChunk))
return 0;
}
if (!int.TryParse(thatChunk.ToString(), out thatNumericChunk))
{ {
return 0; return 0;
} }
if (thisNumericChunk < thatNumericChunk) if (thisNumericChunk < thatNumericChunk)
{ {
result = -1; return -1;
} }
if (thisNumericChunk > thatNumericChunk) if (thisNumericChunk > thatNumericChunk)
{ {
result = 1; return 1;
} }
} }
else else
{ {
result = thisChunk.ToString().CompareTo(thatChunk.ToString()); int result = thisChunk.ToString().CompareTo(thatChunk.ToString());
}
if (result != 0) if (result != 0)
{ {
return result; return result;
} }
} }
}
return 0; return 0;
} }

122
MediaBrowser.Controller/Sorting/SortExtensions.cs
View File

@ -7,137 +7,25 @@ namespace MediaBrowser.Controller.Sorting
{ {
public static class SortExtensions public static class SortExtensions
{ {
private static readonly AlphanumComparator _comparer = new AlphanumComparator();
public static IEnumerable<T> OrderByString<T>(this IEnumerable<T> list, Func<T, string> getName) public static IEnumerable<T> OrderByString<T>(this IEnumerable<T> list, Func<T, string> getName)
{ {
return list.OrderBy(getName, new AlphanumComparator()); return list.OrderBy(getName, _comparer);
} }
public static IEnumerable<T> OrderByStringDescending<T>(this IEnumerable<T> list, Func<T, string> getName) public static IEnumerable<T> OrderByStringDescending<T>(this IEnumerable<T> list, Func<T, string> getName)
{ {
return list.OrderByDescending(getName, new AlphanumComparator()); return list.OrderByDescending(getName, _comparer);
} }
public static IOrderedEnumerable<T> ThenByString<T>(this IOrderedEnumerable<T> list, Func<T, string> getName) public static IOrderedEnumerable<T> ThenByString<T>(this IOrderedEnumerable<T> list, Func<T, string> getName)
{ {
return list.ThenBy(getName, new AlphanumComparator()); return list.ThenBy(getName, _comparer);
} }
public static IOrderedEnumerable<T> ThenByStringDescending<T>(this IOrderedEnumerable<T> list, Func<T, string> getName) public static IOrderedEnumerable<T> ThenByStringDescending<T>(this IOrderedEnumerable<T> list, Func<T, string> getName)
{ {
return list.ThenByDescending(getName, new AlphanumComparator()); return list.ThenByDescending(getName, _comparer);
}
private class AlphanumComparator : IComparer<string>
{
private enum ChunkType { Alphanumeric, Numeric };
private static bool InChunk(char ch, char otherCh)
{
var type = ChunkType.Alphanumeric;
if (char.IsDigit(otherCh))
{
type = ChunkType.Numeric;
}
if ((type == ChunkType.Alphanumeric && char.IsDigit(ch))
|| (type == ChunkType.Numeric && !char.IsDigit(ch)))
{
return false;
}
return true;
}
public static int CompareValues(string s1, string s2)
{
if (s1 == null || s2 == null)
{
return 0;
}
int thisMarker = 0, thisNumericChunk = 0;
int thatMarker = 0, thatNumericChunk = 0;
while ((thisMarker < s1.Length) || (thatMarker < s2.Length))
{
if (thisMarker >= s1.Length)
{
return -1;
}
else if (thatMarker >= s2.Length)
{
return 1;
}
char thisCh = s1[thisMarker];
char thatCh = s2[thatMarker];
var thisChunk = new StringBuilder();
var thatChunk = new StringBuilder();
while ((thisMarker < s1.Length) && (thisChunk.Length == 0 || InChunk(thisCh, thisChunk[0])))
{
thisChunk.Append(thisCh);
thisMarker++;
if (thisMarker < s1.Length)
{
thisCh = s1[thisMarker];
}
}
while ((thatMarker < s2.Length) && (thatChunk.Length == 0 || InChunk(thatCh, thatChunk[0])))
{
thatChunk.Append(thatCh);
thatMarker++;
if (thatMarker < s2.Length)
{
thatCh = s2[thatMarker];
}
}
int result = 0;
// If both chunks contain numeric characters, sort them numerically
if (char.IsDigit(thisChunk[0]) && char.IsDigit(thatChunk[0]))
{
if (!int.TryParse(thisChunk.ToString(), out thisNumericChunk))
{
return 0;
}
if (!int.TryParse(thatChunk.ToString(), out thatNumericChunk))
{
return 0;
}
if (thisNumericChunk < thatNumericChunk)
{
result = -1;
}
if (thisNumericChunk > thatNumericChunk)
{
result = 1;
}
}
else
{
result = thisChunk.ToString().CompareTo(thatChunk.ToString());
}
if (result != 0)
{
return result;
}
}
return 0;
}
public int Compare(string x, string y)
{
return CompareValues(x, y);
}
} }
} }
} }

25
MediaBrowser.Controller/Sorting/SortHelper.cs
View File

@ -1,25 +0,0 @@
namespace MediaBrowser.Controller.Sorting
{
public static class SortHelper
{
private enum ChunkType { Alphanumeric, Numeric };
public static bool InChunk(char ch, char otherCh)
{
var type = ChunkType.Alphanumeric;
if (char.IsDigit(otherCh))
{
type = ChunkType.Numeric;
}
if ((type == ChunkType.Alphanumeric && char.IsDigit(ch))
|| (type == ChunkType.Numeric && !char.IsDigit(ch)))
{
return false;
}
return true;
}
}
}