Merge pull request jellyfin#9170 from Bond-009/alphanum

Smurfwow · Jan 26, 2023 · f3e04ac · f3e04ac
2 parents 63b0132 + b7f2c8d
commit f3e04ac
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 39 deletions.
diff --git a/src/Jellyfin.Extensions/AlphanumericComparator.cs b/src/Jellyfin.Extensions/AlphanumericComparator.cs
@@ -86,47 +86,12 @@ public static int CompareValues(string? s1, string? s2)
                     {
                         return 1;
                     }
-                    else if (span1Len >= 20) // Number is probably too big for a ulong
-                    {
-                        // Trim all the first digits that are the same
-                        int i = 0;
-                        while (i < span1Len && span1[i] == span2[i])
-                        {
-                            i++;
-                        }
-
-                        // If there are no more digits it's the same number
-                        if (i == span1Len)
-                        {
-                            continue;
-                        }
-
-                        // Only need to compare the most significant digit
-                        span1 = span1.Slice(i, 1);
-                        span2 = span2.Slice(i, 1);
-                    }
-
-                    if (!ulong.TryParse(span1, out var num1)
-                        || !ulong.TryParse(span2, out var num2))
-                    {
-                        return 0;
-                    }
-                    else if (num1 < num2)
-                    {
-                        return -1;
-                    }
-                    else if (num1 > num2)
-                    {
-                        return 1;
-                    }
                 }
-                else
+
+                int result = span1.CompareTo(span2, StringComparison.InvariantCulture);
+                if (result != 0)
                 {
-                    int result = span1.CompareTo(span2, StringComparison.InvariantCulture);
-                    if (result != 0)
-                    {
-                        return result;
-                    }
+                    return result;
                 }
             } while (pos1 < len1 && pos2 < len2);
 

diff --git a/tests/Jellyfin.Extensions.Tests/AlphanumericComparatorTests.cs b/tests/Jellyfin.Extensions.Tests/AlphanumericComparatorTests.cs
@@ -19,6 +19,11 @@ public class AlphanumericComparatorTests
         [InlineData("12345678912345678912345678913234567891", "12345678912345678912345678913234567892")]
         [InlineData("12345678912345678912345678913234567891a", "12345678912345678912345678913234567891a")]
         [InlineData("12345678912345678912345678913234567891a", "12345678912345678912345678913234567891b")]
+        [InlineData("a5", "a11")]
+        [InlineData("a05a", "a5b")]
+        [InlineData("a5a", "a05b")]
+        [InlineData("6xxx", "007asdf")]
+        [InlineData("00042Q", "42s")]
         public void AlphanumericComparatorTest(params string?[] strings)
         {
             var copy = strings.Reverse().ToArray();