Merge remote-tracking branch 'upstream/master' into fix-byname-queries

# Conflicts:
#	Jellyfin.Server.Implementations/Item/BaseItemRepository.cs
This commit is contained in:
Shadowghost
2026-08-05 12:15:30 +02:00
21 changed files with 251 additions and 28 deletions
@@ -63,6 +63,14 @@ public sealed partial class BaseItemRepository
(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>