Cutlery/Kavita
1
0
Fork 0
mirror of https://github.com/Kareadita/Kavita.git synced 2026-06-05 22:35:17 -04:00
Code Issues Packages Projects Releases Wiki Activity

Koreader Sync Fix and More (#4006)

Browse Source 
Co-authored-by: Joe Milazzo <josephmajora@gmail.com>
This commit is contained in:
Fesaa
2025-08-28 01:44:30 +02:00
committed by GitHub
parent aa268c2dca
commit 6137d2a30e
30 changed files with 556 additions and 310 deletions
Download Patch File Download Diff File Expand all files Collapse all files
API/Data/Repositories/SeriesRepository.cs
+26 -12
View File
@@ -134,7 +134,7 @@ public interface ISeriesRepository
Task<Series?> GetFullSeriesForSeriesIdAsync(int seriesId);
Task<Chunk> GetChunkInfo(int libraryId = 0);
Task<IList<SeriesMetadata>> GetSeriesMetadataForIdsAsync(IEnumerable<int> seriesIds);
Task<IEnumerable<GroupedSeriesDto>> GetRecentlyUpdatedSeries(int userId, int pageSize = 30);
Task<IEnumerable<GroupedSeriesDto>> GetRecentlyUpdatedSeries(int userId, UserParams? userParams);
Task<RelatedSeriesDto> GetRelatedSeries(int userId, int seriesId);
Task<IEnumerable<SeriesDto>> GetSeriesForRelationKind(int userId, int seriesId, RelationKind kind);
Task<PagedList<SeriesDto>> GetQuickReads(int userId, int libraryId, UserParams userParams);
@@ -417,7 +417,8 @@ public class SeriesRepository : ISeriesRepository
.Include(s => s.Library)
.AsNoTracking()
.AsSplitQuery()
.OrderBy(s => s.SortName!.ToLower())
.OrderBy(s => s.SortName!.Length)
.ThenBy(s => s.SortName!.ToLower())
.Take(maxRecords)
.ProjectTo<SearchResultDto>(_mapper.ConfigurationProvider)
.AsEnumerable();
@@ -435,7 +436,8 @@ public class SeriesRepository : ISeriesRepository
EF.Functions.Like(joined.Series.OriginalName, $"%{searchQuery}%")) ||
(joined.Series.LocalizedName != null &&
EF.Functions.Like(joined.Series.LocalizedName, $"%{searchQuery}%"))))
.OrderBy(joined => joined.Series.Name)
.OrderBy(joined => joined.Series.NormalizedName.Length)
.ThenBy(joined => joined.Series.NormalizedName)
.Take(maxRecords)
.Select(joined => new BookmarkSearchResultDto()
{
@@ -473,7 +475,8 @@ public class SeriesRepository : ISeriesRepository
result.Persons = await _context.Person
.Where(p => personIds.Contains(p.Id))
.OrderBy(p => p.NormalizedName)
.OrderBy(p => p.NormalizedName.Length)
.ThenBy(p => p.NormalizedName)
.ProjectTo<PersonDto>(_mapper.ConfigurationProvider)
.ToListAsync();
@@ -523,7 +526,8 @@ public class SeriesRepository : ISeriesRepository
)
.Where(c => c.Files.All(f => fileIds.Contains(f.Id)))
.AsSplitQuery()
.OrderBy(c => c.TitleName)
.OrderBy(c => c.TitleName.Length)
.ThenBy(c => c.TitleName)
.Take(maxRecords)
.ProjectTo<ChapterDto>(_mapper.ConfigurationProvider)
.ToListAsync();
@@ -1476,12 +1480,12 @@ public class SeriesRepository : ISeriesRepository
/// <remarks>This provides 2 levels of pagination. Fetching the individual chapters only looks at 3000. Then when performing grouping
/// in memory, we stop after 30 series. </remarks>
/// <param name="userId">Used to ensure user has access to libraries</param>
/// <param name="pageSize">How many entities to return</param>
/// <param name="userParams">Page size and offset</param>
/// <returns></returns>
public async Task<IEnumerable<GroupedSeriesDto>> GetRecentlyUpdatedSeries(int userId, int pageSize = 30)
public async Task<IEnumerable<GroupedSeriesDto>> GetRecentlyUpdatedSeries(int userId, UserParams? userParams)
{
var seriesMap = new Dictionary<string, GroupedSeriesDto>();
var index = 0;
userParams ??= UserParams.Default;
var userRating = await _context.AppUser.GetUserAgeRestriction(userId);
var items = (await GetRecentlyAddedChaptersQuery(userId));
@@ -1490,20 +1494,30 @@ public class SeriesRepository : ISeriesRepository
items = items.RestrictAgainstAgeRestriction(userRating);
}
var index = 0;
var seriesMap = new Dictionary<int, GroupedSeriesDto>();
var toSkip = (userParams.PageNumber - 1) * userParams.PageSize;
var skipped = new HashSet<int>();
foreach (var item in items)
{
if (seriesMap.Keys.Count == pageSize) break;
if (seriesMap.Keys.Count == userParams.PageSize) break;
if (item.SeriesName == null) continue;
if (skipped.Count < toSkip)
{
skipped.Add(item.SeriesId);
continue;
}
if (seriesMap.TryGetValue(item.SeriesName + "_" + item.LibraryId, out var value))
if (seriesMap.TryGetValue(item.SeriesId, out var value))
{
value.Count += 1;
}
else
{
seriesMap[item.SeriesName + "_" + item.LibraryId] = new GroupedSeriesDto()
seriesMap[item.SeriesId] = new GroupedSeriesDto()
{
LibraryId = item.LibraryId,
LibraryType = item.LibraryType,