AZEN-SGG/Kavita
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'refs/heads/develop' into feature/user-fonts

Browse source 
# Conflicts:
#	API/Services/TaskScheduler.cs
This commit is contained in:
Fesaa 2024-07-08 21:19:07 +02:00
commit 1f2ea8f59d
No known key found for this signature in database
GPG key ID: 9EA789150BEE0E27
100 changed files with 3553 additions and 1416 deletions
Download patch file Download diff file Expand all files Collapse all files

16
API/Extensions/QueryExtensions/IncludesExtensions.cs
View file

@ -65,22 +65,28 @@ public static class IncludesExtensions
public static IQueryable<Volume> Includes(this IQueryable<Volume> queryable,
VolumeIncludes includes)
{
if (includes.HasFlag(VolumeIncludes.Chapters))
if (includes.HasFlag(VolumeIncludes.Files))
{
queryable = queryable.Include(vol => vol.Chapters);
queryable = queryable
.Include(vol => vol.Chapters.OrderBy(c => c.SortOrder))
.ThenInclude(c => c.Files);
} else if (includes.HasFlag(VolumeIncludes.Chapters))
{
queryable = queryable
.Include(vol => vol.Chapters.OrderBy(c => c.SortOrder));
}
if (includes.HasFlag(VolumeIncludes.People))
{
queryable = queryable
.Include(vol => vol.Chapters)
.Include(vol => vol.Chapters.OrderBy(c => c.SortOrder))
.ThenInclude(c => c.People);
}
if (includes.HasFlag(VolumeIncludes.Tags))
{
queryable = queryable
.Include(vol => vol.Chapters)
.Include(vol => vol.Chapters.OrderBy(c => c.SortOrder))
.ThenInclude(c => c.Tags);
}
@ -104,7 +110,7 @@ public static class IncludesExtensions
{
query = query
.Include(s => s.Volumes)
.ThenInclude(v => v.Chapters);
.ThenInclude(v => v.Chapters.OrderBy(c => c.SortOrder));
}
if (includeFlags.HasFlag(SeriesIncludes.Related))