mirror of
https://github.com/Kareadita/Kavita.git
synced 2025-06-23 15:30:34 -04:00
* Fixed an issue from perf tuning where I forgot to send Pages to frontend, breaking reader. * Built out continuous reading for webtoon reader. Still has some issues with triggering. * Refactored GetUserByUsernameAsync to have a new flavor and allow the caller to pass in bitwise flags for what to include. This has a get by username or id variant. Code is much cleaner and snappier as we avoid many extra joins when not needed. * Cleanup old code from UserRepository.cs * Refactored OPDS to use faster API lookups for User * Refactored more code to be cleaner and faster. * Refactored GetNext/Prev ChapterIds to ReaderService. * Refactored Repository methods to their correct entity repos. * Refactored DTOs and overall cleanup of the code. * Added ability to press 'b' to bookmark a page * On hitting last page, save progress forcing last page to be read. Adjusted logic for the top and bottom spacers for triggering next/prev chapter load * When at top or moving between chapters, scrolling down then up will now trigger page load. Show a toastr to inform the user of a change in chapter (it can be really fast to switch) * Cleaned up scroll code * Fixed an issue where loading a chapter with last page bookmarked, we'd load lastpage - 1 * Fixed last page of webtoon reader not being resumed on loading said chapter due to a difference in how max page is handled between infinite scroller and manga reader. * Removed some comments * Book reader shouldn't look at left/right tap to paginate elems for position bookmarking. Missed a few areas for saving while in incognito mode * Added a benchmark to test out a sort code * Updated the read status on reading list to use same style as other places * Refactored GetNextChapterId to bring the average response time from 1.2 seconds to 400ms. * Added a filter to add to list when there are more than 5 reading lists * Added download reading list (will be removed, just saving for later). Fixes around styling on reading lists * Removed ability to download reading lists * Tweaked the logic for infinite scroller to be much smoother loading next/prev chapter. Added a bug marker for a concurrency bug. * Updated the top spacer so that when you hit the top, you stay at the page height and can now just scroll up. * Got the logic for scrolling up. Now just need the CSS then cont infinite scroller will be working * More polishing on infinite scroller * Removed IsSpecial on volumeDto, which is not used anywhere. * Cont Reading inf scroller edition is done. * Code smells and fixed package.json explore script
103 lines
2.8 KiB
C#
103 lines
2.8 KiB
C#
using System;
|
|
using System.Collections.Generic;
|
|
using System.Text.RegularExpressions;
|
|
using static System.GC;
|
|
using static System.String;
|
|
|
|
namespace API.Comparators
|
|
{
|
|
public sealed class NaturalSortComparer : IComparer<string>, IDisposable
|
|
{
|
|
private readonly bool _isAscending;
|
|
private Dictionary<string, string[]> _table = new();
|
|
|
|
private bool _disposed;
|
|
|
|
|
|
public NaturalSortComparer(bool inAscendingOrder = true)
|
|
{
|
|
_isAscending = inAscendingOrder;
|
|
}
|
|
|
|
int IComparer<string>.Compare(string x, string y)
|
|
{
|
|
if (x == y) return 0;
|
|
|
|
// BUG: Operations that change non-concurrent collections must have exclusive access. A concurrent update was performed on this collection and corrupted its state. The collection's state is no longer correct.
|
|
if (!_table.TryGetValue(x ?? Empty, out var x1))
|
|
{
|
|
x1 = Regex.Split(x ?? Empty, "([0-9]+)");
|
|
_table.Add(x ?? Empty, x1);
|
|
}
|
|
|
|
if (!_table.TryGetValue(y ?? Empty, out var y1))
|
|
{
|
|
y1 = Regex.Split(y ?? Empty, "([0-9]+)");
|
|
_table.Add(y ?? Empty, 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)
|
|
{
|
|
if (!int.TryParse(left, out var x))
|
|
return Compare(left, right, StringComparison.Ordinal);
|
|
|
|
if (!int.TryParse(right, out var y))
|
|
return Compare(left, right, StringComparison.Ordinal);
|
|
|
|
return x.CompareTo(y);
|
|
}
|
|
|
|
private void Dispose(bool disposing)
|
|
{
|
|
if (!_disposed)
|
|
{
|
|
if (disposing)
|
|
{
|
|
// called via myClass.Dispose().
|
|
_table.Clear();
|
|
_table = null;
|
|
}
|
|
// Release unmanaged resources.
|
|
// Set large fields to null.
|
|
_disposed = true;
|
|
}
|
|
}
|
|
|
|
public void Dispose()
|
|
{
|
|
Dispose(true);
|
|
SuppressFinalize(this);
|
|
}
|
|
|
|
~NaturalSortComparer() // the finalizer
|
|
{
|
|
Dispose(false);
|
|
}
|
|
}
|
|
}
|