Merge remote-tracking branch 'upstream/master' into search-rebased

8 files changed, 41 insertions, 22 deletions

diff --git a/Jellyfin.Server.Implementations/Activity/ActivityManager.cs b/Jellyfin.Server.Implementations/Activity/ActivityManager.cs
index fe987b9d86..ba24dc3864 100644
--- a/Jellyfin.Server.Implementations/Activity/ActivityManager.cs
+++ b/Jellyfin.Server.Implementations/Activity/ActivityManager.cs
@@ -58,9 +58,9 @@ public class ActivityManager : IActivityManager
         {
             // TODO switch to LeftJoin in .NET 10.
             var entries = from a in dbContext.ActivityLogs
-                join u in dbContext.Users on a.UserId equals u.Id into ugj
-                from u in ugj.DefaultIfEmpty()
-                select new ExpandedActivityLog { ActivityLog = a, Username = u.Username };
+                          join u in dbContext.Users on a.UserId equals u.Id into ugj
+                          from u in ugj.DefaultIfEmpty()
+                          select new ExpandedActivityLog { ActivityLog = a, Username = u.Username };
 
             if (query.HasUserId is not null)
             {
diff --git a/Jellyfin.Server.Implementations/Events/Consumers/Session/PlaybackStopLogger.cs b/Jellyfin.Server.Implementations/Events/Consumers/Session/PlaybackStopLogger.cs
index 09d68e4451..a88904c727 100644
--- a/Jellyfin.Server.Implementations/Events/Consumers/Session/PlaybackStopLogger.cs
+++ b/Jellyfin.Server.Implementations/Events/Consumers/Session/PlaybackStopLogger.cs
@@ -75,9 +75,9 @@ namespace Jellyfin.Server.Implementations.Events.Consumers.Session
                         eventArgs.DeviceName),
                     notificationType,
                     user.Id)
-                {
-                    ItemId = eventArgs.Item?.Id.ToString("N", CultureInfo.InvariantCulture),
-                })
+            {
+                ItemId = eventArgs.Item?.Id.ToString("N", CultureInfo.InvariantCulture),
+            })
                 .ConfigureAwait(false);
         }
 
diff --git a/Jellyfin.Server.Implementations/Item/BaseItemMapper.cs b/Jellyfin.Server.Implementations/Item/BaseItemMapper.cs
index 736388e9eb..c64e6ac068 100644
--- a/Jellyfin.Server.Implementations/Item/BaseItemMapper.cs
+++ b/Jellyfin.Server.Implementations/Item/BaseItemMapper.cs
@@ -26,7 +26,7 @@ namespace Jellyfin.Server.Implementations.Item;
 /// <summary>
 /// Handles mapping between BaseItemEntity (database) and BaseItemDto (domain) objects.
 /// </summary>
-internal static class BaseItemMapper
+public static class BaseItemMapper
 {
     /// <summary>
     /// This holds all the types in the running assemblies
diff --git a/Jellyfin.Server.Implementations/Item/BaseItemRepository.TranslateQuery.cs b/Jellyfin.Server.Implementations/Item/BaseItemRepository.TranslateQuery.cs
index bee1bf3f9d..d905775aef 100644
--- a/Jellyfin.Server.Implementations/Item/BaseItemRepository.TranslateQuery.cs
+++ b/Jellyfin.Server.Implementations/Item/BaseItemRepository.TranslateQuery.cs
@@ -1020,6 +1020,15 @@ public sealed partial class BaseItemRepository
             baseQuery = baseQuery.Where(e => e.Parents!.AsQueryable().Any(ancestorFilter));
         }
 
+        if (filter.LinkedChildAncestorIds.Length > 0)
+        {
+            // Keep folder-like items (BoxSets, Playlists) whose linked children descend from any of the requested ancestor ids.
+            var linkedChildAncestorIds = filter.LinkedChildAncestorIds;
+            baseQuery = baseQuery.Where(e => context.LinkedChildren.Any(lc =>
+                lc.ParentId == e.Id
+                && lc.Child!.Parents!.Any(a => linkedChildAncestorIds.Contains(a.ParentItemId))));
+        }
+
         if (!string.IsNullOrWhiteSpace(filter.AncestorWithPresentationUniqueKey))
         {
             baseQuery = baseQuery
diff --git a/Jellyfin.Server.Implementations/Item/ChapterRepository.cs b/Jellyfin.Server.Implementations/Item/ChapterRepository.cs
index 98700f3224..f7d76517e1 100644
--- a/Jellyfin.Server.Implementations/Item/ChapterRepository.cs
+++ b/Jellyfin.Server.Implementations/Item/ChapterRepository.cs
@@ -55,6 +55,7 @@ public class ChapterRepository : IChapterRepository
     {
         using var context = _dbProvider.CreateDbContext();
         return context.Chapters.AsNoTracking().Where(e => e.ItemId.Equals(baseItemId))
+            .OrderBy(e => e.StartPositionTicks)
             .Select(e => new
             {
                 chapter = e,
@@ -69,18 +70,16 @@ public class ChapterRepository : IChapterRepository
     public void SaveChapters(Guid itemId, IReadOnlyList<ChapterInfo> chapters)
     {
         using var context = _dbProvider.CreateDbContext();
-        using (var transaction = context.Database.BeginTransaction())
+        using var transaction = context.Database.BeginTransaction();
+        context.Chapters.Where(e => e.ItemId.Equals(itemId)).ExecuteDelete();
+        for (var i = 0; i < chapters.Count; i++)
         {
-            context.Chapters.Where(e => e.ItemId.Equals(itemId)).ExecuteDelete();
-            for (var i = 0; i < chapters.Count; i++)
-            {
-                var chapter = chapters[i];
-                context.Chapters.Add(Map(chapter, i, itemId));
-            }
-
-            context.SaveChanges();
-            transaction.Commit();
+            var chapter = chapters[i];
+            context.Chapters.Add(Map(chapter, i, itemId));
         }
+
+        context.SaveChanges();
+        transaction.Commit();
     }
 
     /// <inheritdoc />
diff --git a/Jellyfin.Server.Implementations/Item/PeopleRepository.cs b/Jellyfin.Server.Implementations/Item/PeopleRepository.cs
index 8f8741d00f..b612112d49 100644
--- a/Jellyfin.Server.Implementations/Item/PeopleRepository.cs
+++ b/Jellyfin.Server.Implementations/Item/PeopleRepository.cs
@@ -110,10 +110,10 @@ public class PeopleRepository(IDbContextFactory<JellyfinDbContext> dbProvider, I
         using var context = _dbProvider.CreateDbContext();
         using var transaction = context.Database.BeginTransaction();
         var existingPersons = context.Peoples.Select(e => new
-            {
-                item = e,
-                SelectionKey = e.Name.ToLower() + "-" + e.PersonType
-            })
+        {
+            item = e,
+            SelectionKey = e.Name.ToLower() + "-" + e.PersonType
+        })
             .Where(p => personKeys.Contains(p.SelectionKey))
             .Select(f => f.item)
             .ToArray();
diff --git a/Jellyfin.Server.Implementations/MediaSegments/MediaSegmentManager.cs b/Jellyfin.Server.Implementations/MediaSegments/MediaSegmentManager.cs
index 249df476a0..be98f93dab 100644
--- a/Jellyfin.Server.Implementations/MediaSegments/MediaSegmentManager.cs
+++ b/Jellyfin.Server.Implementations/MediaSegments/MediaSegmentManager.cs
@@ -81,6 +81,8 @@ public class MediaSegmentManager : IMediaSegmentManager
 
             foreach (var provider in providers)
             {
+                cancellationToken.ThrowIfCancellationRequested();
+
                 if (!await provider.Supports(baseItem).ConfigureAwait(false))
                 {
                     _logger.LogDebug("Media Segment provider {ProviderName} does not support item with path {MediaPath}", provider.Name, baseItem.Path);
@@ -146,6 +148,15 @@ public class MediaSegmentManager : IMediaSegmentManager
                         await CreateSegmentAsync(segment, providerId).ConfigureAwait(false);
                     }
                 }
+                catch (OperationCanceledException) when (cancellationToken.IsCancellationRequested)
+                {
+                    throw;
+                }
+                catch (Exception ex) when (cancellationToken.IsCancellationRequested)
+                {
+                    _logger.LogDebug(ex, "Provider {ProviderName} aborted segment extraction for {MediaPath} due to shutdown", provider.Name, baseItem.Path);
+                    break;
+                }
                 catch (Exception ex)
                 {
                     _logger.LogError(ex, "Provider {ProviderName} failed to extract segments from {MediaPath}", provider.Name, baseItem.Path);
diff --git a/Jellyfin.Server.Implementations/Security/AuthorizationContext.cs b/Jellyfin.Server.Implementations/Security/AuthorizationContext.cs
index e3fe517c49..8657cb7dbb 100644
--- a/Jellyfin.Server.Implementations/Security/AuthorizationContext.cs
+++ b/Jellyfin.Server.Implementations/Security/AuthorizationContext.cs
@@ -302,7 +302,7 @@ namespace Jellyfin.Server.Implementations.Security
                 }
                 else if (!escaped && token == '=')
                 {
-                    key = authorizationHeader[start.. i].Trim().ToString();
+                    key = authorizationHeader[start..i].Trim().ToString();
                     start = i + 1;
                 }
             }