starred/jellyfin-jellyfin-1
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-12-18 06:53:07 +03:00
Code Issues Packages Projects Releases Wiki Activity

Include ListOrder on Import (#14854)

Browse Source
This commit is contained in:
JPVenson
2025-09-25 00:22:05 +03:00
committed by GitHub
parent 5a6d9180fe
commit 740b9924a0
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Jellyfin.Server.Implementations/Item/BaseItemRepository.cs
View File

@@ -481,7 +481,7 @@ public sealed class BaseItemRepository
var counts = dbQuery var counts = dbQuery
.GroupBy(x => x.Type) .GroupBy(x => x.Type)
.Select(x => new { x.Key, Count = x.Count() }) .Select(x => new { x.Key, Count = x.Count() })
.AsEnumerable(); .ToArray();
var lookup = _itemTypeLookup.BaseItemKindNames; var lookup = _itemTypeLookup.BaseItemKindNames;
var result = new ItemCounts(); var result = new ItemCounts();

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

@@ -319,7 +319,7 @@ internal class MigrateLibraryDb : IDatabaseMigrationRoutine
{ {
const string personsQuery = const string personsQuery =
""" """
SELECT ItemId, Name, Role, PersonType, SortOrder FROM People SELECT ItemId, Name, Role, PersonType, SortOrder, ListOrder FROM People
WHERE EXISTS(SELECT 1 FROM TypedBaseItems WHERE TypedBaseItems.guid = People.ItemId) WHERE EXISTS(SELECT 1 FROM TypedBaseItems WHERE TypedBaseItems.guid = People.ItemId)
"""; """;
@@ -347,6 +347,7 @@ internal class MigrateLibraryDb : IDatabaseMigrationRoutine
} }
int? sortOrder = reader.IsDBNull(4) ? null : reader.GetInt32(4); int? sortOrder = reader.IsDBNull(4) ? null : reader.GetInt32(4);
int? listOrder = reader.IsDBNull(5) ? null : reader.GetInt32(5);
personCache.Items.Add(new PeopleBaseItemMap() personCache.Items.Add(new PeopleBaseItemMap()
{ {
@@ -354,7 +355,7 @@ internal class MigrateLibraryDb : IDatabaseMigrationRoutine
ItemId = itemId, ItemId = itemId,
People = null!, People = null!,
PeopleId = personCache.Person.Id, PeopleId = personCache.Person.Id,
ListOrder = sortOrder, ListOrder = listOrder,
SortOrder = sortOrder, SortOrder = sortOrder,
Role = role Role = role
}); });