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

Reading List Polish (#4634)

Browse Source 
Co-authored-by: Amelia <77553571+Fesaa@users.noreply.github.com>
Co-authored-by: Arden Rasmussen <ardenisthebest@gmail.com>
This commit is contained in:
Joe Milazzo
2026-04-23 15:18:49 -05:00
committed by GitHub
parent 9e44ac285d
commit 485c6f87a8
122 changed files with 1532 additions and 1072 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Kavita.Database/Extensions/QueryableExtensions.cs
+9 -27
View File
@@ -6,7 +6,6 @@ using System.Threading;
using System.Threading.Tasks;
using Kavita.API.Repositories;
using Kavita.Models.DTOs.Annotations;
using Kavita.Models.DTOs.Filtering;
using Kavita.Models.DTOs.Filtering.v2.SortFields;
using Kavita.Models.DTOs.Filtering.v2.SortOptions;
using Kavita.Models.DTOs.KavitaPlus.Manage;
@@ -114,24 +113,6 @@ public static class QueryableExtensions
.Select(lib => lib.Id);
}
/// <summary>
/// Returns all libraries for a given user and library type
/// </summary>
/// <param name="library"></param>
/// <param name="userId"></param>
/// <param name="queryContext"></param>
/// <returns></returns>
public static IQueryable<int> GetUserLibrariesByType(this IQueryable<Library> library, int userId, LibraryType type, QueryContext queryContext = QueryContext.None)
{
return library
.Include(l => l.AppUsers)
.Where(lib => lib.AppUsers.Any(user => user.Id == userId))
.Where(lib => lib.Type == type)
.IsRestricted(queryContext)
.AsNoTracking()
.AsSplitQuery()
.Select(lib => lib.Id);
}
public static IEnumerable<DateTime> Range(this DateTime startDate, int numberOfDays) =>
Enumerable.Range(0, numberOfDays).Select(e => startDate.AddDays(e));
@@ -250,11 +231,12 @@ public static class QueryableExtensions
{
if (!condition || string.IsNullOrEmpty(searchQuery)) return queryable;
var method = typeof(DbFunctionsExtensions).GetMethod(nameof(DbFunctionsExtensions.Like), new[] { typeof(DbFunctions), typeof(string), typeof(string) });
var method = typeof(DbFunctionsExtensions).GetMethod(nameof(DbFunctionsExtensions.Like), [typeof(DbFunctions), typeof(string), typeof(string)
]);
var dbFunctions = typeof(EF).GetMethod(nameof(EF.Functions))?.Invoke(null, null);
var searchExpression = Expression.Constant($"%{searchQuery}%");
Expression orExpression = null;
Expression? orExpression = null;
foreach (var propertySelector in propertySelectors)
{
var likeExpression = Expression.Call(method, Expression.Constant(dbFunctions), propertySelector.Body, searchExpression);
@@ -310,8 +292,8 @@ public static class QueryableExtensions
return sort.SortField switch
{
PersonSortField.Name when sort.IsAscending => query.OrderBy(p => p.Name),
PersonSortField.Name => query.OrderByDescending(p => p.Name),
PersonSortField.Name when sort.IsAscending => query.OrderBy(p => p.Name.ToLower()),
PersonSortField.Name => query.OrderByDescending(p => p.Name.ToLower()),
PersonSortField.SeriesCount when sort.IsAscending => query.OrderBy(p => p.SeriesMetadataPeople.Count),
PersonSortField.SeriesCount => query.OrderByDescending(p => p.SeriesMetadataPeople.Count),
PersonSortField.ChapterCount when sort.IsAscending => query.OrderBy(p => p.ChapterPeople.Count),
@@ -324,20 +306,20 @@ public static class QueryableExtensions
{
if (sort == null)
{
return query.OrderBy(p => p.Title);
return query.OrderBy(p => p.Title.ToLower());
}
return sort.SortField switch
{
ReadingListSortField.Title when sort.IsAscending => query.OrderBy(p => p.Title),
ReadingListSortField.Title => query.OrderByDescending(p => p.Title),
ReadingListSortField.Title when sort.IsAscending => query.OrderBy(p => p.Title.ToLower()),
ReadingListSortField.Title => query.OrderByDescending(p => p.Title.ToLower()),
ReadingListSortField.ReleaseYearStart when sort.IsAscending => query.OrderBy(r => r.StartingYear),
ReadingListSortField.ReleaseYearStart => query.OrderByDescending(r => r.StartingYear),
ReadingListSortField.ReleaseYearEnd when sort.IsAscending => query.OrderBy(r => r.EndingYear),
ReadingListSortField.ReleaseYearEnd => query.OrderByDescending(r => r.EndingYear),
ReadingListSortField.ItemCount when sort.IsAscending => query.OrderBy(r => r.Items.Count),
ReadingListSortField.ItemCount => query.OrderByDescending(r => r.Items.Count),
_ => query.OrderBy(p => p.Title),
_ => query.OrderBy(p => p.Title.ToLower()),
};
}