The Free Software Media System - Server Backend & API
Merge remote-tracking branch 'upstream/master' into fix-byname-queries
Shadowghostb2485af6e9b2
diff --cc Jellyfin.Server.Implementations/Item/BaseItemRepository.csindex 4c3dba1b47,6622fb3aa6..1d2aa21853--- a/Jellyfin.Server.Implementations/Item/BaseItemRepository.cs+++ b/Jellyfin.Server.Implementations/Item/BaseItemRepository.cs@@@ -46,23 -46,14 +46,31 @@@ public sealed partial class BaseItemRepprivate static readonly IReadOnlyList<ItemValueType> _getStudiosValueTypes = [ItemValueType.Studios];private static readonly IReadOnlyList<ItemValueType> _getGenreValueTypes = [ItemValueType.Genre];+ private static readonly BaseItemKind[] _itemByNameKinds =+ [+ BaseItemKind.Person,+ BaseItemKind.Genre,+ BaseItemKind.MusicGenre,+ BaseItemKind.MusicArtist,+ BaseItemKind.Studio+ ];++ private static readonly (BaseItemKind Kind, IReadOnlyList<ItemValueType> ValueTypes)[] _itemByNameValueTypes =+ [+ (BaseItemKind.Genre, _getGenreValueTypes),+ (BaseItemKind.MusicGenre, _getGenreValueTypes),+ (BaseItemKind.MusicArtist, _getAllArtistsValueTypes),+ (BaseItemKind.Studio, _getStudiosValueTypes)+ ];++ // The only folder kinds whose children form a single viewing sequence, so playback progress on a+ // child rolls up to them. Every other folder kind is a container that cannot be resumed.+ private static readonly BaseItemKind[] _resumableFolderKinds =+ [+ BaseItemKind.Series,+ BaseItemKind.Season+ ];+/// <summary>/// Initializes a new instance of the <see cref="BaseItemRepository"/> class./// </summary>