Cutlery/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-07-09 03:04:24 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #13616 from Lampan-git/fix_people_role

Browse Source 
Include PeopleBaseItemMap in GetPeople to inlcude Role and SortOrder
This commit is contained in:
Niels van Velzen 2025-03-24 15:29:28 +01:00 committed by GitHub
commit 8680170706
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Jellyfin.Server.Implementations/Item/PeopleRepository.cs
View File

@ -39,6 +39,12 @@ public class PeopleRepository(IDbContextFactory<JellyfinDbContext> dbProvider, I
dbQuery = dbQuery.Take(filter.Limit); dbQuery = dbQuery.Take(filter.Limit);
} }
// Include PeopleBaseItemMap
if (!filter.ItemId.IsEmpty())
{
dbQuery = dbQuery.Include(p => p.BaseItems!.Where(m => m.ItemId == filter.ItemId));
}
return dbQuery.AsEnumerable().Select(Map).ToArray(); return dbQuery.AsEnumerable().Select(Map).ToArray();
} }
@ -93,10 +99,13 @@ public class PeopleRepository(IDbContextFactory<JellyfinDbContext> dbProvider, I
private PersonInfo Map(People people) private PersonInfo Map(People people)
{ {
var mapping = people.BaseItems?.FirstOrDefault();
var personInfo = new PersonInfo() var personInfo = new PersonInfo()
{ {
Id = people.Id, Id = people.Id,
Name = people.Name, Name = people.Name,
Role = mapping?.Role,
SortOrder = mapping?.SortOrder
}; };
if (Enum.TryParse<PersonKind>(people.PersonType, out var kind)) if (Enum.TryParse<PersonKind>(people.PersonType, out var kind))
{ {

4
Jellyfin.Server/Migrations/Routines/MigrateLibraryDb.cs
View File

@ -242,9 +242,7 @@ public class MigrateLibraryDb : IMigrationRoutine
{ {
} }
if (reader.TryGetInt32(4, out var sortOrder)) int? sortOrder = reader.IsDBNull(4) ? null : reader.GetInt32(4);
{
}
personCache.Items.Add(new PeopleBaseItemMap() personCache.Items.Add(new PeopleBaseItemMap()
{ {