Merge pull request #14873 from theguymadmax/use-listorder

Restore NFO/import ordering by using ListOrder instead of SortOrder

1 files changed, 8 insertions, 6 deletions

diff --git a/Jellyfin.Server.Implementations/Item/PeopleRepository.cs b/Jellyfin.Server.Implementations/Item/PeopleRepository.cs
index fc36a4331..e03c13691 100644
--- a/Jellyfin.Server.Implementations/Item/PeopleRepository.cs
+++ b/Jellyfin.Server.Implementations/Item/PeopleRepository.cs
@@ -104,9 +104,7 @@ public class PeopleRepository(IDbContextFactory<JellyfinDbContext> dbProvider, I
 
         var existingMaps = context.PeopleBaseItemMap.Include(e => e.People).Where(e => e.ItemId == itemId).ToList();
 
-        var maxSortOrder = Math.Max(
-            context.PeopleBaseItemMap.Include(e => e.People).Where(e => e.ItemId == itemId && e.People.PersonType == PersonKind.Actor.ToString()).Max(e => (int?)e.SortOrder) ?? 0,
-            people.Where(p => p.Type == PersonKind.Actor && p.SortOrder.HasValue).Max(p => (int?)p.SortOrder) ?? 0);
+        var listOrder = 0;
 
         foreach (var person in people)
         {
@@ -114,23 +112,27 @@ public class PeopleRepository(IDbContextFactory<JellyfinDbContext> dbProvider, I
             var existingMap = existingMaps.FirstOrDefault(e => e.People.Name == person.Name && e.People.PersonType == person.Type.ToString() && e.Role == person.Role);
             if (existingMap is null)
             {
-                var sortOrder = person.Type == PersonKind.Actor ? (person.SortOrder ?? ++maxSortOrder) : person.SortOrder;
                 context.PeopleBaseItemMap.Add(new PeopleBaseItemMap()
                 {
                     Item = null!,
                     ItemId = itemId,
                     People = null!,
                     PeopleId = entityPerson.Id,
-                    ListOrder = sortOrder,
-                    SortOrder = sortOrder,
+                    ListOrder = listOrder,
+                    SortOrder = person.SortOrder,
                     Role = person.Role
                 });
             }
             else
             {
+                // Update the order for existing mappings
+                existingMap.ListOrder = listOrder;
+                existingMap.SortOrder = person.SortOrder;
                 // person mapping already exists so remove from list
                 existingMaps.Remove(existingMap);
             }
+
+            listOrder++;
         }
 
         context.PeopleBaseItemMap.RemoveRange(existingMaps);