The Free Software Media System - Server Backend & API
Fix video version links being read from stale serialised item data instead of the LinkedChildren table
Shadowghost7a4271c85f98
diff --git a/Jellyfin.Server.Implementations/Item/BaseItemMapper.cs b/Jellyfin.Server.Implementations/Item/BaseItemMapper.csindex c64e6ac068..fe202b69ff 100644--- a/Jellyfin.Server.Implementations/Item/BaseItemMapper.cs+++ b/Jellyfin.Server.Implementations/Item/BaseItemMapper.cs@@ -134,6 +134,21 @@ public static class BaseItemMapperif (dto is Video video){video.PrimaryVersionId = entity.PrimaryVersionId;++ // The LinkedChildren table is the source of truth for version links+ if (entity.LinkedChildEntities is not null)+ {+ video.LinkedAlternateVersions = entity.LinkedChildEntities+ .Where(e => e.ChildType is Database.Implementations.Entities.LinkedChildType.LinkedAlternateVersion+ or Database.Implementations.Entities.LinkedChildType.AutoLinkedAlternateVersion)+ .OrderBy(e => e.SortOrder)+ .Select(e => new LinkedChild+ {+ ItemId = e.ChildId,+ Type = (MediaBrowser.Controller.Entities.LinkedChildType)e.ChildType+ })+ .ToArray();+ }}if (dto is IHasSeries hasSeriesName)diff --git a/Jellyfin.Server.Implementations/Item/BaseItemRepository.QueryBuilding.cs b/Jellyfin.Server.Implementations/Item/BaseItemRepository.QueryBuilding.csindex a4de9feb05..3a166979ca 100644--- a/Jellyfin.Server.Implementations/Item/BaseItemRepository.QueryBuilding.cs+++ b/Jellyfin.Server.Implementations/Item/BaseItemRepository.QueryBuilding.cs@@ -244,8 +244,8 @@ public sealed partial class BaseItemRepositorydbQuery = dbQuery.Include(e => e.Images);}- // Include LinkedChildEntities for container types and videos that use them- // (BoxSet, Playlist, CollectionFolder for manual linking; Video, Movie for alternate versions).+ // Include LinkedChildEntities for container types and videos that use them (BoxSet, Playlist,+ // CollectionFolder for manual linking; every video type for alternate versions).// When IncludeItemTypes is empty (any type may be returned), always include them to ensure// LinkedChildren are loaded before items are saved back, preventing accidental deletion.var linkedChildTypes = new[]@@ -254,7 +254,10 @@ public sealed partial class BaseItemRepositoryBaseItemKind.Playlist,BaseItemKind.CollectionFolder,BaseItemKind.Video,- BaseItemKind.Movie+ BaseItemKind.Movie,+ BaseItemKind.Episode,+ BaseItemKind.MusicVideo,+ BaseItemKind.Trailer};if (filter.IncludeItemTypes.Length == 0 || filter.IncludeItemTypes.Any(linkedChildTypes.Contains)){