
* More cases for parsing regex * Fixed a bug where chapter cover images weren't being updated due to a missed not. * Removed a piece of code that was needed for upgrading, since all beta users agreed to wipe db. * Fixed InProgress to properly respect order and show more recent activity first. Issue is with IEntityDate LastModified not updating in DataContext. * Updated dependencies to lastest stable. * LastModified on Volumes wasn't updating, validated it does update when data is changed. * Fixed #152 - Sorting issue when finding cover image. * Fixed #151 - Sort files during scan. * Fixed #161 - Remove files that don't exist from chapters during scan. * Fixed #155 - Ignore images that start with !, expand cover detection by checking for the word cover as well as folder, and some code cleanup to make code more concise. * Fixed #153 - Ensure that we persist series name changes and don't override on scanning. * Fixed a broken unit test
81 lines
No EOL
2 KiB
C#
81 lines
No EOL
2 KiB
C#
using System;
|
|
using System.Collections.Generic;
|
|
using System.Text.RegularExpressions;
|
|
using static System.GC;
|
|
|
|
namespace API.Comparators
|
|
{
|
|
public class NaturalSortComparer : IComparer<string>, IDisposable
|
|
{
|
|
private readonly bool _isAscending;
|
|
private Dictionary<string, string[]> _table = new();
|
|
|
|
public NaturalSortComparer(bool inAscendingOrder = true)
|
|
{
|
|
_isAscending = inAscendingOrder;
|
|
}
|
|
|
|
int IComparer<string>.Compare(string x, string y)
|
|
{
|
|
if (x == y)
|
|
return 0;
|
|
|
|
string[] x1, y1;
|
|
|
|
if (!_table.TryGetValue(x, out x1))
|
|
{
|
|
x1 = Regex.Split(x.Replace(" ", ""), "([0-9]+)");
|
|
_table.Add(x, x1);
|
|
}
|
|
|
|
if (!_table.TryGetValue(y ?? string.Empty, out y1))
|
|
{
|
|
y1 = Regex.Split(y?.Replace(" ", ""), "([0-9]+)");
|
|
_table.Add(y, y1);
|
|
}
|
|
|
|
int returnVal;
|
|
|
|
for (var i = 0; i < x1.Length && i < y1.Length; i++)
|
|
{
|
|
if (x1[i] == y1[i]) continue;
|
|
returnVal = PartCompare(x1[i], y1[i]);
|
|
return _isAscending ? returnVal : -returnVal;
|
|
}
|
|
|
|
if (y1.Length > x1.Length)
|
|
{
|
|
returnVal = 1;
|
|
}
|
|
else if (x1.Length > y1.Length)
|
|
{
|
|
returnVal = -1;
|
|
}
|
|
else
|
|
{
|
|
returnVal = 0;
|
|
}
|
|
|
|
return _isAscending ? returnVal : -returnVal;
|
|
}
|
|
|
|
private static int PartCompare(string left, string right)
|
|
{
|
|
int x, y;
|
|
if (!int.TryParse(left, out x))
|
|
return left.CompareTo(right);
|
|
|
|
if (!int.TryParse(right, out y))
|
|
return left.CompareTo(right);
|
|
|
|
return x.CompareTo(y);
|
|
}
|
|
|
|
public void Dispose()
|
|
{
|
|
SuppressFinalize(this);
|
|
_table.Clear();
|
|
_table = null;
|
|
}
|
|
}
|
|
} |