The Free Software Media System - Server Backend & API
fix person TotalRecordCount when limit is applied
dkanadaec990be12af3
diff --git a/Emby.Server.Implementations/Library/LibraryManager.cs b/Emby.Server.Implementations/Library/LibraryManager.csindex eee87c4d8b..a7062914cf 100644--- a/Emby.Server.Implementations/Library/LibraryManager.cs+++ b/Emby.Server.Implementations/Library/LibraryManager.cs@@ -34,14 +34,11 @@ using MediaBrowser.Controller.IO;using MediaBrowser.Controller.Library;using MediaBrowser.Controller.LiveTv;using MediaBrowser.Controller.MediaEncoding;-using MediaBrowser.Controller.MediaSegments;using MediaBrowser.Controller.Persistence;using MediaBrowser.Controller.Providers;using MediaBrowser.Controller.Resolvers;using MediaBrowser.Controller.Sorting;-using MediaBrowser.Controller.Trickplay;using MediaBrowser.Model.Configuration;-using MediaBrowser.Model.Dlna;using MediaBrowser.Model.Drawing;using MediaBrowser.Model.Dto;using MediaBrowser.Model.Entities;@@ -2918,7 +2915,7 @@ namespace Emby.Server.Implementations.Librarypublic IReadOnlyList<PersonInfo> GetPeople(InternalPeopleQuery query){- return _peopleRepository.GetPeople(query);+ return _peopleRepository.GetPeople(query).Items;}public IReadOnlyList<PersonInfo> GetPeople(BaseItem item)@@ -2939,24 +2936,33 @@ namespace Emby.Server.Implementations.Libraryreturn [];}- public IReadOnlyList<Person> GetPeopleItems(InternalPeopleQuery query)+ public QueryResult<BaseItem> GetPeopleItems(InternalPeopleQuery query){- return _peopleRepository.GetPeopleNames(query)- .Select(i =>- {- try+ var queryResult = _peopleRepository.GetPeople(query);+ var baseItems = queryResult.Items.Select(i =>{- return GetPerson(i);- }- catch (Exception ex)- {- _logger.LogError(ex, "Error getting person");- return null;- }- })- .Where(i => i is not null)- .Where(i => query.User is null || i!.IsVisible(query.User))- .ToList()!; // null values are filtered out+ try+ {+ return GetPerson(i.Name);+ }+ catch (Exception ex)+ {+ _logger.LogError(ex, "error retrieving BaseItem for person: {0}", i.Name);+ return null;+ }+ })+ .Where(i => i is not null)+ .Where(i => query.User is null || i!.IsVisible(query.User))+ .OfType<BaseItem>()+ .ToList()+ .AsReadOnly();++ return new QueryResult<BaseItem>+ {+ StartIndex = queryResult.StartIndex,+ TotalRecordCount = queryResult.TotalRecordCount,+ Items = baseItems,+ };}public IReadOnlyList<string> GetPeopleNames(InternalPeopleQuery query)diff --git a/Jellyfin.Api/Controllers/PersonsController.cs b/Jellyfin.Api/Controllers/PersonsController.csindex 2b2afb0fe6..bc58580741 100644--- a/Jellyfin.Api/Controllers/PersonsController.cs+++ b/Jellyfin.Api/Controllers/PersonsController.cs@@ -106,9 +106,11 @@ public class PersonsController : BaseJellyfinApiController});return new QueryResult<BaseItemDto>(- peopleItems- .Select(person => _dtoService.GetItemByNameDto(person, dtoOptions, null, user))- .ToArray());+ peopleItems.StartIndex,+ peopleItems.TotalRecordCount,+ peopleItems.Items+ .Select(person => _dtoService.GetItemByNameDto(person, dtoOptions, null, user))+ .ToArray());}/// <summary>diff --git a/Jellyfin.Server.Implementations/Item/PeopleRepository.cs b/Jellyfin.Server.Implementations/Item/PeopleRepository.csindex ad9953d1b6..576e786cb7 100644--- a/Jellyfin.Server.Implementations/Item/PeopleRepository.cs+++ b/Jellyfin.Server.Implementations/Item/PeopleRepository.cs@@ -1,14 +1,13 @@using System;using System.Collections.Generic;-using System.Collections.Immutable;using System.Linq;using Jellyfin.Data.Enums;using Jellyfin.Database.Implementations;using Jellyfin.Database.Implementations.Entities;-using Jellyfin.Database.Implementations.Entities.Libraries;using Jellyfin.Extensions;using MediaBrowser.Controller.Entities;using MediaBrowser.Controller.Persistence;+using MediaBrowser.Model.Querying;using Microsoft.EntityFrameworkCore;namespace Jellyfin.Server.Implementations.Item;@@ -30,7 +29,7 @@ public class PeopleRepository(IDbContextFactory<JellyfinDbContext> dbProvider, Iprivate readonly IDbContextFactory<JellyfinDbContext> _dbProvider = dbProvider;/// <inheritdoc/>- public IReadOnlyList<PersonInfo> GetPeople(InternalPeopleQuery filter)+ public QueryResult<PersonInfo> GetPeople(InternalPeopleQuery filter){using var context = _dbProvider.CreateDbContext();var dbQuery = TranslateQuery(context.Peoples.AsNoTracking(), context, filter);@@ -48,12 +47,23 @@ public class PeopleRepository(IDbContextFactory<JellyfinDbContext> dbProvider, IdbQuery = dbQuery.OrderBy(e => e.Name);}+ var count = dbQuery.Count();+ if (filter.StartIndex.HasValue && filter.StartIndex > 0)+ {+ dbQuery = dbQuery.Skip(filter.StartIndex.Value);+ }+if (filter.Limit > 0){dbQuery = dbQuery.Take(filter.Limit);}- return dbQuery.AsEnumerable().Select(Map).ToArray();+ return new QueryResult<PersonInfo>+ {+ StartIndex = filter.StartIndex ?? 0,+ TotalRecordCount = count,+ Items = dbQuery.AsEnumerable().Select(Map).ToArray(),+ };}/// <inheritdoc/>diff --git a/MediaBrowser.Controller/Library/ILibraryManager.cs b/MediaBrowser.Controller/Library/ILibraryManager.csindex df1c98f3f7..a96667545e 100644--- a/MediaBrowser.Controller/Library/ILibraryManager.cs+++ b/MediaBrowser.Controller/Library/ILibraryManager.cs@@ -514,7 +514,7 @@ namespace MediaBrowser.Controller.Library/// </summary>/// <param name="query">The query.</param>/// <returns>List<Person>.</returns>- IReadOnlyList<Person> GetPeopleItems(InternalPeopleQuery query);+ QueryResult<BaseItem> GetPeopleItems(InternalPeopleQuery query);/// <summary>/// Updates the people.diff --git a/MediaBrowser.Controller/Persistence/IPeopleRepository.cs b/MediaBrowser.Controller/Persistence/IPeopleRepository.csindex 418289cb4c..a89f3ef9ee 100644--- a/MediaBrowser.Controller/Persistence/IPeopleRepository.cs+++ b/MediaBrowser.Controller/Persistence/IPeopleRepository.cs@@ -1,13 +1,15 @@#nullable disable-#pragma warning disable CS1591-using System;using System.Collections.Generic;using MediaBrowser.Controller.Entities;+using MediaBrowser.Model.Querying;namespace MediaBrowser.Controller.Persistence;+/// <summary>+/// Provides methods for accessing Peoples.+/// </summary>public interface IPeopleRepository{/// <summary>@@ -15,7 +17,7 @@ public interface IPeopleRepository/// </summary>/// <param name="filter">The query.</param>/// <returns>The list of people matching the filter.</returns>- IReadOnlyList<PersonInfo> GetPeople(InternalPeopleQuery filter);+ QueryResult<PersonInfo> GetPeople(InternalPeopleQuery filter);/// <summary>/// Updates the people.