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

Text View, View & Filter All Annotations, and More OPDS Love (#4062)

Browse Source 
Co-authored-by: Amelia <77553571+Fesaa@users.noreply.github.com>
This commit is contained in:
Joe Milazzo
2025-09-28 14:28:21 -05:00
committed by GitHub
parent becb3d8c3b
commit 5290fd8959
139 changed files with 12399 additions and 2516 deletions
Download Patch File Download Diff File Expand all files Collapse all files
API/Extensions/QueryExtensions/QueryableExtensions.cs
+52 -1
View File
@@ -6,6 +6,7 @@ using System.Threading.Tasks;
using API.Data.Misc;
using API.Data.Repositories;
using API.DTOs;
using API.DTOs.Annotations;
using API.DTOs.Filtering;
using API.DTOs.KavitaPlus.Manage;
using API.DTOs.Metadata.Browse;
@@ -291,10 +292,29 @@ public static class QueryableExtensions
PersonSortField.SeriesCount => query.OrderByDescending(p => p.SeriesMetadataPeople.Count),
PersonSortField.ChapterCount when sort.IsAscending => query.OrderBy(p => p.ChapterPeople.Count),
PersonSortField.ChapterCount => query.OrderByDescending(p => p.ChapterPeople.Count),
_ => query.OrderBy(p => p.Name)
_ => query.OrderBy(p => p.Name),
};
}
public static IQueryable<AppUserAnnotation> SortBy(this IQueryable<AppUserAnnotation> query, AnnotationSortOptions? sort)
{
if (sort == null)
{
return query.OrderBy(a => a.CreatedUtc);
}
return sort.SortField switch
{
AnnotationSortField.Owner when sort.IsAscending => query.OrderBy(a => a.AppUser.UserName),
AnnotationSortField.Owner => query.OrderByDescending(a => a.AppUser.UserName),
AnnotationSortField.Created when sort.IsAscending => query.OrderBy(a => a.CreatedUtc),
AnnotationSortField.Created => query.OrderByDescending(a => a.CreatedUtc),
AnnotationSortField.LastModified when sort.IsAscending => query.OrderBy(a => a.LastModifiedUtc),
AnnotationSortField.LastModified => query.OrderByDescending(a => a.LastModifiedUtc),
AnnotationSortField.Color when sort.IsAscending => query.OrderBy(a => a.SelectedSlotIndex),
AnnotationSortField.Color => query.OrderByDescending(a => a.SelectedSlotIndex),
_ => query.OrderBy(a => a.CreatedUtc),
};
}
/// <summary>
@@ -325,4 +345,35 @@ public static class QueryableExtensions
_ => query
};
}
public static IQueryable<FullAnnotationDto> SelectFullAnnotation(this IQueryable<AppUserAnnotation> query)
{
return query.Select(a => new FullAnnotationDto
{
Id = a.Id,
UserId = a.AppUserId,
SelectedText = a.SelectedText,
Comment = a.Comment,
CommentHtml = a.CommentHtml,
CommentPlainText = a.CommentPlainText,
Context = a.Context,
ChapterTitle = a.ChapterTitle,
PageNumber = a.PageNumber,
SelectedSlotIndex = a.SelectedSlotIndex,
ContainsSpoiler = a.ContainsSpoiler,
CreatedUtc = a.CreatedUtc,
LastModifiedUtc = a.LastModifiedUtc,
LibraryId = a.LibraryId,
LibraryName = a.Chapter.Volume.Series.Library.Name,
SeriesId = a.SeriesId,
SeriesName = a.Chapter.Volume.Series.Name,
VolumeId = a.VolumeId,
VolumeName = a.Chapter.Volume.Name,
ChapterId = a.ChapterId,
})
.OrderBy(a => a.SeriesId)
.ThenBy(a => a.VolumeId)
.ThenBy(a => a.ChapterId)
.ThenBy(a => a.PageNumber);
}
}