mirror of
https://github.com/Kareadita/Kavita.git
synced 2025-06-23 15:30:34 -04:00
* 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. * Rewrote a check to avoid a small heap object warning. * Ensure UpdateSeries checks all libraries for unique name. * Took care of some todos, removed unused imports, on dev go ahead and schedule reoocuring jobs since LiteDB caused the locking issue. * No Tracking when we aren't using entities. * Added code to remove abandoned progress rows after a chapter gets deleted. * RefreshMetadata uses one large query rather than many trips to DB for updating metadata. Significantly faster. * Fixed a bug where UpdateSeries would always complain about a unique name even when we weren't updating name. * Files that are linked to a series but can't parse out Vol/Chapter information are properly grouped like other Specials. * Refresh metadata on UI should call the task directly * Fixed a bug on updating series to make sure we don't complain if we aren't trying to update the name to an existing name. * Fixed #142 - Library cards should be sorted. * Refactored the name of some variables to be more agnostic to comics. * Implemented ScanLibrary but abandoning it. * Code Cleanup & removing ScanSeries code. * Some more tests and new Comparators for natural sorting. * Fixed #137 - When performing I/O on archives, ignore __MACOSX folders completely. * Fixed #137 - When performing I/O on archives, ignore __MACOSX folders completely. * All entities that will show under specials tab should be marked special, rather than just what has a special keyword. * Don't let specials generate cover images * Don't let specials generate cover images * SearchResults should send LocalizedName back since we are searching against it. * Added some tests around macosx folders found from my actual server. * Put extra notes about a case where duplicates come about, logger will now tell user about this issue. * Missed a build issue somehow... * Some code smells
95 lines
2.3 KiB
C#
95 lines
2.3 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;
|
|
|
|
public NaturalSortComparer(bool inAscendingOrder = true)
|
|
{
|
|
_isAscending = inAscendingOrder;
|
|
}
|
|
|
|
#region IComparer<string> Members
|
|
|
|
public int Compare(string x, string y)
|
|
{
|
|
throw new NotImplementedException();
|
|
}
|
|
|
|
#endregion
|
|
|
|
#region IComparer<string> Members
|
|
|
|
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);
|
|
}
|
|
|
|
#endregion
|
|
|
|
private Dictionary<string, string[]> _table = new Dictionary<string, string[]>();
|
|
|
|
public void Dispose()
|
|
{
|
|
SuppressFinalize(this);
|
|
_table.Clear();
|
|
_table = null;
|
|
}
|
|
}
|
|
} |