From d0b4b2ddb31a54f0705303ab8461be1125d66eab Mon Sep 17 00:00:00 2001
From: JPVenson <JPVenson@users.noreply.github.com>
Date: Sat, 7 Sep 2024 19:07:34 +0000
Subject: Migrated UserData from library sqlite db to jellyfin.db

---
 .../Library/IUserDataManager.cs                    |  2 +-
 .../Persistence/IUserDataRepository.cs             | 55 ----------------------
 2 files changed, 1 insertion(+), 56 deletions(-)
 delete mode 100644 MediaBrowser.Controller/Persistence/IUserDataRepository.cs

(limited to 'MediaBrowser.Controller')

diff --git a/MediaBrowser.Controller/Library/IUserDataManager.cs b/MediaBrowser.Controller/Library/IUserDataManager.cs
index f36fd393f..b43c62708 100644
--- a/MediaBrowser.Controller/Library/IUserDataManager.cs
+++ b/MediaBrowser.Controller/Library/IUserDataManager.cs
@@ -44,7 +44,7 @@ namespace MediaBrowser.Controller.Library
         /// <param name="user">User to use.</param>
         /// <param name="item">Item to use.</param>
         /// <returns>User data.</returns>
-        UserItemData GetUserData(User user, BaseItem item);
+        UserItemData? GetUserData(User user, BaseItem item);
 
         /// <summary>
         /// Gets the user data dto.
diff --git a/MediaBrowser.Controller/Persistence/IUserDataRepository.cs b/MediaBrowser.Controller/Persistence/IUserDataRepository.cs
deleted file mode 100644
index f2fb2826a..000000000
--- a/MediaBrowser.Controller/Persistence/IUserDataRepository.cs
+++ /dev/null
@@ -1,55 +0,0 @@
-#nullable disable
-
-using System;
-using System.Collections.Generic;
-using System.Threading;
-using MediaBrowser.Controller.Entities;
-
-namespace MediaBrowser.Controller.Persistence
-{
-    /// <summary>
-    /// Provides an interface to implement a UserData repository.
-    /// </summary>
-    public interface IUserDataRepository : IDisposable
-    {
-        /// <summary>
-        /// Saves the user data.
-        /// </summary>
-        /// <param name="userId">The user id.</param>
-        /// <param name="key">The key.</param>
-        /// <param name="userData">The user data.</param>
-        /// <param name="cancellationToken">The cancellation token.</param>
-        void SaveUserData(long userId, string key, UserItemData userData, CancellationToken cancellationToken);
-
-        /// <summary>
-        /// Gets the user data.
-        /// </summary>
-        /// <param name="userId">The user id.</param>
-        /// <param name="key">The key.</param>
-        /// <returns>The user data.</returns>
-        UserItemData GetUserData(long userId, string key);
-
-        /// <summary>
-        /// Gets the user data.
-        /// </summary>
-        /// <param name="userId">The user id.</param>
-        /// <param name="keys">The keys.</param>
-        /// <returns>The user data.</returns>
-        UserItemData GetUserData(long userId, List<string> keys);
-
-        /// <summary>
-        /// Return all user data associated with the given user.
-        /// </summary>
-        /// <param name="userId">The user id.</param>
-        /// <returns>The list of user item data.</returns>
-        List<UserItemData> GetAllUserData(long userId);
-
-        /// <summary>
-        /// Save all user data associated with the given user.
-        /// </summary>
-        /// <param name="userId">The user id.</param>
-        /// <param name="userData">The user item data.</param>
-        /// <param name="cancellationToken">The cancellation token.</param>
-        void SaveAllUserData(long userId, UserItemData[] userData, CancellationToken cancellationToken);
-    }
-}
-- 
cgit v1.2.3


From 7a2427bf07f9036d62c88a75855cd6dc7e8e3064 Mon Sep 17 00:00:00 2001
From: Shadowghost <Ghost_of_Stone@web.de>
Date: Thu, 5 Sep 2024 12:55:15 +0200
Subject: Add SessionInfoDto, DeviceInfoDto and implement
 JsonDelimitedArrayConverter.Write

---
 .../Session/SessionManager.cs                      | 137 ++++++++++++++-
 Jellyfin.Api/Controllers/DevicesController.cs      |  10 +-
 Jellyfin.Api/Controllers/SessionController.cs      |  85 ++--------
 .../Models/SessionDtos/ClientCapabilitiesDto.cs    |  83 ---------
 Jellyfin.Data/Dtos/DeviceOptionsDto.cs             |  33 ++--
 .../Devices/DeviceManager.cs                       |  85 ++++++++--
 .../Authentication/AuthenticationResult.cs         |  33 ++--
 MediaBrowser.Controller/Devices/IDeviceManager.cs  | 150 ++++++++++-------
 .../AuthenticationResultEventArgs.cs               |   3 +-
 .../WebSocketMessages/Outbound/SessionsMessage.cs  |   5 +-
 MediaBrowser.Controller/Session/ISessionManager.cs |  11 ++
 MediaBrowser.Controller/Session/SessionInfo.cs     | 120 +++++++++++--
 MediaBrowser.Model/Devices/DeviceInfo.cs           | 119 +++++++------
 MediaBrowser.Model/Dto/ClientCapabilitiesDto.cs    |  69 ++++++++
 MediaBrowser.Model/Dto/DeviceInfoDto.cs            |  83 +++++++++
 MediaBrowser.Model/Dto/SessionInfoDto.cs           | 186 +++++++++++++++++++++
 .../Json/Converters/JsonDelimitedArrayConverter.cs |  65 ++++---
 .../Converters/JsonCommaDelimitedArrayTests.cs     |  16 +-
 18 files changed, 919 insertions(+), 374 deletions(-)
 delete mode 100644 Jellyfin.Api/Models/SessionDtos/ClientCapabilitiesDto.cs
 create mode 100644 MediaBrowser.Model/Dto/ClientCapabilitiesDto.cs
 create mode 100644 MediaBrowser.Model/Dto/DeviceInfoDto.cs
 create mode 100644 MediaBrowser.Model/Dto/SessionInfoDto.cs

(limited to 'MediaBrowser.Controller')

diff --git a/Emby.Server.Implementations/Session/SessionManager.cs b/Emby.Server.Implementations/Session/SessionManager.cs
index 72e164b52..6bcbe3ceb 100644
--- a/Emby.Server.Implementations/Session/SessionManager.cs
+++ b/Emby.Server.Implementations/Session/SessionManager.cs
@@ -1,7 +1,5 @@
 #nullable disable
 
-#pragma warning disable CS1591
-
 using System;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
@@ -68,13 +66,29 @@ namespace Emby.Server.Implementations.Session
         private Timer _inactiveTimer;
 
         private DtoOptions _itemInfoDtoOptions;
-        private bool _disposed = false;
+        private bool _disposed;
 
+        /// <summary>
+        /// Initializes a new instance of the <see cref="SessionManager"/> class.
+        /// </summary>
+        /// <param name="logger">Instance of <see cref="ILogger{SessionManager}"/> interface.</param>
+        /// <param name="eventManager">Instance of <see cref="IEventManager"/> interface.</param>
+        /// <param name="userDataManager">Instance of <see cref="IUserDataManager"/> interface.</param>
+        /// <param name="serverConfigurationManager">Instance of <see cref="IServerConfigurationManager"/> interface.</param>
+        /// <param name="libraryManager">Instance of <see cref="ILibraryManager"/> interface.</param>
+        /// <param name="userManager">Instance of <see cref="IUserManager"/> interface.</param>
+        /// <param name="musicManager">Instance of <see cref="IMusicManager"/> interface.</param>
+        /// <param name="dtoService">Instance of <see cref="IDtoService"/> interface.</param>
+        /// <param name="imageProcessor">Instance of <see cref="IImageProcessor"/> interface.</param>
+        /// <param name="appHost">Instance of <see cref="IServerApplicationHost"/> interface.</param>
+        /// <param name="deviceManager">Instance of <see cref="IDeviceManager"/> interface.</param>
+        /// <param name="mediaSourceManager">Instance of <see cref="IMediaSourceManager"/> interface.</param>
+        /// <param name="hostApplicationLifetime">Instance of <see cref="IHostApplicationLifetime"/> interface.</param>
         public SessionManager(
             ILogger<SessionManager> logger,
             IEventManager eventManager,
             IUserDataManager userDataManager,
-            IServerConfigurationManager config,
+            IServerConfigurationManager serverConfigurationManager,
             ILibraryManager libraryManager,
             IUserManager userManager,
             IMusicManager musicManager,
@@ -88,7 +102,7 @@ namespace Emby.Server.Implementations.Session
             _logger = logger;
             _eventManager = eventManager;
             _userDataManager = userDataManager;
-            _config = config;
+            _config = serverConfigurationManager;
             _libraryManager = libraryManager;
             _userManager = userManager;
             _musicManager = musicManager;
@@ -508,7 +522,10 @@ namespace Emby.Server.Implementations.Session
                 deviceName = "Network Device";
             }
 
-            var deviceOptions = _deviceManager.GetDeviceOptions(deviceId);
+            var deviceOptions = _deviceManager.GetDeviceOptions(deviceId) ?? new()
+            {
+                DeviceId = deviceId
+            };
             if (string.IsNullOrEmpty(deviceOptions.CustomName))
             {
                 sessionInfo.DeviceName = deviceName;
@@ -1076,6 +1093,42 @@ namespace Emby.Server.Implementations.Session
             return session;
         }
 
+        private SessionInfoDto ToSessionInfoDto(SessionInfo sessionInfo)
+        {
+            return new SessionInfoDto
+            {
+                PlayState = sessionInfo.PlayState,
+                AdditionalUsers = sessionInfo.AdditionalUsers,
+                Capabilities = _deviceManager.ToClientCapabilitiesDto(sessionInfo.Capabilities),
+                RemoteEndPoint = sessionInfo.RemoteEndPoint,
+                PlayableMediaTypes = sessionInfo.PlayableMediaTypes,
+                Id = sessionInfo.Id,
+                UserId = sessionInfo.UserId,
+                UserName = sessionInfo.UserName,
+                Client = sessionInfo.Client,
+                LastActivityDate = sessionInfo.LastActivityDate,
+                LastPlaybackCheckIn = sessionInfo.LastPlaybackCheckIn,
+                LastPausedDate = sessionInfo.LastPausedDate,
+                DeviceName = sessionInfo.DeviceName,
+                DeviceType = sessionInfo.DeviceType,
+                NowPlayingItem = sessionInfo.NowPlayingItem,
+                NowViewingItem = sessionInfo.NowViewingItem,
+                DeviceId = sessionInfo.DeviceId,
+                ApplicationVersion = sessionInfo.ApplicationVersion,
+                TranscodingInfo = sessionInfo.TranscodingInfo,
+                IsActive = sessionInfo.IsActive,
+                SupportsMediaControl = sessionInfo.SupportsMediaControl,
+                SupportsRemoteControl = sessionInfo.SupportsRemoteControl,
+                NowPlayingQueue = sessionInfo.NowPlayingQueue,
+                NowPlayingQueueFullItems = sessionInfo.NowPlayingQueueFullItems,
+                HasCustomDeviceName = sessionInfo.HasCustomDeviceName,
+                PlaylistItemId = sessionInfo.PlaylistItemId,
+                ServerId = sessionInfo.ServerId,
+                UserPrimaryImageTag = sessionInfo.UserPrimaryImageTag,
+                SupportedCommands = sessionInfo.SupportedCommands
+            };
+        }
+
         /// <inheritdoc />
         public Task SendMessageCommand(string controllingSessionId, string sessionId, MessageCommand command, CancellationToken cancellationToken)
         {
@@ -1393,7 +1446,7 @@ namespace Emby.Server.Implementations.Session
                     UserName = user.Username
                 };
 
-                session.AdditionalUsers = [..session.AdditionalUsers, newUser];
+                session.AdditionalUsers = [.. session.AdditionalUsers, newUser];
             }
         }
 
@@ -1505,7 +1558,7 @@ namespace Emby.Server.Implementations.Session
             var returnResult = new AuthenticationResult
             {
                 User = _userManager.GetUserDto(user, request.RemoteEndPoint),
-                SessionInfo = session,
+                SessionInfo = ToSessionInfoDto(session),
                 AccessToken = token,
                 ServerId = _appHost.SystemId
             };
@@ -1800,6 +1853,74 @@ namespace Emby.Server.Implementations.Session
             return await GetSessionByAuthenticationToken(items[0], deviceId, remoteEndpoint, null).ConfigureAwait(false);
         }
 
+        /// <inheritdoc/>
+        public IReadOnlyList<SessionInfoDto> GetSessions(
+            Guid userId,
+            string deviceId,
+            int? activeWithinSeconds,
+            Guid? controllableUserToCheck)
+        {
+            var result = Sessions;
+            var user = _userManager.GetUserById(userId);
+            if (!string.IsNullOrEmpty(deviceId))
+            {
+                result = result.Where(i => string.Equals(i.DeviceId, deviceId, StringComparison.OrdinalIgnoreCase));
+            }
+
+            if (!controllableUserToCheck.IsNullOrEmpty())
+            {
+                result = result.Where(i => i.SupportsRemoteControl);
+
+                var controlledUser = _userManager.GetUserById(controllableUserToCheck.Value);
+                if (controlledUser is null)
+                {
+                    return [];
+                }
+
+                if (!controlledUser.HasPermission(PermissionKind.EnableSharedDeviceControl))
+                {
+                    // Controlled user has device sharing disabled
+                    result = result.Where(i => !i.UserId.IsEmpty());
+                }
+
+                if (!user.HasPermission(PermissionKind.EnableRemoteControlOfOtherUsers))
+                {
+                    // User cannot control other user's sessions, validate user id.
+                    result = result.Where(i => i.UserId.IsEmpty() || i.ContainsUser(controllableUserToCheck.Value));
+                }
+
+                result = result.Where(i =>
+                {
+                    if (!string.IsNullOrWhiteSpace(i.DeviceId) && !_deviceManager.CanAccessDevice(user, i.DeviceId))
+                    {
+                        return false;
+                    }
+
+                    return true;
+                });
+            }
+            else if (!user.HasPermission(PermissionKind.IsAdministrator))
+            {
+                // Request isn't from administrator, limit to "own" sessions.
+                result = result.Where(i => i.UserId.IsEmpty() || i.ContainsUser(userId));
+
+                // Don't report acceleration type for non-admin users.
+                result = result.Select(r =>
+                {
+                    r.TranscodingInfo.HardwareAccelerationType = HardwareAccelerationType.none;
+                    return r;
+                });
+            }
+
+            if (activeWithinSeconds.HasValue && activeWithinSeconds.Value > 0)
+            {
+                var minActiveDate = DateTime.UtcNow.AddSeconds(0 - activeWithinSeconds.Value);
+                result = result.Where(i => i.LastActivityDate >= minActiveDate);
+            }
+
+            return result.Select(ToSessionInfoDto).ToList();
+        }
+
         /// <inheritdoc />
         public Task SendMessageToAdminSessions<T>(SessionMessageType name, T data, CancellationToken cancellationToken)
         {
diff --git a/Jellyfin.Api/Controllers/DevicesController.cs b/Jellyfin.Api/Controllers/DevicesController.cs
index 2a2ab4ad1..50050262f 100644
--- a/Jellyfin.Api/Controllers/DevicesController.cs
+++ b/Jellyfin.Api/Controllers/DevicesController.cs
@@ -1,15 +1,13 @@
 using System;
 using System.ComponentModel.DataAnnotations;
 using System.Threading.Tasks;
-using Jellyfin.Api.Constants;
 using Jellyfin.Api.Helpers;
 using Jellyfin.Data.Dtos;
-using Jellyfin.Data.Entities.Security;
 using Jellyfin.Data.Queries;
 using MediaBrowser.Common.Api;
 using MediaBrowser.Controller.Devices;
 using MediaBrowser.Controller.Session;
-using MediaBrowser.Model.Devices;
+using MediaBrowser.Model.Dto;
 using MediaBrowser.Model.Querying;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Http;
@@ -47,7 +45,7 @@ public class DevicesController : BaseJellyfinApiController
     /// <returns>An <see cref="OkResult"/> containing the list of devices.</returns>
     [HttpGet]
     [ProducesResponseType(StatusCodes.Status200OK)]
-    public ActionResult<QueryResult<DeviceInfo>> GetDevices([FromQuery] Guid? userId)
+    public ActionResult<QueryResult<DeviceInfoDto>> GetDevices([FromQuery] Guid? userId)
     {
         userId = RequestHelpers.GetUserId(User, userId);
         return _deviceManager.GetDevicesForUser(userId);
@@ -63,7 +61,7 @@ public class DevicesController : BaseJellyfinApiController
     [HttpGet("Info")]
     [ProducesResponseType(StatusCodes.Status200OK)]
     [ProducesResponseType(StatusCodes.Status404NotFound)]
-    public ActionResult<DeviceInfo> GetDeviceInfo([FromQuery, Required] string id)
+    public ActionResult<DeviceInfoDto> GetDeviceInfo([FromQuery, Required] string id)
     {
         var deviceInfo = _deviceManager.GetDevice(id);
         if (deviceInfo is null)
@@ -84,7 +82,7 @@ public class DevicesController : BaseJellyfinApiController
     [HttpGet("Options")]
     [ProducesResponseType(StatusCodes.Status200OK)]
     [ProducesResponseType(StatusCodes.Status404NotFound)]
-    public ActionResult<DeviceOptions> GetDeviceOptions([FromQuery, Required] string id)
+    public ActionResult<DeviceOptionsDto> GetDeviceOptions([FromQuery, Required] string id)
     {
         var deviceInfo = _deviceManager.GetDeviceOptions(id);
         if (deviceInfo is null)
diff --git a/Jellyfin.Api/Controllers/SessionController.cs b/Jellyfin.Api/Controllers/SessionController.cs
index 942bdeb9e..91a879b8e 100644
--- a/Jellyfin.Api/Controllers/SessionController.cs
+++ b/Jellyfin.Api/Controllers/SessionController.cs
@@ -1,18 +1,13 @@
 using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
-using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
-using Jellyfin.Api.Constants;
 using Jellyfin.Api.Extensions;
 using Jellyfin.Api.Helpers;
 using Jellyfin.Api.ModelBinders;
-using Jellyfin.Api.Models.SessionDtos;
 using Jellyfin.Data.Enums;
-using Jellyfin.Extensions;
 using MediaBrowser.Common.Api;
-using MediaBrowser.Controller.Devices;
 using MediaBrowser.Controller.Library;
 using MediaBrowser.Controller.Session;
 using MediaBrowser.Model.Dto;
@@ -32,22 +27,18 @@ public class SessionController : BaseJellyfinApiController
 {
     private readonly ISessionManager _sessionManager;
     private readonly IUserManager _userManager;
-    private readonly IDeviceManager _deviceManager;
 
     /// <summary>
     /// Initializes a new instance of the <see cref="SessionController"/> class.
     /// </summary>
     /// <param name="sessionManager">Instance of <see cref="ISessionManager"/> interface.</param>
     /// <param name="userManager">Instance of <see cref="IUserManager"/> interface.</param>
-    /// <param name="deviceManager">Instance of <see cref="IDeviceManager"/> interface.</param>
     public SessionController(
         ISessionManager sessionManager,
-        IUserManager userManager,
-        IDeviceManager deviceManager)
+        IUserManager userManager)
     {
         _sessionManager = sessionManager;
         _userManager = userManager;
-        _deviceManager = deviceManager;
     }
 
     /// <summary>
@@ -57,77 +48,25 @@ public class SessionController : BaseJellyfinApiController
     /// <param name="deviceId">Filter by device Id.</param>
     /// <param name="activeWithinSeconds">Optional. Filter by sessions that were active in the last n seconds.</param>
     /// <response code="200">List of sessions returned.</response>
-    /// <returns>An <see cref="IEnumerable{SessionInfo}"/> with the available sessions.</returns>
+    /// <returns>An <see cref="IReadOnlyList{SessionInfoDto}"/> with the available sessions.</returns>
     [HttpGet("Sessions")]
     [Authorize]
     [ProducesResponseType(StatusCodes.Status200OK)]
-    public ActionResult<IEnumerable<SessionInfo>> GetSessions(
+    public ActionResult<IReadOnlyList<SessionInfoDto>> GetSessions(
         [FromQuery] Guid? controllableByUserId,
         [FromQuery] string? deviceId,
         [FromQuery] int? activeWithinSeconds)
     {
-        var result = _sessionManager.Sessions;
-        var isRequestingFromAdmin = User.IsInRole(UserRoles.Administrator);
-
-        if (!string.IsNullOrEmpty(deviceId))
-        {
-            result = result.Where(i => string.Equals(i.DeviceId, deviceId, StringComparison.OrdinalIgnoreCase));
-        }
-
-        if (!controllableByUserId.IsNullOrEmpty())
+        Guid? controllableUserToCheck = controllableByUserId is null ? null : RequestHelpers.GetUserId(User, controllableByUserId);
+        var result = _sessionManager.GetSessions(
+            User.GetUserId(),
+            deviceId,
+            activeWithinSeconds,
+            controllableUserToCheck);
+
+        if (result.Count == 0)
         {
-            result = result.Where(i => i.SupportsRemoteControl);
-
-            var user = _userManager.GetUserById(controllableByUserId.Value);
-            if (user is null)
-            {
-                return NotFound();
-            }
-
-            if (!user.HasPermission(PermissionKind.EnableRemoteControlOfOtherUsers))
-            {
-                // User cannot control other user's sessions, validate user id.
-                result = result.Where(i => i.UserId.IsEmpty() || i.ContainsUser(RequestHelpers.GetUserId(User, controllableByUserId)));
-            }
-
-            if (!user.HasPermission(PermissionKind.EnableSharedDeviceControl))
-            {
-                result = result.Where(i => !i.UserId.IsEmpty());
-            }
-
-            result = result.Where(i =>
-            {
-                if (!string.IsNullOrWhiteSpace(i.DeviceId))
-                {
-                    if (!_deviceManager.CanAccessDevice(user, i.DeviceId))
-                    {
-                        return false;
-                    }
-                }
-
-                return true;
-            });
-        }
-        else if (!isRequestingFromAdmin)
-        {
-            // Request isn't from administrator, limit to "own" sessions.
-            result = result.Where(i => i.UserId.IsEmpty() || i.ContainsUser(User.GetUserId()));
-        }
-
-        if (activeWithinSeconds.HasValue && activeWithinSeconds.Value > 0)
-        {
-            var minActiveDate = DateTime.UtcNow.AddSeconds(0 - activeWithinSeconds.Value);
-            result = result.Where(i => i.LastActivityDate >= minActiveDate);
-        }
-
-        // Request isn't from administrator, don't report acceleration type.
-        if (!isRequestingFromAdmin)
-        {
-            result = result.Select(r =>
-            {
-                r.TranscodingInfo.HardwareAccelerationType = HardwareAccelerationType.none;
-                return r;
-            });
+            return NotFound();
         }
 
         return Ok(result);
diff --git a/Jellyfin.Api/Models/SessionDtos/ClientCapabilitiesDto.cs b/Jellyfin.Api/Models/SessionDtos/ClientCapabilitiesDto.cs
deleted file mode 100644
index c699c469d..000000000
--- a/Jellyfin.Api/Models/SessionDtos/ClientCapabilitiesDto.cs
+++ /dev/null
@@ -1,83 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Text.Json.Serialization;
-using Jellyfin.Data.Enums;
-using Jellyfin.Extensions.Json.Converters;
-using MediaBrowser.Model.Dlna;
-using MediaBrowser.Model.Session;
-
-namespace Jellyfin.Api.Models.SessionDtos;
-
-/// <summary>
-/// Client capabilities dto.
-/// </summary>
-public class ClientCapabilitiesDto
-{
-    /// <summary>
-    /// Gets or sets the list of playable media types.
-    /// </summary>
-    [JsonConverter(typeof(JsonCommaDelimitedArrayConverterFactory))]
-    public IReadOnlyList<MediaType> PlayableMediaTypes { get; set; } = Array.Empty<MediaType>();
-
-    /// <summary>
-    /// Gets or sets the list of supported commands.
-    /// </summary>
-    [JsonConverter(typeof(JsonCommaDelimitedArrayConverterFactory))]
-    public IReadOnlyList<GeneralCommandType> SupportedCommands { get; set; } = Array.Empty<GeneralCommandType>();
-
-    /// <summary>
-    /// Gets or sets a value indicating whether session supports media control.
-    /// </summary>
-    public bool SupportsMediaControl { get; set; }
-
-    /// <summary>
-    /// Gets or sets a value indicating whether session supports a persistent identifier.
-    /// </summary>
-    public bool SupportsPersistentIdentifier { get; set; }
-
-    /// <summary>
-    /// Gets or sets the device profile.
-    /// </summary>
-    public DeviceProfile? DeviceProfile { get; set; }
-
-    /// <summary>
-    /// Gets or sets the app store url.
-    /// </summary>
-    public string? AppStoreUrl { get; set; }
-
-    /// <summary>
-    /// Gets or sets the icon url.
-    /// </summary>
-    public string? IconUrl { get; set; }
-
-#pragma warning disable CS1591 // Missing XML comment for publicly visible type or member
-    // TODO: Remove after 10.9
-    [Obsolete("Unused")]
-    [DefaultValue(false)]
-    public bool? SupportsContentUploading { get; set; } = false;
-
-    // TODO: Remove after 10.9
-    [Obsolete("Unused")]
-    [DefaultValue(false)]
-    public bool? SupportsSync { get; set; } = false;
-#pragma warning restore CS1591 // Missing XML comment for publicly visible type or member
-
-    /// <summary>
-    /// Convert the dto to the full <see cref="ClientCapabilities"/> model.
-    /// </summary>
-    /// <returns>The converted <see cref="ClientCapabilities"/> model.</returns>
-    public ClientCapabilities ToClientCapabilities()
-    {
-        return new ClientCapabilities
-        {
-            PlayableMediaTypes = PlayableMediaTypes,
-            SupportedCommands = SupportedCommands,
-            SupportsMediaControl = SupportsMediaControl,
-            SupportsPersistentIdentifier = SupportsPersistentIdentifier,
-            DeviceProfile = DeviceProfile,
-            AppStoreUrl = AppStoreUrl,
-            IconUrl = IconUrl
-        };
-    }
-}
diff --git a/Jellyfin.Data/Dtos/DeviceOptionsDto.cs b/Jellyfin.Data/Dtos/DeviceOptionsDto.cs
index 392ef5ff4..aad578709 100644
--- a/Jellyfin.Data/Dtos/DeviceOptionsDto.cs
+++ b/Jellyfin.Data/Dtos/DeviceOptionsDto.cs
@@ -1,23 +1,22 @@
-namespace Jellyfin.Data.Dtos
+namespace Jellyfin.Data.Dtos;
+
+/// <summary>
+/// A dto representing custom options for a device.
+/// </summary>
+public class DeviceOptionsDto
 {
     /// <summary>
-    /// A dto representing custom options for a device.
+    /// Gets or sets the id.
     /// </summary>
-    public class DeviceOptionsDto
-    {
-        /// <summary>
-        /// Gets or sets the id.
-        /// </summary>
-        public int Id { get; set; }
+    public int Id { get; set; }
 
-        /// <summary>
-        /// Gets or sets the device id.
-        /// </summary>
-        public string? DeviceId { get; set; }
+    /// <summary>
+    /// Gets or sets the device id.
+    /// </summary>
+    public string? DeviceId { get; set; }
 
-        /// <summary>
-        /// Gets or sets the custom name.
-        /// </summary>
-        public string? CustomName { get; set; }
-    }
+    /// <summary>
+    /// Gets or sets the custom name.
+    /// </summary>
+    public string? CustomName { get; set; }
 }
diff --git a/Jellyfin.Server.Implementations/Devices/DeviceManager.cs b/Jellyfin.Server.Implementations/Devices/DeviceManager.cs
index 415c04bbf..d3bff2936 100644
--- a/Jellyfin.Server.Implementations/Devices/DeviceManager.cs
+++ b/Jellyfin.Server.Implementations/Devices/DeviceManager.cs
@@ -3,6 +3,7 @@ using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
+using Jellyfin.Data.Dtos;
 using Jellyfin.Data.Entities;
 using Jellyfin.Data.Entities.Security;
 using Jellyfin.Data.Enums;
@@ -13,6 +14,7 @@ using MediaBrowser.Common.Extensions;
 using MediaBrowser.Controller.Devices;
 using MediaBrowser.Controller.Library;
 using MediaBrowser.Model.Devices;
+using MediaBrowser.Model.Dto;
 using MediaBrowser.Model.Querying;
 using MediaBrowser.Model.Session;
 using Microsoft.EntityFrameworkCore;
@@ -68,7 +70,7 @@ namespace Jellyfin.Server.Implementations.Devices
         }
 
         /// <inheritdoc />
-        public async Task UpdateDeviceOptions(string deviceId, string deviceName)
+        public async Task UpdateDeviceOptions(string deviceId, string? deviceName)
         {
             DeviceOptions? deviceOptions;
             var dbContext = await _dbProvider.CreateDbContextAsync().ConfigureAwait(false);
@@ -105,29 +107,37 @@ namespace Jellyfin.Server.Implementations.Devices
         }
 
         /// <inheritdoc />
-        public DeviceOptions GetDeviceOptions(string deviceId)
+        public DeviceOptionsDto? GetDeviceOptions(string deviceId)
         {
-            _deviceOptions.TryGetValue(deviceId, out var deviceOptions);
+            if (_deviceOptions.TryGetValue(deviceId, out var deviceOptions))
+            {
+                return ToDeviceOptionsDto(deviceOptions);
+            }
 
-            return deviceOptions ?? new DeviceOptions(deviceId);
+            return null;
         }
 
         /// <inheritdoc />
-        public ClientCapabilities GetCapabilities(string deviceId)
+        public ClientCapabilities GetCapabilities(string? deviceId)
         {
+            if (deviceId is null)
+            {
+                return new();
+            }
+
             return _capabilitiesMap.TryGetValue(deviceId, out ClientCapabilities? result)
                 ? result
-                : new ClientCapabilities();
+                : new();
         }
 
         /// <inheritdoc />
-        public DeviceInfo? GetDevice(string id)
+        public DeviceInfoDto? GetDevice(string id)
         {
             var device = _devices.Values.Where(d => d.DeviceId == id).OrderByDescending(d => d.DateLastActivity).FirstOrDefault();
             _deviceOptions.TryGetValue(id, out var deviceOption);
 
             var deviceInfo = device is null ? null : ToDeviceInfo(device, deviceOption);
-            return deviceInfo;
+            return deviceInfo is null ? null : ToDeviceInfoDto(deviceInfo);
         }
 
         /// <inheritdoc />
@@ -166,7 +176,7 @@ namespace Jellyfin.Server.Implementations.Devices
         }
 
         /// <inheritdoc />
-        public QueryResult<DeviceInfo> GetDevicesForUser(Guid? userId)
+        public QueryResult<DeviceInfoDto> GetDevicesForUser(Guid? userId)
         {
             IEnumerable<Device> devices = _devices.Values
                 .OrderByDescending(d => d.DateLastActivity)
@@ -187,9 +197,11 @@ namespace Jellyfin.Server.Implementations.Devices
                 {
                     _deviceOptions.TryGetValue(device.DeviceId, out var option);
                     return ToDeviceInfo(device, option);
-                }).ToArray();
+                })
+                .Select(ToDeviceInfoDto)
+                .ToArray();
 
-            return new QueryResult<DeviceInfo>(array);
+            return new QueryResult<DeviceInfoDto>(array);
         }
 
         /// <inheritdoc />
@@ -235,13 +247,9 @@ namespace Jellyfin.Server.Implementations.Devices
         private DeviceInfo ToDeviceInfo(Device authInfo, DeviceOptions? options = null)
         {
             var caps = GetCapabilities(authInfo.DeviceId);
-            var user = _userManager.GetUserById(authInfo.UserId);
-            if (user is null)
-            {
-                throw new ResourceNotFoundException("User with UserId " + authInfo.UserId + " not found");
-            }
+            var user = _userManager.GetUserById(authInfo.UserId) ?? throw new ResourceNotFoundException("User with UserId " + authInfo.UserId + " not found");
 
-            return new DeviceInfo
+            return new()
             {
                 AppName = authInfo.AppName,
                 AppVersion = authInfo.AppVersion,
@@ -254,5 +262,48 @@ namespace Jellyfin.Server.Implementations.Devices
                 CustomName = options?.CustomName,
             };
         }
+
+        private DeviceOptionsDto ToDeviceOptionsDto(DeviceOptions options)
+        {
+            return new()
+            {
+                Id = options.Id,
+                DeviceId = options.DeviceId,
+                CustomName = options.CustomName,
+            };
+        }
+
+        private DeviceInfoDto ToDeviceInfoDto(DeviceInfo info)
+        {
+            return new()
+            {
+                Name = info.Name,
+                CustomName = info.CustomName,
+                AccessToken = info.AccessToken,
+                Id = info.Id,
+                LastUserName = info.LastUserName,
+                AppName = info.AppName,
+                AppVersion = info.AppVersion,
+                LastUserId = info.LastUserId,
+                DateLastActivity = info.DateLastActivity,
+                Capabilities = ToClientCapabilitiesDto(info.Capabilities),
+                IconUrl = info.IconUrl
+            };
+        }
+
+        /// <inheritdoc />
+        public ClientCapabilitiesDto ToClientCapabilitiesDto(ClientCapabilities capabilities)
+        {
+            return new()
+            {
+                PlayableMediaTypes = capabilities.PlayableMediaTypes,
+                SupportedCommands = capabilities.SupportedCommands,
+                SupportsMediaControl = capabilities.SupportsMediaControl,
+                SupportsPersistentIdentifier = capabilities.SupportsPersistentIdentifier,
+                DeviceProfile = capabilities.DeviceProfile,
+                AppStoreUrl = capabilities.AppStoreUrl,
+                IconUrl = capabilities.IconUrl
+            };
+        }
     }
 }
diff --git a/MediaBrowser.Controller/Authentication/AuthenticationResult.cs b/MediaBrowser.Controller/Authentication/AuthenticationResult.cs
index 635e4eb3d..daf4d9631 100644
--- a/MediaBrowser.Controller/Authentication/AuthenticationResult.cs
+++ b/MediaBrowser.Controller/Authentication/AuthenticationResult.cs
@@ -1,20 +1,31 @@
 #nullable disable
 
-#pragma warning disable CS1591
-
-using MediaBrowser.Controller.Session;
 using MediaBrowser.Model.Dto;
 
-namespace MediaBrowser.Controller.Authentication
+namespace MediaBrowser.Controller.Authentication;
+
+/// <summary>
+/// A class representing an authentication result.
+/// </summary>
+public class AuthenticationResult
 {
-    public class AuthenticationResult
-    {
-        public UserDto User { get; set; }
+    /// <summary>
+    /// Gets or sets the user.
+    /// </summary>
+    public UserDto User { get; set; }
 
-        public SessionInfo SessionInfo { get; set; }
+    /// <summary>
+    /// Gets or sets the session info.
+    /// </summary>
+    public SessionInfoDto SessionInfo { get; set; }
 
-        public string AccessToken { get; set; }
+    /// <summary>
+    /// Gets or sets the access token.
+    /// </summary>
+    public string AccessToken { get; set; }
 
-        public string ServerId { get; set; }
-    }
+    /// <summary>
+    /// Gets or sets the server id.
+    /// </summary>
+    public string ServerId { get; set; }
 }
diff --git a/MediaBrowser.Controller/Devices/IDeviceManager.cs b/MediaBrowser.Controller/Devices/IDeviceManager.cs
index 5566421cb..cade53d99 100644
--- a/MediaBrowser.Controller/Devices/IDeviceManager.cs
+++ b/MediaBrowser.Controller/Devices/IDeviceManager.cs
@@ -1,81 +1,117 @@
-#nullable disable
-
-#pragma warning disable CS1591
-
 using System;
 using System.Threading.Tasks;
+using Jellyfin.Data.Dtos;
 using Jellyfin.Data.Entities;
 using Jellyfin.Data.Entities.Security;
 using Jellyfin.Data.Events;
 using Jellyfin.Data.Queries;
 using MediaBrowser.Model.Devices;
+using MediaBrowser.Model.Dto;
 using MediaBrowser.Model.Querying;
 using MediaBrowser.Model.Session;
 
-namespace MediaBrowser.Controller.Devices
+namespace MediaBrowser.Controller.Devices;
+
+/// <summary>
+/// Device manager interface.
+/// </summary>
+public interface IDeviceManager
 {
-    public interface IDeviceManager
-    {
-        event EventHandler<GenericEventArgs<Tuple<string, DeviceOptions>>> DeviceOptionsUpdated;
+    /// <summary>
+    /// Event handler for updated device options.
+    /// </summary>
+    event EventHandler<GenericEventArgs<Tuple<string, DeviceOptions>>> DeviceOptionsUpdated;
+
+    /// <summary>
+    /// Creates a new device.
+    /// </summary>
+    /// <param name="device">The device to create.</param>
+    /// <returns>A <see cref="Task{Device}"/> representing the creation of the device.</returns>
+    Task<Device> CreateDevice(Device device);
 
-        /// <summary>
-        /// Creates a new device.
-        /// </summary>
-        /// <param name="device">The device to create.</param>
-        /// <returns>A <see cref="Task{Device}"/> representing the creation of the device.</returns>
-        Task<Device> CreateDevice(Device device);
+    /// <summary>
+    /// Saves the capabilities.
+    /// </summary>
+    /// <param name="deviceId">The device id.</param>
+    /// <param name="capabilities">The capabilities.</param>
+    void SaveCapabilities(string deviceId, ClientCapabilities capabilities);
 
-        /// <summary>
-        /// Saves the capabilities.
-        /// </summary>
-        /// <param name="deviceId">The device id.</param>
-        /// <param name="capabilities">The capabilities.</param>
-        void SaveCapabilities(string deviceId, ClientCapabilities capabilities);
+    /// <summary>
+    /// Gets the capabilities.
+    /// </summary>
+    /// <param name="deviceId">The device id.</param>
+    /// <returns>ClientCapabilities.</returns>
+    ClientCapabilities GetCapabilities(string? deviceId);
 
-        /// <summary>
-        /// Gets the capabilities.
-        /// </summary>
-        /// <param name="deviceId">The device id.</param>
-        /// <returns>ClientCapabilities.</returns>
-        ClientCapabilities GetCapabilities(string deviceId);
+    /// <summary>
+    /// Gets the device information.
+    /// </summary>
+    /// <param name="id">The identifier.</param>
+    /// <returns>DeviceInfoDto.</returns>
+    DeviceInfoDto? GetDevice(string id);
 
-        /// <summary>
-        /// Gets the device information.
-        /// </summary>
-        /// <param name="id">The identifier.</param>
-        /// <returns>DeviceInfo.</returns>
-        DeviceInfo GetDevice(string id);
+    /// <summary>
+    /// Gets devices based on the provided query.
+    /// </summary>
+    /// <param name="query">The device query.</param>
+    /// <returns>A <see cref="Task{QueryResult}"/> representing the retrieval of the devices.</returns>
+    QueryResult<Device> GetDevices(DeviceQuery query);
 
-        /// <summary>
-        /// Gets devices based on the provided query.
-        /// </summary>
-        /// <param name="query">The device query.</param>
-        /// <returns>A <see cref="Task{QueryResult}"/> representing the retrieval of the devices.</returns>
-        QueryResult<Device> GetDevices(DeviceQuery query);
+    /// <summary>
+    /// Gets device infromation based on the provided query.
+    /// </summary>
+    /// <param name="query">The device query.</param>
+    /// <returns>A <see cref="Task{QueryResult}"/> representing the retrieval of the device information.</returns>
+    QueryResult<DeviceInfo> GetDeviceInfos(DeviceQuery query);
 
-        QueryResult<DeviceInfo> GetDeviceInfos(DeviceQuery query);
+    /// <summary>
+    /// Gets the device information.
+    /// </summary>
+    /// <param name="userId">The user's id, or <c>null</c>.</param>
+    /// <returns>IEnumerable&lt;DeviceInfoDto&gt;.</returns>
+    QueryResult<DeviceInfoDto> GetDevicesForUser(Guid? userId);
 
-        /// <summary>
-        /// Gets the devices.
-        /// </summary>
-        /// <param name="userId">The user's id, or <c>null</c>.</param>
-        /// <returns>IEnumerable&lt;DeviceInfo&gt;.</returns>
-        QueryResult<DeviceInfo> GetDevicesForUser(Guid? userId);
+    /// <summary>
+    /// Deletes a device.
+    /// </summary>
+    /// <param name="device">The device.</param>
+    /// <returns>A <see cref="Task"/> representing the deletion of the device.</returns>
+    Task DeleteDevice(Device device);
 
-        Task DeleteDevice(Device device);
+    /// <summary>
+    /// Updates a device.
+    /// </summary>
+    /// <param name="device">The device.</param>
+    /// <returns>A <see cref="Task"/> representing the update of the device.</returns>
+    Task UpdateDevice(Device device);
 
-        Task UpdateDevice(Device device);
+    /// <summary>
+    /// Determines whether this instance [can access device] the specified user identifier.
+    /// </summary>
+    /// <param name="user">The user to test.</param>
+    /// <param name="deviceId">The device id to test.</param>
+    /// <returns>Whether the user can access the device.</returns>
+    bool CanAccessDevice(User user, string deviceId);
 
-        /// <summary>
-        /// Determines whether this instance [can access device] the specified user identifier.
-        /// </summary>
-        /// <param name="user">The user to test.</param>
-        /// <param name="deviceId">The device id to test.</param>
-        /// <returns>Whether the user can access the device.</returns>
-        bool CanAccessDevice(User user, string deviceId);
+    /// <summary>
+    /// Updates the options of a device.
+    /// </summary>
+    /// <param name="deviceId">The device id.</param>
+    /// <param name="deviceName">The device name.</param>
+    /// <returns>A <see cref="Task"/> representing the update of the device options.</returns>
+    Task UpdateDeviceOptions(string deviceId, string? deviceName);
 
-        Task UpdateDeviceOptions(string deviceId, string deviceName);
+    /// <summary>
+    /// Gets the options of a device.
+    /// </summary>
+    /// <param name="deviceId">The device id.</param>
+    /// <returns><see cref="DeviceOptions"/> of the device.</returns>
+    DeviceOptionsDto? GetDeviceOptions(string deviceId);
 
-        DeviceOptions GetDeviceOptions(string deviceId);
-    }
+    /// <summary>
+    /// Gets the dto for client capabilites.
+    /// </summary>
+    /// <param name="capabilities">The client capabilities.</param>
+    /// <returns><see cref="ClientCapabilitiesDto"/> of the device.</returns>
+    ClientCapabilitiesDto ToClientCapabilitiesDto(ClientCapabilities capabilities);
 }
diff --git a/MediaBrowser.Controller/Events/Authentication/AuthenticationResultEventArgs.cs b/MediaBrowser.Controller/Events/Authentication/AuthenticationResultEventArgs.cs
index 357ef9406..1542c58b3 100644
--- a/MediaBrowser.Controller/Events/Authentication/AuthenticationResultEventArgs.cs
+++ b/MediaBrowser.Controller/Events/Authentication/AuthenticationResultEventArgs.cs
@@ -1,6 +1,5 @@
 using System;
 using MediaBrowser.Controller.Authentication;
-using MediaBrowser.Controller.Session;
 using MediaBrowser.Model.Dto;
 
 namespace MediaBrowser.Controller.Events.Authentication;
@@ -29,7 +28,7 @@ public class AuthenticationResultEventArgs : EventArgs
     /// <summary>
     /// Gets or sets the session information.
     /// </summary>
-    public SessionInfo? SessionInfo { get; set; }
+    public SessionInfoDto? SessionInfo { get; set; }
 
     /// <summary>
     /// Gets or sets the server id.
diff --git a/MediaBrowser.Controller/Net/WebSocketMessages/Outbound/SessionsMessage.cs b/MediaBrowser.Controller/Net/WebSocketMessages/Outbound/SessionsMessage.cs
index 3504831b8..833074541 100644
--- a/MediaBrowser.Controller/Net/WebSocketMessages/Outbound/SessionsMessage.cs
+++ b/MediaBrowser.Controller/Net/WebSocketMessages/Outbound/SessionsMessage.cs
@@ -1,6 +1,7 @@
 using System.Collections.Generic;
 using System.ComponentModel;
 using MediaBrowser.Controller.Session;
+using MediaBrowser.Model.Dto;
 using MediaBrowser.Model.Session;
 
 namespace MediaBrowser.Controller.Net.WebSocketMessages.Outbound;
@@ -8,13 +9,13 @@ namespace MediaBrowser.Controller.Net.WebSocketMessages.Outbound;
 /// <summary>
 /// Sessions message.
 /// </summary>
-public class SessionsMessage : OutboundWebSocketMessage<IReadOnlyList<SessionInfo>>
+public class SessionsMessage : OutboundWebSocketMessage<IReadOnlyList<SessionInfoDto>>
 {
     /// <summary>
     /// Initializes a new instance of the <see cref="SessionsMessage"/> class.
     /// </summary>
     /// <param name="data">Session info.</param>
-    public SessionsMessage(IReadOnlyList<SessionInfo> data)
+    public SessionsMessage(IReadOnlyList<SessionInfoDto> data)
         : base(data)
     {
     }
diff --git a/MediaBrowser.Controller/Session/ISessionManager.cs b/MediaBrowser.Controller/Session/ISessionManager.cs
index 5a47236f9..f2e98dd78 100644
--- a/MediaBrowser.Controller/Session/ISessionManager.cs
+++ b/MediaBrowser.Controller/Session/ISessionManager.cs
@@ -9,6 +9,7 @@ using System.Threading.Tasks;
 using Jellyfin.Data.Entities.Security;
 using MediaBrowser.Controller.Authentication;
 using MediaBrowser.Controller.Library;
+using MediaBrowser.Model.Dto;
 using MediaBrowser.Model.Session;
 using MediaBrowser.Model.SyncPlay;
 
@@ -292,6 +293,16 @@ namespace MediaBrowser.Controller.Session
         /// <returns>SessionInfo.</returns>
         SessionInfo GetSession(string deviceId, string client, string version);
 
+        /// <summary>
+        /// Gets all sessions available to a user.
+        /// </summary>
+        /// <param name="userId">The session identifier.</param>
+        /// <param name="deviceId">The device id.</param>
+        /// <param name="activeWithinSeconds">Active within session limit.</param>
+        /// <param name="controllableUserToCheck">Filter for sessions remote controllable for this user.</param>
+        /// <returns>IReadOnlyList{SessionInfoDto}.</returns>
+        IReadOnlyList<SessionInfoDto> GetSessions(Guid userId, string deviceId, int? activeWithinSeconds, Guid? controllableUserToCheck);
+
         /// <summary>
         /// Gets the session by authentication token.
         /// </summary>
diff --git a/MediaBrowser.Controller/Session/SessionInfo.cs b/MediaBrowser.Controller/Session/SessionInfo.cs
index 9e3358818..3ba1bfce4 100644
--- a/MediaBrowser.Controller/Session/SessionInfo.cs
+++ b/MediaBrowser.Controller/Session/SessionInfo.cs
@@ -1,7 +1,5 @@
 #nullable disable
 
-#pragma warning disable CS1591
-
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -27,28 +25,45 @@ namespace MediaBrowser.Controller.Session
         private readonly ISessionManager _sessionManager;
         private readonly ILogger _logger;
 
-        private readonly object _progressLock = new object();
+        private readonly object _progressLock = new();
         private Timer _progressTimer;
         private PlaybackProgressInfo _lastProgressInfo;
 
-        private bool _disposed = false;
+        private bool _disposed;
 
+        /// <summary>
+        /// Initializes a new instance of the <see cref="SessionInfo"/> class.
+        /// </summary>
+        /// <param name="sessionManager">Instance of <see cref="ISessionManager"/> interface.</param>
+        /// <param name="logger">Instance of <see cref="ILogger"/> interface.</param>
         public SessionInfo(ISessionManager sessionManager, ILogger logger)
         {
             _sessionManager = sessionManager;
             _logger = logger;
 
-            AdditionalUsers = Array.Empty<SessionUserInfo>();
+            AdditionalUsers = [];
             PlayState = new PlayerStateInfo();
-            SessionControllers = Array.Empty<ISessionController>();
-            NowPlayingQueue = Array.Empty<QueueItem>();
-            NowPlayingQueueFullItems = Array.Empty<BaseItemDto>();
+            SessionControllers = [];
+            NowPlayingQueue = [];
+            NowPlayingQueueFullItems = [];
         }
 
+        /// <summary>
+        /// Gets or sets the play state.
+        /// </summary>
+        /// <value>The play state.</value>
         public PlayerStateInfo PlayState { get; set; }
 
-        public SessionUserInfo[] AdditionalUsers { get; set; }
+        /// <summary>
+        /// Gets or sets the additional users.
+        /// </summary>
+        /// <value>The additional users.</value>
+        public IReadOnlyList<SessionUserInfo> AdditionalUsers { get; set; }
 
+        /// <summary>
+        /// Gets or sets the client capabilities.
+        /// </summary>
+        /// <value>The client capabilities.</value>
         public ClientCapabilities Capabilities { get; set; }
 
         /// <summary>
@@ -67,7 +82,7 @@ namespace MediaBrowser.Controller.Session
             {
                 if (Capabilities is null)
                 {
-                    return Array.Empty<MediaType>();
+                    return [];
                 }
 
                 return Capabilities.PlayableMediaTypes;
@@ -134,9 +149,17 @@ namespace MediaBrowser.Controller.Session
         /// <value>The now playing item.</value>
         public BaseItemDto NowPlayingItem { get; set; }
 
+        /// <summary>
+        /// Gets or sets the now playing queue full items.
+        /// </summary>
+        /// <value>The now playing queue full items.</value>
         [JsonIgnore]
         public BaseItem FullNowPlayingItem { get; set; }
 
+        /// <summary>
+        /// Gets or sets the now viewing item.
+        /// </summary>
+        /// <value>The now viewing item.</value>
         public BaseItemDto NowViewingItem { get; set; }
 
         /// <summary>
@@ -156,8 +179,12 @@ namespace MediaBrowser.Controller.Session
         /// </summary>
         /// <value>The session controller.</value>
         [JsonIgnore]
-        public ISessionController[] SessionControllers { get; set; }
+        public IReadOnlyList<ISessionController> SessionControllers { get; set; }
 
+        /// <summary>
+        /// Gets or sets the transcoding info.
+        /// </summary>
+        /// <value>The transcoding info.</value>
         public TranscodingInfo TranscodingInfo { get; set; }
 
         /// <summary>
@@ -177,7 +204,7 @@ namespace MediaBrowser.Controller.Session
                     }
                 }
 
-                if (controllers.Length > 0)
+                if (controllers.Count > 0)
                 {
                     return false;
                 }
@@ -186,6 +213,10 @@ namespace MediaBrowser.Controller.Session
             }
         }
 
+        /// <summary>
+        /// Gets a value indicating whether the session supports media control.
+        /// </summary>
+        /// <value><c>true</c> if this session supports media control; otherwise, <c>false</c>.</value>
         public bool SupportsMediaControl
         {
             get
@@ -208,6 +239,10 @@ namespace MediaBrowser.Controller.Session
             }
         }
 
+        /// <summary>
+        /// Gets a value indicating whether the session supports remote control.
+        /// </summary>
+        /// <value><c>true</c> if this session supports remote control; otherwise, <c>false</c>.</value>
         public bool SupportsRemoteControl
         {
             get
@@ -230,16 +265,40 @@ namespace MediaBrowser.Controller.Session
             }
         }
 
+        /// <summary>
+        /// Gets or sets the now playing queue.
+        /// </summary>
+        /// <value>The now playing queue.</value>
         public IReadOnlyList<QueueItem> NowPlayingQueue { get; set; }
 
+        /// <summary>
+        /// Gets or sets the now playing queue full items.
+        /// </summary>
+        /// <value>The now playing queue full items.</value>
         public IReadOnlyList<BaseItemDto> NowPlayingQueueFullItems { get; set; }
 
+        /// <summary>
+        /// Gets or sets a value indicating whether the session has a custom device name.
+        /// </summary>
+        /// <value><c>true</c> if this session has a custom device name; otherwise, <c>false</c>.</value>
         public bool HasCustomDeviceName { get; set; }
 
+        /// <summary>
+        /// Gets or sets the playlist item id.
+        /// </summary>
+        /// <value>The splaylist item id.</value>
         public string PlaylistItemId { get; set; }
 
+        /// <summary>
+        /// Gets or sets the server id.
+        /// </summary>
+        /// <value>The server id.</value>
         public string ServerId { get; set; }
 
+        /// <summary>
+        /// Gets or sets the user primary image tag.
+        /// </summary>
+        /// <value>The user primary image tag.</value>
         public string UserPrimaryImageTag { get; set; }
 
         /// <summary>
@@ -247,8 +306,14 @@ namespace MediaBrowser.Controller.Session
         /// </summary>
         /// <value>The supported commands.</value>
         public IReadOnlyList<GeneralCommandType> SupportedCommands
-            => Capabilities is null ? Array.Empty<GeneralCommandType>() : Capabilities.SupportedCommands;
+            => Capabilities is null ? [] : Capabilities.SupportedCommands;
 
+        /// <summary>
+        /// Ensures a controller of type exists.
+        /// </summary>
+        /// <typeparam name="T">Class to register.</typeparam>
+        /// <param name="factory">The factory.</param>
+        /// <returns>Tuple{ISessionController, bool}.</returns>
         public Tuple<ISessionController, bool> EnsureController<T>(Func<SessionInfo, ISessionController> factory)
         {
             var controllers = SessionControllers.ToList();
@@ -261,18 +326,27 @@ namespace MediaBrowser.Controller.Session
             }
 
             var newController = factory(this);
-            _logger.LogDebug("Creating new {0}", newController.GetType().Name);
+            _logger.LogDebug("Creating new {Factory}", newController.GetType().Name);
             controllers.Add(newController);
 
-            SessionControllers = controllers.ToArray();
+            SessionControllers = [.. controllers];
             return new Tuple<ISessionController, bool>(newController, true);
         }
 
+        /// <summary>
+        /// Adds a controller to the session.
+        /// </summary>
+        /// <param name="controller">The controller.</param>
         public void AddController(ISessionController controller)
         {
-            SessionControllers = [..SessionControllers, controller];
+            SessionControllers = [.. SessionControllers, controller];
         }
 
+        /// <summary>
+        /// Gets a value indicating whether the session contains a user.
+        /// </summary>
+        /// <param name="userId">The user id to check.</param>
+        /// <returns><c>true</c> if this session contains the user; otherwise, <c>false</c>.</returns>
         public bool ContainsUser(Guid userId)
         {
             if (UserId.Equals(userId))
@@ -291,6 +365,11 @@ namespace MediaBrowser.Controller.Session
             return false;
         }
 
+        /// <summary>
+        /// Starts automatic progressing.
+        /// </summary>
+        /// <param name="progressInfo">The playback progress info.</param>
+        /// <value>The supported commands.</value>
         public void StartAutomaticProgress(PlaybackProgressInfo progressInfo)
         {
             if (_disposed)
@@ -359,6 +438,9 @@ namespace MediaBrowser.Controller.Session
             }
         }
 
+        /// <summary>
+        /// Stops automatic progressing.
+        /// </summary>
         public void StopAutomaticProgress()
         {
             lock (_progressLock)
@@ -373,6 +455,10 @@ namespace MediaBrowser.Controller.Session
             }
         }
 
+        /// <summary>
+        /// Disposes the instance async.
+        /// </summary>
+        /// <returns>ValueTask.</returns>
         public async ValueTask DisposeAsync()
         {
             _disposed = true;
@@ -380,7 +466,7 @@ namespace MediaBrowser.Controller.Session
             StopAutomaticProgress();
 
             var controllers = SessionControllers.ToList();
-            SessionControllers = Array.Empty<ISessionController>();
+            SessionControllers = [];
 
             foreach (var controller in controllers)
             {
diff --git a/MediaBrowser.Model/Devices/DeviceInfo.cs b/MediaBrowser.Model/Devices/DeviceInfo.cs
index 4962992a0..115598613 100644
--- a/MediaBrowser.Model/Devices/DeviceInfo.cs
+++ b/MediaBrowser.Model/Devices/DeviceInfo.cs
@@ -1,69 +1,84 @@
-#nullable disable
-#pragma warning disable CS1591
-
 using System;
 using MediaBrowser.Model.Session;
 
-namespace MediaBrowser.Model.Devices
+namespace MediaBrowser.Model.Devices;
+
+/// <summary>
+/// A class for device Information.
+/// </summary>
+public class DeviceInfo
 {
-    public class DeviceInfo
+    /// <summary>
+    /// Initializes a new instance of the <see cref="DeviceInfo"/> class.
+    /// </summary>
+    public DeviceInfo()
     {
-        public DeviceInfo()
-        {
-            Capabilities = new ClientCapabilities();
-        }
+        Capabilities = new ClientCapabilities();
+    }
 
-        public string Name { get; set; }
+    /// <summary>
+    /// Gets or sets the name.
+    /// </summary>
+    /// <value>The name.</value>
+    public string? Name { get; set; }
 
-        public string CustomName { get; set; }
+    /// <summary>
+    /// Gets or sets the custom name.
+    /// </summary>
+    /// <value>The custom name.</value>
+    public string? CustomName { get; set; }
 
-        /// <summary>
-        /// Gets or sets the access token.
-        /// </summary>
-        public string AccessToken { get; set; }
+    /// <summary>
+    /// Gets or sets the access token.
+    /// </summary>
+    /// <value>The access token.</value>
+    public string? AccessToken { get; set; }
 
-        /// <summary>
-        /// Gets or sets the identifier.
-        /// </summary>
-        /// <value>The identifier.</value>
-        public string Id { get; set; }
+    /// <summary>
+    /// Gets or sets the identifier.
+    /// </summary>
+    /// <value>The identifier.</value>
+    public string? Id { get; set; }
 
-        /// <summary>
-        /// Gets or sets the last name of the user.
-        /// </summary>
-        /// <value>The last name of the user.</value>
-        public string LastUserName { get; set; }
+    /// <summary>
+    /// Gets or sets the last name of the user.
+    /// </summary>
+    /// <value>The last name of the user.</value>
+    public string? LastUserName { get; set; }
 
-        /// <summary>
-        /// Gets or sets the name of the application.
-        /// </summary>
-        /// <value>The name of the application.</value>
-        public string AppName { get; set; }
+    /// <summary>
+    /// Gets or sets the name of the application.
+    /// </summary>
+    /// <value>The name of the application.</value>
+    public string? AppName { get; set; }
 
-        /// <summary>
-        /// Gets or sets the application version.
-        /// </summary>
-        /// <value>The application version.</value>
-        public string AppVersion { get; set; }
+    /// <summary>
+    /// Gets or sets the application version.
+    /// </summary>
+    /// <value>The application version.</value>
+    public string? AppVersion { get; set; }
 
-        /// <summary>
-        /// Gets or sets the last user identifier.
-        /// </summary>
-        /// <value>The last user identifier.</value>
-        public Guid LastUserId { get; set; }
+    /// <summary>
+    /// Gets or sets the last user identifier.
+    /// </summary>
+    /// <value>The last user identifier.</value>
+    public Guid? LastUserId { get; set; }
 
-        /// <summary>
-        /// Gets or sets the date last modified.
-        /// </summary>
-        /// <value>The date last modified.</value>
-        public DateTime DateLastActivity { get; set; }
+    /// <summary>
+    /// Gets or sets the date last modified.
+    /// </summary>
+    /// <value>The date last modified.</value>
+    public DateTime? DateLastActivity { get; set; }
 
-        /// <summary>
-        /// Gets or sets the capabilities.
-        /// </summary>
-        /// <value>The capabilities.</value>
-        public ClientCapabilities Capabilities { get; set; }
+    /// <summary>
+    /// Gets or sets the capabilities.
+    /// </summary>
+    /// <value>The capabilities.</value>
+    public ClientCapabilities Capabilities { get; set; }
 
-        public string IconUrl { get; set; }
-    }
+    /// <summary>
+    /// Gets or sets the icon URL.
+    /// </summary>
+    /// <value>The icon URL.</value>
+    public string? IconUrl { get; set; }
 }
diff --git a/MediaBrowser.Model/Dto/ClientCapabilitiesDto.cs b/MediaBrowser.Model/Dto/ClientCapabilitiesDto.cs
new file mode 100644
index 000000000..5963ed270
--- /dev/null
+++ b/MediaBrowser.Model/Dto/ClientCapabilitiesDto.cs
@@ -0,0 +1,69 @@
+using System.Collections.Generic;
+using System.Text.Json.Serialization;
+using Jellyfin.Data.Enums;
+using Jellyfin.Extensions.Json.Converters;
+using MediaBrowser.Model.Dlna;
+using MediaBrowser.Model.Session;
+
+namespace MediaBrowser.Model.Dto;
+
+/// <summary>
+/// Client capabilities dto.
+/// </summary>
+public class ClientCapabilitiesDto
+{
+    /// <summary>
+    /// Gets or sets the list of playable media types.
+    /// </summary>
+    [JsonConverter(typeof(JsonCommaDelimitedArrayConverterFactory))]
+    public IReadOnlyList<MediaType> PlayableMediaTypes { get; set; } = [];
+
+    /// <summary>
+    /// Gets or sets the list of supported commands.
+    /// </summary>
+    [JsonConverter(typeof(JsonCommaDelimitedArrayConverterFactory))]
+    public IReadOnlyList<GeneralCommandType> SupportedCommands { get; set; } = [];
+
+    /// <summary>
+    /// Gets or sets a value indicating whether session supports media control.
+    /// </summary>
+    public bool SupportsMediaControl { get; set; }
+
+    /// <summary>
+    /// Gets or sets a value indicating whether session supports a persistent identifier.
+    /// </summary>
+    public bool SupportsPersistentIdentifier { get; set; }
+
+    /// <summary>
+    /// Gets or sets the device profile.
+    /// </summary>
+    public DeviceProfile? DeviceProfile { get; set; }
+
+    /// <summary>
+    /// Gets or sets the app store url.
+    /// </summary>
+    public string? AppStoreUrl { get; set; }
+
+    /// <summary>
+    /// Gets or sets the icon url.
+    /// </summary>
+    public string? IconUrl { get; set; }
+
+    /// <summary>
+    /// Convert the dto to the full <see cref="ClientCapabilities"/> model.
+    /// </summary>
+    /// <returns>The converted <see cref="ClientCapabilities"/> model.</returns>
+    public ClientCapabilities ToClientCapabilities()
+    {
+        return new ClientCapabilities
+        {
+            PlayableMediaTypes = PlayableMediaTypes,
+            SupportedCommands = SupportedCommands,
+            SupportsMediaControl = SupportsMediaControl,
+            SupportsPersistentIdentifier = SupportsPersistentIdentifier,
+            DeviceProfile = DeviceProfile,
+            AppStoreUrl = AppStoreUrl,
+            IconUrl = IconUrl
+        };
+    }
+}
diff --git a/MediaBrowser.Model/Dto/DeviceInfoDto.cs b/MediaBrowser.Model/Dto/DeviceInfoDto.cs
new file mode 100644
index 000000000..ac7a731a9
--- /dev/null
+++ b/MediaBrowser.Model/Dto/DeviceInfoDto.cs
@@ -0,0 +1,83 @@
+using System;
+
+namespace MediaBrowser.Model.Dto;
+
+/// <summary>
+/// A DTO representing device information.
+/// </summary>
+public class DeviceInfoDto
+{
+    /// <summary>
+    /// Initializes a new instance of the <see cref="DeviceInfoDto"/> class.
+    /// </summary>
+    public DeviceInfoDto()
+    {
+        Capabilities = new ClientCapabilitiesDto();
+    }
+
+    /// <summary>
+    /// Gets or sets the name.
+    /// </summary>
+    /// <value>The name.</value>
+    public string? Name { get; set; }
+
+    /// <summary>
+    /// Gets or sets the custom name.
+    /// </summary>
+    /// <value>The custom name.</value>
+    public string? CustomName { get; set; }
+
+    /// <summary>
+    /// Gets or sets the access token.
+    /// </summary>
+    /// <value>The access token.</value>
+    public string? AccessToken { get; set; }
+
+    /// <summary>
+    /// Gets or sets the identifier.
+    /// </summary>
+    /// <value>The identifier.</value>
+    public string? Id { get; set; }
+
+    /// <summary>
+    /// Gets or sets the last name of the user.
+    /// </summary>
+    /// <value>The last name of the user.</value>
+    public string? LastUserName { get; set; }
+
+    /// <summary>
+    /// Gets or sets the name of the application.
+    /// </summary>
+    /// <value>The name of the application.</value>
+    public string? AppName { get; set; }
+
+    /// <summary>
+    /// Gets or sets the application version.
+    /// </summary>
+    /// <value>The application version.</value>
+    public string? AppVersion { get; set; }
+
+    /// <summary>
+    /// Gets or sets the last user identifier.
+    /// </summary>
+    /// <value>The last user identifier.</value>
+    public Guid? LastUserId { get; set; }
+
+    /// <summary>
+    /// Gets or sets the date last modified.
+    /// </summary>
+    /// <value>The date last modified.</value>
+    public DateTime? DateLastActivity { get; set; }
+
+    /// <summary>
+    /// Gets or sets the capabilities.
+    /// </summary>
+    /// <value>The capabilities.</value>
+    public ClientCapabilitiesDto Capabilities { get; set; }
+
+    /// <summary>
+    /// Gets or sets the icon URL.
+    /// </summary>
+    /// <value>The icon URL.</value>
+    public string? IconUrl { get; set; }
+}
diff --git a/MediaBrowser.Model/Dto/SessionInfoDto.cs b/MediaBrowser.Model/Dto/SessionInfoDto.cs
new file mode 100644
index 000000000..2496c933a
--- /dev/null
+++ b/MediaBrowser.Model/Dto/SessionInfoDto.cs
@@ -0,0 +1,186 @@
+using System;
+using System.Collections.Generic;
+using Jellyfin.Data.Enums;
+using MediaBrowser.Model.Session;
+
+namespace MediaBrowser.Model.Dto;
+
+/// <summary>
+/// Session info DTO.
+/// </summary>
+public class SessionInfoDto
+{
+    /// <summary>
+    /// Gets or sets the play state.
+    /// </summary>
+    /// <value>The play state.</value>
+    public PlayerStateInfo? PlayState { get; set; }
+
+    /// <summary>
+    /// Gets or sets the additional users.
+    /// </summary>
+    /// <value>The additional users.</value>
+    public IReadOnlyList<SessionUserInfo>? AdditionalUsers { get; set; }
+
+    /// <summary>
+    /// Gets or sets the client capabilities.
+    /// </summary>
+    /// <value>The client capabilities.</value>
+    public ClientCapabilitiesDto? Capabilities { get; set; }
+
+    /// <summary>
+    /// Gets or sets the remote end point.
+    /// </summary>
+    /// <value>The remote end point.</value>
+    public string? RemoteEndPoint { get; set; }
+
+    /// <summary>
+    /// Gets or sets the playable media types.
+    /// </summary>
+    /// <value>The playable media types.</value>
+    public IReadOnlyList<MediaType> PlayableMediaTypes { get; set; } = [];
+
+    /// <summary>
+    /// Gets or sets the id.
+    /// </summary>
+    /// <value>The id.</value>
+    public string? Id { get; set; }
+
+    /// <summary>
+    /// Gets or sets the user id.
+    /// </summary>
+    /// <value>The user id.</value>
+    public Guid UserId { get; set; }
+
+    /// <summary>
+    /// Gets or sets the username.
+    /// </summary>
+    /// <value>The username.</value>
+    public string? UserName { get; set; }
+
+    /// <summary>
+    /// Gets or sets the type of the client.
+    /// </summary>
+    /// <value>The type of the client.</value>
+    public string? Client { get; set; }
+
+    /// <summary>
+    /// Gets or sets the last activity date.
+    /// </summary>
+    /// <value>The last activity date.</value>
+    public DateTime LastActivityDate { get; set; }
+
+    /// <summary>
+    /// Gets or sets the last playback check in.
+    /// </summary>
+    /// <value>The last playback check in.</value>
+    public DateTime LastPlaybackCheckIn { get; set; }
+
+    /// <summary>
+    /// Gets or sets the last paused date.
+    /// </summary>
+    /// <value>The last paused date.</value>
+    public DateTime? LastPausedDate { get; set; }
+
+    /// <summary>
+    /// Gets or sets the name of the device.
+    /// </summary>
+    /// <value>The name of the device.</value>
+    public string? DeviceName { get; set; }
+
+    /// <summary>
+    /// Gets or sets the type of the device.
+    /// </summary>
+    /// <value>The type of the device.</value>
+    public string? DeviceType { get; set; }
+
+    /// <summary>
+    /// Gets or sets the now playing item.
+    /// </summary>
+    /// <value>The now playing item.</value>
+    public BaseItemDto? NowPlayingItem { get; set; }
+
+    /// <summary>
+    /// Gets or sets the now viewing item.
+    /// </summary>
+    /// <value>The now viewing item.</value>
+    public BaseItemDto? NowViewingItem { get; set; }
+
+    /// <summary>
+    /// Gets or sets the device id.
+    /// </summary>
+    /// <value>The device id.</value>
+    public string? DeviceId { get; set; }
+
+    /// <summary>
+    /// Gets or sets the application version.
+    /// </summary>
+    /// <value>The application version.</value>
+    public string? ApplicationVersion { get; set; }
+
+    /// <summary>
+    /// Gets or sets the transcoding info.
+    /// </summary>
+    /// <value>The transcoding info.</value>
+    public TranscodingInfo? TranscodingInfo { get; set; }
+
+    /// <summary>
+    /// Gets or sets a value indicating whether this session is active.
+    /// </summary>
+    /// <value><c>true</c> if this session is active; otherwise, <c>false</c>.</value>
+    public bool IsActive { get; set; }
+
+    /// <summary>
+    /// Gets or sets a value indicating whether the session supports media control.
+    /// </summary>
+    /// <value><c>true</c> if this session supports media control; otherwise, <c>false</c>.</value>
+    public bool SupportsMediaControl { get; set; }
+
+    /// <summary>
+    /// Gets or sets a value indicating whether the session supports remote control.
+    /// </summary>
+    /// <value><c>true</c> if this session supports remote control; otherwise, <c>false</c>.</value>
+    public bool SupportsRemoteControl { get; set; }
+
+    /// <summary>
+    /// Gets or sets the now playing queue.
+    /// </summary>
+    /// <value>The now playing queue.</value>
+    public IReadOnlyList<QueueItem>? NowPlayingQueue { get; set; }
+
+    /// <summary>
+    /// Gets or sets the now playing queue full items.
+    /// </summary>
+    /// <value>The now playing queue full items.</value>
+    public IReadOnlyList<BaseItemDto>? NowPlayingQueueFullItems { get; set; }
+
+    /// <summary>
+    /// Gets or sets a value indicating whether the session has a custom device name.
+    /// </summary>
+    /// <value><c>true</c> if this session has a custom device name; otherwise, <c>false</c>.</value>
+    public bool HasCustomDeviceName { get; set; }
+
+    /// <summary>
+    /// Gets or sets the playlist item id.
+    /// </summary>
+    /// <value>The splaylist item id.</value>
+    public string? PlaylistItemId { get; set; }
+
+    /// <summary>
+    /// Gets or sets the server id.
+    /// </summary>
+    /// <value>The server id.</value>
+    public string? ServerId { get; set; }
+
+    /// <summary>
+    /// Gets or sets the user primary image tag.
+    /// </summary>
+    /// <value>The user primary image tag.</value>
+    public string? UserPrimaryImageTag { get; set; }
+
+    /// <summary>
+    /// Gets or sets the supported commands.
+    /// </summary>
+    /// <value>The supported commands.</value>
+    public IReadOnlyList<GeneralCommandType> SupportedCommands { get; set; } = [];
+}
diff --git a/src/Jellyfin.Extensions/Json/Converters/JsonDelimitedArrayConverter.cs b/src/Jellyfin.Extensions/Json/Converters/JsonDelimitedArrayConverter.cs
index 1466d3a71..b9477ce6b 100644
--- a/src/Jellyfin.Extensions/Json/Converters/JsonDelimitedArrayConverter.cs
+++ b/src/Jellyfin.Extensions/Json/Converters/JsonDelimitedArrayConverter.cs
@@ -1,5 +1,7 @@
 using System;
+using System.Collections.Generic;
 using System.ComponentModel;
+using System.Linq;
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
@@ -35,38 +37,27 @@ namespace Jellyfin.Extensions.Json.Converters
                 var stringEntries = reader.GetString()!.Split(Delimiter, StringSplitOptions.RemoveEmptyEntries);
                 if (stringEntries.Length == 0)
                 {
-                    return Array.Empty<T>();
+                    return [];
                 }
 
-                var parsedValues = new object[stringEntries.Length];
-                var convertedCount = 0;
+                var typedValues = new List<T>();
                 for (var i = 0; i < stringEntries.Length; i++)
                 {
                     try
                     {
-                        parsedValues[i] = _typeConverter.ConvertFromInvariantString(stringEntries[i].Trim()) ?? throw new FormatException();
-                        convertedCount++;
+                        var parsedValue = _typeConverter.ConvertFromInvariantString(stringEntries[i].Trim());
+                        if (parsedValue is not null)
+                        {
+                            typedValues.Add((T)parsedValue);
+                        }
                     }
                     catch (FormatException)
                     {
-                        // TODO log when upgraded to .Net6
-                        // https://github.com/dotnet/runtime/issues/42975
-                        // _logger.LogDebug(e, "Error converting value.");
+                        // Ignore unconvertable inputs
                     }
                 }
 
-                var typedValues = new T[convertedCount];
-                var typedValueIndex = 0;
-                for (var i = 0; i < stringEntries.Length; i++)
-                {
-                    if (parsedValues[i] is not null)
-                    {
-                        typedValues.SetValue(parsedValues[i], typedValueIndex);
-                        typedValueIndex++;
-                    }
-                }
-
-                return typedValues;
+                return [.. typedValues];
             }
 
             return JsonSerializer.Deserialize<T[]>(ref reader, options);
@@ -75,7 +66,39 @@ namespace Jellyfin.Extensions.Json.Converters
         /// <inheritdoc />
         public override void Write(Utf8JsonWriter writer, T[]? value, JsonSerializerOptions options)
         {
-            throw new NotImplementedException();
+            if (value is not null)
+            {
+                writer.WriteStartArray();
+                if (value.Length > 0)
+                {
+                    var toWrite = value.Length - 1;
+                    foreach (var it in value)
+                    {
+                        var wrote = false;
+                        if (it is not null)
+                        {
+                            writer.WriteStringValue(it.ToString());
+                            wrote = true;
+                        }
+
+                        if (toWrite > 0)
+                        {
+                            if (wrote)
+                            {
+                                writer.WriteStringValue(Delimiter.ToString());
+                            }
+
+                            toWrite--;
+                        }
+                    }
+                }
+
+                writer.WriteEndArray();
+            }
+            else
+            {
+                writer.WriteNullValue();
+            }
         }
     }
 }
diff --git a/tests/Jellyfin.Extensions.Tests/Json/Converters/JsonCommaDelimitedArrayTests.cs b/tests/Jellyfin.Extensions.Tests/Json/Converters/JsonCommaDelimitedArrayTests.cs
index 61105b42b..9fc015823 100644
--- a/tests/Jellyfin.Extensions.Tests/Json/Converters/JsonCommaDelimitedArrayTests.cs
+++ b/tests/Jellyfin.Extensions.Tests/Json/Converters/JsonCommaDelimitedArrayTests.cs
@@ -41,7 +41,7 @@ namespace Jellyfin.Extensions.Tests.Json.Converters
         {
             var desiredValue = new GenericBodyArrayModel<string>
             {
-                Value = new[] { "a", "b", "c" }
+                Value = ["a", "b", "c"]
             };
 
             var value = JsonSerializer.Deserialize<GenericBodyArrayModel<string>>(@"{ ""Value"": ""a,b,c"" }", _jsonOptions);
@@ -53,7 +53,7 @@ namespace Jellyfin.Extensions.Tests.Json.Converters
         {
             var desiredValue = new GenericBodyArrayModel<string>
             {
-                Value = new[] { "a", "b", "c" }
+                Value = ["a", "b", "c"]
             };
 
             var value = JsonSerializer.Deserialize<GenericBodyArrayModel<string>>(@"{ ""Value"": ""a, b, c"" }", _jsonOptions);
@@ -65,7 +65,7 @@ namespace Jellyfin.Extensions.Tests.Json.Converters
         {
             var desiredValue = new GenericBodyArrayModel<GeneralCommandType>
             {
-                Value = new[] { GeneralCommandType.MoveUp, GeneralCommandType.MoveDown }
+                Value = [GeneralCommandType.MoveUp, GeneralCommandType.MoveDown]
             };
 
             var value = JsonSerializer.Deserialize<GenericBodyArrayModel<GeneralCommandType>>(@"{ ""Value"": ""MoveUp,MoveDown"" }", _jsonOptions);
@@ -77,7 +77,7 @@ namespace Jellyfin.Extensions.Tests.Json.Converters
         {
             var desiredValue = new GenericBodyArrayModel<GeneralCommandType>
             {
-                Value = new[] { GeneralCommandType.MoveUp, GeneralCommandType.MoveDown }
+                Value = [GeneralCommandType.MoveUp, GeneralCommandType.MoveDown]
             };
 
             var value = JsonSerializer.Deserialize<GenericBodyArrayModel<GeneralCommandType>>(@"{ ""Value"": ""MoveUp,,MoveDown"" }", _jsonOptions);
@@ -89,7 +89,7 @@ namespace Jellyfin.Extensions.Tests.Json.Converters
         {
             var desiredValue = new GenericBodyArrayModel<GeneralCommandType>
             {
-                Value = new[] { GeneralCommandType.MoveUp, GeneralCommandType.MoveDown }
+                Value = [GeneralCommandType.MoveUp, GeneralCommandType.MoveDown]
             };
 
             var value = JsonSerializer.Deserialize<GenericBodyArrayModel<GeneralCommandType>>(@"{ ""Value"": ""MoveUp,TotallyNotAVallidCommand,MoveDown"" }", _jsonOptions);
@@ -101,7 +101,7 @@ namespace Jellyfin.Extensions.Tests.Json.Converters
         {
             var desiredValue = new GenericBodyArrayModel<GeneralCommandType>
             {
-                Value = new[] { GeneralCommandType.MoveUp, GeneralCommandType.MoveDown }
+                Value = [GeneralCommandType.MoveUp, GeneralCommandType.MoveDown]
             };
 
             var value = JsonSerializer.Deserialize<GenericBodyArrayModel<GeneralCommandType>>(@"{ ""Value"": ""MoveUp, MoveDown"" }", _jsonOptions);
@@ -113,7 +113,7 @@ namespace Jellyfin.Extensions.Tests.Json.Converters
         {
             var desiredValue = new GenericBodyArrayModel<string>
             {
-                Value = new[] { "a", "b", "c" }
+                Value = ["a", "b", "c"]
             };
 
             var value = JsonSerializer.Deserialize<GenericBodyArrayModel<string>>(@"{ ""Value"": [""a"",""b"",""c""] }", _jsonOptions);
@@ -125,7 +125,7 @@ namespace Jellyfin.Extensions.Tests.Json.Converters
         {
             var desiredValue = new GenericBodyArrayModel<GeneralCommandType>
             {
-                Value = new[] { GeneralCommandType.MoveUp, GeneralCommandType.MoveDown }
+                Value = [GeneralCommandType.MoveUp, GeneralCommandType.MoveDown]
             };
 
             var value = JsonSerializer.Deserialize<GenericBodyArrayModel<GeneralCommandType>>(@"{ ""Value"": [""MoveUp"", ""MoveDown""] }", _jsonOptions);
-- 
cgit v1.2.3


From 93db8990d951649c1d25003e2859776ac80e7440 Mon Sep 17 00:00:00 2001
From: Nyanmisaka <nst799610810@gmail.com>
Date: Thu, 19 Sep 2024 21:14:18 +0800
Subject: Enable HEVC RExt HW decoding for 4:2:2/4:4:4 content (#12664)

---
 .../MediaEncoding/EncodingHelper.cs                | 175 ++++++++++++++++-----
 .../Configuration/EncodingOptions.cs               |  12 ++
 2 files changed, 147 insertions(+), 40 deletions(-)

(limited to 'MediaBrowser.Controller')

diff --git a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
index 88aa888a1..e26bcf21e 100644
--- a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
+++ b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
@@ -299,7 +299,7 @@ namespace MediaBrowser.Controller.MediaEncoding
         {
             if (state.VideoStream is null
                 || !options.EnableTonemapping
-                || GetVideoColorBitDepth(state) != 10
+                || GetVideoColorBitDepth(state) < 10
                 || !_mediaEncoder.SupportsFilter("tonemapx"))
             {
                 return false;
@@ -312,7 +312,7 @@ namespace MediaBrowser.Controller.MediaEncoding
         {
             if (state.VideoStream is null
                 || !options.EnableTonemapping
-                || GetVideoColorBitDepth(state) != 10)
+                || GetVideoColorBitDepth(state) < 10)
             {
                 return false;
             }
@@ -354,7 +354,7 @@ namespace MediaBrowser.Controller.MediaEncoding
         {
             if (state.VideoStream is null
                 || !options.EnableVppTonemapping
-                || GetVideoColorBitDepth(state) != 10)
+                || GetVideoColorBitDepth(state) < 10)
             {
                 return false;
             }
@@ -377,7 +377,7 @@ namespace MediaBrowser.Controller.MediaEncoding
         {
             if (state.VideoStream is null
                 || !options.EnableVideoToolboxTonemapping
-                || GetVideoColorBitDepth(state) != 10)
+                || GetVideoColorBitDepth(state) < 10)
             {
                 return false;
             }
@@ -388,6 +388,25 @@ namespace MediaBrowser.Controller.MediaEncoding
                    && state.VideoStream.VideoRangeType is VideoRangeType.HDR10 or VideoRangeType.HLG or VideoRangeType.HDR10Plus or VideoRangeType.DOVIWithHDR10 or VideoRangeType.DOVIWithHLG;
         }
 
+        private bool IsVideoStreamHevcRext(EncodingJobInfo state)
+        {
+            var videoStream = state.VideoStream;
+            if (videoStream is null)
+            {
+                return false;
+            }
+
+            return string.Equals(videoStream.Codec, "hevc", StringComparison.OrdinalIgnoreCase)
+                   && (string.Equals(videoStream.Profile, "Rext", StringComparison.OrdinalIgnoreCase)
+                       || string.Equals(videoStream.PixelFormat, "yuv420p12le", StringComparison.OrdinalIgnoreCase)
+                       || string.Equals(videoStream.PixelFormat, "yuv422p", StringComparison.OrdinalIgnoreCase)
+                       || string.Equals(videoStream.PixelFormat, "yuv422p10le", StringComparison.OrdinalIgnoreCase)
+                       || string.Equals(videoStream.PixelFormat, "yuv422p12le", StringComparison.OrdinalIgnoreCase)
+                       || string.Equals(videoStream.PixelFormat, "yuv444p", StringComparison.OrdinalIgnoreCase)
+                       || string.Equals(videoStream.PixelFormat, "yuv444p10le", StringComparison.OrdinalIgnoreCase)
+                       || string.Equals(videoStream.PixelFormat, "yuv444p12le", StringComparison.OrdinalIgnoreCase));
+        }
+
         /// <summary>
         /// Gets the name of the output video codec.
         /// </summary>
@@ -3659,7 +3678,8 @@ namespace MediaBrowser.Controller.MediaEncoding
                     mainFilters.Add($"transpose_cuda=dir={tranposeDir}");
                 }
 
-                var outFormat = doCuTonemap ? string.Empty : "yuv420p";
+                var isRext = IsVideoStreamHevcRext(state);
+                var outFormat = doCuTonemap ? (isRext ? "p010" : string.Empty) : "yuv420p";
                 var hwScaleFilter = GetHwScaleFilter("scale", "cuda", outFormat, false, swpInW, swpInH, reqW, reqH, reqMaxW, reqMaxH);
                 // hw scale
                 mainFilters.Add(hwScaleFilter);
@@ -4091,6 +4111,8 @@ namespace MediaBrowser.Controller.MediaEncoding
             }
             else if (isD3d11vaDecoder || isQsvDecoder)
             {
+                var isRext = IsVideoStreamHevcRext(state);
+                var twoPassVppTonemap = isRext;
                 var doVppProcamp = false;
                 var procampParams = string.Empty;
                 if (doVppTonemap)
@@ -4100,21 +4122,21 @@ namespace MediaBrowser.Controller.MediaEncoding
                         && options.VppTonemappingBrightness <= 100)
                     {
                         procampParams += $":brightness={options.VppTonemappingBrightness}";
-                        doVppProcamp = true;
+                        twoPassVppTonemap = doVppProcamp = true;
                     }
 
                     if (options.VppTonemappingContrast > 1
                         && options.VppTonemappingContrast <= 10)
                     {
                         procampParams += $":contrast={options.VppTonemappingContrast}";
-                        doVppProcamp = true;
+                        twoPassVppTonemap = doVppProcamp = true;
                     }
 
                     procampParams += doVppProcamp ? ":procamp=1:async_depth=2" : string.Empty;
                 }
 
-                var outFormat = doOclTonemap ? (doVppTranspose ? "p010" : string.Empty) : "nv12";
-                outFormat = (doVppTonemap && doVppProcamp) ? "p010" : outFormat;
+                var outFormat = doOclTonemap ? ((doVppTranspose || isRext) ? "p010" : string.Empty) : "nv12";
+                outFormat = twoPassVppTonemap ? "p010" : outFormat;
 
                 var swapOutputWandH = doVppTranspose && swapWAndH;
                 var hwScalePrefix = (doVppTranspose || doVppTonemap) ? "vpp" : "scale";
@@ -4127,7 +4149,7 @@ namespace MediaBrowser.Controller.MediaEncoding
 
                 if (!string.IsNullOrEmpty(hwScaleFilter) && doVppTonemap)
                 {
-                    hwScaleFilter += doVppProcamp ? procampParams : ":tonemap=1";
+                    hwScaleFilter += doVppProcamp ? procampParams : (twoPassVppTonemap ? string.Empty : ":tonemap=1");
                 }
 
                 if (isD3d11vaDecoder)
@@ -4151,7 +4173,7 @@ namespace MediaBrowser.Controller.MediaEncoding
                 mainFilters.Add(hwScaleFilter);
 
                 // hw tonemap(w/ procamp)
-                if (doVppTonemap && doVppProcamp)
+                if (doVppTonemap && twoPassVppTonemap)
                 {
                     mainFilters.Add("vpp_qsv=tonemap=1:format=nv12:async_depth=2");
                 }
@@ -4346,6 +4368,7 @@ namespace MediaBrowser.Controller.MediaEncoding
             else if (isVaapiDecoder || isQsvDecoder)
             {
                 var hwFilterSuffix = isVaapiDecoder ? "vaapi" : "qsv";
+                var isRext = IsVideoStreamHevcRext(state);
 
                 // INPUT vaapi/qsv surface(vram)
                 // hw deint
@@ -4362,6 +4385,8 @@ namespace MediaBrowser.Controller.MediaEncoding
                 }
 
                 var outFormat = doOclTonemap ? ((isQsvDecoder && doVppTranspose) ? "p010" : string.Empty) : "nv12";
+                outFormat = (doTonemap && isRext) ? "p010" : outFormat;
+
                 var swapOutputWandH = isQsvDecoder && doVppTranspose && swapWAndH;
                 var hwScalePrefix = (isQsvDecoder && doVppTranspose) ? "vpp" : "scale";
                 var hwScaleFilter = GetHwScaleFilter(hwScalePrefix, hwFilterSuffix, outFormat, swapOutputWandH, swpInW, swpInH, reqW, reqH, reqMaxW, reqMaxH);
@@ -4658,6 +4683,8 @@ namespace MediaBrowser.Controller.MediaEncoding
             }
             else if (isVaapiDecoder)
             {
+                var isRext = IsVideoStreamHevcRext(state);
+
                 // INPUT vaapi surface(vram)
                 // hw deint
                 if (doDeintH2645)
@@ -4672,7 +4699,7 @@ namespace MediaBrowser.Controller.MediaEncoding
                     mainFilters.Add($"transpose_vaapi=dir={tranposeDir}");
                 }
 
-                var outFormat = doTonemap ? string.Empty : "nv12";
+                var outFormat = doTonemap ? (isRext ? "p010" : string.Empty) : "nv12";
                 var hwScaleFilter = GetHwScaleFilter("scale", "vaapi", outFormat, false, swpInW, swpInH, reqW, reqH, reqMaxW, reqMaxH);
 
                 // allocate extra pool sizes for vaapi vpp
@@ -5974,7 +6001,11 @@ namespace MediaBrowser.Controller.MediaEncoding
             var decoderName = decoderPrefix + '_' + decoderSuffix;
 
             var isCodecAvailable = _mediaEncoder.SupportsDecoder(decoderName) && options.HardwareDecodingCodecs.Contains(videoCodec, StringComparison.OrdinalIgnoreCase);
-            if (bitDepth == 10 && isCodecAvailable)
+
+            // VideoToolbox decoders have built-in SW fallback
+            if (bitDepth == 10
+                && isCodecAvailable
+                && (options.HardwareAccelerationType != HardwareAccelerationType.videotoolbox))
             {
                 if (string.Equals(videoCodec, "hevc", StringComparison.OrdinalIgnoreCase)
                     && options.HardwareDecodingCodecs.Contains("hevc", StringComparison.OrdinalIgnoreCase)
@@ -6050,17 +6081,40 @@ namespace MediaBrowser.Controller.MediaEncoding
                 && ffmpegVersion >= _minFFmpegDisplayRotationOption;
             var stripRotationDataArgs = stripRotationData ? " -display_rotation 0" : string.Empty;
 
-            if (bitDepth == 10 && isCodecAvailable)
+            // VideoToolbox decoders have built-in SW fallback
+            if (isCodecAvailable
+                && (options.HardwareAccelerationType != HardwareAccelerationType.videotoolbox))
             {
                 if (string.Equals(videoCodec, "hevc", StringComparison.OrdinalIgnoreCase)
-                    && options.HardwareDecodingCodecs.Contains("hevc", StringComparison.OrdinalIgnoreCase)
-                    && !options.EnableDecodingColorDepth10Hevc)
+                    && options.HardwareDecodingCodecs.Contains("hevc", StringComparison.OrdinalIgnoreCase))
                 {
-                    return null;
+                    if (IsVideoStreamHevcRext(state))
+                    {
+                        if (bitDepth <= 10 && !options.EnableDecodingColorDepth10HevcRext)
+                        {
+                            return null;
+                        }
+
+                        if (bitDepth == 12 && !options.EnableDecodingColorDepth12HevcRext)
+                        {
+                            return null;
+                        }
+
+                        if (hardwareAccelerationType == HardwareAccelerationType.vaapi
+                            && !_mediaEncoder.IsVaapiDeviceInteliHD)
+                        {
+                            return null;
+                        }
+                    }
+                    else if (bitDepth == 10 && !options.EnableDecodingColorDepth10Hevc)
+                    {
+                        return null;
+                    }
                 }
 
                 if (string.Equals(videoCodec, "vp9", StringComparison.OrdinalIgnoreCase)
                     && options.HardwareDecodingCodecs.Contains("vp9", StringComparison.OrdinalIgnoreCase)
+                    && bitDepth == 10
                     && !options.EnableDecodingColorDepth10Vp9)
                 {
                     return null;
@@ -6172,6 +6226,14 @@ namespace MediaBrowser.Controller.MediaEncoding
             var is8bitSwFormatsQsv = string.Equals("yuv420p", videoStream.PixelFormat, StringComparison.OrdinalIgnoreCase)
                                      || string.Equals("yuvj420p", videoStream.PixelFormat, StringComparison.OrdinalIgnoreCase);
             var is8_10bitSwFormatsQsv = is8bitSwFormatsQsv || string.Equals("yuv420p10le", videoStream.PixelFormat, StringComparison.OrdinalIgnoreCase);
+            var is8_10_12bitSwFormatsQsv = is8_10bitSwFormatsQsv
+                || string.Equals("yuv422p", videoStream.PixelFormat, StringComparison.OrdinalIgnoreCase)
+                || string.Equals("yuv444p", videoStream.PixelFormat, StringComparison.OrdinalIgnoreCase)
+                || string.Equals("yuv422p10le", videoStream.PixelFormat, StringComparison.OrdinalIgnoreCase)
+                || string.Equals("yuv444p10le", videoStream.PixelFormat, StringComparison.OrdinalIgnoreCase)
+                || string.Equals("yuv420p12le", videoStream.PixelFormat, StringComparison.OrdinalIgnoreCase)
+                || string.Equals("yuv422p12le", videoStream.PixelFormat, StringComparison.OrdinalIgnoreCase)
+                || string.Equals("yuv444p12le", videoStream.PixelFormat, StringComparison.OrdinalIgnoreCase);
             // TODO: add more 8/10bit and 4:4:4 formats for Qsv after finishing the ffcheck tool
 
             if (is8bitSwFormatsQsv)
@@ -6200,12 +6262,6 @@ namespace MediaBrowser.Controller.MediaEncoding
 
             if (is8_10bitSwFormatsQsv)
             {
-                if (string.Equals(videoStream.Codec, "hevc", StringComparison.OrdinalIgnoreCase)
-                    || string.Equals(videoStream.Codec, "h265", StringComparison.OrdinalIgnoreCase))
-                {
-                    return GetHwaccelType(state, options, "hevc", bitDepth, hwSurface) + GetHwDecoderName(options, "hevc", "qsv", "hevc", bitDepth);
-                }
-
                 if (string.Equals(videoStream.Codec, "vp9", StringComparison.OrdinalIgnoreCase))
                 {
                     return GetHwaccelType(state, options, "vp9", bitDepth, hwSurface) + GetHwDecoderName(options, "vp9", "qsv", "vp9", bitDepth);
@@ -6217,6 +6273,15 @@ namespace MediaBrowser.Controller.MediaEncoding
                 }
             }
 
+            if (is8_10_12bitSwFormatsQsv)
+            {
+                if (string.Equals(videoStream.Codec, "hevc", StringComparison.OrdinalIgnoreCase)
+                    || string.Equals(videoStream.Codec, "h265", StringComparison.OrdinalIgnoreCase))
+                {
+                    return GetHwaccelType(state, options, "hevc", bitDepth, hwSurface) + GetHwDecoderName(options, "hevc", "qsv", "hevc", bitDepth);
+                }
+            }
+
             return null;
         }
 
@@ -6232,6 +6297,11 @@ namespace MediaBrowser.Controller.MediaEncoding
             var is8bitSwFormatsNvdec = string.Equals("yuv420p", videoStream.PixelFormat, StringComparison.OrdinalIgnoreCase)
                                        || string.Equals("yuvj420p", videoStream.PixelFormat, StringComparison.OrdinalIgnoreCase);
             var is8_10bitSwFormatsNvdec = is8bitSwFormatsNvdec || string.Equals("yuv420p10le", videoStream.PixelFormat, StringComparison.OrdinalIgnoreCase);
+            var is8_10_12bitSwFormatsNvdec = is8_10bitSwFormatsNvdec
+                || string.Equals("yuv444p", videoStream.PixelFormat, StringComparison.OrdinalIgnoreCase)
+                || string.Equals("yuv444p10le", videoStream.PixelFormat, StringComparison.OrdinalIgnoreCase)
+                || string.Equals("yuv420p12le", videoStream.PixelFormat, StringComparison.OrdinalIgnoreCase)
+                || string.Equals("yuv444p12le", videoStream.PixelFormat, StringComparison.OrdinalIgnoreCase);
             // TODO: add more 8/10/12bit and 4:4:4 formats for Nvdec after finishing the ffcheck tool
 
             if (is8bitSwFormatsNvdec)
@@ -6265,12 +6335,6 @@ namespace MediaBrowser.Controller.MediaEncoding
 
             if (is8_10bitSwFormatsNvdec)
             {
-                if (string.Equals("hevc", videoStream.Codec, StringComparison.OrdinalIgnoreCase)
-                    || string.Equals("h265", videoStream.Codec, StringComparison.OrdinalIgnoreCase))
-                {
-                    return GetHwaccelType(state, options, "hevc", bitDepth, hwSurface) + GetHwDecoderName(options, "hevc", "cuvid", "hevc", bitDepth);
-                }
-
                 if (string.Equals("vp9", videoStream.Codec, StringComparison.OrdinalIgnoreCase))
                 {
                     return GetHwaccelType(state, options, "vp9", bitDepth, hwSurface) + GetHwDecoderName(options, "vp9", "cuvid", "vp9", bitDepth);
@@ -6282,6 +6346,15 @@ namespace MediaBrowser.Controller.MediaEncoding
                 }
             }
 
+            if (is8_10_12bitSwFormatsNvdec)
+            {
+                if (string.Equals("hevc", videoStream.Codec, StringComparison.OrdinalIgnoreCase)
+                    || string.Equals("h265", videoStream.Codec, StringComparison.OrdinalIgnoreCase))
+                {
+                    return GetHwaccelType(state, options, "hevc", bitDepth, hwSurface) + GetHwDecoderName(options, "hevc", "cuvid", "hevc", bitDepth);
+                }
+            }
+
             return null;
         }
 
@@ -6356,6 +6429,14 @@ namespace MediaBrowser.Controller.MediaEncoding
             var is8bitSwFormatsVaapi = string.Equals("yuv420p", videoStream.PixelFormat, StringComparison.OrdinalIgnoreCase)
                                        || string.Equals("yuvj420p", videoStream.PixelFormat, StringComparison.OrdinalIgnoreCase);
             var is8_10bitSwFormatsVaapi = is8bitSwFormatsVaapi || string.Equals("yuv420p10le", videoStream.PixelFormat, StringComparison.OrdinalIgnoreCase);
+            var is8_10_12bitSwFormatsVaapi = is8_10bitSwFormatsVaapi
+                || string.Equals("yuv422p", videoStream.PixelFormat, StringComparison.OrdinalIgnoreCase)
+                || string.Equals("yuv444p", videoStream.PixelFormat, StringComparison.OrdinalIgnoreCase)
+                || string.Equals("yuv422p10le", videoStream.PixelFormat, StringComparison.OrdinalIgnoreCase)
+                || string.Equals("yuv444p10le", videoStream.PixelFormat, StringComparison.OrdinalIgnoreCase)
+                || string.Equals("yuv420p12le", videoStream.PixelFormat, StringComparison.OrdinalIgnoreCase)
+                || string.Equals("yuv422p12le", videoStream.PixelFormat, StringComparison.OrdinalIgnoreCase)
+                || string.Equals("yuv444p12le", videoStream.PixelFormat, StringComparison.OrdinalIgnoreCase);
 
             if (is8bitSwFormatsVaapi)
             {
@@ -6383,12 +6464,6 @@ namespace MediaBrowser.Controller.MediaEncoding
 
             if (is8_10bitSwFormatsVaapi)
             {
-                if (string.Equals("hevc", videoStream.Codec, StringComparison.OrdinalIgnoreCase)
-                    || string.Equals("h265", videoStream.Codec, StringComparison.OrdinalIgnoreCase))
-                {
-                    return GetHwaccelType(state, options, "hevc", bitDepth, hwSurface);
-                }
-
                 if (string.Equals("vp9", videoStream.Codec, StringComparison.OrdinalIgnoreCase))
                 {
                     return GetHwaccelType(state, options, "vp9", bitDepth, hwSurface);
@@ -6400,6 +6475,15 @@ namespace MediaBrowser.Controller.MediaEncoding
                 }
             }
 
+            if (is8_10_12bitSwFormatsVaapi)
+            {
+                if (string.Equals("hevc", videoStream.Codec, StringComparison.OrdinalIgnoreCase)
+                    || string.Equals("h265", videoStream.Codec, StringComparison.OrdinalIgnoreCase))
+                {
+                    return GetHwaccelType(state, options, "hevc", bitDepth, hwSurface);
+                }
+            }
+
             return null;
         }
 
@@ -6414,6 +6498,14 @@ namespace MediaBrowser.Controller.MediaEncoding
             var is8bitSwFormatsVt = string.Equals("yuv420p", videoStream.PixelFormat, StringComparison.OrdinalIgnoreCase)
                                     || string.Equals("yuvj420p", videoStream.PixelFormat, StringComparison.OrdinalIgnoreCase);
             var is8_10bitSwFormatsVt = is8bitSwFormatsVt || string.Equals("yuv420p10le", videoStream.PixelFormat, StringComparison.OrdinalIgnoreCase);
+            var is8_10_12bitSwFormatsVt = is8_10bitSwFormatsVt
+                || string.Equals("yuv422p", videoStream.PixelFormat, StringComparison.OrdinalIgnoreCase)
+                || string.Equals("yuv444p", videoStream.PixelFormat, StringComparison.OrdinalIgnoreCase)
+                || string.Equals("yuv422p10le", videoStream.PixelFormat, StringComparison.OrdinalIgnoreCase)
+                || string.Equals("yuv444p10le", videoStream.PixelFormat, StringComparison.OrdinalIgnoreCase)
+                || string.Equals("yuv420p12le", videoStream.PixelFormat, StringComparison.OrdinalIgnoreCase)
+                || string.Equals("yuv422p12le", videoStream.PixelFormat, StringComparison.OrdinalIgnoreCase)
+                || string.Equals("yuv444p12le", videoStream.PixelFormat, StringComparison.OrdinalIgnoreCase);
 
             // The related patches make videotoolbox hardware surface working is only available in jellyfin-ffmpeg 7.0.1 at the moment.
             bool useHwSurface = (_mediaEncoder.EncoderVersion >= _minFFmpegWorkingVtHwSurface) && IsVideoToolboxFullSupported();
@@ -6434,15 +6526,18 @@ namespace MediaBrowser.Controller.MediaEncoding
                     return GetHwaccelType(state, options, "h264", bitDepth, useHwSurface);
                 }
 
-                if (string.Equals("hevc", videoStream.Codec, StringComparison.OrdinalIgnoreCase)
-                    || string.Equals("h265", videoStream.Codec, StringComparison.OrdinalIgnoreCase))
+                if (string.Equals("vp9", videoStream.Codec, StringComparison.OrdinalIgnoreCase))
                 {
-                    return GetHwaccelType(state, options, "hevc", bitDepth, useHwSurface);
+                    return GetHwaccelType(state, options, "vp9", bitDepth, useHwSurface);
                 }
+            }
 
-                if (string.Equals("vp9", videoStream.Codec, StringComparison.OrdinalIgnoreCase))
+            if (is8_10_12bitSwFormatsVt)
+            {
+                if (string.Equals("hevc", videoStream.Codec, StringComparison.OrdinalIgnoreCase)
+                    || string.Equals("h265", videoStream.Codec, StringComparison.OrdinalIgnoreCase))
                 {
-                    return GetHwaccelType(state, options, "vp9", bitDepth, useHwSurface);
+                    return GetHwaccelType(state, options, "hevc", bitDepth, useHwSurface);
                 }
             }
 
diff --git a/MediaBrowser.Model/Configuration/EncodingOptions.cs b/MediaBrowser.Model/Configuration/EncodingOptions.cs
index d67a2479f..2720c0bdf 100644
--- a/MediaBrowser.Model/Configuration/EncodingOptions.cs
+++ b/MediaBrowser.Model/Configuration/EncodingOptions.cs
@@ -46,6 +46,8 @@ public class EncodingOptions
         DeinterlaceMethod = DeinterlaceMethod.yadif;
         EnableDecodingColorDepth10Hevc = true;
         EnableDecodingColorDepth10Vp9 = true;
+        EnableDecodingColorDepth10HevcRext = false;
+        EnableDecodingColorDepth12HevcRext = false;
         // Enhanced Nvdec or system native decoder is required for DoVi to SDR tone-mapping.
         EnableEnhancedNvdecDecoder = true;
         PreferSystemNativeHwDecoder = true;
@@ -234,6 +236,16 @@ public class EncodingOptions
     /// </summary>
     public bool EnableDecodingColorDepth10Vp9 { get; set; }
 
+    /// <summary>
+    /// Gets or sets a value indicating whether 8/10bit HEVC RExt decoding is enabled.
+    /// </summary>
+    public bool EnableDecodingColorDepth10HevcRext { get; set; }
+
+    /// <summary>
+    /// Gets or sets a value indicating whether 12bit HEVC RExt decoding is enabled.
+    /// </summary>
+    public bool EnableDecodingColorDepth12HevcRext { get; set; }
+
     /// <summary>
     /// Gets or sets a value indicating whether the enhanced NVDEC is enabled.
     /// </summary>
-- 
cgit v1.2.3


From e615b56a70d88c441589bb9f1fd0159e97ea4b1a Mon Sep 17 00:00:00 2001
From: Nyanmisaka <nst799610810@gmail.com>
Date: Fri, 20 Sep 2024 21:01:58 +0800
Subject: Fix RKMPP 2pass scaling in Trickplay (#12675)

---
 MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

(limited to 'MediaBrowser.Controller')

diff --git a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
index e26bcf21e..d8c4f2f85 100644
--- a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
+++ b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
@@ -5570,13 +5570,22 @@ namespace MediaBrowser.Controller.MediaEncoding
                 var outFormat = doOclTonemap ? "p010" : "nv12";
                 var hwScalePrefix = doRkVppTranspose ? "vpp" : "scale";
                 var hwScaleFilter = GetHwScaleFilter(hwScalePrefix, "rkrga", outFormat, swapOutputWandH, swpInW, swpInH, reqW, reqH, reqMaxW, reqMaxH);
-                var hwScaleFilter2 = GetHwScaleFilter(hwScalePrefix, "rkrga", string.Empty, swapOutputWandH, swpInW, swpInH, reqW, reqH, reqMaxW, reqMaxH);
+                var doScaling = GetHwScaleFilter(hwScalePrefix, "rkrga", string.Empty, swapOutputWandH, swpInW, swpInH, reqW, reqH, reqMaxW, reqMaxH);
 
                 if (!hasSubs
                      || doRkVppTranspose
                      || !isFullAfbcPipeline
-                     || !string.IsNullOrEmpty(hwScaleFilter2))
+                     || !string.IsNullOrEmpty(doScaling))
                 {
+                    // RGA3 hardware only support (1/8 ~ 8) scaling in each blit operation,
+                    // but in Trickplay there's a case: (3840/320 == 12), enable 2pass for it
+                    if (!string.IsNullOrEmpty(doScaling)
+                        && !IsScaleRatioSupported(inW, inH, reqW, reqH, reqMaxW, reqMaxH, 8.0f))
+                    {
+                        var hwScaleFilterFirstPass = $"scale_rkrga=w=iw/8:h=ih/8:format={outFormat}:afbc=1";
+                        mainFilters.Add(hwScaleFilterFirstPass);
+                    }
+
                     if (!string.IsNullOrEmpty(hwScaleFilter) && doRkVppTranspose)
                     {
                         hwScaleFilter += $":transpose={tranposeDir}";
-- 
cgit v1.2.3


From d944f415f3cc0e5433d94b11a16684ca3f0131ec Mon Sep 17 00:00:00 2001
From: gnattu <gnattuoc@me.com>
Date: Sun, 22 Sep 2024 00:34:47 +0800
Subject: Let HLS Controller decide if subtitle should be burn in

Previously, we predicted whether the subtitle should be burned in with transcode reasons, but that was not accurate because the actual transcoding codec is only determined after the client has requested the stream. This pass through the option to the `DynamicHlsController` to handle the subtitle burn-in during the actual transcoding process. Now the client should be responsible to conditionally load the subtitle when this option is enabled.
---
 Jellyfin.Api/Controllers/DynamicHlsController.cs   | 63 ++++++++++++++--------
 Jellyfin.Api/Helpers/MediaInfoHelper.cs            |  6 +++
 .../MediaEncoding/BaseEncodingJobOptions.cs        |  2 +
 .../MediaEncoding/EncodingHelper.cs                | 38 +++++++------
 MediaBrowser.Model/Dlna/StreamBuilder.cs           | 18 ++-----
 MediaBrowser.Model/Dlna/StreamInfo.cs              |  7 ++-
 6 files changed, 81 insertions(+), 53 deletions(-)

(limited to 'MediaBrowser.Controller')

diff --git a/Jellyfin.Api/Controllers/DynamicHlsController.cs b/Jellyfin.Api/Controllers/DynamicHlsController.cs
index db1d86698..924f010e4 100644
--- a/Jellyfin.Api/Controllers/DynamicHlsController.cs
+++ b/Jellyfin.Api/Controllers/DynamicHlsController.cs
@@ -158,6 +158,7 @@ public class DynamicHlsController : BaseJellyfinApiController
     /// <param name="maxHeight">Optional. The max height.</param>
     /// <param name="enableSubtitlesInManifest">Optional. Whether to enable subtitles in the manifest.</param>
     /// <param name="enableAudioVbrEncoding">Optional. Whether to enable Audio Encoding.</param>
+    /// <param name="alwaysBurnInSubtitleWhenTranscoding">Whether to always burn in subtitles when transcoding.</param>
     /// <response code="200">Hls live stream retrieved.</response>
     /// <returns>A <see cref="FileResult"/> containing the hls file.</returns>
     [HttpGet("Videos/{itemId}/live.m3u8")]
@@ -216,7 +217,8 @@ public class DynamicHlsController : BaseJellyfinApiController
         [FromQuery] int? maxWidth,
         [FromQuery] int? maxHeight,
         [FromQuery] bool? enableSubtitlesInManifest,
-        [FromQuery] bool enableAudioVbrEncoding = true)
+        [FromQuery] bool enableAudioVbrEncoding = true,
+        [FromQuery] bool alwaysBurnInSubtitleWhenTranscoding = false)
     {
         VideoRequestDto streamingRequest = new VideoRequestDto
         {
@@ -251,7 +253,7 @@ public class DynamicHlsController : BaseJellyfinApiController
             Height = height,
             VideoBitRate = videoBitRate,
             SubtitleStreamIndex = subtitleStreamIndex,
-            SubtitleMethod = subtitleMethod ?? SubtitleDeliveryMethod.Encode,
+            SubtitleMethod = subtitleMethod ?? SubtitleDeliveryMethod.External,
             MaxRefFrames = maxRefFrames,
             MaxVideoBitDepth = maxVideoBitDepth,
             RequireAvc = requireAvc ?? false,
@@ -271,7 +273,8 @@ public class DynamicHlsController : BaseJellyfinApiController
             MaxHeight = maxHeight,
             MaxWidth = maxWidth,
             EnableSubtitlesInManifest = enableSubtitlesInManifest ?? true,
-            EnableAudioVbrEncoding = enableAudioVbrEncoding
+            EnableAudioVbrEncoding = enableAudioVbrEncoding,
+            AlwaysBurnInSubtitleWhenTranscoding = alwaysBurnInSubtitleWhenTranscoding
         };
 
         // CTS lifecycle is managed internally.
@@ -398,6 +401,7 @@ public class DynamicHlsController : BaseJellyfinApiController
     /// <param name="enableAdaptiveBitrateStreaming">Enable adaptive bitrate streaming.</param>
     /// <param name="enableTrickplay">Enable trickplay image playlists being added to master playlist.</param>
     /// <param name="enableAudioVbrEncoding">Whether to enable Audio Encoding.</param>
+    /// <param name="alwaysBurnInSubtitleWhenTranscoding">Whether to always burn in subtitles when transcoding.</param>
     /// <response code="200">Video stream returned.</response>
     /// <returns>A <see cref="FileResult"/> containing the playlist file.</returns>
     [HttpGet("Videos/{itemId}/master.m3u8")]
@@ -457,7 +461,8 @@ public class DynamicHlsController : BaseJellyfinApiController
         [FromQuery] Dictionary<string, string> streamOptions,
         [FromQuery] bool enableAdaptiveBitrateStreaming = true,
         [FromQuery] bool enableTrickplay = true,
-        [FromQuery] bool enableAudioVbrEncoding = true)
+        [FromQuery] bool enableAudioVbrEncoding = true,
+        [FromQuery] bool alwaysBurnInSubtitleWhenTranscoding = false)
     {
         var streamingRequest = new HlsVideoRequestDto
         {
@@ -493,7 +498,7 @@ public class DynamicHlsController : BaseJellyfinApiController
             MaxHeight = maxHeight,
             VideoBitRate = videoBitRate,
             SubtitleStreamIndex = subtitleStreamIndex,
-            SubtitleMethod = subtitleMethod ?? SubtitleDeliveryMethod.Encode,
+            SubtitleMethod = subtitleMethod ?? SubtitleDeliveryMethod.External,
             MaxRefFrames = maxRefFrames,
             MaxVideoBitDepth = maxVideoBitDepth,
             RequireAvc = requireAvc ?? false,
@@ -512,7 +517,8 @@ public class DynamicHlsController : BaseJellyfinApiController
             StreamOptions = streamOptions,
             EnableAdaptiveBitrateStreaming = enableAdaptiveBitrateStreaming,
             EnableTrickplay = enableTrickplay,
-            EnableAudioVbrEncoding = enableAudioVbrEncoding
+            EnableAudioVbrEncoding = enableAudioVbrEncoding,
+            AlwaysBurnInSubtitleWhenTranscoding = alwaysBurnInSubtitleWhenTranscoding
         };
 
         return await _dynamicHlsHelper.GetMasterHlsPlaylist(TranscodingJobType, streamingRequest, enableAdaptiveBitrateStreaming).ConfigureAwait(false);
@@ -572,6 +578,7 @@ public class DynamicHlsController : BaseJellyfinApiController
     /// <param name="streamOptions">Optional. The streaming options.</param>
     /// <param name="enableAdaptiveBitrateStreaming">Enable adaptive bitrate streaming.</param>
     /// <param name="enableAudioVbrEncoding">Optional. Whether to enable Audio Encoding.</param>
+    /// <param name="alwaysBurnInSubtitleWhenTranscoding">Whether to always burn in subtitles when transcoding.</param>
     /// <response code="200">Audio stream returned.</response>
     /// <returns>A <see cref="FileResult"/> containing the playlist file.</returns>
     [HttpGet("Audio/{itemId}/master.m3u8")]
@@ -629,7 +636,8 @@ public class DynamicHlsController : BaseJellyfinApiController
         [FromQuery] EncodingContext? context,
         [FromQuery] Dictionary<string, string> streamOptions,
         [FromQuery] bool enableAdaptiveBitrateStreaming = true,
-        [FromQuery] bool enableAudioVbrEncoding = true)
+        [FromQuery] bool enableAudioVbrEncoding = true,
+        [FromQuery] bool alwaysBurnInSubtitleWhenTranscoding = false)
     {
         var streamingRequest = new HlsAudioRequestDto
         {
@@ -663,7 +671,7 @@ public class DynamicHlsController : BaseJellyfinApiController
             Height = height,
             VideoBitRate = videoBitRate,
             SubtitleStreamIndex = subtitleStreamIndex,
-            SubtitleMethod = subtitleMethod ?? SubtitleDeliveryMethod.Encode,
+            SubtitleMethod = subtitleMethod ?? SubtitleDeliveryMethod.External,
             MaxRefFrames = maxRefFrames,
             MaxVideoBitDepth = maxVideoBitDepth,
             RequireAvc = requireAvc ?? false,
@@ -681,7 +689,8 @@ public class DynamicHlsController : BaseJellyfinApiController
             Context = context ?? EncodingContext.Streaming,
             StreamOptions = streamOptions,
             EnableAdaptiveBitrateStreaming = enableAdaptiveBitrateStreaming,
-            EnableAudioVbrEncoding = enableAudioVbrEncoding
+            EnableAudioVbrEncoding = enableAudioVbrEncoding,
+            AlwaysBurnInSubtitleWhenTranscoding = alwaysBurnInSubtitleWhenTranscoding
         };
 
         return await _dynamicHlsHelper.GetMasterHlsPlaylist(TranscodingJobType, streamingRequest, enableAdaptiveBitrateStreaming).ConfigureAwait(false);
@@ -741,6 +750,7 @@ public class DynamicHlsController : BaseJellyfinApiController
     /// <param name="context">Optional. The <see cref="EncodingContext"/>.</param>
     /// <param name="streamOptions">Optional. The streaming options.</param>
     /// <param name="enableAudioVbrEncoding">Optional. Whether to enable Audio Encoding.</param>
+    /// <param name="alwaysBurnInSubtitleWhenTranscoding">Whether to always burn in subtitles when transcoding.</param>
     /// <response code="200">Video stream returned.</response>
     /// <returns>A <see cref="FileResult"/> containing the audio file.</returns>
     [HttpGet("Videos/{itemId}/main.m3u8")]
@@ -797,7 +807,8 @@ public class DynamicHlsController : BaseJellyfinApiController
         [FromQuery] int? videoStreamIndex,
         [FromQuery] EncodingContext? context,
         [FromQuery] Dictionary<string, string> streamOptions,
-        [FromQuery] bool enableAudioVbrEncoding = true)
+        [FromQuery] bool enableAudioVbrEncoding = true,
+        [FromQuery] bool alwaysBurnInSubtitleWhenTranscoding = false)
     {
         using var cancellationTokenSource = new CancellationTokenSource();
         var streamingRequest = new VideoRequestDto
@@ -834,7 +845,7 @@ public class DynamicHlsController : BaseJellyfinApiController
             MaxHeight = maxHeight,
             VideoBitRate = videoBitRate,
             SubtitleStreamIndex = subtitleStreamIndex,
-            SubtitleMethod = subtitleMethod ?? SubtitleDeliveryMethod.Encode,
+            SubtitleMethod = subtitleMethod ?? SubtitleDeliveryMethod.External,
             MaxRefFrames = maxRefFrames,
             MaxVideoBitDepth = maxVideoBitDepth,
             RequireAvc = requireAvc ?? false,
@@ -851,7 +862,8 @@ public class DynamicHlsController : BaseJellyfinApiController
             VideoStreamIndex = videoStreamIndex,
             Context = context ?? EncodingContext.Streaming,
             StreamOptions = streamOptions,
-            EnableAudioVbrEncoding = enableAudioVbrEncoding
+            EnableAudioVbrEncoding = enableAudioVbrEncoding,
+            AlwaysBurnInSubtitleWhenTranscoding = alwaysBurnInSubtitleWhenTranscoding
         };
 
         return await GetVariantPlaylistInternal(streamingRequest, cancellationTokenSource)
@@ -911,6 +923,7 @@ public class DynamicHlsController : BaseJellyfinApiController
     /// <param name="context">Optional. The <see cref="EncodingContext"/>.</param>
     /// <param name="streamOptions">Optional. The streaming options.</param>
     /// <param name="enableAudioVbrEncoding">Optional. Whether to enable Audio Encoding.</param>
+    /// <param name="alwaysBurnInSubtitleWhenTranscoding">Whether to always burn in subtitles when transcoding.</param>
     /// <response code="200">Audio stream returned.</response>
     /// <returns>A <see cref="FileResult"/> containing the audio file.</returns>
     [HttpGet("Audio/{itemId}/main.m3u8")]
@@ -966,7 +979,8 @@ public class DynamicHlsController : BaseJellyfinApiController
         [FromQuery] int? videoStreamIndex,
         [FromQuery] EncodingContext? context,
         [FromQuery] Dictionary<string, string> streamOptions,
-        [FromQuery] bool enableAudioVbrEncoding = true)
+        [FromQuery] bool enableAudioVbrEncoding = true,
+        [FromQuery] bool alwaysBurnInSubtitleWhenTranscoding = false)
     {
         using var cancellationTokenSource = new CancellationTokenSource();
         var streamingRequest = new StreamingRequestDto
@@ -1001,7 +1015,7 @@ public class DynamicHlsController : BaseJellyfinApiController
             Height = height,
             VideoBitRate = videoBitRate,
             SubtitleStreamIndex = subtitleStreamIndex,
-            SubtitleMethod = subtitleMethod ?? SubtitleDeliveryMethod.Encode,
+            SubtitleMethod = subtitleMethod ?? SubtitleDeliveryMethod.External,
             MaxRefFrames = maxRefFrames,
             MaxVideoBitDepth = maxVideoBitDepth,
             RequireAvc = requireAvc ?? false,
@@ -1018,7 +1032,8 @@ public class DynamicHlsController : BaseJellyfinApiController
             VideoStreamIndex = videoStreamIndex,
             Context = context ?? EncodingContext.Streaming,
             StreamOptions = streamOptions,
-            EnableAudioVbrEncoding = enableAudioVbrEncoding
+            EnableAudioVbrEncoding = enableAudioVbrEncoding,
+            AlwaysBurnInSubtitleWhenTranscoding = alwaysBurnInSubtitleWhenTranscoding
         };
 
         return await GetVariantPlaylistInternal(streamingRequest, cancellationTokenSource)
@@ -1084,6 +1099,7 @@ public class DynamicHlsController : BaseJellyfinApiController
     /// <param name="context">Optional. The <see cref="EncodingContext"/>.</param>
     /// <param name="streamOptions">Optional. The streaming options.</param>
     /// <param name="enableAudioVbrEncoding">Optional. Whether to enable Audio Encoding.</param>
+    /// <param name="alwaysBurnInSubtitleWhenTranscoding">Whether to always burn in subtitles when transcoding.</param>
     /// <response code="200">Video stream returned.</response>
     /// <returns>A <see cref="FileResult"/> containing the audio file.</returns>
     [HttpGet("Videos/{itemId}/hls1/{playlistId}/{segmentId}.{container}")]
@@ -1146,7 +1162,8 @@ public class DynamicHlsController : BaseJellyfinApiController
         [FromQuery] int? videoStreamIndex,
         [FromQuery] EncodingContext? context,
         [FromQuery] Dictionary<string, string> streamOptions,
-        [FromQuery] bool enableAudioVbrEncoding = true)
+        [FromQuery] bool enableAudioVbrEncoding = true,
+        [FromQuery] bool alwaysBurnInSubtitleWhenTranscoding = false)
     {
         var streamingRequest = new VideoRequestDto
         {
@@ -1185,7 +1202,7 @@ public class DynamicHlsController : BaseJellyfinApiController
             MaxHeight = maxHeight,
             VideoBitRate = videoBitRate,
             SubtitleStreamIndex = subtitleStreamIndex,
-            SubtitleMethod = subtitleMethod ?? SubtitleDeliveryMethod.Encode,
+            SubtitleMethod = subtitleMethod ?? SubtitleDeliveryMethod.External,
             MaxRefFrames = maxRefFrames,
             MaxVideoBitDepth = maxVideoBitDepth,
             RequireAvc = requireAvc ?? false,
@@ -1202,7 +1219,8 @@ public class DynamicHlsController : BaseJellyfinApiController
             VideoStreamIndex = videoStreamIndex,
             Context = context ?? EncodingContext.Streaming,
             StreamOptions = streamOptions,
-            EnableAudioVbrEncoding = enableAudioVbrEncoding
+            EnableAudioVbrEncoding = enableAudioVbrEncoding,
+            AlwaysBurnInSubtitleWhenTranscoding = alwaysBurnInSubtitleWhenTranscoding
         };
 
         return await GetDynamicSegment(streamingRequest, segmentId)
@@ -1267,6 +1285,7 @@ public class DynamicHlsController : BaseJellyfinApiController
     /// <param name="context">Optional. The <see cref="EncodingContext"/>.</param>
     /// <param name="streamOptions">Optional. The streaming options.</param>
     /// <param name="enableAudioVbrEncoding">Optional. Whether to enable Audio Encoding.</param>
+    /// <param name="alwaysBurnInSubtitleWhenTranscoding">Whether to always burn in subtitles when transcoding.</param>
     /// <response code="200">Video stream returned.</response>
     /// <returns>A <see cref="FileResult"/> containing the audio file.</returns>
     [HttpGet("Audio/{itemId}/hls1/{playlistId}/{segmentId}.{container}")]
@@ -1328,7 +1347,8 @@ public class DynamicHlsController : BaseJellyfinApiController
         [FromQuery] int? videoStreamIndex,
         [FromQuery] EncodingContext? context,
         [FromQuery] Dictionary<string, string> streamOptions,
-        [FromQuery] bool enableAudioVbrEncoding = true)
+        [FromQuery] bool enableAudioVbrEncoding = true,
+        [FromQuery] bool alwaysBurnInSubtitleWhenTranscoding = false)
     {
         var streamingRequest = new StreamingRequestDto
         {
@@ -1365,7 +1385,7 @@ public class DynamicHlsController : BaseJellyfinApiController
             Height = height,
             VideoBitRate = videoBitRate,
             SubtitleStreamIndex = subtitleStreamIndex,
-            SubtitleMethod = subtitleMethod ?? SubtitleDeliveryMethod.Encode,
+            SubtitleMethod = subtitleMethod ?? SubtitleDeliveryMethod.External,
             MaxRefFrames = maxRefFrames,
             MaxVideoBitDepth = maxVideoBitDepth,
             RequireAvc = requireAvc ?? false,
@@ -1382,7 +1402,8 @@ public class DynamicHlsController : BaseJellyfinApiController
             VideoStreamIndex = videoStreamIndex,
             Context = context ?? EncodingContext.Streaming,
             StreamOptions = streamOptions,
-            EnableAudioVbrEncoding = enableAudioVbrEncoding
+            EnableAudioVbrEncoding = enableAudioVbrEncoding,
+            AlwaysBurnInSubtitleWhenTranscoding = alwaysBurnInSubtitleWhenTranscoding
         };
 
         return await GetDynamicSegment(streamingRequest, segmentId)
diff --git a/Jellyfin.Api/Helpers/MediaInfoHelper.cs b/Jellyfin.Api/Helpers/MediaInfoHelper.cs
index 5050cab41..2d9ecd4f0 100644
--- a/Jellyfin.Api/Helpers/MediaInfoHelper.cs
+++ b/Jellyfin.Api/Helpers/MediaInfoHelper.cs
@@ -293,6 +293,7 @@ public class MediaInfoHelper
                 mediaSource.TranscodingUrl += "&allowAudioStreamCopy=false";
                 mediaSource.TranscodingContainer = streamInfo.Container;
                 mediaSource.TranscodingSubProtocol = streamInfo.SubProtocol;
+                mediaSource.TranscodingUrl += "&alwaysBurnInSubtitleWhenTranscoding=true";
             }
             else
             {
@@ -310,6 +311,11 @@ public class MediaInfoHelper
                     {
                         mediaSource.TranscodingUrl += "&allowAudioStreamCopy=false";
                     }
+
+                    if (streamInfo.AlwaysBurnInSubtitleWhenTranscoding)
+                    {
+                        mediaSource.TranscodingUrl += "&alwaysBurnInSubtitleWhenTranscoding=true";
+                    }
                 }
             }
 
diff --git a/MediaBrowser.Controller/MediaEncoding/BaseEncodingJobOptions.cs b/MediaBrowser.Controller/MediaEncoding/BaseEncodingJobOptions.cs
index f77186e25..20f51ddb7 100644
--- a/MediaBrowser.Controller/MediaEncoding/BaseEncodingJobOptions.cs
+++ b/MediaBrowser.Controller/MediaEncoding/BaseEncodingJobOptions.cs
@@ -193,6 +193,8 @@ namespace MediaBrowser.Controller.MediaEncoding
 
         public bool EnableAudioVbrEncoding { get; set; }
 
+        public bool AlwaysBurnInSubtitleWhenTranscoding { get; set; }
+
         public string GetOption(string qualifier, string name)
         {
             var value = GetOption(qualifier + "-" + name);
diff --git a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
index d8c4f2f85..f8ba8ddd8 100644
--- a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
+++ b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
@@ -941,7 +941,7 @@ namespace MediaBrowser.Controller.MediaEncoding
         {
             // DVBSUB uses the fixed canvas size 720x576
             if (state.SubtitleStream is not null
-                && state.SubtitleDeliveryMethod == SubtitleDeliveryMethod.Encode
+                && ShouldEncodeSubtitle(state)
                 && !state.SubtitleStream.IsTextSubtitleStream
                 && !string.Equals(state.SubtitleStream.Codec, "DVBSUB", StringComparison.OrdinalIgnoreCase))
             {
@@ -1240,7 +1240,7 @@ namespace MediaBrowser.Controller.MediaEncoding
 
             // sub2video for external graphical subtitles
             if (state.SubtitleStream is not null
-                && state.SubtitleDeliveryMethod == SubtitleDeliveryMethod.Encode
+                && ShouldEncodeSubtitle(state)
                 && !state.SubtitleStream.IsTextSubtitleStream
                 && state.SubtitleStream.IsExternal)
             {
@@ -2554,7 +2554,7 @@ namespace MediaBrowser.Controller.MediaEncoding
             }
 
             var isCopyingTimestamps = state.CopyTimestamps || state.TranscodingType != TranscodingJobType.Progressive;
-            if (state.SubtitleStream is not null && state.SubtitleStream.IsTextSubtitleStream && state.SubtitleDeliveryMethod == SubtitleDeliveryMethod.Encode && !isCopyingTimestamps)
+            if (state.SubtitleStream is not null && state.SubtitleStream.IsTextSubtitleStream && ShouldEncodeSubtitle(state) && !isCopyingTimestamps)
             {
                 var seconds = TimeSpan.FromTicks(state.StartTimeTicks ?? 0).TotalSeconds;
 
@@ -2755,7 +2755,7 @@ namespace MediaBrowser.Controller.MediaEncoding
                 if (state.AudioStream.IsExternal)
                 {
                     bool hasExternalGraphicsSubs = state.SubtitleStream is not null
-                        && state.SubtitleDeliveryMethod == SubtitleDeliveryMethod.Encode
+                        && ShouldEncodeSubtitle(state)
                         && state.SubtitleStream.IsExternal
                         && !state.SubtitleStream.IsTextSubtitleStream;
                     int externalAudioMapIndex = hasExternalGraphicsSubs ? 2 : 1;
@@ -3475,7 +3475,7 @@ namespace MediaBrowser.Controller.MediaEncoding
             var doToneMap = IsSwTonemapAvailable(state, options);
             var requireDoviReshaping = doToneMap && state.VideoStream.VideoRangeType == VideoRangeType.DOVI;
 
-            var hasSubs = state.SubtitleStream is not null && state.SubtitleDeliveryMethod == SubtitleDeliveryMethod.Encode;
+            var hasSubs = state.SubtitleStream is not null && ShouldEncodeSubtitle(state);
             var hasTextSubs = hasSubs && state.SubtitleStream.IsTextSubtitleStream;
             var hasGraphicalSubs = hasSubs && !state.SubtitleStream.IsTextSubtitleStream;
 
@@ -3618,7 +3618,7 @@ namespace MediaBrowser.Controller.MediaEncoding
             var doDeintH2645 = doDeintH264 || doDeintHevc;
             var doCuTonemap = IsHwTonemapAvailable(state, options);
 
-            var hasSubs = state.SubtitleStream is not null && state.SubtitleDeliveryMethod == SubtitleDeliveryMethod.Encode;
+            var hasSubs = state.SubtitleStream is not null && ShouldEncodeSubtitle(state);
             var hasTextSubs = hasSubs && state.SubtitleStream.IsTextSubtitleStream;
             var hasGraphicalSubs = hasSubs && !state.SubtitleStream.IsTextSubtitleStream;
             var hasAssSubs = hasSubs
@@ -3824,7 +3824,7 @@ namespace MediaBrowser.Controller.MediaEncoding
             var doDeintH2645 = doDeintH264 || doDeintHevc;
             var doOclTonemap = IsHwTonemapAvailable(state, options);
 
-            var hasSubs = state.SubtitleStream is not null && state.SubtitleDeliveryMethod == SubtitleDeliveryMethod.Encode;
+            var hasSubs = state.SubtitleStream is not null && ShouldEncodeSubtitle(state);
             var hasTextSubs = hasSubs && state.SubtitleStream.IsTextSubtitleStream;
             var hasGraphicalSubs = hasSubs && !state.SubtitleStream.IsTextSubtitleStream;
             var hasAssSubs = hasSubs
@@ -4064,7 +4064,7 @@ namespace MediaBrowser.Controller.MediaEncoding
             var doOclTonemap = !doVppTonemap && IsHwTonemapAvailable(state, options);
             var doTonemap = doVppTonemap || doOclTonemap;
 
-            var hasSubs = state.SubtitleStream is not null && state.SubtitleDeliveryMethod == SubtitleDeliveryMethod.Encode;
+            var hasSubs = state.SubtitleStream is not null && ShouldEncodeSubtitle(state);
             var hasTextSubs = hasSubs && state.SubtitleStream.IsTextSubtitleStream;
             var hasGraphicalSubs = hasSubs && !state.SubtitleStream.IsTextSubtitleStream;
             var hasAssSubs = hasSubs
@@ -4320,7 +4320,7 @@ namespace MediaBrowser.Controller.MediaEncoding
             var doTonemap = doVaVppTonemap || doOclTonemap;
             var doDeintH2645 = doDeintH264 || doDeintHevc;
 
-            var hasSubs = state.SubtitleStream is not null && state.SubtitleDeliveryMethod == SubtitleDeliveryMethod.Encode;
+            var hasSubs = state.SubtitleStream is not null && ShouldEncodeSubtitle(state);
             var hasTextSubs = hasSubs && state.SubtitleStream.IsTextSubtitleStream;
             var hasGraphicalSubs = hasSubs && !state.SubtitleStream.IsTextSubtitleStream;
             var hasAssSubs = hasSubs
@@ -4636,7 +4636,7 @@ namespace MediaBrowser.Controller.MediaEncoding
             var doTonemap = doVaVppTonemap || doOclTonemap;
             var doDeintH2645 = doDeintH264 || doDeintHevc;
 
-            var hasSubs = state.SubtitleStream is not null && state.SubtitleDeliveryMethod == SubtitleDeliveryMethod.Encode;
+            var hasSubs = state.SubtitleStream is not null && ShouldEncodeSubtitle(state);
             var hasTextSubs = hasSubs && state.SubtitleStream.IsTextSubtitleStream;
             var hasGraphicalSubs = hasSubs && !state.SubtitleStream.IsTextSubtitleStream;
             var hasAssSubs = hasSubs
@@ -4858,7 +4858,7 @@ namespace MediaBrowser.Controller.MediaEncoding
             var doVkTonemap = IsVulkanHwTonemapAvailable(state, options);
             var doDeintH2645 = doDeintH264 || doDeintHevc;
 
-            var hasSubs = state.SubtitleStream is not null && state.SubtitleDeliveryMethod == SubtitleDeliveryMethod.Encode;
+            var hasSubs = state.SubtitleStream is not null && ShouldEncodeSubtitle(state);
             var hasTextSubs = hasSubs && state.SubtitleStream.IsTextSubtitleStream;
             var hasGraphicalSubs = hasSubs && !state.SubtitleStream.IsTextSubtitleStream;
             var hasAssSubs = hasSubs
@@ -5091,7 +5091,7 @@ namespace MediaBrowser.Controller.MediaEncoding
             var doDeintH2645 = doDeintH264 || doDeintHevc;
             var doOclTonemap = IsHwTonemapAvailable(state, options);
 
-            var hasSubs = state.SubtitleStream is not null && state.SubtitleDeliveryMethod == SubtitleDeliveryMethod.Encode;
+            var hasSubs = state.SubtitleStream is not null && ShouldEncodeSubtitle(state);
             var hasTextSubs = hasSubs && state.SubtitleStream.IsTextSubtitleStream;
             var hasGraphicalSubs = hasSubs && !state.SubtitleStream.IsTextSubtitleStream;
 
@@ -5339,7 +5339,7 @@ namespace MediaBrowser.Controller.MediaEncoding
 
             var hwScaleFilter = GetHwScaleFilter("scale", "vt", scaleFormat, false, swpInW, swpInH, reqW, reqH, reqMaxW, reqMaxH);
 
-            var hasSubs = state.SubtitleStream is not null && state.SubtitleDeliveryMethod == SubtitleDeliveryMethod.Encode;
+            var hasSubs = state.SubtitleStream is not null && ShouldEncodeSubtitle(state);
             var hasTextSubs = hasSubs && state.SubtitleStream.IsTextSubtitleStream;
             var hasGraphicalSubs = hasSubs && !state.SubtitleStream.IsTextSubtitleStream;
             var hasAssSubs = hasSubs
@@ -5511,7 +5511,7 @@ namespace MediaBrowser.Controller.MediaEncoding
             var doDeintH2645 = doDeintH264 || doDeintHevc;
             var doOclTonemap = IsHwTonemapAvailable(state, options);
 
-            var hasSubs = state.SubtitleStream != null && state.SubtitleDeliveryMethod == SubtitleDeliveryMethod.Encode;
+            var hasSubs = state.SubtitleStream != null && ShouldEncodeSubtitle(state);
             var hasTextSubs = hasSubs && state.SubtitleStream.IsTextSubtitleStream;
             var hasGraphicalSubs = hasSubs && !state.SubtitleStream.IsTextSubtitleStream;
             var hasAssSubs = hasSubs
@@ -5722,7 +5722,7 @@ namespace MediaBrowser.Controller.MediaEncoding
                 return string.Empty;
             }
 
-            var hasSubs = state.SubtitleStream is not null && state.SubtitleDeliveryMethod == SubtitleDeliveryMethod.Encode;
+            var hasSubs = state.SubtitleStream is not null && ShouldEncodeSubtitle(state);
             var hasTextSubs = hasSubs && state.SubtitleStream.IsTextSubtitleStream;
             var hasGraphicalSubs = hasSubs && !state.SubtitleStream.IsTextSubtitleStream;
 
@@ -7156,7 +7156,7 @@ namespace MediaBrowser.Controller.MediaEncoding
 
                 args += keyFrameArg;
 
-                var hasGraphicalSubs = state.SubtitleStream is not null && !state.SubtitleStream.IsTextSubtitleStream && state.SubtitleDeliveryMethod == SubtitleDeliveryMethod.Encode;
+                var hasGraphicalSubs = state.SubtitleStream is not null && !state.SubtitleStream.IsTextSubtitleStream && ShouldEncodeSubtitle(state);
 
                 var hasCopyTs = false;
 
@@ -7361,5 +7361,11 @@ namespace MediaBrowser.Controller.MediaEncoding
         {
             return string.Equals(codec, "copy", StringComparison.OrdinalIgnoreCase);
         }
+
+        private static bool ShouldEncodeSubtitle(EncodingJobInfo state)
+        {
+            return state.SubtitleDeliveryMethod == SubtitleDeliveryMethod.Encode
+                   || (state.BaseRequest.AlwaysBurnInSubtitleWhenTranscoding && !IsCopyCodec(state.OutputVideoCodec));
+        }
     }
 }
diff --git a/MediaBrowser.Model/Dlna/StreamBuilder.cs b/MediaBrowser.Model/Dlna/StreamBuilder.cs
index bf122dcc7..6c45f1946 100644
--- a/MediaBrowser.Model/Dlna/StreamBuilder.cs
+++ b/MediaBrowser.Model/Dlna/StreamBuilder.cs
@@ -639,7 +639,8 @@ namespace MediaBrowser.Model.Dlna
                 RunTimeTicks = item.RunTimeTicks,
                 Context = options.Context,
                 DeviceProfile = options.Profile,
-                SubtitleStreamIndex = options.SubtitleStreamIndex ?? GetDefaultSubtitleStreamIndex(item, options.Profile.SubtitleProfiles)
+                SubtitleStreamIndex = options.SubtitleStreamIndex ?? GetDefaultSubtitleStreamIndex(item, options.Profile.SubtitleProfiles),
+                AlwaysBurnInSubtitleWhenTranscoding = options.AlwaysBurnInSubtitleWhenTranscoding
             };
 
             var subtitleStream = playlistItem.SubtitleStreamIndex.HasValue ? item.GetMediaStream(MediaStreamType.Subtitle, playlistItem.SubtitleStreamIndex.Value) : null;
@@ -767,20 +768,7 @@ namespace MediaBrowser.Model.Dlna
                     if (subtitleStream is not null)
                     {
                         var subtitleProfile = GetSubtitleProfile(item, subtitleStream, options.Profile.SubtitleProfiles, PlayMethod.Transcode, _transcoderSupport, transcodingProfile.Container, transcodingProfile.Protocol);
-
-                        if (options.AlwaysBurnInSubtitleWhenTranscoding && (playlistItem.TranscodeReasons & (VideoReasons | TranscodeReason.ContainerBitrateExceedsLimit)) != 0)
-                        {
-                            playlistItem.SubtitleDeliveryMethod = SubtitleDeliveryMethod.Encode;
-                            foreach (SubtitleProfile profile in options.Profile.SubtitleProfiles)
-                            {
-                                profile.Method = SubtitleDeliveryMethod.Encode;
-                            }
-                        }
-                        else
-                        {
-                            playlistItem.SubtitleDeliveryMethod = subtitleProfile.Method;
-                        }
-
+                        playlistItem.SubtitleDeliveryMethod = subtitleProfile.Method;
                         playlistItem.SubtitleFormat = subtitleProfile.Format;
                         playlistItem.SubtitleCodecs = [subtitleProfile.Format];
                     }
diff --git a/MediaBrowser.Model/Dlna/StreamInfo.cs b/MediaBrowser.Model/Dlna/StreamInfo.cs
index 3be686088..1ae4e1962 100644
--- a/MediaBrowser.Model/Dlna/StreamInfo.cs
+++ b/MediaBrowser.Model/Dlna/StreamInfo.cs
@@ -270,6 +270,11 @@ public class StreamInfo
     /// </summary>
     public bool EnableAudioVbrEncoding { get; set; }
 
+    /// <summary>
+    /// Gets or sets a value indicating whether always burn in subtitles when transcoding.
+    /// </summary>
+    public bool AlwaysBurnInSubtitleWhenTranscoding { get; set; }
+
     /// <summary>
     /// Gets a value indicating whether the stream is direct.
     /// </summary>
@@ -953,7 +958,7 @@ public class StreamInfo
         list.Add(new NameValuePair("VideoCodec", videoCodecs));
         list.Add(new NameValuePair("AudioCodec", audioCodecs));
         list.Add(new NameValuePair("AudioStreamIndex", item.AudioStreamIndex.HasValue ? item.AudioStreamIndex.Value.ToString(CultureInfo.InvariantCulture) : string.Empty));
-        list.Add(new NameValuePair("SubtitleStreamIndex", item.SubtitleStreamIndex.HasValue && item.SubtitleDeliveryMethod != SubtitleDeliveryMethod.External ? item.SubtitleStreamIndex.Value.ToString(CultureInfo.InvariantCulture) : string.Empty));
+        list.Add(new NameValuePair("SubtitleStreamIndex", item.SubtitleStreamIndex.HasValue && (item.AlwaysBurnInSubtitleWhenTranscoding || item.SubtitleDeliveryMethod != SubtitleDeliveryMethod.External) ? item.SubtitleStreamIndex.Value.ToString(CultureInfo.InvariantCulture) : string.Empty));
         list.Add(new NameValuePair("VideoBitrate", item.VideoBitrate.HasValue ? item.VideoBitrate.Value.ToString(CultureInfo.InvariantCulture) : string.Empty));
         list.Add(new NameValuePair("AudioBitrate", item.AudioBitrate.HasValue ? item.AudioBitrate.Value.ToString(CultureInfo.InvariantCulture) : string.Empty));
         list.Add(new NameValuePair("AudioSampleRate", item.AudioSampleRate.HasValue ? item.AudioSampleRate.Value.ToString(CultureInfo.InvariantCulture) : string.Empty));
-- 
cgit v1.2.3


From 56cf1a581c7f0ffc19fca284a13878d231136aaa Mon Sep 17 00:00:00 2001
From: gnattu <gnattu@users.noreply.github.com>
Date: Sun, 22 Sep 2024 10:01:47 +0800
Subject: Better bitrate and resolution normalization (#12644)

---
 Jellyfin.Api/Helpers/StreamingHelpers.cs           |  8 ++-
 .../MediaEncoding/EncodingHelper.cs                |  8 ++-
 MediaBrowser.Model/Dlna/ResolutionNormalizer.cs    | 69 +++++++++++-----------
 3 files changed, 50 insertions(+), 35 deletions(-)

(limited to 'MediaBrowser.Controller')

diff --git a/Jellyfin.Api/Helpers/StreamingHelpers.cs b/Jellyfin.Api/Helpers/StreamingHelpers.cs
index 3cc6a393b..3a5db2f3f 100644
--- a/Jellyfin.Api/Helpers/StreamingHelpers.cs
+++ b/Jellyfin.Api/Helpers/StreamingHelpers.cs
@@ -219,11 +219,17 @@ public static class StreamingHelpers
                 }
                 else
                 {
+                    var h264EquivalentBitrate = EncodingHelper.ScaleBitrate(
+                        state.OutputVideoBitrate.Value,
+                        state.ActualOutputVideoCodec,
+                        "h264");
                     var resolution = ResolutionNormalizer.Normalize(
                         state.VideoStream?.BitRate,
                         state.OutputVideoBitrate.Value,
+                        h264EquivalentBitrate,
                         state.VideoRequest.MaxWidth,
-                        state.VideoRequest.MaxHeight);
+                        state.VideoRequest.MaxHeight,
+                        state.TargetFramerate);
 
                     state.VideoRequest.MaxWidth = resolution.MaxWidth;
                     state.VideoRequest.MaxHeight = resolution.MaxHeight;
diff --git a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
index f8ba8ddd8..788bd0335 100644
--- a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
+++ b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
@@ -2400,7 +2400,7 @@ namespace MediaBrowser.Controller.MediaEncoding
             return 1;
         }
 
-        private static int ScaleBitrate(int bitrate, string inputVideoCodec, string outputVideoCodec)
+        public static int ScaleBitrate(int bitrate, string inputVideoCodec, string outputVideoCodec)
         {
             var inputScaleFactor = GetVideoBitrateScaleFactor(inputVideoCodec);
             var outputScaleFactor = GetVideoBitrateScaleFactor(outputVideoCodec);
@@ -2424,6 +2424,12 @@ namespace MediaBrowser.Controller.MediaEncoding
             {
                 scaleFactor = Math.Max(scaleFactor, 2);
             }
+            else if (bitrate >= 30000000)
+            {
+                // Don't scale beyond 30Mbps, it is hardly visually noticeable for most codecs with our prefer speed encoding
+                // and will cause extremely high bitrate to be used for av1->h264 transcoding that will overload clients and encoders
+                scaleFactor = 1;
+            }
 
             return Convert.ToInt32(scaleFactor * bitrate);
         }
diff --git a/MediaBrowser.Model/Dlna/ResolutionNormalizer.cs b/MediaBrowser.Model/Dlna/ResolutionNormalizer.cs
index 5d7daa81a..1a636b240 100644
--- a/MediaBrowser.Model/Dlna/ResolutionNormalizer.cs
+++ b/MediaBrowser.Model/Dlna/ResolutionNormalizer.cs
@@ -2,28 +2,33 @@
 #pragma warning disable CS1591
 
 using System;
+using System.Linq;
 
 namespace MediaBrowser.Model.Dlna
 {
     public static class ResolutionNormalizer
     {
-        private static readonly ResolutionConfiguration[] Configurations =
-            new[]
-            {
-                new ResolutionConfiguration(426, 320000),
-                new ResolutionConfiguration(640, 400000),
-                new ResolutionConfiguration(720, 950000),
-                new ResolutionConfiguration(1280, 2500000),
-                new ResolutionConfiguration(1920, 4000000),
-                new ResolutionConfiguration(2560, 20000000),
-                new ResolutionConfiguration(3840, 35000000)
-            };
+        // Please note: all bitrate here are in the scale of SDR h264 bitrate at 30fps
+        private static readonly ResolutionConfiguration[] _configurations =
+        [
+            new ResolutionConfiguration(416, 365000),
+            new ResolutionConfiguration(640, 730000),
+            new ResolutionConfiguration(768, 1100000),
+            new ResolutionConfiguration(960, 3000000),
+            new ResolutionConfiguration(1280, 6000000),
+            new ResolutionConfiguration(1920, 13500000),
+            new ResolutionConfiguration(2560, 28000000),
+            new ResolutionConfiguration(3840, 50000000)
+        ];
 
         public static ResolutionOptions Normalize(
             int? inputBitrate,
             int outputBitrate,
+            int h264EquivalentOutputBitrate,
             int? maxWidth,
-            int? maxHeight)
+            int? maxHeight,
+            float? targetFps,
+            bool isHdr = false) // We are not doing HDR transcoding for now, leave for future use
         {
             // If the bitrate isn't changing, then don't downscale the resolution
             if (inputBitrate.HasValue && outputBitrate >= inputBitrate.Value)
@@ -38,16 +43,26 @@ namespace MediaBrowser.Model.Dlna
                 }
             }
 
-            var resolutionConfig = GetResolutionConfiguration(outputBitrate);
-            if (resolutionConfig is not null)
+            var referenceBitrate = h264EquivalentOutputBitrate * (30.0f / (targetFps ?? 30.0f));
+
+            if (isHdr)
             {
-                var originvalValue = maxWidth;
+                referenceBitrate *= 0.8f;
+            }
 
-                maxWidth = Math.Min(resolutionConfig.MaxWidth, maxWidth ?? resolutionConfig.MaxWidth);
-                if (!originvalValue.HasValue || originvalValue.Value != maxWidth.Value)
-                {
-                    maxHeight = null;
-                }
+            var resolutionConfig = GetResolutionConfiguration(Convert.ToInt32(referenceBitrate));
+
+            if (resolutionConfig is null)
+            {
+                return new ResolutionOptions { MaxWidth = maxWidth, MaxHeight = maxHeight };
+            }
+
+            var originWidthValue = maxWidth;
+
+            maxWidth = Math.Min(resolutionConfig.MaxWidth, maxWidth ?? resolutionConfig.MaxWidth);
+            if (!originWidthValue.HasValue || originWidthValue.Value != maxWidth.Value)
+            {
+                maxHeight = null;
             }
 
             return new ResolutionOptions
@@ -59,19 +74,7 @@ namespace MediaBrowser.Model.Dlna
 
         private static ResolutionConfiguration GetResolutionConfiguration(int outputBitrate)
         {
-            ResolutionConfiguration previousOption = null;
-
-            foreach (var config in Configurations)
-            {
-                if (outputBitrate <= config.MaxBitrate)
-                {
-                    return previousOption ?? config;
-                }
-
-                previousOption = config;
-            }
-
-            return null;
+            return _configurations.FirstOrDefault(config => outputBitrate <= config.MaxBitrate);
         }
     }
 }
-- 
cgit v1.2.3


From b162e9290ba7e4265010079708e158399356635c Mon Sep 17 00:00:00 2001
From: Nyanmisaka <nst799610810@gmail.com>
Date: Sun, 22 Sep 2024 22:58:15 +0800
Subject: Fix the diff between requested and actual resolution in RKMPP
 (#12680)

---
 .../MediaEncoding/EncodingHelper.cs                  | 20 +++-----------------
 1 file changed, 3 insertions(+), 17 deletions(-)

(limited to 'MediaBrowser.Controller')

diff --git a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
index 788bd0335..5322b2635 100644
--- a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
+++ b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
@@ -5574,9 +5574,8 @@ namespace MediaBrowser.Controller.MediaEncoding
                 var isFullAfbcPipeline = isEncoderSupportAfbc && isDrmInDrmOut && !doOclTonemap;
                 var swapOutputWandH = doRkVppTranspose && swapWAndH;
                 var outFormat = doOclTonemap ? "p010" : "nv12";
-                var hwScalePrefix = doRkVppTranspose ? "vpp" : "scale";
-                var hwScaleFilter = GetHwScaleFilter(hwScalePrefix, "rkrga", outFormat, swapOutputWandH, swpInW, swpInH, reqW, reqH, reqMaxW, reqMaxH);
-                var doScaling = GetHwScaleFilter(hwScalePrefix, "rkrga", string.Empty, swapOutputWandH, swpInW, swpInH, reqW, reqH, reqMaxW, reqMaxH);
+                var hwScaleFilter = GetHwScaleFilter("vpp", "rkrga", outFormat, swapOutputWandH, swpInW, swpInH, reqW, reqH, reqMaxW, reqMaxH);
+                var doScaling = GetHwScaleFilter("vpp", "rkrga", string.Empty, swapOutputWandH, swpInW, swpInH, reqW, reqH, reqMaxW, reqMaxH);
 
                 if (!hasSubs
                      || doRkVppTranspose
@@ -5588,7 +5587,7 @@ namespace MediaBrowser.Controller.MediaEncoding
                     if (!string.IsNullOrEmpty(doScaling)
                         && !IsScaleRatioSupported(inW, inH, reqW, reqH, reqMaxW, reqMaxH, 8.0f))
                     {
-                        var hwScaleFilterFirstPass = $"scale_rkrga=w=iw/8:h=ih/8:format={outFormat}:afbc=1";
+                        var hwScaleFilterFirstPass = $"scale_rkrga=w=iw/7.9:h=ih/7.9:format={outFormat}:afbc=1";
                         mainFilters.Add(hwScaleFilterFirstPass);
                     }
 
@@ -5980,19 +5979,6 @@ namespace MediaBrowser.Controller.MediaEncoding
                 }
             }
 
-            var whichCodec = videoStream.Codec;
-            if (string.Equals(whichCodec, "avc", StringComparison.OrdinalIgnoreCase))
-            {
-                whichCodec = "h264";
-            }
-            else if (string.Equals(whichCodec, "h265", StringComparison.OrdinalIgnoreCase))
-            {
-                whichCodec = "hevc";
-            }
-
-            // Avoid a second attempt if no hardware acceleration is being used
-            options.HardwareDecodingCodecs = options.HardwareDecodingCodecs.Where(c => !string.Equals(c, whichCodec, StringComparison.OrdinalIgnoreCase)).ToArray();
-
             // leave blank so ffmpeg will decide
             return null;
         }
-- 
cgit v1.2.3


From 5d5afe10e8094f14e5443e1fd3295bdf325f1566 Mon Sep 17 00:00:00 2001
From: Nyanmisaka <nst799610810@gmail.com>
Date: Mon, 23 Sep 2024 08:50:18 +0800
Subject: Fix incorrect input range for certain hw JPEG encoders (#12683)

---
 .../MediaEncoding/EncodingHelper.cs                | 81 +++++++++++++++++-----
 1 file changed, 62 insertions(+), 19 deletions(-)

(limited to 'MediaBrowser.Controller')

diff --git a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
index 5322b2635..e9e8ed618 100644
--- a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
+++ b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
@@ -71,6 +71,7 @@ namespace MediaBrowser.Controller.MediaEncoding
         private readonly Version _minFFmpegAdvancedTonemapMode = new Version(7, 0, 1);
         private readonly Version _minFFmpegAlteredVaVkInterop = new Version(7, 0, 1);
         private readonly Version _minFFmpegQsvVppTonemapOption = new Version(7, 0, 1);
+        private readonly Version _minFFmpegQsvVppOutRangeOption = new Version(7, 0, 1);
 
         private static readonly Regex _validationRegex = new(ValidationRegex, RegexOptions.Compiled);
 
@@ -3297,7 +3298,7 @@ namespace MediaBrowser.Controller.MediaEncoding
             return string.Empty;
         }
 
-        public string GetHwTonemapFilter(EncodingOptions options, string hwTonemapSuffix, string videoFormat)
+        private string GetHwTonemapFilter(EncodingOptions options, string hwTonemapSuffix, string videoFormat, bool forceFullRange)
         {
             if (string.IsNullOrEmpty(hwTonemapSuffix))
             {
@@ -3307,7 +3308,7 @@ namespace MediaBrowser.Controller.MediaEncoding
             var args = string.Empty;
             var algorithm = options.TonemappingAlgorithm.ToString().ToLowerInvariant();
             var mode = options.TonemappingMode.ToString().ToLowerInvariant();
-            var range = options.TonemappingRange;
+            var range = forceFullRange ? TonemappingRange.pc : options.TonemappingRange;
             var rangeString = range.ToString().ToLowerInvariant();
 
             if (string.Equals(hwTonemapSuffix, "vaapi", StringComparison.OrdinalIgnoreCase))
@@ -3377,7 +3378,7 @@ namespace MediaBrowser.Controller.MediaEncoding
                     rangeString);
         }
 
-        public string GetLibplaceboFilter(
+        private string GetLibplaceboFilter(
             EncodingOptions options,
             string videoFormat,
             bool doTonemap,
@@ -3386,7 +3387,8 @@ namespace MediaBrowser.Controller.MediaEncoding
             int? requestedWidth,
             int? requestedHeight,
             int? requestedMaxWidth,
-            int? requestedMaxHeight)
+            int? requestedMaxHeight,
+            bool forceFullRange)
         {
             var (outWidth, outHeight) = GetFixedOutputSize(
                 videoWidth,
@@ -3411,7 +3413,7 @@ namespace MediaBrowser.Controller.MediaEncoding
                 var algorithm = options.TonemappingAlgorithm;
                 var algorithmString = "clip";
                 var mode = options.TonemappingMode;
-                var range = options.TonemappingRange;
+                var range = forceFullRange ? TonemappingRange.pc : options.TonemappingRange;
 
                 if (algorithm == TonemappingAlgorithm.bt2390)
                 {
@@ -3616,6 +3618,7 @@ namespace MediaBrowser.Controller.MediaEncoding
             var isNvencEncoder = vidEncoder.Contains("nvenc", StringComparison.OrdinalIgnoreCase);
             var isSwDecoder = string.IsNullOrEmpty(vidDecoder);
             var isSwEncoder = !isNvencEncoder;
+            var isMjpegEncoder = vidEncoder.Contains("mjpeg", StringComparison.OrdinalIgnoreCase);
             var isCuInCuOut = isNvDecoder && isNvencEncoder;
 
             var doubleRateDeint = options.DeinterlaceDoubleRate && (state.VideoStream?.ReferenceFrameRate ?? 60) <= 30;
@@ -3694,7 +3697,7 @@ namespace MediaBrowser.Controller.MediaEncoding
             // hw tonemap
             if (doCuTonemap)
             {
-                var tonemapFilter = GetHwTonemapFilter(options, "cuda", "yuv420p");
+                var tonemapFilter = GetHwTonemapFilter(options, "cuda", "yuv420p", isMjpegEncoder);
                 mainFilters.Add(tonemapFilter);
             }
 
@@ -3823,6 +3826,7 @@ namespace MediaBrowser.Controller.MediaEncoding
             var isAmfEncoder = vidEncoder.Contains("amf", StringComparison.OrdinalIgnoreCase);
             var isSwDecoder = string.IsNullOrEmpty(vidDecoder);
             var isSwEncoder = !isAmfEncoder;
+            var isMjpegEncoder = vidEncoder.Contains("mjpeg", StringComparison.OrdinalIgnoreCase);
             var isDxInDxOut = isD3d11vaDecoder && isAmfEncoder;
 
             var doDeintH264 = state.DeInterlace("h264", true) || state.DeInterlace("avc", true);
@@ -3902,7 +3906,7 @@ namespace MediaBrowser.Controller.MediaEncoding
             // hw tonemap
             if (doOclTonemap)
             {
-                var tonemapFilter = GetHwTonemapFilter(options, "opencl", "nv12");
+                var tonemapFilter = GetHwTonemapFilter(options, "opencl", "nv12", isMjpegEncoder);
                 mainFilters.Add(tonemapFilter);
             }
 
@@ -4061,6 +4065,7 @@ namespace MediaBrowser.Controller.MediaEncoding
             var isHwDecoder = isD3d11vaDecoder || isQsvDecoder;
             var isSwDecoder = string.IsNullOrEmpty(vidDecoder);
             var isSwEncoder = !isQsvEncoder;
+            var isMjpegEncoder = vidEncoder.Contains("mjpeg", StringComparison.OrdinalIgnoreCase);
             var isQsvInQsvOut = isHwDecoder && isQsvEncoder;
 
             var doDeintH264 = state.DeInterlace("h264", true) || state.DeInterlace("avc", true);
@@ -4119,6 +4124,8 @@ namespace MediaBrowser.Controller.MediaEncoding
             {
                 var isRext = IsVideoStreamHevcRext(state);
                 var twoPassVppTonemap = isRext;
+                var doVppFullRangeOut = isMjpegEncoder
+                    && _mediaEncoder.EncoderVersion >= _minFFmpegQsvVppOutRangeOption;
                 var doVppProcamp = false;
                 var procampParams = string.Empty;
                 if (doVppTonemap)
@@ -4145,7 +4152,7 @@ namespace MediaBrowser.Controller.MediaEncoding
                 outFormat = twoPassVppTonemap ? "p010" : outFormat;
 
                 var swapOutputWandH = doVppTranspose && swapWAndH;
-                var hwScalePrefix = (doVppTranspose || doVppTonemap) ? "vpp" : "scale";
+                var hwScalePrefix = (doVppTranspose || doVppTonemap || doVppFullRangeOut) ? "vpp" : "scale";
                 var hwScaleFilter = GetHwScaleFilter(hwScalePrefix, "qsv", outFormat, swapOutputWandH, swpInW, swpInH, reqW, reqH, reqMaxW, reqMaxH);
 
                 if (!string.IsNullOrEmpty(hwScaleFilter) && doVppTranspose)
@@ -4153,6 +4160,11 @@ namespace MediaBrowser.Controller.MediaEncoding
                     hwScaleFilter += $":transpose={tranposeDir}";
                 }
 
+                if (!string.IsNullOrEmpty(hwScaleFilter) && doVppFullRangeOut)
+                {
+                    hwScaleFilter += ":out_range=pc";
+                }
+
                 if (!string.IsNullOrEmpty(hwScaleFilter) && doVppTonemap)
                 {
                     hwScaleFilter += doVppProcamp ? procampParams : (twoPassVppTonemap ? string.Empty : ":tonemap=1");
@@ -4200,7 +4212,7 @@ namespace MediaBrowser.Controller.MediaEncoding
             // hw tonemap
             if (doOclTonemap)
             {
-                var tonemapFilter = GetHwTonemapFilter(options, "opencl", "nv12");
+                var tonemapFilter = GetHwTonemapFilter(options, "opencl", "nv12", isMjpegEncoder);
                 mainFilters.Add(tonemapFilter);
             }
 
@@ -4317,6 +4329,7 @@ namespace MediaBrowser.Controller.MediaEncoding
             var isHwDecoder = isVaapiDecoder || isQsvDecoder;
             var isSwDecoder = string.IsNullOrEmpty(vidDecoder);
             var isSwEncoder = !isQsvEncoder;
+            var isMjpegEncoder = vidEncoder.Contains("mjpeg", StringComparison.OrdinalIgnoreCase);
             var isQsvInQsvOut = isHwDecoder && isQsvEncoder;
 
             var doDeintH264 = state.DeInterlace("h264", true) || state.DeInterlace("avc", true);
@@ -4375,6 +4388,8 @@ namespace MediaBrowser.Controller.MediaEncoding
             {
                 var hwFilterSuffix = isVaapiDecoder ? "vaapi" : "qsv";
                 var isRext = IsVideoStreamHevcRext(state);
+                var doVppFullRangeOut = isMjpegEncoder
+                    && _mediaEncoder.EncoderVersion >= _minFFmpegQsvVppOutRangeOption;
 
                 // INPUT vaapi/qsv surface(vram)
                 // hw deint
@@ -4394,7 +4409,7 @@ namespace MediaBrowser.Controller.MediaEncoding
                 outFormat = (doTonemap && isRext) ? "p010" : outFormat;
 
                 var swapOutputWandH = isQsvDecoder && doVppTranspose && swapWAndH;
-                var hwScalePrefix = (isQsvDecoder && doVppTranspose) ? "vpp" : "scale";
+                var hwScalePrefix = (isQsvDecoder && (doVppTranspose || doVppFullRangeOut)) ? "vpp" : "scale";
                 var hwScaleFilter = GetHwScaleFilter(hwScalePrefix, hwFilterSuffix, outFormat, swapOutputWandH, swpInW, swpInH, reqW, reqH, reqMaxW, reqMaxH);
 
                 if (!string.IsNullOrEmpty(hwScaleFilter) && isQsvDecoder && doVppTranspose)
@@ -4402,6 +4417,13 @@ namespace MediaBrowser.Controller.MediaEncoding
                     hwScaleFilter += $":transpose={tranposeDir}";
                 }
 
+                if (!string.IsNullOrEmpty(hwScaleFilter)
+                    && ((isVaapiDecoder && isMjpegEncoder)
+                         || (isQsvDecoder && doVppFullRangeOut)))
+                {
+                    hwScaleFilter += ":out_range=pc";
+                }
+
                 // allocate extra pool sizes for vaapi vpp scale
                 if (!string.IsNullOrEmpty(hwScaleFilter) && isVaapiDecoder)
                 {
@@ -4422,7 +4444,7 @@ namespace MediaBrowser.Controller.MediaEncoding
                     mainFilters.Add("format=vaapi");
                 }
 
-                var tonemapFilter = GetHwTonemapFilter(options, "vaapi", "nv12");
+                var tonemapFilter = GetHwTonemapFilter(options, "vaapi", "nv12", isMjpegEncoder);
                 mainFilters.Add(tonemapFilter);
 
                 if (isQsvDecoder)
@@ -4442,7 +4464,7 @@ namespace MediaBrowser.Controller.MediaEncoding
             // ocl tonemap
             if (doOclTonemap)
             {
-                var tonemapFilter = GetHwTonemapFilter(options, "opencl", "nv12");
+                var tonemapFilter = GetHwTonemapFilter(options, "opencl", "nv12", isMjpegEncoder);
                 mainFilters.Add(tonemapFilter);
             }
 
@@ -4633,6 +4655,7 @@ namespace MediaBrowser.Controller.MediaEncoding
             var isVaapiEncoder = vidEncoder.Contains("vaapi", StringComparison.OrdinalIgnoreCase);
             var isSwDecoder = string.IsNullOrEmpty(vidDecoder);
             var isSwEncoder = !isVaapiEncoder;
+            var isMjpegEncoder = vidEncoder.Contains("mjpeg", StringComparison.OrdinalIgnoreCase);
             var isVaInVaOut = isVaapiDecoder && isVaapiEncoder;
 
             var doDeintH264 = state.DeInterlace("h264", true) || state.DeInterlace("avc", true);
@@ -4708,6 +4731,11 @@ namespace MediaBrowser.Controller.MediaEncoding
                 var outFormat = doTonemap ? (isRext ? "p010" : string.Empty) : "nv12";
                 var hwScaleFilter = GetHwScaleFilter("scale", "vaapi", outFormat, false, swpInW, swpInH, reqW, reqH, reqMaxW, reqMaxH);
 
+                if (!string.IsNullOrEmpty(hwScaleFilter) && isMjpegEncoder)
+                {
+                    hwScaleFilter += ":out_range=pc";
+                }
+
                 // allocate extra pool sizes for vaapi vpp
                 if (!string.IsNullOrEmpty(hwScaleFilter))
                 {
@@ -4721,7 +4749,7 @@ namespace MediaBrowser.Controller.MediaEncoding
             // vaapi vpp tonemap
             if (doVaVppTonemap && isVaapiDecoder)
             {
-                var tonemapFilter = GetHwTonemapFilter(options, "vaapi", "nv12");
+                var tonemapFilter = GetHwTonemapFilter(options, "vaapi", "nv12", isMjpegEncoder);
                 mainFilters.Add(tonemapFilter);
             }
 
@@ -4734,7 +4762,7 @@ namespace MediaBrowser.Controller.MediaEncoding
             // ocl tonemap
             if (doOclTonemap)
             {
-                var tonemapFilter = GetHwTonemapFilter(options, "opencl", "nv12");
+                var tonemapFilter = GetHwTonemapFilter(options, "opencl", "nv12", isMjpegEncoder);
                 mainFilters.Add(tonemapFilter);
             }
 
@@ -4858,6 +4886,7 @@ namespace MediaBrowser.Controller.MediaEncoding
             var isVaapiEncoder = vidEncoder.Contains("vaapi", StringComparison.OrdinalIgnoreCase);
             var isSwDecoder = string.IsNullOrEmpty(vidDecoder);
             var isSwEncoder = !isVaapiEncoder;
+            var isMjpegEncoder = vidEncoder.Contains("mjpeg", StringComparison.OrdinalIgnoreCase);
 
             var doDeintH264 = state.DeInterlace("h264", true) || state.DeInterlace("avc", true);
             var doDeintHevc = state.DeInterlace("h265", true) || state.DeInterlace("hevc", true);
@@ -4953,6 +4982,12 @@ namespace MediaBrowser.Controller.MediaEncoding
 
                     // hw scale
                     var hwScaleFilter = GetHwScaleFilter("scale", "vaapi", "nv12", false, inW, inH, reqW, reqH, reqMaxW, reqMaxH);
+
+                    if (!string.IsNullOrEmpty(hwScaleFilter) && isMjpegEncoder)
+                    {
+                        hwScaleFilter += ":out_range=pc";
+                    }
+
                     mainFilters.Add(hwScaleFilter);
                 }
             }
@@ -4973,7 +5008,7 @@ namespace MediaBrowser.Controller.MediaEncoding
             // vk libplacebo
             if (doVkTonemap || hasSubs)
             {
-                var libplaceboFilter = GetLibplaceboFilter(options, "bgra", doVkTonemap, swpInW, swpInH, reqW, reqH, reqMaxW, reqMaxH);
+                var libplaceboFilter = GetLibplaceboFilter(options, "bgra", doVkTonemap, swpInW, swpInH, reqW, reqH, reqMaxW, reqMaxH, isMjpegEncoder);
                 mainFilters.Add(libplaceboFilter);
                 mainFilters.Add("format=vulkan");
             }
@@ -5088,6 +5123,7 @@ namespace MediaBrowser.Controller.MediaEncoding
             var isVaapiEncoder = vidEncoder.Contains("vaapi", StringComparison.OrdinalIgnoreCase);
             var isSwDecoder = string.IsNullOrEmpty(vidDecoder);
             var isSwEncoder = !isVaapiEncoder;
+            var isMjpegEncoder = vidEncoder.Contains("mjpeg", StringComparison.OrdinalIgnoreCase);
             var isVaInVaOut = isVaapiDecoder && isVaapiEncoder;
             var isi965Driver = _mediaEncoder.IsVaapiDeviceInteli965;
             var isAmdDriver = _mediaEncoder.IsVaapiDeviceAmd;
@@ -5149,6 +5185,11 @@ namespace MediaBrowser.Controller.MediaEncoding
                 outFormat = doOclTonemap ? string.Empty : "nv12";
                 var hwScaleFilter = GetHwScaleFilter("scale", "vaapi", outFormat, false, inW, inH, reqW, reqH, reqMaxW, reqMaxH);
 
+                if (!string.IsNullOrEmpty(hwScaleFilter) && isMjpegEncoder)
+                {
+                    hwScaleFilter += ":out_range=pc";
+                }
+
                 // allocate extra pool sizes for vaapi vpp
                 if (!string.IsNullOrEmpty(hwScaleFilter))
                 {
@@ -5177,7 +5218,7 @@ namespace MediaBrowser.Controller.MediaEncoding
             // ocl tonemap
             if (doOclTonemap)
             {
-                var tonemapFilter = GetHwTonemapFilter(options, "opencl", "nv12");
+                var tonemapFilter = GetHwTonemapFilter(options, "opencl", "nv12", isMjpegEncoder);
                 mainFilters.Add(tonemapFilter);
             }
 
@@ -5303,6 +5344,7 @@ namespace MediaBrowser.Controller.MediaEncoding
         {
             var isVtEncoder = vidEncoder.Contains("videotoolbox", StringComparison.OrdinalIgnoreCase);
             var isVtDecoder = vidDecoder.Contains("videotoolbox", StringComparison.OrdinalIgnoreCase);
+            var isMjpegEncoder = vidEncoder.Contains("mjpeg", StringComparison.OrdinalIgnoreCase);
 
             var inW = state.VideoStream?.Width;
             var inH = state.VideoStream?.Height;
@@ -5384,7 +5426,7 @@ namespace MediaBrowser.Controller.MediaEncoding
             // Metal tonemap
             if (doMetalTonemap)
             {
-                var tonemapFilter = GetHwTonemapFilter(options, "videotoolbox", "nv12");
+                var tonemapFilter = GetHwTonemapFilter(options, "videotoolbox", "nv12", isMjpegEncoder);
                 mainFilters.Add(tonemapFilter);
             }
 
@@ -5507,6 +5549,7 @@ namespace MediaBrowser.Controller.MediaEncoding
             var isRkmppEncoder = vidEncoder.Contains("rkmpp", StringComparison.OrdinalIgnoreCase);
             var isSwDecoder = !isRkmppDecoder;
             var isSwEncoder = !isRkmppEncoder;
+            var isMjpegEncoder = vidEncoder.Contains("mjpeg", StringComparison.OrdinalIgnoreCase);
             var isDrmInDrmOut = isRkmppDecoder && isRkmppEncoder;
             var isEncoderSupportAfbc = isRkmppEncoder
                 && (vidEncoder.Contains("h264", StringComparison.OrdinalIgnoreCase)
@@ -5573,7 +5616,7 @@ namespace MediaBrowser.Controller.MediaEncoding
 
                 var isFullAfbcPipeline = isEncoderSupportAfbc && isDrmInDrmOut && !doOclTonemap;
                 var swapOutputWandH = doRkVppTranspose && swapWAndH;
-                var outFormat = doOclTonemap ? "p010" : "nv12";
+                var outFormat = doOclTonemap ? "p010" : (isMjpegEncoder ? "bgra" : "nv12"); // RGA only support full range in rgb fmts
                 var hwScaleFilter = GetHwScaleFilter("vpp", "rkrga", outFormat, swapOutputWandH, swpInW, swpInH, reqW, reqH, reqMaxW, reqMaxH);
                 var doScaling = GetHwScaleFilter("vpp", "rkrga", string.Empty, swapOutputWandH, swpInW, swpInH, reqW, reqH, reqMaxW, reqMaxH);
 
@@ -5616,7 +5659,7 @@ namespace MediaBrowser.Controller.MediaEncoding
             // ocl tonemap
             if (doOclTonemap)
             {
-                var tonemapFilter = GetHwTonemapFilter(options, "opencl", "nv12");
+                var tonemapFilter = GetHwTonemapFilter(options, "opencl", "nv12", isMjpegEncoder);
                 mainFilters.Add(tonemapFilter);
             }
 
-- 
cgit v1.2.3


From 9ec85a0f180dd3ea1582ad60f3fb8d55861f2fdf Mon Sep 17 00:00:00 2001
From: elfalem <elfalem@users.noreply.github.com>
Date: Sun, 22 Sep 2024 20:50:29 -0400
Subject: Allow Playlists access for users with allowed tags configured
 (#12686)

---
 CONTRIBUTORS.md                              | 1 +
 MediaBrowser.Controller/Entities/BaseItem.cs | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

(limited to 'MediaBrowser.Controller')

diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
index 5b94e04e1..a9deb1c4a 100644
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@@ -191,6 +191,7 @@
  - [pret0rian8](https://github.com/pret0rian)
  - [jaina heartles](https://github.com/heartles)
  - [oxixes](https://github.com/oxixes)
+ - [elfalem](https://github.com/elfalem)
 
 # Emby Contributors
 
diff --git a/MediaBrowser.Controller/Entities/BaseItem.cs b/MediaBrowser.Controller/Entities/BaseItem.cs
index 414488853..eb605f6c8 100644
--- a/MediaBrowser.Controller/Entities/BaseItem.cs
+++ b/MediaBrowser.Controller/Entities/BaseItem.cs
@@ -1608,7 +1608,7 @@ namespace MediaBrowser.Controller.Entities
             }
 
             var parent = GetParents().FirstOrDefault() ?? this;
-            if (parent is UserRootFolder or AggregateFolder)
+            if (parent is UserRootFolder or AggregateFolder or UserView)
             {
                 return true;
             }
-- 
cgit v1.2.3


From a0204ada2f97b73f932e1ec40befd6cfa75e8e16 Mon Sep 17 00:00:00 2001
From: Nyanmisaka <nst799610810@gmail.com>
Date: Mon, 23 Sep 2024 23:02:31 +0800
Subject: Fix intel Xe kernel driver cannot be used with QSV (#12691)

---
 .../MediaEncoding/EncodingHelper.cs                   | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

(limited to 'MediaBrowser.Controller')

diff --git a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
index e9e8ed618..b05d2ffb7 100644
--- a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
+++ b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
@@ -72,6 +72,7 @@ namespace MediaBrowser.Controller.MediaEncoding
         private readonly Version _minFFmpegAlteredVaVkInterop = new Version(7, 0, 1);
         private readonly Version _minFFmpegQsvVppTonemapOption = new Version(7, 0, 1);
         private readonly Version _minFFmpegQsvVppOutRangeOption = new Version(7, 0, 1);
+        private readonly Version _minFFmpegVaapiDeviceVendorId = new Version(7, 0, 1);
 
         private static readonly Regex _validationRegex = new(ValidationRegex, RegexOptions.Compiled);
 
@@ -872,13 +873,15 @@ namespace MediaBrowser.Controller.MediaEncoding
                 options);
         }
 
-        private string GetVaapiDeviceArgs(string renderNodePath, string driver, string kernelDriver, string srcDeviceAlias, string alias)
+        private string GetVaapiDeviceArgs(string renderNodePath, string driver, string kernelDriver, string vendorId, string srcDeviceAlias, string alias)
         {
             alias ??= VaapiAlias;
+            var haveVendorId = !string.IsNullOrEmpty(vendorId)
+                && _mediaEncoder.EncoderVersion >= _minFFmpegVaapiDeviceVendorId;
 
-            // 'renderNodePath' has higher priority than 'kernelDriver'
+            // Priority: 'renderNodePath' > 'vendorId' > 'kernelDriver'
             var driverOpts = string.IsNullOrEmpty(renderNodePath)
-                ? (string.IsNullOrEmpty(kernelDriver) ? string.Empty : ",kernel_driver=" + kernelDriver)
+                ? (haveVendorId ? $",vendor_id={vendorId}" : (string.IsNullOrEmpty(kernelDriver) ? string.Empty : $",kernel_driver={kernelDriver}"))
                 : renderNodePath;
 
             // 'driver' behaves similarly to env LIBVA_DRIVER_NAME
@@ -913,7 +916,7 @@ namespace MediaBrowser.Controller.MediaEncoding
             if (OperatingSystem.IsLinux())
             {
                 // derive qsv from vaapi device
-                return GetVaapiDeviceArgs(renderNodePath, "iHD", "i915", null, VaapiAlias) + arg + "@" + VaapiAlias;
+                return GetVaapiDeviceArgs(renderNodePath, "iHD", "i915", "0x8086", null, VaapiAlias) + arg + "@" + VaapiAlias;
             }
 
             if (OperatingSystem.IsWindows())
@@ -1008,14 +1011,14 @@ namespace MediaBrowser.Controller.MediaEncoding
 
                 if (_mediaEncoder.IsVaapiDeviceInteliHD)
                 {
-                    args.Append(GetVaapiDeviceArgs(options.VaapiDevice, "iHD", null, null, VaapiAlias));
+                    args.Append(GetVaapiDeviceArgs(options.VaapiDevice, "iHD", null, null, null, VaapiAlias));
                 }
                 else if (_mediaEncoder.IsVaapiDeviceInteli965)
                 {
                     // Only override i965 since it has lower priority than iHD in libva lookup.
                     Environment.SetEnvironmentVariable("LIBVA_DRIVER_NAME", "i965");
                     Environment.SetEnvironmentVariable("LIBVA_DRIVER_NAME_JELLYFIN", "i965");
-                    args.Append(GetVaapiDeviceArgs(options.VaapiDevice, "i965", null, null, VaapiAlias));
+                    args.Append(GetVaapiDeviceArgs(options.VaapiDevice, "i965", null, null, null, VaapiAlias));
                 }
 
                 var filterDevArgs = string.Empty;
@@ -1039,7 +1042,7 @@ namespace MediaBrowser.Controller.MediaEncoding
                         && Environment.OSVersion.Version >= _minKernelVersionAmdVkFmtModifier)
                     {
                         args.Append(GetDrmDeviceArgs(options.VaapiDevice, DrmAlias));
-                        args.Append(GetVaapiDeviceArgs(null, null, null, DrmAlias, VaapiAlias));
+                        args.Append(GetVaapiDeviceArgs(null, null, null, null, DrmAlias, VaapiAlias));
                         args.Append(GetVulkanDeviceArgs(0, null, DrmAlias, VulkanAlias));
 
                         // libplacebo wants an explicitly set vulkan filter device.
@@ -1047,7 +1050,7 @@ namespace MediaBrowser.Controller.MediaEncoding
                     }
                     else
                     {
-                        args.Append(GetVaapiDeviceArgs(options.VaapiDevice, null, null, null, VaapiAlias));
+                        args.Append(GetVaapiDeviceArgs(options.VaapiDevice, null, null, null, null, VaapiAlias));
                         filterDevArgs = GetFilterHwDeviceArgs(VaapiAlias);
 
                         if (doOclTonemap)
-- 
cgit v1.2.3


From 0539fdc5e3a164b694d12d8d3f8437e2cc5b6457 Mon Sep 17 00:00:00 2001
From: gnattu <gnattu@users.noreply.github.com>
Date: Mon, 23 Sep 2024 23:09:08 +0800
Subject: Fix libx264/libx265 auto preset (#12692)

---
 MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'MediaBrowser.Controller')

diff --git a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
index b05d2ffb7..557eb5e32 100644
--- a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
+++ b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
@@ -1444,7 +1444,13 @@ namespace MediaBrowser.Controller.MediaEncoding
             var encoderPreset = preset ?? defaultPreset;
             if (string.Equals(videoEncoder, "libx264", StringComparison.OrdinalIgnoreCase) || isLibX265)
             {
-                param += " -preset " + encoderPreset.ToString().ToLowerInvariant();
+                var presetString = encoderPreset switch
+                {
+                    EncoderPreset.auto => EncoderPreset.veryfast.ToString().ToLowerInvariant(),
+                    _ => encoderPreset.ToString().ToLowerInvariant()
+                };
+
+                param += " -preset " + presetString;
 
                 int encodeCrf = encodingOptions.H264Crf;
                 if (isLibX265)
-- 
cgit v1.2.3


From 3c639c2e80f2a17eea3f5f1a70c1b287bc99aba4 Mon Sep 17 00:00:00 2001
From: Cody Robibero <cody@robibe.ro>
Date: Mon, 23 Sep 2024 09:09:23 -0600
Subject: Tweak Trickplay migration for speed (#12643)

---
 .../Trickplay/TrickplayManager.cs                  |  8 +--
 .../Migrations/Routines/MoveTrickplayFiles.cs      | 57 +++++++++++++++++-----
 .../Trickplay/ITrickplayManager.cs                 |  4 +-
 .../Trickplay/TrickplayMoveImagesTask.cs           | 51 +++++++++++--------
 4 files changed, 82 insertions(+), 38 deletions(-)

(limited to 'MediaBrowser.Controller')

diff --git a/Jellyfin.Server.Implementations/Trickplay/TrickplayManager.cs b/Jellyfin.Server.Implementations/Trickplay/TrickplayManager.cs
index 861037c1f..73e31279f 100644
--- a/Jellyfin.Server.Implementations/Trickplay/TrickplayManager.cs
+++ b/Jellyfin.Server.Implementations/Trickplay/TrickplayManager.cs
@@ -455,16 +455,18 @@ public class TrickplayManager : ITrickplayManager
     }
 
     /// <inheritdoc />
-    public async Task<IReadOnlyList<Guid>> GetTrickplayItemsAsync()
+    public async Task<IReadOnlyList<TrickplayInfo>> GetTrickplayItemsAsync(int limit, int offset)
     {
-        List<Guid> trickplayItems;
+        IReadOnlyList<TrickplayInfo> trickplayItems;
 
         var dbContext = await _dbProvider.CreateDbContextAsync().ConfigureAwait(false);
         await using (dbContext.ConfigureAwait(false))
         {
             trickplayItems = await dbContext.TrickplayInfos
                 .AsNoTracking()
-                .Select(i => i.ItemId)
+                .OrderBy(i => i.ItemId)
+                .Skip(offset)
+                .Take(limit)
                 .ToListAsync()
                 .ConfigureAwait(false);
         }
diff --git a/Jellyfin.Server/Migrations/Routines/MoveTrickplayFiles.cs b/Jellyfin.Server/Migrations/Routines/MoveTrickplayFiles.cs
index 301541b6c..c1a9e8894 100644
--- a/Jellyfin.Server/Migrations/Routines/MoveTrickplayFiles.cs
+++ b/Jellyfin.Server/Migrations/Routines/MoveTrickplayFiles.cs
@@ -1,10 +1,15 @@
 using System;
+using System.Diagnostics;
 using System.Globalization;
 using System.IO;
+using System.Linq;
+using Jellyfin.Data.Enums;
+using MediaBrowser.Common;
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Library;
 using MediaBrowser.Controller.Trickplay;
 using MediaBrowser.Model.IO;
+using Microsoft.Extensions.Logging;
 
 namespace Jellyfin.Server.Migrations.Routines;
 
@@ -16,6 +21,7 @@ public class MoveTrickplayFiles : IMigrationRoutine
     private readonly ITrickplayManager _trickplayManager;
     private readonly IFileSystem _fileSystem;
     private readonly ILibraryManager _libraryManager;
+    private readonly ILogger<MoveTrickplayFiles> _logger;
 
     /// <summary>
     /// Initializes a new instance of the <see cref="MoveTrickplayFiles"/> class.
@@ -23,11 +29,13 @@ public class MoveTrickplayFiles : IMigrationRoutine
     /// <param name="trickplayManager">Instance of the <see cref="ITrickplayManager"/> interface.</param>
     /// <param name="fileSystem">Instance of the <see cref="IFileSystem"/> interface.</param>
     /// <param name="libraryManager">Instance of the <see cref="ILibraryManager"/> interface.</param>
-    public MoveTrickplayFiles(ITrickplayManager trickplayManager, IFileSystem fileSystem, ILibraryManager libraryManager)
+    /// <param name="logger">The logger.</param>
+    public MoveTrickplayFiles(ITrickplayManager trickplayManager, IFileSystem fileSystem, ILibraryManager libraryManager, ILogger<MoveTrickplayFiles> logger)
     {
         _trickplayManager = trickplayManager;
         _fileSystem = fileSystem;
         _libraryManager = libraryManager;
+        _logger = logger;
     }
 
     /// <inheritdoc />
@@ -42,26 +50,49 @@ public class MoveTrickplayFiles : IMigrationRoutine
     /// <inheritdoc />
     public void Perform()
     {
-        var trickplayItems = _trickplayManager.GetTrickplayItemsAsync().GetAwaiter().GetResult();
-        foreach (var itemId in trickplayItems)
+        const int Limit = 100;
+        int itemCount = 0, offset = 0, previousCount;
+
+        var sw = Stopwatch.StartNew();
+        var trickplayQuery = new InternalItemsQuery
         {
-            var resolutions = _trickplayManager.GetTrickplayResolutions(itemId).GetAwaiter().GetResult();
-            var item = _libraryManager.GetItemById(itemId);
-            if (item is null)
-            {
-                continue;
-            }
+            MediaTypes = [MediaType.Video],
+            SourceTypes = [SourceType.Library],
+            IsVirtualItem = false,
+            IsFolder = false
+        };
 
-            foreach (var resolution in resolutions)
+        do
+        {
+            var trickplayInfos = _trickplayManager.GetTrickplayItemsAsync(Limit, offset).GetAwaiter().GetResult();
+            previousCount = trickplayInfos.Count;
+            offset += Limit;
+
+            trickplayQuery.ItemIds = trickplayInfos.Select(i => i.ItemId).Distinct().ToArray();
+            var items = _libraryManager.GetItemList(trickplayQuery);
+            foreach (var trickplayInfo in trickplayInfos)
             {
-                var oldPath = GetOldTrickplayDirectory(item, resolution.Key);
-                var newPath = _trickplayManager.GetTrickplayDirectory(item, resolution.Value.TileWidth, resolution.Value.TileHeight, resolution.Value.Width, false);
+                var item = items.OfType<Video>().FirstOrDefault(i => i.Id.Equals(trickplayInfo.ItemId));
+                if (item is null)
+                {
+                    continue;
+                }
+
+                if (++itemCount % 1_000 == 0)
+                {
+                    _logger.LogInformation("Moved {Count} items in {Time}", itemCount, sw.Elapsed);
+                }
+
+                var oldPath = GetOldTrickplayDirectory(item, trickplayInfo.Width);
+                var newPath = _trickplayManager.GetTrickplayDirectory(item, trickplayInfo.TileWidth, trickplayInfo.TileHeight, trickplayInfo.Width, false);
                 if (_fileSystem.DirectoryExists(oldPath))
                 {
                     _fileSystem.MoveDirectory(oldPath, newPath);
                 }
             }
-        }
+        } while (previousCount == Limit);
+
+        _logger.LogInformation("Moved {Count} items in {Time}", itemCount, sw.Elapsed);
     }
 
     private string GetOldTrickplayDirectory(BaseItem item, int? width = null)
diff --git a/MediaBrowser.Controller/Trickplay/ITrickplayManager.cs b/MediaBrowser.Controller/Trickplay/ITrickplayManager.cs
index bda794aa6..800317800 100644
--- a/MediaBrowser.Controller/Trickplay/ITrickplayManager.cs
+++ b/MediaBrowser.Controller/Trickplay/ITrickplayManager.cs
@@ -46,8 +46,10 @@ public interface ITrickplayManager
     /// <summary>
     /// Gets the item ids of all items with trickplay info.
     /// </summary>
+    /// <param name="limit">The limit of items to return.</param>
+    /// <param name="offset">The offset to start the query at.</param>
     /// <returns>The list of item ids that have trickplay info.</returns>
-    public Task<IReadOnlyList<Guid>> GetTrickplayItemsAsync();
+    Task<IReadOnlyList<TrickplayInfo>> GetTrickplayItemsAsync(int limit, int offset);
 
     /// <summary>
     /// Saves trickplay info.
diff --git a/MediaBrowser.Providers/Trickplay/TrickplayMoveImagesTask.cs b/MediaBrowser.Providers/Trickplay/TrickplayMoveImagesTask.cs
index c581fd26c..c0b8a8c75 100644
--- a/MediaBrowser.Providers/Trickplay/TrickplayMoveImagesTask.cs
+++ b/MediaBrowser.Providers/Trickplay/TrickplayMoveImagesTask.cs
@@ -18,8 +18,6 @@ namespace MediaBrowser.Providers.Trickplay;
 /// </summary>
 public class TrickplayMoveImagesTask : IScheduledTask
 {
-    private const int QueryPageLimit = 100;
-
     private readonly ILogger<TrickplayMoveImagesTask> _logger;
     private readonly ILibraryManager _libraryManager;
     private readonly ILocalizationManager _localization;
@@ -62,32 +60,46 @@ public class TrickplayMoveImagesTask : IScheduledTask
     /// <inheritdoc />
     public async Task ExecuteAsync(IProgress<double> progress, CancellationToken cancellationToken)
     {
-        var trickplayItems = await _trickplayManager.GetTrickplayItemsAsync().ConfigureAwait(false);
-        var query = new InternalItemsQuery
+        const int Limit = 100;
+        int itemCount = 0, offset = 0, previousCount;
+
+        // This count may not be accurate, but just get something to show progress on the dashboard.
+        var totalVideoCount = _libraryManager.GetCount(new InternalItemsQuery
         {
             MediaTypes = [MediaType.Video],
             SourceTypes = [SourceType.Library],
             IsVirtualItem = false,
             IsFolder = false,
-            Recursive = true,
-            Limit = QueryPageLimit
-        };
-
-        var numberOfVideos = _libraryManager.GetCount(query);
+            Recursive = true
+        });
 
-        var startIndex = 0;
-        var numComplete = 0;
+        var trickplayQuery = new InternalItemsQuery
+        {
+            MediaTypes = [MediaType.Video],
+            SourceTypes = [SourceType.Library],
+            IsVirtualItem = false,
+            IsFolder = false
+        };
 
-        while (startIndex < numberOfVideos)
+        do
         {
-            query.StartIndex = startIndex;
-            var videos = _libraryManager.GetItemList(query).OfType<Video>().ToList();
-            videos.RemoveAll(i => !trickplayItems.Contains(i.Id));
+            var trickplayInfos = await _trickplayManager.GetTrickplayItemsAsync(Limit, offset).ConfigureAwait(false);
+            previousCount = trickplayInfos.Count;
+            offset += Limit;
 
-            foreach (var video in videos)
+            trickplayQuery.ItemIds = trickplayInfos.Select(i => i.ItemId).Distinct().ToArray();
+            var items = _libraryManager.GetItemList(trickplayQuery);
+            foreach (var trickplayInfo in trickplayInfos)
             {
                 cancellationToken.ThrowIfCancellationRequested();
 
+                var video = items.OfType<Video>().FirstOrDefault(i => i.Id.Equals(trickplayInfo.ItemId));
+                if (video is null)
+                {
+                    continue;
+                }
+
+                itemCount++;
                 try
                 {
                     var libraryOptions = _libraryManager.GetLibraryOptions(video);
@@ -97,13 +109,10 @@ public class TrickplayMoveImagesTask : IScheduledTask
                 {
                     _logger.LogError(ex, "Error moving trickplay files for {ItemName}", video.Name);
                 }
-
-                numComplete++;
-                progress.Report(100d * numComplete / numberOfVideos);
             }
 
-            startIndex += QueryPageLimit;
-        }
+            progress.Report(100d * itemCount / totalVideoCount);
+        } while (previousCount == Limit);
 
         progress.Report(100);
     }
-- 
cgit v1.2.3


From cb8f01065a03a5ba546c1ff33c7452d81c32da62 Mon Sep 17 00:00:00 2001
From: Nyanmisaka <nst799610810@gmail.com>
Date: Tue, 24 Sep 2024 01:24:49 +0800
Subject: Fix MJPEG hwenc may be incorrectly enabled on AMDGPU (#12695)

---
 MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'MediaBrowser.Controller')

diff --git a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
index 557eb5e32..7076ed087 100644
--- a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
+++ b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
@@ -209,6 +209,14 @@ namespace MediaBrowser.Controller.MediaEncoding
             {
                 var hwType = encodingOptions.HardwareAccelerationType;
 
+                // Only Intel has VA-API MJPEG encoder
+                if (hwType == HardwareAccelerationType.vaapi
+                    && !(_mediaEncoder.IsVaapiDeviceInteliHD
+                         || _mediaEncoder.IsVaapiDeviceInteli965))
+                {
+                    return _defaultMjpegEncoder;
+                }
+
                 if (hwType != HardwareAccelerationType.none
                     && encodingOptions.EnableHardwareEncoding
                     && _mjpegCodecMap.TryGetValue(hwType, out var preferredEncoder)
-- 
cgit v1.2.3


From 75bbd3029613829a9b55ac01e27093583fc8cf52 Mon Sep 17 00:00:00 2001
From: gnattu <gnattu@users.noreply.github.com>
Date: Tue, 24 Sep 2024 22:15:53 +0800
Subject: Fix get sessions with api key (#12696)

---
 .../Session/SessionManager.cs                      | 44 ++++++++++++++++++----
 Jellyfin.Api/Controllers/SessionController.cs      |  3 +-
 MediaBrowser.Controller/Session/ISessionManager.cs |  3 +-
 3 files changed, 40 insertions(+), 10 deletions(-)

(limited to 'MediaBrowser.Controller')

diff --git a/Emby.Server.Implementations/Session/SessionManager.cs b/Emby.Server.Implementations/Session/SessionManager.cs
index 55e485669..6a8ad2bdc 100644
--- a/Emby.Server.Implementations/Session/SessionManager.cs
+++ b/Emby.Server.Implementations/Session/SessionManager.cs
@@ -1858,15 +1858,38 @@ namespace Emby.Server.Implementations.Session
             Guid userId,
             string deviceId,
             int? activeWithinSeconds,
-            Guid? controllableUserToCheck)
+            Guid? controllableUserToCheck,
+            bool isApiKey)
         {
             var result = Sessions;
-            var user = _userManager.GetUserById(userId);
             if (!string.IsNullOrEmpty(deviceId))
             {
                 result = result.Where(i => string.Equals(i.DeviceId, deviceId, StringComparison.OrdinalIgnoreCase));
             }
 
+            var userCanControlOthers = false;
+            var userIsAdmin = false;
+            User user = null;
+
+            if (isApiKey)
+            {
+                userCanControlOthers = true;
+                userIsAdmin = true;
+            }
+            else if (!userId.IsEmpty())
+            {
+                user = _userManager.GetUserById(userId);
+                if (user is not null)
+                {
+                    userCanControlOthers = user.HasPermission(PermissionKind.EnableRemoteControlOfOtherUsers);
+                    userIsAdmin = user.HasPermission(PermissionKind.IsAdministrator);
+                }
+                else
+                {
+                    return [];
+                }
+            }
+
             if (!controllableUserToCheck.IsNullOrEmpty())
             {
                 result = result.Where(i => i.SupportsRemoteControl);
@@ -1883,29 +1906,34 @@ namespace Emby.Server.Implementations.Session
                     result = result.Where(i => !i.UserId.IsEmpty());
                 }
 
-                if (!user.HasPermission(PermissionKind.EnableRemoteControlOfOtherUsers))
+                if (!userCanControlOthers)
                 {
                     // User cannot control other user's sessions, validate user id.
-                    result = result.Where(i => i.UserId.IsEmpty() || i.ContainsUser(user.Id));
+                    result = result.Where(i => i.UserId.IsEmpty() || i.ContainsUser(userId));
                 }
 
                 result = result.Where(i =>
                 {
-                    if (!string.IsNullOrWhiteSpace(i.DeviceId) && !_deviceManager.CanAccessDevice(user, i.DeviceId))
+                    if (isApiKey)
+                    {
+                        return true;
+                    }
+
+                    if (user is null)
                     {
                         return false;
                     }
 
-                    return true;
+                    return string.IsNullOrWhiteSpace(i.DeviceId) || _deviceManager.CanAccessDevice(user, i.DeviceId);
                 });
             }
-            else if (!user.HasPermission(PermissionKind.IsAdministrator))
+            else if (!userIsAdmin)
             {
                 // Request isn't from administrator, limit to "own" sessions.
                 result = result.Where(i => i.UserId.IsEmpty() || i.ContainsUser(userId));
             }
 
-            if (!user.HasPermission(PermissionKind.IsAdministrator))
+            if (!userIsAdmin)
             {
                 // Don't report acceleration type for non-admin users.
                 result = result.Select(r =>
diff --git a/Jellyfin.Api/Controllers/SessionController.cs b/Jellyfin.Api/Controllers/SessionController.cs
index 72eb93eff..2f9e9f091 100644
--- a/Jellyfin.Api/Controllers/SessionController.cs
+++ b/Jellyfin.Api/Controllers/SessionController.cs
@@ -62,7 +62,8 @@ public class SessionController : BaseJellyfinApiController
             User.GetUserId(),
             deviceId,
             activeWithinSeconds,
-            controllableUserToCheck);
+            controllableUserToCheck,
+            User.GetIsApiKey());
 
         return Ok(result);
     }
diff --git a/MediaBrowser.Controller/Session/ISessionManager.cs b/MediaBrowser.Controller/Session/ISessionManager.cs
index f2e98dd78..462a62455 100644
--- a/MediaBrowser.Controller/Session/ISessionManager.cs
+++ b/MediaBrowser.Controller/Session/ISessionManager.cs
@@ -300,8 +300,9 @@ namespace MediaBrowser.Controller.Session
         /// <param name="deviceId">The device id.</param>
         /// <param name="activeWithinSeconds">Active within session limit.</param>
         /// <param name="controllableUserToCheck">Filter for sessions remote controllable for this user.</param>
+        /// <param name="isApiKey">Is the request authenticated with API key.</param>
         /// <returns>IReadOnlyList{SessionInfoDto}.</returns>
-        IReadOnlyList<SessionInfoDto> GetSessions(Guid userId, string deviceId, int? activeWithinSeconds, Guid? controllableUserToCheck);
+        IReadOnlyList<SessionInfoDto> GetSessions(Guid userId, string deviceId, int? activeWithinSeconds, Guid? controllableUserToCheck, bool isApiKey);
 
         /// <summary>
         /// Gets the session by authentication token.
-- 
cgit v1.2.3


From e5f5f7c3843d8de0fd212d77332e9d20f614db59 Mon Sep 17 00:00:00 2001
From: Nyanmisaka <nst799610810@gmail.com>
Date: Sat, 28 Sep 2024 04:14:42 +0000
Subject: Fix the invalid libplacebo filter option (#12732)

---
 MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'MediaBrowser.Controller')

diff --git a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
index 7076ed087..e5b9ad167 100644
--- a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
+++ b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
@@ -3441,7 +3441,7 @@ namespace MediaBrowser.Controller.MediaEncoding
                     algorithmString = algorithm.ToString().ToLowerInvariant();
                 }
 
-                tonemapArg = ":tonemapping=" + algorithm + ":peak_detect=0:color_primaries=bt709:color_trc=bt709:colorspace=bt709";
+                tonemapArg = $":tonemapping={algorithmString}:peak_detect=0:color_primaries=bt709:color_trc=bt709:colorspace=bt709";
 
                 if (range == TonemappingRange.tv || range == TonemappingRange.pc)
                 {
-- 
cgit v1.2.3


From f52f5290b2e387edd9520197a75eda9c63fde7e8 Mon Sep 17 00:00:00 2001
From: Nyanmisaka <nst799610810@gmail.com>
Date: Sat, 28 Sep 2024 09:36:33 +0000
Subject: Fix vpp tonemap pixfmt regression (#12733)

---
 MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'MediaBrowser.Controller')

diff --git a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
index e5b9ad167..c8deca609 100644
--- a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
+++ b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
@@ -4422,9 +4422,7 @@ namespace MediaBrowser.Controller.MediaEncoding
                     mainFilters.Add($"transpose_vaapi=dir={tranposeDir}");
                 }
 
-                var outFormat = doOclTonemap ? ((isQsvDecoder && doVppTranspose) ? "p010" : string.Empty) : "nv12";
-                outFormat = (doTonemap && isRext) ? "p010" : outFormat;
-
+                var outFormat = doTonemap ? (((isQsvDecoder && doVppTranspose) || isRext) ? "p010" : string.Empty) : "nv12";
                 var swapOutputWandH = isQsvDecoder && doVppTranspose && swapWAndH;
                 var hwScalePrefix = (isQsvDecoder && (doVppTranspose || doVppFullRangeOut)) ? "vpp" : "scale";
                 var hwScaleFilter = GetHwScaleFilter(hwScalePrefix, hwFilterSuffix, outFormat, swapOutputWandH, swpInW, swpInH, reqW, reqH, reqMaxW, reqMaxH);
-- 
cgit v1.2.3


From 77420739e6303787109b0f7e81ea067f7cd6b9f1 Mon Sep 17 00:00:00 2001
From: Nyanmisaka <nst799610810@gmail.com>
Date: Mon, 30 Sep 2024 02:21:36 +0000
Subject: Handle full range output in tonemap filter for Trickplay (#12746)

---
 MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'MediaBrowser.Controller')

diff --git a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
index c8deca609..73618e104 100644
--- a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
+++ b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
@@ -4177,7 +4177,7 @@ namespace MediaBrowser.Controller.MediaEncoding
                     hwScaleFilter += $":transpose={tranposeDir}";
                 }
 
-                if (!string.IsNullOrEmpty(hwScaleFilter) && doVppFullRangeOut)
+                if (!string.IsNullOrEmpty(hwScaleFilter) && doVppFullRangeOut && !doOclTonemap)
                 {
                     hwScaleFilter += ":out_range=pc";
                 }
@@ -4433,6 +4433,7 @@ namespace MediaBrowser.Controller.MediaEncoding
                 }
 
                 if (!string.IsNullOrEmpty(hwScaleFilter)
+                    && !doOclTonemap
                     && ((isVaapiDecoder && isMjpegEncoder)
                          || (isQsvDecoder && doVppFullRangeOut)))
                 {
@@ -4746,7 +4747,7 @@ namespace MediaBrowser.Controller.MediaEncoding
                 var outFormat = doTonemap ? (isRext ? "p010" : string.Empty) : "nv12";
                 var hwScaleFilter = GetHwScaleFilter("scale", "vaapi", outFormat, false, swpInW, swpInH, reqW, reqH, reqMaxW, reqMaxH);
 
-                if (!string.IsNullOrEmpty(hwScaleFilter) && isMjpegEncoder)
+                if (!string.IsNullOrEmpty(hwScaleFilter) && isMjpegEncoder && !doOclTonemap)
                 {
                     hwScaleFilter += ":out_range=pc";
                 }
@@ -4998,7 +4999,7 @@ namespace MediaBrowser.Controller.MediaEncoding
                     // hw scale
                     var hwScaleFilter = GetHwScaleFilter("scale", "vaapi", "nv12", false, inW, inH, reqW, reqH, reqMaxW, reqMaxH);
 
-                    if (!string.IsNullOrEmpty(hwScaleFilter) && isMjpegEncoder)
+                    if (!string.IsNullOrEmpty(hwScaleFilter) && isMjpegEncoder && !doVkTonemap)
                     {
                         hwScaleFilter += ":out_range=pc";
                     }
@@ -5200,7 +5201,7 @@ namespace MediaBrowser.Controller.MediaEncoding
                 outFormat = doOclTonemap ? string.Empty : "nv12";
                 var hwScaleFilter = GetHwScaleFilter("scale", "vaapi", outFormat, false, inW, inH, reqW, reqH, reqMaxW, reqMaxH);
 
-                if (!string.IsNullOrEmpty(hwScaleFilter) && isMjpegEncoder)
+                if (!string.IsNullOrEmpty(hwScaleFilter) && isMjpegEncoder && !doOclTonemap)
                 {
                     hwScaleFilter += ":out_range=pc";
                 }
-- 
cgit v1.2.3


From 9ef7ccfc125d00c0a0ce789626db258a4cb51f2f Mon Sep 17 00:00:00 2001
From: gnattu <gnattu@users.noreply.github.com>
Date: Mon, 30 Sep 2024 10:21:46 +0800
Subject: Add perf tradeoff mode to image extractor (#12744)

---
 Emby.Server.Implementations/ConfigurationOptions.cs         |  1 +
 .../Extensions/ConfigurationExtensions.cs                   | 13 +++++++++++++
 MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs          |  9 ++++++++-
 3 files changed, 22 insertions(+), 1 deletion(-)

(limited to 'MediaBrowser.Controller')

diff --git a/Emby.Server.Implementations/ConfigurationOptions.cs b/Emby.Server.Implementations/ConfigurationOptions.cs
index 702707297..91791a1c8 100644
--- a/Emby.Server.Implementations/ConfigurationOptions.cs
+++ b/Emby.Server.Implementations/ConfigurationOptions.cs
@@ -21,6 +21,7 @@ namespace Emby.Server.Implementations
             { BindToUnixSocketKey, bool.FalseString },
             { SqliteCacheSizeKey, "20000" },
             { FfmpegSkipValidationKey, bool.FalseString },
+            { FfmpegImgExtractPerfTradeoffKey, bool.FalseString },
             { DetectNetworkChangeKey, bool.TrueString }
         };
     }
diff --git a/MediaBrowser.Controller/Extensions/ConfigurationExtensions.cs b/MediaBrowser.Controller/Extensions/ConfigurationExtensions.cs
index 7ca508426..f8049cd48 100644
--- a/MediaBrowser.Controller/Extensions/ConfigurationExtensions.cs
+++ b/MediaBrowser.Controller/Extensions/ConfigurationExtensions.cs
@@ -39,6 +39,11 @@ namespace MediaBrowser.Controller.Extensions
         /// </summary>
         public const string FfmpegAnalyzeDurationKey = "FFmpeg:analyzeduration";
 
+        /// <summary>
+        /// The key for the FFmpeg image extraction performance tradeoff option.
+        /// </summary>
+        public const string FfmpegImgExtractPerfTradeoffKey = "FFmpeg:imgExtractPerfTradeoff";
+
         /// <summary>
         /// The key for the FFmpeg path option.
         /// </summary>
@@ -107,6 +112,14 @@ namespace MediaBrowser.Controller.Extensions
         public static bool GetFFmpegSkipValidation(this IConfiguration configuration)
             => configuration.GetValue<bool>(FfmpegSkipValidationKey);
 
+        /// <summary>
+        /// Gets a value indicating whether the server should trade off for performance during FFmpeg image extraction.
+        /// </summary>
+        /// <param name="configuration">The configuration to read the setting from.</param>
+        /// <returns><c>true</c> if the server should trade off for performance during FFmpeg image extraction, otherwise <c>false</c>.</returns>
+        public static bool GetFFmpegImgExtractPerfTradeoff(this IConfiguration configuration)
+            => configuration.GetValue<bool>(FfmpegImgExtractPerfTradeoffKey);
+
         /// <summary>
         /// Gets a value indicating whether playlists should allow duplicate entries from the <see cref="IConfiguration"/>.
         /// </summary>
diff --git a/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs b/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
index 7ae1fbbb1..ace8bda19 100644
--- a/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
+++ b/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
@@ -650,6 +650,8 @@ namespace MediaBrowser.MediaEncoding.Encoder
         {
             ArgumentException.ThrowIfNullOrEmpty(inputPath);
 
+            var useTradeoff = _config.GetFFmpegImgExtractPerfTradeoff();
+
             var outputExtension = targetFormat?.GetExtension() ?? ".jpg";
 
             var tempExtractPath = Path.Combine(_configurationManager.ApplicationPaths.TempDirectory, Guid.NewGuid() + outputExtension);
@@ -684,7 +686,7 @@ namespace MediaBrowser.MediaEncoding.Encoder
 
             // Use ffmpeg to sample 100 (we can drop this if required using thumbnail=50 for 50 frames) frames and pick the best thumbnail. Have a fall back just in case.
             // mpegts need larger batch size otherwise the corrupted thumbnail will be created. Larger batch size will lower the processing speed.
-            var enableThumbnail = useIFrame && !string.Equals("wtv", container, StringComparison.OrdinalIgnoreCase);
+            var enableThumbnail = !useTradeoff && useIFrame && !string.Equals("wtv", container, StringComparison.OrdinalIgnoreCase);
             if (enableThumbnail)
             {
                 var useLargerBatchSize = string.Equals("mpegts", container, StringComparison.OrdinalIgnoreCase);
@@ -718,6 +720,11 @@ namespace MediaBrowser.MediaEncoding.Encoder
                 args = string.Format(CultureInfo.InvariantCulture, "-ss {0} ", GetTimeParameter(offset.Value)) + args;
             }
 
+            if (useIFrame && useTradeoff)
+            {
+                args = "-skip_frame nokey " + args;
+            }
+
             if (!string.IsNullOrWhiteSpace(container))
             {
                 var inputFormat = EncodingHelper.GetInputFormat(container);
-- 
cgit v1.2.3


From f36e73e74864b85faafcb820f5cd7d4016c718ce Mon Sep 17 00:00:00 2001
From: Nyanmisaka <nst799610810@gmail.com>
Date: Tue, 1 Oct 2024 13:01:33 +0000
Subject: Improve Trickplay image quality using HQ scaler on intel (#12759)

---
 .../MediaEncoding/EncodingHelper.cs                | 35 ++++++++++++----------
 1 file changed, 20 insertions(+), 15 deletions(-)

(limited to 'MediaBrowser.Controller')

diff --git a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
index 73618e104..c90704c5e 100644
--- a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
+++ b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
@@ -73,6 +73,7 @@ namespace MediaBrowser.Controller.MediaEncoding
         private readonly Version _minFFmpegQsvVppTonemapOption = new Version(7, 0, 1);
         private readonly Version _minFFmpegQsvVppOutRangeOption = new Version(7, 0, 1);
         private readonly Version _minFFmpegVaapiDeviceVendorId = new Version(7, 0, 1);
+        private readonly Version _minFFmpegQsvVppScaleModeOption = new Version(6, 0);
 
         private static readonly Regex _validationRegex = new(ValidationRegex, RegexOptions.Compiled);
 
@@ -4143,6 +4144,8 @@ namespace MediaBrowser.Controller.MediaEncoding
                 var twoPassVppTonemap = isRext;
                 var doVppFullRangeOut = isMjpegEncoder
                     && _mediaEncoder.EncoderVersion >= _minFFmpegQsvVppOutRangeOption;
+                var doVppScaleModeHq = isMjpegEncoder
+                    && _mediaEncoder.EncoderVersion >= _minFFmpegQsvVppScaleModeOption;
                 var doVppProcamp = false;
                 var procampParams = string.Empty;
                 if (doVppTonemap)
@@ -4169,17 +4172,17 @@ namespace MediaBrowser.Controller.MediaEncoding
                 outFormat = twoPassVppTonemap ? "p010" : outFormat;
 
                 var swapOutputWandH = doVppTranspose && swapWAndH;
-                var hwScalePrefix = (doVppTranspose || doVppTonemap || doVppFullRangeOut) ? "vpp" : "scale";
-                var hwScaleFilter = GetHwScaleFilter(hwScalePrefix, "qsv", outFormat, swapOutputWandH, swpInW, swpInH, reqW, reqH, reqMaxW, reqMaxH);
+                var hwScaleFilter = GetHwScaleFilter("vpp", "qsv", outFormat, swapOutputWandH, swpInW, swpInH, reqW, reqH, reqMaxW, reqMaxH);
 
                 if (!string.IsNullOrEmpty(hwScaleFilter) && doVppTranspose)
                 {
                     hwScaleFilter += $":transpose={tranposeDir}";
                 }
 
-                if (!string.IsNullOrEmpty(hwScaleFilter) && doVppFullRangeOut && !doOclTonemap)
+                if (!string.IsNullOrEmpty(hwScaleFilter) && isMjpegEncoder)
                 {
-                    hwScaleFilter += ":out_range=pc";
+                    hwScaleFilter += (doVppFullRangeOut && !doOclTonemap) ? ":out_range=pc" : string.Empty;
+                    hwScaleFilter += doVppScaleModeHq ? ":scale_mode=hq" : string.Empty;
                 }
 
                 if (!string.IsNullOrEmpty(hwScaleFilter) && doVppTonemap)
@@ -4407,6 +4410,8 @@ namespace MediaBrowser.Controller.MediaEncoding
                 var isRext = IsVideoStreamHevcRext(state);
                 var doVppFullRangeOut = isMjpegEncoder
                     && _mediaEncoder.EncoderVersion >= _minFFmpegQsvVppOutRangeOption;
+                var doVppScaleModeHq = isMjpegEncoder
+                    && _mediaEncoder.EncoderVersion >= _minFFmpegQsvVppScaleModeOption;
 
                 // INPUT vaapi/qsv surface(vram)
                 // hw deint
@@ -4424,7 +4429,7 @@ namespace MediaBrowser.Controller.MediaEncoding
 
                 var outFormat = doTonemap ? (((isQsvDecoder && doVppTranspose) || isRext) ? "p010" : string.Empty) : "nv12";
                 var swapOutputWandH = isQsvDecoder && doVppTranspose && swapWAndH;
-                var hwScalePrefix = (isQsvDecoder && (doVppTranspose || doVppFullRangeOut)) ? "vpp" : "scale";
+                var hwScalePrefix = isQsvDecoder ? "vpp" : "scale";
                 var hwScaleFilter = GetHwScaleFilter(hwScalePrefix, hwFilterSuffix, outFormat, swapOutputWandH, swpInW, swpInH, reqW, reqH, reqMaxW, reqMaxH);
 
                 if (!string.IsNullOrEmpty(hwScaleFilter) && isQsvDecoder && doVppTranspose)
@@ -4432,12 +4437,10 @@ namespace MediaBrowser.Controller.MediaEncoding
                     hwScaleFilter += $":transpose={tranposeDir}";
                 }
 
-                if (!string.IsNullOrEmpty(hwScaleFilter)
-                    && !doOclTonemap
-                    && ((isVaapiDecoder && isMjpegEncoder)
-                         || (isQsvDecoder && doVppFullRangeOut)))
+                if (!string.IsNullOrEmpty(hwScaleFilter) && isMjpegEncoder)
                 {
-                    hwScaleFilter += ":out_range=pc";
+                    hwScaleFilter += ((isQsvDecoder && !doVppFullRangeOut) || doOclTonemap) ? string.Empty : ":out_range=pc";
+                    hwScaleFilter += isQsvDecoder ? (doVppScaleModeHq ? ":scale_mode=hq" : string.Empty) : ":mode=hq";
                 }
 
                 // allocate extra pool sizes for vaapi vpp scale
@@ -4747,9 +4750,10 @@ namespace MediaBrowser.Controller.MediaEncoding
                 var outFormat = doTonemap ? (isRext ? "p010" : string.Empty) : "nv12";
                 var hwScaleFilter = GetHwScaleFilter("scale", "vaapi", outFormat, false, swpInW, swpInH, reqW, reqH, reqMaxW, reqMaxH);
 
-                if (!string.IsNullOrEmpty(hwScaleFilter) && isMjpegEncoder && !doOclTonemap)
+                if (!string.IsNullOrEmpty(hwScaleFilter) && isMjpegEncoder)
                 {
-                    hwScaleFilter += ":out_range=pc";
+                    hwScaleFilter += doOclTonemap ? string.Empty : ":out_range=pc";
+                    hwScaleFilter += ":mode=hq";
                 }
 
                 // allocate extra pool sizes for vaapi vpp
@@ -5001,7 +5005,7 @@ namespace MediaBrowser.Controller.MediaEncoding
 
                     if (!string.IsNullOrEmpty(hwScaleFilter) && isMjpegEncoder && !doVkTonemap)
                     {
-                        hwScaleFilter += ":out_range=pc";
+                        hwScaleFilter += ":out_range=pc:mode=hq";
                     }
 
                     mainFilters.Add(hwScaleFilter);
@@ -5201,9 +5205,10 @@ namespace MediaBrowser.Controller.MediaEncoding
                 outFormat = doOclTonemap ? string.Empty : "nv12";
                 var hwScaleFilter = GetHwScaleFilter("scale", "vaapi", outFormat, false, inW, inH, reqW, reqH, reqMaxW, reqMaxH);
 
-                if (!string.IsNullOrEmpty(hwScaleFilter) && isMjpegEncoder && !doOclTonemap)
+                if (!string.IsNullOrEmpty(hwScaleFilter) && isMjpegEncoder)
                 {
-                    hwScaleFilter += ":out_range=pc";
+                    hwScaleFilter += doOclTonemap ? string.Empty : ":out_range=pc";
+                    hwScaleFilter += ":mode=hq";
                 }
 
                 // allocate extra pool sizes for vaapi vpp
-- 
cgit v1.2.3


From 431770255914161ad6a71b93eea2473d18a1daf2 Mon Sep 17 00:00:00 2001
From: Nyanmisaka <nst799610810@gmail.com>
Date: Tue, 1 Oct 2024 13:02:01 +0000
Subject: Fix RKMPP-DRM-OpenCL mapping (#12758)

---
 MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'MediaBrowser.Controller')

diff --git a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
index c90704c5e..a29d41426 100644
--- a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
+++ b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
@@ -5674,7 +5674,7 @@ namespace MediaBrowser.Controller.MediaEncoding
             if (doOclTonemap && isRkmppDecoder)
             {
                 // map from rkmpp/drm to opencl via drm-opencl interop.
-                mainFilters.Add("hwmap=derive_device=opencl:mode=read");
+                mainFilters.Add("hwmap=derive_device=opencl");
             }
 
             // ocl tonemap
@@ -5717,7 +5717,7 @@ namespace MediaBrowser.Controller.MediaEncoding
                 {
                     // OUTPUT drm(nv12) surface(gem/dma-heap)
                     // reverse-mapping via drm-opencl interop.
-                    mainFilters.Add("hwmap=derive_device=rkmpp:mode=write:reverse=1");
+                    mainFilters.Add("hwmap=derive_device=rkmpp:reverse=1");
                     mainFilters.Add("format=drm_prime");
                 }
             }
-- 
cgit v1.2.3


From 368edeb8ad23f85c5146daae2d7059acde69bb74 Mon Sep 17 00:00:00 2001
From: Nyanmisaka <nst799610810@gmail.com>
Date: Wed, 2 Oct 2024 16:34:40 +0000
Subject: Fix full range in SW decoder & HW encoder for Trickplay (#12763)

---
 .../MediaEncoding/EncodingHelper.cs                | 30 ++++++++++++++++++++++
 1 file changed, 30 insertions(+)

(limited to 'MediaBrowser.Controller')

diff --git a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
index a29d41426..ae33da1fb 100644
--- a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
+++ b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
@@ -4126,6 +4126,12 @@ namespace MediaBrowser.Controller.MediaEncoding
 
                 var outFormat = doOclTonemap ? "yuv420p10le" : (hasGraphicalSubs ? "yuv420p" : "nv12");
                 var swScaleFilter = GetSwScaleFilter(state, options, vidEncoder, swpInW, swpInH, threeDFormat, reqW, reqH, reqMaxW, reqMaxH);
+                if (isMjpegEncoder && !doOclTonemap)
+                {
+                    // sw decoder + hw mjpeg encoder
+                    swScaleFilter = string.IsNullOrEmpty(swScaleFilter) ? "scale=out_range=pc" : $"{swScaleFilter}:out_range=pc";
+                }
+
                 // sw scale
                 mainFilters.Add(swScaleFilter);
                 mainFilters.Add($"format={outFormat}");
@@ -4392,6 +4398,12 @@ namespace MediaBrowser.Controller.MediaEncoding
 
                 var outFormat = doOclTonemap ? "yuv420p10le" : (hasGraphicalSubs ? "yuv420p" : "nv12");
                 var swScaleFilter = GetSwScaleFilter(state, options, vidEncoder, swpInW, swpInH, threeDFormat, reqW, reqH, reqMaxW, reqMaxH);
+                if (isMjpegEncoder && !doOclTonemap)
+                {
+                    // sw decoder + hw mjpeg encoder
+                    swScaleFilter = string.IsNullOrEmpty(swScaleFilter) ? "scale=out_range=pc" : $"{swScaleFilter}:out_range=pc";
+                }
+
                 // sw scale
                 mainFilters.Add(swScaleFilter);
                 mainFilters.Add($"format={outFormat}");
@@ -4717,6 +4729,12 @@ namespace MediaBrowser.Controller.MediaEncoding
 
                 var outFormat = doOclTonemap ? "yuv420p10le" : "nv12";
                 var swScaleFilter = GetSwScaleFilter(state, options, vidEncoder, swpInW, swpInH, threeDFormat, reqW, reqH, reqMaxW, reqMaxH);
+                if (isMjpegEncoder && !doOclTonemap)
+                {
+                    // sw decoder + hw mjpeg encoder
+                    swScaleFilter = string.IsNullOrEmpty(swScaleFilter) ? "scale=out_range=pc" : $"{swScaleFilter}:out_range=pc";
+                }
+
                 // sw scale
                 mainFilters.Add(swScaleFilter);
                 mainFilters.Add($"format={outFormat}");
@@ -5180,6 +5198,12 @@ namespace MediaBrowser.Controller.MediaEncoding
 
                 outFormat = doOclTonemap ? "yuv420p10le" : "nv12";
                 var swScaleFilter = GetSwScaleFilter(state, options, vidEncoder, swpInW, swpInH, threeDFormat, reqW, reqH, reqMaxW, reqMaxH);
+                if (isMjpegEncoder && !doOclTonemap)
+                {
+                    // sw decoder + hw mjpeg encoder
+                    swScaleFilter = string.IsNullOrEmpty(swScaleFilter) ? "scale=out_range=pc" : $"{swScaleFilter}:out_range=pc";
+                }
+
                 // sw scale
                 mainFilters.Add(swScaleFilter);
                 mainFilters.Add("format=" + outFormat);
@@ -5614,6 +5638,12 @@ namespace MediaBrowser.Controller.MediaEncoding
 
                 var outFormat = doOclTonemap ? "yuv420p10le" : (hasGraphicalSubs ? "yuv420p" : "nv12");
                 var swScaleFilter = GetSwScaleFilter(state, options, vidEncoder, swpInW, swpInH, threeDFormat, reqW, reqH, reqMaxW, reqMaxH);
+                if (isMjpegEncoder && !doOclTonemap)
+                {
+                    // sw decoder + hw mjpeg encoder
+                    swScaleFilter = string.IsNullOrEmpty(swScaleFilter) ? "scale=out_range=pc" : $"{swScaleFilter}:out_range=pc";
+                }
+
                 if (!string.IsNullOrEmpty(swScaleFilter))
                 {
                     swScaleFilter += ":flags=fast_bilinear";
-- 
cgit v1.2.3


From b496f979f02c6b65a2a6f1887558d8cbd9d8d7b6 Mon Sep 17 00:00:00 2001
From: Nyanmisaka <nst799610810@gmail.com>
Date: Thu, 3 Oct 2024 14:18:40 +0000
Subject: Clean up deprecated -vsync option (#12765)

---
 Jellyfin.Api/Controllers/DynamicHlsController.cs   |  2 +-
 .../MediaEncoding/EncodingHelper.cs                | 32 ++++++++++++++++++++--
 MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs |  2 +-
 src/Jellyfin.LiveTv/IO/EncodedRecorder.cs          |  4 +--
 4 files changed, 34 insertions(+), 6 deletions(-)

(limited to 'MediaBrowser.Controller')

diff --git a/Jellyfin.Api/Controllers/DynamicHlsController.cs b/Jellyfin.Api/Controllers/DynamicHlsController.cs
index 48fda471a..54e0527c9 100644
--- a/Jellyfin.Api/Controllers/DynamicHlsController.cs
+++ b/Jellyfin.Api/Controllers/DynamicHlsController.cs
@@ -1908,7 +1908,7 @@ public class DynamicHlsController : BaseJellyfinApiController
 
         if (!string.IsNullOrEmpty(state.OutputVideoSync))
         {
-            args += " -vsync " + state.OutputVideoSync;
+            args += EncodingHelper.GetVideoSyncOption(state.OutputVideoSync, _mediaEncoder.EncoderVersion);
         }
 
         args += _encodingHelper.GetOutputFFlags(state);
diff --git a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
index ae33da1fb..c120e08fa 100644
--- a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
+++ b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
@@ -6857,7 +6857,7 @@ namespace MediaBrowser.Controller.MediaEncoding
 
             if (!string.IsNullOrEmpty(state.InputVideoSync))
             {
-                inputModifier += " -vsync " + state.InputVideoSync;
+                inputModifier += GetVideoSyncOption(state.InputVideoSync, _mediaEncoder.EncoderVersion);
             }
 
             if (state.ReadInputAtNativeFramerate && state.InputProtocol != MediaProtocol.Rtsp)
@@ -7280,7 +7280,7 @@ namespace MediaBrowser.Controller.MediaEncoding
 
             if (!string.IsNullOrEmpty(state.OutputVideoSync))
             {
-                args += " -vsync " + state.OutputVideoSync;
+                args += GetVideoSyncOption(state.OutputVideoSync, _mediaEncoder.EncoderVersion);
             }
 
             args += GetOutputFFlags(state);
@@ -7453,5 +7453,33 @@ namespace MediaBrowser.Controller.MediaEncoding
             return state.SubtitleDeliveryMethod == SubtitleDeliveryMethod.Encode
                    || (state.BaseRequest.AlwaysBurnInSubtitleWhenTranscoding && !IsCopyCodec(state.OutputVideoCodec));
         }
+
+        public static string GetVideoSyncOption(string videoSync, Version encoderVersion)
+        {
+            if (string.IsNullOrEmpty(videoSync))
+            {
+                return string.Empty;
+            }
+
+            if (encoderVersion >= new Version(5, 1))
+            {
+                if (int.TryParse(videoSync, CultureInfo.InvariantCulture, out var vsync))
+                {
+                    return vsync switch
+                    {
+                        -1 => " -fps_mode auto",
+                        0 => " -fps_mode passthrough",
+                        1 => " -fps_mode cfr",
+                        2 => " -fps_mode vfr",
+                        _ => string.Empty
+                    };
+                }
+
+                return string.Empty;
+            }
+
+            // -vsync is deprecated in FFmpeg 5.1 and will be removed in the future.
+            return $" -vsync {videoSync}";
+        }
     }
 }
diff --git a/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs b/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
index ace8bda19..ec0401576 100644
--- a/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
+++ b/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
@@ -945,7 +945,7 @@ namespace MediaBrowser.MediaEncoding.Encoder
                 vidEncoder,
                 encoderQualityOption + encoderQuality + " ",
                 vidEncoder.Contains("videotoolbox", StringComparison.InvariantCultureIgnoreCase) ? "-allow_sw 1 " : string.Empty, // allow_sw fallback for some intel macs
-                EncoderVersion >= new Version(5, 1) ? "-fps_mode passthrough " : "-vsync passthrough ", // passthrough timestamp
+                EncodingHelper.GetVideoSyncOption("0", EncoderVersion).Trim() + " ", // passthrough timestamp
                 "image2",
                 outputPath);
 
diff --git a/src/Jellyfin.LiveTv/IO/EncodedRecorder.cs b/src/Jellyfin.LiveTv/IO/EncodedRecorder.cs
index ff00c8999..0c660637f 100644
--- a/src/Jellyfin.LiveTv/IO/EncodedRecorder.cs
+++ b/src/Jellyfin.LiveTv/IO/EncodedRecorder.cs
@@ -130,7 +130,7 @@ namespace Jellyfin.LiveTv.IO
                 const int MaxBitrate = 25000000;
                 videoArgs = string.Format(
                     CultureInfo.InvariantCulture,
-                    "-codec:v:0 libx264 -force_key_frames \"expr:gte(t,n_forced*5)\" {0} -pix_fmt yuv420p -preset superfast -crf 23 -b:v {1} -maxrate {1} -bufsize ({1}*2) -vsync -1 -profile:v high -level 41",
+                    "-codec:v:0 libx264 -force_key_frames \"expr:gte(t,n_forced*5)\" {0} -pix_fmt yuv420p -preset superfast -crf 23 -b:v {1} -maxrate {1} -bufsize ({1}*2) -profile:v high -level 41",
                     GetOutputSizeParam(),
                     MaxBitrate);
             }
@@ -157,7 +157,7 @@ namespace Jellyfin.LiveTv.IO
                 flags.Add("+genpts");
             }
 
-            var inputModifier = "-async 1 -vsync -1";
+            var inputModifier = "-async 1";
 
             if (flags.Count > 0)
             {
-- 
cgit v1.2.3


From 6c819fe516ba742f1dcc77d61f6eedbe987cd692 Mon Sep 17 00:00:00 2001
From: JPVenson <6794763+JPVenson@users.noreply.github.com>
Date: Tue, 8 Oct 2024 12:27:27 +0000
Subject: WIP BaseItem search refactoring

---
 .../Data/SqliteItemRepository.cs                   | 1211 +----------------
 Jellyfin.Data/Entities/BaseItem.cs                 |    6 +
 Jellyfin.Data/Entities/People.cs                   |    1 +
 .../Item/BaseItemManager.cs                        | 1364 +++++++++++++++++++-
 .../Item/ChapterManager.cs                         |   58 +-
 MediaBrowser.Controller/Chapters/ChapterManager.cs |   24 +
 .../Chapters/IChapterManager.cs                    |   16 +
 .../Persistence/IItemRepository.cs                 |   22 -
 MediaBrowser.Providers/Chapters/ChapterManager.cs  |   26 -
 .../MediaBrowser.Providers.csproj                  |    2 +-
 10 files changed, 1444 insertions(+), 1286 deletions(-)
 create mode 100644 MediaBrowser.Controller/Chapters/ChapterManager.cs
 delete mode 100644 MediaBrowser.Providers/Chapters/ChapterManager.cs

(limited to 'MediaBrowser.Controller')

diff --git a/Emby.Server.Implementations/Data/SqliteItemRepository.cs b/Emby.Server.Implementations/Data/SqliteItemRepository.cs
index a2aeaf0fc..94a5eba81 100644
--- a/Emby.Server.Implementations/Data/SqliteItemRepository.cs
+++ b/Emby.Server.Implementations/Data/SqliteItemRepository.cs
@@ -59,119 +59,6 @@ namespace Emby.Server.Implementations.Data
         private readonly TypeMapper _typeMapper;
         private readonly JsonSerializerOptions _jsonOptions;
 
-        private readonly ItemFields[] _allItemFields = Enum.GetValues<ItemFields>();
-
-        private static readonly string _mediaStreamSaveColumnsInsertQuery =
-            $"insert into mediastreams ({string.Join(',', _mediaStreamSaveColumns)}) values ";
-
-        private static readonly string _mediaStreamSaveColumnsSelectQuery =
-            $"select {string.Join(',', _mediaStreamSaveColumns)} from mediastreams where ItemId=@ItemId";
-
-        private static readonly string[] _mediaAttachmentSaveColumns =
-        {
-            "ItemId",
-            "AttachmentIndex",
-            "Codec",
-            "CodecTag",
-            "Comment",
-            "Filename",
-            "MIMEType"
-        };
-
-        private static readonly string _mediaAttachmentSaveColumnsSelectQuery =
-            $"select {string.Join(',', _mediaAttachmentSaveColumns)} from mediaattachments where ItemId=@ItemId";
-
-        private static readonly string _mediaAttachmentInsertPrefix = BuildMediaAttachmentInsertPrefix();
-
-        private static readonly BaseItemKind[] _programTypes = new[]
-        {
-            BaseItemKind.Program,
-            BaseItemKind.TvChannel,
-            BaseItemKind.LiveTvProgram,
-            BaseItemKind.LiveTvChannel
-        };
-
-        private static readonly BaseItemKind[] _programExcludeParentTypes = new[]
-        {
-            BaseItemKind.Series,
-            BaseItemKind.Season,
-            BaseItemKind.MusicAlbum,
-            BaseItemKind.MusicArtist,
-            BaseItemKind.PhotoAlbum
-        };
-
-        private static readonly BaseItemKind[] _serviceTypes = new[]
-        {
-            BaseItemKind.TvChannel,
-            BaseItemKind.LiveTvChannel
-        };
-
-        private static readonly BaseItemKind[] _startDateTypes = new[]
-        {
-            BaseItemKind.Program,
-            BaseItemKind.LiveTvProgram
-        };
-
-        private static readonly BaseItemKind[] _seriesTypes = new[]
-        {
-            BaseItemKind.Book,
-            BaseItemKind.AudioBook,
-            BaseItemKind.Episode,
-            BaseItemKind.Season
-        };
-
-        private static readonly BaseItemKind[] _artistExcludeParentTypes = new[]
-        {
-            BaseItemKind.Series,
-            BaseItemKind.Season,
-            BaseItemKind.PhotoAlbum
-        };
-
-        private static readonly BaseItemKind[] _artistsTypes = new[]
-        {
-            BaseItemKind.Audio,
-            BaseItemKind.MusicAlbum,
-            BaseItemKind.MusicVideo,
-            BaseItemKind.AudioBook
-        };
-
-        private static readonly Dictionary<BaseItemKind, string> _baseItemKindNames = new()
-        {
-            { BaseItemKind.AggregateFolder, typeof(AggregateFolder).FullName },
-            { BaseItemKind.Audio, typeof(Audio).FullName },
-            { BaseItemKind.AudioBook, typeof(AudioBook).FullName },
-            { BaseItemKind.BasePluginFolder, typeof(BasePluginFolder).FullName },
-            { BaseItemKind.Book, typeof(Book).FullName },
-            { BaseItemKind.BoxSet, typeof(BoxSet).FullName },
-            { BaseItemKind.Channel, typeof(Channel).FullName },
-            { BaseItemKind.CollectionFolder, typeof(CollectionFolder).FullName },
-            { BaseItemKind.Episode, typeof(Episode).FullName },
-            { BaseItemKind.Folder, typeof(Folder).FullName },
-            { BaseItemKind.Genre, typeof(Genre).FullName },
-            { BaseItemKind.Movie, typeof(Movie).FullName },
-            { BaseItemKind.LiveTvChannel, typeof(LiveTvChannel).FullName },
-            { BaseItemKind.LiveTvProgram, typeof(LiveTvProgram).FullName },
-            { BaseItemKind.MusicAlbum, typeof(MusicAlbum).FullName },
-            { BaseItemKind.MusicArtist, typeof(MusicArtist).FullName },
-            { BaseItemKind.MusicGenre, typeof(MusicGenre).FullName },
-            { BaseItemKind.MusicVideo, typeof(MusicVideo).FullName },
-            { BaseItemKind.Person, typeof(Person).FullName },
-            { BaseItemKind.Photo, typeof(Photo).FullName },
-            { BaseItemKind.PhotoAlbum, typeof(PhotoAlbum).FullName },
-            { BaseItemKind.Playlist, typeof(Playlist).FullName },
-            { BaseItemKind.PlaylistsFolder, typeof(PlaylistsFolder).FullName },
-            { BaseItemKind.Season, typeof(Season).FullName },
-            { BaseItemKind.Series, typeof(Series).FullName },
-            { BaseItemKind.Studio, typeof(Studio).FullName },
-            { BaseItemKind.Trailer, typeof(Trailer).FullName },
-            { BaseItemKind.TvChannel, typeof(LiveTvChannel).FullName },
-            { BaseItemKind.TvProgram, typeof(LiveTvProgram).FullName },
-            { BaseItemKind.UserRootFolder, typeof(UserRootFolder).FullName },
-            { BaseItemKind.UserView, typeof(UserView).FullName },
-            { BaseItemKind.Video, typeof(Video).FullName },
-            { BaseItemKind.Year, typeof(Year).FullName }
-        };
-
         /// <summary>
         /// Initializes a new instance of the <see cref="SqliteItemRepository"/> class.
         /// </summary>
@@ -210,957 +97,15 @@ namespace Emby.Server.Implementations.Data
         /// <inheritdoc />
         protected override TempStoreMode TempStore => TempStoreMode.Memory;
 
-        /// <summary>
-        /// Opens the connection to the database.
-        /// </summary>
-        public override void Initialize()
-        {
-            base.Initialize();
-
-            const string CreateMediaStreamsTableCommand
-                    = "create table if not exists mediastreams (ItemId GUID, StreamIndex INT, StreamType TEXT, Codec TEXT, Language TEXT, ChannelLayout TEXT, Profile TEXT, AspectRatio TEXT, Path TEXT, IsInterlaced BIT, BitRate INT NULL, Channels INT NULL, SampleRate INT NULL, IsDefault BIT, IsForced BIT, IsExternal BIT, Height INT NULL, Width INT NULL, AverageFrameRate FLOAT NULL, RealFrameRate FLOAT NULL, Level FLOAT NULL, PixelFormat TEXT, BitDepth INT NULL, IsAnamorphic BIT NULL, RefFrames INT NULL, CodecTag TEXT NULL, Comment TEXT NULL, NalLengthSize TEXT NULL, IsAvc BIT NULL, Title TEXT NULL, TimeBase TEXT NULL, CodecTimeBase TEXT NULL, ColorPrimaries TEXT NULL, ColorSpace TEXT NULL, ColorTransfer TEXT NULL, DvVersionMajor INT NULL, DvVersionMinor INT NULL, DvProfile INT NULL, DvLevel INT NULL, RpuPresentFlag INT NULL, ElPresentFlag INT NULL, BlPresentFlag INT NULL, DvBlSignalCompatibilityId INT NULL, IsHearingImpaired BIT NULL, Rotation INT NULL, PRIMARY KEY (ItemId, StreamIndex))";
-
-            const string CreateMediaAttachmentsTableCommand
-                    = "create table if not exists mediaattachments (ItemId GUID, AttachmentIndex INT, Codec TEXT, CodecTag TEXT NULL, Comment TEXT NULL, Filename TEXT NULL, MIMEType TEXT NULL, PRIMARY KEY (ItemId, AttachmentIndex))";
-
-            string[] queries =
-            {
-                "create table if not exists TypedBaseItems (guid GUID primary key NOT NULL, type TEXT NOT NULL, data BLOB NULL, ParentId GUID NULL, Path TEXT NULL)",
-
-                "create table if not exists AncestorIds (ItemId GUID NOT NULL, AncestorId GUID NOT NULL, AncestorIdText TEXT NOT NULL, PRIMARY KEY (ItemId, AncestorId))",
-                "create index if not exists idx_AncestorIds1 on AncestorIds(AncestorId)",
-                "create index if not exists idx_AncestorIds5 on AncestorIds(AncestorIdText,ItemId)",
-
-                "create table if not exists ItemValues (ItemId GUID NOT NULL, Type INT NOT NULL, Value TEXT NOT NULL, CleanValue TEXT NOT NULL)",
-
-                "create table if not exists People (ItemId GUID, Name TEXT NOT NULL, Role TEXT, PersonType TEXT, SortOrder int, ListOrder int)",
-
-                "drop index if exists idxPeopleItemId",
-                "create index if not exists idxPeopleItemId1 on People(ItemId,ListOrder)",
-                "create index if not exists idxPeopleName on People(Name)",
-
-                "create table if not exists " + ChaptersTableName + " (ItemId GUID, ChapterIndex INT NOT NULL, StartPositionTicks BIGINT NOT NULL, Name TEXT, ImagePath TEXT, PRIMARY KEY (ItemId, ChapterIndex))",
-
-                CreateMediaStreamsTableCommand,
-                CreateMediaAttachmentsTableCommand,
-
-                "pragma shrink_memory"
-            };
-
-            string[] postQueries =
-            {
-                "create index if not exists idx_PathTypedBaseItems on TypedBaseItems(Path)",
-                "create index if not exists idx_ParentIdTypedBaseItems on TypedBaseItems(ParentId)",
-
-                "create index if not exists idx_PresentationUniqueKey on TypedBaseItems(PresentationUniqueKey)",
-                "create index if not exists idx_GuidTypeIsFolderIsVirtualItem on TypedBaseItems(Guid,Type,IsFolder,IsVirtualItem)",
-                "create index if not exists idx_CleanNameType on TypedBaseItems(CleanName,Type)",
-
-                // covering index
-                "create index if not exists idx_TopParentIdGuid on TypedBaseItems(TopParentId,Guid)",
-
-                // series
-                "create index if not exists idx_TypeSeriesPresentationUniqueKey1 on TypedBaseItems(Type,SeriesPresentationUniqueKey,PresentationUniqueKey,SortName)",
-
-                // series counts
-                // seriesdateplayed sort order
-                "create index if not exists idx_TypeSeriesPresentationUniqueKey3 on TypedBaseItems(SeriesPresentationUniqueKey,Type,IsFolder,IsVirtualItem)",
-
-                // live tv programs
-                "create index if not exists idx_TypeTopParentIdStartDate on TypedBaseItems(Type,TopParentId,StartDate)",
-
-                // covering index for getitemvalues
-                "create index if not exists idx_TypeTopParentIdGuid on TypedBaseItems(Type,TopParentId,Guid)",
-
-                // used by movie suggestions
-                "create index if not exists idx_TypeTopParentIdGroup on TypedBaseItems(Type,TopParentId,PresentationUniqueKey)",
-                "create index if not exists idx_TypeTopParentId5 on TypedBaseItems(TopParentId,IsVirtualItem)",
-
-                // latest items
-                "create index if not exists idx_TypeTopParentId9 on TypedBaseItems(TopParentId,Type,IsVirtualItem,PresentationUniqueKey,DateCreated)",
-                "create index if not exists idx_TypeTopParentId8 on TypedBaseItems(TopParentId,IsFolder,IsVirtualItem,PresentationUniqueKey,DateCreated)",
-
-                // resume
-                "create index if not exists idx_TypeTopParentId7 on TypedBaseItems(TopParentId,MediaType,IsVirtualItem,PresentationUniqueKey)",
-
-                // items by name
-                "create index if not exists idx_ItemValues6 on ItemValues(ItemId,Type,CleanValue)",
-                "create index if not exists idx_ItemValues7 on ItemValues(Type,CleanValue,ItemId)",
-
-                // Used to update inherited tags
-                "create index if not exists idx_ItemValues8 on ItemValues(Type, ItemId, Value)",
-
-                "CREATE INDEX IF NOT EXISTS idx_TypedBaseItemsUserDataKeyType ON TypedBaseItems(UserDataKey, Type)",
-                "CREATE INDEX IF NOT EXISTS idx_PeopleNameListOrder ON People(Name, ListOrder)"
-            };
-
-            using (var connection = GetConnection())
-            using (var transaction = connection.BeginTransaction())
-            {
-                connection.Execute(string.Join(';', queries));
-
-                var existingColumnNames = GetColumnNames(connection, "AncestorIds");
-                AddColumn(connection, "AncestorIds", "AncestorIdText", "Text", existingColumnNames);
-
-                existingColumnNames = GetColumnNames(connection, "TypedBaseItems");
-
-                AddColumn(connection, "TypedBaseItems", "Path", "Text", existingColumnNames);
-                AddColumn(connection, "TypedBaseItems", "StartDate", "DATETIME", existingColumnNames);
-                AddColumn(connection, "TypedBaseItems", "EndDate", "DATETIME", existingColumnNames);
-                AddColumn(connection, "TypedBaseItems", "ChannelId", "Text", existingColumnNames);
-                AddColumn(connection, "TypedBaseItems", "IsMovie", "BIT", existingColumnNames);
-                AddColumn(connection, "TypedBaseItems", "CommunityRating", "Float", existingColumnNames);
-                AddColumn(connection, "TypedBaseItems", "CustomRating", "Text", existingColumnNames);
-                AddColumn(connection, "TypedBaseItems", "IndexNumber", "INT", existingColumnNames);
-                AddColumn(connection, "TypedBaseItems", "IsLocked", "BIT", existingColumnNames);
-                AddColumn(connection, "TypedBaseItems", "Name", "Text", existingColumnNames);
-                AddColumn(connection, "TypedBaseItems", "OfficialRating", "Text", existingColumnNames);
-                AddColumn(connection, "TypedBaseItems", "MediaType", "Text", existingColumnNames);
-                AddColumn(connection, "TypedBaseItems", "Overview", "Text", existingColumnNames);
-                AddColumn(connection, "TypedBaseItems", "ParentIndexNumber", "INT", existingColumnNames);
-                AddColumn(connection, "TypedBaseItems", "PremiereDate", "DATETIME", existingColumnNames);
-                AddColumn(connection, "TypedBaseItems", "ProductionYear", "INT", existingColumnNames);
-                AddColumn(connection, "TypedBaseItems", "ParentId", "GUID", existingColumnNames);
-                AddColumn(connection, "TypedBaseItems", "Genres", "Text", existingColumnNames);
-                AddColumn(connection, "TypedBaseItems", "SortName", "Text", existingColumnNames);
-                AddColumn(connection, "TypedBaseItems", "ForcedSortName", "Text", existingColumnNames);
-                AddColumn(connection, "TypedBaseItems", "RunTimeTicks", "BIGINT", existingColumnNames);
-                AddColumn(connection, "TypedBaseItems", "DateCreated", "DATETIME", existingColumnNames);
-                AddColumn(connection, "TypedBaseItems", "DateModified", "DATETIME", existingColumnNames);
-                AddColumn(connection, "TypedBaseItems", "IsSeries", "BIT", existingColumnNames);
-                AddColumn(connection, "TypedBaseItems", "EpisodeTitle", "Text", existingColumnNames);
-                AddColumn(connection, "TypedBaseItems", "IsRepeat", "BIT", existingColumnNames);
-                AddColumn(connection, "TypedBaseItems", "PreferredMetadataLanguage", "Text", existingColumnNames);
-                AddColumn(connection, "TypedBaseItems", "PreferredMetadataCountryCode", "Text", existingColumnNames);
-                AddColumn(connection, "TypedBaseItems", "DateLastRefreshed", "DATETIME", existingColumnNames);
-                AddColumn(connection, "TypedBaseItems", "DateLastSaved", "DATETIME", existingColumnNames);
-                AddColumn(connection, "TypedBaseItems", "IsInMixedFolder", "BIT", existingColumnNames);
-                AddColumn(connection, "TypedBaseItems", "LockedFields", "Text", existingColumnNames);
-                AddColumn(connection, "TypedBaseItems", "Studios", "Text", existingColumnNames);
-                AddColumn(connection, "TypedBaseItems", "Audio", "Text", existingColumnNames);
-                AddColumn(connection, "TypedBaseItems", "ExternalServiceId", "Text", existingColumnNames);
-                AddColumn(connection, "TypedBaseItems", "Tags", "Text", existingColumnNames);
-                AddColumn(connection, "TypedBaseItems", "IsFolder", "BIT", existingColumnNames);
-                AddColumn(connection, "TypedBaseItems", "InheritedParentalRatingValue", "INT", existingColumnNames);
-                AddColumn(connection, "TypedBaseItems", "UnratedType", "Text", existingColumnNames);
-                AddColumn(connection, "TypedBaseItems", "TopParentId", "Text", existingColumnNames);
-                AddColumn(connection, "TypedBaseItems", "TrailerTypes", "Text", existingColumnNames);
-                AddColumn(connection, "TypedBaseItems", "CriticRating", "Float", existingColumnNames);
-                AddColumn(connection, "TypedBaseItems", "CleanName", "Text", existingColumnNames);
-                AddColumn(connection, "TypedBaseItems", "PresentationUniqueKey", "Text", existingColumnNames);
-                AddColumn(connection, "TypedBaseItems", "OriginalTitle", "Text", existingColumnNames);
-                AddColumn(connection, "TypedBaseItems", "PrimaryVersionId", "Text", existingColumnNames);
-                AddColumn(connection, "TypedBaseItems", "DateLastMediaAdded", "DATETIME", existingColumnNames);
-                AddColumn(connection, "TypedBaseItems", "Album", "Text", existingColumnNames);
-                AddColumn(connection, "TypedBaseItems", "LUFS", "Float", existingColumnNames);
-                AddColumn(connection, "TypedBaseItems", "NormalizationGain", "Float", existingColumnNames);
-                AddColumn(connection, "TypedBaseItems", "IsVirtualItem", "BIT", existingColumnNames);
-                AddColumn(connection, "TypedBaseItems", "SeriesName", "Text", existingColumnNames);
-                AddColumn(connection, "TypedBaseItems", "UserDataKey", "Text", existingColumnNames);
-                AddColumn(connection, "TypedBaseItems", "SeasonName", "Text", existingColumnNames);
-                AddColumn(connection, "TypedBaseItems", "SeasonId", "GUID", existingColumnNames);
-                AddColumn(connection, "TypedBaseItems", "SeriesId", "GUID", existingColumnNames);
-                AddColumn(connection, "TypedBaseItems", "ExternalSeriesId", "Text", existingColumnNames);
-                AddColumn(connection, "TypedBaseItems", "Tagline", "Text", existingColumnNames);
-                AddColumn(connection, "TypedBaseItems", "ProviderIds", "Text", existingColumnNames);
-                AddColumn(connection, "TypedBaseItems", "Images", "Text", existingColumnNames);
-                AddColumn(connection, "TypedBaseItems", "ProductionLocations", "Text", existingColumnNames);
-                AddColumn(connection, "TypedBaseItems", "ExtraIds", "Text", existingColumnNames);
-                AddColumn(connection, "TypedBaseItems", "TotalBitrate", "INT", existingColumnNames);
-                AddColumn(connection, "TypedBaseItems", "ExtraType", "Text", existingColumnNames);
-                AddColumn(connection, "TypedBaseItems", "Artists", "Text", existingColumnNames);
-                AddColumn(connection, "TypedBaseItems", "AlbumArtists", "Text", existingColumnNames);
-                AddColumn(connection, "TypedBaseItems", "ExternalId", "Text", existingColumnNames);
-                AddColumn(connection, "TypedBaseItems", "SeriesPresentationUniqueKey", "Text", existingColumnNames);
-                AddColumn(connection, "TypedBaseItems", "ShowId", "Text", existingColumnNames);
-                AddColumn(connection, "TypedBaseItems", "OwnerId", "Text", existingColumnNames);
-                AddColumn(connection, "TypedBaseItems", "Width", "INT", existingColumnNames);
-                AddColumn(connection, "TypedBaseItems", "Height", "INT", existingColumnNames);
-                AddColumn(connection, "TypedBaseItems", "Size", "BIGINT", existingColumnNames);
-
-                existingColumnNames = GetColumnNames(connection, "ItemValues");
-                AddColumn(connection, "ItemValues", "CleanValue", "Text", existingColumnNames);
-
-                existingColumnNames = GetColumnNames(connection, ChaptersTableName);
-                AddColumn(connection, ChaptersTableName, "ImageDateModified", "DATETIME", existingColumnNames);
-
-                existingColumnNames = GetColumnNames(connection, "MediaStreams");
-                AddColumn(connection, "MediaStreams", "IsAvc", "BIT", existingColumnNames);
-                AddColumn(connection, "MediaStreams", "TimeBase", "TEXT", existingColumnNames);
-                AddColumn(connection, "MediaStreams", "CodecTimeBase", "TEXT", existingColumnNames);
-                AddColumn(connection, "MediaStreams", "Title", "TEXT", existingColumnNames);
-                AddColumn(connection, "MediaStreams", "NalLengthSize", "TEXT", existingColumnNames);
-                AddColumn(connection, "MediaStreams", "Comment", "TEXT", existingColumnNames);
-                AddColumn(connection, "MediaStreams", "CodecTag", "TEXT", existingColumnNames);
-                AddColumn(connection, "MediaStreams", "PixelFormat", "TEXT", existingColumnNames);
-                AddColumn(connection, "MediaStreams", "BitDepth", "INT", existingColumnNames);
-                AddColumn(connection, "MediaStreams", "RefFrames", "INT", existingColumnNames);
-                AddColumn(connection, "MediaStreams", "KeyFrames", "TEXT", existingColumnNames);
-                AddColumn(connection, "MediaStreams", "IsAnamorphic", "BIT", existingColumnNames);
-
-                AddColumn(connection, "MediaStreams", "ColorPrimaries", "TEXT", existingColumnNames);
-                AddColumn(connection, "MediaStreams", "ColorSpace", "TEXT", existingColumnNames);
-                AddColumn(connection, "MediaStreams", "ColorTransfer", "TEXT", existingColumnNames);
-
-                AddColumn(connection, "MediaStreams", "DvVersionMajor", "INT", existingColumnNames);
-                AddColumn(connection, "MediaStreams", "DvVersionMinor", "INT", existingColumnNames);
-                AddColumn(connection, "MediaStreams", "DvProfile", "INT", existingColumnNames);
-                AddColumn(connection, "MediaStreams", "DvLevel", "INT", existingColumnNames);
-                AddColumn(connection, "MediaStreams", "RpuPresentFlag", "INT", existingColumnNames);
-                AddColumn(connection, "MediaStreams", "ElPresentFlag", "INT", existingColumnNames);
-                AddColumn(connection, "MediaStreams", "BlPresentFlag", "INT", existingColumnNames);
-                AddColumn(connection, "MediaStreams", "DvBlSignalCompatibilityId", "INT", existingColumnNames);
-
-                AddColumn(connection, "MediaStreams", "IsHearingImpaired", "BIT", existingColumnNames);
-
-                AddColumn(connection, "MediaStreams", "Rotation", "INT", existingColumnNames);
-
-                connection.Execute(string.Join(';', postQueries));
-
-                transaction.Commit();
-            }
-        }
-
-        /// <inheritdoc />
-        public void SaveImages(BaseItem item)
-        {
-            ArgumentNullException.ThrowIfNull(item);
-
-            CheckDisposed();
-
-            var images = SerializeImages(item.ImageInfos);
-            using var connection = GetConnection();
-            using var transaction = connection.BeginTransaction();
-            using var saveImagesStatement = PrepareStatement(connection, "Update TypedBaseItems set Images=@Images where guid=@Id");
-            saveImagesStatement.TryBind("@Id", item.Id);
-            saveImagesStatement.TryBind("@Images", images);
-
-            saveImagesStatement.ExecuteNonQuery();
-            transaction.Commit();
-        }
-
-        /// <summary>
-        /// Saves the items.
-        /// </summary>
-        /// <param name="items">The items.</param>
-        /// <param name="cancellationToken">The cancellation token.</param>
-        /// <exception cref="ArgumentNullException">
-        /// <paramref name="items"/> or <paramref name="cancellationToken"/> is <c>null</c>.
-        /// </exception>
-        public void SaveItems(IReadOnlyList<BaseItem> items, CancellationToken cancellationToken)
-        {
-            ArgumentNullException.ThrowIfNull(items);
-
-            cancellationToken.ThrowIfCancellationRequested();
-
-            CheckDisposed();
-
-            var itemsLen = items.Count;
-            var tuples = new ValueTuple<BaseItem, List<Guid>, BaseItem, string, List<string>>[itemsLen];
-            for (int i = 0; i < itemsLen; i++)
-            {
-                var item = items[i];
-                var ancestorIds = item.SupportsAncestors ?
-                    item.GetAncestorIds().Distinct().ToList() :
-                    null;
-
-                var topParent = item.GetTopParent();
-
-                var userdataKey = item.GetUserDataKeys().FirstOrDefault();
-                var inheritedTags = item.GetInheritedTags();
-
-                tuples[i] = (item, ancestorIds, topParent, userdataKey, inheritedTags);
-            }
-
-            using var connection = GetConnection();
-            using var transaction = connection.BeginTransaction();
-            SaveItemsInTransaction(connection, tuples);
-            transaction.Commit();
-        }
 
-        private void SaveItemsInTransaction(ManagedConnection db, IEnumerable<(BaseItem Item, List<Guid> AncestorIds, BaseItem TopParent, string UserDataKey, List<string> InheritedTags)> tuples)
+        private bool TypeRequiresDeserialization(Type type)
         {
-            using (var saveItemStatement = PrepareStatement(db, SaveItemCommandText))
-            using (var deleteAncestorsStatement = PrepareStatement(db, "delete from AncestorIds where ItemId=@ItemId"))
+            if (_config.Configuration.SkipDeserializationForBasicTypes)
             {
-                var requiresReset = false;
-                foreach (var tuple in tuples)
+                if (type == typeof(Channel)
+                    || type == typeof(UserRootFolder))
                 {
-                    if (requiresReset)
-                    {
-                        saveItemStatement.Parameters.Clear();
-                        deleteAncestorsStatement.Parameters.Clear();
-                    }
-
-                    var item = tuple.Item;
-                    var topParent = tuple.TopParent;
-                    var userDataKey = tuple.UserDataKey;
-
-                    SaveItem(item, topParent, userDataKey, saveItemStatement);
-
-                    var inheritedTags = tuple.InheritedTags;
-
-                    if (item.SupportsAncestors)
-                    {
-                        UpdateAncestors(item.Id, tuple.AncestorIds, db, deleteAncestorsStatement);
-                    }
-
-                    UpdateItemValues(item.Id, GetItemValuesToSave(item, inheritedTags), db);
-
-                    requiresReset = true;
-                }
-            }
-        }
-
-        private string GetPathToSave(string path)
-        {
-            if (path is null)
-            {
-                return null;
-            }
-
-            return _appHost.ReverseVirtualPath(path);
-        }
-
-        private string RestorePath(string path)
-        {
-            return _appHost.ExpandVirtualPath(path);
-        }
-
-        private void SaveItem(BaseItem item, BaseItem topParent, string userDataKey, SqliteCommand saveItemStatement)
-        {
-            Type type = item.GetType();
-
-            saveItemStatement.TryBind("@guid", item.Id);
-            saveItemStatement.TryBind("@type", type.FullName);
-
-            if (TypeRequiresDeserialization(type))
-            {
-                saveItemStatement.TryBind("@data", JsonSerializer.SerializeToUtf8Bytes(item, type, _jsonOptions), true);
-            }
-            else
-            {
-                saveItemStatement.TryBindNull("@data");
-            }
-
-            saveItemStatement.TryBind("@Path", GetPathToSave(item.Path));
-
-            if (item is IHasStartDate hasStartDate)
-            {
-                saveItemStatement.TryBind("@StartDate", hasStartDate.StartDate);
-            }
-            else
-            {
-                saveItemStatement.TryBindNull("@StartDate");
-            }
-
-            if (item.EndDate.HasValue)
-            {
-                saveItemStatement.TryBind("@EndDate", item.EndDate.Value);
-            }
-            else
-            {
-                saveItemStatement.TryBindNull("@EndDate");
-            }
-
-            saveItemStatement.TryBind("@ChannelId", item.ChannelId.IsEmpty() ? null : item.ChannelId.ToString("N", CultureInfo.InvariantCulture));
-
-            if (item is IHasProgramAttributes hasProgramAttributes)
-            {
-                saveItemStatement.TryBind("@IsMovie", hasProgramAttributes.IsMovie);
-                saveItemStatement.TryBind("@IsSeries", hasProgramAttributes.IsSeries);
-                saveItemStatement.TryBind("@EpisodeTitle", hasProgramAttributes.EpisodeTitle);
-                saveItemStatement.TryBind("@IsRepeat", hasProgramAttributes.IsRepeat);
-            }
-            else
-            {
-                saveItemStatement.TryBindNull("@IsMovie");
-                saveItemStatement.TryBindNull("@IsSeries");
-                saveItemStatement.TryBindNull("@EpisodeTitle");
-                saveItemStatement.TryBindNull("@IsRepeat");
-            }
-
-            saveItemStatement.TryBind("@CommunityRating", item.CommunityRating);
-            saveItemStatement.TryBind("@CustomRating", item.CustomRating);
-            saveItemStatement.TryBind("@IndexNumber", item.IndexNumber);
-            saveItemStatement.TryBind("@IsLocked", item.IsLocked);
-            saveItemStatement.TryBind("@Name", item.Name);
-            saveItemStatement.TryBind("@OfficialRating", item.OfficialRating);
-            saveItemStatement.TryBind("@MediaType", item.MediaType.ToString());
-            saveItemStatement.TryBind("@Overview", item.Overview);
-            saveItemStatement.TryBind("@ParentIndexNumber", item.ParentIndexNumber);
-            saveItemStatement.TryBind("@PremiereDate", item.PremiereDate);
-            saveItemStatement.TryBind("@ProductionYear", item.ProductionYear);
-
-            var parentId = item.ParentId;
-            if (parentId.IsEmpty())
-            {
-                saveItemStatement.TryBindNull("@ParentId");
-            }
-            else
-            {
-                saveItemStatement.TryBind("@ParentId", parentId);
-            }
-
-            if (item.Genres.Length > 0)
-            {
-                saveItemStatement.TryBind("@Genres", string.Join('|', item.Genres));
-            }
-            else
-            {
-                saveItemStatement.TryBindNull("@Genres");
-            }
-
-            saveItemStatement.TryBind("@InheritedParentalRatingValue", item.InheritedParentalRatingValue);
-
-            saveItemStatement.TryBind("@SortName", item.SortName);
-
-            saveItemStatement.TryBind("@ForcedSortName", item.ForcedSortName);
-
-            saveItemStatement.TryBind("@RunTimeTicks", item.RunTimeTicks);
-            saveItemStatement.TryBind("@Size", item.Size);
-
-            saveItemStatement.TryBind("@DateCreated", item.DateCreated);
-            saveItemStatement.TryBind("@DateModified", item.DateModified);
-
-            saveItemStatement.TryBind("@PreferredMetadataLanguage", item.PreferredMetadataLanguage);
-            saveItemStatement.TryBind("@PreferredMetadataCountryCode", item.PreferredMetadataCountryCode);
-
-            if (item.Width > 0)
-            {
-                saveItemStatement.TryBind("@Width", item.Width);
-            }
-            else
-            {
-                saveItemStatement.TryBindNull("@Width");
-            }
-
-            if (item.Height > 0)
-            {
-                saveItemStatement.TryBind("@Height", item.Height);
-            }
-            else
-            {
-                saveItemStatement.TryBindNull("@Height");
-            }
-
-            if (item.DateLastRefreshed != default(DateTime))
-            {
-                saveItemStatement.TryBind("@DateLastRefreshed", item.DateLastRefreshed);
-            }
-            else
-            {
-                saveItemStatement.TryBindNull("@DateLastRefreshed");
-            }
-
-            if (item.DateLastSaved != default(DateTime))
-            {
-                saveItemStatement.TryBind("@DateLastSaved", item.DateLastSaved);
-            }
-            else
-            {
-                saveItemStatement.TryBindNull("@DateLastSaved");
-            }
-
-            saveItemStatement.TryBind("@IsInMixedFolder", item.IsInMixedFolder);
-
-            if (item.LockedFields.Length > 0)
-            {
-                saveItemStatement.TryBind("@LockedFields", string.Join('|', item.LockedFields));
-            }
-            else
-            {
-                saveItemStatement.TryBindNull("@LockedFields");
-            }
-
-            if (item.Studios.Length > 0)
-            {
-                saveItemStatement.TryBind("@Studios", string.Join('|', item.Studios));
-            }
-            else
-            {
-                saveItemStatement.TryBindNull("@Studios");
-            }
-
-            if (item.Audio.HasValue)
-            {
-                saveItemStatement.TryBind("@Audio", item.Audio.Value.ToString());
-            }
-            else
-            {
-                saveItemStatement.TryBindNull("@Audio");
-            }
-
-            if (item is LiveTvChannel liveTvChannel)
-            {
-                saveItemStatement.TryBind("@ExternalServiceId", liveTvChannel.ServiceName);
-            }
-            else
-            {
-                saveItemStatement.TryBindNull("@ExternalServiceId");
-            }
-
-            if (item.Tags.Length > 0)
-            {
-                saveItemStatement.TryBind("@Tags", string.Join('|', item.Tags));
-            }
-            else
-            {
-                saveItemStatement.TryBindNull("@Tags");
-            }
-
-            saveItemStatement.TryBind("@IsFolder", item.IsFolder);
-
-            saveItemStatement.TryBind("@UnratedType", item.GetBlockUnratedType().ToString());
-
-            if (topParent is null)
-            {
-                saveItemStatement.TryBindNull("@TopParentId");
-            }
-            else
-            {
-                saveItemStatement.TryBind("@TopParentId", topParent.Id.ToString("N", CultureInfo.InvariantCulture));
-            }
-
-            if (item is Trailer trailer && trailer.TrailerTypes.Length > 0)
-            {
-                saveItemStatement.TryBind("@TrailerTypes", string.Join('|', trailer.TrailerTypes));
-            }
-            else
-            {
-                saveItemStatement.TryBindNull("@TrailerTypes");
-            }
-
-            saveItemStatement.TryBind("@CriticRating", item.CriticRating);
-
-            if (string.IsNullOrWhiteSpace(item.Name))
-            {
-                saveItemStatement.TryBindNull("@CleanName");
-            }
-            else
-            {
-                saveItemStatement.TryBind("@CleanName", GetCleanValue(item.Name));
-            }
-
-            saveItemStatement.TryBind("@PresentationUniqueKey", item.PresentationUniqueKey);
-            saveItemStatement.TryBind("@OriginalTitle", item.OriginalTitle);
-
-            if (item is Video video)
-            {
-                saveItemStatement.TryBind("@PrimaryVersionId", video.PrimaryVersionId);
-            }
-            else
-            {
-                saveItemStatement.TryBindNull("@PrimaryVersionId");
-            }
-
-            if (item is Folder folder && folder.DateLastMediaAdded.HasValue)
-            {
-                saveItemStatement.TryBind("@DateLastMediaAdded", folder.DateLastMediaAdded.Value);
-            }
-            else
-            {
-                saveItemStatement.TryBindNull("@DateLastMediaAdded");
-            }
-
-            saveItemStatement.TryBind("@Album", item.Album);
-            saveItemStatement.TryBind("@LUFS", item.LUFS);
-            saveItemStatement.TryBind("@NormalizationGain", item.NormalizationGain);
-            saveItemStatement.TryBind("@IsVirtualItem", item.IsVirtualItem);
-
-            if (item is IHasSeries hasSeriesName)
-            {
-                saveItemStatement.TryBind("@SeriesName", hasSeriesName.SeriesName);
-            }
-            else
-            {
-                saveItemStatement.TryBindNull("@SeriesName");
-            }
-
-            if (string.IsNullOrWhiteSpace(userDataKey))
-            {
-                saveItemStatement.TryBindNull("@UserDataKey");
-            }
-            else
-            {
-                saveItemStatement.TryBind("@UserDataKey", userDataKey);
-            }
-
-            if (item is Episode episode)
-            {
-                saveItemStatement.TryBind("@SeasonName", episode.SeasonName);
-
-                var nullableSeasonId = episode.SeasonId.IsEmpty() ? (Guid?)null : episode.SeasonId;
-
-                saveItemStatement.TryBind("@SeasonId", nullableSeasonId);
-            }
-            else
-            {
-                saveItemStatement.TryBindNull("@SeasonName");
-                saveItemStatement.TryBindNull("@SeasonId");
-            }
-
-            if (item is IHasSeries hasSeries)
-            {
-                var nullableSeriesId = hasSeries.SeriesId.IsEmpty() ? (Guid?)null : hasSeries.SeriesId;
-
-                saveItemStatement.TryBind("@SeriesId", nullableSeriesId);
-                saveItemStatement.TryBind("@SeriesPresentationUniqueKey", hasSeries.SeriesPresentationUniqueKey);
-            }
-            else
-            {
-                saveItemStatement.TryBindNull("@SeriesId");
-                saveItemStatement.TryBindNull("@SeriesPresentationUniqueKey");
-            }
-
-            saveItemStatement.TryBind("@ExternalSeriesId", item.ExternalSeriesId);
-            saveItemStatement.TryBind("@Tagline", item.Tagline);
-
-            saveItemStatement.TryBind("@ProviderIds", SerializeProviderIds(item.ProviderIds));
-            saveItemStatement.TryBind("@Images", SerializeImages(item.ImageInfos));
-
-            if (item.ProductionLocations.Length > 0)
-            {
-                saveItemStatement.TryBind("@ProductionLocations", string.Join('|', item.ProductionLocations));
-            }
-            else
-            {
-                saveItemStatement.TryBindNull("@ProductionLocations");
-            }
-
-            if (item.ExtraIds.Length > 0)
-            {
-                saveItemStatement.TryBind("@ExtraIds", string.Join('|', item.ExtraIds));
-            }
-            else
-            {
-                saveItemStatement.TryBindNull("@ExtraIds");
-            }
-
-            saveItemStatement.TryBind("@TotalBitrate", item.TotalBitrate);
-            if (item.ExtraType.HasValue)
-            {
-                saveItemStatement.TryBind("@ExtraType", item.ExtraType.Value.ToString());
-            }
-            else
-            {
-                saveItemStatement.TryBindNull("@ExtraType");
-            }
-
-            string artists = null;
-            if (item is IHasArtist hasArtists && hasArtists.Artists.Count > 0)
-            {
-                artists = string.Join('|', hasArtists.Artists);
-            }
-
-            saveItemStatement.TryBind("@Artists", artists);
-
-            string albumArtists = null;
-            if (item is IHasAlbumArtist hasAlbumArtists
-                && hasAlbumArtists.AlbumArtists.Count > 0)
-            {
-                albumArtists = string.Join('|', hasAlbumArtists.AlbumArtists);
-            }
-
-            saveItemStatement.TryBind("@AlbumArtists", albumArtists);
-            saveItemStatement.TryBind("@ExternalId", item.ExternalId);
-
-            if (item is LiveTvProgram program)
-            {
-                saveItemStatement.TryBind("@ShowId", program.ShowId);
-            }
-            else
-            {
-                saveItemStatement.TryBindNull("@ShowId");
-            }
-
-            Guid ownerId = item.OwnerId;
-            if (ownerId.IsEmpty())
-            {
-                saveItemStatement.TryBindNull("@OwnerId");
-            }
-            else
-            {
-                saveItemStatement.TryBind("@OwnerId", ownerId);
-            }
-
-            saveItemStatement.ExecuteNonQuery();
-        }
-
-        internal static string SerializeProviderIds(Dictionary<string, string> providerIds)
-        {
-            StringBuilder str = new StringBuilder();
-            foreach (var i in providerIds)
-            {
-                // Ideally we shouldn't need this IsNullOrWhiteSpace check,
-                // but we're seeing some cases of bad data slip through
-                if (string.IsNullOrWhiteSpace(i.Value))
-                {
-                    continue;
-                }
-
-                str.Append(i.Key)
-                    .Append('=')
-                    .Append(i.Value)
-                    .Append('|');
-            }
-
-            if (str.Length == 0)
-            {
-                return null;
-            }
-
-            str.Length -= 1; // Remove last |
-            return str.ToString();
-        }
-
-        internal static void DeserializeProviderIds(string value, IHasProviderIds item)
-        {
-            if (string.IsNullOrWhiteSpace(value))
-            {
-                return;
-            }
-
-            foreach (var part in value.SpanSplit('|'))
-            {
-                var providerDelimiterIndex = part.IndexOf('=');
-                // Don't let empty values through
-                if (providerDelimiterIndex != -1 && part.Length != providerDelimiterIndex + 1)
-                {
-                    item.SetProviderId(part[..providerDelimiterIndex].ToString(), part[(providerDelimiterIndex + 1)..].ToString());
-                }
-            }
-        }
-
-        internal string SerializeImages(ItemImageInfo[] images)
-        {
-            if (images.Length == 0)
-            {
-                return null;
-            }
-
-            StringBuilder str = new StringBuilder();
-            foreach (var i in images)
-            {
-                if (string.IsNullOrWhiteSpace(i.Path))
-                {
-                    continue;
-                }
-
-                AppendItemImageInfo(str, i);
-                str.Append('|');
-            }
-
-            str.Length -= 1; // Remove last |
-            return str.ToString();
-        }
-
-        internal ItemImageInfo[] DeserializeImages(string value)
-        {
-            if (string.IsNullOrWhiteSpace(value))
-            {
-                return Array.Empty<ItemImageInfo>();
-            }
-
-            // TODO The following is an ugly performance optimization, but it's extremely unlikely that the data in the database would be malformed
-            var valueSpan = value.AsSpan();
-            var count = valueSpan.Count('|') + 1;
-
-            var position = 0;
-            var result = new ItemImageInfo[count];
-            foreach (var part in valueSpan.Split('|'))
-            {
-                var image = ItemImageInfoFromValueString(part);
-
-                if (image is not null)
-                {
-                    result[position++] = image;
-                }
-            }
-
-            if (position == count)
-            {
-                return result;
-            }
-
-            if (position == 0)
-            {
-                return Array.Empty<ItemImageInfo>();
-            }
-
-            // Extremely unlikely, but somehow one or more of the image strings were malformed. Cut the array.
-            return result[..position];
-        }
-
-        private void AppendItemImageInfo(StringBuilder bldr, ItemImageInfo image)
-        {
-            const char Delimiter = '*';
-
-            var path = image.Path ?? string.Empty;
-
-            bldr.Append(GetPathToSave(path))
-                .Append(Delimiter)
-                .Append(image.DateModified.Ticks)
-                .Append(Delimiter)
-                .Append(image.Type)
-                .Append(Delimiter)
-                .Append(image.Width)
-                .Append(Delimiter)
-                .Append(image.Height);
-
-            var hash = image.BlurHash;
-            if (!string.IsNullOrEmpty(hash))
-            {
-                bldr.Append(Delimiter)
-                    // Replace delimiters with other characters.
-                    // This can be removed when we migrate to a proper DB.
-                    .Append(hash.Replace(Delimiter, '/').Replace('|', '\\'));
-            }
-        }
-
-        internal ItemImageInfo ItemImageInfoFromValueString(ReadOnlySpan<char> value)
-        {
-            const char Delimiter = '*';
-
-            var nextSegment = value.IndexOf(Delimiter);
-            if (nextSegment == -1)
-            {
-                return null;
-            }
-
-            ReadOnlySpan<char> path = value[..nextSegment];
-            value = value[(nextSegment + 1)..];
-            nextSegment = value.IndexOf(Delimiter);
-            if (nextSegment == -1)
-            {
-                return null;
-            }
-
-            ReadOnlySpan<char> dateModified = value[..nextSegment];
-            value = value[(nextSegment + 1)..];
-            nextSegment = value.IndexOf(Delimiter);
-            if (nextSegment == -1)
-            {
-                nextSegment = value.Length;
-            }
-
-            ReadOnlySpan<char> imageType = value[..nextSegment];
-
-            var image = new ItemImageInfo
-            {
-                Path = RestorePath(path.ToString())
-            };
-
-            if (long.TryParse(dateModified, CultureInfo.InvariantCulture, out var ticks)
-                && ticks >= DateTime.MinValue.Ticks
-                && ticks <= DateTime.MaxValue.Ticks)
-            {
-                image.DateModified = new DateTime(ticks, DateTimeKind.Utc);
-            }
-            else
-            {
-                return null;
-            }
-
-            if (Enum.TryParse(imageType, true, out ImageType type))
-            {
-                image.Type = type;
-            }
-            else
-            {
-                return null;
-            }
-
-            // Optional parameters: width*height*blurhash
-            if (nextSegment + 1 < value.Length - 1)
-            {
-                value = value[(nextSegment + 1)..];
-                nextSegment = value.IndexOf(Delimiter);
-                if (nextSegment == -1 || nextSegment == value.Length)
-                {
-                    return image;
-                }
-
-                ReadOnlySpan<char> widthSpan = value[..nextSegment];
-
-                value = value[(nextSegment + 1)..];
-                nextSegment = value.IndexOf(Delimiter);
-                if (nextSegment == -1)
-                {
-                    nextSegment = value.Length;
-                }
-
-                ReadOnlySpan<char> heightSpan = value[..nextSegment];
-
-                if (int.TryParse(widthSpan, NumberStyles.Integer, CultureInfo.InvariantCulture, out var width)
-                    && int.TryParse(heightSpan, NumberStyles.Integer, CultureInfo.InvariantCulture, out var height))
-                {
-                    image.Width = width;
-                    image.Height = height;
-                }
-
-                if (nextSegment < value.Length - 1)
-                {
-                    value = value[(nextSegment + 1)..];
-                    var length = value.Length;
-
-                    Span<char> blurHashSpan = stackalloc char[length];
-                    for (int i = 0; i < length; i++)
-                    {
-                        var c = value[i];
-                        blurHashSpan[i] = c switch
-                        {
-                            '/' => Delimiter,
-                            '\\' => '|',
-                            _ => c
-                        };
-                    }
-
-                    image.BlurHash = new string(blurHashSpan);
-                }
-            }
-
-            return image;
-        }
-
-        /// <summary>
-        /// Internal retrieve from items or users table.
-        /// </summary>
-        /// <param name="id">The id.</param>
-        /// <returns>BaseItem.</returns>
-        /// <exception cref="ArgumentNullException"><paramref name="id"/> is <c>null</c>.</exception>
-        /// <exception cref="ArgumentException"><paramr name="id"/> is <seealso cref="Guid.Empty"/>.</exception>
-        public BaseItem RetrieveItem(Guid id)
-        {
-            if (id.IsEmpty())
-            {
-                throw new ArgumentException("Guid can't be empty", nameof(id));
-            }
-
-            CheckDisposed();
-
-            using (var connection = GetConnection(true))
-            using (var statement = PrepareStatement(connection, _retrieveItemColumnsSelectQuery))
-            {
-                statement.TryBind("@guid", id);
-
-                foreach (var row in statement.ExecuteQuery())
-                {
-                    return GetItem(row, new InternalItemsQuery());
-                }
-            }
-
-            return null;
-        }
-
-        private bool TypeRequiresDeserialization(Type type)
-        {
-            if (_config.Configuration.SkipDeserializationForBasicTypes)
-            {
-                if (type == typeof(Channel)
-                    || type == typeof(UserRootFolder))
-                {
-                    return false;
+                    return false;
                 }
             }
 
@@ -1179,152 +124,6 @@ namespace Emby.Server.Implementations.Data
                 && type != typeof(MusicAlbum);
         }
 
-        /// <inheritdoc />
-        public List<ChapterInfo> GetChapters(BaseItem item)
-        {
-            CheckDisposed();
-
-            var chapters = new List<ChapterInfo>();
-            using (var connection = GetConnection(true))
-            using (var statement = PrepareStatement(connection, "select StartPositionTicks,Name,ImagePath,ImageDateModified from " + ChaptersTableName + " where ItemId = @ItemId order by ChapterIndex asc"))
-            {
-                statement.TryBind("@ItemId", item.Id);
-
-                foreach (var row in statement.ExecuteQuery())
-                {
-                    chapters.Add(GetChapter(row, item));
-                }
-            }
-
-            return chapters;
-        }
-
-        /// <inheritdoc />
-        public ChapterInfo GetChapter(BaseItem item, int index)
-        {
-            CheckDisposed();
-
-            using (var connection = GetConnection(true))
-            using (var statement = PrepareStatement(connection, "select StartPositionTicks,Name,ImagePath,ImageDateModified from " + ChaptersTableName + " where ItemId = @ItemId and ChapterIndex=@ChapterIndex"))
-            {
-                statement.TryBind("@ItemId", item.Id);
-                statement.TryBind("@ChapterIndex", index);
-
-                foreach (var row in statement.ExecuteQuery())
-                {
-                    return GetChapter(row, item);
-                }
-            }
-
-            return null;
-        }
-
-        /// <summary>
-        /// Gets the chapter.
-        /// </summary>
-        /// <param name="reader">The reader.</param>
-        /// <param name="item">The item.</param>
-        /// <returns>ChapterInfo.</returns>
-        private ChapterInfo GetChapter(SqliteDataReader reader, BaseItem item)
-        {
-            var chapter = new ChapterInfo
-            {
-                StartPositionTicks = reader.GetInt64(0)
-            };
-
-            if (reader.TryGetString(1, out var chapterName))
-            {
-                chapter.Name = chapterName;
-            }
-
-            if (reader.TryGetString(2, out var imagePath))
-            {
-                chapter.ImagePath = imagePath;
-                chapter.ImageTag = _imageProcessor.GetImageCacheTag(item, chapter);
-            }
-
-            if (reader.TryReadDateTime(3, out var imageDateModified))
-            {
-                chapter.ImageDateModified = imageDateModified;
-            }
-
-            return chapter;
-        }
-
-        /// <summary>
-        /// Saves the chapters.
-        /// </summary>
-        /// <param name="id">The item id.</param>
-        /// <param name="chapters">The chapters.</param>
-        public void SaveChapters(Guid id, IReadOnlyList<ChapterInfo> chapters)
-        {
-            CheckDisposed();
-
-            if (id.IsEmpty())
-            {
-                throw new ArgumentNullException(nameof(id));
-            }
-
-            ArgumentNullException.ThrowIfNull(chapters);
-
-            using var connection = GetConnection();
-            using var transaction = connection.BeginTransaction();
-            // First delete chapters
-            using var command = connection.PrepareStatement($"delete from {ChaptersTableName} where ItemId=@ItemId");
-            command.TryBind("@ItemId", id);
-            command.ExecuteNonQuery();
-
-            InsertChapters(id, chapters, connection);
-            transaction.Commit();
-        }
-
-        private void InsertChapters(Guid idBlob, IReadOnlyList<ChapterInfo> chapters, ManagedConnection db)
-        {
-            var startIndex = 0;
-            var limit = 100;
-            var chapterIndex = 0;
-
-            const string StartInsertText = "insert into " + ChaptersTableName + " (ItemId, ChapterIndex, StartPositionTicks, Name, ImagePath, ImageDateModified) values ";
-            var insertText = new StringBuilder(StartInsertText, 256);
-
-            while (startIndex < chapters.Count)
-            {
-                var endIndex = Math.Min(chapters.Count, startIndex + limit);
-
-                for (var i = startIndex; i < endIndex; i++)
-                {
-                    insertText.AppendFormat(CultureInfo.InvariantCulture, "(@ItemId, @ChapterIndex{0}, @StartPositionTicks{0}, @Name{0}, @ImagePath{0}, @ImageDateModified{0}),", i.ToString(CultureInfo.InvariantCulture));
-                }
-
-                insertText.Length -= 1; // Remove trailing comma
-
-                using (var statement = PrepareStatement(db, insertText.ToString()))
-                {
-                    statement.TryBind("@ItemId", idBlob);
-
-                    for (var i = startIndex; i < endIndex; i++)
-                    {
-                        var index = i.ToString(CultureInfo.InvariantCulture);
-
-                        var chapter = chapters[i];
-
-                        statement.TryBind("@ChapterIndex" + index, chapterIndex);
-                        statement.TryBind("@StartPositionTicks" + index, chapter.StartPositionTicks);
-                        statement.TryBind("@Name" + index, chapter.Name);
-                        statement.TryBind("@ImagePath" + index, chapter.ImagePath);
-                        statement.TryBind("@ImageDateModified" + index, chapter.ImageDateModified);
-
-                        chapterIndex++;
-                    }
-
-                    statement.ExecuteNonQuery();
-                }
-
-                startIndex += limit;
-                insertText.Length = StartInsertText.Length;
-            }
-        }
-
         private static bool EnableJoinUserData(InternalItemsQuery query)
         {
             if (query.User is null)
diff --git a/Jellyfin.Data/Entities/BaseItem.cs b/Jellyfin.Data/Entities/BaseItem.cs
index c0c88b2e6..18166f7c1 100644
--- a/Jellyfin.Data/Entities/BaseItem.cs
+++ b/Jellyfin.Data/Entities/BaseItem.cs
@@ -161,4 +161,10 @@ public class BaseItem
     public int? Height { get; set; }
 
     public long? Size { get; set; }
+
+    public ICollection<People>? Peoples { get; set; }
+
+    public ICollection<UserData>? UserData { get; set; }
+
+    public ICollection<ItemValue>? ItemValues { get; set; }
 }
diff --git a/Jellyfin.Data/Entities/People.cs b/Jellyfin.Data/Entities/People.cs
index 72c39699b..014a0f1c9 100644
--- a/Jellyfin.Data/Entities/People.cs
+++ b/Jellyfin.Data/Entities/People.cs
@@ -7,6 +7,7 @@ namespace Jellyfin.Data.Entities;
 public class People
 {
     public Guid ItemId { get; set; }
+    public BaseItem Item { get; set; }
 
     public required string Name { get; set; }
     public string? Role { get; set; }
diff --git a/Jellyfin.Server.Implementations/Item/BaseItemManager.cs b/Jellyfin.Server.Implementations/Item/BaseItemManager.cs
index 4ad842e0b..85dc98e09 100644
--- a/Jellyfin.Server.Implementations/Item/BaseItemManager.cs
+++ b/Jellyfin.Server.Implementations/Item/BaseItemManager.cs
@@ -3,16 +3,24 @@ using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
+using System.Linq.Expressions;
+using System.Security.Cryptography.X509Certificates;
 using System.Text;
 using System.Threading;
+using System.Threading.Channels;
+using Jellyfin.Data.Enums;
 using Jellyfin.Extensions;
 using MediaBrowser.Controller;
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Entities.Audio;
+using MediaBrowser.Controller.Entities.Movies;
 using MediaBrowser.Controller.Entities.TV;
 using MediaBrowser.Controller.LiveTv;
+using MediaBrowser.Controller.Persistence;
+using MediaBrowser.Controller.Playlists;
 using MediaBrowser.Model.Entities;
 using MediaBrowser.Model.LiveTv;
+using MediaBrowser.Model.Querying;
 using Microsoft.EntityFrameworkCore;
 using BaseItemDto = MediaBrowser.Controller.Entities.BaseItem;
 using BaseItemEntity = Jellyfin.Data.Entities.BaseItem;
@@ -22,25 +30,1316 @@ namespace Jellyfin.Server.Implementations.Item;
 /// <summary>
 /// Handles all storage logic for BaseItems.
 /// </summary>
-public class BaseItemManager
+public class BaseItemManager : IItemRepository
 {
     private readonly IDbContextFactory<JellyfinDbContext> _dbProvider;
     private readonly IServerApplicationHost _appHost;
 
-     /// <summary>
+
+
+    private readonly ItemFields[] _allItemFields = Enum.GetValues<ItemFields>();
+
+    private static readonly BaseItemKind[] _programTypes = new[]
+    {
+            BaseItemKind.Program,
+            BaseItemKind.TvChannel,
+            BaseItemKind.LiveTvProgram,
+            BaseItemKind.LiveTvChannel
+    };
+
+    private static readonly BaseItemKind[] _programExcludeParentTypes = new[]
+    {
+            BaseItemKind.Series,
+            BaseItemKind.Season,
+            BaseItemKind.MusicAlbum,
+            BaseItemKind.MusicArtist,
+            BaseItemKind.PhotoAlbum
+    };
+
+    private static readonly BaseItemKind[] _serviceTypes = new[]
+    {
+            BaseItemKind.TvChannel,
+            BaseItemKind.LiveTvChannel
+    };
+
+    private static readonly BaseItemKind[] _startDateTypes = new[]
+    {
+            BaseItemKind.Program,
+            BaseItemKind.LiveTvProgram
+    };
+
+    private static readonly BaseItemKind[] _seriesTypes = new[]
+    {
+            BaseItemKind.Book,
+            BaseItemKind.AudioBook,
+            BaseItemKind.Episode,
+            BaseItemKind.Season
+    };
+
+    private static readonly BaseItemKind[] _artistExcludeParentTypes = new[]
+    {
+            BaseItemKind.Series,
+            BaseItemKind.Season,
+            BaseItemKind.PhotoAlbum
+    };
+
+    private static readonly BaseItemKind[] _artistsTypes = new[]
+    {
+            BaseItemKind.Audio,
+            BaseItemKind.MusicAlbum,
+            BaseItemKind.MusicVideo,
+            BaseItemKind.AudioBook
+    };
+
+    private static readonly Dictionary<BaseItemKind, string?> _baseItemKindNames = new()
+        {
+            { BaseItemKind.AggregateFolder, typeof(AggregateFolder).FullName },
+            { BaseItemKind.Audio, typeof(Audio).FullName },
+            { BaseItemKind.AudioBook, typeof(AudioBook).FullName },
+            { BaseItemKind.BasePluginFolder, typeof(BasePluginFolder).FullName },
+            { BaseItemKind.Book, typeof(Book).FullName },
+            { BaseItemKind.BoxSet, typeof(BoxSet).FullName },
+            { BaseItemKind.Channel, typeof(Channel).FullName },
+            { BaseItemKind.CollectionFolder, typeof(CollectionFolder).FullName },
+            { BaseItemKind.Episode, typeof(Episode).FullName },
+            { BaseItemKind.Folder, typeof(Folder).FullName },
+            { BaseItemKind.Genre, typeof(Genre).FullName },
+            { BaseItemKind.Movie, typeof(Movie).FullName },
+            { BaseItemKind.LiveTvChannel, typeof(LiveTvChannel).FullName },
+            { BaseItemKind.LiveTvProgram, typeof(LiveTvProgram).FullName },
+            { BaseItemKind.MusicAlbum, typeof(MusicAlbum).FullName },
+            { BaseItemKind.MusicArtist, typeof(MusicArtist).FullName },
+            { BaseItemKind.MusicGenre, typeof(MusicGenre).FullName },
+            { BaseItemKind.MusicVideo, typeof(MusicVideo).FullName },
+            { BaseItemKind.Person, typeof(Person).FullName },
+            { BaseItemKind.Photo, typeof(Photo).FullName },
+            { BaseItemKind.PhotoAlbum, typeof(PhotoAlbum).FullName },
+            { BaseItemKind.Playlist, typeof(Playlist).FullName },
+            { BaseItemKind.PlaylistsFolder, typeof(PlaylistsFolder).FullName },
+            { BaseItemKind.Season, typeof(Season).FullName },
+            { BaseItemKind.Series, typeof(Series).FullName },
+            { BaseItemKind.Studio, typeof(Studio).FullName },
+            { BaseItemKind.Trailer, typeof(Trailer).FullName },
+            { BaseItemKind.TvChannel, typeof(LiveTvChannel).FullName },
+            { BaseItemKind.TvProgram, typeof(LiveTvProgram).FullName },
+            { BaseItemKind.UserRootFolder, typeof(UserRootFolder).FullName },
+            { BaseItemKind.UserView, typeof(UserView).FullName },
+            { BaseItemKind.Video, typeof(Video).FullName },
+            { BaseItemKind.Year, typeof(Year).FullName }
+        };
+
+    /// <summary>
     /// This holds all the types in the running assemblies
     /// so that we can de-serialize properly when we don't have strong types.
     /// </summary>
     private static readonly ConcurrentDictionary<string, Type?> _typeMap = new ConcurrentDictionary<string, Type?>();
 
-    /// <summary>
-    /// Initializes a new instance of the <see cref="BaseItemManager"/> class.
-    /// </summary>
-    /// <param name="dbProvider">The db factory.</param>
-    public BaseItemManager(IDbContextFactory<JellyfinDbContext> dbProvider, IServerApplicationHost appHost)
-    {
-        _dbProvider = dbProvider;
-        _appHost = appHost;
+    /// <summary>
+    /// Initializes a new instance of the <see cref="BaseItemManager"/> class.
+    /// </summary>
+    /// <param name="dbProvider">The db factory.</param>
+    /// <param name="appHost">The Application host.</param>
+    public BaseItemManager(IDbContextFactory<JellyfinDbContext> dbProvider, IServerApplicationHost appHost)
+    {
+        _dbProvider = dbProvider;
+        _appHost = appHost;
+    }
+
+    public int GetCount(InternalItemsQuery query)
+    {
+        ArgumentNullException.ThrowIfNull(query);
+        // Hack for right now since we currently don't support filtering out these duplicates within a query
+        if (query.Limit.HasValue && query.EnableGroupByMetadataKey)
+        {
+            query.Limit = query.Limit.Value + 4;
+        }
+
+        if (query.IsResumable ?? false)
+        {
+            query.IsVirtualItem = false;
+        }
+
+
+
+    }
+
+    private IQueryable<BaseItemEntity> TranslateQuery(
+        IQueryable<BaseItemEntity> baseQuery,
+        JellyfinDbContext context,
+        InternalItemsQuery query)
+    {
+        var minWidth = query.MinWidth;
+        var maxWidth = query.MaxWidth;
+        var now = DateTime.UtcNow;
+
+        if (query.IsHD.HasValue)
+        {
+            const int Threshold = 1200;
+            if (query.IsHD.Value)
+            {
+                minWidth = Threshold;
+            }
+            else
+            {
+                maxWidth = Threshold - 1;
+            }
+        }
+
+        if (query.Is4K.HasValue)
+        {
+            const int Threshold = 3800;
+            if (query.Is4K.Value)
+            {
+                minWidth = Threshold;
+            }
+            else
+            {
+                maxWidth = Threshold - 1;
+            }
+        }
+
+        if (minWidth.HasValue)
+        {
+            baseQuery = baseQuery.Where(e => e.Width >= minWidth);
+        }
+
+        if (query.MinHeight.HasValue)
+        {
+            baseQuery = baseQuery.Where(e => e.Height >= query.MinHeight);
+        }
+
+        if (maxWidth.HasValue)
+        {
+            baseQuery = baseQuery.Where(e => e.Width >= maxWidth);
+        }
+
+        if (query.MaxHeight.HasValue)
+        {
+            baseQuery = baseQuery.Where(e => e.Height <= query.MaxHeight);
+        }
+
+        if (query.IsLocked.HasValue)
+        {
+            baseQuery = baseQuery.Where(e => e.IsLocked == query.IsLocked);
+        }
+
+        var tags = query.Tags.ToList();
+        var excludeTags = query.ExcludeTags.ToList();
+
+        if (query.IsMovie == true)
+        {
+            if (query.IncludeItemTypes.Length == 0
+                || query.IncludeItemTypes.Contains(BaseItemKind.Movie)
+                || query.IncludeItemTypes.Contains(BaseItemKind.Trailer))
+            {
+                baseQuery = baseQuery.Where(e => e.IsMovie);
+            }
+        }
+        else if (query.IsMovie.HasValue)
+        {
+            baseQuery = baseQuery.Where(e => e.IsMovie == query.IsMovie);
+        }
+
+        if (query.IsSeries.HasValue)
+        {
+            baseQuery = baseQuery.Where(e => e.IsSeries == query.IsSeries);
+        }
+
+        if (query.IsSports.HasValue)
+        {
+            if (query.IsSports.Value)
+            {
+                tags.Add("Sports");
+            }
+            else
+            {
+                excludeTags.Add("Sports");
+            }
+        }
+
+        if (query.IsNews.HasValue)
+        {
+            if (query.IsNews.Value)
+            {
+                tags.Add("News");
+            }
+            else
+            {
+                excludeTags.Add("News");
+            }
+        }
+
+        if (query.IsKids.HasValue)
+        {
+            if (query.IsKids.Value)
+            {
+                tags.Add("Kids");
+            }
+            else
+            {
+                excludeTags.Add("Kids");
+            }
+        }
+
+        if (query.SimilarTo is not null && query.MinSimilarityScore > 0)
+        {
+            // TODO support similarty score via CTE
+            baseQuery = baseQuery.Where(e => e.Sim == query.IsSeries);
+            whereClauses.Add("SimilarityScore > " + (query.MinSimilarityScore - 1).ToString(CultureInfo.InvariantCulture));
+        }
+
+        if (!string.IsNullOrEmpty(query.SearchTerm))
+        {
+            whereClauses.Add("SearchScore > 0");
+        }
+
+        if (query.IsFolder.HasValue)
+        {
+            baseQuery = baseQuery.Where(e => e.IsFolder == query.IsFolder);
+        }
+
+        var includeTypes = query.IncludeItemTypes;
+        // Only specify excluded types if no included types are specified
+        if (query.IncludeItemTypes.Length == 0)
+        {
+            var excludeTypes = query.ExcludeItemTypes;
+            if (excludeTypes.Length == 1)
+            {
+                if (_baseItemKindNames.TryGetValue(excludeTypes[0], out var excludeTypeName))
+                {
+                    baseQuery = baseQuery.Where(e => e.Type != excludeTypeName);
+                }
+            }
+            else if (excludeTypes.Length > 1)
+            {
+                var excludeTypeName = new List<string>();
+                foreach (var excludeType in excludeTypes)
+                {
+                    if (_baseItemKindNames.TryGetValue(excludeType, out var baseItemKindName))
+                    {
+                        excludeTypeName.Add(baseItemKindName!);
+                    }
+                }
+
+                baseQuery = baseQuery.Where(e => !excludeTypeName.Contains(e.Type));
+            }
+        }
+        else if (includeTypes.Length == 1)
+        {
+            if (_baseItemKindNames.TryGetValue(includeTypes[0], out var includeTypeName))
+            {
+                baseQuery = baseQuery.Where(e => e.Type == includeTypeName);
+            }
+        }
+        else if (includeTypes.Length > 1)
+        {
+            var includeTypeName = new List<string>();
+            foreach (var includeType in includeTypes)
+            {
+                if (_baseItemKindNames.TryGetValue(includeType, out var baseItemKindName))
+                {
+                    includeTypeName.Add(baseItemKindName!);
+                }
+            }
+
+            baseQuery = baseQuery.Where(e => includeTypeName.Contains(e.Type));
+        }
+
+        if (query.ChannelIds.Count == 1)
+        {
+            baseQuery = baseQuery.Where(e => e.ChannelId == query.ChannelIds[0].ToString("N", CultureInfo.InvariantCulture));
+        }
+        else if (query.ChannelIds.Count > 1)
+        {
+            baseQuery = baseQuery.Where(e => query.ChannelIds.Select(f => f.ToString("N", CultureInfo.InvariantCulture)).Contains(e.ChannelId));
+        }
+
+        if (!query.ParentId.IsEmpty())
+        {
+            baseQuery = baseQuery.Where(e => e.ParentId.Equals(query.ParentId));
+        }
+
+        if (!string.IsNullOrWhiteSpace(query.Path))
+        {
+            baseQuery = baseQuery.Where(e => e.Path == query.Path);
+        }
+
+        if (!string.IsNullOrWhiteSpace(query.PresentationUniqueKey))
+        {
+            baseQuery = baseQuery.Where(e => e.PresentationUniqueKey == query.PresentationUniqueKey);
+        }
+
+        if (query.MinCommunityRating.HasValue)
+        {
+            baseQuery = baseQuery.Where(e => e.CommunityRating >= query.MinCommunityRating);
+        }
+
+        if (query.MinIndexNumber.HasValue)
+        {
+            baseQuery = baseQuery.Where(e => e.IndexNumber >= query.MinIndexNumber);
+        }
+
+        if (query.MinParentAndIndexNumber.HasValue)
+        {
+            baseQuery = baseQuery
+                .Where(e => (e.ParentIndexNumber == query.MinParentAndIndexNumber.Value.ParentIndexNumber && e.IndexNumber >= query.MinParentAndIndexNumber.Value.IndexNumber) || e.ParentIndexNumber > query.MinParentAndIndexNumber.Value.ParentIndexNumber);
+        }
+
+        if (query.MinDateCreated.HasValue)
+        {
+            baseQuery = baseQuery.Where(e => e.DateCreated >= query.MinDateCreated);
+        }
+
+        if (query.MinDateLastSaved.HasValue)
+        {
+            baseQuery = baseQuery.Where(e => e.DateLastSaved != null && e.DateLastSaved >= query.MinDateLastSaved.Value);
+        }
+
+        if (query.MinDateLastSavedForUser.HasValue)
+        {
+            baseQuery = baseQuery.Where(e => e.DateLastSaved != null && e.DateLastSaved >= query.MinDateLastSavedForUser.Value);
+        }
+
+        if (query.IndexNumber.HasValue)
+        {
+            baseQuery = baseQuery.Where(e => e.IndexNumber == query.IndexNumber.Value);
+        }
+
+        if (query.ParentIndexNumber.HasValue)
+        {
+            baseQuery = baseQuery.Where(e => e.ParentIndexNumber == query.ParentIndexNumber.Value);
+        }
+
+        if (query.ParentIndexNumberNotEquals.HasValue)
+        {
+            baseQuery = baseQuery.Where(e => e.ParentIndexNumber != query.ParentIndexNumberNotEquals.Value || e.ParentIndexNumber == null);
+        }
+
+        var minEndDate = query.MinEndDate;
+        var maxEndDate = query.MaxEndDate;
+
+        if (query.HasAired.HasValue)
+        {
+            if (query.HasAired.Value)
+            {
+                maxEndDate = DateTime.UtcNow;
+            }
+            else
+            {
+                minEndDate = DateTime.UtcNow;
+            }
+        }
+
+        if (minEndDate.HasValue)
+        {
+            baseQuery = baseQuery.Where(e => e.EndDate >= minEndDate);
+        }
+
+        if (maxEndDate.HasValue)
+        {
+            baseQuery = baseQuery.Where(e => e.EndDate <= maxEndDate);
+        }
+
+        if (query.MinStartDate.HasValue)
+        {
+            baseQuery = baseQuery.Where(e => e.StartDate >= query.MinStartDate.Value);
+        }
+
+        if (query.MaxStartDate.HasValue)
+        {
+            baseQuery = baseQuery.Where(e => e.StartDate <= query.MaxStartDate.Value);
+        }
+
+        if (query.MinPremiereDate.HasValue)
+        {
+            baseQuery = baseQuery.Where(e => e.PremiereDate <= query.MinPremiereDate.Value);
+        }
+
+        if (query.MaxPremiereDate.HasValue)
+        {
+            baseQuery = baseQuery.Where(e => e.PremiereDate <= query.MaxPremiereDate.Value);
+        }
+
+        if (query.TrailerTypes.Length > 0)
+        {
+            baseQuery = baseQuery.Where(e => query.TrailerTypes.Any(f => e.TrailerTypes!.Contains(f.ToString(), StringComparison.OrdinalIgnoreCase)));
+        }
+
+        if (query.IsAiring.HasValue)
+        {
+            if (query.IsAiring.Value)
+            {
+                baseQuery = baseQuery.Where(e => e.StartDate <= now && e.EndDate >= now);
+            }
+            else
+            {
+                baseQuery = baseQuery.Where(e => e.StartDate > now && e.EndDate < now);
+            }
+        }
+
+        if (query.PersonIds.Length > 0)
+        {
+            baseQuery = baseQuery
+                .Where(e =>
+                    context.Peoples.Where(w => context.BaseItems.Where(w => query.PersonIds.Contains(w.Id)).Any(f => f.Name == w.Name))
+                        .Any(f => f.ItemId.Equals(e.Id)));
+        }
+
+        if (!string.IsNullOrWhiteSpace(query.Person))
+        {
+            baseQuery = baseQuery.Where(e => e.Peoples!.Any(f => f.Name == query.Person));
+        }
+
+        if (!string.IsNullOrWhiteSpace(query.MinSortName))
+        {
+            // this does not makes sense.
+            // baseQuery = baseQuery.Where(e => e.SortName >= query.MinSortName);
+            // whereClauses.Add("SortName>=@MinSortName");
+            // statement?.TryBind("@MinSortName", query.MinSortName);
+        }
+
+        if (!string.IsNullOrWhiteSpace(query.ExternalSeriesId))
+        {
+            baseQuery = baseQuery.Where(e => e.ExternalSeriesId == query.ExternalSeriesId);
+        }
+
+        if (!string.IsNullOrWhiteSpace(query.ExternalId))
+        {
+            baseQuery = baseQuery.Where(e => e.ExternalId == query.ExternalId);
+        }
+
+        if (!string.IsNullOrWhiteSpace(query.Name))
+        {
+            var cleanName = GetCleanValue(query.Name);
+            baseQuery = baseQuery.Where(e => e.CleanName == cleanName);
+        }
+
+        // These are the same, for now
+        var nameContains = query.NameContains;
+        if (!string.IsNullOrWhiteSpace(nameContains))
+        {
+            baseQuery = baseQuery.Where(e =>
+                e.CleanName == query.NameContains
+                || e.OriginalTitle!.Contains(query.NameContains!, StringComparison.Ordinal));
+        }
+
+        if (!string.IsNullOrWhiteSpace(query.NameStartsWith))
+        {
+            baseQuery = baseQuery.Where(e => e.SortName!.Contains(query.NameStartsWith, StringComparison.OrdinalIgnoreCase));
+        }
+
+        if (!string.IsNullOrWhiteSpace(query.NameStartsWithOrGreater))
+        {
+            // i hate this
+            baseQuery = baseQuery.Where(e => e.SortName![0] > query.NameStartsWithOrGreater[0]);
+        }
+
+        if (!string.IsNullOrWhiteSpace(query.NameLessThan))
+        {
+            // i hate this
+            baseQuery = baseQuery.Where(e => e.SortName![0] < query.NameLessThan[0]);
+        }
+
+        if (query.ImageTypes.Length > 0)
+        {
+            baseQuery = baseQuery.Where(e => query.ImageTypes.Any(f => e.Images!.Contains(f.ToString(), StringComparison.InvariantCulture)));
+        }
+
+        if (query.IsLiked.HasValue)
+        {
+            baseQuery = baseQuery
+                .Where(e => e.UserData!.FirstOrDefault(f => f.UserId.Equals(query.User!.Id) && f.Key == e.UserDataKey)!.Rating >= UserItemData.MinLikeValue);
+        }
+
+        if (query.IsFavoriteOrLiked.HasValue)
+        {
+            baseQuery = baseQuery
+                .Where(e => e.UserData!.FirstOrDefault(f => f.UserId.Equals(query.User!.Id) && f.Key == e.UserDataKey)!.IsFavorite == query.IsFavoriteOrLiked);
+        }
+
+        if (query.IsFavorite.HasValue)
+        {
+            baseQuery = baseQuery
+                .Where(e => e.UserData!.FirstOrDefault(f => f.UserId.Equals(query.User!.Id) && f.Key == e.UserDataKey)!.IsFavorite == query.IsFavorite);
+        }
+
+        if (query.IsPlayed.HasValue)
+        {
+            baseQuery = baseQuery
+                   .Where(e => e.UserData!.FirstOrDefault(f => f.UserId.Equals(query.User!.Id) && f.Key == e.UserDataKey)!.Played == query.IsPlayed.Value);
+        }
+
+        if (query.IsResumable.HasValue)
+        {
+            if (query.IsResumable.Value)
+            {
+                baseQuery = baseQuery
+                       .Where(e => e.UserData!.FirstOrDefault(f => f.UserId.Equals(query.User!.Id) && f.Key == e.UserDataKey)!.PlaybackPositionTicks > 0);
+            }
+            else
+            {
+                baseQuery = baseQuery
+                       .Where(e => e.UserData!.FirstOrDefault(f => f.UserId.Equals(query.User!.Id) && f.Key == e.UserDataKey)!.PlaybackPositionTicks == 0);
+            }
+        }
+
+        if (query.ArtistIds.Length > 0)
+        {
+            baseQuery = baseQuery
+                   .Where(e => e.ItemValues!.Any(f => f.Type <= 1 && context.BaseItems.Where(w => query.ArtistIds.Contains(w.Id)).Any(w => w.CleanName == f.CleanValue)));
+        }
+
+        if (query.AlbumArtistIds.Length > 0)
+        {
+            baseQuery = baseQuery
+               .Where(e => e.ItemValues!.Any(f => f.Type == 1 && context.BaseItems.Where(w => query.ArtistIds.Contains(w.Id)).Any(w => w.CleanName == f.CleanValue)));
+        }
+
+        if (query.ContributingArtistIds.Length > 0)
+        {
+            var contributingArtists = context.BaseItems.Where(e => query.ContributingArtistIds.Contains(e.Id));
+            baseQuery = baseQuery.Where(e => e.ItemValues!.Any(f => f.Type == 0 && contributingArtists.Any(w => w.CleanName == f.CleanValue)));
+
+            clauseBuilder.Append('(');
+            for (var i = 0; i < query.ContributingArtistIds.Length; i++)
+            {
+                clauseBuilder.Append("((select CleanName from TypedBaseItems where guid=@ArtistIds")
+                    .Append(i)
+                    .Append(") in (select CleanValue from ItemValues where ItemId=Guid and Type=0) AND (select CleanName from TypedBaseItems where guid=@ArtistIds")
+                    .Append(i)
+                    .Append(") not in (select CleanValue from ItemValues where ItemId=Guid and Type=1)) OR ");
+                statement?.TryBind("@ArtistIds" + i, query.ContributingArtistIds[i]);
+            }
+
+            clauseBuilder.Length -= Or.Length;
+            whereClauses.Add(clauseBuilder.Append(')').ToString());
+            clauseBuilder.Length = 0;
+        }
+
+        if (query.AlbumIds.Length > 0)
+        {
+            clauseBuilder.Append('(');
+            for (var i = 0; i < query.AlbumIds.Length; i++)
+            {
+                clauseBuilder.Append("Album in (select Name from typedbaseitems where guid=@AlbumIds")
+                    .Append(i)
+                    .Append(") OR ");
+                statement?.TryBind("@AlbumIds" + i, query.AlbumIds[i]);
+            }
+
+            clauseBuilder.Length -= Or.Length;
+            whereClauses.Add(clauseBuilder.Append(')').ToString());
+            clauseBuilder.Length = 0;
+        }
+
+        if (query.ExcludeArtistIds.Length > 0)
+        {
+            clauseBuilder.Append('(');
+            for (var i = 0; i < query.ExcludeArtistIds.Length; i++)
+            {
+                clauseBuilder.Append("(guid not in (select itemid from ItemValues where CleanValue = (select CleanName from TypedBaseItems where guid=@ExcludeArtistId")
+                    .Append(i)
+                    .Append(") and Type<=1)) OR ");
+                statement?.TryBind("@ExcludeArtistId" + i, query.ExcludeArtistIds[i]);
+            }
+
+            clauseBuilder.Length -= Or.Length;
+            whereClauses.Add(clauseBuilder.Append(')').ToString());
+            clauseBuilder.Length = 0;
+        }
+
+        if (query.GenreIds.Count > 0)
+        {
+            clauseBuilder.Append('(');
+            for (var i = 0; i < query.GenreIds.Count; i++)
+            {
+                clauseBuilder.Append("(guid in (select itemid from ItemValues where CleanValue = (select CleanName from TypedBaseItems where guid=@GenreId")
+                    .Append(i)
+                    .Append(") and Type=2)) OR ");
+                statement?.TryBind("@GenreId" + i, query.GenreIds[i]);
+            }
+
+            clauseBuilder.Length -= Or.Length;
+            whereClauses.Add(clauseBuilder.Append(')').ToString());
+            clauseBuilder.Length = 0;
+        }
+
+        if (query.Genres.Count > 0)
+        {
+            clauseBuilder.Append('(');
+            for (var i = 0; i < query.Genres.Count; i++)
+            {
+                clauseBuilder.Append("@Genre")
+                    .Append(i)
+                    .Append(" in (select CleanValue from ItemValues where ItemId=Guid and Type=2) OR ");
+                statement?.TryBind("@Genre" + i, GetCleanValue(query.Genres[i]));
+            }
+
+            clauseBuilder.Length -= Or.Length;
+            whereClauses.Add(clauseBuilder.Append(')').ToString());
+            clauseBuilder.Length = 0;
+        }
+
+        if (tags.Count > 0)
+        {
+            clauseBuilder.Append('(');
+            for (var i = 0; i < tags.Count; i++)
+            {
+                clauseBuilder.Append("@Tag")
+                    .Append(i)
+                    .Append(" in (select CleanValue from ItemValues where ItemId=Guid and Type=4) OR ");
+                statement?.TryBind("@Tag" + i, GetCleanValue(tags[i]));
+            }
+
+            clauseBuilder.Length -= Or.Length;
+            whereClauses.Add(clauseBuilder.Append(')').ToString());
+            clauseBuilder.Length = 0;
+        }
+
+        if (excludeTags.Count > 0)
+        {
+            clauseBuilder.Append('(');
+            for (var i = 0; i < excludeTags.Count; i++)
+            {
+                clauseBuilder.Append("@ExcludeTag")
+                    .Append(i)
+                    .Append(" not in (select CleanValue from ItemValues where ItemId=Guid and Type=4) OR ");
+                statement?.TryBind("@ExcludeTag" + i, GetCleanValue(excludeTags[i]));
+            }
+
+            clauseBuilder.Length -= Or.Length;
+            whereClauses.Add(clauseBuilder.Append(')').ToString());
+            clauseBuilder.Length = 0;
+        }
+
+        if (query.StudioIds.Length > 0)
+        {
+            clauseBuilder.Append('(');
+            for (var i = 0; i < query.StudioIds.Length; i++)
+            {
+                clauseBuilder.Append("(guid in (select itemid from ItemValues where CleanValue = (select CleanName from TypedBaseItems where guid=@StudioId")
+                    .Append(i)
+                    .Append(") and Type=3)) OR ");
+                statement?.TryBind("@StudioId" + i, query.StudioIds[i]);
+            }
+
+            clauseBuilder.Length -= Or.Length;
+            whereClauses.Add(clauseBuilder.Append(')').ToString());
+            clauseBuilder.Length = 0;
+        }
+
+        if (query.OfficialRatings.Length > 0)
+        {
+            clauseBuilder.Append('(');
+            for (var i = 0; i < query.OfficialRatings.Length; i++)
+            {
+                clauseBuilder.Append("OfficialRating=@OfficialRating").Append(i).Append(Or);
+                statement?.TryBind("@OfficialRating" + i, query.OfficialRatings[i]);
+            }
+
+            clauseBuilder.Length -= Or.Length;
+            whereClauses.Add(clauseBuilder.Append(')').ToString());
+            clauseBuilder.Length = 0;
+        }
+
+        clauseBuilder.Append('(');
+        if (query.HasParentalRating ?? false)
+        {
+            clauseBuilder.Append("InheritedParentalRatingValue not null");
+            if (query.MinParentalRating.HasValue)
+            {
+                clauseBuilder.Append(" AND InheritedParentalRatingValue >= @MinParentalRating");
+                statement?.TryBind("@MinParentalRating", query.MinParentalRating.Value);
+            }
+
+            if (query.MaxParentalRating.HasValue)
+            {
+                clauseBuilder.Append(" AND InheritedParentalRatingValue <= @MaxParentalRating");
+                statement?.TryBind("@MaxParentalRating", query.MaxParentalRating.Value);
+            }
+        }
+        else if (query.BlockUnratedItems.Length > 0)
+        {
+            const string ParamName = "@UnratedType";
+            clauseBuilder.Append("(InheritedParentalRatingValue is null AND UnratedType not in (");
+
+            for (int i = 0; i < query.BlockUnratedItems.Length; i++)
+            {
+                clauseBuilder.Append(ParamName).Append(i).Append(',');
+                statement?.TryBind(ParamName + i, query.BlockUnratedItems[i].ToString());
+            }
+
+            // Remove trailing comma
+            clauseBuilder.Length--;
+            clauseBuilder.Append("))");
+
+            if (query.MinParentalRating.HasValue || query.MaxParentalRating.HasValue)
+            {
+                clauseBuilder.Append(" OR (");
+            }
+
+            if (query.MinParentalRating.HasValue)
+            {
+                clauseBuilder.Append("InheritedParentalRatingValue >= @MinParentalRating");
+                statement?.TryBind("@MinParentalRating", query.MinParentalRating.Value);
+            }
+
+            if (query.MaxParentalRating.HasValue)
+            {
+                if (query.MinParentalRating.HasValue)
+                {
+                    clauseBuilder.Append(" AND ");
+                }
+
+                clauseBuilder.Append("InheritedParentalRatingValue <= @MaxParentalRating");
+                statement?.TryBind("@MaxParentalRating", query.MaxParentalRating.Value);
+            }
+
+            if (query.MinParentalRating.HasValue || query.MaxParentalRating.HasValue)
+            {
+                clauseBuilder.Append(')');
+            }
+
+            if (!(query.MinParentalRating.HasValue || query.MaxParentalRating.HasValue))
+            {
+                clauseBuilder.Append(" OR InheritedParentalRatingValue not null");
+            }
+        }
+        else if (query.MinParentalRating.HasValue)
+        {
+            clauseBuilder.Append("InheritedParentalRatingValue is null OR (InheritedParentalRatingValue >= @MinParentalRating");
+            statement?.TryBind("@MinParentalRating", query.MinParentalRating.Value);
+
+            if (query.MaxParentalRating.HasValue)
+            {
+                clauseBuilder.Append(" AND InheritedParentalRatingValue <= @MaxParentalRating");
+                statement?.TryBind("@MaxParentalRating", query.MaxParentalRating.Value);
+            }
+
+            clauseBuilder.Append(')');
+        }
+        else if (query.MaxParentalRating.HasValue)
+        {
+            clauseBuilder.Append("InheritedParentalRatingValue is null OR InheritedParentalRatingValue <= @MaxParentalRating");
+            statement?.TryBind("@MaxParentalRating", query.MaxParentalRating.Value);
+        }
+        else if (!query.HasParentalRating ?? false)
+        {
+            clauseBuilder.Append("InheritedParentalRatingValue is null");
+        }
+
+        if (clauseBuilder.Length > 1)
+        {
+            whereClauses.Add(clauseBuilder.Append(')').ToString());
+            clauseBuilder.Length = 0;
+        }
+
+        if (query.HasOfficialRating.HasValue)
+        {
+            if (query.HasOfficialRating.Value)
+            {
+                whereClauses.Add("(OfficialRating not null AND OfficialRating<>'')");
+            }
+            else
+            {
+                whereClauses.Add("(OfficialRating is null OR OfficialRating='')");
+            }
+        }
+
+        if (query.HasOverview.HasValue)
+        {
+            if (query.HasOverview.Value)
+            {
+                whereClauses.Add("(Overview not null AND Overview<>'')");
+            }
+            else
+            {
+                whereClauses.Add("(Overview is null OR Overview='')");
+            }
+        }
+
+        if (query.HasOwnerId.HasValue)
+        {
+            if (query.HasOwnerId.Value)
+            {
+                whereClauses.Add("OwnerId not null");
+            }
+            else
+            {
+                whereClauses.Add("OwnerId is null");
+            }
+        }
+
+        if (!string.IsNullOrWhiteSpace(query.HasNoAudioTrackWithLanguage))
+        {
+            whereClauses.Add("((select language from MediaStreams where MediaStreams.ItemId=A.Guid and MediaStreams.StreamType='Audio' and MediaStreams.Language=@HasNoAudioTrackWithLanguage limit 1) is null)");
+            statement?.TryBind("@HasNoAudioTrackWithLanguage", query.HasNoAudioTrackWithLanguage);
+        }
+
+        if (!string.IsNullOrWhiteSpace(query.HasNoInternalSubtitleTrackWithLanguage))
+        {
+            whereClauses.Add("((select language from MediaStreams where MediaStreams.ItemId=A.Guid and MediaStreams.StreamType='Subtitle' and MediaStreams.IsExternal=0 and MediaStreams.Language=@HasNoInternalSubtitleTrackWithLanguage limit 1) is null)");
+            statement?.TryBind("@HasNoInternalSubtitleTrackWithLanguage", query.HasNoInternalSubtitleTrackWithLanguage);
+        }
+
+        if (!string.IsNullOrWhiteSpace(query.HasNoExternalSubtitleTrackWithLanguage))
+        {
+            whereClauses.Add("((select language from MediaStreams where MediaStreams.ItemId=A.Guid and MediaStreams.StreamType='Subtitle' and MediaStreams.IsExternal=1 and MediaStreams.Language=@HasNoExternalSubtitleTrackWithLanguage limit 1) is null)");
+            statement?.TryBind("@HasNoExternalSubtitleTrackWithLanguage", query.HasNoExternalSubtitleTrackWithLanguage);
+        }
+
+        if (!string.IsNullOrWhiteSpace(query.HasNoSubtitleTrackWithLanguage))
+        {
+            whereClauses.Add("((select language from MediaStreams where MediaStreams.ItemId=A.Guid and MediaStreams.StreamType='Subtitle' and MediaStreams.Language=@HasNoSubtitleTrackWithLanguage limit 1) is null)");
+            statement?.TryBind("@HasNoSubtitleTrackWithLanguage", query.HasNoSubtitleTrackWithLanguage);
+        }
+
+        if (query.HasSubtitles.HasValue)
+        {
+            if (query.HasSubtitles.Value)
+            {
+                whereClauses.Add("((select type from MediaStreams where MediaStreams.ItemId=A.Guid and MediaStreams.StreamType='Subtitle' limit 1) not null)");
+            }
+            else
+            {
+                whereClauses.Add("((select type from MediaStreams where MediaStreams.ItemId=A.Guid and MediaStreams.StreamType='Subtitle' limit 1) is null)");
+            }
+        }
+
+        if (query.HasChapterImages.HasValue)
+        {
+            if (query.HasChapterImages.Value)
+            {
+                whereClauses.Add("((select imagepath from Chapters2 where Chapters2.ItemId=A.Guid and imagepath not null limit 1) not null)");
+            }
+            else
+            {
+                whereClauses.Add("((select imagepath from Chapters2 where Chapters2.ItemId=A.Guid and imagepath not null limit 1) is null)");
+            }
+        }
+
+        if (query.HasDeadParentId.HasValue && query.HasDeadParentId.Value)
+        {
+            whereClauses.Add("ParentId NOT NULL AND ParentId NOT IN (select guid from TypedBaseItems)");
+        }
+
+        if (query.IsDeadArtist.HasValue && query.IsDeadArtist.Value)
+        {
+            whereClauses.Add("CleanName not in (Select CleanValue From ItemValues where Type in (0,1))");
+        }
+
+        if (query.IsDeadStudio.HasValue && query.IsDeadStudio.Value)
+        {
+            whereClauses.Add("CleanName not in (Select CleanValue From ItemValues where Type = 3)");
+        }
+
+        if (query.IsDeadPerson.HasValue && query.IsDeadPerson.Value)
+        {
+            whereClauses.Add("Name not in (Select Name From People)");
+        }
+
+        if (query.Years.Length == 1)
+        {
+            whereClauses.Add("ProductionYear=@Years");
+            statement?.TryBind("@Years", query.Years[0].ToString(CultureInfo.InvariantCulture));
+        }
+        else if (query.Years.Length > 1)
+        {
+            var val = string.Join(',', query.Years);
+            whereClauses.Add("ProductionYear in (" + val + ")");
+        }
+
+        var isVirtualItem = query.IsVirtualItem ?? query.IsMissing;
+        if (isVirtualItem.HasValue)
+        {
+            whereClauses.Add("IsVirtualItem=@IsVirtualItem");
+            statement?.TryBind("@IsVirtualItem", isVirtualItem.Value);
+        }
+
+        if (query.IsSpecialSeason.HasValue)
+        {
+            if (query.IsSpecialSeason.Value)
+            {
+                whereClauses.Add("IndexNumber = 0");
+            }
+            else
+            {
+                whereClauses.Add("IndexNumber <> 0");
+            }
+        }
+
+        if (query.IsUnaired.HasValue)
+        {
+            if (query.IsUnaired.Value)
+            {
+                whereClauses.Add("PremiereDate >= DATETIME('now')");
+            }
+            else
+            {
+                whereClauses.Add("PremiereDate < DATETIME('now')");
+            }
+        }
+
+        if (query.MediaTypes.Length == 1)
+        {
+            whereClauses.Add("MediaType=@MediaTypes");
+            statement?.TryBind("@MediaTypes", query.MediaTypes[0].ToString());
+        }
+        else if (query.MediaTypes.Length > 1)
+        {
+            var val = string.Join(',', query.MediaTypes.Select(i => $"'{i}'"));
+            whereClauses.Add("MediaType in (" + val + ")");
+        }
+
+        if (query.ItemIds.Length > 0)
+        {
+            var includeIds = new List<string>();
+            var index = 0;
+            foreach (var id in query.ItemIds)
+            {
+                includeIds.Add("Guid = @IncludeId" + index);
+                statement?.TryBind("@IncludeId" + index, id);
+                index++;
+            }
+
+            whereClauses.Add("(" + string.Join(" OR ", includeIds) + ")");
+        }
+
+        if (query.ExcludeItemIds.Length > 0)
+        {
+            var excludeIds = new List<string>();
+            var index = 0;
+            foreach (var id in query.ExcludeItemIds)
+            {
+                excludeIds.Add("Guid <> @ExcludeId" + index);
+                statement?.TryBind("@ExcludeId" + index, id);
+                index++;
+            }
+
+            whereClauses.Add(string.Join(" AND ", excludeIds));
+        }
+
+        if (query.ExcludeProviderIds is not null && query.ExcludeProviderIds.Count > 0)
+        {
+            var excludeIds = new List<string>();
+
+            var index = 0;
+            foreach (var pair in query.ExcludeProviderIds)
+            {
+                if (string.Equals(pair.Key, nameof(MetadataProvider.TmdbCollection), StringComparison.OrdinalIgnoreCase))
+                {
+                    continue;
+                }
+
+                var paramName = "@ExcludeProviderId" + index;
+                excludeIds.Add("(ProviderIds is null or ProviderIds not like " + paramName + ")");
+                statement?.TryBind(paramName, "%" + pair.Key + "=" + pair.Value + "%");
+                index++;
+
+                break;
+            }
+
+            if (excludeIds.Count > 0)
+            {
+                whereClauses.Add(string.Join(" AND ", excludeIds));
+            }
+        }
+
+        if (query.HasAnyProviderId is not null && query.HasAnyProviderId.Count > 0)
+        {
+            var hasProviderIds = new List<string>();
+
+            var index = 0;
+            foreach (var pair in query.HasAnyProviderId)
+            {
+                if (string.Equals(pair.Key, nameof(MetadataProvider.TmdbCollection), StringComparison.OrdinalIgnoreCase))
+                {
+                    continue;
+                }
+
+                // TODO this seems to be an idea for a better schema where ProviderIds are their own table
+                //      but this is not implemented
+                // hasProviderIds.Add("(COALESCE((select value from ProviderIds where ItemId=Guid and Name = '" + pair.Key + "'), '') <> " + paramName + ")");
+
+                // TODO this is a really BAD way to do it since the pair:
+                //      Tmdb, 1234 matches Tmdb=1234 but also Tmdb=1234567
+                //      and maybe even NotTmdb=1234.
+
+                // this is a placeholder for this specific pair to correlate it in the bigger query
+                var paramName = "@HasAnyProviderId" + index;
+
+                // this is a search for the placeholder
+                hasProviderIds.Add("ProviderIds like " + paramName);
+
+                // this replaces the placeholder with a value, here: %key=val%
+                statement?.TryBind(paramName, "%" + pair.Key + "=" + pair.Value + "%");
+                index++;
+
+                break;
+            }
+
+            if (hasProviderIds.Count > 0)
+            {
+                whereClauses.Add("(" + string.Join(" OR ", hasProviderIds) + ")");
+            }
+        }
+
+        if (query.HasImdbId.HasValue)
+        {
+            whereClauses.Add(GetProviderIdClause(query.HasImdbId.Value, "imdb"));
+        }
+
+        if (query.HasTmdbId.HasValue)
+        {
+            whereClauses.Add(GetProviderIdClause(query.HasTmdbId.Value, "tmdb"));
+        }
+
+        if (query.HasTvdbId.HasValue)
+        {
+            whereClauses.Add(GetProviderIdClause(query.HasTvdbId.Value, "tvdb"));
+        }
+
+        var queryTopParentIds = query.TopParentIds;
+
+        if (queryTopParentIds.Length > 0)
+        {
+            var includedItemByNameTypes = GetItemByNameTypesInQuery(query);
+            var enableItemsByName = (query.IncludeItemsByName ?? false) && includedItemByNameTypes.Count > 0;
+
+            if (queryTopParentIds.Length == 1)
+            {
+                if (enableItemsByName && includedItemByNameTypes.Count == 1)
+                {
+                    whereClauses.Add("(TopParentId=@TopParentId or Type=@IncludedItemByNameType)");
+                    statement?.TryBind("@IncludedItemByNameType", includedItemByNameTypes[0]);
+                }
+                else if (enableItemsByName && includedItemByNameTypes.Count > 1)
+                {
+                    var itemByNameTypeVal = string.Join(',', includedItemByNameTypes.Select(i => "'" + i + "'"));
+                    whereClauses.Add("(TopParentId=@TopParentId or Type in (" + itemByNameTypeVal + "))");
+                }
+                else
+                {
+                    whereClauses.Add("(TopParentId=@TopParentId)");
+                }
+
+                statement?.TryBind("@TopParentId", queryTopParentIds[0].ToString("N", CultureInfo.InvariantCulture));
+            }
+            else if (queryTopParentIds.Length > 1)
+            {
+                var val = string.Join(',', queryTopParentIds.Select(i => "'" + i.ToString("N", CultureInfo.InvariantCulture) + "'"));
+
+                if (enableItemsByName && includedItemByNameTypes.Count == 1)
+                {
+                    whereClauses.Add("(Type=@IncludedItemByNameType or TopParentId in (" + val + "))");
+                    statement?.TryBind("@IncludedItemByNameType", includedItemByNameTypes[0]);
+                }
+                else if (enableItemsByName && includedItemByNameTypes.Count > 1)
+                {
+                    var itemByNameTypeVal = string.Join(',', includedItemByNameTypes.Select(i => "'" + i + "'"));
+                    whereClauses.Add("(Type in (" + itemByNameTypeVal + ") or TopParentId in (" + val + "))");
+                }
+                else
+                {
+                    whereClauses.Add("TopParentId in (" + val + ")");
+                }
+            }
+        }
+
+        if (query.AncestorIds.Length == 1)
+        {
+            whereClauses.Add("Guid in (select itemId from AncestorIds where AncestorId=@AncestorId)");
+            statement?.TryBind("@AncestorId", query.AncestorIds[0]);
+        }
+
+        if (query.AncestorIds.Length > 1)
+        {
+            var inClause = string.Join(',', query.AncestorIds.Select(i => "'" + i.ToString("N", CultureInfo.InvariantCulture) + "'"));
+            whereClauses.Add(string.Format(CultureInfo.InvariantCulture, "Guid in (select itemId from AncestorIds where AncestorIdText in ({0}))", inClause));
+        }
+
+        if (!string.IsNullOrWhiteSpace(query.AncestorWithPresentationUniqueKey))
+        {
+            var inClause = "select guid from TypedBaseItems where PresentationUniqueKey=@AncestorWithPresentationUniqueKey";
+            whereClauses.Add(string.Format(CultureInfo.InvariantCulture, "Guid in (select itemId from AncestorIds where AncestorId in ({0}))", inClause));
+            statement?.TryBind("@AncestorWithPresentationUniqueKey", query.AncestorWithPresentationUniqueKey);
+        }
+
+        if (!string.IsNullOrWhiteSpace(query.SeriesPresentationUniqueKey))
+        {
+            whereClauses.Add("SeriesPresentationUniqueKey=@SeriesPresentationUniqueKey");
+            statement?.TryBind("@SeriesPresentationUniqueKey", query.SeriesPresentationUniqueKey);
+        }
+
+        if (query.ExcludeInheritedTags.Length > 0)
+        {
+            var paramName = "@ExcludeInheritedTags";
+            if (statement is null)
+            {
+                int index = 0;
+                string excludedTags = string.Join(',', query.ExcludeInheritedTags.Select(_ => paramName + index++));
+                whereClauses.Add("((select CleanValue from ItemValues where ItemId=Guid and Type=6 and cleanvalue in (" + excludedTags + ")) is null)");
+            }
+            else
+            {
+                for (int index = 0; index < query.ExcludeInheritedTags.Length; index++)
+                {
+                    statement.TryBind(paramName + index, GetCleanValue(query.ExcludeInheritedTags[index]));
+                }
+            }
+        }
+
+        if (query.IncludeInheritedTags.Length > 0)
+        {
+            var paramName = "@IncludeInheritedTags";
+            if (statement is null)
+            {
+                int index = 0;
+                string includedTags = string.Join(',', query.IncludeInheritedTags.Select(_ => paramName + index++));
+                // Episodes do not store inherit tags from their parents in the database, and the tag may be still required by the client.
+                // In addtion to the tags for the episodes themselves, we need to manually query its parent (the season)'s tags as well.
+                if (includeTypes.Length == 1 && includeTypes.FirstOrDefault() is BaseItemKind.Episode)
+                {
+                    whereClauses.Add($"""
+                                          ((select CleanValue from ItemValues where ItemId=Guid and Type=6 and CleanValue in ({includedTags})) is not null
+                                          OR (select CleanValue from ItemValues where ItemId=ParentId and Type=6 and CleanValue in ({includedTags})) is not null)
+                                          """);
+                }
+
+                // A playlist should be accessible to its owner regardless of allowed tags.
+                else if (includeTypes.Length == 1 && includeTypes.FirstOrDefault() is BaseItemKind.Playlist)
+                {
+                    whereClauses.Add($"""
+                                          ((select CleanValue from ItemValues where ItemId=Guid and Type=6 and CleanValue in ({includedTags})) is not null
+                                          OR data like @PlaylistOwnerUserId)
+                                          """);
+                }
+                else
+                {
+                    whereClauses.Add("((select CleanValue from ItemValues where ItemId=Guid and Type=6 and cleanvalue in (" + includedTags + ")) is not null)");
+                }
+            }
+            else
+            {
+                for (int index = 0; index < query.IncludeInheritedTags.Length; index++)
+                {
+                    statement.TryBind(paramName + index, GetCleanValue(query.IncludeInheritedTags[index]));
+                }
+
+                if (query.User is not null)
+                {
+                    statement.TryBind("@PlaylistOwnerUserId", $"""%"OwnerUserId":"{query.User.Id.ToString("N")}"%""");
+                }
+            }
+        }
+
+        if (query.SeriesStatuses.Length > 0)
+        {
+            var statuses = new List<string>();
+
+            foreach (var seriesStatus in query.SeriesStatuses)
+            {
+                statuses.Add("data like  '%" + seriesStatus + "%'");
+            }
+
+            whereClauses.Add("(" + string.Join(" OR ", statuses) + ")");
+        }
+
+        if (query.BoxSetLibraryFolders.Length > 0)
+        {
+            var folderIdQueries = new List<string>();
+
+            foreach (var folderId in query.BoxSetLibraryFolders)
+            {
+                folderIdQueries.Add("data like '%" + folderId.ToString("N", CultureInfo.InvariantCulture) + "%'");
+            }
+
+            whereClauses.Add("(" + string.Join(" OR ", folderIdQueries) + ")");
+        }
+
+        if (query.VideoTypes.Length > 0)
+        {
+            var videoTypes = new List<string>();
+
+            foreach (var videoType in query.VideoTypes)
+            {
+                videoTypes.Add("data like '%\"VideoType\":\"" + videoType + "\"%'");
+            }
+
+            whereClauses.Add("(" + string.Join(" OR ", videoTypes) + ")");
+        }
+
+        if (query.Is3D.HasValue)
+        {
+            if (query.Is3D.Value)
+            {
+                whereClauses.Add("data like '%Video3DFormat%'");
+            }
+            else
+            {
+                whereClauses.Add("data not like '%Video3DFormat%'");
+            }
+        }
+
+        if (query.IsPlaceHolder.HasValue)
+        {
+            if (query.IsPlaceHolder.Value)
+            {
+                whereClauses.Add("data like '%\"IsPlaceHolder\":true%'");
+            }
+            else
+            {
+                whereClauses.Add("(data is null or data not like '%\"IsPlaceHolder\":true%')");
+            }
+        }
+
+        if (query.HasSpecialFeature.HasValue)
+        {
+            if (query.HasSpecialFeature.Value)
+            {
+                whereClauses.Add("ExtraIds not null");
+            }
+            else
+            {
+                whereClauses.Add("ExtraIds is null");
+            }
+        }
+
+        if (query.HasTrailer.HasValue)
+        {
+            if (query.HasTrailer.Value)
+            {
+                whereClauses.Add("ExtraIds not null");
+            }
+            else
+            {
+                whereClauses.Add("ExtraIds is null");
+            }
+        }
+
+        if (query.HasThemeSong.HasValue)
+        {
+            if (query.HasThemeSong.Value)
+            {
+                whereClauses.Add("ExtraIds not null");
+            }
+            else
+            {
+                whereClauses.Add("ExtraIds is null");
+            }
+        }
+
+        if (query.HasThemeVideo.HasValue)
+        {
+            if (query.HasThemeVideo.Value)
+            {
+                whereClauses.Add("ExtraIds not null");
+            }
+            else
+            {
+                whereClauses.Add("ExtraIds is null");
+            }
+        }
     }
 
     /// <summary>
@@ -58,14 +1357,26 @@ public class BaseItemManager
             .FirstOrDefault(t => t is not null));
     }
 
-    /// <summary>
-    /// Saves the items.
-    /// </summary>
-    /// <param name="items">The items.</param>
-    /// <param name="cancellationToken">The cancellation token.</param>
-    /// <exception cref="ArgumentNullException">
-    /// <paramref name="items"/> or <paramref name="cancellationToken"/> is <c>null</c>.
-    /// </exception>
+    /// <inheritdoc cref="IItemRepository" />
+    public void SaveImages(BaseItem item)
+    {
+        ArgumentNullException.ThrowIfNull(item);
+
+        var images = SerializeImages(item.ImageInfos);
+        using var db = _dbProvider.CreateDbContext();
+
+        db.BaseItems
+            .Where(e => e.Id.Equals(item.Id))
+            .ExecuteUpdate(e => e.SetProperty(f => f.Images, images));
+    }
+
+    /// <inheritdoc cref="IItemRepository" />
+    public void SaveItems(IReadOnlyList<BaseItemDto> items, CancellationToken cancellationToken)
+    {
+        UpdateOrInsertItems(items, cancellationToken);
+    }
+
+    /// <inheritdoc cref="IItemRepository" />
     public void UpdateOrInsertItems(IReadOnlyList<BaseItemDto> items, CancellationToken cancellationToken)
     {
         ArgumentNullException.ThrowIfNull(items);
@@ -124,7 +1435,8 @@ public class BaseItemManager
         context.SaveChanges(true);
     }
 
-    public BaseItemDto? GetSingle(Guid id)
+    /// <inheritdoc cref="IItemRepository" />
+    public BaseItemDto? RetrieveItem(Guid id)
     {
         if (id.IsEmpty())
         {
@@ -141,13 +1453,6 @@ public class BaseItemManager
         return DeserialiseBaseItem(item);
     }
 
-    private BaseItemDto DeserialiseBaseItem(BaseItemEntity baseItemEntity)
-    {
-        var type = GetType(baseItemEntity.Type) ?? throw new InvalidOperationException("Cannot deserialise unkown type.");
-        var dto = Activator.CreateInstance(type) as BaseItemDto ?? throw new InvalidOperationException("Cannot deserialise unkown type.");;
-        return Map(baseItemEntity, dto);
-    }
-
     /// <summary>
     /// Maps a Entity to the DTO.
     /// </summary>
@@ -462,6 +1767,13 @@ public class BaseItemManager
         return entity;
     }
 
+    private BaseItemDto DeserialiseBaseItem(BaseItemEntity baseItemEntity)
+    {
+        var type = GetType(baseItemEntity.Type) ?? throw new InvalidOperationException("Cannot deserialise unkown type.");
+        var dto = Activator.CreateInstance(type) as BaseItemDto ?? throw new InvalidOperationException("Cannot deserialise unkown type."); ;
+        return Map(baseItemEntity, dto);
+    }
+
     private string GetCleanValue(string value)
     {
         if (string.IsNullOrWhiteSpace(value))
diff --git a/Jellyfin.Server.Implementations/Item/ChapterManager.cs b/Jellyfin.Server.Implementations/Item/ChapterManager.cs
index 273cc96ba..7b0f98fde 100644
--- a/Jellyfin.Server.Implementations/Item/ChapterManager.cs
+++ b/Jellyfin.Server.Implementations/Item/ChapterManager.cs
@@ -1,26 +1,74 @@
 using System;
 using System.Collections.Generic;
+using System.Collections.Immutable;
 using System.Linq;
 using Jellyfin.Data.Entities;
+using MediaBrowser.Controller.Chapters;
+using MediaBrowser.Controller.Drawing;
+using MediaBrowser.Model.Dto;
 using MediaBrowser.Model.Entities;
 using Microsoft.EntityFrameworkCore;
-using BaseItemDto = MediaBrowser.Controller.Entities.BaseItem;
 
 namespace Jellyfin.Server.Implementations.Item;
 
-public class ChapterManager
+/// <summary>
+/// The Chapter manager.
+/// </summary>
+public class ChapterManager : IChapterManager
 {
     private readonly IDbContextFactory<JellyfinDbContext> _dbProvider;
+    private readonly IImageProcessor _imageProcessor;
 
-    public ChapterManager(IDbContextFactory<JellyfinDbContext> dbProvider)
+    /// <summary>
+    /// Initializes a new instance of the <see cref="ChapterManager"/> class.
+    /// </summary>
+    /// <param name="dbProvider">The EFCore provider.</param>
+    /// <param name="imageProcessor">The Image Processor.</param>
+    public ChapterManager(IDbContextFactory<JellyfinDbContext> dbProvider, IImageProcessor imageProcessor)
     {
         _dbProvider = dbProvider;
+        _imageProcessor = imageProcessor;
     }
 
-    public IReadOnlyList<ChapterInfo> GetChapters(BaseItemDto baseItemDto)
+    /// <inheritdoc cref="IChapterManager"/>
+    public ChapterInfo? GetChapter(BaseItemDto baseItem, int index)
     {
         using var context = _dbProvider.CreateDbContext();
-        return context.Chapters.Where(e => e.ItemId.Equals(baseItemDto.Id)).Select(Map).ToList();
+        var chapter = context.Chapters.FirstOrDefault(e => e.ItemId.Equals(baseItem.Id) && e.ChapterIndex == index);
+        if (chapter is not null)
+        {
+            return Map(chapter, baseItem);
+        }
+
+        return null;
+    }
+
+    /// <inheritdoc cref="IChapterManager"/>
+    public IReadOnlyList<ChapterInfo> GetChapters(BaseItemDto baseItem)
+    {
+        using var context = _dbProvider.CreateDbContext();
+        return context.Chapters.Where(e => e.ItemId.Equals(baseItem.Id))
+            .ToList()
+            .Select(e => Map(e, baseItem))
+            .ToImmutableArray();
+    }
+
+    /// <inheritdoc cref="IChapterManager"/>
+    public void SaveChapters(Guid itemId, IReadOnlyList<ChapterInfo> chapters)
+    {
+        using var context = _dbProvider.CreateDbContext();
+        using (var transaction = context.Database.BeginTransaction())
+        {
+            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();
+        }
     }
 
     private Chapter Map(ChapterInfo chapterInfo, int index, Guid itemId)
diff --git a/MediaBrowser.Controller/Chapters/ChapterManager.cs b/MediaBrowser.Controller/Chapters/ChapterManager.cs
new file mode 100644
index 000000000..a9e11f603
--- /dev/null
+++ b/MediaBrowser.Controller/Chapters/ChapterManager.cs
@@ -0,0 +1,24 @@
+#pragma warning disable CS1591
+
+using System;
+using System.Collections.Generic;
+using MediaBrowser.Controller.Chapters;
+using MediaBrowser.Controller.Persistence;
+using MediaBrowser.Model.Entities;
+
+namespace MediaBrowser.Providers.Chapters
+{
+    public class ChapterManager : IChapterManager
+    {
+        public ChapterManager(IDbContextFactory<JellyfinDbContext> dbProvider)
+        {
+            _itemRepo = itemRepo;
+        }
+
+        /// <inheritdoc />
+        public void SaveChapters(Guid itemId, IReadOnlyList<ChapterInfo> chapters)
+        {
+            _itemRepo.SaveChapters(itemId, chapters);
+        }
+    }
+}
diff --git a/MediaBrowser.Controller/Chapters/IChapterManager.cs b/MediaBrowser.Controller/Chapters/IChapterManager.cs
index c049bb97e..55762c7fc 100644
--- a/MediaBrowser.Controller/Chapters/IChapterManager.cs
+++ b/MediaBrowser.Controller/Chapters/IChapterManager.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using MediaBrowser.Model.Dto;
 using MediaBrowser.Model.Entities;
 
 namespace MediaBrowser.Controller.Chapters
@@ -15,5 +16,20 @@ namespace MediaBrowser.Controller.Chapters
         /// <param name="itemId">The item.</param>
         /// <param name="chapters">The set of chapters.</param>
         void SaveChapters(Guid itemId, IReadOnlyList<ChapterInfo> chapters);
+
+        /// <summary>
+        /// Gets all chapters associated with the baseItem.
+        /// </summary>
+        /// <param name="baseItem">The baseitem.</param>
+        /// <returns>A readonly list of chapter instances.</returns>
+        IReadOnlyList<ChapterInfo> GetChapters(BaseItemDto baseItem);
+
+        /// <summary>
+        /// Gets a single chapter of a BaseItem on a specific index.
+        /// </summary>
+        /// <param name="baseItem">The baseitem.</param>
+        /// <param name="index">The index of that chapter.</param>
+        /// <returns>A chapter instance.</returns>
+        ChapterInfo? GetChapter(BaseItemDto baseItem, int index);
     }
 }
diff --git a/MediaBrowser.Controller/Persistence/IItemRepository.cs b/MediaBrowser.Controller/Persistence/IItemRepository.cs
index 2c52b2b45..21b9ee4b7 100644
--- a/MediaBrowser.Controller/Persistence/IItemRepository.cs
+++ b/MediaBrowser.Controller/Persistence/IItemRepository.cs
@@ -39,28 +39,6 @@ namespace MediaBrowser.Controller.Persistence
         /// <returns>BaseItem.</returns>
         BaseItem RetrieveItem(Guid id);
 
-        /// <summary>
-        /// Gets chapters for an item.
-        /// </summary>
-        /// <param name="item">The item.</param>
-        /// <returns>The list of chapter info.</returns>
-        List<ChapterInfo> GetChapters(BaseItem item);
-
-        /// <summary>
-        /// Gets a single chapter for an item.
-        /// </summary>
-        /// <param name="item">The item.</param>
-        /// <param name="index">The chapter index.</param>
-        /// <returns>The chapter info at the specified index.</returns>
-        ChapterInfo GetChapter(BaseItem item, int index);
-
-        /// <summary>
-        /// Saves the chapters.
-        /// </summary>
-        /// <param name="id">The item id.</param>
-        /// <param name="chapters">The list of chapters to save.</param>
-        void SaveChapters(Guid id, IReadOnlyList<ChapterInfo> chapters);
-
         /// <summary>
         /// Gets the media streams.
         /// </summary>
diff --git a/MediaBrowser.Providers/Chapters/ChapterManager.cs b/MediaBrowser.Providers/Chapters/ChapterManager.cs
deleted file mode 100644
index 3cbfe7d4d..000000000
--- a/MediaBrowser.Providers/Chapters/ChapterManager.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-#pragma warning disable CS1591
-
-using System;
-using System.Collections.Generic;
-using MediaBrowser.Controller.Chapters;
-using MediaBrowser.Controller.Persistence;
-using MediaBrowser.Model.Entities;
-
-namespace MediaBrowser.Providers.Chapters
-{
-    public class ChapterManager : IChapterManager
-    {
-        private readonly IItemRepository _itemRepo;
-
-        public ChapterManager(IItemRepository itemRepo)
-        {
-            _itemRepo = itemRepo;
-        }
-
-        /// <inheritdoc />
-        public void SaveChapters(Guid itemId, IReadOnlyList<ChapterInfo> chapters)
-        {
-            _itemRepo.SaveChapters(itemId, chapters);
-        }
-    }
-}
diff --git a/MediaBrowser.Providers/MediaBrowser.Providers.csproj b/MediaBrowser.Providers/MediaBrowser.Providers.csproj
index 9a65852f0..f2df731c0 100644
--- a/MediaBrowser.Providers/MediaBrowser.Providers.csproj
+++ b/MediaBrowser.Providers/MediaBrowser.Providers.csproj
@@ -23,7 +23,7 @@
     <PackageReference Include="Microsoft.Extensions.Http" />
     <PackageReference Include="Newtonsoft.Json" />
     <PackageReference Include="PlaylistsNET" />
-    <PackageReference Include="z440.atl.core"/>
+    <PackageReference Include="z440.atl.core" />
     <PackageReference Include="TMDbLib" />
   </ItemGroup>
 
-- 
cgit v1.2.3


From 15bf43e3adc69fc0ec5413e81a20b1f0d5dccd5c Mon Sep 17 00:00:00 2001
From: JPVenson <6794763+JPVenson@users.noreply.github.com>
Date: Tue, 8 Oct 2024 19:53:26 +0000
Subject: Removed BaseSqliteRepository

---
 .../Data/BaseSqliteRepository.cs                   | 269 ---------
 .../Data/ManagedConnection.cs                      |  62 ---
 .../Data/SqliteItemRepository.cs                   | 461 ----------------
 .../Data/SynchronousMode.cs                        |  30 -
 Emby.Server.Implementations/Data/TempStoreMode.cs  |  23 -
 Jellyfin.Data/Entities/AttachmentStreamInfo.cs     |   2 +
 .../Item/BaseItemManager.cs                        | 604 ++++++++++++---------
 .../Item/MediaAttachmentManager.cs                 |  73 +++
 .../Item/MediaStreamManager.cs                     |   2 +-
 .../Item/PeopleManager.cs                          |  22 +-
 .../Persistence/IItemRepository.cs                 | 200 +++----
 .../Persistence/IMediaAttachmentManager.cs         |  29 +
 .../Persistence/IMediaStreamManager.cs             |  28 +
 .../Persistence/IPeopleManager.cs                  |  34 ++
 14 files changed, 591 insertions(+), 1248 deletions(-)
 delete mode 100644 Emby.Server.Implementations/Data/BaseSqliteRepository.cs
 delete mode 100644 Emby.Server.Implementations/Data/ManagedConnection.cs
 delete mode 100644 Emby.Server.Implementations/Data/SqliteItemRepository.cs
 delete mode 100644 Emby.Server.Implementations/Data/SynchronousMode.cs
 delete mode 100644 Emby.Server.Implementations/Data/TempStoreMode.cs
 create mode 100644 Jellyfin.Server.Implementations/Item/MediaAttachmentManager.cs
 create mode 100644 MediaBrowser.Controller/Persistence/IMediaAttachmentManager.cs
 create mode 100644 MediaBrowser.Controller/Persistence/IMediaStreamManager.cs
 create mode 100644 MediaBrowser.Controller/Persistence/IPeopleManager.cs

(limited to 'MediaBrowser.Controller')

diff --git a/Emby.Server.Implementations/Data/BaseSqliteRepository.cs b/Emby.Server.Implementations/Data/BaseSqliteRepository.cs
deleted file mode 100644
index 8ed72c208..000000000
--- a/Emby.Server.Implementations/Data/BaseSqliteRepository.cs
+++ /dev/null
@@ -1,269 +0,0 @@
-#nullable disable
-
-#pragma warning disable CS1591
-
-using System;
-using System.Collections.Generic;
-using System.Threading;
-using Jellyfin.Extensions;
-using Microsoft.Data.Sqlite;
-using Microsoft.Extensions.Logging;
-
-namespace Emby.Server.Implementations.Data
-{
-    public abstract class BaseSqliteRepository : IDisposable
-    {
-        private bool _disposed = false;
-        private SemaphoreSlim _writeLock = new SemaphoreSlim(1, 1);
-        private SqliteConnection _writeConnection;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="BaseSqliteRepository"/> class.
-        /// </summary>
-        /// <param name="logger">The logger.</param>
-        protected BaseSqliteRepository(ILogger<BaseSqliteRepository> logger)
-        {
-            Logger = logger;
-        }
-
-        /// <summary>
-        /// Gets or sets the path to the DB file.
-        /// </summary>
-        protected string DbFilePath { get; set; }
-
-        /// <summary>
-        /// Gets the logger.
-        /// </summary>
-        /// <value>The logger.</value>
-        protected ILogger<BaseSqliteRepository> Logger { get; }
-
-        /// <summary>
-        /// Gets the cache size.
-        /// </summary>
-        /// <value>The cache size or null.</value>
-        protected virtual int? CacheSize => null;
-
-        /// <summary>
-        /// Gets the locking mode. <see href="https://www.sqlite.org/pragma.html#pragma_locking_mode" />.
-        /// </summary>
-        protected virtual string LockingMode => "NORMAL";
-
-        /// <summary>
-        /// Gets the journal mode. <see href="https://www.sqlite.org/pragma.html#pragma_journal_mode" />.
-        /// </summary>
-        /// <value>The journal mode.</value>
-        protected virtual string JournalMode => "WAL";
-
-        /// <summary>
-        /// Gets the journal size limit. <see href="https://www.sqlite.org/pragma.html#pragma_journal_size_limit" />.
-        /// The default (-1) is overridden to prevent unconstrained WAL size, as reported by users.
-        /// </summary>
-        /// <value>The journal size limit.</value>
-        protected virtual int? JournalSizeLimit => 134_217_728; // 128MiB
-
-        /// <summary>
-        /// Gets the page size.
-        /// </summary>
-        /// <value>The page size or null.</value>
-        protected virtual int? PageSize => null;
-
-        /// <summary>
-        /// Gets the temp store mode.
-        /// </summary>
-        /// <value>The temp store mode.</value>
-        /// <see cref="TempStoreMode"/>
-        protected virtual TempStoreMode TempStore => TempStoreMode.Memory;
-
-        /// <summary>
-        /// Gets the synchronous mode.
-        /// </summary>
-        /// <value>The synchronous mode or null.</value>
-        /// <see cref="SynchronousMode"/>
-        protected virtual SynchronousMode? Synchronous => SynchronousMode.Normal;
-
-        public virtual void Initialize()
-        {
-            // Configuration and pragmas can affect VACUUM so it needs to be last.
-            using (var connection = GetConnection())
-            {
-                connection.Execute("VACUUM");
-            }
-        }
-
-        protected ManagedConnection GetConnection(bool readOnly = false)
-        {
-            if (!readOnly)
-            {
-                _writeLock.Wait();
-                if (_writeConnection is not null)
-                {
-                    return new ManagedConnection(_writeConnection, _writeLock);
-                }
-
-                var writeConnection = new SqliteConnection($"Filename={DbFilePath};Pooling=False");
-                writeConnection.Open();
-
-                if (CacheSize.HasValue)
-                {
-                    writeConnection.Execute("PRAGMA cache_size=" + CacheSize.Value);
-                }
-
-                if (!string.IsNullOrWhiteSpace(LockingMode))
-                {
-                    writeConnection.Execute("PRAGMA locking_mode=" + LockingMode);
-                }
-
-                if (!string.IsNullOrWhiteSpace(JournalMode))
-                {
-                    writeConnection.Execute("PRAGMA journal_mode=" + JournalMode);
-                }
-
-                if (JournalSizeLimit.HasValue)
-                {
-                    writeConnection.Execute("PRAGMA journal_size_limit=" + JournalSizeLimit.Value);
-                }
-
-                if (Synchronous.HasValue)
-                {
-                    writeConnection.Execute("PRAGMA synchronous=" + (int)Synchronous.Value);
-                }
-
-                if (PageSize.HasValue)
-                {
-                    writeConnection.Execute("PRAGMA page_size=" + PageSize.Value);
-                }
-
-                writeConnection.Execute("PRAGMA temp_store=" + (int)TempStore);
-
-                return new ManagedConnection(_writeConnection = writeConnection, _writeLock);
-            }
-
-            var connection = new SqliteConnection($"Filename={DbFilePath};Mode=ReadOnly");
-            connection.Open();
-
-            if (CacheSize.HasValue)
-            {
-                connection.Execute("PRAGMA cache_size=" + CacheSize.Value);
-            }
-
-            if (!string.IsNullOrWhiteSpace(LockingMode))
-            {
-                connection.Execute("PRAGMA locking_mode=" + LockingMode);
-            }
-
-            if (!string.IsNullOrWhiteSpace(JournalMode))
-            {
-                connection.Execute("PRAGMA journal_mode=" + JournalMode);
-            }
-
-            if (JournalSizeLimit.HasValue)
-            {
-                connection.Execute("PRAGMA journal_size_limit=" + JournalSizeLimit.Value);
-            }
-
-            if (Synchronous.HasValue)
-            {
-                connection.Execute("PRAGMA synchronous=" + (int)Synchronous.Value);
-            }
-
-            if (PageSize.HasValue)
-            {
-                connection.Execute("PRAGMA page_size=" + PageSize.Value);
-            }
-
-            connection.Execute("PRAGMA temp_store=" + (int)TempStore);
-
-            return new ManagedConnection(connection, null);
-        }
-
-        public SqliteCommand PrepareStatement(ManagedConnection connection, string sql)
-        {
-            var command = connection.CreateCommand();
-            command.CommandText = sql;
-            return command;
-        }
-
-        protected bool TableExists(ManagedConnection connection, string name)
-        {
-            using var statement = PrepareStatement(connection, "select DISTINCT tbl_name from sqlite_master");
-            foreach (var row in statement.ExecuteQuery())
-            {
-                if (string.Equals(name, row.GetString(0), StringComparison.OrdinalIgnoreCase))
-                {
-                    return true;
-                }
-            }
-
-            return false;
-        }
-
-        protected List<string> GetColumnNames(ManagedConnection connection, string table)
-        {
-            var columnNames = new List<string>();
-
-            foreach (var row in connection.Query("PRAGMA table_info(" + table + ")"))
-            {
-                if (row.TryGetString(1, out var columnName))
-                {
-                    columnNames.Add(columnName);
-                }
-            }
-
-            return columnNames;
-        }
-
-        protected void AddColumn(ManagedConnection connection, string table, string columnName, string type, List<string> existingColumnNames)
-        {
-            if (existingColumnNames.Contains(columnName, StringComparison.OrdinalIgnoreCase))
-            {
-                return;
-            }
-
-            connection.Execute("alter table " + table + " add column " + columnName + " " + type + " NULL");
-        }
-
-        protected void CheckDisposed()
-        {
-            ObjectDisposedException.ThrowIf(_disposed, this);
-        }
-
-        /// <inheritdoc />
-        public void Dispose()
-        {
-            Dispose(true);
-            GC.SuppressFinalize(this);
-        }
-
-        /// <summary>
-        /// Releases unmanaged and - optionally - managed resources.
-        /// </summary>
-        /// <param name="dispose"><c>true</c> to release both managed and unmanaged resources; <c>false</c> to release only unmanaged resources.</param>
-        protected virtual void Dispose(bool dispose)
-        {
-            if (_disposed)
-            {
-                return;
-            }
-
-            if (dispose)
-            {
-                _writeLock.Wait();
-                try
-                {
-                    _writeConnection.Dispose();
-                }
-                finally
-                {
-                    _writeLock.Release();
-                }
-
-                _writeLock.Dispose();
-            }
-
-            _writeConnection = null;
-            _writeLock = null;
-
-            _disposed = true;
-        }
-    }
-}
diff --git a/Emby.Server.Implementations/Data/ManagedConnection.cs b/Emby.Server.Implementations/Data/ManagedConnection.cs
deleted file mode 100644
index 860950b30..000000000
--- a/Emby.Server.Implementations/Data/ManagedConnection.cs
+++ /dev/null
@@ -1,62 +0,0 @@
-#pragma warning disable CS1591
-
-using System;
-using System.Collections.Generic;
-using System.Threading;
-using Microsoft.Data.Sqlite;
-
-namespace Emby.Server.Implementations.Data;
-
-public sealed class ManagedConnection : IDisposable
-{
-    private readonly SemaphoreSlim? _writeLock;
-
-    private SqliteConnection _db;
-
-    private bool _disposed = false;
-
-    public ManagedConnection(SqliteConnection db, SemaphoreSlim? writeLock)
-    {
-        _db = db;
-        _writeLock = writeLock;
-    }
-
-    public SqliteTransaction BeginTransaction()
-        => _db.BeginTransaction();
-
-    public SqliteCommand CreateCommand()
-        => _db.CreateCommand();
-
-    public void Execute(string commandText)
-        => _db.Execute(commandText);
-
-    public SqliteCommand PrepareStatement(string sql)
-        => _db.PrepareStatement(sql);
-
-    public IEnumerable<SqliteDataReader> Query(string commandText)
-        => _db.Query(commandText);
-
-    public void Dispose()
-    {
-        if (_disposed)
-        {
-            return;
-        }
-
-        if (_writeLock is null)
-        {
-            // Read connections are managed with an internal pool
-            _db.Dispose();
-        }
-        else
-        {
-            // Write lock is managed by BaseSqliteRepository
-            // Don't dispose here
-            _writeLock.Release();
-        }
-
-        _db = null!;
-
-        _disposed = true;
-    }
-}
diff --git a/Emby.Server.Implementations/Data/SqliteItemRepository.cs b/Emby.Server.Implementations/Data/SqliteItemRepository.cs
deleted file mode 100644
index a650f9555..000000000
--- a/Emby.Server.Implementations/Data/SqliteItemRepository.cs
+++ /dev/null
@@ -1,461 +0,0 @@
-#nullable disable
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Globalization;
-using System.IO;
-using System.Linq;
-using System.Runtime.CompilerServices;
-using System.Text;
-using System.Text.Json;
-using System.Threading;
-using Emby.Server.Implementations.Playlists;
-using Jellyfin.Data.Enums;
-using Jellyfin.Extensions;
-using Jellyfin.Extensions.Json;
-using MediaBrowser.Controller;
-using MediaBrowser.Controller.Channels;
-using MediaBrowser.Controller.Configuration;
-using MediaBrowser.Controller.Drawing;
-using MediaBrowser.Controller.Entities;
-using MediaBrowser.Controller.Entities.Audio;
-using MediaBrowser.Controller.Entities.Movies;
-using MediaBrowser.Controller.Entities.TV;
-using MediaBrowser.Controller.Extensions;
-using MediaBrowser.Controller.LiveTv;
-using MediaBrowser.Controller.Persistence;
-using MediaBrowser.Controller.Playlists;
-using MediaBrowser.Model.Dto;
-using MediaBrowser.Model.Entities;
-using MediaBrowser.Model.Globalization;
-using MediaBrowser.Model.LiveTv;
-using MediaBrowser.Model.Querying;
-using Microsoft.Data.Sqlite;
-using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.Logging;
-
-namespace Emby.Server.Implementations.Data
-{
-    /// <summary>
-    /// Class SQLiteItemRepository.
-    /// </summary>
-    public class SqliteItemRepository : BaseSqliteRepository, IItemRepository
-    {
-        private const string FromText = " from TypedBaseItems A";
-        private const string ChaptersTableName = "Chapters2";
-
-        private const string SaveItemCommandText =
-            @"replace into TypedBaseItems
-            (guid,type,data,Path,StartDate,EndDate,ChannelId,IsMovie,IsSeries,EpisodeTitle,IsRepeat,CommunityRating,CustomRating,IndexNumber,IsLocked,Name,OfficialRating,MediaType,Overview,ParentIndexNumber,PremiereDate,ProductionYear,ParentId,Genres,InheritedParentalRatingValue,SortName,ForcedSortName,RunTimeTicks,Size,DateCreated,DateModified,PreferredMetadataLanguage,PreferredMetadataCountryCode,Width,Height,DateLastRefreshed,DateLastSaved,IsInMixedFolder,LockedFields,Studios,Audio,ExternalServiceId,Tags,IsFolder,UnratedType,TopParentId,TrailerTypes,CriticRating,CleanName,PresentationUniqueKey,OriginalTitle,PrimaryVersionId,DateLastMediaAdded,Album,LUFS,NormalizationGain,IsVirtualItem,SeriesName,UserDataKey,SeasonName,SeasonId,SeriesId,ExternalSeriesId,Tagline,ProviderIds,Images,ProductionLocations,ExtraIds,TotalBitrate,ExtraType,Artists,AlbumArtists,ExternalId,SeriesPresentationUniqueKey,ShowId,OwnerId)
-            values (@guid,@type,@data,@Path,@StartDate,@EndDate,@ChannelId,@IsMovie,@IsSeries,@EpisodeTitle,@IsRepeat,@CommunityRating,@CustomRating,@IndexNumber,@IsLocked,@Name,@OfficialRating,@MediaType,@Overview,@ParentIndexNumber,@PremiereDate,@ProductionYear,@ParentId,@Genres,@InheritedParentalRatingValue,@SortName,@ForcedSortName,@RunTimeTicks,@Size,@DateCreated,@DateModified,@PreferredMetadataLanguage,@PreferredMetadataCountryCode,@Width,@Height,@DateLastRefreshed,@DateLastSaved,@IsInMixedFolder,@LockedFields,@Studios,@Audio,@ExternalServiceId,@Tags,@IsFolder,@UnratedType,@TopParentId,@TrailerTypes,@CriticRating,@CleanName,@PresentationUniqueKey,@OriginalTitle,@PrimaryVersionId,@DateLastMediaAdded,@Album,@LUFS,@NormalizationGain,@IsVirtualItem,@SeriesName,@UserDataKey,@SeasonName,@SeasonId,@SeriesId,@ExternalSeriesId,@Tagline,@ProviderIds,@Images,@ProductionLocations,@ExtraIds,@TotalBitrate,@ExtraType,@Artists,@AlbumArtists,@ExternalId,@SeriesPresentationUniqueKey,@ShowId,@OwnerId)";
-
-        private readonly IServerConfigurationManager _config;
-        private readonly IServerApplicationHost _appHost;
-        private readonly ILocalizationManager _localization;
-        // TODO: Remove this dependency. GetImageCacheTag() is the only method used and it can be converted to a static helper method
-        private readonly IImageProcessor _imageProcessor;
-
-        private readonly TypeMapper _typeMapper;
-        private readonly JsonSerializerOptions _jsonOptions;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="SqliteItemRepository"/> class.
-        /// </summary>
-        /// <param name="config">Instance of the <see cref="IServerConfigurationManager"/> interface.</param>
-        /// <param name="appHost">Instance of the <see cref="IServerApplicationHost"/> interface.</param>
-        /// <param name="logger">Instance of the <see cref="ILogger{SqliteItemRepository}"/> interface.</param>
-        /// <param name="localization">Instance of the <see cref="ILocalizationManager"/> interface.</param>
-        /// <param name="imageProcessor">Instance of the <see cref="IImageProcessor"/> interface.</param>
-        /// <param name="configuration">Instance of the <see cref="IConfiguration"/> interface.</param>
-        /// <exception cref="ArgumentNullException">config is null.</exception>
-        public SqliteItemRepository(
-            IServerConfigurationManager config,
-            IServerApplicationHost appHost,
-            ILogger<SqliteItemRepository> logger,
-            ILocalizationManager localization,
-            IImageProcessor imageProcessor,
-            IConfiguration configuration)
-            : base(logger)
-        {
-            _config = config;
-            _appHost = appHost;
-            _localization = localization;
-            _imageProcessor = imageProcessor;
-
-            _typeMapper = new TypeMapper();
-            _jsonOptions = JsonDefaults.Options;
-
-            DbFilePath = Path.Combine(_config.ApplicationPaths.DataPath, "library.db");
-
-            CacheSize = configuration.GetSqliteCacheSize();
-        }
-
-        /// <inheritdoc />
-        protected override int? CacheSize { get; }
-
-        /// <inheritdoc />
-        protected override TempStoreMode TempStore => TempStoreMode.Memory;
-
-
-        private bool TypeRequiresDeserialization(Type type)
-        {
-            if (_config.Configuration.SkipDeserializationForBasicTypes)
-            {
-                if (type == typeof(Channel)
-                    || type == typeof(UserRootFolder))
-                {
-                    return false;
-                }
-            }
-
-            return type != typeof(Season)
-                && type != typeof(MusicArtist)
-                && type != typeof(Person)
-                && type != typeof(MusicGenre)
-                && type != typeof(Genre)
-                && type != typeof(Studio)
-                && type != typeof(PlaylistsFolder)
-                && type != typeof(PhotoAlbum)
-                && type != typeof(Year)
-                && type != typeof(Book)
-                && type != typeof(LiveTvProgram)
-                && type != typeof(AudioBook)
-                && type != typeof(MusicAlbum);
-        }
-
-        private static bool EnableJoinUserData(InternalItemsQuery query)
-        {
-            if (query.User is null)
-            {
-                return false;
-            }
-
-            var sortingFields = new HashSet<ItemSortBy>(query.OrderBy.Select(i => i.OrderBy));
-
-            return sortingFields.Contains(ItemSortBy.IsFavoriteOrLiked)
-                    || sortingFields.Contains(ItemSortBy.IsPlayed)
-                    || sortingFields.Contains(ItemSortBy.IsUnplayed)
-                    || sortingFields.Contains(ItemSortBy.PlayCount)
-                    || sortingFields.Contains(ItemSortBy.DatePlayed)
-                    || sortingFields.Contains(ItemSortBy.SeriesDatePlayed)
-                    || query.IsFavoriteOrLiked.HasValue
-                    || query.IsFavorite.HasValue
-                    || query.IsResumable.HasValue
-                    || query.IsPlayed.HasValue
-                    || query.IsLiked.HasValue;
-        }
-
-        private string GetJoinUserDataText(InternalItemsQuery query)
-        {
-            if (!EnableJoinUserData(query))
-            {
-                return string.Empty;
-            }
-
-            return " left join UserDatas on UserDataKey=UserDatas.Key And (UserId=@UserId)";
-        }
-
-        /// <inheritdoc />
-        public List<string> GetStudioNames()
-        {
-            return GetItemValueNames(new[] { 3 }, Array.Empty<string>(), Array.Empty<string>());
-        }
-
-        /// <inheritdoc />
-        public List<string> GetAllArtistNames()
-        {
-            return GetItemValueNames(new[] { 0, 1 }, Array.Empty<string>(), Array.Empty<string>());
-        }
-
-        /// <inheritdoc />
-        public List<string> GetMusicGenreNames()
-        {
-            return GetItemValueNames(
-                new[] { 2 },
-                new string[]
-                {
-                    typeof(Audio).FullName,
-                    typeof(MusicVideo).FullName,
-                    typeof(MusicAlbum).FullName,
-                    typeof(MusicArtist).FullName
-                },
-                Array.Empty<string>());
-        }
-
-        /// <inheritdoc />
-        public List<string> GetGenreNames()
-        {
-            return GetItemValueNames(
-                new[] { 2 },
-                Array.Empty<string>(),
-                new string[]
-                {
-                    typeof(Audio).FullName,
-                    typeof(MusicVideo).FullName,
-                    typeof(MusicAlbum).FullName,
-                    typeof(MusicArtist).FullName
-                });
-        }
-
-        private List<string> GetItemValueNames(int[] itemValueTypes, IReadOnlyList<string> withItemTypes, IReadOnlyList<string> excludeItemTypes)
-        {
-            CheckDisposed();
-
-            var stringBuilder = new StringBuilder("Select Value From ItemValues where Type", 128);
-            if (itemValueTypes.Length == 1)
-            {
-                stringBuilder.Append('=')
-                    .Append(itemValueTypes[0]);
-            }
-            else
-            {
-                stringBuilder.Append(" in (")
-                    .AppendJoin(',', itemValueTypes)
-                    .Append(')');
-            }
-
-            if (withItemTypes.Count > 0)
-            {
-                stringBuilder.Append(" AND ItemId In (select guid from typedbaseitems where type in (")
-                    .AppendJoinInSingleQuotes(',', withItemTypes)
-                    .Append("))");
-            }
-
-            if (excludeItemTypes.Count > 0)
-            {
-                stringBuilder.Append(" AND ItemId not In (select guid from typedbaseitems where type in (")
-                    .AppendJoinInSingleQuotes(',', excludeItemTypes)
-                    .Append("))");
-            }
-
-            stringBuilder.Append(" Group By CleanValue");
-            var commandText = stringBuilder.ToString();
-
-            var list = new List<string>();
-            using (new QueryTimeLogger(Logger, commandText))
-            using (var connection = GetConnection(true))
-            using (var statement = PrepareStatement(connection, commandText))
-            {
-                foreach (var row in statement.ExecuteQuery())
-                {
-                    if (row.TryGetString(0, out var result))
-                    {
-                        list.Add(result);
-                    }
-                }
-            }
-
-            return list;
-        }
-
-
-
-        /// <inheritdoc />
-        public List<MediaAttachment> GetMediaAttachments(MediaAttachmentQuery query)
-        {
-            CheckDisposed();
-
-            ArgumentNullException.ThrowIfNull(query);
-
-            var cmdText = _mediaAttachmentSaveColumnsSelectQuery;
-
-            if (query.Index.HasValue)
-            {
-                cmdText += " AND AttachmentIndex=@AttachmentIndex";
-            }
-
-            cmdText += " order by AttachmentIndex ASC";
-
-            var list = new List<MediaAttachment>();
-            using (var connection = GetConnection(true))
-            using (var statement = PrepareStatement(connection, cmdText))
-            {
-                statement.TryBind("@ItemId", query.ItemId);
-
-                if (query.Index.HasValue)
-                {
-                    statement.TryBind("@AttachmentIndex", query.Index.Value);
-                }
-
-                foreach (var row in statement.ExecuteQuery())
-                {
-                    list.Add(GetMediaAttachment(row));
-                }
-            }
-
-            return list;
-        }
-
-        /// <inheritdoc />
-        public void SaveMediaAttachments(
-            Guid id,
-            IReadOnlyList<MediaAttachment> attachments,
-            CancellationToken cancellationToken)
-        {
-            CheckDisposed();
-            if (id.IsEmpty())
-            {
-                throw new ArgumentException("Guid can't be empty.", nameof(id));
-            }
-
-            ArgumentNullException.ThrowIfNull(attachments);
-
-            cancellationToken.ThrowIfCancellationRequested();
-
-            using (var connection = GetConnection())
-            using (var transaction = connection.BeginTransaction())
-            using (var command = connection.PrepareStatement("delete from mediaattachments where ItemId=@ItemId"))
-            {
-                command.TryBind("@ItemId", id);
-                command.ExecuteNonQuery();
-
-                InsertMediaAttachments(id, attachments, connection, cancellationToken);
-
-                transaction.Commit();
-            }
-        }
-
-        private void InsertMediaAttachments(
-            Guid id,
-            IReadOnlyList<MediaAttachment> attachments,
-            ManagedConnection db,
-            CancellationToken cancellationToken)
-        {
-            const int InsertAtOnce = 10;
-
-            var insertText = new StringBuilder(_mediaAttachmentInsertPrefix);
-            for (var startIndex = 0; startIndex < attachments.Count; startIndex += InsertAtOnce)
-            {
-                var endIndex = Math.Min(attachments.Count, startIndex + InsertAtOnce);
-
-                for (var i = startIndex; i < endIndex; i++)
-                {
-                    insertText.Append("(@ItemId, ");
-
-                    foreach (var column in _mediaAttachmentSaveColumns.Skip(1))
-                    {
-                        insertText.Append('@')
-                            .Append(column)
-                            .Append(i)
-                            .Append(',');
-                    }
-
-                    insertText.Length -= 1;
-
-                    insertText.Append("),");
-                }
-
-                insertText.Length--;
-
-                cancellationToken.ThrowIfCancellationRequested();
-
-                using (var statement = PrepareStatement(db, insertText.ToString()))
-                {
-                    statement.TryBind("@ItemId", id);
-
-                    for (var i = startIndex; i < endIndex; i++)
-                    {
-                        var index = i.ToString(CultureInfo.InvariantCulture);
-
-                        var attachment = attachments[i];
-
-                        statement.TryBind("@AttachmentIndex" + index, attachment.Index);
-                        statement.TryBind("@Codec" + index, attachment.Codec);
-                        statement.TryBind("@CodecTag" + index, attachment.CodecTag);
-                        statement.TryBind("@Comment" + index, attachment.Comment);
-                        statement.TryBind("@Filename" + index, attachment.FileName);
-                        statement.TryBind("@MIMEType" + index, attachment.MimeType);
-                    }
-
-                    statement.ExecuteNonQuery();
-                }
-
-                insertText.Length = _mediaAttachmentInsertPrefix.Length;
-            }
-        }
-
-        /// <summary>
-        /// Gets the attachment.
-        /// </summary>
-        /// <param name="reader">The reader.</param>
-        /// <returns>MediaAttachment.</returns>
-        private MediaAttachment GetMediaAttachment(SqliteDataReader reader)
-        {
-            var item = new MediaAttachment
-            {
-                Index = reader.GetInt32(1)
-            };
-
-            if (reader.TryGetString(2, out var codec))
-            {
-                item.Codec = codec;
-            }
-
-            if (reader.TryGetString(3, out var codecTag))
-            {
-                item.CodecTag = codecTag;
-            }
-
-            if (reader.TryGetString(4, out var comment))
-            {
-                item.Comment = comment;
-            }
-
-            if (reader.TryGetString(5, out var fileName))
-            {
-                item.FileName = fileName;
-            }
-
-            if (reader.TryGetString(6, out var mimeType))
-            {
-                item.MimeType = mimeType;
-            }
-
-            return item;
-        }
-
-#nullable enable
-
-        private readonly struct QueryTimeLogger : IDisposable
-        {
-            private readonly ILogger _logger;
-            private readonly string _commandText;
-            private readonly string _methodName;
-            private readonly long _startTimestamp;
-
-            public QueryTimeLogger(ILogger logger, string commandText, [CallerMemberName] string methodName = "")
-            {
-                _logger = logger;
-                _commandText = commandText;
-                _methodName = methodName;
-                _startTimestamp = logger.IsEnabled(LogLevel.Debug) ? Stopwatch.GetTimestamp() : -1;
-            }
-
-            public void Dispose()
-            {
-                if (_startTimestamp == -1)
-                {
-                    return;
-                }
-
-                var elapsedMs = Stopwatch.GetElapsedTime(_startTimestamp).TotalMilliseconds;
-
-#if DEBUG
-                const int SlowThreshold = 100;
-#else
-                const int SlowThreshold = 10;
-#endif
-
-                if (elapsedMs >= SlowThreshold)
-                {
-                    _logger.LogDebug(
-                        "{Method} query time (slow): {ElapsedMs}ms. Query: {Query}",
-                        _methodName,
-                        elapsedMs,
-                        _commandText);
-                }
-            }
-        }
-    }
-}
diff --git a/Emby.Server.Implementations/Data/SynchronousMode.cs b/Emby.Server.Implementations/Data/SynchronousMode.cs
deleted file mode 100644
index cde524e2e..000000000
--- a/Emby.Server.Implementations/Data/SynchronousMode.cs
+++ /dev/null
@@ -1,30 +0,0 @@
-namespace Emby.Server.Implementations.Data;
-
-/// <summary>
-/// The disk synchronization mode, controls how aggressively SQLite will write data
-/// all the way out to physical storage.
-/// </summary>
-public enum SynchronousMode
-{
-    /// <summary>
-    /// SQLite continues without syncing as soon as it has handed data off to the operating system.
-    /// </summary>
-    Off = 0,
-
-    /// <summary>
-    /// SQLite database engine will still sync at the most critical moments.
-    /// </summary>
-    Normal = 1,
-
-    /// <summary>
-    /// SQLite database engine will use the xSync method of the VFS
-    /// to ensure that all content is safely written to the disk surface prior to continuing.
-    /// </summary>
-    Full = 2,
-
-    /// <summary>
-    /// EXTRA synchronous is like FULL with the addition that the directory containing a rollback journal
-    /// is synced after that journal is unlinked to commit a transaction in DELETE mode.
-    /// </summary>
-    Extra = 3
-}
diff --git a/Emby.Server.Implementations/Data/TempStoreMode.cs b/Emby.Server.Implementations/Data/TempStoreMode.cs
deleted file mode 100644
index d2427ce47..000000000
--- a/Emby.Server.Implementations/Data/TempStoreMode.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-namespace Emby.Server.Implementations.Data;
-
-/// <summary>
-/// Storage mode used by temporary database files.
-/// </summary>
-public enum TempStoreMode
-{
-    /// <summary>
-    /// The compile-time C preprocessor macro SQLITE_TEMP_STORE
-    /// is used to determine where temporary tables and indices are stored.
-    /// </summary>
-    Default = 0,
-
-    /// <summary>
-    /// Temporary tables and indices are stored in a file.
-    /// </summary>
-    File = 1,
-
-    /// <summary>
-    /// Temporary tables and indices are kept in as if they were pure in-memory databases memory.
-    /// </summary>
-    Memory = 2
-}
diff --git a/Jellyfin.Data/Entities/AttachmentStreamInfo.cs b/Jellyfin.Data/Entities/AttachmentStreamInfo.cs
index d2483548b..858465424 100644
--- a/Jellyfin.Data/Entities/AttachmentStreamInfo.cs
+++ b/Jellyfin.Data/Entities/AttachmentStreamInfo.cs
@@ -7,6 +7,8 @@ public class AttachmentStreamInfo
 {
     public required Guid ItemId { get; set; }
 
+    public required BaseItem Item { get; set; }
+
     public required int Index { get; set; }
 
     public required string Codec { get; set; }
diff --git a/Jellyfin.Server.Implementations/Item/BaseItemManager.cs b/Jellyfin.Server.Implementations/Item/BaseItemManager.cs
index 022f26cd7..66cc765f3 100644
--- a/Jellyfin.Server.Implementations/Item/BaseItemManager.cs
+++ b/Jellyfin.Server.Implementations/Item/BaseItemManager.cs
@@ -34,7 +34,7 @@ namespace Jellyfin.Server.Implementations.Item;
 /// <summary>
 /// Handles all storage logic for BaseItems.
 /// </summary>
-public class BaseItemManager : IItemRepository
+public sealed class BaseItemManager : IItemRepository, IDisposable
 {
     private readonly IDbContextFactory<JellyfinDbContext> _dbProvider;
     private readonly IServerApplicationHost _appHost;
@@ -135,6 +135,7 @@ public class BaseItemManager : IItemRepository
     /// so that we can de-serialize properly when we don't have strong types.
     /// </summary>
     private static readonly ConcurrentDictionary<string, Type?> _typeMap = new ConcurrentDictionary<string, Type?>();
+    private bool _disposed;
 
     /// <summary>
     /// Initializes a new instance of the <see cref="BaseItemManager"/> class.
@@ -147,6 +148,17 @@ public class BaseItemManager : IItemRepository
         _appHost = appHost;
     }
 
+    /// <inheritdoc/>
+    public void Dispose()
+    {
+        if (_disposed)
+        {
+            return;
+        }
+
+        _disposed = true;
+    }
+
     private QueryResult<(BaseItemDto Item, ItemCounts ItemCounts)> GetItemValues(InternalItemsQuery filter, int[] itemValueTypes, string returnType)
     {
         ArgumentNullException.ThrowIfNull(filter);
@@ -338,106 +350,148 @@ public class BaseItemManager : IItemRepository
     }
 
     /// <inheritdoc />
-    public QueryResult<(BaseItem Item, ItemCounts ItemCounts)> GetAllArtists(InternalItemsQuery query)
+    public QueryResult<(BaseItem Item, ItemCounts ItemCounts)> GetAllArtists(InternalItemsQuery filter)
+    {
+        return GetItemValues(filter, new[] { 0, 1 }, typeof(MusicArtist).FullName!);
+    }
+
+    /// <inheritdoc />
+    public QueryResult<(BaseItem Item, ItemCounts ItemCounts)> GetArtists(InternalItemsQuery filter)
+    {
+        return GetItemValues(filter, new[] { 0 }, typeof(MusicArtist).FullName!);
+    }
+
+    /// <inheritdoc />
+    public QueryResult<(BaseItem Item, ItemCounts ItemCounts)> GetAlbumArtists(InternalItemsQuery filter)
+    {
+        return GetItemValues(filter, new[] { 1 }, typeof(MusicArtist).FullName!);
+    }
+
+    /// <inheritdoc />
+    public QueryResult<(BaseItem Item, ItemCounts ItemCounts)> GetStudios(InternalItemsQuery filter)
     {
-        return GetItemValues(query, new[] { 0, 1 }, typeof(MusicArtist).FullName);
+        return GetItemValues(filter, new[] { 3 }, typeof(Studio).FullName!);
     }
 
     /// <inheritdoc />
-    public QueryResult<(BaseItem Item, ItemCounts ItemCounts)> GetArtists(InternalItemsQuery query)
+    public QueryResult<(BaseItem Item, ItemCounts ItemCounts)> GetGenres(InternalItemsQuery filter)
     {
-        return GetItemValues(query, new[] { 0 }, typeof(MusicArtist).FullName);
+        return GetItemValues(filter, new[] { 2 }, typeof(Genre).FullName!);
     }
 
     /// <inheritdoc />
-    public QueryResult<(BaseItem Item, ItemCounts ItemCounts)> GetAlbumArtists(InternalItemsQuery query)
+    public QueryResult<(BaseItem Item, ItemCounts ItemCounts)> GetMusicGenres(InternalItemsQuery filter)
     {
-        return GetItemValues(query, new[] { 1 }, typeof(MusicArtist).FullName);
+        return GetItemValues(filter, new[] { 2 }, typeof(MusicGenre).FullName!);
     }
 
     /// <inheritdoc />
-    public QueryResult<(BaseItem Item, ItemCounts ItemCounts)> GetStudios(InternalItemsQuery query)
+    public IReadOnlyList<string> GetStudioNames()
     {
-        return GetItemValues(query, new[] { 3 }, typeof(Studio).FullName);
+        return GetItemValueNames(new[] { 3 }, Array.Empty<string>(), Array.Empty<string>());
     }
 
     /// <inheritdoc />
-    public QueryResult<(BaseItem Item, ItemCounts ItemCounts)> GetGenres(InternalItemsQuery query)
+    public IReadOnlyList<string> GetAllArtistNames()
     {
-        return GetItemValues(query, new[] { 2 }, typeof(Genre).FullName);
+        return GetItemValueNames(new[] { 0, 1 }, Array.Empty<string>(), Array.Empty<string>());
     }
 
     /// <inheritdoc />
-    public QueryResult<(BaseItem Item, ItemCounts ItemCounts)> GetMusicGenres(InternalItemsQuery query)
+    public IReadOnlyList<string> GetMusicGenreNames()
     {
-        return GetItemValues(query, new[] { 2 }, typeof(MusicGenre).FullName);
+        return GetItemValueNames(
+            new[] { 2 },
+            new string[]
+            {
+                    typeof(Audio).FullName!,
+                    typeof(MusicVideo).FullName!,
+                    typeof(MusicAlbum).FullName!,
+                    typeof(MusicArtist).FullName!
+            },
+            Array.Empty<string>());
+    }
+
+    /// <inheritdoc />
+    public IReadOnlyList<string> GetGenreNames()
+    {
+        return GetItemValueNames(
+            new[] { 2 },
+            Array.Empty<string>(),
+            new string[]
+            {
+                    typeof(Audio).FullName!,
+                    typeof(MusicVideo).FullName!,
+                    typeof(MusicAlbum).FullName!,
+                    typeof(MusicArtist).FullName!
+            });
     }
 
     /// <inheritdoc cref="IItemRepository"/>
-    public QueryResult<BaseItemDto> GetItems(InternalItemsQuery query)
+    public QueryResult<BaseItemDto> GetItems(InternalItemsQuery filter)
     {
-        ArgumentNullException.ThrowIfNull(query);
-        if (!query.EnableTotalRecordCount || (!query.Limit.HasValue && (query.StartIndex ?? 0) == 0))
+        ArgumentNullException.ThrowIfNull(filter);
+        if (!filter.EnableTotalRecordCount || (!filter.Limit.HasValue && (filter.StartIndex ?? 0) == 0))
         {
-            var returnList = GetItemList(query);
+            var returnList = GetItemList(filter);
             return new QueryResult<BaseItemDto>(
-                query.StartIndex,
+                filter.StartIndex,
                 returnList.Count,
                 returnList);
         }
 
-        PrepareFilterQuery(query);
+        PrepareFilterQuery(filter);
         var result = new QueryResult<BaseItemDto>();
 
         using var context = _dbProvider.CreateDbContext();
-        var dbQuery = TranslateQuery(context.BaseItems, context, query)
+        var dbQuery = TranslateQuery(context.BaseItems, context, filter)
             .DistinctBy(e => e.Id);
-        if (query.EnableTotalRecordCount)
+        if (filter.EnableTotalRecordCount)
         {
             result.TotalRecordCount = dbQuery.Count();
         }
 
-        if (query.Limit.HasValue || query.StartIndex.HasValue)
+        if (filter.Limit.HasValue || filter.StartIndex.HasValue)
         {
-            var offset = query.StartIndex ?? 0;
+            var offset = filter.StartIndex ?? 0;
 
             if (offset > 0)
             {
                 dbQuery = dbQuery.Skip(offset);
             }
 
-            if (query.Limit.HasValue)
+            if (filter.Limit.HasValue)
             {
-                dbQuery = dbQuery.Take(query.Limit.Value);
+                dbQuery = dbQuery.Take(filter.Limit.Value);
             }
         }
 
         result.Items = dbQuery.ToList().Select(DeserialiseBaseItem).ToImmutableArray();
-        result.StartIndex = query.StartIndex ?? 0;
+        result.StartIndex = filter.StartIndex ?? 0;
         return result;
     }
 
     /// <inheritdoc cref="IItemRepository"/>
-    public IReadOnlyList<BaseItemDto> GetItemList(InternalItemsQuery query)
+    public IReadOnlyList<BaseItemDto> GetItemList(InternalItemsQuery filter)
     {
-        ArgumentNullException.ThrowIfNull(query);
-        PrepareFilterQuery(query);
+        ArgumentNullException.ThrowIfNull(filter);
+        PrepareFilterQuery(filter);
 
         using var context = _dbProvider.CreateDbContext();
-        var dbQuery = TranslateQuery(context.BaseItems, context, query)
+        var dbQuery = TranslateQuery(context.BaseItems, context, filter)
             .DistinctBy(e => e.Id);
-        if (query.Limit.HasValue || query.StartIndex.HasValue)
+        if (filter.Limit.HasValue || filter.StartIndex.HasValue)
         {
-            var offset = query.StartIndex ?? 0;
+            var offset = filter.StartIndex ?? 0;
 
             if (offset > 0)
             {
                 dbQuery = dbQuery.Skip(offset);
             }
 
-            if (query.Limit.HasValue)
+            if (filter.Limit.HasValue)
             {
-                dbQuery = dbQuery.Take(query.Limit.Value);
+                dbQuery = dbQuery.Take(filter.Limit.Value);
             }
         }
 
@@ -445,14 +499,14 @@ public class BaseItemManager : IItemRepository
     }
 
     /// <inheritdoc/>
-    public int GetCount(InternalItemsQuery query)
+    public int GetCount(InternalItemsQuery filter)
     {
-        ArgumentNullException.ThrowIfNull(query);
+        ArgumentNullException.ThrowIfNull(filter);
         // Hack for right now since we currently don't support filtering out these duplicates within a query
-        PrepareFilterQuery(query);
+        PrepareFilterQuery(filter);
 
         using var context = _dbProvider.CreateDbContext();
-        var dbQuery = TranslateQuery(context.BaseItems, context, query);
+        var dbQuery = TranslateQuery(context.BaseItems, context, filter);
 
         return dbQuery.Count();
     }
@@ -460,16 +514,16 @@ public class BaseItemManager : IItemRepository
     private IQueryable<BaseItemEntity> TranslateQuery(
         IQueryable<BaseItemEntity> baseQuery,
         JellyfinDbContext context,
-        InternalItemsQuery query)
+        InternalItemsQuery filter)
     {
-        var minWidth = query.MinWidth;
-        var maxWidth = query.MaxWidth;
+        var minWidth = filter.MinWidth;
+        var maxWidth = filter.MaxWidth;
         var now = DateTime.UtcNow;
 
-        if (query.IsHD.HasValue)
+        if (filter.IsHD.HasValue)
         {
             const int Threshold = 1200;
-            if (query.IsHD.Value)
+            if (filter.IsHD.Value)
             {
                 minWidth = Threshold;
             }
@@ -479,10 +533,10 @@ public class BaseItemManager : IItemRepository
             }
         }
 
-        if (query.Is4K.HasValue)
+        if (filter.Is4K.HasValue)
         {
             const int Threshold = 3800;
-            if (query.Is4K.Value)
+            if (filter.Is4K.Value)
             {
                 minWidth = Threshold;
             }
@@ -497,9 +551,9 @@ public class BaseItemManager : IItemRepository
             baseQuery = baseQuery.Where(e => e.Width >= minWidth);
         }
 
-        if (query.MinHeight.HasValue)
+        if (filter.MinHeight.HasValue)
         {
-            baseQuery = baseQuery.Where(e => e.Height >= query.MinHeight);
+            baseQuery = baseQuery.Where(e => e.Height >= filter.MinHeight);
         }
 
         if (maxWidth.HasValue)
@@ -507,41 +561,41 @@ public class BaseItemManager : IItemRepository
             baseQuery = baseQuery.Where(e => e.Width >= maxWidth);
         }
 
-        if (query.MaxHeight.HasValue)
+        if (filter.MaxHeight.HasValue)
         {
-            baseQuery = baseQuery.Where(e => e.Height <= query.MaxHeight);
+            baseQuery = baseQuery.Where(e => e.Height <= filter.MaxHeight);
         }
 
-        if (query.IsLocked.HasValue)
+        if (filter.IsLocked.HasValue)
         {
-            baseQuery = baseQuery.Where(e => e.IsLocked == query.IsLocked);
+            baseQuery = baseQuery.Where(e => e.IsLocked == filter.IsLocked);
         }
 
-        var tags = query.Tags.ToList();
-        var excludeTags = query.ExcludeTags.ToList();
+        var tags = filter.Tags.ToList();
+        var excludeTags = filter.ExcludeTags.ToList();
 
-        if (query.IsMovie == true)
+        if (filter.IsMovie == true)
         {
-            if (query.IncludeItemTypes.Length == 0
-                || query.IncludeItemTypes.Contains(BaseItemKind.Movie)
-                || query.IncludeItemTypes.Contains(BaseItemKind.Trailer))
+            if (filter.IncludeItemTypes.Length == 0
+                || filter.IncludeItemTypes.Contains(BaseItemKind.Movie)
+                || filter.IncludeItemTypes.Contains(BaseItemKind.Trailer))
             {
                 baseQuery = baseQuery.Where(e => e.IsMovie);
             }
         }
-        else if (query.IsMovie.HasValue)
+        else if (filter.IsMovie.HasValue)
         {
-            baseQuery = baseQuery.Where(e => e.IsMovie == query.IsMovie);
+            baseQuery = baseQuery.Where(e => e.IsMovie == filter.IsMovie);
         }
 
-        if (query.IsSeries.HasValue)
+        if (filter.IsSeries.HasValue)
         {
-            baseQuery = baseQuery.Where(e => e.IsSeries == query.IsSeries);
+            baseQuery = baseQuery.Where(e => e.IsSeries == filter.IsSeries);
         }
 
-        if (query.IsSports.HasValue)
+        if (filter.IsSports.HasValue)
         {
-            if (query.IsSports.Value)
+            if (filter.IsSports.Value)
             {
                 tags.Add("Sports");
             }
@@ -551,9 +605,9 @@ public class BaseItemManager : IItemRepository
             }
         }
 
-        if (query.IsNews.HasValue)
+        if (filter.IsNews.HasValue)
         {
-            if (query.IsNews.Value)
+            if (filter.IsNews.Value)
             {
                 tags.Add("News");
             }
@@ -563,9 +617,9 @@ public class BaseItemManager : IItemRepository
             }
         }
 
-        if (query.IsKids.HasValue)
+        if (filter.IsKids.HasValue)
         {
-            if (query.IsKids.Value)
+            if (filter.IsKids.Value)
             {
                 tags.Add("Kids");
             }
@@ -575,21 +629,21 @@ public class BaseItemManager : IItemRepository
             }
         }
 
-        if (!string.IsNullOrEmpty(query.SearchTerm))
+        if (!string.IsNullOrEmpty(filter.SearchTerm))
         {
-            baseQuery = baseQuery.Where(e => e.CleanName!.Contains(query.SearchTerm, StringComparison.InvariantCultureIgnoreCase) || (e.OriginalTitle != null && e.OriginalTitle.Contains(query.SearchTerm, StringComparison.InvariantCultureIgnoreCase)));
+            baseQuery = baseQuery.Where(e => e.CleanName!.Contains(filter.SearchTerm, StringComparison.InvariantCultureIgnoreCase) || (e.OriginalTitle != null && e.OriginalTitle.Contains(filter.SearchTerm, StringComparison.InvariantCultureIgnoreCase)));
         }
 
-        if (query.IsFolder.HasValue)
+        if (filter.IsFolder.HasValue)
         {
-            baseQuery = baseQuery.Where(e => e.IsFolder == query.IsFolder);
+            baseQuery = baseQuery.Where(e => e.IsFolder == filter.IsFolder);
         }
 
-        var includeTypes = query.IncludeItemTypes;
+        var includeTypes = filter.IncludeItemTypes;
         // Only specify excluded types if no included types are specified
-        if (query.IncludeItemTypes.Length == 0)
+        if (filter.IncludeItemTypes.Length == 0)
         {
-            var excludeTypes = query.ExcludeItemTypes;
+            var excludeTypes = filter.ExcludeItemTypes;
             if (excludeTypes.Length == 1)
             {
                 if (_baseItemKindNames.TryGetValue(excludeTypes[0], out var excludeTypeName))
@@ -632,82 +686,82 @@ public class BaseItemManager : IItemRepository
             baseQuery = baseQuery.Where(e => includeTypeName.Contains(e.Type));
         }
 
-        if (query.ChannelIds.Count == 1)
+        if (filter.ChannelIds.Count == 1)
         {
-            baseQuery = baseQuery.Where(e => e.ChannelId == query.ChannelIds[0].ToString("N", CultureInfo.InvariantCulture));
+            baseQuery = baseQuery.Where(e => e.ChannelId == filter.ChannelIds[0].ToString("N", CultureInfo.InvariantCulture));
         }
-        else if (query.ChannelIds.Count > 1)
+        else if (filter.ChannelIds.Count > 1)
         {
-            baseQuery = baseQuery.Where(e => query.ChannelIds.Select(f => f.ToString("N", CultureInfo.InvariantCulture)).Contains(e.ChannelId));
+            baseQuery = baseQuery.Where(e => filter.ChannelIds.Select(f => f.ToString("N", CultureInfo.InvariantCulture)).Contains(e.ChannelId));
         }
 
-        if (!query.ParentId.IsEmpty())
+        if (!filter.ParentId.IsEmpty())
         {
-            baseQuery = baseQuery.Where(e => e.ParentId.Equals(query.ParentId));
+            baseQuery = baseQuery.Where(e => e.ParentId.Equals(filter.ParentId));
         }
 
-        if (!string.IsNullOrWhiteSpace(query.Path))
+        if (!string.IsNullOrWhiteSpace(filter.Path))
         {
-            baseQuery = baseQuery.Where(e => e.Path == query.Path);
+            baseQuery = baseQuery.Where(e => e.Path == filter.Path);
         }
 
-        if (!string.IsNullOrWhiteSpace(query.PresentationUniqueKey))
+        if (!string.IsNullOrWhiteSpace(filter.PresentationUniqueKey))
         {
-            baseQuery = baseQuery.Where(e => e.PresentationUniqueKey == query.PresentationUniqueKey);
+            baseQuery = baseQuery.Where(e => e.PresentationUniqueKey == filter.PresentationUniqueKey);
         }
 
-        if (query.MinCommunityRating.HasValue)
+        if (filter.MinCommunityRating.HasValue)
         {
-            baseQuery = baseQuery.Where(e => e.CommunityRating >= query.MinCommunityRating);
+            baseQuery = baseQuery.Where(e => e.CommunityRating >= filter.MinCommunityRating);
         }
 
-        if (query.MinIndexNumber.HasValue)
+        if (filter.MinIndexNumber.HasValue)
         {
-            baseQuery = baseQuery.Where(e => e.IndexNumber >= query.MinIndexNumber);
+            baseQuery = baseQuery.Where(e => e.IndexNumber >= filter.MinIndexNumber);
         }
 
-        if (query.MinParentAndIndexNumber.HasValue)
+        if (filter.MinParentAndIndexNumber.HasValue)
         {
             baseQuery = baseQuery
-                .Where(e => (e.ParentIndexNumber == query.MinParentAndIndexNumber.Value.ParentIndexNumber && e.IndexNumber >= query.MinParentAndIndexNumber.Value.IndexNumber) || e.ParentIndexNumber > query.MinParentAndIndexNumber.Value.ParentIndexNumber);
+                .Where(e => (e.ParentIndexNumber == filter.MinParentAndIndexNumber.Value.ParentIndexNumber && e.IndexNumber >= filter.MinParentAndIndexNumber.Value.IndexNumber) || e.ParentIndexNumber > filter.MinParentAndIndexNumber.Value.ParentIndexNumber);
         }
 
-        if (query.MinDateCreated.HasValue)
+        if (filter.MinDateCreated.HasValue)
         {
-            baseQuery = baseQuery.Where(e => e.DateCreated >= query.MinDateCreated);
+            baseQuery = baseQuery.Where(e => e.DateCreated >= filter.MinDateCreated);
         }
 
-        if (query.MinDateLastSaved.HasValue)
+        if (filter.MinDateLastSaved.HasValue)
         {
-            baseQuery = baseQuery.Where(e => e.DateLastSaved != null && e.DateLastSaved >= query.MinDateLastSaved.Value);
+            baseQuery = baseQuery.Where(e => e.DateLastSaved != null && e.DateLastSaved >= filter.MinDateLastSaved.Value);
         }
 
-        if (query.MinDateLastSavedForUser.HasValue)
+        if (filter.MinDateLastSavedForUser.HasValue)
         {
-            baseQuery = baseQuery.Where(e => e.DateLastSaved != null && e.DateLastSaved >= query.MinDateLastSavedForUser.Value);
+            baseQuery = baseQuery.Where(e => e.DateLastSaved != null && e.DateLastSaved >= filter.MinDateLastSavedForUser.Value);
         }
 
-        if (query.IndexNumber.HasValue)
+        if (filter.IndexNumber.HasValue)
         {
-            baseQuery = baseQuery.Where(e => e.IndexNumber == query.IndexNumber.Value);
+            baseQuery = baseQuery.Where(e => e.IndexNumber == filter.IndexNumber.Value);
         }
 
-        if (query.ParentIndexNumber.HasValue)
+        if (filter.ParentIndexNumber.HasValue)
         {
-            baseQuery = baseQuery.Where(e => e.ParentIndexNumber == query.ParentIndexNumber.Value);
+            baseQuery = baseQuery.Where(e => e.ParentIndexNumber == filter.ParentIndexNumber.Value);
         }
 
-        if (query.ParentIndexNumberNotEquals.HasValue)
+        if (filter.ParentIndexNumberNotEquals.HasValue)
         {
-            baseQuery = baseQuery.Where(e => e.ParentIndexNumber != query.ParentIndexNumberNotEquals.Value || e.ParentIndexNumber == null);
+            baseQuery = baseQuery.Where(e => e.ParentIndexNumber != filter.ParentIndexNumberNotEquals.Value || e.ParentIndexNumber == null);
         }
 
-        var minEndDate = query.MinEndDate;
-        var maxEndDate = query.MaxEndDate;
+        var minEndDate = filter.MinEndDate;
+        var maxEndDate = filter.MaxEndDate;
 
-        if (query.HasAired.HasValue)
+        if (filter.HasAired.HasValue)
         {
-            if (query.HasAired.Value)
+            if (filter.HasAired.Value)
             {
                 maxEndDate = DateTime.UtcNow;
             }
@@ -727,34 +781,34 @@ public class BaseItemManager : IItemRepository
             baseQuery = baseQuery.Where(e => e.EndDate <= maxEndDate);
         }
 
-        if (query.MinStartDate.HasValue)
+        if (filter.MinStartDate.HasValue)
         {
-            baseQuery = baseQuery.Where(e => e.StartDate >= query.MinStartDate.Value);
+            baseQuery = baseQuery.Where(e => e.StartDate >= filter.MinStartDate.Value);
         }
 
-        if (query.MaxStartDate.HasValue)
+        if (filter.MaxStartDate.HasValue)
         {
-            baseQuery = baseQuery.Where(e => e.StartDate <= query.MaxStartDate.Value);
+            baseQuery = baseQuery.Where(e => e.StartDate <= filter.MaxStartDate.Value);
         }
 
-        if (query.MinPremiereDate.HasValue)
+        if (filter.MinPremiereDate.HasValue)
         {
-            baseQuery = baseQuery.Where(e => e.PremiereDate <= query.MinPremiereDate.Value);
+            baseQuery = baseQuery.Where(e => e.PremiereDate <= filter.MinPremiereDate.Value);
         }
 
-        if (query.MaxPremiereDate.HasValue)
+        if (filter.MaxPremiereDate.HasValue)
         {
-            baseQuery = baseQuery.Where(e => e.PremiereDate <= query.MaxPremiereDate.Value);
+            baseQuery = baseQuery.Where(e => e.PremiereDate <= filter.MaxPremiereDate.Value);
         }
 
-        if (query.TrailerTypes.Length > 0)
+        if (filter.TrailerTypes.Length > 0)
         {
-            baseQuery = baseQuery.Where(e => query.TrailerTypes.Any(f => e.TrailerTypes!.Contains(f.ToString(), StringComparison.OrdinalIgnoreCase)));
+            baseQuery = baseQuery.Where(e => filter.TrailerTypes.Any(f => e.TrailerTypes!.Contains(f.ToString(), StringComparison.OrdinalIgnoreCase)));
         }
 
-        if (query.IsAiring.HasValue)
+        if (filter.IsAiring.HasValue)
         {
-            if (query.IsAiring.Value)
+            if (filter.IsAiring.Value)
             {
                 baseQuery = baseQuery.Where(e => e.StartDate <= now && e.EndDate >= now);
             }
@@ -764,20 +818,20 @@ public class BaseItemManager : IItemRepository
             }
         }
 
-        if (query.PersonIds.Length > 0)
+        if (filter.PersonIds.Length > 0)
         {
             baseQuery = baseQuery
                 .Where(e =>
-                    context.Peoples.Where(w => context.BaseItems.Where(w => query.PersonIds.Contains(w.Id)).Any(f => f.Name == w.Name))
+                    context.Peoples.Where(w => context.BaseItems.Where(w => filter.PersonIds.Contains(w.Id)).Any(f => f.Name == w.Name))
                         .Any(f => f.ItemId.Equals(e.Id)));
         }
 
-        if (!string.IsNullOrWhiteSpace(query.Person))
+        if (!string.IsNullOrWhiteSpace(filter.Person))
         {
-            baseQuery = baseQuery.Where(e => e.Peoples!.Any(f => f.Name == query.Person));
+            baseQuery = baseQuery.Where(e => e.Peoples!.Any(f => f.Name == filter.Person));
         }
 
-        if (!string.IsNullOrWhiteSpace(query.MinSortName))
+        if (!string.IsNullOrWhiteSpace(filter.MinSortName))
         {
             // this does not makes sense.
             // baseQuery = baseQuery.Where(e => e.SortName >= query.MinSortName);
@@ -785,132 +839,132 @@ public class BaseItemManager : IItemRepository
             // statement?.TryBind("@MinSortName", query.MinSortName);
         }
 
-        if (!string.IsNullOrWhiteSpace(query.ExternalSeriesId))
+        if (!string.IsNullOrWhiteSpace(filter.ExternalSeriesId))
         {
-            baseQuery = baseQuery.Where(e => e.ExternalSeriesId == query.ExternalSeriesId);
+            baseQuery = baseQuery.Where(e => e.ExternalSeriesId == filter.ExternalSeriesId);
         }
 
-        if (!string.IsNullOrWhiteSpace(query.ExternalId))
+        if (!string.IsNullOrWhiteSpace(filter.ExternalId))
         {
-            baseQuery = baseQuery.Where(e => e.ExternalId == query.ExternalId);
+            baseQuery = baseQuery.Where(e => e.ExternalId == filter.ExternalId);
         }
 
-        if (!string.IsNullOrWhiteSpace(query.Name))
+        if (!string.IsNullOrWhiteSpace(filter.Name))
         {
-            var cleanName = GetCleanValue(query.Name);
+            var cleanName = GetCleanValue(filter.Name);
             baseQuery = baseQuery.Where(e => e.CleanName == cleanName);
         }
 
         // These are the same, for now
-        var nameContains = query.NameContains;
+        var nameContains = filter.NameContains;
         if (!string.IsNullOrWhiteSpace(nameContains))
         {
             baseQuery = baseQuery.Where(e =>
-                e.CleanName == query.NameContains
-                || e.OriginalTitle!.Contains(query.NameContains!, StringComparison.Ordinal));
+                e.CleanName == filter.NameContains
+                || e.OriginalTitle!.Contains(filter.NameContains!, StringComparison.Ordinal));
         }
 
-        if (!string.IsNullOrWhiteSpace(query.NameStartsWith))
+        if (!string.IsNullOrWhiteSpace(filter.NameStartsWith))
         {
-            baseQuery = baseQuery.Where(e => e.SortName!.Contains(query.NameStartsWith, StringComparison.OrdinalIgnoreCase));
+            baseQuery = baseQuery.Where(e => e.SortName!.Contains(filter.NameStartsWith, StringComparison.OrdinalIgnoreCase));
         }
 
-        if (!string.IsNullOrWhiteSpace(query.NameStartsWithOrGreater))
+        if (!string.IsNullOrWhiteSpace(filter.NameStartsWithOrGreater))
         {
             // i hate this
-            baseQuery = baseQuery.Where(e => e.SortName![0] > query.NameStartsWithOrGreater[0]);
+            baseQuery = baseQuery.Where(e => e.SortName![0] > filter.NameStartsWithOrGreater[0]);
         }
 
-        if (!string.IsNullOrWhiteSpace(query.NameLessThan))
+        if (!string.IsNullOrWhiteSpace(filter.NameLessThan))
         {
             // i hate this
-            baseQuery = baseQuery.Where(e => e.SortName![0] < query.NameLessThan[0]);
+            baseQuery = baseQuery.Where(e => e.SortName![0] < filter.NameLessThan[0]);
         }
 
-        if (query.ImageTypes.Length > 0)
+        if (filter.ImageTypes.Length > 0)
         {
-            baseQuery = baseQuery.Where(e => query.ImageTypes.Any(f => e.Images!.Contains(f.ToString(), StringComparison.InvariantCulture)));
+            baseQuery = baseQuery.Where(e => filter.ImageTypes.Any(f => e.Images!.Contains(f.ToString(), StringComparison.InvariantCulture)));
         }
 
-        if (query.IsLiked.HasValue)
+        if (filter.IsLiked.HasValue)
         {
             baseQuery = baseQuery
-                .Where(e => e.UserData!.FirstOrDefault(f => f.UserId.Equals(query.User!.Id) && f.Key == e.UserDataKey)!.Rating >= UserItemData.MinLikeValue);
+                .Where(e => e.UserData!.FirstOrDefault(f => f.UserId.Equals(filter.User!.Id) && f.Key == e.UserDataKey)!.Rating >= UserItemData.MinLikeValue);
         }
 
-        if (query.IsFavoriteOrLiked.HasValue)
+        if (filter.IsFavoriteOrLiked.HasValue)
         {
             baseQuery = baseQuery
-                .Where(e => e.UserData!.FirstOrDefault(f => f.UserId.Equals(query.User!.Id) && f.Key == e.UserDataKey)!.IsFavorite == query.IsFavoriteOrLiked);
+                .Where(e => e.UserData!.FirstOrDefault(f => f.UserId.Equals(filter.User!.Id) && f.Key == e.UserDataKey)!.IsFavorite == filter.IsFavoriteOrLiked);
         }
 
-        if (query.IsFavorite.HasValue)
+        if (filter.IsFavorite.HasValue)
         {
             baseQuery = baseQuery
-                .Where(e => e.UserData!.FirstOrDefault(f => f.UserId.Equals(query.User!.Id) && f.Key == e.UserDataKey)!.IsFavorite == query.IsFavorite);
+                .Where(e => e.UserData!.FirstOrDefault(f => f.UserId.Equals(filter.User!.Id) && f.Key == e.UserDataKey)!.IsFavorite == filter.IsFavorite);
         }
 
-        if (query.IsPlayed.HasValue)
+        if (filter.IsPlayed.HasValue)
         {
             baseQuery = baseQuery
-                   .Where(e => e.UserData!.FirstOrDefault(f => f.UserId.Equals(query.User!.Id) && f.Key == e.UserDataKey)!.Played == query.IsPlayed.Value);
+                   .Where(e => e.UserData!.FirstOrDefault(f => f.UserId.Equals(filter.User!.Id) && f.Key == e.UserDataKey)!.Played == filter.IsPlayed.Value);
         }
 
-        if (query.IsResumable.HasValue)
+        if (filter.IsResumable.HasValue)
         {
-            if (query.IsResumable.Value)
+            if (filter.IsResumable.Value)
             {
                 baseQuery = baseQuery
-                       .Where(e => e.UserData!.FirstOrDefault(f => f.UserId.Equals(query.User!.Id) && f.Key == e.UserDataKey)!.PlaybackPositionTicks > 0);
+                       .Where(e => e.UserData!.FirstOrDefault(f => f.UserId.Equals(filter.User!.Id) && f.Key == e.UserDataKey)!.PlaybackPositionTicks > 0);
             }
             else
             {
                 baseQuery = baseQuery
-                       .Where(e => e.UserData!.FirstOrDefault(f => f.UserId.Equals(query.User!.Id) && f.Key == e.UserDataKey)!.PlaybackPositionTicks == 0);
+                       .Where(e => e.UserData!.FirstOrDefault(f => f.UserId.Equals(filter.User!.Id) && f.Key == e.UserDataKey)!.PlaybackPositionTicks == 0);
             }
         }
 
-        var artistQuery = context.BaseItems.Where(w => query.ArtistIds.Contains(w.Id));
+        var artistQuery = context.BaseItems.Where(w => filter.ArtistIds.Contains(w.Id));
 
-        if (query.ArtistIds.Length > 0)
+        if (filter.ArtistIds.Length > 0)
         {
             baseQuery = baseQuery
                    .Where(e => e.ItemValues!.Any(f => f.Type <= 1 && artistQuery.Any(w => w.CleanName == f.CleanValue)));
         }
 
-        if (query.AlbumArtistIds.Length > 0)
+        if (filter.AlbumArtistIds.Length > 0)
         {
             baseQuery = baseQuery
                .Where(e => e.ItemValues!.Any(f => f.Type == 1 && artistQuery.Any(w => w.CleanName == f.CleanValue)));
         }
 
-        if (query.ContributingArtistIds.Length > 0)
+        if (filter.ContributingArtistIds.Length > 0)
         {
-            var contributingArtists = context.BaseItems.Where(e => query.ContributingArtistIds.Contains(e.Id));
+            var contributingArtists = context.BaseItems.Where(e => filter.ContributingArtistIds.Contains(e.Id));
             baseQuery = baseQuery.Where(e => e.ItemValues!.Any(f => f.Type == 0 && contributingArtists.Any(w => w.CleanName == f.CleanValue)));
         }
 
-        if (query.AlbumIds.Length > 0)
+        if (filter.AlbumIds.Length > 0)
         {
-            baseQuery = baseQuery.Where(e => context.BaseItems.Where(e => query.AlbumIds.Contains(e.Id)).Any(f => f.Name == e.Album));
+            baseQuery = baseQuery.Where(e => context.BaseItems.Where(e => filter.AlbumIds.Contains(e.Id)).Any(f => f.Name == e.Album));
         }
 
-        if (query.ExcludeArtistIds.Length > 0)
+        if (filter.ExcludeArtistIds.Length > 0)
         {
-            var excludeArtistQuery = context.BaseItems.Where(w => query.ExcludeArtistIds.Contains(w.Id));
+            var excludeArtistQuery = context.BaseItems.Where(w => filter.ExcludeArtistIds.Contains(w.Id));
             baseQuery = baseQuery
                    .Where(e => !e.ItemValues!.Any(f => f.Type <= 1 && artistQuery.Any(w => w.CleanName == f.CleanValue)));
         }
 
-        if (query.GenreIds.Count > 0)
+        if (filter.GenreIds.Count > 0)
         {
             baseQuery = baseQuery
-                   .Where(e => e.ItemValues!.Any(f => f.Type == 2 && context.BaseItems.Where(w => query.GenreIds.Contains(w.Id)).Any(w => w.CleanName == f.CleanValue)));
+                   .Where(e => e.ItemValues!.Any(f => f.Type == 2 && context.BaseItems.Where(w => filter.GenreIds.Contains(w.Id)).Any(w => w.CleanName == f.CleanValue)));
         }
 
-        if (query.Genres.Count > 0)
+        if (filter.Genres.Count > 0)
         {
-            var cleanGenres = query.Genres.Select(e => GetCleanValue(e)).ToArray();
+            var cleanGenres = filter.Genres.Select(e => GetCleanValue(e)).ToArray();
             baseQuery = baseQuery
                    .Where(e => e.ItemValues!.Any(f => f.Type == 2 && cleanGenres.Contains(f.CleanValue)));
         }
@@ -929,82 +983,82 @@ public class BaseItemManager : IItemRepository
                    .Where(e => !e.ItemValues!.Any(f => f.Type == 4 && cleanValues.Contains(f.CleanValue)));
         }
 
-        if (query.StudioIds.Length > 0)
+        if (filter.StudioIds.Length > 0)
         {
             baseQuery = baseQuery
-                   .Where(e => e.ItemValues!.Any(f => f.Type == 3 && context.BaseItems.Where(w => query.StudioIds.Contains(w.Id)).Any(w => w.CleanName == f.CleanValue)));
+                   .Where(e => e.ItemValues!.Any(f => f.Type == 3 && context.BaseItems.Where(w => filter.StudioIds.Contains(w.Id)).Any(w => w.CleanName == f.CleanValue)));
         }
 
-        if (query.OfficialRatings.Length > 0)
+        if (filter.OfficialRatings.Length > 0)
         {
             baseQuery = baseQuery
-                   .Where(e => query.OfficialRatings.Contains(e.OfficialRating));
+                   .Where(e => filter.OfficialRatings.Contains(e.OfficialRating));
         }
 
-        if (query.HasParentalRating ?? false)
+        if (filter.HasParentalRating ?? false)
         {
-            if (query.MinParentalRating.HasValue)
+            if (filter.MinParentalRating.HasValue)
             {
                 baseQuery = baseQuery
-                   .Where(e => e.InheritedParentalRatingValue >= query.MinParentalRating.Value);
+                   .Where(e => e.InheritedParentalRatingValue >= filter.MinParentalRating.Value);
             }
 
-            if (query.MaxParentalRating.HasValue)
+            if (filter.MaxParentalRating.HasValue)
             {
                 baseQuery = baseQuery
-                   .Where(e => e.InheritedParentalRatingValue < query.MaxParentalRating.Value);
+                   .Where(e => e.InheritedParentalRatingValue < filter.MaxParentalRating.Value);
             }
         }
-        else if (query.BlockUnratedItems.Length > 0)
+        else if (filter.BlockUnratedItems.Length > 0)
         {
-            if (query.MinParentalRating.HasValue)
+            if (filter.MinParentalRating.HasValue)
             {
-                if (query.MaxParentalRating.HasValue)
+                if (filter.MaxParentalRating.HasValue)
                 {
                     baseQuery = baseQuery
-                        .Where(e => (e.InheritedParentalRatingValue == null && !query.BlockUnratedItems.Select(e => e.ToString()).Contains(e.UnratedType))
-                        || (e.InheritedParentalRatingValue >= query.MinParentalRating && e.InheritedParentalRatingValue <= query.MaxParentalRating));
+                        .Where(e => (e.InheritedParentalRatingValue == null && !filter.BlockUnratedItems.Select(e => e.ToString()).Contains(e.UnratedType))
+                        || (e.InheritedParentalRatingValue >= filter.MinParentalRating && e.InheritedParentalRatingValue <= filter.MaxParentalRating));
                 }
                 else
                 {
                     baseQuery = baseQuery
-                        .Where(e => (e.InheritedParentalRatingValue == null && !query.BlockUnratedItems.Select(e => e.ToString()).Contains(e.UnratedType))
-                        || e.InheritedParentalRatingValue >= query.MinParentalRating);
+                        .Where(e => (e.InheritedParentalRatingValue == null && !filter.BlockUnratedItems.Select(e => e.ToString()).Contains(e.UnratedType))
+                        || e.InheritedParentalRatingValue >= filter.MinParentalRating);
                 }
             }
             else
             {
                 baseQuery = baseQuery
-                    .Where(e => e.InheritedParentalRatingValue != null && !query.BlockUnratedItems.Select(e => e.ToString()).Contains(e.UnratedType));
+                    .Where(e => e.InheritedParentalRatingValue != null && !filter.BlockUnratedItems.Select(e => e.ToString()).Contains(e.UnratedType));
             }
         }
-        else if (query.MinParentalRating.HasValue)
+        else if (filter.MinParentalRating.HasValue)
         {
-            if (query.MaxParentalRating.HasValue)
+            if (filter.MaxParentalRating.HasValue)
             {
                 baseQuery = baseQuery
-                    .Where(e => e.InheritedParentalRatingValue != null && e.InheritedParentalRatingValue >= query.MinParentalRating.Value && e.InheritedParentalRatingValue <= query.MaxParentalRating.Value);
+                    .Where(e => e.InheritedParentalRatingValue != null && e.InheritedParentalRatingValue >= filter.MinParentalRating.Value && e.InheritedParentalRatingValue <= filter.MaxParentalRating.Value);
             }
             else
             {
                 baseQuery = baseQuery
-                    .Where(e => e.InheritedParentalRatingValue != null && e.InheritedParentalRatingValue >= query.MinParentalRating.Value);
+                    .Where(e => e.InheritedParentalRatingValue != null && e.InheritedParentalRatingValue >= filter.MinParentalRating.Value);
             }
         }
-        else if (query.MaxParentalRating.HasValue)
+        else if (filter.MaxParentalRating.HasValue)
         {
             baseQuery = baseQuery
-                .Where(e => e.InheritedParentalRatingValue != null && e.InheritedParentalRatingValue >= query.MaxParentalRating.Value);
+                .Where(e => e.InheritedParentalRatingValue != null && e.InheritedParentalRatingValue >= filter.MaxParentalRating.Value);
         }
-        else if (!query.HasParentalRating ?? false)
+        else if (!filter.HasParentalRating ?? false)
         {
             baseQuery = baseQuery
                 .Where(e => e.InheritedParentalRatingValue == null);
         }
 
-        if (query.HasOfficialRating.HasValue)
+        if (filter.HasOfficialRating.HasValue)
         {
-            if (query.HasOfficialRating.Value)
+            if (filter.HasOfficialRating.Value)
             {
                 baseQuery = baseQuery
                     .Where(e => e.OfficialRating != null && e.OfficialRating != string.Empty);
@@ -1016,9 +1070,9 @@ public class BaseItemManager : IItemRepository
             }
         }
 
-        if (query.HasOverview.HasValue)
+        if (filter.HasOverview.HasValue)
         {
-            if (query.HasOverview.Value)
+            if (filter.HasOverview.Value)
             {
                 baseQuery = baseQuery
                     .Where(e => e.Overview != null && e.Overview != string.Empty);
@@ -1030,9 +1084,9 @@ public class BaseItemManager : IItemRepository
             }
         }
 
-        if (query.HasOwnerId.HasValue)
+        if (filter.HasOwnerId.HasValue)
         {
-            if (query.HasOwnerId.Value)
+            if (filter.HasOwnerId.Value)
             {
                 baseQuery = baseQuery
                     .Where(e => e.OwnerId != null);
@@ -1044,87 +1098,87 @@ public class BaseItemManager : IItemRepository
             }
         }
 
-        if (!string.IsNullOrWhiteSpace(query.HasNoAudioTrackWithLanguage))
+        if (!string.IsNullOrWhiteSpace(filter.HasNoAudioTrackWithLanguage))
         {
             baseQuery = baseQuery
-                .Where(e => !e.MediaStreams!.Any(e => e.StreamType == "Audio" && e.Language == query.HasNoAudioTrackWithLanguage));
+                .Where(e => !e.MediaStreams!.Any(e => e.StreamType == "Audio" && e.Language == filter.HasNoAudioTrackWithLanguage));
         }
 
-        if (!string.IsNullOrWhiteSpace(query.HasNoInternalSubtitleTrackWithLanguage))
+        if (!string.IsNullOrWhiteSpace(filter.HasNoInternalSubtitleTrackWithLanguage))
         {
             baseQuery = baseQuery
-                .Where(e => !e.MediaStreams!.Any(e => e.StreamType == "Subtitle" && !e.IsExternal && e.Language == query.HasNoInternalSubtitleTrackWithLanguage));
+                .Where(e => !e.MediaStreams!.Any(e => e.StreamType == "Subtitle" && !e.IsExternal && e.Language == filter.HasNoInternalSubtitleTrackWithLanguage));
         }
 
-        if (!string.IsNullOrWhiteSpace(query.HasNoExternalSubtitleTrackWithLanguage))
+        if (!string.IsNullOrWhiteSpace(filter.HasNoExternalSubtitleTrackWithLanguage))
         {
             baseQuery = baseQuery
-                .Where(e => !e.MediaStreams!.Any(e => e.StreamType == "Subtitle" && e.IsExternal && e.Language == query.HasNoExternalSubtitleTrackWithLanguage));
+                .Where(e => !e.MediaStreams!.Any(e => e.StreamType == "Subtitle" && e.IsExternal && e.Language == filter.HasNoExternalSubtitleTrackWithLanguage));
         }
 
-        if (!string.IsNullOrWhiteSpace(query.HasNoSubtitleTrackWithLanguage))
+        if (!string.IsNullOrWhiteSpace(filter.HasNoSubtitleTrackWithLanguage))
         {
             baseQuery = baseQuery
-                .Where(e => !e.MediaStreams!.Any(e => e.StreamType == "Subtitle" && e.Language == query.HasNoSubtitleTrackWithLanguage));
+                .Where(e => !e.MediaStreams!.Any(e => e.StreamType == "Subtitle" && e.Language == filter.HasNoSubtitleTrackWithLanguage));
         }
 
-        if (query.HasSubtitles.HasValue)
+        if (filter.HasSubtitles.HasValue)
         {
             baseQuery = baseQuery
-                .Where(e => e.MediaStreams!.Any(e => e.StreamType == "Subtitle") == query.HasSubtitles.Value);
+                .Where(e => e.MediaStreams!.Any(e => e.StreamType == "Subtitle") == filter.HasSubtitles.Value);
         }
 
-        if (query.HasChapterImages.HasValue)
+        if (filter.HasChapterImages.HasValue)
         {
             baseQuery = baseQuery
-                .Where(e => e.Chapters!.Any(e => e.ImagePath != null) == query.HasChapterImages.Value);
+                .Where(e => e.Chapters!.Any(e => e.ImagePath != null) == filter.HasChapterImages.Value);
         }
 
-        if (query.HasDeadParentId.HasValue && query.HasDeadParentId.Value)
+        if (filter.HasDeadParentId.HasValue && filter.HasDeadParentId.Value)
         {
             baseQuery = baseQuery
                 .Where(e => e.ParentId.HasValue && context.BaseItems.Any(f => f.Id.Equals(e.ParentId.Value)));
         }
 
-        if (query.IsDeadArtist.HasValue && query.IsDeadArtist.Value)
+        if (filter.IsDeadArtist.HasValue && filter.IsDeadArtist.Value)
         {
             baseQuery = baseQuery
                 .Where(e => e.ItemValues!.Any(f => (f.Type == 0 || f.Type == 1) && f.CleanValue == e.CleanName));
         }
 
-        if (query.IsDeadStudio.HasValue && query.IsDeadStudio.Value)
+        if (filter.IsDeadStudio.HasValue && filter.IsDeadStudio.Value)
         {
             baseQuery = baseQuery
                 .Where(e => e.ItemValues!.Any(f => f.Type == 3 && f.CleanValue == e.CleanName));
         }
 
-        if (query.IsDeadPerson.HasValue && query.IsDeadPerson.Value)
+        if (filter.IsDeadPerson.HasValue && filter.IsDeadPerson.Value)
         {
             baseQuery = baseQuery
                 .Where(e => !e.Peoples!.Any(f => f.Name == e.Name));
         }
 
-        if (query.Years.Length == 1)
+        if (filter.Years.Length == 1)
         {
             baseQuery = baseQuery
-                .Where(e => e.ProductionYear == query.Years[0]);
+                .Where(e => e.ProductionYear == filter.Years[0]);
         }
-        else if (query.Years.Length > 1)
+        else if (filter.Years.Length > 1)
         {
             baseQuery = baseQuery
-                .Where(e => query.Years.Any(f => f == e.ProductionYear));
+                .Where(e => filter.Years.Any(f => f == e.ProductionYear));
         }
 
-        var isVirtualItem = query.IsVirtualItem ?? query.IsMissing;
+        var isVirtualItem = filter.IsVirtualItem ?? filter.IsMissing;
         if (isVirtualItem.HasValue)
         {
             baseQuery = baseQuery
                 .Where(e => e.IsVirtualItem == isVirtualItem.Value);
         }
 
-        if (query.IsSpecialSeason.HasValue)
+        if (filter.IsSpecialSeason.HasValue)
         {
-            if (query.IsSpecialSeason.Value)
+            if (filter.IsSpecialSeason.Value)
             {
                 baseQuery = baseQuery
                     .Where(e => e.IndexNumber == 0);
@@ -1136,9 +1190,9 @@ public class BaseItemManager : IItemRepository
             }
         }
 
-        if (query.IsUnaired.HasValue)
+        if (filter.IsUnaired.HasValue)
         {
-            if (query.IsUnaired.Value)
+            if (filter.IsUnaired.Value)
             {
                 baseQuery = baseQuery
                     .Where(e => e.PremiereDate >= now);
@@ -1150,60 +1204,60 @@ public class BaseItemManager : IItemRepository
             }
         }
 
-        if (query.MediaTypes.Length == 1)
+        if (filter.MediaTypes.Length == 1)
         {
             baseQuery = baseQuery
-                .Where(e => e.MediaType == query.MediaTypes[0].ToString());
+                .Where(e => e.MediaType == filter.MediaTypes[0].ToString());
         }
-        else if (query.MediaTypes.Length > 1)
+        else if (filter.MediaTypes.Length > 1)
         {
             baseQuery = baseQuery
-                .Where(e => query.MediaTypes.Select(f => f.ToString()).Contains(e.MediaType));
+                .Where(e => filter.MediaTypes.Select(f => f.ToString()).Contains(e.MediaType));
         }
 
-        if (query.ItemIds.Length > 0)
+        if (filter.ItemIds.Length > 0)
         {
             baseQuery = baseQuery
-                .Where(e => query.ItemIds.Contains(e.Id));
+                .Where(e => filter.ItemIds.Contains(e.Id));
         }
 
-        if (query.ExcludeItemIds.Length > 0)
+        if (filter.ExcludeItemIds.Length > 0)
         {
             baseQuery = baseQuery
-                .Where(e => !query.ItemIds.Contains(e.Id));
+                .Where(e => !filter.ItemIds.Contains(e.Id));
         }
 
-        if (query.ExcludeProviderIds is not null && query.ExcludeProviderIds.Count > 0)
+        if (filter.ExcludeProviderIds is not null && filter.ExcludeProviderIds.Count > 0)
         {
-            baseQuery = baseQuery.Where(e => !e.Provider!.All(f => !query.ExcludeProviderIds.All(w => f.ProviderId == w.Key && f.ProviderValue == w.Value)));
+            baseQuery = baseQuery.Where(e => !e.Provider!.All(f => !filter.ExcludeProviderIds.All(w => f.ProviderId == w.Key && f.ProviderValue == w.Value)));
         }
 
-        if (query.HasAnyProviderId is not null && query.HasAnyProviderId.Count > 0)
+        if (filter.HasAnyProviderId is not null && filter.HasAnyProviderId.Count > 0)
         {
-            baseQuery = baseQuery.Where(e => e.Provider!.Any(f => !query.HasAnyProviderId.Any(w => f.ProviderId == w.Key && f.ProviderValue == w.Value)));
+            baseQuery = baseQuery.Where(e => e.Provider!.Any(f => !filter.HasAnyProviderId.Any(w => f.ProviderId == w.Key && f.ProviderValue == w.Value)));
         }
 
-        if (query.HasImdbId.HasValue)
+        if (filter.HasImdbId.HasValue)
         {
             baseQuery = baseQuery.Where(e => e.Provider!.Any(f => f.ProviderId == "imdb"));
         }
 
-        if (query.HasTmdbId.HasValue)
+        if (filter.HasTmdbId.HasValue)
         {
             baseQuery = baseQuery.Where(e => e.Provider!.Any(f => f.ProviderId == "tmdb"));
         }
 
-        if (query.HasTvdbId.HasValue)
+        if (filter.HasTvdbId.HasValue)
         {
             baseQuery = baseQuery.Where(e => e.Provider!.Any(f => f.ProviderId == "tvdb"));
         }
 
-        var queryTopParentIds = query.TopParentIds;
+        var queryTopParentIds = filter.TopParentIds;
 
         if (queryTopParentIds.Length > 0)
         {
-            var includedItemByNameTypes = GetItemByNameTypesInQuery(query);
-            var enableItemsByName = (query.IncludeItemsByName ?? false) && includedItemByNameTypes.Count > 0;
+            var includedItemByNameTypes = GetItemByNameTypesInQuery(filter);
+            var enableItemsByName = (filter.IncludeItemsByName ?? false) && includedItemByNameTypes.Count > 0;
             if (enableItemsByName && includedItemByNameTypes.Count > 0)
             {
                 baseQuery = baseQuery.Where(e => includedItemByNameTypes.Contains(e.Type) || queryTopParentIds.Any(w => w.Equals(e.TopParentId!.Value)));
@@ -1214,31 +1268,31 @@ public class BaseItemManager : IItemRepository
             }
         }
 
-        if (query.AncestorIds.Length > 0)
+        if (filter.AncestorIds.Length > 0)
         {
-            baseQuery = baseQuery.Where(e => e.AncestorIds!.Any(f => query.AncestorIds.Contains(f.Id)));
+            baseQuery = baseQuery.Where(e => e.AncestorIds!.Any(f => filter.AncestorIds.Contains(f.Id)));
         }
 
-        if (!string.IsNullOrWhiteSpace(query.AncestorWithPresentationUniqueKey))
+        if (!string.IsNullOrWhiteSpace(filter.AncestorWithPresentationUniqueKey))
         {
             baseQuery = baseQuery
-                .Where(e => context.BaseItems.Where(f => f.PresentationUniqueKey == query.AncestorWithPresentationUniqueKey).Any(f => f.AncestorIds!.Any(w => w.ItemId.Equals(f.Id))));
+                .Where(e => context.BaseItems.Where(f => f.PresentationUniqueKey == filter.AncestorWithPresentationUniqueKey).Any(f => f.AncestorIds!.Any(w => w.ItemId.Equals(f.Id))));
         }
 
-        if (!string.IsNullOrWhiteSpace(query.SeriesPresentationUniqueKey))
+        if (!string.IsNullOrWhiteSpace(filter.SeriesPresentationUniqueKey))
         {
             baseQuery = baseQuery
-                .Where(e => e.SeriesPresentationUniqueKey == query.SeriesPresentationUniqueKey);
+                .Where(e => e.SeriesPresentationUniqueKey == filter.SeriesPresentationUniqueKey);
         }
 
-        if (query.ExcludeInheritedTags.Length > 0)
+        if (filter.ExcludeInheritedTags.Length > 0)
         {
             baseQuery = baseQuery
                 .Where(e => !e.ItemValues!.Where(e => e.Type == 6)
-                    .Any(f => query.ExcludeInheritedTags.Contains(f.CleanValue)));
+                    .Any(f => filter.ExcludeInheritedTags.Contains(f.CleanValue)));
         }
 
-        if (query.IncludeInheritedTags.Length > 0)
+        if (filter.IncludeInheritedTags.Length > 0)
         {
             // Episodes do not store inherit tags from their parents in the database, and the tag may be still required by the client.
             // In addtion to the tags for the episodes themselves, we need to manually query its parent (the season)'s tags as well.
@@ -1246,10 +1300,10 @@ public class BaseItemManager : IItemRepository
             {
                 baseQuery = baseQuery
                     .Where(e => e.ItemValues!.Where(e => e.Type == 6)
-                        .Any(f => query.IncludeInheritedTags.Contains(f.CleanValue))
+                        .Any(f => filter.IncludeInheritedTags.Contains(f.CleanValue))
                         ||
                         (e.ParentId.HasValue && context.ItemValues.Where(w => w.ItemId.Equals(e.ParentId.Value))!.Where(e => e.Type == 6)
-                        .Any(f => query.IncludeInheritedTags.Contains(f.CleanValue))));
+                        .Any(f => filter.IncludeInheritedTags.Contains(f.CleanValue))));
             }
 
             // A playlist should be accessible to its owner regardless of allowed tags.
@@ -1257,39 +1311,39 @@ public class BaseItemManager : IItemRepository
             {
                 baseQuery = baseQuery
                     .Where(e => e.ItemValues!.Where(e => e.Type == 6)
-                        .Any(f => query.IncludeInheritedTags.Contains(f.CleanValue)) || e.Data!.Contains($"OwnerUserId\":\"{query.User!.Id:N}\""));
+                        .Any(f => filter.IncludeInheritedTags.Contains(f.CleanValue)) || e.Data!.Contains($"OwnerUserId\":\"{filter.User!.Id:N}\""));
                 // d                                                                      ^^ this is stupid it hate this.
             }
             else
             {
                 baseQuery = baseQuery
                     .Where(e => e.ItemValues!.Where(e => e.Type == 6)
-                        .Any(f => query.IncludeInheritedTags.Contains(f.CleanValue)));
+                        .Any(f => filter.IncludeInheritedTags.Contains(f.CleanValue)));
             }
         }
 
-        if (query.SeriesStatuses.Length > 0)
+        if (filter.SeriesStatuses.Length > 0)
         {
             baseQuery = baseQuery
-                .Where(e => query.SeriesStatuses.Any(f => e.Data!.Contains(f.ToString(), StringComparison.InvariantCultureIgnoreCase)));
+                .Where(e => filter.SeriesStatuses.Any(f => e.Data!.Contains(f.ToString(), StringComparison.InvariantCultureIgnoreCase)));
         }
 
-        if (query.BoxSetLibraryFolders.Length > 0)
+        if (filter.BoxSetLibraryFolders.Length > 0)
         {
             baseQuery = baseQuery
-                .Where(e => query.BoxSetLibraryFolders.Any(f => e.Data!.Contains(f.ToString("N", CultureInfo.InvariantCulture), StringComparison.InvariantCultureIgnoreCase)));
+                .Where(e => filter.BoxSetLibraryFolders.Any(f => e.Data!.Contains(f.ToString("N", CultureInfo.InvariantCulture), StringComparison.InvariantCultureIgnoreCase)));
         }
 
-        if (query.VideoTypes.Length > 0)
+        if (filter.VideoTypes.Length > 0)
         {
-            var videoTypeBs = query.VideoTypes.Select(e => $"\"VideoType\":\"" + e + "\"");
+            var videoTypeBs = filter.VideoTypes.Select(e => $"\"VideoType\":\"" + e + "\"");
             baseQuery = baseQuery
                 .Where(e => videoTypeBs.Any(f => e.Data!.Contains(f, StringComparison.InvariantCultureIgnoreCase)));
         }
 
-        if (query.Is3D.HasValue)
+        if (filter.Is3D.HasValue)
         {
-            if (query.Is3D.Value)
+            if (filter.Is3D.Value)
             {
                 baseQuery = baseQuery
                     .Where(e => e.Data!.Contains("Video3DFormat", StringComparison.InvariantCultureIgnoreCase));
@@ -1301,9 +1355,9 @@ public class BaseItemManager : IItemRepository
             }
         }
 
-        if (query.IsPlaceHolder.HasValue)
+        if (filter.IsPlaceHolder.HasValue)
         {
-            if (query.IsPlaceHolder.Value)
+            if (filter.IsPlaceHolder.Value)
             {
                 baseQuery = baseQuery
                     .Where(e => e.Data!.Contains("IsPlaceHolder\":true", StringComparison.InvariantCultureIgnoreCase));
@@ -1315,9 +1369,9 @@ public class BaseItemManager : IItemRepository
             }
         }
 
-        if (query.HasSpecialFeature.HasValue)
+        if (filter.HasSpecialFeature.HasValue)
         {
-            if (query.HasSpecialFeature.Value)
+            if (filter.HasSpecialFeature.Value)
             {
                 baseQuery = baseQuery
                     .Where(e => e.ExtraIds != null);
@@ -1329,9 +1383,9 @@ public class BaseItemManager : IItemRepository
             }
         }
 
-        if (query.HasTrailer.HasValue || query.HasThemeSong.HasValue || query.HasThemeVideo.HasValue)
+        if (filter.HasTrailer.HasValue || filter.HasThemeSong.HasValue || filter.HasThemeVideo.HasValue)
         {
-            if (query.HasTrailer.GetValueOrDefault() || query.HasThemeSong.GetValueOrDefault() || query.HasThemeVideo.GetValueOrDefault())
+            if (filter.HasTrailer.GetValueOrDefault() || filter.HasThemeSong.GetValueOrDefault() || filter.HasThemeVideo.GetValueOrDefault())
             {
                 baseQuery = baseQuery
                     .Where(e => e.ExtraIds != null);
@@ -1776,6 +1830,26 @@ public class BaseItemManager : IItemRepository
         return entity;
     }
 
+    private IReadOnlyList<string> GetItemValueNames(int[] itemValueTypes, IReadOnlyList<string> withItemTypes, IReadOnlyList<string> excludeItemTypes)
+    {
+        using var context = _dbProvider.CreateDbContext();
+
+        var query = context.ItemValues
+            .Where(e => itemValueTypes.Contains(e.Type));
+        if (withItemTypes.Count > 0)
+        {
+            query = query.Where(e => context.BaseItems.Where(e => withItemTypes.Contains(e.Type)).Any(f => f.ItemValues!.Any(w => w.ItemId.Equals(e.ItemId))));
+        }
+
+        if (excludeItemTypes.Count > 0)
+        {
+            query = query.Where(e => !context.BaseItems.Where(e => withItemTypes.Contains(e.Type)).Any(f => f.ItemValues!.Any(w => w.ItemId.Equals(e.ItemId))));
+        }
+
+        query = query.DistinctBy(e => e.CleanValue);
+        return query.Select(e => e.CleanValue).ToImmutableArray();
+    }
+
     private BaseItemDto DeserialiseBaseItem(BaseItemEntity baseItemEntity)
     {
         var type = GetType(baseItemEntity.Type) ?? throw new InvalidOperationException("Cannot deserialise unkown type.");
diff --git a/Jellyfin.Server.Implementations/Item/MediaAttachmentManager.cs b/Jellyfin.Server.Implementations/Item/MediaAttachmentManager.cs
new file mode 100644
index 000000000..288b1943e
--- /dev/null
+++ b/Jellyfin.Server.Implementations/Item/MediaAttachmentManager.cs
@@ -0,0 +1,73 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.Immutable;
+using System.Linq;
+using System.Threading;
+using Jellyfin.Data.Entities;
+using MediaBrowser.Controller.Persistence;
+using MediaBrowser.Model.Entities;
+using Microsoft.EntityFrameworkCore;
+
+namespace Jellyfin.Server.Implementations.Item;
+
+/// <summary>
+/// Manager for handling Media Attachments.
+/// </summary>
+/// <param name="dbProvider">Efcore Factory.</param>
+public class MediaAttachmentManager(IDbContextFactory<JellyfinDbContext> dbProvider) : IMediaAttachmentManager
+{
+    /// <inheritdoc />
+    public void SaveMediaAttachments(
+        Guid id,
+        IReadOnlyList<MediaAttachment> attachments,
+        CancellationToken cancellationToken)
+    {
+        using var context = dbProvider.CreateDbContext();
+        using var transaction = context.Database.BeginTransaction();
+        context.AttachmentStreamInfos.Where(e => e.ItemId.Equals(id)).ExecuteDelete();
+        context.AttachmentStreamInfos.AddRange(attachments.Select(e => Map(e, id)));
+        context.SaveChanges();
+        transaction.Commit();
+    }
+
+    /// <inheritdoc />
+    public IReadOnlyList<MediaAttachment> GetMediaAttachments(MediaAttachmentQuery filter)
+    {
+        using var context = dbProvider.CreateDbContext();
+        var query = context.AttachmentStreamInfos.Where(e => e.ItemId.Equals(filter.ItemId));
+        if (filter.Index.HasValue)
+        {
+            query = query.Where(e => e.Index == filter.Index);
+        }
+
+        return query.ToList().Select(Map).ToImmutableArray();
+    }
+
+    private MediaAttachment Map(AttachmentStreamInfo attachment)
+    {
+        return new MediaAttachment()
+        {
+            Codec = attachment.Codec,
+            CodecTag = attachment.CodecTag,
+            Comment = attachment.Comment,
+            FileName = attachment.Filename,
+            Index = attachment.Index,
+            MimeType = attachment.MimeType,
+        };
+    }
+
+    private AttachmentStreamInfo Map(MediaAttachment attachment, Guid id)
+    {
+        return new AttachmentStreamInfo()
+        {
+            Codec = attachment.Codec,
+            CodecTag = attachment.CodecTag,
+            Comment = attachment.Comment,
+            Filename = attachment.FileName,
+            Index = attachment.Index,
+            MimeType = attachment.MimeType,
+            ItemId = id,
+            Item = null!
+        };
+    }
+}
diff --git a/Jellyfin.Server.Implementations/Item/MediaStreamManager.cs b/Jellyfin.Server.Implementations/Item/MediaStreamManager.cs
index e609cdc1e..b7124283a 100644
--- a/Jellyfin.Server.Implementations/Item/MediaStreamManager.cs
+++ b/Jellyfin.Server.Implementations/Item/MediaStreamManager.cs
@@ -18,7 +18,7 @@ namespace Jellyfin.Server.Implementations.Item;
 /// <param name="dbProvider"></param>
 /// <param name="serverApplicationHost"></param>
 /// <param name="localization"></param>
-public class MediaStreamManager(IDbContextFactory<JellyfinDbContext> dbProvider, IServerApplicationHost serverApplicationHost, ILocalizationManager localization)
+public class MediaStreamManager(IDbContextFactory<JellyfinDbContext> dbProvider, IServerApplicationHost serverApplicationHost, ILocalizationManager localization) : IMediaStreamManager
 {
     /// <inheritdoc />
     public void SaveMediaStreams(Guid id, IReadOnlyList<MediaStream> streams, CancellationToken cancellationToken)
diff --git a/Jellyfin.Server.Implementations/Item/PeopleManager.cs b/Jellyfin.Server.Implementations/Item/PeopleManager.cs
index 0f1760cbd..d29d8b143 100644
--- a/Jellyfin.Server.Implementations/Item/PeopleManager.cs
+++ b/Jellyfin.Server.Implementations/Item/PeopleManager.cs
@@ -6,22 +6,22 @@ using Jellyfin.Data.Entities;
 using Jellyfin.Data.Enums;
 using Jellyfin.Extensions;
 using MediaBrowser.Controller.Entities;
+using MediaBrowser.Controller.Persistence;
 using Microsoft.EntityFrameworkCore;
 
 namespace Jellyfin.Server.Implementations.Item;
 
-public class PeopleManager
+/// <summary>
+/// Manager for handling people.
+/// </summary>
+/// <param name="dbProvider">Efcore Factory.</param>
+/// <remarks>
+/// Initializes a new instance of the <see cref="PeopleManager"/> class.
+/// </remarks>
+/// <param name="dbProvider">The EFCore Context factory.</param>
+public class PeopleManager(IDbContextFactory<JellyfinDbContext> dbProvider) : IPeopleManager
 {
-    private readonly IDbContextFactory<JellyfinDbContext> _dbProvider;
-
-    /// <summary>
-    /// Initializes a new instance of the <see cref="PeopleManager"/> class.
-    /// </summary>
-    /// <param name="dbProvider">The EFCore Context factory.</param>
-    public PeopleManager(IDbContextFactory<JellyfinDbContext> dbProvider)
-    {
-        _dbProvider = dbProvider;
-    }
+    private readonly IDbContextFactory<JellyfinDbContext> _dbProvider = dbProvider;
 
     public IReadOnlyList<PersonInfo> GetPeople(InternalPeopleQuery filter)
     {
diff --git a/MediaBrowser.Controller/Persistence/IItemRepository.cs b/MediaBrowser.Controller/Persistence/IItemRepository.cs
index 21b9ee4b7..313b1459a 100644
--- a/MediaBrowser.Controller/Persistence/IItemRepository.cs
+++ b/MediaBrowser.Controller/Persistence/IItemRepository.cs
@@ -7,135 +7,83 @@ using System.Collections.Generic;
 using System.Threading;
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Model.Dto;
-using MediaBrowser.Model.Entities;
 using MediaBrowser.Model.Querying;
 
-namespace MediaBrowser.Controller.Persistence
+namespace MediaBrowser.Controller.Persistence;
+
+/// <summary>
+/// Provides an interface to implement an Item repository.
+/// </summary>
+public interface IItemRepository : IDisposable
 {
     /// <summary>
-    /// Provides an interface to implement an Item repository.
+    /// Deletes the item.
+    /// </summary>
+    /// <param name="id">The identifier.</param>
+    void DeleteItem(Guid id);
+
+    /// <summary>
+    /// Saves the items.
+    /// </summary>
+    /// <param name="items">The items.</param>
+    /// <param name="cancellationToken">The cancellation token.</param>
+    void SaveItems(IReadOnlyList<BaseItem> items, CancellationToken cancellationToken);
+
+    void SaveImages(BaseItem item);
+
+    /// <summary>
+    /// Retrieves the item.
+    /// </summary>
+    /// <param name="id">The id.</param>
+    /// <returns>BaseItem.</returns>
+    BaseItem RetrieveItem(Guid id);
+
+    /// <summary>
+    /// Gets the items.
+    /// </summary>
+    /// <param name="filter">The query.</param>
+    /// <returns>QueryResult&lt;BaseItem&gt;.</returns>
+    QueryResult<BaseItem> GetItems(InternalItemsQuery filter);
+
+    /// <summary>
+    /// Gets the item ids list.
+    /// </summary>
+    /// <param name="filter">The query.</param>
+    /// <returns>List&lt;Guid&gt;.</returns>
+    IReadOnlyList<Guid> GetItemIdsList(InternalItemsQuery filter);
+
+
+    /// <summary>
+    /// Gets the item list.
+    /// </summary>
+    /// <param name="filter">The query.</param>
+    /// <returns>List&lt;BaseItem&gt;.</returns>
+    IReadOnlyList<BaseItem> GetItemList(InternalItemsQuery filter);
+
+    /// <summary>
+    /// Updates the inherited values.
     /// </summary>
-    public interface IItemRepository : IDisposable
-    {
-        /// <summary>
-        /// Deletes the item.
-        /// </summary>
-        /// <param name="id">The identifier.</param>
-        void DeleteItem(Guid id);
-
-        /// <summary>
-        /// Saves the items.
-        /// </summary>
-        /// <param name="items">The items.</param>
-        /// <param name="cancellationToken">The cancellation token.</param>
-        void SaveItems(IReadOnlyList<BaseItem> items, CancellationToken cancellationToken);
-
-        void SaveImages(BaseItem item);
-
-        /// <summary>
-        /// Retrieves the item.
-        /// </summary>
-        /// <param name="id">The id.</param>
-        /// <returns>BaseItem.</returns>
-        BaseItem RetrieveItem(Guid id);
-
-        /// <summary>
-        /// Gets the media streams.
-        /// </summary>
-        /// <param name="query">The query.</param>
-        /// <returns>IEnumerable{MediaStream}.</returns>
-        List<MediaStream> GetMediaStreams(MediaStreamQuery query);
-
-        /// <summary>
-        /// Saves the media streams.
-        /// </summary>
-        /// <param name="id">The identifier.</param>
-        /// <param name="streams">The streams.</param>
-        /// <param name="cancellationToken">The cancellation token.</param>
-        void SaveMediaStreams(Guid id, IReadOnlyList<MediaStream> streams, CancellationToken cancellationToken);
-
-        /// <summary>
-        /// Gets the media attachments.
-        /// </summary>
-        /// <param name="query">The query.</param>
-        /// <returns>IEnumerable{MediaAttachment}.</returns>
-        List<MediaAttachment> GetMediaAttachments(MediaAttachmentQuery query);
-
-        /// <summary>
-        /// Saves the media attachments.
-        /// </summary>
-        /// <param name="id">The identifier.</param>
-        /// <param name="attachments">The attachments.</param>
-        /// <param name="cancellationToken">The cancellation token.</param>
-        void SaveMediaAttachments(Guid id, IReadOnlyList<MediaAttachment> attachments, CancellationToken cancellationToken);
-
-        /// <summary>
-        /// Gets the items.
-        /// </summary>
-        /// <param name="query">The query.</param>
-        /// <returns>QueryResult&lt;BaseItem&gt;.</returns>
-        QueryResult<BaseItem> GetItems(InternalItemsQuery query);
-
-        /// <summary>
-        /// Gets the item ids list.
-        /// </summary>
-        /// <param name="query">The query.</param>
-        /// <returns>List&lt;Guid&gt;.</returns>
-        List<Guid> GetItemIdsList(InternalItemsQuery query);
-
-        /// <summary>
-        /// Gets the people.
-        /// </summary>
-        /// <param name="query">The query.</param>
-        /// <returns>List&lt;PersonInfo&gt;.</returns>
-        List<PersonInfo> GetPeople(InternalPeopleQuery query);
-
-        /// <summary>
-        /// Updates the people.
-        /// </summary>
-        /// <param name="itemId">The item identifier.</param>
-        /// <param name="people">The people.</param>
-        void UpdatePeople(Guid itemId, List<PersonInfo> people);
-
-        /// <summary>
-        /// Gets the people names.
-        /// </summary>
-        /// <param name="query">The query.</param>
-        /// <returns>List&lt;System.String&gt;.</returns>
-        List<string> GetPeopleNames(InternalPeopleQuery query);
-
-        /// <summary>
-        /// Gets the item list.
-        /// </summary>
-        /// <param name="query">The query.</param>
-        /// <returns>List&lt;BaseItem&gt;.</returns>
-        List<BaseItem> GetItemList(InternalItemsQuery query);
-
-        /// <summary>
-        /// Updates the inherited values.
-        /// </summary>
-        void UpdateInheritedValues();
-
-        int GetCount(InternalItemsQuery query);
-
-        QueryResult<(BaseItem Item, ItemCounts ItemCounts)> GetGenres(InternalItemsQuery query);
-
-        QueryResult<(BaseItem Item, ItemCounts ItemCounts)> GetMusicGenres(InternalItemsQuery query);
-
-        QueryResult<(BaseItem Item, ItemCounts ItemCounts)> GetStudios(InternalItemsQuery query);
-
-        QueryResult<(BaseItem Item, ItemCounts ItemCounts)> GetArtists(InternalItemsQuery query);
-
-        QueryResult<(BaseItem Item, ItemCounts ItemCounts)> GetAlbumArtists(InternalItemsQuery query);
-
-        QueryResult<(BaseItem Item, ItemCounts ItemCounts)> GetAllArtists(InternalItemsQuery query);
-
-        List<string> GetMusicGenreNames();
-
-        List<string> GetStudioNames();
-
-        List<string> GetGenreNames();
-
-        List<string> GetAllArtistNames();
-    }
+    void UpdateInheritedValues();
+
+    int GetCount(InternalItemsQuery filter);
+
+    QueryResult<(BaseItem Item, ItemCounts ItemCounts)> GetGenres(InternalItemsQuery filter);
+
+    QueryResult<(BaseItem Item, ItemCounts ItemCounts)> GetMusicGenres(InternalItemsQuery filter);
+
+    QueryResult<(BaseItem Item, ItemCounts ItemCounts)> GetStudios(InternalItemsQuery filter);
+
+    QueryResult<(BaseItem Item, ItemCounts ItemCounts)> GetArtists(InternalItemsQuery filter);
+
+    QueryResult<(BaseItem Item, ItemCounts ItemCounts)> GetAlbumArtists(InternalItemsQuery filter);
+
+    QueryResult<(BaseItem Item, ItemCounts ItemCounts)> GetAllArtists(InternalItemsQuery filter);
+
+    IReadOnlyList<string> GetMusicGenreNames();
+
+    IReadOnlyList<string> GetStudioNames();
+
+    IReadOnlyList<string> GetGenreNames();
+
+    IReadOnlyList<string> GetAllArtistNames();
 }
diff --git a/MediaBrowser.Controller/Persistence/IMediaAttachmentManager.cs b/MediaBrowser.Controller/Persistence/IMediaAttachmentManager.cs
new file mode 100644
index 000000000..210d80afa
--- /dev/null
+++ b/MediaBrowser.Controller/Persistence/IMediaAttachmentManager.cs
@@ -0,0 +1,29 @@
+#nullable disable
+
+#pragma warning disable CS1591
+
+using System;
+using System.Collections.Generic;
+using System.Threading;
+using MediaBrowser.Model.Entities;
+
+namespace MediaBrowser.Controller.Persistence;
+
+public interface IMediaAttachmentManager
+{
+
+    /// <summary>
+    /// Gets the media attachments.
+    /// </summary>
+    /// <param name="filter">The query.</param>
+    /// <returns>IEnumerable{MediaAttachment}.</returns>
+    IReadOnlyList<MediaAttachment> GetMediaAttachments(MediaAttachmentQuery filter);
+
+    /// <summary>
+    /// Saves the media attachments.
+    /// </summary>
+    /// <param name="id">The identifier.</param>
+    /// <param name="attachments">The attachments.</param>
+    /// <param name="cancellationToken">The cancellation token.</param>
+    void SaveMediaAttachments(Guid id, IReadOnlyList<MediaAttachment> attachments, CancellationToken cancellationToken);
+}
diff --git a/MediaBrowser.Controller/Persistence/IMediaStreamManager.cs b/MediaBrowser.Controller/Persistence/IMediaStreamManager.cs
new file mode 100644
index 000000000..ec7c72935
--- /dev/null
+++ b/MediaBrowser.Controller/Persistence/IMediaStreamManager.cs
@@ -0,0 +1,28 @@
+#nullable disable
+
+#pragma warning disable CS1591
+
+using System;
+using System.Collections.Generic;
+using System.Threading;
+using MediaBrowser.Model.Entities;
+
+namespace MediaBrowser.Controller.Persistence;
+
+public interface IMediaStreamManager
+{
+    /// <summary>
+    /// Gets the media streams.
+    /// </summary>
+    /// <param name="filter">The query.</param>
+    /// <returns>IEnumerable{MediaStream}.</returns>
+    List<MediaStream> GetMediaStreams(MediaStreamQuery filter);
+
+    /// <summary>
+    /// Saves the media streams.
+    /// </summary>
+    /// <param name="id">The identifier.</param>
+    /// <param name="streams">The streams.</param>
+    /// <param name="cancellationToken">The cancellation token.</param>
+    void SaveMediaStreams(Guid id, IReadOnlyList<MediaStream> streams, CancellationToken cancellationToken);
+}
diff --git a/MediaBrowser.Controller/Persistence/IPeopleManager.cs b/MediaBrowser.Controller/Persistence/IPeopleManager.cs
new file mode 100644
index 000000000..84e503fef
--- /dev/null
+++ b/MediaBrowser.Controller/Persistence/IPeopleManager.cs
@@ -0,0 +1,34 @@
+#nullable disable
+
+#pragma warning disable CS1591
+
+using System;
+using System.Collections.Generic;
+using MediaBrowser.Controller.Entities;
+
+namespace MediaBrowser.Controller.Persistence;
+
+public interface IPeopleManager
+{
+    /// <summary>
+    /// Gets the people.
+    /// </summary>
+    /// <param name="filter">The query.</param>
+    /// <returns>List&lt;PersonInfo&gt;.</returns>
+    IReadOnlyList<PersonInfo> GetPeople(InternalPeopleQuery filter);
+
+    /// <summary>
+    /// Updates the people.
+    /// </summary>
+    /// <param name="itemId">The item identifier.</param>
+    /// <param name="people">The people.</param>
+    void UpdatePeople(Guid itemId, IReadOnlyList<PersonInfo> people);
+
+    /// <summary>
+    /// Gets the people names.
+    /// </summary>
+    /// <param name="filter">The query.</param>
+    /// <returns>List&lt;System.String&gt;.</returns>
+    IReadOnlyList<string> GetPeopleNames(InternalPeopleQuery filter);
+
+}
-- 
cgit v1.2.3


From be48cdd9e90ed147c5526ef3fed0624bcbad7741 Mon Sep 17 00:00:00 2001
From: JPVenson <6794763+JPVenson@users.noreply.github.com>
Date: Wed, 9 Oct 2024 09:53:39 +0000
Subject: Naming refactoring and WIP porting of new interface repositories

---
 Emby.Server.Implementations/ApplicationHost.cs     |   13 +-
 Emby.Server.Implementations/Data/ItemTypeLookup.cs |  139 ++
 .../MediaEncoder/EncodingManager.cs                |    4 +-
 Jellyfin.Data/Entities/AncestorId.cs               |    2 +-
 Jellyfin.Data/Entities/AttachmentStreamInfo.cs     |    2 +-
 Jellyfin.Data/Entities/BaseItem.cs                 |  176 --
 Jellyfin.Data/Entities/BaseItemEntity.cs           |  177 ++
 Jellyfin.Data/Entities/BaseItemProvider.cs         |   23 +-
 Jellyfin.Data/Entities/Chapter.cs                  |    2 +-
 Jellyfin.Data/Entities/ItemValue.cs                |   23 +-
 Jellyfin.Data/Entities/MediaStreamInfo.cs          |    2 +-
 Jellyfin.Data/Entities/People.cs                   |   34 +-
 .../Item/BaseItemManager.cs                        | 2333 --------------------
 .../Item/BaseItemRepository.cs                     | 2233 +++++++++++++++++++
 .../Item/ChapterManager.cs                         |   99 -
 .../Item/ChapterRepository.cs                      |  123 ++
 .../Item/MediaAttachmentManager.cs                 |   73 -
 .../Item/MediaAttachmentRepository.cs              |   73 +
 .../Item/MediaStreamManager.cs                     |  201 --
 .../Item/MediaStreamRepository.cs                  |  201 ++
 .../Item/PeopleManager.cs                          |  164 --
 .../Item/PeopleRepository.cs                       |  165 ++
 .../JellyfinDbContext.cs                           |    2 +-
 .../ModelConfiguration/BaseItemConfiguration.cs    |    4 +-
 .../BaseItemProviderConfiguration.cs               |    2 +-
 MediaBrowser.Controller/Chapters/ChapterManager.cs |   24 -
 .../Chapters/IChapterManager.cs                    |   35 -
 .../Chapters/IChapterRepository.cs                 |   49 +
 MediaBrowser.Controller/Drawing/IImageProcessor.cs |   25 +
 MediaBrowser.Controller/Entities/BaseItem.cs       |    7 +-
 .../Persistence/IItemRepository.cs                 |    1 -
 .../Persistence/IItemTypeLookup.cs                 |   57 +
 .../Persistence/IMediaAttachmentManager.cs         |   29 -
 .../Persistence/IMediaAttachmentRepository.cs      |   28 +
 .../Persistence/IMediaStreamManager.cs             |   28 -
 .../Persistence/IMediaStreamRepository.cs          |   31 +
 .../Persistence/IPeopleManager.cs                  |   34 -
 .../Persistence/IPeopleRepository.cs               |   33 +
 .../MediaInfo/FFProbeVideoInfo.cs                  |    4 +-
 MediaBrowser.Providers/MediaInfo/ProbeProvider.cs  |    4 +-
 src/Jellyfin.Drawing/ImageProcessor.cs             |   25 +
 41 files changed, 3459 insertions(+), 3225 deletions(-)
 create mode 100644 Emby.Server.Implementations/Data/ItemTypeLookup.cs
 delete mode 100644 Jellyfin.Data/Entities/BaseItem.cs
 create mode 100644 Jellyfin.Data/Entities/BaseItemEntity.cs
 delete mode 100644 Jellyfin.Server.Implementations/Item/BaseItemManager.cs
 create mode 100644 Jellyfin.Server.Implementations/Item/BaseItemRepository.cs
 delete mode 100644 Jellyfin.Server.Implementations/Item/ChapterManager.cs
 create mode 100644 Jellyfin.Server.Implementations/Item/ChapterRepository.cs
 delete mode 100644 Jellyfin.Server.Implementations/Item/MediaAttachmentManager.cs
 create mode 100644 Jellyfin.Server.Implementations/Item/MediaAttachmentRepository.cs
 delete mode 100644 Jellyfin.Server.Implementations/Item/MediaStreamManager.cs
 create mode 100644 Jellyfin.Server.Implementations/Item/MediaStreamRepository.cs
 delete mode 100644 Jellyfin.Server.Implementations/Item/PeopleManager.cs
 create mode 100644 Jellyfin.Server.Implementations/Item/PeopleRepository.cs
 delete mode 100644 MediaBrowser.Controller/Chapters/ChapterManager.cs
 delete mode 100644 MediaBrowser.Controller/Chapters/IChapterManager.cs
 create mode 100644 MediaBrowser.Controller/Chapters/IChapterRepository.cs
 create mode 100644 MediaBrowser.Controller/Persistence/IItemTypeLookup.cs
 delete mode 100644 MediaBrowser.Controller/Persistence/IMediaAttachmentManager.cs
 create mode 100644 MediaBrowser.Controller/Persistence/IMediaAttachmentRepository.cs
 delete mode 100644 MediaBrowser.Controller/Persistence/IMediaStreamManager.cs
 create mode 100644 MediaBrowser.Controller/Persistence/IMediaStreamRepository.cs
 delete mode 100644 MediaBrowser.Controller/Persistence/IPeopleManager.cs
 create mode 100644 MediaBrowser.Controller/Persistence/IPeopleRepository.cs

(limited to 'MediaBrowser.Controller')

diff --git a/Emby.Server.Implementations/ApplicationHost.cs b/Emby.Server.Implementations/ApplicationHost.cs
index bdf013b5d..fbec4726f 100644
--- a/Emby.Server.Implementations/ApplicationHost.cs
+++ b/Emby.Server.Implementations/ApplicationHost.cs
@@ -40,6 +40,7 @@ using Jellyfin.MediaEncoding.Hls.Playlist;
 using Jellyfin.Networking.Manager;
 using Jellyfin.Networking.Udp;
 using Jellyfin.Server.Implementations;
+using Jellyfin.Server.Implementations.Item;
 using Jellyfin.Server.Implementations.MediaSegments;
 using MediaBrowser.Common;
 using MediaBrowser.Common.Configuration;
@@ -83,7 +84,6 @@ using MediaBrowser.Model.Net;
 using MediaBrowser.Model.Serialization;
 using MediaBrowser.Model.System;
 using MediaBrowser.Model.Tasks;
-using MediaBrowser.Providers.Chapters;
 using MediaBrowser.Providers.Lyric;
 using MediaBrowser.Providers.Manager;
 using MediaBrowser.Providers.Plugins.Tmdb;
@@ -494,7 +494,12 @@ namespace Emby.Server.Implementations
 
             serviceCollection.AddSingleton<IUserDataManager, UserDataManager>();
 
-            serviceCollection.AddSingleton<IItemRepository, SqliteItemRepository>();
+            serviceCollection.AddSingleton<IItemRepository, BaseItemRepository>();
+            serviceCollection.AddSingleton<IPeopleRepository, PeopleRepository>();
+            serviceCollection.AddSingleton<IChapterRepository, ChapterRepository>();
+            serviceCollection.AddSingleton<IMediaAttachmentRepository, MediaAttachmentRepository>();
+            serviceCollection.AddSingleton<IMediaStreamRepository, MediaStreamRepository>();
+            serviceCollection.AddSingleton<IItemTypeLookup, ItemTypeLookup>();
 
             serviceCollection.AddSingleton<IMediaEncoder, MediaBrowser.MediaEncoding.Encoder.MediaEncoder>();
             serviceCollection.AddSingleton<EncodingHelper>();
@@ -539,8 +544,6 @@ namespace Emby.Server.Implementations
 
             serviceCollection.AddSingleton<IUserViewManager, UserViewManager>();
 
-            serviceCollection.AddSingleton<IChapterManager, ChapterManager>();
-
             serviceCollection.AddSingleton<IEncodingManager, MediaEncoder.EncodingManager>();
 
             serviceCollection.AddSingleton<IAuthService, AuthService>();
@@ -578,8 +581,6 @@ namespace Emby.Server.Implementations
                 }
             }
 
-            ((SqliteItemRepository)Resolve<IItemRepository>()).Initialize();
-
             var localizationManager = (LocalizationManager)Resolve<ILocalizationManager>();
             await localizationManager.LoadAll().ConfigureAwait(false);
 
diff --git a/Emby.Server.Implementations/Data/ItemTypeLookup.cs b/Emby.Server.Implementations/Data/ItemTypeLookup.cs
new file mode 100644
index 000000000..14dc68a32
--- /dev/null
+++ b/Emby.Server.Implementations/Data/ItemTypeLookup.cs
@@ -0,0 +1,139 @@
+using System;
+using System.Collections.Generic;
+using System.Threading.Channels;
+using Emby.Server.Implementations.Playlists;
+using Jellyfin.Data.Enums;
+using MediaBrowser.Controller.Entities;
+using MediaBrowser.Controller.Entities.Audio;
+using MediaBrowser.Controller.Entities.Movies;
+using MediaBrowser.Controller.Entities.TV;
+using MediaBrowser.Controller.LiveTv;
+using MediaBrowser.Controller.Persistence;
+using MediaBrowser.Controller.Playlists;
+using MediaBrowser.Model.Querying;
+
+namespace Jellyfin.Server.Implementations.Item;
+
+/// <summary>
+/// Provides static topic based lookups for the BaseItemKind.
+/// </summary>
+public class ItemTypeLookup : IItemTypeLookup
+{
+    /// <summary>
+    /// Gets all values of the ItemFields type.
+    /// </summary>
+    public IReadOnlyList<ItemFields> AllItemFields { get; } = Enum.GetValues<ItemFields>();
+
+    /// <summary>
+    /// Gets all BaseItemKinds that are considered Programs.
+    /// </summary>
+    public IReadOnlyList<BaseItemKind> ProgramTypes { get; } =
+    [
+            BaseItemKind.Program,
+            BaseItemKind.TvChannel,
+            BaseItemKind.LiveTvProgram,
+            BaseItemKind.LiveTvChannel
+    ];
+
+    /// <summary>
+    /// Gets all BaseItemKinds that should be excluded from parent lookup.
+    /// </summary>
+    public IReadOnlyList<BaseItemKind> ProgramExcludeParentTypes { get; } =
+    [
+            BaseItemKind.Series,
+            BaseItemKind.Season,
+            BaseItemKind.MusicAlbum,
+            BaseItemKind.MusicArtist,
+            BaseItemKind.PhotoAlbum
+    ];
+
+    /// <summary>
+    /// Gets all BaseItemKinds that are considered to be provided by services.
+    /// </summary>
+    public IReadOnlyList<BaseItemKind> ServiceTypes { get; } =
+    [
+            BaseItemKind.TvChannel,
+            BaseItemKind.LiveTvChannel
+    ];
+
+    /// <summary>
+    /// Gets all BaseItemKinds that have a StartDate.
+    /// </summary>
+    public IReadOnlyList<BaseItemKind> StartDateTypes { get; } =
+    [
+            BaseItemKind.Program,
+            BaseItemKind.LiveTvProgram
+    ];
+
+    /// <summary>
+    /// Gets all BaseItemKinds that are considered Series.
+    /// </summary>
+    public IReadOnlyList<BaseItemKind> SeriesTypes { get; } =
+    [
+            BaseItemKind.Book,
+            BaseItemKind.AudioBook,
+            BaseItemKind.Episode,
+            BaseItemKind.Season
+    ];
+
+    /// <summary>
+    /// Gets all BaseItemKinds that are not to be evaluated for Artists.
+    /// </summary>
+    public IReadOnlyList<BaseItemKind> ArtistExcludeParentTypes { get; } =
+    [
+            BaseItemKind.Series,
+            BaseItemKind.Season,
+            BaseItemKind.PhotoAlbum
+    ];
+
+    /// <summary>
+    /// Gets all BaseItemKinds that are considered Artists.
+    /// </summary>
+    public IReadOnlyList<BaseItemKind> ArtistsTypes { get; } =
+    [
+            BaseItemKind.Audio,
+            BaseItemKind.MusicAlbum,
+            BaseItemKind.MusicVideo,
+            BaseItemKind.AudioBook
+    ];
+
+    /// <summary>
+    /// Gets mapping for all BaseItemKinds and their expected serialisaition target.
+    /// </summary>
+    public IDictionary<BaseItemKind, string?> BaseItemKindNames { get; } = new Dictionary<BaseItemKind, string?>()
+    {
+        { BaseItemKind.AggregateFolder, typeof(AggregateFolder).FullName },
+        { BaseItemKind.Audio, typeof(Audio).FullName },
+        { BaseItemKind.AudioBook, typeof(AudioBook).FullName },
+        { BaseItemKind.BasePluginFolder, typeof(BasePluginFolder).FullName },
+        { BaseItemKind.Book, typeof(Book).FullName },
+        { BaseItemKind.BoxSet, typeof(BoxSet).FullName },
+        { BaseItemKind.Channel, typeof(Channel).FullName },
+        { BaseItemKind.CollectionFolder, typeof(CollectionFolder).FullName },
+        { BaseItemKind.Episode, typeof(Episode).FullName },
+        { BaseItemKind.Folder, typeof(Folder).FullName },
+        { BaseItemKind.Genre, typeof(Genre).FullName },
+        { BaseItemKind.Movie, typeof(Movie).FullName },
+        { BaseItemKind.LiveTvChannel, typeof(LiveTvChannel).FullName },
+        { BaseItemKind.LiveTvProgram, typeof(LiveTvProgram).FullName },
+        { BaseItemKind.MusicAlbum, typeof(MusicAlbum).FullName },
+        { BaseItemKind.MusicArtist, typeof(MusicArtist).FullName },
+        { BaseItemKind.MusicGenre, typeof(MusicGenre).FullName },
+        { BaseItemKind.MusicVideo, typeof(MusicVideo).FullName },
+        { BaseItemKind.Person, typeof(Person).FullName },
+        { BaseItemKind.Photo, typeof(Photo).FullName },
+        { BaseItemKind.PhotoAlbum, typeof(PhotoAlbum).FullName },
+        { BaseItemKind.Playlist, typeof(Playlist).FullName },
+        { BaseItemKind.PlaylistsFolder, typeof(PlaylistsFolder).FullName },
+        { BaseItemKind.Season, typeof(Season).FullName },
+        { BaseItemKind.Series, typeof(Series).FullName },
+        { BaseItemKind.Studio, typeof(Studio).FullName },
+        { BaseItemKind.Trailer, typeof(Trailer).FullName },
+        { BaseItemKind.TvChannel, typeof(LiveTvChannel).FullName },
+        { BaseItemKind.TvProgram, typeof(LiveTvProgram).FullName },
+        { BaseItemKind.UserRootFolder, typeof(UserRootFolder).FullName },
+        { BaseItemKind.UserView, typeof(UserView).FullName },
+        { BaseItemKind.Video, typeof(Video).FullName },
+        { BaseItemKind.Year, typeof(Year).FullName }
+    }.AsReadOnly();
+}
diff --git a/Emby.Server.Implementations/MediaEncoder/EncodingManager.cs b/Emby.Server.Implementations/MediaEncoder/EncodingManager.cs
index eb55e32c5..ea7896861 100644
--- a/Emby.Server.Implementations/MediaEncoder/EncodingManager.cs
+++ b/Emby.Server.Implementations/MediaEncoder/EncodingManager.cs
@@ -28,7 +28,7 @@ namespace Emby.Server.Implementations.MediaEncoder
         private readonly IFileSystem _fileSystem;
         private readonly ILogger<EncodingManager> _logger;
         private readonly IMediaEncoder _encoder;
-        private readonly IChapterManager _chapterManager;
+        private readonly IChapterRepository _chapterManager;
         private readonly ILibraryManager _libraryManager;
 
         /// <summary>
@@ -40,7 +40,7 @@ namespace Emby.Server.Implementations.MediaEncoder
             ILogger<EncodingManager> logger,
             IFileSystem fileSystem,
             IMediaEncoder encoder,
-            IChapterManager chapterManager,
+            IChapterRepository chapterManager,
             ILibraryManager libraryManager)
         {
             _logger = logger;
diff --git a/Jellyfin.Data/Entities/AncestorId.cs b/Jellyfin.Data/Entities/AncestorId.cs
index dc83b763e..3839b1ae4 100644
--- a/Jellyfin.Data/Entities/AncestorId.cs
+++ b/Jellyfin.Data/Entities/AncestorId.cs
@@ -13,7 +13,7 @@ public class AncestorId
 
     public Guid ItemId { get; set; }
 
-    public required BaseItem Item { get; set; }
+    public required BaseItemEntity Item { get; set; }
 
     public string? AncestorIdText { get; set; }
 }
diff --git a/Jellyfin.Data/Entities/AttachmentStreamInfo.cs b/Jellyfin.Data/Entities/AttachmentStreamInfo.cs
index 858465424..056d5b05e 100644
--- a/Jellyfin.Data/Entities/AttachmentStreamInfo.cs
+++ b/Jellyfin.Data/Entities/AttachmentStreamInfo.cs
@@ -7,7 +7,7 @@ public class AttachmentStreamInfo
 {
     public required Guid ItemId { get; set; }
 
-    public required BaseItem Item { get; set; }
+    public required BaseItemEntity Item { get; set; }
 
     public required int Index { get; set; }
 
diff --git a/Jellyfin.Data/Entities/BaseItem.cs b/Jellyfin.Data/Entities/BaseItem.cs
deleted file mode 100644
index 0e67a7ca4..000000000
--- a/Jellyfin.Data/Entities/BaseItem.cs
+++ /dev/null
@@ -1,176 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
-using System.ComponentModel.DataAnnotations.Schema;
-
-namespace Jellyfin.Data.Entities;
-
-#pragma warning disable CS1591 // Missing XML comment for publicly visible type or member
-public class BaseItem
-{
-    [DatabaseGenerated(DatabaseGeneratedOption.Identity)]
-
-    public Guid Id { get; set; }
-
-    public required string Type { get; set; }
-
-    public string? Data { get; set; }
-
-    public Guid? ParentId { get; set; }
-
-    public string? Path { get; set; }
-
-    public DateTime StartDate { get; set; }
-
-    public DateTime EndDate { get; set; }
-
-    public string? ChannelId { get; set; }
-
-    public bool IsMovie { get; set; }
-
-    public float? CommunityRating { get; set; }
-
-    public string? CustomRating { get; set; }
-
-    public int? IndexNumber { get; set; }
-
-    public bool IsLocked { get; set; }
-
-    public string? Name { get; set; }
-
-    public string? OfficialRating { get; set; }
-
-    public string? MediaType { get; set; }
-
-    public string? Overview { get; set; }
-
-    public int? ParentIndexNumber { get; set; }
-
-    public DateTime? PremiereDate { get; set; }
-
-    public int? ProductionYear { get; set; }
-
-    public string? Genres { get; set; }
-
-    public string? SortName { get; set; }
-
-    public string? ForcedSortName { get; set; }
-
-    public long? RunTimeTicks { get; set; }
-
-    public DateTime? DateCreated { get; set; }
-
-    public DateTime? DateModified { get; set; }
-
-    public bool IsSeries { get; set; }
-
-    public string? EpisodeTitle { get; set; }
-
-    public bool IsRepeat { get; set; }
-
-    public string? PreferredMetadataLanguage { get; set; }
-
-    public string? PreferredMetadataCountryCode { get; set; }
-
-    public DateTime? DateLastRefreshed { get; set; }
-
-    public DateTime? DateLastSaved { get; set; }
-
-    public bool IsInMixedFolder { get; set; }
-
-    public string? LockedFields { get; set; }
-
-    public string? Studios { get; set; }
-
-    public string? Audio { get; set; }
-
-    public string? ExternalServiceId { get; set; }
-
-    public string? Tags { get; set; }
-
-    public bool IsFolder { get; set; }
-
-    public int? InheritedParentalRatingValue { get; set; }
-
-    public string? UnratedType { get; set; }
-
-    public Guid? TopParentId { get; set; }
-
-    public string? TrailerTypes { get; set; }
-
-    public float? CriticRating { get; set; }
-
-    public string? CleanName { get; set; }
-
-    public string? PresentationUniqueKey { get; set; }
-
-    public string? OriginalTitle { get; set; }
-
-    public string? PrimaryVersionId { get; set; }
-
-    public DateTime? DateLastMediaAdded { get; set; }
-
-    public string? Album { get; set; }
-
-    public float? LUFS { get; set; }
-
-    public float? NormalizationGain { get; set; }
-
-    public bool IsVirtualItem { get; set; }
-
-    public string? SeriesName { get; set; }
-
-    public string? UserDataKey { get; set; }
-
-    public string? SeasonName { get; set; }
-
-    public Guid? SeasonId { get; set; }
-
-    public Guid? SeriesId { get; set; }
-
-    public string? ExternalSeriesId { get; set; }
-
-    public string? Tagline { get; set; }
-
-    public string? Images { get; set; }
-
-    public string? ProductionLocations { get; set; }
-
-    public string? ExtraIds { get; set; }
-
-    public int? TotalBitrate { get; set; }
-
-    public string? ExtraType { get; set; }
-
-    public string? Artists { get; set; }
-
-    public string? AlbumArtists { get; set; }
-
-    public string? ExternalId { get; set; }
-
-    public string? SeriesPresentationUniqueKey { get; set; }
-
-    public string? ShowId { get; set; }
-
-    public string? OwnerId { get; set; }
-
-    public int? Width { get; set; }
-
-    public int? Height { get; set; }
-
-    public long? Size { get; set; }
-
-    public ICollection<People>? Peoples { get; set; }
-
-    public ICollection<UserData>? UserData { get; set; }
-
-    public ICollection<ItemValue>? ItemValues { get; set; }
-
-    public ICollection<MediaStreamInfo>? MediaStreams { get; set; }
-
-    public ICollection<Chapter>? Chapters { get; set; }
-
-    public ICollection<BaseItemProvider>? Provider { get; set; }
-
-    public ICollection<AncestorId>? AncestorIds { get; set; }
-}
diff --git a/Jellyfin.Data/Entities/BaseItemEntity.cs b/Jellyfin.Data/Entities/BaseItemEntity.cs
new file mode 100644
index 000000000..92b5caf05
--- /dev/null
+++ b/Jellyfin.Data/Entities/BaseItemEntity.cs
@@ -0,0 +1,177 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace Jellyfin.Data.Entities;
+
+#pragma warning disable CS1591 // Missing XML comment for publicly visible type or member
+public class BaseItemEntity
+{
+    [DatabaseGenerated(DatabaseGeneratedOption.Identity)]
+
+    public Guid Id { get; set; }
+
+    public required string Type { get; set; }
+
+    public string? Data { get; set; }
+
+    public Guid? ParentId { get; set; }
+
+    public string? Path { get; set; }
+
+    public DateTime StartDate { get; set; }
+
+    public DateTime EndDate { get; set; }
+
+    public string? ChannelId { get; set; }
+
+    public bool IsMovie { get; set; }
+
+    public float? CommunityRating { get; set; }
+
+    public string? CustomRating { get; set; }
+
+    public int? IndexNumber { get; set; }
+
+    public bool IsLocked { get; set; }
+
+    public string? Name { get; set; }
+
+    public string? OfficialRating { get; set; }
+
+    public string? MediaType { get; set; }
+
+    public string? Overview { get; set; }
+
+    public int? ParentIndexNumber { get; set; }
+
+    public DateTime? PremiereDate { get; set; }
+
+    public int? ProductionYear { get; set; }
+
+    public string? Genres { get; set; }
+
+    public string? SortName { get; set; }
+
+    public string? ForcedSortName { get; set; }
+
+    public long? RunTimeTicks { get; set; }
+
+    public DateTime? DateCreated { get; set; }
+
+    public DateTime? DateModified { get; set; }
+
+    public bool IsSeries { get; set; }
+
+    public string? EpisodeTitle { get; set; }
+
+    public bool IsRepeat { get; set; }
+
+    public string? PreferredMetadataLanguage { get; set; }
+
+    public string? PreferredMetadataCountryCode { get; set; }
+
+    public DateTime? DateLastRefreshed { get; set; }
+
+    public DateTime? DateLastSaved { get; set; }
+
+    public bool IsInMixedFolder { get; set; }
+
+    public string? LockedFields { get; set; }
+
+    public string? Studios { get; set; }
+
+    public string? Audio { get; set; }
+
+    public string? ExternalServiceId { get; set; }
+
+    public string? Tags { get; set; }
+
+    public bool IsFolder { get; set; }
+
+    public int? InheritedParentalRatingValue { get; set; }
+
+    public string? UnratedType { get; set; }
+
+    public Guid? TopParentId { get; set; }
+
+    public string? TrailerTypes { get; set; }
+
+    public float? CriticRating { get; set; }
+
+    public string? CleanName { get; set; }
+
+    public string? PresentationUniqueKey { get; set; }
+
+    public string? OriginalTitle { get; set; }
+
+    public string? PrimaryVersionId { get; set; }
+
+    public DateTime? DateLastMediaAdded { get; set; }
+
+    public string? Album { get; set; }
+
+    public float? LUFS { get; set; }
+
+    public float? NormalizationGain { get; set; }
+
+    public bool IsVirtualItem { get; set; }
+
+    public string? SeriesName { get; set; }
+
+    public string? UserDataKey { get; set; }
+
+    public string? SeasonName { get; set; }
+
+    public Guid? SeasonId { get; set; }
+
+    public Guid? SeriesId { get; set; }
+
+    public string? ExternalSeriesId { get; set; }
+
+    public string? Tagline { get; set; }
+
+    public string? Images { get; set; }
+
+    public string? ProductionLocations { get; set; }
+
+    public string? ExtraIds { get; set; }
+
+    public int? TotalBitrate { get; set; }
+
+    public string? ExtraType { get; set; }
+
+    public string? Artists { get; set; }
+
+    public string? AlbumArtists { get; set; }
+
+    public string? ExternalId { get; set; }
+
+    public string? SeriesPresentationUniqueKey { get; set; }
+
+    public string? ShowId { get; set; }
+
+    public string? OwnerId { get; set; }
+
+    public int? Width { get; set; }
+
+    public int? Height { get; set; }
+
+    public long? Size { get; set; }
+
+#pragma warning disable CA2227 // Collection properties should be read only
+    public ICollection<People>? Peoples { get; set; }
+
+    public ICollection<UserData>? UserData { get; set; }
+
+    public ICollection<ItemValue>? ItemValues { get; set; }
+
+    public ICollection<MediaStreamInfo>? MediaStreams { get; set; }
+
+    public ICollection<Chapter>? Chapters { get; set; }
+
+    public ICollection<BaseItemProvider>? Provider { get; set; }
+
+    public ICollection<AncestorId>? AncestorIds { get; set; }
+}
diff --git a/Jellyfin.Data/Entities/BaseItemProvider.cs b/Jellyfin.Data/Entities/BaseItemProvider.cs
index 6f8e1c39b..1fc721d6a 100644
--- a/Jellyfin.Data/Entities/BaseItemProvider.cs
+++ b/Jellyfin.Data/Entities/BaseItemProvider.cs
@@ -5,11 +5,28 @@ using System.ComponentModel.DataAnnotations.Schema;
 
 namespace Jellyfin.Data.Entities;
 
+/// <summary>
+/// Represents an Key-Value relaten of an BaseItem's provider.
+/// </summary>
 public class BaseItemProvider
 {
+    /// <summary>
+    /// Gets or Sets the reference ItemId.
+    /// </summary>
     public Guid ItemId { get; set; }
-    public required BaseItem Item { get; set; }
 
-    public string ProviderId { get; set; }
-    public string ProviderValue { get; set; }
+    /// <summary>
+    /// Gets or Sets the reference BaseItem.
+    /// </summary>
+    public required BaseItemEntity Item { get; set; }
+
+    /// <summary>
+    /// Gets or Sets the ProvidersId.
+    /// </summary>
+    public required string ProviderId { get; set; }
+
+    /// <summary>
+    /// Gets or Sets the Providers Value.
+    /// </summary>
+    public required string ProviderValue { get; set; }
 }
diff --git a/Jellyfin.Data/Entities/Chapter.cs b/Jellyfin.Data/Entities/Chapter.cs
index ad119d1c6..be353b5da 100644
--- a/Jellyfin.Data/Entities/Chapter.cs
+++ b/Jellyfin.Data/Entities/Chapter.cs
@@ -10,7 +10,7 @@ public class Chapter
 {
     public Guid ItemId { get; set; }
 
-    public required BaseItem Item { get; set; }
+    public required BaseItemEntity Item { get; set; }
 
     public required int ChapterIndex { get; set; }
 
diff --git a/Jellyfin.Data/Entities/ItemValue.cs b/Jellyfin.Data/Entities/ItemValue.cs
index a3c0908bb..1063aaa8b 100644
--- a/Jellyfin.Data/Entities/ItemValue.cs
+++ b/Jellyfin.Data/Entities/ItemValue.cs
@@ -5,12 +5,33 @@ using System.ComponentModel.DataAnnotations.Schema;
 
 namespace Jellyfin.Data.Entities;
 
+/// <summary>
+/// Represents an ItemValue for a BaseItem.
+/// </summary>
 public class ItemValue
 {
+    /// <summary>
+    /// Gets or Sets the reference ItemId.
+    /// </summary>
     public Guid ItemId { get; set; }
-    public required BaseItem Item { get; set; }
 
+    /// <summary>
+    /// Gets or Sets the referenced BaseItem.
+    /// </summary>
+    public required BaseItemEntity Item { get; set; }
+
+    /// <summary>
+    /// Gets or Sets the Type.
+    /// </summary>
     public required int Type { get; set; }
+
+    /// <summary>
+    /// Gets or Sets the Value.
+    /// </summary>
     public required string Value { get; set; }
+
+    /// <summary>
+    /// Gets or Sets the sanatised Value.
+    /// </summary>
     public required string CleanValue { get; set; }
 }
diff --git a/Jellyfin.Data/Entities/MediaStreamInfo.cs b/Jellyfin.Data/Entities/MediaStreamInfo.cs
index 3b89ca62f..992f33ecf 100644
--- a/Jellyfin.Data/Entities/MediaStreamInfo.cs
+++ b/Jellyfin.Data/Entities/MediaStreamInfo.cs
@@ -7,7 +7,7 @@ public class MediaStreamInfo
 {
     public Guid ItemId { get; set; }
 
-    public required BaseItem Item { get; set; }
+    public required BaseItemEntity Item { get; set; }
 
     public int StreamIndex { get; set; }
 
diff --git a/Jellyfin.Data/Entities/People.cs b/Jellyfin.Data/Entities/People.cs
index 014a0f1c9..8eb23f5e4 100644
--- a/Jellyfin.Data/Entities/People.cs
+++ b/Jellyfin.Data/Entities/People.cs
@@ -4,14 +4,44 @@ using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
 namespace Jellyfin.Data.Entities;
+
+/// <summary>
+/// People entity.
+/// </summary>
 public class People
 {
-    public Guid ItemId { get; set; }
-    public BaseItem Item { get; set; }
+    /// <summary>
+    /// Gets or Sets The ItemId.
+    /// </summary>
+    public required Guid ItemId { get; set; }
+
+    /// <summary>
+    /// Gets or Sets Reference Item.
+    /// </summary>
+    public required BaseItemEntity Item { get; set; }
 
+    /// <summary>
+    /// Gets or Sets the Persons Name.
+    /// </summary>
     public required string Name { get; set; }
+
+    /// <summary>
+    /// Gets or Sets the Role.
+    /// </summary>
     public string? Role { get; set; }
+
+    /// <summary>
+    /// Gets or Sets the Type.
+    /// </summary>
     public string? PersonType { get; set; }
+
+    /// <summary>
+    /// Gets or Sets the SortOrder.
+    /// </summary>
     public int? SortOrder { get; set; }
+
+    /// <summary>
+    /// Gets or Sets the ListOrder.
+    /// </summary>
     public int? ListOrder { get; set; }
 }
diff --git a/Jellyfin.Server.Implementations/Item/BaseItemManager.cs b/Jellyfin.Server.Implementations/Item/BaseItemManager.cs
deleted file mode 100644
index 66cc765f3..000000000
--- a/Jellyfin.Server.Implementations/Item/BaseItemManager.cs
+++ /dev/null
@@ -1,2333 +0,0 @@
-using System;
-using System.Collections.Concurrent;
-using System.Collections.Generic;
-using System.Collections.Immutable;
-using System.Globalization;
-using System.Linq;
-using System.Linq.Expressions;
-using System.Security.Cryptography.X509Certificates;
-using System.Text;
-using System.Threading;
-using System.Threading.Channels;
-using Jellyfin.Data.Enums;
-using Jellyfin.Extensions;
-using MediaBrowser.Controller;
-using MediaBrowser.Controller.Entities;
-using MediaBrowser.Controller.Entities.Audio;
-using MediaBrowser.Controller.Entities.Movies;
-using MediaBrowser.Controller.Entities.TV;
-using MediaBrowser.Controller.LiveTv;
-using MediaBrowser.Controller.Persistence;
-using MediaBrowser.Controller.Playlists;
-using MediaBrowser.Model.Dto;
-using MediaBrowser.Model.Entities;
-using MediaBrowser.Model.LiveTv;
-using MediaBrowser.Model.Querying;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Internal;
-using Microsoft.EntityFrameworkCore.Query.SqlExpressions;
-using BaseItemDto = MediaBrowser.Controller.Entities.BaseItem;
-using BaseItemEntity = Jellyfin.Data.Entities.BaseItem;
-
-namespace Jellyfin.Server.Implementations.Item;
-
-/// <summary>
-/// Handles all storage logic for BaseItems.
-/// </summary>
-public sealed class BaseItemManager : IItemRepository, IDisposable
-{
-    private readonly IDbContextFactory<JellyfinDbContext> _dbProvider;
-    private readonly IServerApplicationHost _appHost;
-
-    private readonly ItemFields[] _allItemFields = Enum.GetValues<ItemFields>();
-
-    private static readonly BaseItemKind[] _programTypes = new[]
-    {
-            BaseItemKind.Program,
-            BaseItemKind.TvChannel,
-            BaseItemKind.LiveTvProgram,
-            BaseItemKind.LiveTvChannel
-    };
-
-    private static readonly BaseItemKind[] _programExcludeParentTypes = new[]
-    {
-            BaseItemKind.Series,
-            BaseItemKind.Season,
-            BaseItemKind.MusicAlbum,
-            BaseItemKind.MusicArtist,
-            BaseItemKind.PhotoAlbum
-    };
-
-    private static readonly BaseItemKind[] _serviceTypes = new[]
-    {
-            BaseItemKind.TvChannel,
-            BaseItemKind.LiveTvChannel
-    };
-
-    private static readonly BaseItemKind[] _startDateTypes = new[]
-    {
-            BaseItemKind.Program,
-            BaseItemKind.LiveTvProgram
-    };
-
-    private static readonly BaseItemKind[] _seriesTypes = new[]
-    {
-            BaseItemKind.Book,
-            BaseItemKind.AudioBook,
-            BaseItemKind.Episode,
-            BaseItemKind.Season
-    };
-
-    private static readonly BaseItemKind[] _artistExcludeParentTypes = new[]
-    {
-            BaseItemKind.Series,
-            BaseItemKind.Season,
-            BaseItemKind.PhotoAlbum
-    };
-
-    private static readonly BaseItemKind[] _artistsTypes = new[]
-    {
-            BaseItemKind.Audio,
-            BaseItemKind.MusicAlbum,
-            BaseItemKind.MusicVideo,
-            BaseItemKind.AudioBook
-    };
-
-    private static readonly Dictionary<BaseItemKind, string?> _baseItemKindNames = new()
-        {
-            { BaseItemKind.AggregateFolder, typeof(AggregateFolder).FullName },
-            { BaseItemKind.Audio, typeof(Audio).FullName },
-            { BaseItemKind.AudioBook, typeof(AudioBook).FullName },
-            { BaseItemKind.BasePluginFolder, typeof(BasePluginFolder).FullName },
-            { BaseItemKind.Book, typeof(Book).FullName },
-            { BaseItemKind.BoxSet, typeof(BoxSet).FullName },
-            { BaseItemKind.Channel, typeof(Channel).FullName },
-            { BaseItemKind.CollectionFolder, typeof(CollectionFolder).FullName },
-            { BaseItemKind.Episode, typeof(Episode).FullName },
-            { BaseItemKind.Folder, typeof(Folder).FullName },
-            { BaseItemKind.Genre, typeof(Genre).FullName },
-            { BaseItemKind.Movie, typeof(Movie).FullName },
-            { BaseItemKind.LiveTvChannel, typeof(LiveTvChannel).FullName },
-            { BaseItemKind.LiveTvProgram, typeof(LiveTvProgram).FullName },
-            { BaseItemKind.MusicAlbum, typeof(MusicAlbum).FullName },
-            { BaseItemKind.MusicArtist, typeof(MusicArtist).FullName },
-            { BaseItemKind.MusicGenre, typeof(MusicGenre).FullName },
-            { BaseItemKind.MusicVideo, typeof(MusicVideo).FullName },
-            { BaseItemKind.Person, typeof(Person).FullName },
-            { BaseItemKind.Photo, typeof(Photo).FullName },
-            { BaseItemKind.PhotoAlbum, typeof(PhotoAlbum).FullName },
-            { BaseItemKind.Playlist, typeof(Playlist).FullName },
-            { BaseItemKind.PlaylistsFolder, typeof(PlaylistsFolder).FullName },
-            { BaseItemKind.Season, typeof(Season).FullName },
-            { BaseItemKind.Series, typeof(Series).FullName },
-            { BaseItemKind.Studio, typeof(Studio).FullName },
-            { BaseItemKind.Trailer, typeof(Trailer).FullName },
-            { BaseItemKind.TvChannel, typeof(LiveTvChannel).FullName },
-            { BaseItemKind.TvProgram, typeof(LiveTvProgram).FullName },
-            { BaseItemKind.UserRootFolder, typeof(UserRootFolder).FullName },
-            { BaseItemKind.UserView, typeof(UserView).FullName },
-            { BaseItemKind.Video, typeof(Video).FullName },
-            { BaseItemKind.Year, typeof(Year).FullName }
-        };
-
-    /// <summary>
-    /// This holds all the types in the running assemblies
-    /// so that we can de-serialize properly when we don't have strong types.
-    /// </summary>
-    private static readonly ConcurrentDictionary<string, Type?> _typeMap = new ConcurrentDictionary<string, Type?>();
-    private bool _disposed;
-
-    /// <summary>
-    /// Initializes a new instance of the <see cref="BaseItemManager"/> class.
-    /// </summary>
-    /// <param name="dbProvider">The db factory.</param>
-    /// <param name="appHost">The Application host.</param>
-    public BaseItemManager(IDbContextFactory<JellyfinDbContext> dbProvider, IServerApplicationHost appHost)
-    {
-        _dbProvider = dbProvider;
-        _appHost = appHost;
-    }
-
-    /// <inheritdoc/>
-    public void Dispose()
-    {
-        if (_disposed)
-        {
-            return;
-        }
-
-        _disposed = true;
-    }
-
-    private QueryResult<(BaseItemDto Item, ItemCounts ItemCounts)> GetItemValues(InternalItemsQuery filter, int[] itemValueTypes, string returnType)
-    {
-        ArgumentNullException.ThrowIfNull(filter);
-
-        if (!filter.Limit.HasValue)
-        {
-            filter.EnableTotalRecordCount = false;
-        }
-
-        using var context = _dbProvider.CreateDbContext();
-
-        var innerQuery = new InternalItemsQuery(filter.User)
-        {
-            ExcludeItemTypes = filter.ExcludeItemTypes,
-            IncludeItemTypes = filter.IncludeItemTypes,
-            MediaTypes = filter.MediaTypes,
-            AncestorIds = filter.AncestorIds,
-            ItemIds = filter.ItemIds,
-            TopParentIds = filter.TopParentIds,
-            ParentId = filter.ParentId,
-            IsAiring = filter.IsAiring,
-            IsMovie = filter.IsMovie,
-            IsSports = filter.IsSports,
-            IsKids = filter.IsKids,
-            IsNews = filter.IsNews,
-            IsSeries = filter.IsSeries
-        };
-        var query = TranslateQuery(context.BaseItems, context, innerQuery);
-
-        query = query.Where(e => e.Type == returnType && e.ItemValues!.Any(f => e.CleanName == f.CleanValue && itemValueTypes.Contains(f.Type)));
-
-        var outerQuery = new InternalItemsQuery(filter.User)
-        {
-            IsPlayed = filter.IsPlayed,
-            IsFavorite = filter.IsFavorite,
-            IsFavoriteOrLiked = filter.IsFavoriteOrLiked,
-            IsLiked = filter.IsLiked,
-            IsLocked = filter.IsLocked,
-            NameLessThan = filter.NameLessThan,
-            NameStartsWith = filter.NameStartsWith,
-            NameStartsWithOrGreater = filter.NameStartsWithOrGreater,
-            Tags = filter.Tags,
-            OfficialRatings = filter.OfficialRatings,
-            StudioIds = filter.StudioIds,
-            GenreIds = filter.GenreIds,
-            Genres = filter.Genres,
-            Years = filter.Years,
-            NameContains = filter.NameContains,
-            SearchTerm = filter.SearchTerm,
-            SimilarTo = filter.SimilarTo,
-            ExcludeItemIds = filter.ExcludeItemIds
-        };
-        query = TranslateQuery(query, context, outerQuery)
-            .OrderBy(e => e.PresentationUniqueKey);
-
-        if (filter.OrderBy.Count != 0
-            || filter.SimilarTo is not null
-            || !string.IsNullOrEmpty(filter.SearchTerm))
-        {
-            query = ApplyOrder(query, filter);
-        }
-        else
-        {
-            query = query.OrderBy(e => e.SortName);
-        }
-
-        if (filter.Limit.HasValue || filter.StartIndex.HasValue)
-        {
-            var offset = filter.StartIndex ?? 0;
-
-            if (offset > 0)
-            {
-                query = query.Skip(offset);
-            }
-
-            if (filter.Limit.HasValue)
-            {
-                query.Take(filter.Limit.Value);
-            }
-        }
-
-        var result = new QueryResult<(BaseItem, ItemCounts)>();
-        string countText = string.Empty;
-        if (filter.EnableTotalRecordCount)
-        {
-            result.TotalRecordCount = query.DistinctBy(e => e.PresentationUniqueKey).Count();
-        }
-
-        var resultQuery = query.Select(e => new
-        {
-            item = e,
-            itemCount = new ItemCounts()
-            {
-                SeriesCount = e.ItemValues!.Count(e => e.Type == (int)BaseItemKind.Series),
-                EpisodeCount = e.ItemValues!.Count(e => e.Type == (int)BaseItemKind.Episode),
-                MovieCount = e.ItemValues!.Count(e => e.Type == (int)BaseItemKind.Movie),
-                AlbumCount = e.ItemValues!.Count(e => e.Type == (int)BaseItemKind.MusicAlbum),
-                ArtistCount = e.ItemValues!.Count(e => e.Type == 0 || e.Type == 1),
-                SongCount = e.ItemValues!.Count(e => e.Type == (int)BaseItemKind.MusicAlbum),
-                TrailerCount = e.ItemValues!.Count(e => e.Type == (int)BaseItemKind.Trailer),
-            }
-        });
-
-        result.StartIndex = filter.StartIndex ?? 0;
-        result.Items = resultQuery.ToImmutableArray().Select(e =>
-        {
-            return (DeserialiseBaseItem(e.item), e.itemCount);
-        }).ToImmutableArray();
-
-        return result;
-    }
-
-    /// <inheritdoc />
-    public void DeleteItem(Guid id)
-    {
-        ArgumentNullException.ThrowIfNull(id.IsEmpty() ? null : id);
-
-        using var context = _dbProvider.CreateDbContext();
-        using var transaction = context.Database.BeginTransaction();
-        context.Peoples.Where(e => e.ItemId.Equals(id)).ExecuteDelete();
-        context.Chapters.Where(e => e.ItemId.Equals(id)).ExecuteDelete();
-        context.MediaStreamInfos.Where(e => e.ItemId.Equals(id)).ExecuteDelete();
-        context.AncestorIds.Where(e => e.ItemId.Equals(id)).ExecuteDelete();
-        context.ItemValues.Where(e => e.ItemId.Equals(id)).ExecuteDelete();
-        context.BaseItems.Where(e => e.Id.Equals(id)).ExecuteDelete();
-        context.SaveChanges();
-        transaction.Commit();
-    }
-
-    /// <inheritdoc />
-    public void UpdateInheritedValues()
-    {
-        using var context = _dbProvider.CreateDbContext();
-        using var transaction = context.Database.BeginTransaction();
-
-        context.ItemValues.Where(e => e.Type == 6).ExecuteDelete();
-        context.ItemValues.AddRange(context.ItemValues.Where(e => e.Type == 4).Select(e => new Data.Entities.ItemValue()
-        {
-            CleanValue = e.CleanValue,
-            ItemId = e.ItemId,
-            Type = 6,
-            Value = e.Value,
-            Item = null!
-        }));
-
-        context.ItemValues.AddRange(
-            context.AncestorIds.Where(e => e.AncestorIdText != null).Join(context.ItemValues.Where(e => e.Value != null && e.Type == 4), e => e.Id, e => e.ItemId, (e, f) => new Data.Entities.ItemValue()
-            {
-                CleanValue = f.CleanValue,
-                ItemId = e.ItemId,
-                Item = null!,
-                Type = 6,
-                Value = f.Value
-            }));
-        context.SaveChanges();
-
-        transaction.Commit();
-    }
-
-    /// <inheritdoc cref="IItemRepository"/>
-    public IReadOnlyList<Guid> GetItemIdsList(InternalItemsQuery filter)
-    {
-        ArgumentNullException.ThrowIfNull(filter);
-        PrepareFilterQuery(filter);
-
-        using var context = _dbProvider.CreateDbContext();
-        var dbQuery = TranslateQuery(context.BaseItems.AsNoTracking(), context, filter)
-            .DistinctBy(e => e.Id);
-
-        var enableGroupByPresentationUniqueKey = EnableGroupByPresentationUniqueKey(filter);
-        if (enableGroupByPresentationUniqueKey && filter.GroupBySeriesPresentationUniqueKey)
-        {
-            dbQuery = dbQuery.GroupBy(e => new { e.PresentationUniqueKey, e.SeriesPresentationUniqueKey }).SelectMany(e => e);
-        }
-
-        if (enableGroupByPresentationUniqueKey)
-        {
-            dbQuery = dbQuery.GroupBy(e => e.PresentationUniqueKey).SelectMany(e => e);
-        }
-
-        if (filter.GroupBySeriesPresentationUniqueKey)
-        {
-            dbQuery = dbQuery.GroupBy(e => e.SeriesPresentationUniqueKey).SelectMany(e => e);
-        }
-
-        dbQuery = ApplyOrder(dbQuery, filter);
-
-        return Pageinate(dbQuery, filter).Select(e => e.Id).ToImmutableArray();
-    }
-
-    /// <inheritdoc />
-    public QueryResult<(BaseItem Item, ItemCounts ItemCounts)> GetAllArtists(InternalItemsQuery filter)
-    {
-        return GetItemValues(filter, new[] { 0, 1 }, typeof(MusicArtist).FullName!);
-    }
-
-    /// <inheritdoc />
-    public QueryResult<(BaseItem Item, ItemCounts ItemCounts)> GetArtists(InternalItemsQuery filter)
-    {
-        return GetItemValues(filter, new[] { 0 }, typeof(MusicArtist).FullName!);
-    }
-
-    /// <inheritdoc />
-    public QueryResult<(BaseItem Item, ItemCounts ItemCounts)> GetAlbumArtists(InternalItemsQuery filter)
-    {
-        return GetItemValues(filter, new[] { 1 }, typeof(MusicArtist).FullName!);
-    }
-
-    /// <inheritdoc />
-    public QueryResult<(BaseItem Item, ItemCounts ItemCounts)> GetStudios(InternalItemsQuery filter)
-    {
-        return GetItemValues(filter, new[] { 3 }, typeof(Studio).FullName!);
-    }
-
-    /// <inheritdoc />
-    public QueryResult<(BaseItem Item, ItemCounts ItemCounts)> GetGenres(InternalItemsQuery filter)
-    {
-        return GetItemValues(filter, new[] { 2 }, typeof(Genre).FullName!);
-    }
-
-    /// <inheritdoc />
-    public QueryResult<(BaseItem Item, ItemCounts ItemCounts)> GetMusicGenres(InternalItemsQuery filter)
-    {
-        return GetItemValues(filter, new[] { 2 }, typeof(MusicGenre).FullName!);
-    }
-
-    /// <inheritdoc />
-    public IReadOnlyList<string> GetStudioNames()
-    {
-        return GetItemValueNames(new[] { 3 }, Array.Empty<string>(), Array.Empty<string>());
-    }
-
-    /// <inheritdoc />
-    public IReadOnlyList<string> GetAllArtistNames()
-    {
-        return GetItemValueNames(new[] { 0, 1 }, Array.Empty<string>(), Array.Empty<string>());
-    }
-
-    /// <inheritdoc />
-    public IReadOnlyList<string> GetMusicGenreNames()
-    {
-        return GetItemValueNames(
-            new[] { 2 },
-            new string[]
-            {
-                    typeof(Audio).FullName!,
-                    typeof(MusicVideo).FullName!,
-                    typeof(MusicAlbum).FullName!,
-                    typeof(MusicArtist).FullName!
-            },
-            Array.Empty<string>());
-    }
-
-    /// <inheritdoc />
-    public IReadOnlyList<string> GetGenreNames()
-    {
-        return GetItemValueNames(
-            new[] { 2 },
-            Array.Empty<string>(),
-            new string[]
-            {
-                    typeof(Audio).FullName!,
-                    typeof(MusicVideo).FullName!,
-                    typeof(MusicAlbum).FullName!,
-                    typeof(MusicArtist).FullName!
-            });
-    }
-
-    /// <inheritdoc cref="IItemRepository"/>
-    public QueryResult<BaseItemDto> GetItems(InternalItemsQuery filter)
-    {
-        ArgumentNullException.ThrowIfNull(filter);
-        if (!filter.EnableTotalRecordCount || (!filter.Limit.HasValue && (filter.StartIndex ?? 0) == 0))
-        {
-            var returnList = GetItemList(filter);
-            return new QueryResult<BaseItemDto>(
-                filter.StartIndex,
-                returnList.Count,
-                returnList);
-        }
-
-        PrepareFilterQuery(filter);
-        var result = new QueryResult<BaseItemDto>();
-
-        using var context = _dbProvider.CreateDbContext();
-        var dbQuery = TranslateQuery(context.BaseItems, context, filter)
-            .DistinctBy(e => e.Id);
-        if (filter.EnableTotalRecordCount)
-        {
-            result.TotalRecordCount = dbQuery.Count();
-        }
-
-        if (filter.Limit.HasValue || filter.StartIndex.HasValue)
-        {
-            var offset = filter.StartIndex ?? 0;
-
-            if (offset > 0)
-            {
-                dbQuery = dbQuery.Skip(offset);
-            }
-
-            if (filter.Limit.HasValue)
-            {
-                dbQuery = dbQuery.Take(filter.Limit.Value);
-            }
-        }
-
-        result.Items = dbQuery.ToList().Select(DeserialiseBaseItem).ToImmutableArray();
-        result.StartIndex = filter.StartIndex ?? 0;
-        return result;
-    }
-
-    /// <inheritdoc cref="IItemRepository"/>
-    public IReadOnlyList<BaseItemDto> GetItemList(InternalItemsQuery filter)
-    {
-        ArgumentNullException.ThrowIfNull(filter);
-        PrepareFilterQuery(filter);
-
-        using var context = _dbProvider.CreateDbContext();
-        var dbQuery = TranslateQuery(context.BaseItems, context, filter)
-            .DistinctBy(e => e.Id);
-        if (filter.Limit.HasValue || filter.StartIndex.HasValue)
-        {
-            var offset = filter.StartIndex ?? 0;
-
-            if (offset > 0)
-            {
-                dbQuery = dbQuery.Skip(offset);
-            }
-
-            if (filter.Limit.HasValue)
-            {
-                dbQuery = dbQuery.Take(filter.Limit.Value);
-            }
-        }
-
-        return dbQuery.ToList().Select(DeserialiseBaseItem).ToImmutableArray();
-    }
-
-    /// <inheritdoc/>
-    public int GetCount(InternalItemsQuery filter)
-    {
-        ArgumentNullException.ThrowIfNull(filter);
-        // Hack for right now since we currently don't support filtering out these duplicates within a query
-        PrepareFilterQuery(filter);
-
-        using var context = _dbProvider.CreateDbContext();
-        var dbQuery = TranslateQuery(context.BaseItems, context, filter);
-
-        return dbQuery.Count();
-    }
-
-    private IQueryable<BaseItemEntity> TranslateQuery(
-        IQueryable<BaseItemEntity> baseQuery,
-        JellyfinDbContext context,
-        InternalItemsQuery filter)
-    {
-        var minWidth = filter.MinWidth;
-        var maxWidth = filter.MaxWidth;
-        var now = DateTime.UtcNow;
-
-        if (filter.IsHD.HasValue)
-        {
-            const int Threshold = 1200;
-            if (filter.IsHD.Value)
-            {
-                minWidth = Threshold;
-            }
-            else
-            {
-                maxWidth = Threshold - 1;
-            }
-        }
-
-        if (filter.Is4K.HasValue)
-        {
-            const int Threshold = 3800;
-            if (filter.Is4K.Value)
-            {
-                minWidth = Threshold;
-            }
-            else
-            {
-                maxWidth = Threshold - 1;
-            }
-        }
-
-        if (minWidth.HasValue)
-        {
-            baseQuery = baseQuery.Where(e => e.Width >= minWidth);
-        }
-
-        if (filter.MinHeight.HasValue)
-        {
-            baseQuery = baseQuery.Where(e => e.Height >= filter.MinHeight);
-        }
-
-        if (maxWidth.HasValue)
-        {
-            baseQuery = baseQuery.Where(e => e.Width >= maxWidth);
-        }
-
-        if (filter.MaxHeight.HasValue)
-        {
-            baseQuery = baseQuery.Where(e => e.Height <= filter.MaxHeight);
-        }
-
-        if (filter.IsLocked.HasValue)
-        {
-            baseQuery = baseQuery.Where(e => e.IsLocked == filter.IsLocked);
-        }
-
-        var tags = filter.Tags.ToList();
-        var excludeTags = filter.ExcludeTags.ToList();
-
-        if (filter.IsMovie == true)
-        {
-            if (filter.IncludeItemTypes.Length == 0
-                || filter.IncludeItemTypes.Contains(BaseItemKind.Movie)
-                || filter.IncludeItemTypes.Contains(BaseItemKind.Trailer))
-            {
-                baseQuery = baseQuery.Where(e => e.IsMovie);
-            }
-        }
-        else if (filter.IsMovie.HasValue)
-        {
-            baseQuery = baseQuery.Where(e => e.IsMovie == filter.IsMovie);
-        }
-
-        if (filter.IsSeries.HasValue)
-        {
-            baseQuery = baseQuery.Where(e => e.IsSeries == filter.IsSeries);
-        }
-
-        if (filter.IsSports.HasValue)
-        {
-            if (filter.IsSports.Value)
-            {
-                tags.Add("Sports");
-            }
-            else
-            {
-                excludeTags.Add("Sports");
-            }
-        }
-
-        if (filter.IsNews.HasValue)
-        {
-            if (filter.IsNews.Value)
-            {
-                tags.Add("News");
-            }
-            else
-            {
-                excludeTags.Add("News");
-            }
-        }
-
-        if (filter.IsKids.HasValue)
-        {
-            if (filter.IsKids.Value)
-            {
-                tags.Add("Kids");
-            }
-            else
-            {
-                excludeTags.Add("Kids");
-            }
-        }
-
-        if (!string.IsNullOrEmpty(filter.SearchTerm))
-        {
-            baseQuery = baseQuery.Where(e => e.CleanName!.Contains(filter.SearchTerm, StringComparison.InvariantCultureIgnoreCase) || (e.OriginalTitle != null && e.OriginalTitle.Contains(filter.SearchTerm, StringComparison.InvariantCultureIgnoreCase)));
-        }
-
-        if (filter.IsFolder.HasValue)
-        {
-            baseQuery = baseQuery.Where(e => e.IsFolder == filter.IsFolder);
-        }
-
-        var includeTypes = filter.IncludeItemTypes;
-        // Only specify excluded types if no included types are specified
-        if (filter.IncludeItemTypes.Length == 0)
-        {
-            var excludeTypes = filter.ExcludeItemTypes;
-            if (excludeTypes.Length == 1)
-            {
-                if (_baseItemKindNames.TryGetValue(excludeTypes[0], out var excludeTypeName))
-                {
-                    baseQuery = baseQuery.Where(e => e.Type != excludeTypeName);
-                }
-            }
-            else if (excludeTypes.Length > 1)
-            {
-                var excludeTypeName = new List<string>();
-                foreach (var excludeType in excludeTypes)
-                {
-                    if (_baseItemKindNames.TryGetValue(excludeType, out var baseItemKindName))
-                    {
-                        excludeTypeName.Add(baseItemKindName!);
-                    }
-                }
-
-                baseQuery = baseQuery.Where(e => !excludeTypeName.Contains(e.Type));
-            }
-        }
-        else if (includeTypes.Length == 1)
-        {
-            if (_baseItemKindNames.TryGetValue(includeTypes[0], out var includeTypeName))
-            {
-                baseQuery = baseQuery.Where(e => e.Type == includeTypeName);
-            }
-        }
-        else if (includeTypes.Length > 1)
-        {
-            var includeTypeName = new List<string>();
-            foreach (var includeType in includeTypes)
-            {
-                if (_baseItemKindNames.TryGetValue(includeType, out var baseItemKindName))
-                {
-                    includeTypeName.Add(baseItemKindName!);
-                }
-            }
-
-            baseQuery = baseQuery.Where(e => includeTypeName.Contains(e.Type));
-        }
-
-        if (filter.ChannelIds.Count == 1)
-        {
-            baseQuery = baseQuery.Where(e => e.ChannelId == filter.ChannelIds[0].ToString("N", CultureInfo.InvariantCulture));
-        }
-        else if (filter.ChannelIds.Count > 1)
-        {
-            baseQuery = baseQuery.Where(e => filter.ChannelIds.Select(f => f.ToString("N", CultureInfo.InvariantCulture)).Contains(e.ChannelId));
-        }
-
-        if (!filter.ParentId.IsEmpty())
-        {
-            baseQuery = baseQuery.Where(e => e.ParentId.Equals(filter.ParentId));
-        }
-
-        if (!string.IsNullOrWhiteSpace(filter.Path))
-        {
-            baseQuery = baseQuery.Where(e => e.Path == filter.Path);
-        }
-
-        if (!string.IsNullOrWhiteSpace(filter.PresentationUniqueKey))
-        {
-            baseQuery = baseQuery.Where(e => e.PresentationUniqueKey == filter.PresentationUniqueKey);
-        }
-
-        if (filter.MinCommunityRating.HasValue)
-        {
-            baseQuery = baseQuery.Where(e => e.CommunityRating >= filter.MinCommunityRating);
-        }
-
-        if (filter.MinIndexNumber.HasValue)
-        {
-            baseQuery = baseQuery.Where(e => e.IndexNumber >= filter.MinIndexNumber);
-        }
-
-        if (filter.MinParentAndIndexNumber.HasValue)
-        {
-            baseQuery = baseQuery
-                .Where(e => (e.ParentIndexNumber == filter.MinParentAndIndexNumber.Value.ParentIndexNumber && e.IndexNumber >= filter.MinParentAndIndexNumber.Value.IndexNumber) || e.ParentIndexNumber > filter.MinParentAndIndexNumber.Value.ParentIndexNumber);
-        }
-
-        if (filter.MinDateCreated.HasValue)
-        {
-            baseQuery = baseQuery.Where(e => e.DateCreated >= filter.MinDateCreated);
-        }
-
-        if (filter.MinDateLastSaved.HasValue)
-        {
-            baseQuery = baseQuery.Where(e => e.DateLastSaved != null && e.DateLastSaved >= filter.MinDateLastSaved.Value);
-        }
-
-        if (filter.MinDateLastSavedForUser.HasValue)
-        {
-            baseQuery = baseQuery.Where(e => e.DateLastSaved != null && e.DateLastSaved >= filter.MinDateLastSavedForUser.Value);
-        }
-
-        if (filter.IndexNumber.HasValue)
-        {
-            baseQuery = baseQuery.Where(e => e.IndexNumber == filter.IndexNumber.Value);
-        }
-
-        if (filter.ParentIndexNumber.HasValue)
-        {
-            baseQuery = baseQuery.Where(e => e.ParentIndexNumber == filter.ParentIndexNumber.Value);
-        }
-
-        if (filter.ParentIndexNumberNotEquals.HasValue)
-        {
-            baseQuery = baseQuery.Where(e => e.ParentIndexNumber != filter.ParentIndexNumberNotEquals.Value || e.ParentIndexNumber == null);
-        }
-
-        var minEndDate = filter.MinEndDate;
-        var maxEndDate = filter.MaxEndDate;
-
-        if (filter.HasAired.HasValue)
-        {
-            if (filter.HasAired.Value)
-            {
-                maxEndDate = DateTime.UtcNow;
-            }
-            else
-            {
-                minEndDate = DateTime.UtcNow;
-            }
-        }
-
-        if (minEndDate.HasValue)
-        {
-            baseQuery = baseQuery.Where(e => e.EndDate >= minEndDate);
-        }
-
-        if (maxEndDate.HasValue)
-        {
-            baseQuery = baseQuery.Where(e => e.EndDate <= maxEndDate);
-        }
-
-        if (filter.MinStartDate.HasValue)
-        {
-            baseQuery = baseQuery.Where(e => e.StartDate >= filter.MinStartDate.Value);
-        }
-
-        if (filter.MaxStartDate.HasValue)
-        {
-            baseQuery = baseQuery.Where(e => e.StartDate <= filter.MaxStartDate.Value);
-        }
-
-        if (filter.MinPremiereDate.HasValue)
-        {
-            baseQuery = baseQuery.Where(e => e.PremiereDate <= filter.MinPremiereDate.Value);
-        }
-
-        if (filter.MaxPremiereDate.HasValue)
-        {
-            baseQuery = baseQuery.Where(e => e.PremiereDate <= filter.MaxPremiereDate.Value);
-        }
-
-        if (filter.TrailerTypes.Length > 0)
-        {
-            baseQuery = baseQuery.Where(e => filter.TrailerTypes.Any(f => e.TrailerTypes!.Contains(f.ToString(), StringComparison.OrdinalIgnoreCase)));
-        }
-
-        if (filter.IsAiring.HasValue)
-        {
-            if (filter.IsAiring.Value)
-            {
-                baseQuery = baseQuery.Where(e => e.StartDate <= now && e.EndDate >= now);
-            }
-            else
-            {
-                baseQuery = baseQuery.Where(e => e.StartDate > now && e.EndDate < now);
-            }
-        }
-
-        if (filter.PersonIds.Length > 0)
-        {
-            baseQuery = baseQuery
-                .Where(e =>
-                    context.Peoples.Where(w => context.BaseItems.Where(w => filter.PersonIds.Contains(w.Id)).Any(f => f.Name == w.Name))
-                        .Any(f => f.ItemId.Equals(e.Id)));
-        }
-
-        if (!string.IsNullOrWhiteSpace(filter.Person))
-        {
-            baseQuery = baseQuery.Where(e => e.Peoples!.Any(f => f.Name == filter.Person));
-        }
-
-        if (!string.IsNullOrWhiteSpace(filter.MinSortName))
-        {
-            // this does not makes sense.
-            // baseQuery = baseQuery.Where(e => e.SortName >= query.MinSortName);
-            // whereClauses.Add("SortName>=@MinSortName");
-            // statement?.TryBind("@MinSortName", query.MinSortName);
-        }
-
-        if (!string.IsNullOrWhiteSpace(filter.ExternalSeriesId))
-        {
-            baseQuery = baseQuery.Where(e => e.ExternalSeriesId == filter.ExternalSeriesId);
-        }
-
-        if (!string.IsNullOrWhiteSpace(filter.ExternalId))
-        {
-            baseQuery = baseQuery.Where(e => e.ExternalId == filter.ExternalId);
-        }
-
-        if (!string.IsNullOrWhiteSpace(filter.Name))
-        {
-            var cleanName = GetCleanValue(filter.Name);
-            baseQuery = baseQuery.Where(e => e.CleanName == cleanName);
-        }
-
-        // These are the same, for now
-        var nameContains = filter.NameContains;
-        if (!string.IsNullOrWhiteSpace(nameContains))
-        {
-            baseQuery = baseQuery.Where(e =>
-                e.CleanName == filter.NameContains
-                || e.OriginalTitle!.Contains(filter.NameContains!, StringComparison.Ordinal));
-        }
-
-        if (!string.IsNullOrWhiteSpace(filter.NameStartsWith))
-        {
-            baseQuery = baseQuery.Where(e => e.SortName!.Contains(filter.NameStartsWith, StringComparison.OrdinalIgnoreCase));
-        }
-
-        if (!string.IsNullOrWhiteSpace(filter.NameStartsWithOrGreater))
-        {
-            // i hate this
-            baseQuery = baseQuery.Where(e => e.SortName![0] > filter.NameStartsWithOrGreater[0]);
-        }
-
-        if (!string.IsNullOrWhiteSpace(filter.NameLessThan))
-        {
-            // i hate this
-            baseQuery = baseQuery.Where(e => e.SortName![0] < filter.NameLessThan[0]);
-        }
-
-        if (filter.ImageTypes.Length > 0)
-        {
-            baseQuery = baseQuery.Where(e => filter.ImageTypes.Any(f => e.Images!.Contains(f.ToString(), StringComparison.InvariantCulture)));
-        }
-
-        if (filter.IsLiked.HasValue)
-        {
-            baseQuery = baseQuery
-                .Where(e => e.UserData!.FirstOrDefault(f => f.UserId.Equals(filter.User!.Id) && f.Key == e.UserDataKey)!.Rating >= UserItemData.MinLikeValue);
-        }
-
-        if (filter.IsFavoriteOrLiked.HasValue)
-        {
-            baseQuery = baseQuery
-                .Where(e => e.UserData!.FirstOrDefault(f => f.UserId.Equals(filter.User!.Id) && f.Key == e.UserDataKey)!.IsFavorite == filter.IsFavoriteOrLiked);
-        }
-
-        if (filter.IsFavorite.HasValue)
-        {
-            baseQuery = baseQuery
-                .Where(e => e.UserData!.FirstOrDefault(f => f.UserId.Equals(filter.User!.Id) && f.Key == e.UserDataKey)!.IsFavorite == filter.IsFavorite);
-        }
-
-        if (filter.IsPlayed.HasValue)
-        {
-            baseQuery = baseQuery
-                   .Where(e => e.UserData!.FirstOrDefault(f => f.UserId.Equals(filter.User!.Id) && f.Key == e.UserDataKey)!.Played == filter.IsPlayed.Value);
-        }
-
-        if (filter.IsResumable.HasValue)
-        {
-            if (filter.IsResumable.Value)
-            {
-                baseQuery = baseQuery
-                       .Where(e => e.UserData!.FirstOrDefault(f => f.UserId.Equals(filter.User!.Id) && f.Key == e.UserDataKey)!.PlaybackPositionTicks > 0);
-            }
-            else
-            {
-                baseQuery = baseQuery
-                       .Where(e => e.UserData!.FirstOrDefault(f => f.UserId.Equals(filter.User!.Id) && f.Key == e.UserDataKey)!.PlaybackPositionTicks == 0);
-            }
-        }
-
-        var artistQuery = context.BaseItems.Where(w => filter.ArtistIds.Contains(w.Id));
-
-        if (filter.ArtistIds.Length > 0)
-        {
-            baseQuery = baseQuery
-                   .Where(e => e.ItemValues!.Any(f => f.Type <= 1 && artistQuery.Any(w => w.CleanName == f.CleanValue)));
-        }
-
-        if (filter.AlbumArtistIds.Length > 0)
-        {
-            baseQuery = baseQuery
-               .Where(e => e.ItemValues!.Any(f => f.Type == 1 && artistQuery.Any(w => w.CleanName == f.CleanValue)));
-        }
-
-        if (filter.ContributingArtistIds.Length > 0)
-        {
-            var contributingArtists = context.BaseItems.Where(e => filter.ContributingArtistIds.Contains(e.Id));
-            baseQuery = baseQuery.Where(e => e.ItemValues!.Any(f => f.Type == 0 && contributingArtists.Any(w => w.CleanName == f.CleanValue)));
-        }
-
-        if (filter.AlbumIds.Length > 0)
-        {
-            baseQuery = baseQuery.Where(e => context.BaseItems.Where(e => filter.AlbumIds.Contains(e.Id)).Any(f => f.Name == e.Album));
-        }
-
-        if (filter.ExcludeArtistIds.Length > 0)
-        {
-            var excludeArtistQuery = context.BaseItems.Where(w => filter.ExcludeArtistIds.Contains(w.Id));
-            baseQuery = baseQuery
-                   .Where(e => !e.ItemValues!.Any(f => f.Type <= 1 && artistQuery.Any(w => w.CleanName == f.CleanValue)));
-        }
-
-        if (filter.GenreIds.Count > 0)
-        {
-            baseQuery = baseQuery
-                   .Where(e => e.ItemValues!.Any(f => f.Type == 2 && context.BaseItems.Where(w => filter.GenreIds.Contains(w.Id)).Any(w => w.CleanName == f.CleanValue)));
-        }
-
-        if (filter.Genres.Count > 0)
-        {
-            var cleanGenres = filter.Genres.Select(e => GetCleanValue(e)).ToArray();
-            baseQuery = baseQuery
-                   .Where(e => e.ItemValues!.Any(f => f.Type == 2 && cleanGenres.Contains(f.CleanValue)));
-        }
-
-        if (tags.Count > 0)
-        {
-            var cleanValues = tags.Select(e => GetCleanValue(e)).ToArray();
-            baseQuery = baseQuery
-                   .Where(e => e.ItemValues!.Any(f => f.Type == 4 && cleanValues.Contains(f.CleanValue)));
-        }
-
-        if (excludeTags.Count > 0)
-        {
-            var cleanValues = excludeTags.Select(e => GetCleanValue(e)).ToArray();
-            baseQuery = baseQuery
-                   .Where(e => !e.ItemValues!.Any(f => f.Type == 4 && cleanValues.Contains(f.CleanValue)));
-        }
-
-        if (filter.StudioIds.Length > 0)
-        {
-            baseQuery = baseQuery
-                   .Where(e => e.ItemValues!.Any(f => f.Type == 3 && context.BaseItems.Where(w => filter.StudioIds.Contains(w.Id)).Any(w => w.CleanName == f.CleanValue)));
-        }
-
-        if (filter.OfficialRatings.Length > 0)
-        {
-            baseQuery = baseQuery
-                   .Where(e => filter.OfficialRatings.Contains(e.OfficialRating));
-        }
-
-        if (filter.HasParentalRating ?? false)
-        {
-            if (filter.MinParentalRating.HasValue)
-            {
-                baseQuery = baseQuery
-                   .Where(e => e.InheritedParentalRatingValue >= filter.MinParentalRating.Value);
-            }
-
-            if (filter.MaxParentalRating.HasValue)
-            {
-                baseQuery = baseQuery
-                   .Where(e => e.InheritedParentalRatingValue < filter.MaxParentalRating.Value);
-            }
-        }
-        else if (filter.BlockUnratedItems.Length > 0)
-        {
-            if (filter.MinParentalRating.HasValue)
-            {
-                if (filter.MaxParentalRating.HasValue)
-                {
-                    baseQuery = baseQuery
-                        .Where(e => (e.InheritedParentalRatingValue == null && !filter.BlockUnratedItems.Select(e => e.ToString()).Contains(e.UnratedType))
-                        || (e.InheritedParentalRatingValue >= filter.MinParentalRating && e.InheritedParentalRatingValue <= filter.MaxParentalRating));
-                }
-                else
-                {
-                    baseQuery = baseQuery
-                        .Where(e => (e.InheritedParentalRatingValue == null && !filter.BlockUnratedItems.Select(e => e.ToString()).Contains(e.UnratedType))
-                        || e.InheritedParentalRatingValue >= filter.MinParentalRating);
-                }
-            }
-            else
-            {
-                baseQuery = baseQuery
-                    .Where(e => e.InheritedParentalRatingValue != null && !filter.BlockUnratedItems.Select(e => e.ToString()).Contains(e.UnratedType));
-            }
-        }
-        else if (filter.MinParentalRating.HasValue)
-        {
-            if (filter.MaxParentalRating.HasValue)
-            {
-                baseQuery = baseQuery
-                    .Where(e => e.InheritedParentalRatingValue != null && e.InheritedParentalRatingValue >= filter.MinParentalRating.Value && e.InheritedParentalRatingValue <= filter.MaxParentalRating.Value);
-            }
-            else
-            {
-                baseQuery = baseQuery
-                    .Where(e => e.InheritedParentalRatingValue != null && e.InheritedParentalRatingValue >= filter.MinParentalRating.Value);
-            }
-        }
-        else if (filter.MaxParentalRating.HasValue)
-        {
-            baseQuery = baseQuery
-                .Where(e => e.InheritedParentalRatingValue != null && e.InheritedParentalRatingValue >= filter.MaxParentalRating.Value);
-        }
-        else if (!filter.HasParentalRating ?? false)
-        {
-            baseQuery = baseQuery
-                .Where(e => e.InheritedParentalRatingValue == null);
-        }
-
-        if (filter.HasOfficialRating.HasValue)
-        {
-            if (filter.HasOfficialRating.Value)
-            {
-                baseQuery = baseQuery
-                    .Where(e => e.OfficialRating != null && e.OfficialRating != string.Empty);
-            }
-            else
-            {
-                baseQuery = baseQuery
-                    .Where(e => e.OfficialRating == null || e.OfficialRating == string.Empty);
-            }
-        }
-
-        if (filter.HasOverview.HasValue)
-        {
-            if (filter.HasOverview.Value)
-            {
-                baseQuery = baseQuery
-                    .Where(e => e.Overview != null && e.Overview != string.Empty);
-            }
-            else
-            {
-                baseQuery = baseQuery
-                    .Where(e => e.Overview == null || e.Overview == string.Empty);
-            }
-        }
-
-        if (filter.HasOwnerId.HasValue)
-        {
-            if (filter.HasOwnerId.Value)
-            {
-                baseQuery = baseQuery
-                    .Where(e => e.OwnerId != null);
-            }
-            else
-            {
-                baseQuery = baseQuery
-                    .Where(e => e.OwnerId == null);
-            }
-        }
-
-        if (!string.IsNullOrWhiteSpace(filter.HasNoAudioTrackWithLanguage))
-        {
-            baseQuery = baseQuery
-                .Where(e => !e.MediaStreams!.Any(e => e.StreamType == "Audio" && e.Language == filter.HasNoAudioTrackWithLanguage));
-        }
-
-        if (!string.IsNullOrWhiteSpace(filter.HasNoInternalSubtitleTrackWithLanguage))
-        {
-            baseQuery = baseQuery
-                .Where(e => !e.MediaStreams!.Any(e => e.StreamType == "Subtitle" && !e.IsExternal && e.Language == filter.HasNoInternalSubtitleTrackWithLanguage));
-        }
-
-        if (!string.IsNullOrWhiteSpace(filter.HasNoExternalSubtitleTrackWithLanguage))
-        {
-            baseQuery = baseQuery
-                .Where(e => !e.MediaStreams!.Any(e => e.StreamType == "Subtitle" && e.IsExternal && e.Language == filter.HasNoExternalSubtitleTrackWithLanguage));
-        }
-
-        if (!string.IsNullOrWhiteSpace(filter.HasNoSubtitleTrackWithLanguage))
-        {
-            baseQuery = baseQuery
-                .Where(e => !e.MediaStreams!.Any(e => e.StreamType == "Subtitle" && e.Language == filter.HasNoSubtitleTrackWithLanguage));
-        }
-
-        if (filter.HasSubtitles.HasValue)
-        {
-            baseQuery = baseQuery
-                .Where(e => e.MediaStreams!.Any(e => e.StreamType == "Subtitle") == filter.HasSubtitles.Value);
-        }
-
-        if (filter.HasChapterImages.HasValue)
-        {
-            baseQuery = baseQuery
-                .Where(e => e.Chapters!.Any(e => e.ImagePath != null) == filter.HasChapterImages.Value);
-        }
-
-        if (filter.HasDeadParentId.HasValue && filter.HasDeadParentId.Value)
-        {
-            baseQuery = baseQuery
-                .Where(e => e.ParentId.HasValue && context.BaseItems.Any(f => f.Id.Equals(e.ParentId.Value)));
-        }
-
-        if (filter.IsDeadArtist.HasValue && filter.IsDeadArtist.Value)
-        {
-            baseQuery = baseQuery
-                .Where(e => e.ItemValues!.Any(f => (f.Type == 0 || f.Type == 1) && f.CleanValue == e.CleanName));
-        }
-
-        if (filter.IsDeadStudio.HasValue && filter.IsDeadStudio.Value)
-        {
-            baseQuery = baseQuery
-                .Where(e => e.ItemValues!.Any(f => f.Type == 3 && f.CleanValue == e.CleanName));
-        }
-
-        if (filter.IsDeadPerson.HasValue && filter.IsDeadPerson.Value)
-        {
-            baseQuery = baseQuery
-                .Where(e => !e.Peoples!.Any(f => f.Name == e.Name));
-        }
-
-        if (filter.Years.Length == 1)
-        {
-            baseQuery = baseQuery
-                .Where(e => e.ProductionYear == filter.Years[0]);
-        }
-        else if (filter.Years.Length > 1)
-        {
-            baseQuery = baseQuery
-                .Where(e => filter.Years.Any(f => f == e.ProductionYear));
-        }
-
-        var isVirtualItem = filter.IsVirtualItem ?? filter.IsMissing;
-        if (isVirtualItem.HasValue)
-        {
-            baseQuery = baseQuery
-                .Where(e => e.IsVirtualItem == isVirtualItem.Value);
-        }
-
-        if (filter.IsSpecialSeason.HasValue)
-        {
-            if (filter.IsSpecialSeason.Value)
-            {
-                baseQuery = baseQuery
-                    .Where(e => e.IndexNumber == 0);
-            }
-            else
-            {
-                baseQuery = baseQuery
-                    .Where(e => e.IndexNumber != 0);
-            }
-        }
-
-        if (filter.IsUnaired.HasValue)
-        {
-            if (filter.IsUnaired.Value)
-            {
-                baseQuery = baseQuery
-                    .Where(e => e.PremiereDate >= now);
-            }
-            else
-            {
-                baseQuery = baseQuery
-                    .Where(e => e.PremiereDate < now);
-            }
-        }
-
-        if (filter.MediaTypes.Length == 1)
-        {
-            baseQuery = baseQuery
-                .Where(e => e.MediaType == filter.MediaTypes[0].ToString());
-        }
-        else if (filter.MediaTypes.Length > 1)
-        {
-            baseQuery = baseQuery
-                .Where(e => filter.MediaTypes.Select(f => f.ToString()).Contains(e.MediaType));
-        }
-
-        if (filter.ItemIds.Length > 0)
-        {
-            baseQuery = baseQuery
-                .Where(e => filter.ItemIds.Contains(e.Id));
-        }
-
-        if (filter.ExcludeItemIds.Length > 0)
-        {
-            baseQuery = baseQuery
-                .Where(e => !filter.ItemIds.Contains(e.Id));
-        }
-
-        if (filter.ExcludeProviderIds is not null && filter.ExcludeProviderIds.Count > 0)
-        {
-            baseQuery = baseQuery.Where(e => !e.Provider!.All(f => !filter.ExcludeProviderIds.All(w => f.ProviderId == w.Key && f.ProviderValue == w.Value)));
-        }
-
-        if (filter.HasAnyProviderId is not null && filter.HasAnyProviderId.Count > 0)
-        {
-            baseQuery = baseQuery.Where(e => e.Provider!.Any(f => !filter.HasAnyProviderId.Any(w => f.ProviderId == w.Key && f.ProviderValue == w.Value)));
-        }
-
-        if (filter.HasImdbId.HasValue)
-        {
-            baseQuery = baseQuery.Where(e => e.Provider!.Any(f => f.ProviderId == "imdb"));
-        }
-
-        if (filter.HasTmdbId.HasValue)
-        {
-            baseQuery = baseQuery.Where(e => e.Provider!.Any(f => f.ProviderId == "tmdb"));
-        }
-
-        if (filter.HasTvdbId.HasValue)
-        {
-            baseQuery = baseQuery.Where(e => e.Provider!.Any(f => f.ProviderId == "tvdb"));
-        }
-
-        var queryTopParentIds = filter.TopParentIds;
-
-        if (queryTopParentIds.Length > 0)
-        {
-            var includedItemByNameTypes = GetItemByNameTypesInQuery(filter);
-            var enableItemsByName = (filter.IncludeItemsByName ?? false) && includedItemByNameTypes.Count > 0;
-            if (enableItemsByName && includedItemByNameTypes.Count > 0)
-            {
-                baseQuery = baseQuery.Where(e => includedItemByNameTypes.Contains(e.Type) || queryTopParentIds.Any(w => w.Equals(e.TopParentId!.Value)));
-            }
-            else
-            {
-                baseQuery = baseQuery.Where(e => queryTopParentIds.Any(w => w.Equals(e.TopParentId!.Value)));
-            }
-        }
-
-        if (filter.AncestorIds.Length > 0)
-        {
-            baseQuery = baseQuery.Where(e => e.AncestorIds!.Any(f => filter.AncestorIds.Contains(f.Id)));
-        }
-
-        if (!string.IsNullOrWhiteSpace(filter.AncestorWithPresentationUniqueKey))
-        {
-            baseQuery = baseQuery
-                .Where(e => context.BaseItems.Where(f => f.PresentationUniqueKey == filter.AncestorWithPresentationUniqueKey).Any(f => f.AncestorIds!.Any(w => w.ItemId.Equals(f.Id))));
-        }
-
-        if (!string.IsNullOrWhiteSpace(filter.SeriesPresentationUniqueKey))
-        {
-            baseQuery = baseQuery
-                .Where(e => e.SeriesPresentationUniqueKey == filter.SeriesPresentationUniqueKey);
-        }
-
-        if (filter.ExcludeInheritedTags.Length > 0)
-        {
-            baseQuery = baseQuery
-                .Where(e => !e.ItemValues!.Where(e => e.Type == 6)
-                    .Any(f => filter.ExcludeInheritedTags.Contains(f.CleanValue)));
-        }
-
-        if (filter.IncludeInheritedTags.Length > 0)
-        {
-            // Episodes do not store inherit tags from their parents in the database, and the tag may be still required by the client.
-            // In addtion to the tags for the episodes themselves, we need to manually query its parent (the season)'s tags as well.
-            if (includeTypes.Length == 1 && includeTypes.FirstOrDefault() is BaseItemKind.Episode)
-            {
-                baseQuery = baseQuery
-                    .Where(e => e.ItemValues!.Where(e => e.Type == 6)
-                        .Any(f => filter.IncludeInheritedTags.Contains(f.CleanValue))
-                        ||
-                        (e.ParentId.HasValue && context.ItemValues.Where(w => w.ItemId.Equals(e.ParentId.Value))!.Where(e => e.Type == 6)
-                        .Any(f => filter.IncludeInheritedTags.Contains(f.CleanValue))));
-            }
-
-            // A playlist should be accessible to its owner regardless of allowed tags.
-            else if (includeTypes.Length == 1 && includeTypes.FirstOrDefault() is BaseItemKind.Playlist)
-            {
-                baseQuery = baseQuery
-                    .Where(e => e.ItemValues!.Where(e => e.Type == 6)
-                        .Any(f => filter.IncludeInheritedTags.Contains(f.CleanValue)) || e.Data!.Contains($"OwnerUserId\":\"{filter.User!.Id:N}\""));
-                // d                                                                      ^^ this is stupid it hate this.
-            }
-            else
-            {
-                baseQuery = baseQuery
-                    .Where(e => e.ItemValues!.Where(e => e.Type == 6)
-                        .Any(f => filter.IncludeInheritedTags.Contains(f.CleanValue)));
-            }
-        }
-
-        if (filter.SeriesStatuses.Length > 0)
-        {
-            baseQuery = baseQuery
-                .Where(e => filter.SeriesStatuses.Any(f => e.Data!.Contains(f.ToString(), StringComparison.InvariantCultureIgnoreCase)));
-        }
-
-        if (filter.BoxSetLibraryFolders.Length > 0)
-        {
-            baseQuery = baseQuery
-                .Where(e => filter.BoxSetLibraryFolders.Any(f => e.Data!.Contains(f.ToString("N", CultureInfo.InvariantCulture), StringComparison.InvariantCultureIgnoreCase)));
-        }
-
-        if (filter.VideoTypes.Length > 0)
-        {
-            var videoTypeBs = filter.VideoTypes.Select(e => $"\"VideoType\":\"" + e + "\"");
-            baseQuery = baseQuery
-                .Where(e => videoTypeBs.Any(f => e.Data!.Contains(f, StringComparison.InvariantCultureIgnoreCase)));
-        }
-
-        if (filter.Is3D.HasValue)
-        {
-            if (filter.Is3D.Value)
-            {
-                baseQuery = baseQuery
-                    .Where(e => e.Data!.Contains("Video3DFormat", StringComparison.InvariantCultureIgnoreCase));
-            }
-            else
-            {
-                baseQuery = baseQuery
-                    .Where(e => !e.Data!.Contains("Video3DFormat", StringComparison.InvariantCultureIgnoreCase));
-            }
-        }
-
-        if (filter.IsPlaceHolder.HasValue)
-        {
-            if (filter.IsPlaceHolder.Value)
-            {
-                baseQuery = baseQuery
-                    .Where(e => e.Data!.Contains("IsPlaceHolder\":true", StringComparison.InvariantCultureIgnoreCase));
-            }
-            else
-            {
-                baseQuery = baseQuery
-                    .Where(e => !e.Data!.Contains("IsPlaceHolder\":true", StringComparison.InvariantCultureIgnoreCase));
-            }
-        }
-
-        if (filter.HasSpecialFeature.HasValue)
-        {
-            if (filter.HasSpecialFeature.Value)
-            {
-                baseQuery = baseQuery
-                    .Where(e => e.ExtraIds != null);
-            }
-            else
-            {
-                baseQuery = baseQuery
-                    .Where(e => e.ExtraIds == null);
-            }
-        }
-
-        if (filter.HasTrailer.HasValue || filter.HasThemeSong.HasValue || filter.HasThemeVideo.HasValue)
-        {
-            if (filter.HasTrailer.GetValueOrDefault() || filter.HasThemeSong.GetValueOrDefault() || filter.HasThemeVideo.GetValueOrDefault())
-            {
-                baseQuery = baseQuery
-                    .Where(e => e.ExtraIds != null);
-            }
-            else
-            {
-                baseQuery = baseQuery
-                    .Where(e => e.ExtraIds == null);
-            }
-        }
-
-        return baseQuery;
-    }
-
-    /// <summary>
-    /// Gets the type.
-    /// </summary>
-    /// <param name="typeName">Name of the type.</param>
-    /// <returns>Type.</returns>
-    /// <exception cref="ArgumentNullException"><c>typeName</c> is null.</exception>
-    private static Type? GetType(string typeName)
-    {
-        ArgumentException.ThrowIfNullOrEmpty(typeName);
-
-        return _typeMap.GetOrAdd(typeName, k => AppDomain.CurrentDomain.GetAssemblies()
-            .Select(a => a.GetType(k))
-            .FirstOrDefault(t => t is not null));
-    }
-
-    /// <inheritdoc cref="IItemRepository" />
-    public void SaveImages(BaseItem item)
-    {
-        ArgumentNullException.ThrowIfNull(item);
-
-        var images = SerializeImages(item.ImageInfos);
-        using var db = _dbProvider.CreateDbContext();
-
-        db.BaseItems
-            .Where(e => e.Id.Equals(item.Id))
-            .ExecuteUpdate(e => e.SetProperty(f => f.Images, images));
-    }
-
-    /// <inheritdoc cref="IItemRepository" />
-    public void SaveItems(IReadOnlyList<BaseItemDto> items, CancellationToken cancellationToken)
-    {
-        UpdateOrInsertItems(items, cancellationToken);
-    }
-
-    /// <inheritdoc cref="IItemRepository" />
-    public void UpdateOrInsertItems(IReadOnlyList<BaseItemDto> items, CancellationToken cancellationToken)
-    {
-        ArgumentNullException.ThrowIfNull(items);
-        cancellationToken.ThrowIfCancellationRequested();
-
-        var itemsLen = items.Count;
-        var tuples = new (BaseItemDto Item, List<Guid>? AncestorIds, BaseItemDto TopParent, string? UserDataKey, List<string> InheritedTags)[itemsLen];
-        for (int i = 0; i < itemsLen; i++)
-        {
-            var item = items[i];
-            var ancestorIds = item.SupportsAncestors ?
-                item.GetAncestorIds().Distinct().ToList() :
-                null;
-
-            var topParent = item.GetTopParent();
-
-            var userdataKey = item.GetUserDataKeys().FirstOrDefault();
-            var inheritedTags = item.GetInheritedTags();
-
-            tuples[i] = (item, ancestorIds, topParent, userdataKey, inheritedTags);
-        }
-
-        using var context = _dbProvider.CreateDbContext();
-        foreach (var item in tuples)
-        {
-            var entity = Map(item.Item);
-            context.BaseItems.Add(entity);
-
-            if (item.Item.SupportsAncestors && item.AncestorIds != null)
-            {
-                foreach (var ancestorId in item.AncestorIds)
-                {
-                    context.AncestorIds.Add(new Data.Entities.AncestorId()
-                    {
-                        Item = entity,
-                        AncestorIdText = ancestorId.ToString(),
-                        Id = ancestorId
-                    });
-                }
-            }
-
-            var itemValues = GetItemValuesToSave(item.Item, item.InheritedTags);
-            context.ItemValues.Where(e => e.ItemId.Equals(entity.Id)).ExecuteDelete();
-            foreach (var itemValue in itemValues)
-            {
-                context.ItemValues.Add(new()
-                {
-                    Item = entity,
-                    Type = itemValue.MagicNumber,
-                    Value = itemValue.Value,
-                    CleanValue = GetCleanValue(itemValue.Value)
-                });
-            }
-        }
-
-        context.SaveChanges(true);
-    }
-
-    /// <inheritdoc cref="IItemRepository" />
-    public BaseItemDto? RetrieveItem(Guid id)
-    {
-        if (id.IsEmpty())
-        {
-            throw new ArgumentException("Guid can't be empty", nameof(id));
-        }
-
-        using var context = _dbProvider.CreateDbContext();
-        var item = context.BaseItems.FirstOrDefault(e => e.Id.Equals(id));
-        if (item is null)
-        {
-            return null;
-        }
-
-        return DeserialiseBaseItem(item);
-    }
-
-    /// <summary>
-    /// Maps a Entity to the DTO.
-    /// </summary>
-    /// <param name="entity">The entity.</param>
-    /// <param name="dto">The dto base instance.</param>
-    /// <returns>The dto to map.</returns>
-    public BaseItemDto Map(BaseItemEntity entity, BaseItemDto dto)
-    {
-        dto.Id = entity.Id;
-        dto.ParentId = entity.ParentId.GetValueOrDefault();
-        dto.Path = entity.Path;
-        dto.EndDate = entity.EndDate;
-        dto.CommunityRating = entity.CommunityRating;
-        dto.CustomRating = entity.CustomRating;
-        dto.IndexNumber = entity.IndexNumber;
-        dto.IsLocked = entity.IsLocked;
-        dto.Name = entity.Name;
-        dto.OfficialRating = entity.OfficialRating;
-        dto.Overview = entity.Overview;
-        dto.ParentIndexNumber = entity.ParentIndexNumber;
-        dto.PremiereDate = entity.PremiereDate;
-        dto.ProductionYear = entity.ProductionYear;
-        dto.SortName = entity.SortName;
-        dto.ForcedSortName = entity.ForcedSortName;
-        dto.RunTimeTicks = entity.RunTimeTicks;
-        dto.PreferredMetadataLanguage = entity.PreferredMetadataLanguage;
-        dto.PreferredMetadataCountryCode = entity.PreferredMetadataCountryCode;
-        dto.IsInMixedFolder = entity.IsInMixedFolder;
-        dto.InheritedParentalRatingValue = entity.InheritedParentalRatingValue;
-        dto.CriticRating = entity.CriticRating;
-        dto.PresentationUniqueKey = entity.PresentationUniqueKey;
-        dto.OriginalTitle = entity.OriginalTitle;
-        dto.Album = entity.Album;
-        dto.LUFS = entity.LUFS;
-        dto.NormalizationGain = entity.NormalizationGain;
-        dto.IsVirtualItem = entity.IsVirtualItem;
-        dto.ExternalSeriesId = entity.ExternalSeriesId;
-        dto.Tagline = entity.Tagline;
-        dto.TotalBitrate = entity.TotalBitrate;
-        dto.ExternalId = entity.ExternalId;
-        dto.Size = entity.Size;
-        dto.Genres = entity.Genres?.Split('|');
-        dto.DateCreated = entity.DateCreated.GetValueOrDefault();
-        dto.DateModified = entity.DateModified.GetValueOrDefault();
-        dto.ChannelId = string.IsNullOrWhiteSpace(entity.ChannelId) ? Guid.Empty : Guid.Parse(entity.ChannelId);
-        dto.DateLastRefreshed = entity.DateLastRefreshed.GetValueOrDefault();
-        dto.DateLastSaved = entity.DateLastSaved.GetValueOrDefault();
-        dto.OwnerId = string.IsNullOrWhiteSpace(entity.OwnerId) ? Guid.Empty : Guid.Parse(entity.OwnerId);
-        dto.Width = entity.Width.GetValueOrDefault();
-        dto.Height = entity.Height.GetValueOrDefault();
-        if (entity.Provider is not null)
-        {
-            dto.ProviderIds = entity.Provider.ToDictionary(e => e.ProviderId, e => e.ProviderValue);
-        }
-
-        if (entity.ExtraType is not null)
-        {
-            dto.ExtraType = Enum.Parse<ExtraType>(entity.ExtraType);
-        }
-
-        if (entity.LockedFields is not null)
-        {
-            List<MetadataField>? fields = null;
-            foreach (var i in entity.LockedFields.AsSpan().Split('|'))
-            {
-                if (Enum.TryParse(i, true, out MetadataField parsedValue))
-                {
-                    (fields ??= new List<MetadataField>()).Add(parsedValue);
-                }
-            }
-
-            dto.LockedFields = fields?.ToArray() ?? Array.Empty<MetadataField>();
-        }
-
-        if (entity.Audio is not null)
-        {
-            dto.Audio = Enum.Parse<ProgramAudio>(entity.Audio);
-        }
-
-        dto.ExtraIds = entity.ExtraIds?.Split('|').Select(e => Guid.Parse(e)).ToArray();
-        dto.ProductionLocations = entity.ProductionLocations?.Split('|');
-        dto.Studios = entity.Studios?.Split('|');
-        dto.Tags = entity.Tags?.Split('|');
-
-        if (dto is IHasProgramAttributes hasProgramAttributes)
-        {
-            hasProgramAttributes.IsMovie = entity.IsMovie;
-            hasProgramAttributes.IsSeries = entity.IsSeries;
-            hasProgramAttributes.EpisodeTitle = entity.EpisodeTitle;
-            hasProgramAttributes.IsRepeat = entity.IsRepeat;
-        }
-
-        if (dto is LiveTvChannel liveTvChannel)
-        {
-            liveTvChannel.ServiceName = entity.ExternalServiceId;
-        }
-
-        if (dto is Trailer trailer)
-        {
-            List<TrailerType>? types = null;
-            foreach (var i in entity.TrailerTypes.AsSpan().Split('|'))
-            {
-                if (Enum.TryParse(i, true, out TrailerType parsedValue))
-                {
-                    (types ??= new List<TrailerType>()).Add(parsedValue);
-                }
-            }
-
-            trailer.TrailerTypes = types?.ToArray() ?? Array.Empty<TrailerType>();
-        }
-
-        if (dto is Video video)
-        {
-            video.PrimaryVersionId = entity.PrimaryVersionId;
-        }
-
-        if (dto is IHasSeries hasSeriesName)
-        {
-            hasSeriesName.SeriesName = entity.SeriesName;
-            hasSeriesName.SeriesId = entity.SeriesId.GetValueOrDefault();
-            hasSeriesName.SeriesPresentationUniqueKey = entity.SeriesPresentationUniqueKey;
-        }
-
-        if (dto is Episode episode)
-        {
-            episode.SeasonName = entity.SeasonName;
-            episode.SeasonId = entity.SeasonId.GetValueOrDefault();
-        }
-
-        if (dto is IHasArtist hasArtists)
-        {
-            hasArtists.Artists = entity.Artists?.Split('|', StringSplitOptions.RemoveEmptyEntries);
-        }
-
-        if (dto is IHasAlbumArtist hasAlbumArtists)
-        {
-            hasAlbumArtists.AlbumArtists = entity.AlbumArtists?.Split('|', StringSplitOptions.RemoveEmptyEntries);
-        }
-
-        if (dto is LiveTvProgram program)
-        {
-            program.ShowId = entity.ShowId;
-        }
-
-        if (entity.Images is not null)
-        {
-            dto.ImageInfos = DeserializeImages(entity.Images);
-        }
-
-        // dto.Type = entity.Type;
-        // dto.Data = entity.Data;
-        // dto.MediaType = entity.MediaType;
-        if (dto is IHasStartDate hasStartDate)
-        {
-            hasStartDate.StartDate = entity.StartDate;
-        }
-
-        // Fields that are present in the DB but are never actually used
-        // dto.UnratedType = entity.UnratedType;
-        // dto.TopParentId = entity.TopParentId;
-        // dto.CleanName = entity.CleanName;
-        // dto.UserDataKey = entity.UserDataKey;
-
-        if (dto is Folder folder)
-        {
-            folder.DateLastMediaAdded = entity.DateLastMediaAdded;
-        }
-
-        return dto;
-    }
-
-    /// <summary>
-    /// Maps a Entity to the DTO.
-    /// </summary>
-    /// <param name="dto">The entity.</param>
-    /// <returns>The dto to map.</returns>
-    public BaseItemEntity Map(BaseItemDto dto)
-    {
-        var entity = new BaseItemEntity()
-        {
-            Type = dto.GetType().ToString(),
-        };
-        entity.Id = dto.Id;
-        entity.ParentId = dto.ParentId;
-        entity.Path = GetPathToSave(dto.Path);
-        entity.EndDate = dto.EndDate.GetValueOrDefault();
-        entity.CommunityRating = dto.CommunityRating;
-        entity.CustomRating = dto.CustomRating;
-        entity.IndexNumber = dto.IndexNumber;
-        entity.IsLocked = dto.IsLocked;
-        entity.Name = dto.Name;
-        entity.OfficialRating = dto.OfficialRating;
-        entity.Overview = dto.Overview;
-        entity.ParentIndexNumber = dto.ParentIndexNumber;
-        entity.PremiereDate = dto.PremiereDate;
-        entity.ProductionYear = dto.ProductionYear;
-        entity.SortName = dto.SortName;
-        entity.ForcedSortName = dto.ForcedSortName;
-        entity.RunTimeTicks = dto.RunTimeTicks;
-        entity.PreferredMetadataLanguage = dto.PreferredMetadataLanguage;
-        entity.PreferredMetadataCountryCode = dto.PreferredMetadataCountryCode;
-        entity.IsInMixedFolder = dto.IsInMixedFolder;
-        entity.InheritedParentalRatingValue = dto.InheritedParentalRatingValue;
-        entity.CriticRating = dto.CriticRating;
-        entity.PresentationUniqueKey = dto.PresentationUniqueKey;
-        entity.OriginalTitle = dto.OriginalTitle;
-        entity.Album = dto.Album;
-        entity.LUFS = dto.LUFS;
-        entity.NormalizationGain = dto.NormalizationGain;
-        entity.IsVirtualItem = dto.IsVirtualItem;
-        entity.ExternalSeriesId = dto.ExternalSeriesId;
-        entity.Tagline = dto.Tagline;
-        entity.TotalBitrate = dto.TotalBitrate;
-        entity.ExternalId = dto.ExternalId;
-        entity.Size = dto.Size;
-        entity.Genres = string.Join('|', dto.Genres);
-        entity.DateCreated = dto.DateCreated;
-        entity.DateModified = dto.DateModified;
-        entity.ChannelId = dto.ChannelId.ToString();
-        entity.DateLastRefreshed = dto.DateLastRefreshed;
-        entity.DateLastSaved = dto.DateLastSaved;
-        entity.OwnerId = dto.OwnerId.ToString();
-        entity.Width = dto.Width;
-        entity.Height = dto.Height;
-        entity.Provider = dto.ProviderIds.Select(e => new Data.Entities.BaseItemProvider()
-        {
-            Item = entity,
-            ProviderId = e.Key,
-            ProviderValue = e.Value
-        }).ToList();
-
-        entity.Audio = dto.Audio?.ToString();
-        entity.ExtraType = dto.ExtraType?.ToString();
-
-        entity.ExtraIds = string.Join('|', dto.ExtraIds);
-        entity.ProductionLocations = string.Join('|', dto.ProductionLocations);
-        entity.Studios = dto.Studios is not null ? string.Join('|', dto.Studios) : null;
-        entity.Tags = dto.Tags is not null ? string.Join('|', dto.Tags) : null;
-        entity.LockedFields = dto.LockedFields is not null ? string.Join('|', dto.LockedFields) : null;
-
-        if (dto is IHasProgramAttributes hasProgramAttributes)
-        {
-            entity.IsMovie = hasProgramAttributes.IsMovie;
-            entity.IsSeries = hasProgramAttributes.IsSeries;
-            entity.EpisodeTitle = hasProgramAttributes.EpisodeTitle;
-            entity.IsRepeat = hasProgramAttributes.IsRepeat;
-        }
-
-        if (dto is LiveTvChannel liveTvChannel)
-        {
-            entity.ExternalServiceId = liveTvChannel.ServiceName;
-        }
-
-        if (dto is Trailer trailer)
-        {
-            entity.LockedFields = trailer.LockedFields is not null ? string.Join('|', trailer.LockedFields) : null;
-        }
-
-        if (dto is Video video)
-        {
-            entity.PrimaryVersionId = video.PrimaryVersionId;
-        }
-
-        if (dto is IHasSeries hasSeriesName)
-        {
-            entity.SeriesName = hasSeriesName.SeriesName;
-            entity.SeriesId = hasSeriesName.SeriesId;
-            entity.SeriesPresentationUniqueKey = hasSeriesName.SeriesPresentationUniqueKey;
-        }
-
-        if (dto is Episode episode)
-        {
-            entity.SeasonName = episode.SeasonName;
-            entity.SeasonId = episode.SeasonId;
-        }
-
-        if (dto is IHasArtist hasArtists)
-        {
-            entity.Artists = hasArtists.Artists is not null ? string.Join('|', hasArtists.Artists) : null;
-        }
-
-        if (dto is IHasAlbumArtist hasAlbumArtists)
-        {
-            entity.AlbumArtists = hasAlbumArtists.AlbumArtists is not null ? string.Join('|', hasAlbumArtists.AlbumArtists) : null;
-        }
-
-        if (dto is LiveTvProgram program)
-        {
-            entity.ShowId = program.ShowId;
-        }
-
-        if (dto.ImageInfos is not null)
-        {
-            entity.Images = SerializeImages(dto.ImageInfos);
-        }
-
-        // dto.Type = entity.Type;
-        // dto.Data = entity.Data;
-        // dto.MediaType = entity.MediaType;
-        if (dto is IHasStartDate hasStartDate)
-        {
-            entity.StartDate = hasStartDate.StartDate;
-        }
-
-        // Fields that are present in the DB but are never actually used
-        // dto.UnratedType = entity.UnratedType;
-        // dto.TopParentId = entity.TopParentId;
-        // dto.CleanName = entity.CleanName;
-        // dto.UserDataKey = entity.UserDataKey;
-
-        if (dto is Folder folder)
-        {
-            entity.DateLastMediaAdded = folder.DateLastMediaAdded;
-            entity.IsFolder = folder.IsFolder;
-        }
-
-        return entity;
-    }
-
-    private IReadOnlyList<string> GetItemValueNames(int[] itemValueTypes, IReadOnlyList<string> withItemTypes, IReadOnlyList<string> excludeItemTypes)
-    {
-        using var context = _dbProvider.CreateDbContext();
-
-        var query = context.ItemValues
-            .Where(e => itemValueTypes.Contains(e.Type));
-        if (withItemTypes.Count > 0)
-        {
-            query = query.Where(e => context.BaseItems.Where(e => withItemTypes.Contains(e.Type)).Any(f => f.ItemValues!.Any(w => w.ItemId.Equals(e.ItemId))));
-        }
-
-        if (excludeItemTypes.Count > 0)
-        {
-            query = query.Where(e => !context.BaseItems.Where(e => withItemTypes.Contains(e.Type)).Any(f => f.ItemValues!.Any(w => w.ItemId.Equals(e.ItemId))));
-        }
-
-        query = query.DistinctBy(e => e.CleanValue);
-        return query.Select(e => e.CleanValue).ToImmutableArray();
-    }
-
-    private BaseItemDto DeserialiseBaseItem(BaseItemEntity baseItemEntity)
-    {
-        var type = GetType(baseItemEntity.Type) ?? throw new InvalidOperationException("Cannot deserialise unkown type.");
-        var dto = Activator.CreateInstance(type) as BaseItemDto ?? throw new InvalidOperationException("Cannot deserialise unkown type.");
-        return Map(baseItemEntity, dto);
-    }
-
-    private static void PrepareFilterQuery(InternalItemsQuery query)
-    {
-        if (query.Limit.HasValue && query.EnableGroupByMetadataKey)
-        {
-            query.Limit = query.Limit.Value + 4;
-        }
-
-        if (query.IsResumable ?? false)
-        {
-            query.IsVirtualItem = false;
-        }
-    }
-
-    private string GetCleanValue(string value)
-    {
-        if (string.IsNullOrWhiteSpace(value))
-        {
-            return value;
-        }
-
-        return value.RemoveDiacritics().ToLowerInvariant();
-    }
-
-    private List<(int MagicNumber, string Value)> GetItemValuesToSave(BaseItem item, List<string> inheritedTags)
-    {
-        var list = new List<(int, string)>();
-
-        if (item is IHasArtist hasArtist)
-        {
-            list.AddRange(hasArtist.Artists.Select(i => (0, i)));
-        }
-
-        if (item is IHasAlbumArtist hasAlbumArtist)
-        {
-            list.AddRange(hasAlbumArtist.AlbumArtists.Select(i => (1, i)));
-        }
-
-        list.AddRange(item.Genres.Select(i => (2, i)));
-        list.AddRange(item.Studios.Select(i => (3, i)));
-        list.AddRange(item.Tags.Select(i => (4, i)));
-
-        // keywords was 5
-
-        list.AddRange(inheritedTags.Select(i => (6, i)));
-
-        // Remove all invalid values.
-        list.RemoveAll(i => string.IsNullOrWhiteSpace(i.Item2));
-
-        return list;
-    }
-
-    internal static string? SerializeProviderIds(Dictionary<string, string> providerIds)
-    {
-        StringBuilder str = new StringBuilder();
-        foreach (var i in providerIds)
-        {
-            // Ideally we shouldn't need this IsNullOrWhiteSpace check,
-            // but we're seeing some cases of bad data slip through
-            if (string.IsNullOrWhiteSpace(i.Value))
-            {
-                continue;
-            }
-
-            str.Append(i.Key)
-                .Append('=')
-                .Append(i.Value)
-                .Append('|');
-        }
-
-        if (str.Length == 0)
-        {
-            return null;
-        }
-
-        str.Length -= 1; // Remove last |
-        return str.ToString();
-    }
-
-    internal static void DeserializeProviderIds(string value, IHasProviderIds item)
-    {
-        if (string.IsNullOrWhiteSpace(value))
-        {
-            return;
-        }
-
-        foreach (var part in value.SpanSplit('|'))
-        {
-            var providerDelimiterIndex = part.IndexOf('=');
-            // Don't let empty values through
-            if (providerDelimiterIndex != -1 && part.Length != providerDelimiterIndex + 1)
-            {
-                item.SetProviderId(part[..providerDelimiterIndex].ToString(), part[(providerDelimiterIndex + 1)..].ToString());
-            }
-        }
-    }
-
-    internal string? SerializeImages(ItemImageInfo[] images)
-    {
-        if (images.Length == 0)
-        {
-            return null;
-        }
-
-        StringBuilder str = new StringBuilder();
-        foreach (var i in images)
-        {
-            if (string.IsNullOrWhiteSpace(i.Path))
-            {
-                continue;
-            }
-
-            AppendItemImageInfo(str, i);
-            str.Append('|');
-        }
-
-        str.Length -= 1; // Remove last |
-        return str.ToString();
-    }
-
-    internal ItemImageInfo[] DeserializeImages(string value)
-    {
-        if (string.IsNullOrWhiteSpace(value))
-        {
-            return Array.Empty<ItemImageInfo>();
-        }
-
-        // TODO The following is an ugly performance optimization, but it's extremely unlikely that the data in the database would be malformed
-        var valueSpan = value.AsSpan();
-        var count = valueSpan.Count('|') + 1;
-
-        var position = 0;
-        var result = new ItemImageInfo[count];
-        foreach (var part in valueSpan.Split('|'))
-        {
-            var image = ItemImageInfoFromValueString(part);
-
-            if (image is not null)
-            {
-                result[position++] = image;
-            }
-        }
-
-        if (position == count)
-        {
-            return result;
-        }
-
-        if (position == 0)
-        {
-            return Array.Empty<ItemImageInfo>();
-        }
-
-        // Extremely unlikely, but somehow one or more of the image strings were malformed. Cut the array.
-        return result[..position];
-    }
-
-    private void AppendItemImageInfo(StringBuilder bldr, ItemImageInfo image)
-    {
-        const char Delimiter = '*';
-
-        var path = image.Path ?? string.Empty;
-
-        bldr.Append(GetPathToSave(path))
-            .Append(Delimiter)
-            .Append(image.DateModified.Ticks)
-            .Append(Delimiter)
-            .Append(image.Type)
-            .Append(Delimiter)
-            .Append(image.Width)
-            .Append(Delimiter)
-            .Append(image.Height);
-
-        var hash = image.BlurHash;
-        if (!string.IsNullOrEmpty(hash))
-        {
-            bldr.Append(Delimiter)
-                // Replace delimiters with other characters.
-                // This can be removed when we migrate to a proper DB.
-                .Append(hash.Replace(Delimiter, '/').Replace('|', '\\'));
-        }
-    }
-
-    private string? GetPathToSave(string path)
-    {
-        if (path is null)
-        {
-            return null;
-        }
-
-        return _appHost.ReverseVirtualPath(path);
-    }
-
-    private string RestorePath(string path)
-    {
-        return _appHost.ExpandVirtualPath(path);
-    }
-
-    internal ItemImageInfo? ItemImageInfoFromValueString(ReadOnlySpan<char> value)
-    {
-        const char Delimiter = '*';
-
-        var nextSegment = value.IndexOf(Delimiter);
-        if (nextSegment == -1)
-        {
-            return null;
-        }
-
-        ReadOnlySpan<char> path = value[..nextSegment];
-        value = value[(nextSegment + 1)..];
-        nextSegment = value.IndexOf(Delimiter);
-        if (nextSegment == -1)
-        {
-            return null;
-        }
-
-        ReadOnlySpan<char> dateModified = value[..nextSegment];
-        value = value[(nextSegment + 1)..];
-        nextSegment = value.IndexOf(Delimiter);
-        if (nextSegment == -1)
-        {
-            nextSegment = value.Length;
-        }
-
-        ReadOnlySpan<char> imageType = value[..nextSegment];
-
-        var image = new ItemImageInfo
-        {
-            Path = RestorePath(path.ToString())
-        };
-
-        if (long.TryParse(dateModified, CultureInfo.InvariantCulture, out var ticks)
-            && ticks >= DateTime.MinValue.Ticks
-            && ticks <= DateTime.MaxValue.Ticks)
-        {
-            image.DateModified = new DateTime(ticks, DateTimeKind.Utc);
-        }
-        else
-        {
-            return null;
-        }
-
-        if (Enum.TryParse(imageType, true, out ImageType type))
-        {
-            image.Type = type;
-        }
-        else
-        {
-            return null;
-        }
-
-        // Optional parameters: width*height*blurhash
-        if (nextSegment + 1 < value.Length - 1)
-        {
-            value = value[(nextSegment + 1)..];
-            nextSegment = value.IndexOf(Delimiter);
-            if (nextSegment == -1 || nextSegment == value.Length)
-            {
-                return image;
-            }
-
-            ReadOnlySpan<char> widthSpan = value[..nextSegment];
-
-            value = value[(nextSegment + 1)..];
-            nextSegment = value.IndexOf(Delimiter);
-            if (nextSegment == -1)
-            {
-                nextSegment = value.Length;
-            }
-
-            ReadOnlySpan<char> heightSpan = value[..nextSegment];
-
-            if (int.TryParse(widthSpan, NumberStyles.Integer, CultureInfo.InvariantCulture, out var width)
-                && int.TryParse(heightSpan, NumberStyles.Integer, CultureInfo.InvariantCulture, out var height))
-            {
-                image.Width = width;
-                image.Height = height;
-            }
-
-            if (nextSegment < value.Length - 1)
-            {
-                value = value[(nextSegment + 1)..];
-                var length = value.Length;
-
-                Span<char> blurHashSpan = stackalloc char[length];
-                for (int i = 0; i < length; i++)
-                {
-                    var c = value[i];
-                    blurHashSpan[i] = c switch
-                    {
-                        '/' => Delimiter,
-                        '\\' => '|',
-                        _ => c
-                    };
-                }
-
-                image.BlurHash = new string(blurHashSpan);
-            }
-        }
-
-        return image;
-    }
-
-    private List<string> GetItemByNameTypesInQuery(InternalItemsQuery query)
-    {
-        var list = new List<string>();
-
-        if (IsTypeInQuery(BaseItemKind.Person, query))
-        {
-            list.Add(typeof(Person).FullName!);
-        }
-
-        if (IsTypeInQuery(BaseItemKind.Genre, query))
-        {
-            list.Add(typeof(Genre).FullName!);
-        }
-
-        if (IsTypeInQuery(BaseItemKind.MusicGenre, query))
-        {
-            list.Add(typeof(MusicGenre).FullName!);
-        }
-
-        if (IsTypeInQuery(BaseItemKind.MusicArtist, query))
-        {
-            list.Add(typeof(MusicArtist).FullName!);
-        }
-
-        if (IsTypeInQuery(BaseItemKind.Studio, query))
-        {
-            list.Add(typeof(Studio).FullName!);
-        }
-
-        return list;
-    }
-
-    private bool IsTypeInQuery(BaseItemKind type, InternalItemsQuery query)
-    {
-        if (query.ExcludeItemTypes.Contains(type))
-        {
-            return false;
-        }
-
-        return query.IncludeItemTypes.Length == 0 || query.IncludeItemTypes.Contains(type);
-    }
-
-    private IQueryable<T> Pageinate<T>(IQueryable<T> query, InternalItemsQuery filter)
-    {
-        if (filter.Limit.HasValue || filter.StartIndex.HasValue)
-        {
-            var offset = filter.StartIndex ?? 0;
-
-            if (offset > 0)
-            {
-                query = query.Skip(offset);
-            }
-
-            if (filter.Limit.HasValue)
-            {
-                query = query.Take(filter.Limit.Value);
-            }
-        }
-
-        return query;
-    }
-
-    private Expression<Func<BaseItemEntity, object>> MapOrderByField(ItemSortBy sortBy, InternalItemsQuery query)
-    {
-#pragma warning disable CS8603 // Possible null reference return.
-        return sortBy switch
-        {
-            ItemSortBy.AirTime => e => e.SortName, // TODO
-            ItemSortBy.Runtime => e => e.RunTimeTicks,
-            ItemSortBy.Random => e => EF.Functions.Random(),
-            ItemSortBy.DatePlayed => e => e.UserData!.FirstOrDefault(f => f.UserId.Equals(query.User!.Id) && f.Key == e.UserDataKey)!.LastPlayedDate,
-            ItemSortBy.PlayCount => e => e.UserData!.FirstOrDefault(f => f.UserId.Equals(query.User!.Id) && f.Key == e.UserDataKey)!.PlayCount,
-            ItemSortBy.IsFavoriteOrLiked => e => e.UserData!.FirstOrDefault(f => f.UserId.Equals(query.User!.Id) && f.Key == e.UserDataKey)!.IsFavorite,
-            ItemSortBy.IsFolder => e => e.IsFolder,
-            ItemSortBy.IsPlayed => e => e.UserData!.FirstOrDefault(f => f.UserId.Equals(query.User!.Id) && f.Key == e.UserDataKey)!.Played,
-            ItemSortBy.IsUnplayed => e => !e.UserData!.FirstOrDefault(f => f.UserId.Equals(query.User!.Id) && f.Key == e.UserDataKey)!.Played,
-            ItemSortBy.DateLastContentAdded => e => e.DateLastMediaAdded,
-            ItemSortBy.Artist => e => e.ItemValues!.Where(f => f.Type == 0).Select(f => f.CleanValue),
-            ItemSortBy.AlbumArtist => e => e.ItemValues!.Where(f => f.Type == 1).Select(f => f.CleanValue),
-            ItemSortBy.Studio => e => e.ItemValues!.Where(f => f.Type == 3).Select(f => f.CleanValue),
-            ItemSortBy.OfficialRating => e => e.InheritedParentalRatingValue,
-            // ItemSortBy.SeriesDatePlayed => "(Select MAX(LastPlayedDate) from TypedBaseItems B" + GetJoinUserDataText(query) + " where Played=1 and B.SeriesPresentationUniqueKey=A.PresentationUniqueKey)",
-            ItemSortBy.SeriesSortName => e => e.SeriesName,
-            // ItemSortBy.AiredEpisodeOrder => "AiredEpisodeOrder",
-            ItemSortBy.Album => e => e.Album,
-            ItemSortBy.DateCreated => e => e.DateCreated,
-            ItemSortBy.PremiereDate => e => e.PremiereDate,
-            ItemSortBy.StartDate => e => e.StartDate,
-            ItemSortBy.Name => e => e.Name,
-            ItemSortBy.CommunityRating => e => e.CommunityRating,
-            ItemSortBy.ProductionYear => e => e.ProductionYear,
-            ItemSortBy.CriticRating => e => e.CriticRating,
-            ItemSortBy.VideoBitRate => e => e.TotalBitrate,
-            ItemSortBy.ParentIndexNumber => e => e.ParentIndexNumber,
-            ItemSortBy.IndexNumber => e => e.IndexNumber,
-            _ => e => e.SortName
-        };
-#pragma warning restore CS8603 // Possible null reference return.
-
-    }
-
-    private bool EnableGroupByPresentationUniqueKey(InternalItemsQuery query)
-    {
-        if (!query.GroupByPresentationUniqueKey)
-        {
-            return false;
-        }
-
-        if (query.GroupBySeriesPresentationUniqueKey)
-        {
-            return false;
-        }
-
-        if (!string.IsNullOrWhiteSpace(query.PresentationUniqueKey))
-        {
-            return false;
-        }
-
-        if (query.User is null)
-        {
-            return false;
-        }
-
-        if (query.IncludeItemTypes.Length == 0)
-        {
-            return true;
-        }
-
-        return query.IncludeItemTypes.Contains(BaseItemKind.Episode)
-            || query.IncludeItemTypes.Contains(BaseItemKind.Video)
-            || query.IncludeItemTypes.Contains(BaseItemKind.Movie)
-            || query.IncludeItemTypes.Contains(BaseItemKind.MusicVideo)
-            || query.IncludeItemTypes.Contains(BaseItemKind.Series)
-            || query.IncludeItemTypes.Contains(BaseItemKind.Season);
-    }
-
-    private IQueryable<BaseItemEntity> ApplyOrder(IQueryable<BaseItemEntity> query, InternalItemsQuery filter)
-    {
-        var orderBy = filter.OrderBy;
-        bool hasSearch = !string.IsNullOrEmpty(filter.SearchTerm);
-
-        if (hasSearch)
-        {
-            List<(ItemSortBy, SortOrder)> prepend = new List<(ItemSortBy, SortOrder)>(4);
-            if (hasSearch)
-            {
-                prepend.Add((ItemSortBy.SortName, SortOrder.Ascending));
-            }
-
-            orderBy = filter.OrderBy = [.. prepend, .. orderBy];
-        }
-        else if (orderBy.Count == 0)
-        {
-            return query;
-        }
-
-        foreach (var item in orderBy)
-        {
-            var expression = MapOrderByField(item.OrderBy, filter);
-            if (item.SortOrder == SortOrder.Ascending)
-            {
-                query = query.OrderBy(expression);
-            }
-            else
-            {
-                query = query.OrderByDescending(expression);
-            }
-        }
-
-        return query;
-    }
-}
diff --git a/Jellyfin.Server.Implementations/Item/BaseItemRepository.cs b/Jellyfin.Server.Implementations/Item/BaseItemRepository.cs
new file mode 100644
index 000000000..a3e617a21
--- /dev/null
+++ b/Jellyfin.Server.Implementations/Item/BaseItemRepository.cs
@@ -0,0 +1,2233 @@
+using System;
+using System.Collections.Concurrent;
+using System.Collections.Generic;
+using System.Collections.Immutable;
+using System.Globalization;
+using System.Linq;
+using System.Linq.Expressions;
+using System.Security.Cryptography.X509Certificates;
+using System.Text;
+using System.Threading;
+using System.Threading.Channels;
+using Jellyfin.Data.Enums;
+using Jellyfin.Extensions;
+using MediaBrowser.Controller;
+using MediaBrowser.Controller.Entities;
+using MediaBrowser.Controller.Entities.Audio;
+using MediaBrowser.Controller.Entities.Movies;
+using MediaBrowser.Controller.Entities.TV;
+using MediaBrowser.Controller.LiveTv;
+using MediaBrowser.Controller.Persistence;
+using MediaBrowser.Controller.Playlists;
+using MediaBrowser.Model.Dto;
+using MediaBrowser.Model.Entities;
+using MediaBrowser.Model.LiveTv;
+using MediaBrowser.Model.Querying;
+using Microsoft.EntityFrameworkCore;
+using BaseItemDto = MediaBrowser.Controller.Entities.BaseItem;
+using BaseItemEntity = Jellyfin.Data.Entities.BaseItemEntity;
+
+namespace Jellyfin.Server.Implementations.Item;
+
+/// <summary>
+/// Handles all storage logic for BaseItems.
+/// </summary>
+/// <remarks>
+/// Initializes a new instance of the <see cref="BaseItemRepository"/> class.
+/// </remarks>
+/// <param name="dbProvider">The db factory.</param>
+/// <param name="appHost">The Application host.</param>
+/// <param name="itemTypeLookup">The static type lookup.</param>
+public sealed class BaseItemRepository(IDbContextFactory<JellyfinDbContext> dbProvider, IServerApplicationHost appHost, IItemTypeLookup itemTypeLookup)
+    : IItemRepository, IDisposable
+{
+    /// <summary>
+    /// This holds all the types in the running assemblies
+    /// so that we can de-serialize properly when we don't have strong types.
+    /// </summary>
+    private static readonly ConcurrentDictionary<string, Type?> _typeMap = new ConcurrentDictionary<string, Type?>();
+    private bool _disposed;
+
+    /// <inheritdoc/>
+    public void Dispose()
+    {
+        if (_disposed)
+        {
+            return;
+        }
+
+        _disposed = true;
+    }
+
+    /// <inheritdoc />
+    public void DeleteItem(Guid id)
+    {
+        ArgumentNullException.ThrowIfNull(id.IsEmpty() ? null : id);
+
+        using var context = dbProvider.CreateDbContext();
+        using var transaction = context.Database.BeginTransaction();
+        context.Peoples.Where(e => e.ItemId.Equals(id)).ExecuteDelete();
+        context.Chapters.Where(e => e.ItemId.Equals(id)).ExecuteDelete();
+        context.MediaStreamInfos.Where(e => e.ItemId.Equals(id)).ExecuteDelete();
+        context.AncestorIds.Where(e => e.ItemId.Equals(id)).ExecuteDelete();
+        context.ItemValues.Where(e => e.ItemId.Equals(id)).ExecuteDelete();
+        context.BaseItems.Where(e => e.Id.Equals(id)).ExecuteDelete();
+        context.SaveChanges();
+        transaction.Commit();
+    }
+
+    /// <inheritdoc />
+    public void UpdateInheritedValues()
+    {
+        using var context = dbProvider.CreateDbContext();
+        using var transaction = context.Database.BeginTransaction();
+
+        context.ItemValues.Where(e => e.Type == 6).ExecuteDelete();
+        context.ItemValues.AddRange(context.ItemValues.Where(e => e.Type == 4).Select(e => new Data.Entities.ItemValue()
+        {
+            CleanValue = e.CleanValue,
+            ItemId = e.ItemId,
+            Type = 6,
+            Value = e.Value,
+            Item = null!
+        }));
+
+        context.ItemValues.AddRange(
+            context.AncestorIds.Where(e => e.AncestorIdText != null).Join(context.ItemValues.Where(e => e.Value != null && e.Type == 4), e => e.Id, e => e.ItemId, (e, f) => new Data.Entities.ItemValue()
+            {
+                CleanValue = f.CleanValue,
+                ItemId = e.ItemId,
+                Item = null!,
+                Type = 6,
+                Value = f.Value
+            }));
+        context.SaveChanges();
+
+        transaction.Commit();
+    }
+
+    /// <inheritdoc cref="IItemRepository"/>
+    public IReadOnlyList<Guid> GetItemIdsList(InternalItemsQuery filter)
+    {
+        ArgumentNullException.ThrowIfNull(filter);
+        PrepareFilterQuery(filter);
+
+        using var context = dbProvider.CreateDbContext();
+        var dbQuery = TranslateQuery(context.BaseItems.AsNoTracking(), context, filter)
+            .DistinctBy(e => e.Id);
+
+        var enableGroupByPresentationUniqueKey = EnableGroupByPresentationUniqueKey(filter);
+        if (enableGroupByPresentationUniqueKey && filter.GroupBySeriesPresentationUniqueKey)
+        {
+            dbQuery = dbQuery.GroupBy(e => new { e.PresentationUniqueKey, e.SeriesPresentationUniqueKey }).SelectMany(e => e);
+        }
+
+        if (enableGroupByPresentationUniqueKey)
+        {
+            dbQuery = dbQuery.GroupBy(e => e.PresentationUniqueKey).SelectMany(e => e);
+        }
+
+        if (filter.GroupBySeriesPresentationUniqueKey)
+        {
+            dbQuery = dbQuery.GroupBy(e => e.SeriesPresentationUniqueKey).SelectMany(e => e);
+        }
+
+        dbQuery = ApplyOrder(dbQuery, filter);
+
+        return Pageinate(dbQuery, filter).Select(e => e.Id).ToImmutableArray();
+    }
+
+    /// <inheritdoc />
+    public QueryResult<(BaseItem Item, ItemCounts ItemCounts)> GetAllArtists(InternalItemsQuery filter)
+    {
+        return GetItemValues(filter, [0, 1], typeof(MusicArtist).FullName!);
+    }
+
+    /// <inheritdoc />
+    public QueryResult<(BaseItem Item, ItemCounts ItemCounts)> GetArtists(InternalItemsQuery filter)
+    {
+        return GetItemValues(filter, [0], typeof(MusicArtist).FullName!);
+    }
+
+    /// <inheritdoc />
+    public QueryResult<(BaseItem Item, ItemCounts ItemCounts)> GetAlbumArtists(InternalItemsQuery filter)
+    {
+        return GetItemValues(filter, [1], typeof(MusicArtist).FullName!);
+    }
+
+    /// <inheritdoc />
+    public QueryResult<(BaseItem Item, ItemCounts ItemCounts)> GetStudios(InternalItemsQuery filter)
+    {
+        return GetItemValues(filter, [3], typeof(Studio).FullName!);
+    }
+
+    /// <inheritdoc />
+    public QueryResult<(BaseItem Item, ItemCounts ItemCounts)> GetGenres(InternalItemsQuery filter)
+    {
+        return GetItemValues(filter, [2], typeof(Genre).FullName!);
+    }
+
+    /// <inheritdoc />
+    public QueryResult<(BaseItem Item, ItemCounts ItemCounts)> GetMusicGenres(InternalItemsQuery filter)
+    {
+        return GetItemValues(filter, [2], typeof(MusicGenre).FullName!);
+    }
+
+    /// <inheritdoc />
+    public IReadOnlyList<string> GetStudioNames()
+    {
+        return GetItemValueNames([3], Array.Empty<string>(), Array.Empty<string>());
+    }
+
+    /// <inheritdoc />
+    public IReadOnlyList<string> GetAllArtistNames()
+    {
+        return GetItemValueNames([0, 1], Array.Empty<string>(), Array.Empty<string>());
+    }
+
+    /// <inheritdoc />
+    public IReadOnlyList<string> GetMusicGenreNames()
+    {
+        return GetItemValueNames(
+            [2],
+            new string[]
+            {
+                    typeof(Audio).FullName!,
+                    typeof(MusicVideo).FullName!,
+                    typeof(MusicAlbum).FullName!,
+                    typeof(MusicArtist).FullName!
+            },
+            Array.Empty<string>());
+    }
+
+    /// <inheritdoc />
+    public IReadOnlyList<string> GetGenreNames()
+    {
+        return GetItemValueNames(
+            [2],
+            Array.Empty<string>(),
+            new string[]
+            {
+                    typeof(Audio).FullName!,
+                    typeof(MusicVideo).FullName!,
+                    typeof(MusicAlbum).FullName!,
+                    typeof(MusicArtist).FullName!
+            });
+    }
+
+    /// <inheritdoc cref="IItemRepository"/>
+    public QueryResult<BaseItemDto> GetItems(InternalItemsQuery filter)
+    {
+        ArgumentNullException.ThrowIfNull(filter);
+        if (!filter.EnableTotalRecordCount || (!filter.Limit.HasValue && (filter.StartIndex ?? 0) == 0))
+        {
+            var returnList = GetItemList(filter);
+            return new QueryResult<BaseItemDto>(
+                filter.StartIndex,
+                returnList.Count,
+                returnList);
+        }
+
+        PrepareFilterQuery(filter);
+        var result = new QueryResult<BaseItemDto>();
+
+        using var context = dbProvider.CreateDbContext();
+        var dbQuery = TranslateQuery(context.BaseItems, context, filter)
+            .DistinctBy(e => e.Id);
+        if (filter.EnableTotalRecordCount)
+        {
+            result.TotalRecordCount = dbQuery.Count();
+        }
+
+        if (filter.Limit.HasValue || filter.StartIndex.HasValue)
+        {
+            var offset = filter.StartIndex ?? 0;
+
+            if (offset > 0)
+            {
+                dbQuery = dbQuery.Skip(offset);
+            }
+
+            if (filter.Limit.HasValue)
+            {
+                dbQuery = dbQuery.Take(filter.Limit.Value);
+            }
+        }
+
+        result.Items = dbQuery.ToList().Select(DeserialiseBaseItem).ToImmutableArray();
+        result.StartIndex = filter.StartIndex ?? 0;
+        return result;
+    }
+
+    /// <inheritdoc cref="IItemRepository"/>
+    public IReadOnlyList<BaseItemDto> GetItemList(InternalItemsQuery filter)
+    {
+        ArgumentNullException.ThrowIfNull(filter);
+        PrepareFilterQuery(filter);
+
+        using var context = dbProvider.CreateDbContext();
+        var dbQuery = TranslateQuery(context.BaseItems, context, filter)
+            .DistinctBy(e => e.Id);
+        if (filter.Limit.HasValue || filter.StartIndex.HasValue)
+        {
+            var offset = filter.StartIndex ?? 0;
+
+            if (offset > 0)
+            {
+                dbQuery = dbQuery.Skip(offset);
+            }
+
+            if (filter.Limit.HasValue)
+            {
+                dbQuery = dbQuery.Take(filter.Limit.Value);
+            }
+        }
+
+        return dbQuery.ToList().Select(DeserialiseBaseItem).ToImmutableArray();
+    }
+
+    /// <inheritdoc/>
+    public int GetCount(InternalItemsQuery filter)
+    {
+        ArgumentNullException.ThrowIfNull(filter);
+        // Hack for right now since we currently don't support filtering out these duplicates within a query
+        PrepareFilterQuery(filter);
+
+        using var context = dbProvider.CreateDbContext();
+        var dbQuery = TranslateQuery(context.BaseItems, context, filter);
+
+        return dbQuery.Count();
+    }
+
+    private IQueryable<BaseItemEntity> TranslateQuery(
+        IQueryable<BaseItemEntity> baseQuery,
+        JellyfinDbContext context,
+        InternalItemsQuery filter)
+    {
+        var minWidth = filter.MinWidth;
+        var maxWidth = filter.MaxWidth;
+        var now = DateTime.UtcNow;
+
+        if (filter.IsHD.HasValue)
+        {
+            const int Threshold = 1200;
+            if (filter.IsHD.Value)
+            {
+                minWidth = Threshold;
+            }
+            else
+            {
+                maxWidth = Threshold - 1;
+            }
+        }
+
+        if (filter.Is4K.HasValue)
+        {
+            const int Threshold = 3800;
+            if (filter.Is4K.Value)
+            {
+                minWidth = Threshold;
+            }
+            else
+            {
+                maxWidth = Threshold - 1;
+            }
+        }
+
+        if (minWidth.HasValue)
+        {
+            baseQuery = baseQuery.Where(e => e.Width >= minWidth);
+        }
+
+        if (filter.MinHeight.HasValue)
+        {
+            baseQuery = baseQuery.Where(e => e.Height >= filter.MinHeight);
+        }
+
+        if (maxWidth.HasValue)
+        {
+            baseQuery = baseQuery.Where(e => e.Width >= maxWidth);
+        }
+
+        if (filter.MaxHeight.HasValue)
+        {
+            baseQuery = baseQuery.Where(e => e.Height <= filter.MaxHeight);
+        }
+
+        if (filter.IsLocked.HasValue)
+        {
+            baseQuery = baseQuery.Where(e => e.IsLocked == filter.IsLocked);
+        }
+
+        var tags = filter.Tags.ToList();
+        var excludeTags = filter.ExcludeTags.ToList();
+
+        if (filter.IsMovie == true)
+        {
+            if (filter.IncludeItemTypes.Length == 0
+                || filter.IncludeItemTypes.Contains(BaseItemKind.Movie)
+                || filter.IncludeItemTypes.Contains(BaseItemKind.Trailer))
+            {
+                baseQuery = baseQuery.Where(e => e.IsMovie);
+            }
+        }
+        else if (filter.IsMovie.HasValue)
+        {
+            baseQuery = baseQuery.Where(e => e.IsMovie == filter.IsMovie);
+        }
+
+        if (filter.IsSeries.HasValue)
+        {
+            baseQuery = baseQuery.Where(e => e.IsSeries == filter.IsSeries);
+        }
+
+        if (filter.IsSports.HasValue)
+        {
+            if (filter.IsSports.Value)
+            {
+                tags.Add("Sports");
+            }
+            else
+            {
+                excludeTags.Add("Sports");
+            }
+        }
+
+        if (filter.IsNews.HasValue)
+        {
+            if (filter.IsNews.Value)
+            {
+                tags.Add("News");
+            }
+            else
+            {
+                excludeTags.Add("News");
+            }
+        }
+
+        if (filter.IsKids.HasValue)
+        {
+            if (filter.IsKids.Value)
+            {
+                tags.Add("Kids");
+            }
+            else
+            {
+                excludeTags.Add("Kids");
+            }
+        }
+
+        if (!string.IsNullOrEmpty(filter.SearchTerm))
+        {
+            baseQuery = baseQuery.Where(e => e.CleanName!.Contains(filter.SearchTerm, StringComparison.InvariantCultureIgnoreCase) || (e.OriginalTitle != null && e.OriginalTitle.Contains(filter.SearchTerm, StringComparison.InvariantCultureIgnoreCase)));
+        }
+
+        if (filter.IsFolder.HasValue)
+        {
+            baseQuery = baseQuery.Where(e => e.IsFolder == filter.IsFolder);
+        }
+
+        var includeTypes = filter.IncludeItemTypes;
+        // Only specify excluded types if no included types are specified
+        if (filter.IncludeItemTypes.Length == 0)
+        {
+            var excludeTypes = filter.ExcludeItemTypes;
+            if (excludeTypes.Length == 1)
+            {
+                if (itemTypeLookup.BaseItemKindNames.TryGetValue(excludeTypes[0], out var excludeTypeName))
+                {
+                    baseQuery = baseQuery.Where(e => e.Type != excludeTypeName);
+                }
+            }
+            else if (excludeTypes.Length > 1)
+            {
+                var excludeTypeName = new List<string>();
+                foreach (var excludeType in excludeTypes)
+                {
+                    if (itemTypeLookup.BaseItemKindNames.TryGetValue(excludeType, out var baseItemKindName))
+                    {
+                        excludeTypeName.Add(baseItemKindName!);
+                    }
+                }
+
+                baseQuery = baseQuery.Where(e => !excludeTypeName.Contains(e.Type));
+            }
+        }
+        else if (includeTypes.Length == 1)
+        {
+            if (itemTypeLookup.BaseItemKindNames.TryGetValue(includeTypes[0], out var includeTypeName))
+            {
+                baseQuery = baseQuery.Where(e => e.Type == includeTypeName);
+            }
+        }
+        else if (includeTypes.Length > 1)
+        {
+            var includeTypeName = new List<string>();
+            foreach (var includeType in includeTypes)
+            {
+                if (itemTypeLookup.BaseItemKindNames.TryGetValue(includeType, out var baseItemKindName))
+                {
+                    includeTypeName.Add(baseItemKindName!);
+                }
+            }
+
+            baseQuery = baseQuery.Where(e => includeTypeName.Contains(e.Type));
+        }
+
+        if (filter.ChannelIds.Count == 1)
+        {
+            baseQuery = baseQuery.Where(e => e.ChannelId == filter.ChannelIds[0].ToString("N", CultureInfo.InvariantCulture));
+        }
+        else if (filter.ChannelIds.Count > 1)
+        {
+            baseQuery = baseQuery.Where(e => filter.ChannelIds.Select(f => f.ToString("N", CultureInfo.InvariantCulture)).Contains(e.ChannelId));
+        }
+
+        if (!filter.ParentId.IsEmpty())
+        {
+            baseQuery = baseQuery.Where(e => e.ParentId.Equals(filter.ParentId));
+        }
+
+        if (!string.IsNullOrWhiteSpace(filter.Path))
+        {
+            baseQuery = baseQuery.Where(e => e.Path == filter.Path);
+        }
+
+        if (!string.IsNullOrWhiteSpace(filter.PresentationUniqueKey))
+        {
+            baseQuery = baseQuery.Where(e => e.PresentationUniqueKey == filter.PresentationUniqueKey);
+        }
+
+        if (filter.MinCommunityRating.HasValue)
+        {
+            baseQuery = baseQuery.Where(e => e.CommunityRating >= filter.MinCommunityRating);
+        }
+
+        if (filter.MinIndexNumber.HasValue)
+        {
+            baseQuery = baseQuery.Where(e => e.IndexNumber >= filter.MinIndexNumber);
+        }
+
+        if (filter.MinParentAndIndexNumber.HasValue)
+        {
+            baseQuery = baseQuery
+                .Where(e => (e.ParentIndexNumber == filter.MinParentAndIndexNumber.Value.ParentIndexNumber && e.IndexNumber >= filter.MinParentAndIndexNumber.Value.IndexNumber) || e.ParentIndexNumber > filter.MinParentAndIndexNumber.Value.ParentIndexNumber);
+        }
+
+        if (filter.MinDateCreated.HasValue)
+        {
+            baseQuery = baseQuery.Where(e => e.DateCreated >= filter.MinDateCreated);
+        }
+
+        if (filter.MinDateLastSaved.HasValue)
+        {
+            baseQuery = baseQuery.Where(e => e.DateLastSaved != null && e.DateLastSaved >= filter.MinDateLastSaved.Value);
+        }
+
+        if (filter.MinDateLastSavedForUser.HasValue)
+        {
+            baseQuery = baseQuery.Where(e => e.DateLastSaved != null && e.DateLastSaved >= filter.MinDateLastSavedForUser.Value);
+        }
+
+        if (filter.IndexNumber.HasValue)
+        {
+            baseQuery = baseQuery.Where(e => e.IndexNumber == filter.IndexNumber.Value);
+        }
+
+        if (filter.ParentIndexNumber.HasValue)
+        {
+            baseQuery = baseQuery.Where(e => e.ParentIndexNumber == filter.ParentIndexNumber.Value);
+        }
+
+        if (filter.ParentIndexNumberNotEquals.HasValue)
+        {
+            baseQuery = baseQuery.Where(e => e.ParentIndexNumber != filter.ParentIndexNumberNotEquals.Value || e.ParentIndexNumber == null);
+        }
+
+        var minEndDate = filter.MinEndDate;
+        var maxEndDate = filter.MaxEndDate;
+
+        if (filter.HasAired.HasValue)
+        {
+            if (filter.HasAired.Value)
+            {
+                maxEndDate = DateTime.UtcNow;
+            }
+            else
+            {
+                minEndDate = DateTime.UtcNow;
+            }
+        }
+
+        if (minEndDate.HasValue)
+        {
+            baseQuery = baseQuery.Where(e => e.EndDate >= minEndDate);
+        }
+
+        if (maxEndDate.HasValue)
+        {
+            baseQuery = baseQuery.Where(e => e.EndDate <= maxEndDate);
+        }
+
+        if (filter.MinStartDate.HasValue)
+        {
+            baseQuery = baseQuery.Where(e => e.StartDate >= filter.MinStartDate.Value);
+        }
+
+        if (filter.MaxStartDate.HasValue)
+        {
+            baseQuery = baseQuery.Where(e => e.StartDate <= filter.MaxStartDate.Value);
+        }
+
+        if (filter.MinPremiereDate.HasValue)
+        {
+            baseQuery = baseQuery.Where(e => e.PremiereDate <= filter.MinPremiereDate.Value);
+        }
+
+        if (filter.MaxPremiereDate.HasValue)
+        {
+            baseQuery = baseQuery.Where(e => e.PremiereDate <= filter.MaxPremiereDate.Value);
+        }
+
+        if (filter.TrailerTypes.Length > 0)
+        {
+            baseQuery = baseQuery.Where(e => filter.TrailerTypes.Any(f => e.TrailerTypes!.Contains(f.ToString(), StringComparison.OrdinalIgnoreCase)));
+        }
+
+        if (filter.IsAiring.HasValue)
+        {
+            if (filter.IsAiring.Value)
+            {
+                baseQuery = baseQuery.Where(e => e.StartDate <= now && e.EndDate >= now);
+            }
+            else
+            {
+                baseQuery = baseQuery.Where(e => e.StartDate > now && e.EndDate < now);
+            }
+        }
+
+        if (filter.PersonIds.Length > 0)
+        {
+            baseQuery = baseQuery
+                .Where(e =>
+                    context.Peoples.Where(w => context.BaseItems.Where(w => filter.PersonIds.Contains(w.Id)).Any(f => f.Name == w.Name))
+                        .Any(f => f.ItemId.Equals(e.Id)));
+        }
+
+        if (!string.IsNullOrWhiteSpace(filter.Person))
+        {
+            baseQuery = baseQuery.Where(e => e.Peoples!.Any(f => f.Name == filter.Person));
+        }
+
+        if (!string.IsNullOrWhiteSpace(filter.MinSortName))
+        {
+            // this does not makes sense.
+            // baseQuery = baseQuery.Where(e => e.SortName >= query.MinSortName);
+            // whereClauses.Add("SortName>=@MinSortName");
+            // statement?.TryBind("@MinSortName", query.MinSortName);
+        }
+
+        if (!string.IsNullOrWhiteSpace(filter.ExternalSeriesId))
+        {
+            baseQuery = baseQuery.Where(e => e.ExternalSeriesId == filter.ExternalSeriesId);
+        }
+
+        if (!string.IsNullOrWhiteSpace(filter.ExternalId))
+        {
+            baseQuery = baseQuery.Where(e => e.ExternalId == filter.ExternalId);
+        }
+
+        if (!string.IsNullOrWhiteSpace(filter.Name))
+        {
+            var cleanName = GetCleanValue(filter.Name);
+            baseQuery = baseQuery.Where(e => e.CleanName == cleanName);
+        }
+
+        // These are the same, for now
+        var nameContains = filter.NameContains;
+        if (!string.IsNullOrWhiteSpace(nameContains))
+        {
+            baseQuery = baseQuery.Where(e =>
+                e.CleanName == filter.NameContains
+                || e.OriginalTitle!.Contains(filter.NameContains!, StringComparison.Ordinal));
+        }
+
+        if (!string.IsNullOrWhiteSpace(filter.NameStartsWith))
+        {
+            baseQuery = baseQuery.Where(e => e.SortName!.Contains(filter.NameStartsWith, StringComparison.OrdinalIgnoreCase));
+        }
+
+        if (!string.IsNullOrWhiteSpace(filter.NameStartsWithOrGreater))
+        {
+            // i hate this
+            baseQuery = baseQuery.Where(e => e.SortName![0] > filter.NameStartsWithOrGreater[0]);
+        }
+
+        if (!string.IsNullOrWhiteSpace(filter.NameLessThan))
+        {
+            // i hate this
+            baseQuery = baseQuery.Where(e => e.SortName![0] < filter.NameLessThan[0]);
+        }
+
+        if (filter.ImageTypes.Length > 0)
+        {
+            baseQuery = baseQuery.Where(e => filter.ImageTypes.Any(f => e.Images!.Contains(f.ToString(), StringComparison.InvariantCulture)));
+        }
+
+        if (filter.IsLiked.HasValue)
+        {
+            baseQuery = baseQuery
+                .Where(e => e.UserData!.FirstOrDefault(f => f.UserId.Equals(filter.User!.Id) && f.Key == e.UserDataKey)!.Rating >= UserItemData.MinLikeValue);
+        }
+
+        if (filter.IsFavoriteOrLiked.HasValue)
+        {
+            baseQuery = baseQuery
+                .Where(e => e.UserData!.FirstOrDefault(f => f.UserId.Equals(filter.User!.Id) && f.Key == e.UserDataKey)!.IsFavorite == filter.IsFavoriteOrLiked);
+        }
+
+        if (filter.IsFavorite.HasValue)
+        {
+            baseQuery = baseQuery
+                .Where(e => e.UserData!.FirstOrDefault(f => f.UserId.Equals(filter.User!.Id) && f.Key == e.UserDataKey)!.IsFavorite == filter.IsFavorite);
+        }
+
+        if (filter.IsPlayed.HasValue)
+        {
+            baseQuery = baseQuery
+                   .Where(e => e.UserData!.FirstOrDefault(f => f.UserId.Equals(filter.User!.Id) && f.Key == e.UserDataKey)!.Played == filter.IsPlayed.Value);
+        }
+
+        if (filter.IsResumable.HasValue)
+        {
+            if (filter.IsResumable.Value)
+            {
+                baseQuery = baseQuery
+                       .Where(e => e.UserData!.FirstOrDefault(f => f.UserId.Equals(filter.User!.Id) && f.Key == e.UserDataKey)!.PlaybackPositionTicks > 0);
+            }
+            else
+            {
+                baseQuery = baseQuery
+                       .Where(e => e.UserData!.FirstOrDefault(f => f.UserId.Equals(filter.User!.Id) && f.Key == e.UserDataKey)!.PlaybackPositionTicks == 0);
+            }
+        }
+
+        var artistQuery = context.BaseItems.Where(w => filter.ArtistIds.Contains(w.Id));
+
+        if (filter.ArtistIds.Length > 0)
+        {
+            baseQuery = baseQuery
+                   .Where(e => e.ItemValues!.Any(f => f.Type <= 1 && artistQuery.Any(w => w.CleanName == f.CleanValue)));
+        }
+
+        if (filter.AlbumArtistIds.Length > 0)
+        {
+            baseQuery = baseQuery
+               .Where(e => e.ItemValues!.Any(f => f.Type == 1 && artistQuery.Any(w => w.CleanName == f.CleanValue)));
+        }
+
+        if (filter.ContributingArtistIds.Length > 0)
+        {
+            var contributingArtists = context.BaseItems.Where(e => filter.ContributingArtistIds.Contains(e.Id));
+            baseQuery = baseQuery.Where(e => e.ItemValues!.Any(f => f.Type == 0 && contributingArtists.Any(w => w.CleanName == f.CleanValue)));
+        }
+
+        if (filter.AlbumIds.Length > 0)
+        {
+            baseQuery = baseQuery.Where(e => context.BaseItems.Where(e => filter.AlbumIds.Contains(e.Id)).Any(f => f.Name == e.Album));
+        }
+
+        if (filter.ExcludeArtistIds.Length > 0)
+        {
+            var excludeArtistQuery = context.BaseItems.Where(w => filter.ExcludeArtistIds.Contains(w.Id));
+            baseQuery = baseQuery
+                   .Where(e => !e.ItemValues!.Any(f => f.Type <= 1 && artistQuery.Any(w => w.CleanName == f.CleanValue)));
+        }
+
+        if (filter.GenreIds.Count > 0)
+        {
+            baseQuery = baseQuery
+                   .Where(e => e.ItemValues!.Any(f => f.Type == 2 && context.BaseItems.Where(w => filter.GenreIds.Contains(w.Id)).Any(w => w.CleanName == f.CleanValue)));
+        }
+
+        if (filter.Genres.Count > 0)
+        {
+            var cleanGenres = filter.Genres.Select(e => GetCleanValue(e)).ToArray();
+            baseQuery = baseQuery
+                   .Where(e => e.ItemValues!.Any(f => f.Type == 2 && cleanGenres.Contains(f.CleanValue)));
+        }
+
+        if (tags.Count > 0)
+        {
+            var cleanValues = tags.Select(e => GetCleanValue(e)).ToArray();
+            baseQuery = baseQuery
+                   .Where(e => e.ItemValues!.Any(f => f.Type == 4 && cleanValues.Contains(f.CleanValue)));
+        }
+
+        if (excludeTags.Count > 0)
+        {
+            var cleanValues = excludeTags.Select(e => GetCleanValue(e)).ToArray();
+            baseQuery = baseQuery
+                   .Where(e => !e.ItemValues!.Any(f => f.Type == 4 && cleanValues.Contains(f.CleanValue)));
+        }
+
+        if (filter.StudioIds.Length > 0)
+        {
+            baseQuery = baseQuery
+                   .Where(e => e.ItemValues!.Any(f => f.Type == 3 && context.BaseItems.Where(w => filter.StudioIds.Contains(w.Id)).Any(w => w.CleanName == f.CleanValue)));
+        }
+
+        if (filter.OfficialRatings.Length > 0)
+        {
+            baseQuery = baseQuery
+                   .Where(e => filter.OfficialRatings.Contains(e.OfficialRating));
+        }
+
+        if (filter.HasParentalRating ?? false)
+        {
+            if (filter.MinParentalRating.HasValue)
+            {
+                baseQuery = baseQuery
+                   .Where(e => e.InheritedParentalRatingValue >= filter.MinParentalRating.Value);
+            }
+
+            if (filter.MaxParentalRating.HasValue)
+            {
+                baseQuery = baseQuery
+                   .Where(e => e.InheritedParentalRatingValue < filter.MaxParentalRating.Value);
+            }
+        }
+        else if (filter.BlockUnratedItems.Length > 0)
+        {
+            if (filter.MinParentalRating.HasValue)
+            {
+                if (filter.MaxParentalRating.HasValue)
+                {
+                    baseQuery = baseQuery
+                        .Where(e => (e.InheritedParentalRatingValue == null && !filter.BlockUnratedItems.Select(e => e.ToString()).Contains(e.UnratedType))
+                        || (e.InheritedParentalRatingValue >= filter.MinParentalRating && e.InheritedParentalRatingValue <= filter.MaxParentalRating));
+                }
+                else
+                {
+                    baseQuery = baseQuery
+                        .Where(e => (e.InheritedParentalRatingValue == null && !filter.BlockUnratedItems.Select(e => e.ToString()).Contains(e.UnratedType))
+                        || e.InheritedParentalRatingValue >= filter.MinParentalRating);
+                }
+            }
+            else
+            {
+                baseQuery = baseQuery
+                    .Where(e => e.InheritedParentalRatingValue != null && !filter.BlockUnratedItems.Select(e => e.ToString()).Contains(e.UnratedType));
+            }
+        }
+        else if (filter.MinParentalRating.HasValue)
+        {
+            if (filter.MaxParentalRating.HasValue)
+            {
+                baseQuery = baseQuery
+                    .Where(e => e.InheritedParentalRatingValue != null && e.InheritedParentalRatingValue >= filter.MinParentalRating.Value && e.InheritedParentalRatingValue <= filter.MaxParentalRating.Value);
+            }
+            else
+            {
+                baseQuery = baseQuery
+                    .Where(e => e.InheritedParentalRatingValue != null && e.InheritedParentalRatingValue >= filter.MinParentalRating.Value);
+            }
+        }
+        else if (filter.MaxParentalRating.HasValue)
+        {
+            baseQuery = baseQuery
+                .Where(e => e.InheritedParentalRatingValue != null && e.InheritedParentalRatingValue >= filter.MaxParentalRating.Value);
+        }
+        else if (!filter.HasParentalRating ?? false)
+        {
+            baseQuery = baseQuery
+                .Where(e => e.InheritedParentalRatingValue == null);
+        }
+
+        if (filter.HasOfficialRating.HasValue)
+        {
+            if (filter.HasOfficialRating.Value)
+            {
+                baseQuery = baseQuery
+                    .Where(e => e.OfficialRating != null && e.OfficialRating != string.Empty);
+            }
+            else
+            {
+                baseQuery = baseQuery
+                    .Where(e => e.OfficialRating == null || e.OfficialRating == string.Empty);
+            }
+        }
+
+        if (filter.HasOverview.HasValue)
+        {
+            if (filter.HasOverview.Value)
+            {
+                baseQuery = baseQuery
+                    .Where(e => e.Overview != null && e.Overview != string.Empty);
+            }
+            else
+            {
+                baseQuery = baseQuery
+                    .Where(e => e.Overview == null || e.Overview == string.Empty);
+            }
+        }
+
+        if (filter.HasOwnerId.HasValue)
+        {
+            if (filter.HasOwnerId.Value)
+            {
+                baseQuery = baseQuery
+                    .Where(e => e.OwnerId != null);
+            }
+            else
+            {
+                baseQuery = baseQuery
+                    .Where(e => e.OwnerId == null);
+            }
+        }
+
+        if (!string.IsNullOrWhiteSpace(filter.HasNoAudioTrackWithLanguage))
+        {
+            baseQuery = baseQuery
+                .Where(e => !e.MediaStreams!.Any(e => e.StreamType == "Audio" && e.Language == filter.HasNoAudioTrackWithLanguage));
+        }
+
+        if (!string.IsNullOrWhiteSpace(filter.HasNoInternalSubtitleTrackWithLanguage))
+        {
+            baseQuery = baseQuery
+                .Where(e => !e.MediaStreams!.Any(e => e.StreamType == "Subtitle" && !e.IsExternal && e.Language == filter.HasNoInternalSubtitleTrackWithLanguage));
+        }
+
+        if (!string.IsNullOrWhiteSpace(filter.HasNoExternalSubtitleTrackWithLanguage))
+        {
+            baseQuery = baseQuery
+                .Where(e => !e.MediaStreams!.Any(e => e.StreamType == "Subtitle" && e.IsExternal && e.Language == filter.HasNoExternalSubtitleTrackWithLanguage));
+        }
+
+        if (!string.IsNullOrWhiteSpace(filter.HasNoSubtitleTrackWithLanguage))
+        {
+            baseQuery = baseQuery
+                .Where(e => !e.MediaStreams!.Any(e => e.StreamType == "Subtitle" && e.Language == filter.HasNoSubtitleTrackWithLanguage));
+        }
+
+        if (filter.HasSubtitles.HasValue)
+        {
+            baseQuery = baseQuery
+                .Where(e => e.MediaStreams!.Any(e => e.StreamType == "Subtitle") == filter.HasSubtitles.Value);
+        }
+
+        if (filter.HasChapterImages.HasValue)
+        {
+            baseQuery = baseQuery
+                .Where(e => e.Chapters!.Any(e => e.ImagePath != null) == filter.HasChapterImages.Value);
+        }
+
+        if (filter.HasDeadParentId.HasValue && filter.HasDeadParentId.Value)
+        {
+            baseQuery = baseQuery
+                .Where(e => e.ParentId.HasValue && context.BaseItems.Any(f => f.Id.Equals(e.ParentId.Value)));
+        }
+
+        if (filter.IsDeadArtist.HasValue && filter.IsDeadArtist.Value)
+        {
+            baseQuery = baseQuery
+                .Where(e => e.ItemValues!.Any(f => (f.Type == 0 || f.Type == 1) && f.CleanValue == e.CleanName));
+        }
+
+        if (filter.IsDeadStudio.HasValue && filter.IsDeadStudio.Value)
+        {
+            baseQuery = baseQuery
+                .Where(e => e.ItemValues!.Any(f => f.Type == 3 && f.CleanValue == e.CleanName));
+        }
+
+        if (filter.IsDeadPerson.HasValue && filter.IsDeadPerson.Value)
+        {
+            baseQuery = baseQuery
+                .Where(e => !e.Peoples!.Any(f => f.Name == e.Name));
+        }
+
+        if (filter.Years.Length == 1)
+        {
+            baseQuery = baseQuery
+                .Where(e => e.ProductionYear == filter.Years[0]);
+        }
+        else if (filter.Years.Length > 1)
+        {
+            baseQuery = baseQuery
+                .Where(e => filter.Years.Any(f => f == e.ProductionYear));
+        }
+
+        var isVirtualItem = filter.IsVirtualItem ?? filter.IsMissing;
+        if (isVirtualItem.HasValue)
+        {
+            baseQuery = baseQuery
+                .Where(e => e.IsVirtualItem == isVirtualItem.Value);
+        }
+
+        if (filter.IsSpecialSeason.HasValue)
+        {
+            if (filter.IsSpecialSeason.Value)
+            {
+                baseQuery = baseQuery
+                    .Where(e => e.IndexNumber == 0);
+            }
+            else
+            {
+                baseQuery = baseQuery
+                    .Where(e => e.IndexNumber != 0);
+            }
+        }
+
+        if (filter.IsUnaired.HasValue)
+        {
+            if (filter.IsUnaired.Value)
+            {
+                baseQuery = baseQuery
+                    .Where(e => e.PremiereDate >= now);
+            }
+            else
+            {
+                baseQuery = baseQuery
+                    .Where(e => e.PremiereDate < now);
+            }
+        }
+
+        if (filter.MediaTypes.Length == 1)
+        {
+            baseQuery = baseQuery
+                .Where(e => e.MediaType == filter.MediaTypes[0].ToString());
+        }
+        else if (filter.MediaTypes.Length > 1)
+        {
+            baseQuery = baseQuery
+                .Where(e => filter.MediaTypes.Select(f => f.ToString()).Contains(e.MediaType));
+        }
+
+        if (filter.ItemIds.Length > 0)
+        {
+            baseQuery = baseQuery
+                .Where(e => filter.ItemIds.Contains(e.Id));
+        }
+
+        if (filter.ExcludeItemIds.Length > 0)
+        {
+            baseQuery = baseQuery
+                .Where(e => !filter.ItemIds.Contains(e.Id));
+        }
+
+        if (filter.ExcludeProviderIds is not null && filter.ExcludeProviderIds.Count > 0)
+        {
+            baseQuery = baseQuery.Where(e => !e.Provider!.All(f => !filter.ExcludeProviderIds.All(w => f.ProviderId == w.Key && f.ProviderValue == w.Value)));
+        }
+
+        if (filter.HasAnyProviderId is not null && filter.HasAnyProviderId.Count > 0)
+        {
+            baseQuery = baseQuery.Where(e => e.Provider!.Any(f => !filter.HasAnyProviderId.Any(w => f.ProviderId == w.Key && f.ProviderValue == w.Value)));
+        }
+
+        if (filter.HasImdbId.HasValue)
+        {
+            baseQuery = baseQuery.Where(e => e.Provider!.Any(f => f.ProviderId == "imdb"));
+        }
+
+        if (filter.HasTmdbId.HasValue)
+        {
+            baseQuery = baseQuery.Where(e => e.Provider!.Any(f => f.ProviderId == "tmdb"));
+        }
+
+        if (filter.HasTvdbId.HasValue)
+        {
+            baseQuery = baseQuery.Where(e => e.Provider!.Any(f => f.ProviderId == "tvdb"));
+        }
+
+        var queryTopParentIds = filter.TopParentIds;
+
+        if (queryTopParentIds.Length > 0)
+        {
+            var includedItemByNameTypes = GetItemByNameTypesInQuery(filter);
+            var enableItemsByName = (filter.IncludeItemsByName ?? false) && includedItemByNameTypes.Count > 0;
+            if (enableItemsByName && includedItemByNameTypes.Count > 0)
+            {
+                baseQuery = baseQuery.Where(e => includedItemByNameTypes.Contains(e.Type) || queryTopParentIds.Any(w => w.Equals(e.TopParentId!.Value)));
+            }
+            else
+            {
+                baseQuery = baseQuery.Where(e => queryTopParentIds.Any(w => w.Equals(e.TopParentId!.Value)));
+            }
+        }
+
+        if (filter.AncestorIds.Length > 0)
+        {
+            baseQuery = baseQuery.Where(e => e.AncestorIds!.Any(f => filter.AncestorIds.Contains(f.Id)));
+        }
+
+        if (!string.IsNullOrWhiteSpace(filter.AncestorWithPresentationUniqueKey))
+        {
+            baseQuery = baseQuery
+                .Where(e => context.BaseItems.Where(f => f.PresentationUniqueKey == filter.AncestorWithPresentationUniqueKey).Any(f => f.AncestorIds!.Any(w => w.ItemId.Equals(f.Id))));
+        }
+
+        if (!string.IsNullOrWhiteSpace(filter.SeriesPresentationUniqueKey))
+        {
+            baseQuery = baseQuery
+                .Where(e => e.SeriesPresentationUniqueKey == filter.SeriesPresentationUniqueKey);
+        }
+
+        if (filter.ExcludeInheritedTags.Length > 0)
+        {
+            baseQuery = baseQuery
+                .Where(e => !e.ItemValues!.Where(e => e.Type == 6)
+                    .Any(f => filter.ExcludeInheritedTags.Contains(f.CleanValue)));
+        }
+
+        if (filter.IncludeInheritedTags.Length > 0)
+        {
+            // Episodes do not store inherit tags from their parents in the database, and the tag may be still required by the client.
+            // In addtion to the tags for the episodes themselves, we need to manually query its parent (the season)'s tags as well.
+            if (includeTypes.Length == 1 && includeTypes.FirstOrDefault() is BaseItemKind.Episode)
+            {
+                baseQuery = baseQuery
+                    .Where(e => e.ItemValues!.Where(e => e.Type == 6)
+                        .Any(f => filter.IncludeInheritedTags.Contains(f.CleanValue))
+                        ||
+                        (e.ParentId.HasValue && context.ItemValues.Where(w => w.ItemId.Equals(e.ParentId.Value))!.Where(e => e.Type == 6)
+                        .Any(f => filter.IncludeInheritedTags.Contains(f.CleanValue))));
+            }
+
+            // A playlist should be accessible to its owner regardless of allowed tags.
+            else if (includeTypes.Length == 1 && includeTypes.FirstOrDefault() is BaseItemKind.Playlist)
+            {
+                baseQuery = baseQuery
+                    .Where(e => e.ItemValues!.Where(e => e.Type == 6)
+                        .Any(f => filter.IncludeInheritedTags.Contains(f.CleanValue)) || e.Data!.Contains($"OwnerUserId\":\"{filter.User!.Id:N}\""));
+                // d                                                                      ^^ this is stupid it hate this.
+            }
+            else
+            {
+                baseQuery = baseQuery
+                    .Where(e => e.ItemValues!.Where(e => e.Type == 6)
+                        .Any(f => filter.IncludeInheritedTags.Contains(f.CleanValue)));
+            }
+        }
+
+        if (filter.SeriesStatuses.Length > 0)
+        {
+            baseQuery = baseQuery
+                .Where(e => filter.SeriesStatuses.Any(f => e.Data!.Contains(f.ToString(), StringComparison.InvariantCultureIgnoreCase)));
+        }
+
+        if (filter.BoxSetLibraryFolders.Length > 0)
+        {
+            baseQuery = baseQuery
+                .Where(e => filter.BoxSetLibraryFolders.Any(f => e.Data!.Contains(f.ToString("N", CultureInfo.InvariantCulture), StringComparison.InvariantCultureIgnoreCase)));
+        }
+
+        if (filter.VideoTypes.Length > 0)
+        {
+            var videoTypeBs = filter.VideoTypes.Select(e => $"\"VideoType\":\"" + e + "\"");
+            baseQuery = baseQuery
+                .Where(e => videoTypeBs.Any(f => e.Data!.Contains(f, StringComparison.InvariantCultureIgnoreCase)));
+        }
+
+        if (filter.Is3D.HasValue)
+        {
+            if (filter.Is3D.Value)
+            {
+                baseQuery = baseQuery
+                    .Where(e => e.Data!.Contains("Video3DFormat", StringComparison.InvariantCultureIgnoreCase));
+            }
+            else
+            {
+                baseQuery = baseQuery
+                    .Where(e => !e.Data!.Contains("Video3DFormat", StringComparison.InvariantCultureIgnoreCase));
+            }
+        }
+
+        if (filter.IsPlaceHolder.HasValue)
+        {
+            if (filter.IsPlaceHolder.Value)
+            {
+                baseQuery = baseQuery
+                    .Where(e => e.Data!.Contains("IsPlaceHolder\":true", StringComparison.InvariantCultureIgnoreCase));
+            }
+            else
+            {
+                baseQuery = baseQuery
+                    .Where(e => !e.Data!.Contains("IsPlaceHolder\":true", StringComparison.InvariantCultureIgnoreCase));
+            }
+        }
+
+        if (filter.HasSpecialFeature.HasValue)
+        {
+            if (filter.HasSpecialFeature.Value)
+            {
+                baseQuery = baseQuery
+                    .Where(e => e.ExtraIds != null);
+            }
+            else
+            {
+                baseQuery = baseQuery
+                    .Where(e => e.ExtraIds == null);
+            }
+        }
+
+        if (filter.HasTrailer.HasValue || filter.HasThemeSong.HasValue || filter.HasThemeVideo.HasValue)
+        {
+            if (filter.HasTrailer.GetValueOrDefault() || filter.HasThemeSong.GetValueOrDefault() || filter.HasThemeVideo.GetValueOrDefault())
+            {
+                baseQuery = baseQuery
+                    .Where(e => e.ExtraIds != null);
+            }
+            else
+            {
+                baseQuery = baseQuery
+                    .Where(e => e.ExtraIds == null);
+            }
+        }
+
+        return baseQuery;
+    }
+
+    /// <summary>
+    /// Gets the type.
+    /// </summary>
+    /// <param name="typeName">Name of the type.</param>
+    /// <returns>Type.</returns>
+    /// <exception cref="ArgumentNullException"><c>typeName</c> is null.</exception>
+    private static Type? GetType(string typeName)
+    {
+        ArgumentException.ThrowIfNullOrEmpty(typeName);
+
+        return _typeMap.GetOrAdd(typeName, k => AppDomain.CurrentDomain.GetAssemblies()
+            .Select(a => a.GetType(k))
+            .FirstOrDefault(t => t is not null));
+    }
+
+    /// <inheritdoc cref="IItemRepository" />
+    public void SaveImages(BaseItem item)
+    {
+        ArgumentNullException.ThrowIfNull(item);
+
+        var images = SerializeImages(item.ImageInfos);
+        using var db = dbProvider.CreateDbContext();
+
+        db.BaseItems
+            .Where(e => e.Id.Equals(item.Id))
+            .ExecuteUpdate(e => e.SetProperty(f => f.Images, images));
+    }
+
+    /// <inheritdoc cref="IItemRepository" />
+    public void SaveItems(IReadOnlyList<BaseItemDto> items, CancellationToken cancellationToken)
+    {
+        UpdateOrInsertItems(items, cancellationToken);
+    }
+
+    /// <inheritdoc cref="IItemRepository" />
+    public void UpdateOrInsertItems(IReadOnlyList<BaseItemDto> items, CancellationToken cancellationToken)
+    {
+        ArgumentNullException.ThrowIfNull(items);
+        cancellationToken.ThrowIfCancellationRequested();
+
+        var itemsLen = items.Count;
+        var tuples = new (BaseItemDto Item, List<Guid>? AncestorIds, BaseItemDto TopParent, string? UserDataKey, List<string> InheritedTags)[itemsLen];
+        for (int i = 0; i < itemsLen; i++)
+        {
+            var item = items[i];
+            var ancestorIds = item.SupportsAncestors ?
+                item.GetAncestorIds().Distinct().ToList() :
+                null;
+
+            var topParent = item.GetTopParent();
+
+            var userdataKey = item.GetUserDataKeys().FirstOrDefault();
+            var inheritedTags = item.GetInheritedTags();
+
+            tuples[i] = (item, ancestorIds, topParent, userdataKey, inheritedTags);
+        }
+
+        using var context = dbProvider.CreateDbContext();
+        foreach (var item in tuples)
+        {
+            var entity = Map(item.Item);
+            context.BaseItems.Add(entity);
+
+            if (item.Item.SupportsAncestors && item.AncestorIds != null)
+            {
+                foreach (var ancestorId in item.AncestorIds)
+                {
+                    context.AncestorIds.Add(new Data.Entities.AncestorId()
+                    {
+                        Item = entity,
+                        AncestorIdText = ancestorId.ToString(),
+                        Id = ancestorId
+                    });
+                }
+            }
+
+            var itemValues = GetItemValuesToSave(item.Item, item.InheritedTags);
+            context.ItemValues.Where(e => e.ItemId.Equals(entity.Id)).ExecuteDelete();
+            foreach (var itemValue in itemValues)
+            {
+                context.ItemValues.Add(new()
+                {
+                    Item = entity,
+                    Type = itemValue.MagicNumber,
+                    Value = itemValue.Value,
+                    CleanValue = GetCleanValue(itemValue.Value)
+                });
+            }
+        }
+
+        context.SaveChanges(true);
+    }
+
+    /// <inheritdoc cref="IItemRepository" />
+    public BaseItemDto? RetrieveItem(Guid id)
+    {
+        if (id.IsEmpty())
+        {
+            throw new ArgumentException("Guid can't be empty", nameof(id));
+        }
+
+        using var context = dbProvider.CreateDbContext();
+        var item = context.BaseItems.FirstOrDefault(e => e.Id.Equals(id));
+        if (item is null)
+        {
+            return null;
+        }
+
+        return DeserialiseBaseItem(item);
+    }
+
+    /// <summary>
+    /// Maps a Entity to the DTO.
+    /// </summary>
+    /// <param name="entity">The entity.</param>
+    /// <param name="dto">The dto base instance.</param>
+    /// <returns>The dto to map.</returns>
+    public BaseItemDto Map(BaseItemEntity entity, BaseItemDto dto)
+    {
+        dto.Id = entity.Id;
+        dto.ParentId = entity.ParentId.GetValueOrDefault();
+        dto.Path = entity.Path;
+        dto.EndDate = entity.EndDate;
+        dto.CommunityRating = entity.CommunityRating;
+        dto.CustomRating = entity.CustomRating;
+        dto.IndexNumber = entity.IndexNumber;
+        dto.IsLocked = entity.IsLocked;
+        dto.Name = entity.Name;
+        dto.OfficialRating = entity.OfficialRating;
+        dto.Overview = entity.Overview;
+        dto.ParentIndexNumber = entity.ParentIndexNumber;
+        dto.PremiereDate = entity.PremiereDate;
+        dto.ProductionYear = entity.ProductionYear;
+        dto.SortName = entity.SortName;
+        dto.ForcedSortName = entity.ForcedSortName;
+        dto.RunTimeTicks = entity.RunTimeTicks;
+        dto.PreferredMetadataLanguage = entity.PreferredMetadataLanguage;
+        dto.PreferredMetadataCountryCode = entity.PreferredMetadataCountryCode;
+        dto.IsInMixedFolder = entity.IsInMixedFolder;
+        dto.InheritedParentalRatingValue = entity.InheritedParentalRatingValue;
+        dto.CriticRating = entity.CriticRating;
+        dto.PresentationUniqueKey = entity.PresentationUniqueKey;
+        dto.OriginalTitle = entity.OriginalTitle;
+        dto.Album = entity.Album;
+        dto.LUFS = entity.LUFS;
+        dto.NormalizationGain = entity.NormalizationGain;
+        dto.IsVirtualItem = entity.IsVirtualItem;
+        dto.ExternalSeriesId = entity.ExternalSeriesId;
+        dto.Tagline = entity.Tagline;
+        dto.TotalBitrate = entity.TotalBitrate;
+        dto.ExternalId = entity.ExternalId;
+        dto.Size = entity.Size;
+        dto.Genres = entity.Genres?.Split('|');
+        dto.DateCreated = entity.DateCreated.GetValueOrDefault();
+        dto.DateModified = entity.DateModified.GetValueOrDefault();
+        dto.ChannelId = string.IsNullOrWhiteSpace(entity.ChannelId) ? Guid.Empty : Guid.Parse(entity.ChannelId);
+        dto.DateLastRefreshed = entity.DateLastRefreshed.GetValueOrDefault();
+        dto.DateLastSaved = entity.DateLastSaved.GetValueOrDefault();
+        dto.OwnerId = string.IsNullOrWhiteSpace(entity.OwnerId) ? Guid.Empty : Guid.Parse(entity.OwnerId);
+        dto.Width = entity.Width.GetValueOrDefault();
+        dto.Height = entity.Height.GetValueOrDefault();
+        if (entity.Provider is not null)
+        {
+            dto.ProviderIds = entity.Provider.ToDictionary(e => e.ProviderId, e => e.ProviderValue);
+        }
+
+        if (entity.ExtraType is not null)
+        {
+            dto.ExtraType = Enum.Parse<ExtraType>(entity.ExtraType);
+        }
+
+        if (entity.LockedFields is not null)
+        {
+            List<MetadataField>? fields = null;
+            foreach (var i in entity.LockedFields.AsSpan().Split('|'))
+            {
+                if (Enum.TryParse(i, true, out MetadataField parsedValue))
+                {
+                    (fields ??= new List<MetadataField>()).Add(parsedValue);
+                }
+            }
+
+            dto.LockedFields = fields?.ToArray() ?? Array.Empty<MetadataField>();
+        }
+
+        if (entity.Audio is not null)
+        {
+            dto.Audio = Enum.Parse<ProgramAudio>(entity.Audio);
+        }
+
+        dto.ExtraIds = entity.ExtraIds?.Split('|').Select(e => Guid.Parse(e)).ToArray();
+        dto.ProductionLocations = entity.ProductionLocations?.Split('|');
+        dto.Studios = entity.Studios?.Split('|');
+        dto.Tags = entity.Tags?.Split('|');
+
+        if (dto is IHasProgramAttributes hasProgramAttributes)
+        {
+            hasProgramAttributes.IsMovie = entity.IsMovie;
+            hasProgramAttributes.IsSeries = entity.IsSeries;
+            hasProgramAttributes.EpisodeTitle = entity.EpisodeTitle;
+            hasProgramAttributes.IsRepeat = entity.IsRepeat;
+        }
+
+        if (dto is LiveTvChannel liveTvChannel)
+        {
+            liveTvChannel.ServiceName = entity.ExternalServiceId;
+        }
+
+        if (dto is Trailer trailer)
+        {
+            List<TrailerType>? types = null;
+            foreach (var i in entity.TrailerTypes.AsSpan().Split('|'))
+            {
+                if (Enum.TryParse(i, true, out TrailerType parsedValue))
+                {
+                    (types ??= new List<TrailerType>()).Add(parsedValue);
+                }
+            }
+
+            trailer.TrailerTypes = types?.ToArray() ?? Array.Empty<TrailerType>();
+        }
+
+        if (dto is Video video)
+        {
+            video.PrimaryVersionId = entity.PrimaryVersionId;
+        }
+
+        if (dto is IHasSeries hasSeriesName)
+        {
+            hasSeriesName.SeriesName = entity.SeriesName;
+            hasSeriesName.SeriesId = entity.SeriesId.GetValueOrDefault();
+            hasSeriesName.SeriesPresentationUniqueKey = entity.SeriesPresentationUniqueKey;
+        }
+
+        if (dto is Episode episode)
+        {
+            episode.SeasonName = entity.SeasonName;
+            episode.SeasonId = entity.SeasonId.GetValueOrDefault();
+        }
+
+        if (dto is IHasArtist hasArtists)
+        {
+            hasArtists.Artists = entity.Artists?.Split('|', StringSplitOptions.RemoveEmptyEntries);
+        }
+
+        if (dto is IHasAlbumArtist hasAlbumArtists)
+        {
+            hasAlbumArtists.AlbumArtists = entity.AlbumArtists?.Split('|', StringSplitOptions.RemoveEmptyEntries);
+        }
+
+        if (dto is LiveTvProgram program)
+        {
+            program.ShowId = entity.ShowId;
+        }
+
+        if (entity.Images is not null)
+        {
+            dto.ImageInfos = DeserializeImages(entity.Images);
+        }
+
+        // dto.Type = entity.Type;
+        // dto.Data = entity.Data;
+        // dto.MediaType = entity.MediaType;
+        if (dto is IHasStartDate hasStartDate)
+        {
+            hasStartDate.StartDate = entity.StartDate;
+        }
+
+        // Fields that are present in the DB but are never actually used
+        // dto.UnratedType = entity.UnratedType;
+        // dto.TopParentId = entity.TopParentId;
+        // dto.CleanName = entity.CleanName;
+        // dto.UserDataKey = entity.UserDataKey;
+
+        if (dto is Folder folder)
+        {
+            folder.DateLastMediaAdded = entity.DateLastMediaAdded;
+        }
+
+        return dto;
+    }
+
+    /// <summary>
+    /// Maps a Entity to the DTO.
+    /// </summary>
+    /// <param name="dto">The entity.</param>
+    /// <returns>The dto to map.</returns>
+    public BaseItemEntity Map(BaseItemDto dto)
+    {
+        var entity = new BaseItemEntity()
+        {
+            Type = dto.GetType().ToString(),
+        };
+        entity.Id = dto.Id;
+        entity.ParentId = dto.ParentId;
+        entity.Path = GetPathToSave(dto.Path);
+        entity.EndDate = dto.EndDate.GetValueOrDefault();
+        entity.CommunityRating = dto.CommunityRating;
+        entity.CustomRating = dto.CustomRating;
+        entity.IndexNumber = dto.IndexNumber;
+        entity.IsLocked = dto.IsLocked;
+        entity.Name = dto.Name;
+        entity.OfficialRating = dto.OfficialRating;
+        entity.Overview = dto.Overview;
+        entity.ParentIndexNumber = dto.ParentIndexNumber;
+        entity.PremiereDate = dto.PremiereDate;
+        entity.ProductionYear = dto.ProductionYear;
+        entity.SortName = dto.SortName;
+        entity.ForcedSortName = dto.ForcedSortName;
+        entity.RunTimeTicks = dto.RunTimeTicks;
+        entity.PreferredMetadataLanguage = dto.PreferredMetadataLanguage;
+        entity.PreferredMetadataCountryCode = dto.PreferredMetadataCountryCode;
+        entity.IsInMixedFolder = dto.IsInMixedFolder;
+        entity.InheritedParentalRatingValue = dto.InheritedParentalRatingValue;
+        entity.CriticRating = dto.CriticRating;
+        entity.PresentationUniqueKey = dto.PresentationUniqueKey;
+        entity.OriginalTitle = dto.OriginalTitle;
+        entity.Album = dto.Album;
+        entity.LUFS = dto.LUFS;
+        entity.NormalizationGain = dto.NormalizationGain;
+        entity.IsVirtualItem = dto.IsVirtualItem;
+        entity.ExternalSeriesId = dto.ExternalSeriesId;
+        entity.Tagline = dto.Tagline;
+        entity.TotalBitrate = dto.TotalBitrate;
+        entity.ExternalId = dto.ExternalId;
+        entity.Size = dto.Size;
+        entity.Genres = string.Join('|', dto.Genres);
+        entity.DateCreated = dto.DateCreated;
+        entity.DateModified = dto.DateModified;
+        entity.ChannelId = dto.ChannelId.ToString();
+        entity.DateLastRefreshed = dto.DateLastRefreshed;
+        entity.DateLastSaved = dto.DateLastSaved;
+        entity.OwnerId = dto.OwnerId.ToString();
+        entity.Width = dto.Width;
+        entity.Height = dto.Height;
+        entity.Provider = dto.ProviderIds.Select(e => new Data.Entities.BaseItemProvider()
+        {
+            Item = entity,
+            ProviderId = e.Key,
+            ProviderValue = e.Value
+        }).ToList();
+
+        entity.Audio = dto.Audio?.ToString();
+        entity.ExtraType = dto.ExtraType?.ToString();
+
+        entity.ExtraIds = string.Join('|', dto.ExtraIds);
+        entity.ProductionLocations = string.Join('|', dto.ProductionLocations);
+        entity.Studios = dto.Studios is not null ? string.Join('|', dto.Studios) : null;
+        entity.Tags = dto.Tags is not null ? string.Join('|', dto.Tags) : null;
+        entity.LockedFields = dto.LockedFields is not null ? string.Join('|', dto.LockedFields) : null;
+
+        if (dto is IHasProgramAttributes hasProgramAttributes)
+        {
+            entity.IsMovie = hasProgramAttributes.IsMovie;
+            entity.IsSeries = hasProgramAttributes.IsSeries;
+            entity.EpisodeTitle = hasProgramAttributes.EpisodeTitle;
+            entity.IsRepeat = hasProgramAttributes.IsRepeat;
+        }
+
+        if (dto is LiveTvChannel liveTvChannel)
+        {
+            entity.ExternalServiceId = liveTvChannel.ServiceName;
+        }
+
+        if (dto is Trailer trailer)
+        {
+            entity.LockedFields = trailer.LockedFields is not null ? string.Join('|', trailer.LockedFields) : null;
+        }
+
+        if (dto is Video video)
+        {
+            entity.PrimaryVersionId = video.PrimaryVersionId;
+        }
+
+        if (dto is IHasSeries hasSeriesName)
+        {
+            entity.SeriesName = hasSeriesName.SeriesName;
+            entity.SeriesId = hasSeriesName.SeriesId;
+            entity.SeriesPresentationUniqueKey = hasSeriesName.SeriesPresentationUniqueKey;
+        }
+
+        if (dto is Episode episode)
+        {
+            entity.SeasonName = episode.SeasonName;
+            entity.SeasonId = episode.SeasonId;
+        }
+
+        if (dto is IHasArtist hasArtists)
+        {
+            entity.Artists = hasArtists.Artists is not null ? string.Join('|', hasArtists.Artists) : null;
+        }
+
+        if (dto is IHasAlbumArtist hasAlbumArtists)
+        {
+            entity.AlbumArtists = hasAlbumArtists.AlbumArtists is not null ? string.Join('|', hasAlbumArtists.AlbumArtists) : null;
+        }
+
+        if (dto is LiveTvProgram program)
+        {
+            entity.ShowId = program.ShowId;
+        }
+
+        if (dto.ImageInfos is not null)
+        {
+            entity.Images = SerializeImages(dto.ImageInfos);
+        }
+
+        // dto.Type = entity.Type;
+        // dto.Data = entity.Data;
+        // dto.MediaType = entity.MediaType;
+        if (dto is IHasStartDate hasStartDate)
+        {
+            entity.StartDate = hasStartDate.StartDate;
+        }
+
+        // Fields that are present in the DB but are never actually used
+        // dto.UnratedType = entity.UnratedType;
+        // dto.TopParentId = entity.TopParentId;
+        // dto.CleanName = entity.CleanName;
+        // dto.UserDataKey = entity.UserDataKey;
+
+        if (dto is Folder folder)
+        {
+            entity.DateLastMediaAdded = folder.DateLastMediaAdded;
+            entity.IsFolder = folder.IsFolder;
+        }
+
+        return entity;
+    }
+
+    private IReadOnlyList<string> GetItemValueNames(int[] itemValueTypes, IReadOnlyList<string> withItemTypes, IReadOnlyList<string> excludeItemTypes)
+    {
+        using var context = dbProvider.CreateDbContext();
+
+        var query = context.ItemValues
+            .Where(e => itemValueTypes.Contains(e.Type));
+        if (withItemTypes.Count > 0)
+        {
+            query = query.Where(e => context.BaseItems.Where(e => withItemTypes.Contains(e.Type)).Any(f => f.ItemValues!.Any(w => w.ItemId.Equals(e.ItemId))));
+        }
+
+        if (excludeItemTypes.Count > 0)
+        {
+            query = query.Where(e => !context.BaseItems.Where(e => withItemTypes.Contains(e.Type)).Any(f => f.ItemValues!.Any(w => w.ItemId.Equals(e.ItemId))));
+        }
+
+        query = query.DistinctBy(e => e.CleanValue);
+        return query.Select(e => e.CleanValue).ToImmutableArray();
+    }
+
+    private BaseItemDto DeserialiseBaseItem(BaseItemEntity baseItemEntity)
+    {
+        var type = GetType(baseItemEntity.Type) ?? throw new InvalidOperationException("Cannot deserialise unkown type.");
+        var dto = Activator.CreateInstance(type) as BaseItemDto ?? throw new InvalidOperationException("Cannot deserialise unkown type.");
+        return Map(baseItemEntity, dto);
+    }
+
+    private QueryResult<(BaseItemDto Item, ItemCounts ItemCounts)> GetItemValues(InternalItemsQuery filter, int[] itemValueTypes, string returnType)
+    {
+        ArgumentNullException.ThrowIfNull(filter);
+
+        if (!filter.Limit.HasValue)
+        {
+            filter.EnableTotalRecordCount = false;
+        }
+
+        using var context = dbProvider.CreateDbContext();
+
+        var innerQuery = new InternalItemsQuery(filter.User)
+        {
+            ExcludeItemTypes = filter.ExcludeItemTypes,
+            IncludeItemTypes = filter.IncludeItemTypes,
+            MediaTypes = filter.MediaTypes,
+            AncestorIds = filter.AncestorIds,
+            ItemIds = filter.ItemIds,
+            TopParentIds = filter.TopParentIds,
+            ParentId = filter.ParentId,
+            IsAiring = filter.IsAiring,
+            IsMovie = filter.IsMovie,
+            IsSports = filter.IsSports,
+            IsKids = filter.IsKids,
+            IsNews = filter.IsNews,
+            IsSeries = filter.IsSeries
+        };
+        var query = TranslateQuery(context.BaseItems, context, innerQuery);
+
+        query = query.Where(e => e.Type == returnType && e.ItemValues!.Any(f => e.CleanName == f.CleanValue && itemValueTypes.Contains(f.Type)));
+
+        var outerQuery = new InternalItemsQuery(filter.User)
+        {
+            IsPlayed = filter.IsPlayed,
+            IsFavorite = filter.IsFavorite,
+            IsFavoriteOrLiked = filter.IsFavoriteOrLiked,
+            IsLiked = filter.IsLiked,
+            IsLocked = filter.IsLocked,
+            NameLessThan = filter.NameLessThan,
+            NameStartsWith = filter.NameStartsWith,
+            NameStartsWithOrGreater = filter.NameStartsWithOrGreater,
+            Tags = filter.Tags,
+            OfficialRatings = filter.OfficialRatings,
+            StudioIds = filter.StudioIds,
+            GenreIds = filter.GenreIds,
+            Genres = filter.Genres,
+            Years = filter.Years,
+            NameContains = filter.NameContains,
+            SearchTerm = filter.SearchTerm,
+            SimilarTo = filter.SimilarTo,
+            ExcludeItemIds = filter.ExcludeItemIds
+        };
+        query = TranslateQuery(query, context, outerQuery)
+            .OrderBy(e => e.PresentationUniqueKey);
+
+        if (filter.OrderBy.Count != 0
+            || filter.SimilarTo is not null
+            || !string.IsNullOrEmpty(filter.SearchTerm))
+        {
+            query = ApplyOrder(query, filter);
+        }
+        else
+        {
+            query = query.OrderBy(e => e.SortName);
+        }
+
+        if (filter.Limit.HasValue || filter.StartIndex.HasValue)
+        {
+            var offset = filter.StartIndex ?? 0;
+
+            if (offset > 0)
+            {
+                query = query.Skip(offset);
+            }
+
+            if (filter.Limit.HasValue)
+            {
+                query.Take(filter.Limit.Value);
+            }
+        }
+
+        var result = new QueryResult<(BaseItem, ItemCounts)>();
+        string countText = string.Empty;
+        if (filter.EnableTotalRecordCount)
+        {
+            result.TotalRecordCount = query.DistinctBy(e => e.PresentationUniqueKey).Count();
+        }
+
+        var resultQuery = query.Select(e => new
+        {
+            item = e,
+            itemCount = new ItemCounts()
+            {
+                SeriesCount = e.ItemValues!.Count(e => e.Type == (int)BaseItemKind.Series),
+                EpisodeCount = e.ItemValues!.Count(e => e.Type == (int)BaseItemKind.Episode),
+                MovieCount = e.ItemValues!.Count(e => e.Type == (int)BaseItemKind.Movie),
+                AlbumCount = e.ItemValues!.Count(e => e.Type == (int)BaseItemKind.MusicAlbum),
+                ArtistCount = e.ItemValues!.Count(e => e.Type == 0 || e.Type == 1),
+                SongCount = e.ItemValues!.Count(e => e.Type == (int)BaseItemKind.MusicAlbum),
+                TrailerCount = e.ItemValues!.Count(e => e.Type == (int)BaseItemKind.Trailer),
+            }
+        });
+
+        result.StartIndex = filter.StartIndex ?? 0;
+        result.Items = resultQuery.ToImmutableArray().Select(e =>
+        {
+            return (DeserialiseBaseItem(e.item), e.itemCount);
+        }).ToImmutableArray();
+
+        return result;
+    }
+
+    private static void PrepareFilterQuery(InternalItemsQuery query)
+    {
+        if (query.Limit.HasValue && query.EnableGroupByMetadataKey)
+        {
+            query.Limit = query.Limit.Value + 4;
+        }
+
+        if (query.IsResumable ?? false)
+        {
+            query.IsVirtualItem = false;
+        }
+    }
+
+    private string GetCleanValue(string value)
+    {
+        if (string.IsNullOrWhiteSpace(value))
+        {
+            return value;
+        }
+
+        return value.RemoveDiacritics().ToLowerInvariant();
+    }
+
+    private List<(int MagicNumber, string Value)> GetItemValuesToSave(BaseItem item, List<string> inheritedTags)
+    {
+        var list = new List<(int, string)>();
+
+        if (item is IHasArtist hasArtist)
+        {
+            list.AddRange(hasArtist.Artists.Select(i => (0, i)));
+        }
+
+        if (item is IHasAlbumArtist hasAlbumArtist)
+        {
+            list.AddRange(hasAlbumArtist.AlbumArtists.Select(i => (1, i)));
+        }
+
+        list.AddRange(item.Genres.Select(i => (2, i)));
+        list.AddRange(item.Studios.Select(i => (3, i)));
+        list.AddRange(item.Tags.Select(i => (4, i)));
+
+        // keywords was 5
+
+        list.AddRange(inheritedTags.Select(i => (6, i)));
+
+        // Remove all invalid values.
+        list.RemoveAll(i => string.IsNullOrWhiteSpace(i.Item2));
+
+        return list;
+    }
+
+    internal static string? SerializeProviderIds(Dictionary<string, string> providerIds)
+    {
+        StringBuilder str = new StringBuilder();
+        foreach (var i in providerIds)
+        {
+            // Ideally we shouldn't need this IsNullOrWhiteSpace check,
+            // but we're seeing some cases of bad data slip through
+            if (string.IsNullOrWhiteSpace(i.Value))
+            {
+                continue;
+            }
+
+            str.Append(i.Key)
+                .Append('=')
+                .Append(i.Value)
+                .Append('|');
+        }
+
+        if (str.Length == 0)
+        {
+            return null;
+        }
+
+        str.Length -= 1; // Remove last |
+        return str.ToString();
+    }
+
+    internal static void DeserializeProviderIds(string value, IHasProviderIds item)
+    {
+        if (string.IsNullOrWhiteSpace(value))
+        {
+            return;
+        }
+
+        foreach (var part in value.SpanSplit('|'))
+        {
+            var providerDelimiterIndex = part.IndexOf('=');
+            // Don't let empty values through
+            if (providerDelimiterIndex != -1 && part.Length != providerDelimiterIndex + 1)
+            {
+                item.SetProviderId(part[..providerDelimiterIndex].ToString(), part[(providerDelimiterIndex + 1)..].ToString());
+            }
+        }
+    }
+
+    internal string? SerializeImages(ItemImageInfo[] images)
+    {
+        if (images.Length == 0)
+        {
+            return null;
+        }
+
+        StringBuilder str = new StringBuilder();
+        foreach (var i in images)
+        {
+            if (string.IsNullOrWhiteSpace(i.Path))
+            {
+                continue;
+            }
+
+            AppendItemImageInfo(str, i);
+            str.Append('|');
+        }
+
+        str.Length -= 1; // Remove last |
+        return str.ToString();
+    }
+
+    internal ItemImageInfo[] DeserializeImages(string value)
+    {
+        if (string.IsNullOrWhiteSpace(value))
+        {
+            return Array.Empty<ItemImageInfo>();
+        }
+
+        // TODO The following is an ugly performance optimization, but it's extremely unlikely that the data in the database would be malformed
+        var valueSpan = value.AsSpan();
+        var count = valueSpan.Count('|') + 1;
+
+        var position = 0;
+        var result = new ItemImageInfo[count];
+        foreach (var part in valueSpan.Split('|'))
+        {
+            var image = ItemImageInfoFromValueString(part);
+
+            if (image is not null)
+            {
+                result[position++] = image;
+            }
+        }
+
+        if (position == count)
+        {
+            return result;
+        }
+
+        if (position == 0)
+        {
+            return Array.Empty<ItemImageInfo>();
+        }
+
+        // Extremely unlikely, but somehow one or more of the image strings were malformed. Cut the array.
+        return result[..position];
+    }
+
+    private void AppendItemImageInfo(StringBuilder bldr, ItemImageInfo image)
+    {
+        const char Delimiter = '*';
+
+        var path = image.Path ?? string.Empty;
+
+        bldr.Append(GetPathToSave(path))
+            .Append(Delimiter)
+            .Append(image.DateModified.Ticks)
+            .Append(Delimiter)
+            .Append(image.Type)
+            .Append(Delimiter)
+            .Append(image.Width)
+            .Append(Delimiter)
+            .Append(image.Height);
+
+        var hash = image.BlurHash;
+        if (!string.IsNullOrEmpty(hash))
+        {
+            bldr.Append(Delimiter)
+                // Replace delimiters with other characters.
+                // This can be removed when we migrate to a proper DB.
+                .Append(hash.Replace(Delimiter, '/').Replace('|', '\\'));
+        }
+    }
+
+    private string? GetPathToSave(string path)
+    {
+        if (path is null)
+        {
+            return null;
+        }
+
+        return appHost.ReverseVirtualPath(path);
+    }
+
+    private string RestorePath(string path)
+    {
+        return appHost.ExpandVirtualPath(path);
+    }
+
+    internal ItemImageInfo? ItemImageInfoFromValueString(ReadOnlySpan<char> value)
+    {
+        const char Delimiter = '*';
+
+        var nextSegment = value.IndexOf(Delimiter);
+        if (nextSegment == -1)
+        {
+            return null;
+        }
+
+        ReadOnlySpan<char> path = value[..nextSegment];
+        value = value[(nextSegment + 1)..];
+        nextSegment = value.IndexOf(Delimiter);
+        if (nextSegment == -1)
+        {
+            return null;
+        }
+
+        ReadOnlySpan<char> dateModified = value[..nextSegment];
+        value = value[(nextSegment + 1)..];
+        nextSegment = value.IndexOf(Delimiter);
+        if (nextSegment == -1)
+        {
+            nextSegment = value.Length;
+        }
+
+        ReadOnlySpan<char> imageType = value[..nextSegment];
+
+        var image = new ItemImageInfo
+        {
+            Path = RestorePath(path.ToString())
+        };
+
+        if (long.TryParse(dateModified, CultureInfo.InvariantCulture, out var ticks)
+            && ticks >= DateTime.MinValue.Ticks
+            && ticks <= DateTime.MaxValue.Ticks)
+        {
+            image.DateModified = new DateTime(ticks, DateTimeKind.Utc);
+        }
+        else
+        {
+            return null;
+        }
+
+        if (Enum.TryParse(imageType, true, out ImageType type))
+        {
+            image.Type = type;
+        }
+        else
+        {
+            return null;
+        }
+
+        // Optional parameters: width*height*blurhash
+        if (nextSegment + 1 < value.Length - 1)
+        {
+            value = value[(nextSegment + 1)..];
+            nextSegment = value.IndexOf(Delimiter);
+            if (nextSegment == -1 || nextSegment == value.Length)
+            {
+                return image;
+            }
+
+            ReadOnlySpan<char> widthSpan = value[..nextSegment];
+
+            value = value[(nextSegment + 1)..];
+            nextSegment = value.IndexOf(Delimiter);
+            if (nextSegment == -1)
+            {
+                nextSegment = value.Length;
+            }
+
+            ReadOnlySpan<char> heightSpan = value[..nextSegment];
+
+            if (int.TryParse(widthSpan, NumberStyles.Integer, CultureInfo.InvariantCulture, out var width)
+                && int.TryParse(heightSpan, NumberStyles.Integer, CultureInfo.InvariantCulture, out var height))
+            {
+                image.Width = width;
+                image.Height = height;
+            }
+
+            if (nextSegment < value.Length - 1)
+            {
+                value = value[(nextSegment + 1)..];
+                var length = value.Length;
+
+                Span<char> blurHashSpan = stackalloc char[length];
+                for (int i = 0; i < length; i++)
+                {
+                    var c = value[i];
+                    blurHashSpan[i] = c switch
+                    {
+                        '/' => Delimiter,
+                        '\\' => '|',
+                        _ => c
+                    };
+                }
+
+                image.BlurHash = new string(blurHashSpan);
+            }
+        }
+
+        return image;
+    }
+
+    private List<string> GetItemByNameTypesInQuery(InternalItemsQuery query)
+    {
+        var list = new List<string>();
+
+        if (IsTypeInQuery(BaseItemKind.Person, query))
+        {
+            list.Add(typeof(Person).FullName!);
+        }
+
+        if (IsTypeInQuery(BaseItemKind.Genre, query))
+        {
+            list.Add(typeof(Genre).FullName!);
+        }
+
+        if (IsTypeInQuery(BaseItemKind.MusicGenre, query))
+        {
+            list.Add(typeof(MusicGenre).FullName!);
+        }
+
+        if (IsTypeInQuery(BaseItemKind.MusicArtist, query))
+        {
+            list.Add(typeof(MusicArtist).FullName!);
+        }
+
+        if (IsTypeInQuery(BaseItemKind.Studio, query))
+        {
+            list.Add(typeof(Studio).FullName!);
+        }
+
+        return list;
+    }
+
+    private bool IsTypeInQuery(BaseItemKind type, InternalItemsQuery query)
+    {
+        if (query.ExcludeItemTypes.Contains(type))
+        {
+            return false;
+        }
+
+        return query.IncludeItemTypes.Length == 0 || query.IncludeItemTypes.Contains(type);
+    }
+
+    private IQueryable<T> Pageinate<T>(IQueryable<T> query, InternalItemsQuery filter)
+    {
+        if (filter.Limit.HasValue || filter.StartIndex.HasValue)
+        {
+            var offset = filter.StartIndex ?? 0;
+
+            if (offset > 0)
+            {
+                query = query.Skip(offset);
+            }
+
+            if (filter.Limit.HasValue)
+            {
+                query = query.Take(filter.Limit.Value);
+            }
+        }
+
+        return query;
+    }
+
+    private Expression<Func<BaseItemEntity, object>> MapOrderByField(ItemSortBy sortBy, InternalItemsQuery query)
+    {
+#pragma warning disable CS8603 // Possible null reference return.
+        return sortBy switch
+        {
+            ItemSortBy.AirTime => e => e.SortName, // TODO
+            ItemSortBy.Runtime => e => e.RunTimeTicks,
+            ItemSortBy.Random => e => EF.Functions.Random(),
+            ItemSortBy.DatePlayed => e => e.UserData!.FirstOrDefault(f => f.UserId.Equals(query.User!.Id) && f.Key == e.UserDataKey)!.LastPlayedDate,
+            ItemSortBy.PlayCount => e => e.UserData!.FirstOrDefault(f => f.UserId.Equals(query.User!.Id) && f.Key == e.UserDataKey)!.PlayCount,
+            ItemSortBy.IsFavoriteOrLiked => e => e.UserData!.FirstOrDefault(f => f.UserId.Equals(query.User!.Id) && f.Key == e.UserDataKey)!.IsFavorite,
+            ItemSortBy.IsFolder => e => e.IsFolder,
+            ItemSortBy.IsPlayed => e => e.UserData!.FirstOrDefault(f => f.UserId.Equals(query.User!.Id) && f.Key == e.UserDataKey)!.Played,
+            ItemSortBy.IsUnplayed => e => !e.UserData!.FirstOrDefault(f => f.UserId.Equals(query.User!.Id) && f.Key == e.UserDataKey)!.Played,
+            ItemSortBy.DateLastContentAdded => e => e.DateLastMediaAdded,
+            ItemSortBy.Artist => e => e.ItemValues!.Where(f => f.Type == 0).Select(f => f.CleanValue),
+            ItemSortBy.AlbumArtist => e => e.ItemValues!.Where(f => f.Type == 1).Select(f => f.CleanValue),
+            ItemSortBy.Studio => e => e.ItemValues!.Where(f => f.Type == 3).Select(f => f.CleanValue),
+            ItemSortBy.OfficialRating => e => e.InheritedParentalRatingValue,
+            // ItemSortBy.SeriesDatePlayed => "(Select MAX(LastPlayedDate) from TypedBaseItems B" + GetJoinUserDataText(query) + " where Played=1 and B.SeriesPresentationUniqueKey=A.PresentationUniqueKey)",
+            ItemSortBy.SeriesSortName => e => e.SeriesName,
+            // ItemSortBy.AiredEpisodeOrder => "AiredEpisodeOrder",
+            ItemSortBy.Album => e => e.Album,
+            ItemSortBy.DateCreated => e => e.DateCreated,
+            ItemSortBy.PremiereDate => e => e.PremiereDate,
+            ItemSortBy.StartDate => e => e.StartDate,
+            ItemSortBy.Name => e => e.Name,
+            ItemSortBy.CommunityRating => e => e.CommunityRating,
+            ItemSortBy.ProductionYear => e => e.ProductionYear,
+            ItemSortBy.CriticRating => e => e.CriticRating,
+            ItemSortBy.VideoBitRate => e => e.TotalBitrate,
+            ItemSortBy.ParentIndexNumber => e => e.ParentIndexNumber,
+            ItemSortBy.IndexNumber => e => e.IndexNumber,
+            _ => e => e.SortName
+        };
+#pragma warning restore CS8603 // Possible null reference return.
+
+    }
+
+    private bool EnableGroupByPresentationUniqueKey(InternalItemsQuery query)
+    {
+        if (!query.GroupByPresentationUniqueKey)
+        {
+            return false;
+        }
+
+        if (query.GroupBySeriesPresentationUniqueKey)
+        {
+            return false;
+        }
+
+        if (!string.IsNullOrWhiteSpace(query.PresentationUniqueKey))
+        {
+            return false;
+        }
+
+        if (query.User is null)
+        {
+            return false;
+        }
+
+        if (query.IncludeItemTypes.Length == 0)
+        {
+            return true;
+        }
+
+        return query.IncludeItemTypes.Contains(BaseItemKind.Episode)
+            || query.IncludeItemTypes.Contains(BaseItemKind.Video)
+            || query.IncludeItemTypes.Contains(BaseItemKind.Movie)
+            || query.IncludeItemTypes.Contains(BaseItemKind.MusicVideo)
+            || query.IncludeItemTypes.Contains(BaseItemKind.Series)
+            || query.IncludeItemTypes.Contains(BaseItemKind.Season);
+    }
+
+    private IQueryable<BaseItemEntity> ApplyOrder(IQueryable<BaseItemEntity> query, InternalItemsQuery filter)
+    {
+        var orderBy = filter.OrderBy;
+        bool hasSearch = !string.IsNullOrEmpty(filter.SearchTerm);
+
+        if (hasSearch)
+        {
+            List<(ItemSortBy, SortOrder)> prepend = new List<(ItemSortBy, SortOrder)>(4);
+            if (hasSearch)
+            {
+                prepend.Add((ItemSortBy.SortName, SortOrder.Ascending));
+            }
+
+            orderBy = filter.OrderBy = [.. prepend, .. orderBy];
+        }
+        else if (orderBy.Count == 0)
+        {
+            return query;
+        }
+
+        foreach (var item in orderBy)
+        {
+            var expression = MapOrderByField(item.OrderBy, filter);
+            if (item.SortOrder == SortOrder.Ascending)
+            {
+                query = query.OrderBy(expression);
+            }
+            else
+            {
+                query = query.OrderByDescending(expression);
+            }
+        }
+
+        return query;
+    }
+}
diff --git a/Jellyfin.Server.Implementations/Item/ChapterManager.cs b/Jellyfin.Server.Implementations/Item/ChapterManager.cs
deleted file mode 100644
index 7b0f98fde..000000000
--- a/Jellyfin.Server.Implementations/Item/ChapterManager.cs
+++ /dev/null
@@ -1,99 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Collections.Immutable;
-using System.Linq;
-using Jellyfin.Data.Entities;
-using MediaBrowser.Controller.Chapters;
-using MediaBrowser.Controller.Drawing;
-using MediaBrowser.Model.Dto;
-using MediaBrowser.Model.Entities;
-using Microsoft.EntityFrameworkCore;
-
-namespace Jellyfin.Server.Implementations.Item;
-
-/// <summary>
-/// The Chapter manager.
-/// </summary>
-public class ChapterManager : IChapterManager
-{
-    private readonly IDbContextFactory<JellyfinDbContext> _dbProvider;
-    private readonly IImageProcessor _imageProcessor;
-
-    /// <summary>
-    /// Initializes a new instance of the <see cref="ChapterManager"/> class.
-    /// </summary>
-    /// <param name="dbProvider">The EFCore provider.</param>
-    /// <param name="imageProcessor">The Image Processor.</param>
-    public ChapterManager(IDbContextFactory<JellyfinDbContext> dbProvider, IImageProcessor imageProcessor)
-    {
-        _dbProvider = dbProvider;
-        _imageProcessor = imageProcessor;
-    }
-
-    /// <inheritdoc cref="IChapterManager"/>
-    public ChapterInfo? GetChapter(BaseItemDto baseItem, int index)
-    {
-        using var context = _dbProvider.CreateDbContext();
-        var chapter = context.Chapters.FirstOrDefault(e => e.ItemId.Equals(baseItem.Id) && e.ChapterIndex == index);
-        if (chapter is not null)
-        {
-            return Map(chapter, baseItem);
-        }
-
-        return null;
-    }
-
-    /// <inheritdoc cref="IChapterManager"/>
-    public IReadOnlyList<ChapterInfo> GetChapters(BaseItemDto baseItem)
-    {
-        using var context = _dbProvider.CreateDbContext();
-        return context.Chapters.Where(e => e.ItemId.Equals(baseItem.Id))
-            .ToList()
-            .Select(e => Map(e, baseItem))
-            .ToImmutableArray();
-    }
-
-    /// <inheritdoc cref="IChapterManager"/>
-    public void SaveChapters(Guid itemId, IReadOnlyList<ChapterInfo> chapters)
-    {
-        using var context = _dbProvider.CreateDbContext();
-        using (var transaction = context.Database.BeginTransaction())
-        {
-            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();
-        }
-    }
-
-    private Chapter Map(ChapterInfo chapterInfo, int index, Guid itemId)
-    {
-        return new Chapter()
-        {
-            ChapterIndex = index,
-            StartPositionTicks = chapterInfo.StartPositionTicks,
-            ImageDateModified = chapterInfo.ImageDateModified,
-            ImagePath = chapterInfo.ImagePath,
-            ItemId = itemId,
-            Name = chapterInfo.Name
-        };
-    }
-
-    private ChapterInfo Map(Chapter chapterInfo, BaseItemDto baseItem)
-    {
-        var info = new ChapterInfo()
-        {
-            StartPositionTicks = chapterInfo.StartPositionTicks,
-            ImageDateModified = chapterInfo.ImageDateModified.GetValueOrDefault(),
-            ImagePath = chapterInfo.ImagePath,
-            Name = chapterInfo.Name,
-        };
-        info.ImageTag = _imageProcessor.GetImageCacheTag(baseItem, info);
-        return info;
-    }
-}
diff --git a/Jellyfin.Server.Implementations/Item/ChapterRepository.cs b/Jellyfin.Server.Implementations/Item/ChapterRepository.cs
new file mode 100644
index 000000000..d215a1d7a
--- /dev/null
+++ b/Jellyfin.Server.Implementations/Item/ChapterRepository.cs
@@ -0,0 +1,123 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.Immutable;
+using System.Linq;
+using Jellyfin.Data.Entities;
+using MediaBrowser.Controller.Chapters;
+using MediaBrowser.Controller.Drawing;
+using MediaBrowser.Model.Dto;
+using MediaBrowser.Model.Entities;
+using Microsoft.EntityFrameworkCore;
+
+namespace Jellyfin.Server.Implementations.Item;
+
+/// <summary>
+/// The Chapter manager.
+/// </summary>
+public class ChapterRepository : IChapterRepository
+{
+    private readonly IDbContextFactory<JellyfinDbContext> _dbProvider;
+    private readonly IImageProcessor _imageProcessor;
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="ChapterRepository"/> class.
+    /// </summary>
+    /// <param name="dbProvider">The EFCore provider.</param>
+    /// <param name="imageProcessor">The Image Processor.</param>
+    public ChapterRepository(IDbContextFactory<JellyfinDbContext> dbProvider, IImageProcessor imageProcessor)
+    {
+        _dbProvider = dbProvider;
+        _imageProcessor = imageProcessor;
+    }
+
+    /// <inheritdoc cref="IChapterRepository"/>
+    public ChapterInfo? GetChapter(BaseItemDto baseItem, int index)
+    {
+        return GetChapter(baseItem.Id, index);
+    }
+
+    /// <inheritdoc cref="IChapterRepository"/>
+    public IReadOnlyList<ChapterInfo> GetChapters(BaseItemDto baseItem)
+    {
+        return GetChapters(baseItem.Id);
+    }
+
+    /// <inheritdoc cref="IChapterRepository"/>
+    public ChapterInfo? GetChapter(Guid baseItemId, int index)
+    {
+        using var context = _dbProvider.CreateDbContext();
+        var chapter = context.Chapters
+            .Select(e => new
+            {
+                chapter = e,
+                baseItemPath = e.Item.Path
+            })
+            .FirstOrDefault(e => e.chapter.ItemId.Equals(baseItemId) && e.chapter.ChapterIndex == index);
+        if (chapter is not null)
+        {
+            return Map(chapter.chapter, chapter.baseItemPath!);
+        }
+
+        return null;
+    }
+
+    /// <inheritdoc cref="IChapterRepository"/>
+    public IReadOnlyList<ChapterInfo> GetChapters(Guid baseItemId)
+    {
+        using var context = _dbProvider.CreateDbContext();
+        return context.Chapters.Where(e => e.ItemId.Equals(baseItemId))
+            .Select(e => new
+            {
+                chapter = e,
+                baseItemPath = e.Item.Path
+            })
+            .ToList()
+            .Select(e => Map(e.chapter, e.baseItemPath!))
+            .ToImmutableArray();
+    }
+
+    /// <inheritdoc cref="IChapterRepository"/>
+    public void SaveChapters(Guid itemId, IReadOnlyList<ChapterInfo> chapters)
+    {
+        using var context = _dbProvider.CreateDbContext();
+        using (var transaction = context.Database.BeginTransaction())
+        {
+            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();
+        }
+    }
+
+    private Chapter Map(ChapterInfo chapterInfo, int index, Guid itemId)
+    {
+        return new Chapter()
+        {
+            ChapterIndex = index,
+            StartPositionTicks = chapterInfo.StartPositionTicks,
+            ImageDateModified = chapterInfo.ImageDateModified,
+            ImagePath = chapterInfo.ImagePath,
+            ItemId = itemId,
+            Name = chapterInfo.Name,
+            Item = null!
+        };
+    }
+
+    private ChapterInfo Map(Chapter chapterInfo, string baseItemPath)
+    {
+        var chapterEntity = new ChapterInfo()
+        {
+            StartPositionTicks = chapterInfo.StartPositionTicks,
+            ImageDateModified = chapterInfo.ImageDateModified.GetValueOrDefault(),
+            ImagePath = chapterInfo.ImagePath,
+            Name = chapterInfo.Name,
+        };
+        chapterEntity.ImageTag = _imageProcessor.GetImageCacheTag(baseItemPath, chapterEntity.ImageDateModified);
+        return chapterEntity;
+    }
+}
diff --git a/Jellyfin.Server.Implementations/Item/MediaAttachmentManager.cs b/Jellyfin.Server.Implementations/Item/MediaAttachmentManager.cs
deleted file mode 100644
index 288b1943e..000000000
--- a/Jellyfin.Server.Implementations/Item/MediaAttachmentManager.cs
+++ /dev/null
@@ -1,73 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Collections.Immutable;
-using System.Linq;
-using System.Threading;
-using Jellyfin.Data.Entities;
-using MediaBrowser.Controller.Persistence;
-using MediaBrowser.Model.Entities;
-using Microsoft.EntityFrameworkCore;
-
-namespace Jellyfin.Server.Implementations.Item;
-
-/// <summary>
-/// Manager for handling Media Attachments.
-/// </summary>
-/// <param name="dbProvider">Efcore Factory.</param>
-public class MediaAttachmentManager(IDbContextFactory<JellyfinDbContext> dbProvider) : IMediaAttachmentManager
-{
-    /// <inheritdoc />
-    public void SaveMediaAttachments(
-        Guid id,
-        IReadOnlyList<MediaAttachment> attachments,
-        CancellationToken cancellationToken)
-    {
-        using var context = dbProvider.CreateDbContext();
-        using var transaction = context.Database.BeginTransaction();
-        context.AttachmentStreamInfos.Where(e => e.ItemId.Equals(id)).ExecuteDelete();
-        context.AttachmentStreamInfos.AddRange(attachments.Select(e => Map(e, id)));
-        context.SaveChanges();
-        transaction.Commit();
-    }
-
-    /// <inheritdoc />
-    public IReadOnlyList<MediaAttachment> GetMediaAttachments(MediaAttachmentQuery filter)
-    {
-        using var context = dbProvider.CreateDbContext();
-        var query = context.AttachmentStreamInfos.Where(e => e.ItemId.Equals(filter.ItemId));
-        if (filter.Index.HasValue)
-        {
-            query = query.Where(e => e.Index == filter.Index);
-        }
-
-        return query.ToList().Select(Map).ToImmutableArray();
-    }
-
-    private MediaAttachment Map(AttachmentStreamInfo attachment)
-    {
-        return new MediaAttachment()
-        {
-            Codec = attachment.Codec,
-            CodecTag = attachment.CodecTag,
-            Comment = attachment.Comment,
-            FileName = attachment.Filename,
-            Index = attachment.Index,
-            MimeType = attachment.MimeType,
-        };
-    }
-
-    private AttachmentStreamInfo Map(MediaAttachment attachment, Guid id)
-    {
-        return new AttachmentStreamInfo()
-        {
-            Codec = attachment.Codec,
-            CodecTag = attachment.CodecTag,
-            Comment = attachment.Comment,
-            Filename = attachment.FileName,
-            Index = attachment.Index,
-            MimeType = attachment.MimeType,
-            ItemId = id,
-            Item = null!
-        };
-    }
-}
diff --git a/Jellyfin.Server.Implementations/Item/MediaAttachmentRepository.cs b/Jellyfin.Server.Implementations/Item/MediaAttachmentRepository.cs
new file mode 100644
index 000000000..70c5ff1e2
--- /dev/null
+++ b/Jellyfin.Server.Implementations/Item/MediaAttachmentRepository.cs
@@ -0,0 +1,73 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.Immutable;
+using System.Linq;
+using System.Threading;
+using Jellyfin.Data.Entities;
+using MediaBrowser.Controller.Persistence;
+using MediaBrowser.Model.Entities;
+using Microsoft.EntityFrameworkCore;
+
+namespace Jellyfin.Server.Implementations.Item;
+
+/// <summary>
+/// Manager for handling Media Attachments.
+/// </summary>
+/// <param name="dbProvider">Efcore Factory.</param>
+public class MediaAttachmentRepository(IDbContextFactory<JellyfinDbContext> dbProvider) : IMediaAttachmentRepository
+{
+    /// <inheritdoc />
+    public void SaveMediaAttachments(
+        Guid id,
+        IReadOnlyList<MediaAttachment> attachments,
+        CancellationToken cancellationToken)
+    {
+        using var context = dbProvider.CreateDbContext();
+        using var transaction = context.Database.BeginTransaction();
+        context.AttachmentStreamInfos.Where(e => e.ItemId.Equals(id)).ExecuteDelete();
+        context.AttachmentStreamInfos.AddRange(attachments.Select(e => Map(e, id)));
+        context.SaveChanges();
+        transaction.Commit();
+    }
+
+    /// <inheritdoc />
+    public IReadOnlyList<MediaAttachment> GetMediaAttachments(MediaAttachmentQuery filter)
+    {
+        using var context = dbProvider.CreateDbContext();
+        var query = context.AttachmentStreamInfos.Where(e => e.ItemId.Equals(filter.ItemId));
+        if (filter.Index.HasValue)
+        {
+            query = query.Where(e => e.Index == filter.Index);
+        }
+
+        return query.ToList().Select(Map).ToImmutableArray();
+    }
+
+    private MediaAttachment Map(AttachmentStreamInfo attachment)
+    {
+        return new MediaAttachment()
+        {
+            Codec = attachment.Codec,
+            CodecTag = attachment.CodecTag,
+            Comment = attachment.Comment,
+            FileName = attachment.Filename,
+            Index = attachment.Index,
+            MimeType = attachment.MimeType,
+        };
+    }
+
+    private AttachmentStreamInfo Map(MediaAttachment attachment, Guid id)
+    {
+        return new AttachmentStreamInfo()
+        {
+            Codec = attachment.Codec,
+            CodecTag = attachment.CodecTag,
+            Comment = attachment.Comment,
+            Filename = attachment.FileName,
+            Index = attachment.Index,
+            MimeType = attachment.MimeType,
+            ItemId = id,
+            Item = null!
+        };
+    }
+}
diff --git a/Jellyfin.Server.Implementations/Item/MediaStreamManager.cs b/Jellyfin.Server.Implementations/Item/MediaStreamManager.cs
deleted file mode 100644
index b7124283a..000000000
--- a/Jellyfin.Server.Implementations/Item/MediaStreamManager.cs
+++ /dev/null
@@ -1,201 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Collections.Immutable;
-using System.Linq;
-using System.Threading;
-using Jellyfin.Data.Entities;
-using MediaBrowser.Controller;
-using MediaBrowser.Controller.Persistence;
-using MediaBrowser.Model.Entities;
-using MediaBrowser.Model.Globalization;
-using Microsoft.EntityFrameworkCore;
-
-namespace Jellyfin.Server.Implementations.Item;
-
-/// <summary>
-/// Initializes a new instance of the <see cref="MediaStreamManager"/> class.
-/// </summary>
-/// <param name="dbProvider"></param>
-/// <param name="serverApplicationHost"></param>
-/// <param name="localization"></param>
-public class MediaStreamManager(IDbContextFactory<JellyfinDbContext> dbProvider, IServerApplicationHost serverApplicationHost, ILocalizationManager localization) : IMediaStreamManager
-{
-    /// <inheritdoc />
-    public void SaveMediaStreams(Guid id, IReadOnlyList<MediaStream> streams, CancellationToken cancellationToken)
-    {
-        using var context = dbProvider.CreateDbContext();
-        using var transaction = context.Database.BeginTransaction();
-
-        context.MediaStreamInfos.Where(e => e.ItemId.Equals(id)).ExecuteDelete();
-        context.MediaStreamInfos.AddRange(streams.Select(f => Map(f, id)));
-        context.SaveChanges();
-
-        transaction.Commit();
-    }
-
-    /// <inheritdoc />
-    public IReadOnlyList<MediaStream> GetMediaStreams(MediaStreamQuery filter)
-    {
-        using var context = dbProvider.CreateDbContext();
-        return TranslateQuery(context.MediaStreamInfos, filter).ToList().Select(Map).ToImmutableArray();
-    }
-
-    private string? GetPathToSave(string? path)
-    {
-        if (path is null)
-        {
-            return null;
-        }
-
-        return serverApplicationHost.ReverseVirtualPath(path);
-    }
-
-    private string? RestorePath(string? path)
-    {
-        if (path is null)
-        {
-            return null;
-        }
-
-        return serverApplicationHost.ExpandVirtualPath(path);
-    }
-
-    private IQueryable<MediaStreamInfo> TranslateQuery(IQueryable<MediaStreamInfo> query, MediaStreamQuery filter)
-    {
-        query = query.Where(e => e.ItemId.Equals(filter.ItemId));
-        if (filter.Index.HasValue)
-        {
-            query = query.Where(e => e.StreamIndex == filter.Index);
-        }
-
-        if (filter.Type.HasValue)
-        {
-            query = query.Where(e => e.StreamType == filter.Type.ToString());
-        }
-
-        return query;
-    }
-
-    private MediaStream Map(MediaStreamInfo entity)
-    {
-        var dto = new MediaStream();
-        dto.Index = entity.StreamIndex;
-        if (entity.StreamType != null)
-        {
-            dto.Type = Enum.Parse<MediaStreamType>(entity.StreamType);
-        }
-
-        dto.IsAVC = entity.IsAvc;
-        dto.Codec = entity.Codec;
-        dto.Language = entity.Language;
-        dto.ChannelLayout = entity.ChannelLayout;
-        dto.Profile = entity.Profile;
-        dto.AspectRatio = entity.AspectRatio;
-        dto.Path = RestorePath(entity.Path);
-        dto.IsInterlaced = entity.IsInterlaced;
-        dto.BitRate = entity.BitRate;
-        dto.Channels = entity.Channels;
-        dto.SampleRate = entity.SampleRate;
-        dto.IsDefault = entity.IsDefault;
-        dto.IsForced = entity.IsForced;
-        dto.IsExternal = entity.IsExternal;
-        dto.Height = entity.Height;
-        dto.Width = entity.Width;
-        dto.AverageFrameRate = entity.AverageFrameRate;
-        dto.RealFrameRate = entity.RealFrameRate;
-        dto.Level = entity.Level;
-        dto.PixelFormat = entity.PixelFormat;
-        dto.BitDepth = entity.BitDepth;
-        dto.IsAnamorphic = entity.IsAnamorphic;
-        dto.RefFrames = entity.RefFrames;
-        dto.CodecTag = entity.CodecTag;
-        dto.Comment = entity.Comment;
-        dto.NalLengthSize = entity.NalLengthSize;
-        dto.Title = entity.Title;
-        dto.TimeBase = entity.TimeBase;
-        dto.CodecTimeBase = entity.CodecTimeBase;
-        dto.ColorPrimaries = entity.ColorPrimaries;
-        dto.ColorSpace = entity.ColorSpace;
-        dto.ColorTransfer = entity.ColorTransfer;
-        dto.DvVersionMajor = entity.DvVersionMajor;
-        dto.DvVersionMinor = entity.DvVersionMinor;
-        dto.DvProfile = entity.DvProfile;
-        dto.DvLevel = entity.DvLevel;
-        dto.RpuPresentFlag = entity.RpuPresentFlag;
-        dto.ElPresentFlag = entity.ElPresentFlag;
-        dto.BlPresentFlag = entity.BlPresentFlag;
-        dto.DvBlSignalCompatibilityId = entity.DvBlSignalCompatibilityId;
-        dto.IsHearingImpaired = entity.IsHearingImpaired;
-        dto.Rotation = entity.Rotation;
-
-        if (dto.Type is MediaStreamType.Audio or MediaStreamType.Subtitle)
-        {
-            dto.LocalizedDefault = localization.GetLocalizedString("Default");
-            dto.LocalizedExternal = localization.GetLocalizedString("External");
-
-            if (dto.Type is MediaStreamType.Subtitle)
-            {
-                dto.LocalizedUndefined = localization.GetLocalizedString("Undefined");
-                dto.LocalizedForced = localization.GetLocalizedString("Forced");
-                dto.LocalizedHearingImpaired = localization.GetLocalizedString("HearingImpaired");
-            }
-        }
-
-        return dto;
-    }
-
-    private MediaStreamInfo Map(MediaStream dto, Guid itemId)
-    {
-        var entity = new MediaStreamInfo
-        {
-            Item = null!,
-            ItemId = itemId,
-            StreamIndex = dto.Index,
-            StreamType = dto.Type.ToString(),
-            IsAvc = dto.IsAVC.GetValueOrDefault(),
-
-            Codec = dto.Codec,
-            Language = dto.Language,
-            ChannelLayout = dto.ChannelLayout,
-            Profile = dto.Profile,
-            AspectRatio = dto.AspectRatio,
-            Path = GetPathToSave(dto.Path),
-            IsInterlaced = dto.IsInterlaced,
-            BitRate = dto.BitRate.GetValueOrDefault(0),
-            Channels = dto.Channels.GetValueOrDefault(0),
-            SampleRate = dto.SampleRate.GetValueOrDefault(0),
-            IsDefault = dto.IsDefault,
-            IsForced = dto.IsForced,
-            IsExternal = dto.IsExternal,
-            Height = dto.Height.GetValueOrDefault(0),
-            Width = dto.Width.GetValueOrDefault(0),
-            AverageFrameRate = dto.AverageFrameRate.GetValueOrDefault(0),
-            RealFrameRate = dto.RealFrameRate.GetValueOrDefault(0),
-            Level = (float)dto.Level.GetValueOrDefault(),
-            PixelFormat = dto.PixelFormat,
-            BitDepth = dto.BitDepth.GetValueOrDefault(0),
-            IsAnamorphic = dto.IsAnamorphic.GetValueOrDefault(0),
-            RefFrames = dto.RefFrames.GetValueOrDefault(0),
-            CodecTag = dto.CodecTag,
-            Comment = dto.Comment,
-            NalLengthSize = dto.NalLengthSize,
-            Title = dto.Title,
-            TimeBase = dto.TimeBase,
-            CodecTimeBase = dto.CodecTimeBase,
-            ColorPrimaries = dto.ColorPrimaries,
-            ColorSpace = dto.ColorSpace,
-            ColorTransfer = dto.ColorTransfer,
-            DvVersionMajor = dto.DvVersionMajor.GetValueOrDefault(0),
-            DvVersionMinor = dto.DvVersionMinor.GetValueOrDefault(0),
-            DvProfile = dto.DvProfile.GetValueOrDefault(0),
-            DvLevel = dto.DvLevel.GetValueOrDefault(0),
-            RpuPresentFlag = dto.RpuPresentFlag.GetValueOrDefault(0),
-            ElPresentFlag = dto.ElPresentFlag.GetValueOrDefault(0),
-            BlPresentFlag = dto.BlPresentFlag.GetValueOrDefault(0),
-            DvBlSignalCompatibilityId = dto.DvBlSignalCompatibilityId.GetValueOrDefault(0),
-            IsHearingImpaired = dto.IsHearingImpaired,
-            Rotation = dto.Rotation.GetValueOrDefault(0)
-        };
-        return entity;
-    }
-}
diff --git a/Jellyfin.Server.Implementations/Item/MediaStreamRepository.cs b/Jellyfin.Server.Implementations/Item/MediaStreamRepository.cs
new file mode 100644
index 000000000..f7b714c29
--- /dev/null
+++ b/Jellyfin.Server.Implementations/Item/MediaStreamRepository.cs
@@ -0,0 +1,201 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.Immutable;
+using System.Linq;
+using System.Threading;
+using Jellyfin.Data.Entities;
+using MediaBrowser.Controller;
+using MediaBrowser.Controller.Persistence;
+using MediaBrowser.Model.Entities;
+using MediaBrowser.Model.Globalization;
+using Microsoft.EntityFrameworkCore;
+
+namespace Jellyfin.Server.Implementations.Item;
+
+/// <summary>
+/// Initializes a new instance of the <see cref="MediaStreamRepository"/> class.
+/// </summary>
+/// <param name="dbProvider">The EFCore db factory.</param>
+/// <param name="serverApplicationHost">The Application host.</param>
+/// <param name="localization">The Localisation Provider.</param>
+public class MediaStreamRepository(IDbContextFactory<JellyfinDbContext> dbProvider, IServerApplicationHost serverApplicationHost, ILocalizationManager localization) : IMediaStreamRepository
+{
+    /// <inheritdoc />
+    public void SaveMediaStreams(Guid id, IReadOnlyList<MediaStream> streams, CancellationToken cancellationToken)
+    {
+        using var context = dbProvider.CreateDbContext();
+        using var transaction = context.Database.BeginTransaction();
+
+        context.MediaStreamInfos.Where(e => e.ItemId.Equals(id)).ExecuteDelete();
+        context.MediaStreamInfos.AddRange(streams.Select(f => Map(f, id)));
+        context.SaveChanges();
+
+        transaction.Commit();
+    }
+
+    /// <inheritdoc />
+    public IReadOnlyList<MediaStream> GetMediaStreams(MediaStreamQuery filter)
+    {
+        using var context = dbProvider.CreateDbContext();
+        return TranslateQuery(context.MediaStreamInfos, filter).ToList().Select(Map).ToImmutableArray();
+    }
+
+    private string? GetPathToSave(string? path)
+    {
+        if (path is null)
+        {
+            return null;
+        }
+
+        return serverApplicationHost.ReverseVirtualPath(path);
+    }
+
+    private string? RestorePath(string? path)
+    {
+        if (path is null)
+        {
+            return null;
+        }
+
+        return serverApplicationHost.ExpandVirtualPath(path);
+    }
+
+    private IQueryable<MediaStreamInfo> TranslateQuery(IQueryable<MediaStreamInfo> query, MediaStreamQuery filter)
+    {
+        query = query.Where(e => e.ItemId.Equals(filter.ItemId));
+        if (filter.Index.HasValue)
+        {
+            query = query.Where(e => e.StreamIndex == filter.Index);
+        }
+
+        if (filter.Type.HasValue)
+        {
+            query = query.Where(e => e.StreamType == filter.Type.ToString());
+        }
+
+        return query;
+    }
+
+    private MediaStream Map(MediaStreamInfo entity)
+    {
+        var dto = new MediaStream();
+        dto.Index = entity.StreamIndex;
+        if (entity.StreamType != null)
+        {
+            dto.Type = Enum.Parse<MediaStreamType>(entity.StreamType);
+        }
+
+        dto.IsAVC = entity.IsAvc;
+        dto.Codec = entity.Codec;
+        dto.Language = entity.Language;
+        dto.ChannelLayout = entity.ChannelLayout;
+        dto.Profile = entity.Profile;
+        dto.AspectRatio = entity.AspectRatio;
+        dto.Path = RestorePath(entity.Path);
+        dto.IsInterlaced = entity.IsInterlaced;
+        dto.BitRate = entity.BitRate;
+        dto.Channels = entity.Channels;
+        dto.SampleRate = entity.SampleRate;
+        dto.IsDefault = entity.IsDefault;
+        dto.IsForced = entity.IsForced;
+        dto.IsExternal = entity.IsExternal;
+        dto.Height = entity.Height;
+        dto.Width = entity.Width;
+        dto.AverageFrameRate = entity.AverageFrameRate;
+        dto.RealFrameRate = entity.RealFrameRate;
+        dto.Level = entity.Level;
+        dto.PixelFormat = entity.PixelFormat;
+        dto.BitDepth = entity.BitDepth;
+        dto.IsAnamorphic = entity.IsAnamorphic;
+        dto.RefFrames = entity.RefFrames;
+        dto.CodecTag = entity.CodecTag;
+        dto.Comment = entity.Comment;
+        dto.NalLengthSize = entity.NalLengthSize;
+        dto.Title = entity.Title;
+        dto.TimeBase = entity.TimeBase;
+        dto.CodecTimeBase = entity.CodecTimeBase;
+        dto.ColorPrimaries = entity.ColorPrimaries;
+        dto.ColorSpace = entity.ColorSpace;
+        dto.ColorTransfer = entity.ColorTransfer;
+        dto.DvVersionMajor = entity.DvVersionMajor;
+        dto.DvVersionMinor = entity.DvVersionMinor;
+        dto.DvProfile = entity.DvProfile;
+        dto.DvLevel = entity.DvLevel;
+        dto.RpuPresentFlag = entity.RpuPresentFlag;
+        dto.ElPresentFlag = entity.ElPresentFlag;
+        dto.BlPresentFlag = entity.BlPresentFlag;
+        dto.DvBlSignalCompatibilityId = entity.DvBlSignalCompatibilityId;
+        dto.IsHearingImpaired = entity.IsHearingImpaired;
+        dto.Rotation = entity.Rotation;
+
+        if (dto.Type is MediaStreamType.Audio or MediaStreamType.Subtitle)
+        {
+            dto.LocalizedDefault = localization.GetLocalizedString("Default");
+            dto.LocalizedExternal = localization.GetLocalizedString("External");
+
+            if (dto.Type is MediaStreamType.Subtitle)
+            {
+                dto.LocalizedUndefined = localization.GetLocalizedString("Undefined");
+                dto.LocalizedForced = localization.GetLocalizedString("Forced");
+                dto.LocalizedHearingImpaired = localization.GetLocalizedString("HearingImpaired");
+            }
+        }
+
+        return dto;
+    }
+
+    private MediaStreamInfo Map(MediaStream dto, Guid itemId)
+    {
+        var entity = new MediaStreamInfo
+        {
+            Item = null!,
+            ItemId = itemId,
+            StreamIndex = dto.Index,
+            StreamType = dto.Type.ToString(),
+            IsAvc = dto.IsAVC.GetValueOrDefault(),
+
+            Codec = dto.Codec,
+            Language = dto.Language,
+            ChannelLayout = dto.ChannelLayout,
+            Profile = dto.Profile,
+            AspectRatio = dto.AspectRatio,
+            Path = GetPathToSave(dto.Path),
+            IsInterlaced = dto.IsInterlaced,
+            BitRate = dto.BitRate.GetValueOrDefault(0),
+            Channels = dto.Channels.GetValueOrDefault(0),
+            SampleRate = dto.SampleRate.GetValueOrDefault(0),
+            IsDefault = dto.IsDefault,
+            IsForced = dto.IsForced,
+            IsExternal = dto.IsExternal,
+            Height = dto.Height.GetValueOrDefault(0),
+            Width = dto.Width.GetValueOrDefault(0),
+            AverageFrameRate = dto.AverageFrameRate.GetValueOrDefault(0),
+            RealFrameRate = dto.RealFrameRate.GetValueOrDefault(0),
+            Level = (float)dto.Level.GetValueOrDefault(),
+            PixelFormat = dto.PixelFormat,
+            BitDepth = dto.BitDepth.GetValueOrDefault(0),
+            IsAnamorphic = dto.IsAnamorphic.GetValueOrDefault(0),
+            RefFrames = dto.RefFrames.GetValueOrDefault(0),
+            CodecTag = dto.CodecTag,
+            Comment = dto.Comment,
+            NalLengthSize = dto.NalLengthSize,
+            Title = dto.Title,
+            TimeBase = dto.TimeBase,
+            CodecTimeBase = dto.CodecTimeBase,
+            ColorPrimaries = dto.ColorPrimaries,
+            ColorSpace = dto.ColorSpace,
+            ColorTransfer = dto.ColorTransfer,
+            DvVersionMajor = dto.DvVersionMajor.GetValueOrDefault(0),
+            DvVersionMinor = dto.DvVersionMinor.GetValueOrDefault(0),
+            DvProfile = dto.DvProfile.GetValueOrDefault(0),
+            DvLevel = dto.DvLevel.GetValueOrDefault(0),
+            RpuPresentFlag = dto.RpuPresentFlag.GetValueOrDefault(0),
+            ElPresentFlag = dto.ElPresentFlag.GetValueOrDefault(0),
+            BlPresentFlag = dto.BlPresentFlag.GetValueOrDefault(0),
+            DvBlSignalCompatibilityId = dto.DvBlSignalCompatibilityId.GetValueOrDefault(0),
+            IsHearingImpaired = dto.IsHearingImpaired,
+            Rotation = dto.Rotation.GetValueOrDefault(0)
+        };
+        return entity;
+    }
+}
diff --git a/Jellyfin.Server.Implementations/Item/PeopleManager.cs b/Jellyfin.Server.Implementations/Item/PeopleManager.cs
deleted file mode 100644
index d29d8b143..000000000
--- a/Jellyfin.Server.Implementations/Item/PeopleManager.cs
+++ /dev/null
@@ -1,164 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Collections.Immutable;
-using System.Linq;
-using Jellyfin.Data.Entities;
-using Jellyfin.Data.Enums;
-using Jellyfin.Extensions;
-using MediaBrowser.Controller.Entities;
-using MediaBrowser.Controller.Persistence;
-using Microsoft.EntityFrameworkCore;
-
-namespace Jellyfin.Server.Implementations.Item;
-
-/// <summary>
-/// Manager for handling people.
-/// </summary>
-/// <param name="dbProvider">Efcore Factory.</param>
-/// <remarks>
-/// Initializes a new instance of the <see cref="PeopleManager"/> class.
-/// </remarks>
-/// <param name="dbProvider">The EFCore Context factory.</param>
-public class PeopleManager(IDbContextFactory<JellyfinDbContext> dbProvider) : IPeopleManager
-{
-    private readonly IDbContextFactory<JellyfinDbContext> _dbProvider = dbProvider;
-
-    public IReadOnlyList<PersonInfo> GetPeople(InternalPeopleQuery filter)
-    {
-        using var context = _dbProvider.CreateDbContext();
-        var dbQuery = TranslateQuery(context.Peoples.AsNoTracking(), context, filter);
-
-        dbQuery = dbQuery.OrderBy(e => e.ListOrder);
-        if (filter.Limit > 0)
-        {
-            dbQuery = dbQuery.Take(filter.Limit);
-        }
-
-        return dbQuery.ToList().Select(Map).ToImmutableArray();
-    }
-
-    public IReadOnlyList<string> GetPeopleNames(InternalPeopleQuery filter)
-    {
-        using var context = _dbProvider.CreateDbContext();
-        var dbQuery = TranslateQuery(context.Peoples.AsNoTracking(), context, filter);
-
-        dbQuery = dbQuery.OrderBy(e => e.ListOrder);
-        if (filter.Limit > 0)
-        {
-            dbQuery = dbQuery.Take(filter.Limit);
-        }
-
-        return dbQuery.Select(e => e.Name).ToImmutableArray();
-    }
-
-    /// <inheritdoc />
-    public void UpdatePeople(Guid itemId, IReadOnlyList<PersonInfo> people)
-    {
-        using var context = _dbProvider.CreateDbContext();
-        using var transaction = context.Database.BeginTransaction();
-
-        context.Peoples.Where(e => e.ItemId.Equals(itemId)).ExecuteDelete();
-        context.Peoples.AddRange(people.Select(Map));
-        context.SaveChanges();
-        transaction.Commit();
-    }
-
-    private PersonInfo Map(People people)
-    {
-        var personInfo = new PersonInfo()
-        {
-            ItemId = people.ItemId,
-            Name = people.Name,
-            Role = people.Role,
-            SortOrder = people.SortOrder,
-        };
-        if (Enum.TryParse<PersonKind>(people.PersonType, out var kind))
-        {
-            personInfo.Type = kind;
-        }
-
-        return personInfo;
-    }
-
-    private People Map(PersonInfo people)
-    {
-        var personInfo = new People()
-        {
-            ItemId = people.ItemId,
-            Name = people.Name,
-            Role = people.Role,
-            SortOrder = people.SortOrder,
-            PersonType = people.Type.ToString()
-        };
-
-        return personInfo;
-    }
-
-    private IQueryable<People> TranslateQuery(IQueryable<People> query, JellyfinDbContext context, InternalPeopleQuery filter)
-    {
-        if (filter.User is not null && filter.IsFavorite.HasValue)
-        {
-            query = query.Where(e => e.PersonType == typeof(Person).FullName)
-                .Where(e => context.BaseItems.Where(d => context.UserData.Where(e => e.IsFavorite == filter.IsFavorite && e.UserId.Equals(filter.User.Id)).Any(f => f.Key == d.UserDataKey))
-                    .Select(f => f.Name).Contains(e.Name));
-        }
-
-        if (!filter.ItemId.IsEmpty())
-        {
-            query = query.Where(e => e.ItemId.Equals(filter.ItemId));
-        }
-
-        if (!filter.AppearsInItemId.IsEmpty())
-        {
-            query = query.Where(e => context.Peoples.Where(f => f.ItemId.Equals(filter.AppearsInItemId)).Select(e => e.Name).Contains(e.Name));
-        }
-
-        var queryPersonTypes = filter.PersonTypes.Where(IsValidPersonType).ToList();
-        if (queryPersonTypes.Count > 0)
-        {
-            query = query.Where(e => queryPersonTypes.Contains(e.PersonType));
-        }
-
-        var queryExcludePersonTypes = filter.ExcludePersonTypes.Where(IsValidPersonType).ToList();
-
-        if (queryExcludePersonTypes.Count > 0)
-        {
-            query = query.Where(e => !queryPersonTypes.Contains(e.PersonType));
-        }
-
-        if (filter.MaxListOrder.HasValue)
-        {
-            query = query.Where(e => e.ListOrder <= filter.MaxListOrder.Value);
-        }
-
-        if (!string.IsNullOrWhiteSpace(filter.NameContains))
-        {
-            query = query.Where(e => e.Name.Contains(filter.NameContains));
-        }
-
-        return query;
-    }
-
-    private bool IsAlphaNumeric(string str)
-    {
-        if (string.IsNullOrWhiteSpace(str))
-        {
-            return false;
-        }
-
-        for (int i = 0; i < str.Length; i++)
-        {
-            if (!char.IsLetter(str[i]) && !char.IsNumber(str[i]))
-            {
-                return false;
-            }
-        }
-
-        return true;
-    }
-
-    private bool IsValidPersonType(string value)
-    {
-        return IsAlphaNumeric(value);
-    }
-}
diff --git a/Jellyfin.Server.Implementations/Item/PeopleRepository.cs b/Jellyfin.Server.Implementations/Item/PeopleRepository.cs
new file mode 100644
index 000000000..3ced6e24e
--- /dev/null
+++ b/Jellyfin.Server.Implementations/Item/PeopleRepository.cs
@@ -0,0 +1,165 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.Immutable;
+using System.Linq;
+using Jellyfin.Data.Entities;
+using Jellyfin.Data.Enums;
+using Jellyfin.Extensions;
+using MediaBrowser.Controller.Entities;
+using MediaBrowser.Controller.Persistence;
+using Microsoft.EntityFrameworkCore;
+
+namespace Jellyfin.Server.Implementations.Item;
+
+/// <summary>
+/// Manager for handling people.
+/// </summary>
+/// <param name="dbProvider">Efcore Factory.</param>
+/// <remarks>
+/// Initializes a new instance of the <see cref="PeopleRepository"/> class.
+/// </remarks>
+public class PeopleRepository(IDbContextFactory<JellyfinDbContext> dbProvider) : IPeopleRepository
+{
+    private readonly IDbContextFactory<JellyfinDbContext> _dbProvider = dbProvider;
+
+    /// <inheritdoc/>
+    public IReadOnlyList<PersonInfo> GetPeople(InternalPeopleQuery filter)
+    {
+        using var context = _dbProvider.CreateDbContext();
+        var dbQuery = TranslateQuery(context.Peoples.AsNoTracking(), context, filter);
+
+        dbQuery = dbQuery.OrderBy(e => e.ListOrder);
+        if (filter.Limit > 0)
+        {
+            dbQuery = dbQuery.Take(filter.Limit);
+        }
+
+        return dbQuery.ToList().Select(Map).ToImmutableArray();
+    }
+
+    /// <inheritdoc/>
+    public IReadOnlyList<string> GetPeopleNames(InternalPeopleQuery filter)
+    {
+        using var context = _dbProvider.CreateDbContext();
+        var dbQuery = TranslateQuery(context.Peoples.AsNoTracking(), context, filter);
+
+        dbQuery = dbQuery.OrderBy(e => e.ListOrder);
+        if (filter.Limit > 0)
+        {
+            dbQuery = dbQuery.Take(filter.Limit);
+        }
+
+        return dbQuery.Select(e => e.Name).ToImmutableArray();
+    }
+
+    /// <inheritdoc />
+    public void UpdatePeople(Guid itemId, IReadOnlyList<PersonInfo> people)
+    {
+        using var context = _dbProvider.CreateDbContext();
+        using var transaction = context.Database.BeginTransaction();
+
+        context.Peoples.Where(e => e.ItemId.Equals(itemId)).ExecuteDelete();
+        context.Peoples.AddRange(people.Select(Map));
+        context.SaveChanges();
+        transaction.Commit();
+    }
+
+    private PersonInfo Map(People people)
+    {
+        var personInfo = new PersonInfo()
+        {
+            ItemId = people.ItemId,
+            Name = people.Name,
+            Role = people.Role,
+            SortOrder = people.SortOrder,
+        };
+        if (Enum.TryParse<PersonKind>(people.PersonType, out var kind))
+        {
+            personInfo.Type = kind;
+        }
+
+        return personInfo;
+    }
+
+    private People Map(PersonInfo people)
+    {
+        var personInfo = new People()
+        {
+            ItemId = people.ItemId,
+            Name = people.Name,
+            Role = people.Role,
+            SortOrder = people.SortOrder,
+            PersonType = people.Type.ToString()
+        };
+
+        return personInfo;
+    }
+
+    private IQueryable<People> TranslateQuery(IQueryable<People> query, JellyfinDbContext context, InternalPeopleQuery filter)
+    {
+        if (filter.User is not null && filter.IsFavorite.HasValue)
+        {
+            query = query.Where(e => e.PersonType == typeof(Person).FullName)
+                .Where(e => context.BaseItems.Where(d => context.UserData.Where(e => e.IsFavorite == filter.IsFavorite && e.UserId.Equals(filter.User.Id)).Any(f => f.Key == d.UserDataKey))
+                    .Select(f => f.Name).Contains(e.Name));
+        }
+
+        if (!filter.ItemId.IsEmpty())
+        {
+            query = query.Where(e => e.ItemId.Equals(filter.ItemId));
+        }
+
+        if (!filter.AppearsInItemId.IsEmpty())
+        {
+            query = query.Where(e => context.Peoples.Where(f => f.ItemId.Equals(filter.AppearsInItemId)).Select(e => e.Name).Contains(e.Name));
+        }
+
+        var queryPersonTypes = filter.PersonTypes.Where(IsValidPersonType).ToList();
+        if (queryPersonTypes.Count > 0)
+        {
+            query = query.Where(e => queryPersonTypes.Contains(e.PersonType));
+        }
+
+        var queryExcludePersonTypes = filter.ExcludePersonTypes.Where(IsValidPersonType).ToList();
+
+        if (queryExcludePersonTypes.Count > 0)
+        {
+            query = query.Where(e => !queryPersonTypes.Contains(e.PersonType));
+        }
+
+        if (filter.MaxListOrder.HasValue)
+        {
+            query = query.Where(e => e.ListOrder <= filter.MaxListOrder.Value);
+        }
+
+        if (!string.IsNullOrWhiteSpace(filter.NameContains))
+        {
+            query = query.Where(e => e.Name.Contains(filter.NameContains));
+        }
+
+        return query;
+    }
+
+    private bool IsAlphaNumeric(string str)
+    {
+        if (string.IsNullOrWhiteSpace(str))
+        {
+            return false;
+        }
+
+        for (int i = 0; i < str.Length; i++)
+        {
+            if (!char.IsLetter(str[i]) && !char.IsNumber(str[i]))
+            {
+                return false;
+            }
+        }
+
+        return true;
+    }
+
+    private bool IsValidPersonType(string value)
+    {
+        return IsAlphaNumeric(value);
+    }
+}
diff --git a/Jellyfin.Server.Implementations/JellyfinDbContext.cs b/Jellyfin.Server.Implementations/JellyfinDbContext.cs
index fcc20a0d4..c1d6d58cd 100644
--- a/Jellyfin.Server.Implementations/JellyfinDbContext.cs
+++ b/Jellyfin.Server.Implementations/JellyfinDbContext.cs
@@ -106,7 +106,7 @@ public class JellyfinDbContext : DbContext
     /// <summary>
     /// Gets the <see cref="DbSet{TEntity}"/> containing the user data.
     /// </summary>
-    public DbSet<BaseItem> BaseItems => Set<BaseItem>();
+    public DbSet<BaseItemEntity> BaseItems => Set<BaseItemEntity>();
 
     /// <summary>
     /// Gets the <see cref="DbSet{TEntity}"/> containing the user data.
diff --git a/Jellyfin.Server.Implementations/ModelConfiguration/BaseItemConfiguration.cs b/Jellyfin.Server.Implementations/ModelConfiguration/BaseItemConfiguration.cs
index c0f09670d..4aba9d07e 100644
--- a/Jellyfin.Server.Implementations/ModelConfiguration/BaseItemConfiguration.cs
+++ b/Jellyfin.Server.Implementations/ModelConfiguration/BaseItemConfiguration.cs
@@ -8,10 +8,10 @@ namespace Jellyfin.Server.Implementations.ModelConfiguration;
 /// <summary>
 /// Configuration for BaseItem.
 /// </summary>
-public class BaseItemConfiguration : IEntityTypeConfiguration<BaseItem>
+public class BaseItemConfiguration : IEntityTypeConfiguration<BaseItemEntity>
 {
     /// <inheritdoc/>
-    public void Configure(EntityTypeBuilder<BaseItem> builder)
+    public void Configure(EntityTypeBuilder<BaseItemEntity> builder)
     {
         builder.HasNoKey();
         builder.HasIndex(e => e.Path);
diff --git a/Jellyfin.Server.Implementations/ModelConfiguration/BaseItemProviderConfiguration.cs b/Jellyfin.Server.Implementations/ModelConfiguration/BaseItemProviderConfiguration.cs
index f34837c57..d15049a1f 100644
--- a/Jellyfin.Server.Implementations/ModelConfiguration/BaseItemProviderConfiguration.cs
+++ b/Jellyfin.Server.Implementations/ModelConfiguration/BaseItemProviderConfiguration.cs
@@ -13,7 +13,7 @@ public class BaseItemProviderConfiguration : IEntityTypeConfiguration<BaseItemPr
     /// <inheritdoc/>
     public void Configure(EntityTypeBuilder<BaseItemProvider> builder)
     {
-        builder.HasNoKey();
+        builder.HasKey(e => new { e.ItemId, e.ProviderId });
         builder.HasOne(e => e.Item);
         builder.HasIndex(e => new { e.ProviderId, e.ProviderValue, e.ItemId });
     }
diff --git a/MediaBrowser.Controller/Chapters/ChapterManager.cs b/MediaBrowser.Controller/Chapters/ChapterManager.cs
deleted file mode 100644
index a9e11f603..000000000
--- a/MediaBrowser.Controller/Chapters/ChapterManager.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-#pragma warning disable CS1591
-
-using System;
-using System.Collections.Generic;
-using MediaBrowser.Controller.Chapters;
-using MediaBrowser.Controller.Persistence;
-using MediaBrowser.Model.Entities;
-
-namespace MediaBrowser.Providers.Chapters
-{
-    public class ChapterManager : IChapterManager
-    {
-        public ChapterManager(IDbContextFactory<JellyfinDbContext> dbProvider)
-        {
-            _itemRepo = itemRepo;
-        }
-
-        /// <inheritdoc />
-        public void SaveChapters(Guid itemId, IReadOnlyList<ChapterInfo> chapters)
-        {
-            _itemRepo.SaveChapters(itemId, chapters);
-        }
-    }
-}
diff --git a/MediaBrowser.Controller/Chapters/IChapterManager.cs b/MediaBrowser.Controller/Chapters/IChapterManager.cs
deleted file mode 100644
index 55762c7fc..000000000
--- a/MediaBrowser.Controller/Chapters/IChapterManager.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-using System;
-using System.Collections.Generic;
-using MediaBrowser.Model.Dto;
-using MediaBrowser.Model.Entities;
-
-namespace MediaBrowser.Controller.Chapters
-{
-    /// <summary>
-    /// Interface IChapterManager.
-    /// </summary>
-    public interface IChapterManager
-    {
-        /// <summary>
-        /// Saves the chapters.
-        /// </summary>
-        /// <param name="itemId">The item.</param>
-        /// <param name="chapters">The set of chapters.</param>
-        void SaveChapters(Guid itemId, IReadOnlyList<ChapterInfo> chapters);
-
-        /// <summary>
-        /// Gets all chapters associated with the baseItem.
-        /// </summary>
-        /// <param name="baseItem">The baseitem.</param>
-        /// <returns>A readonly list of chapter instances.</returns>
-        IReadOnlyList<ChapterInfo> GetChapters(BaseItemDto baseItem);
-
-        /// <summary>
-        /// Gets a single chapter of a BaseItem on a specific index.
-        /// </summary>
-        /// <param name="baseItem">The baseitem.</param>
-        /// <param name="index">The index of that chapter.</param>
-        /// <returns>A chapter instance.</returns>
-        ChapterInfo? GetChapter(BaseItemDto baseItem, int index);
-    }
-}
diff --git a/MediaBrowser.Controller/Chapters/IChapterRepository.cs b/MediaBrowser.Controller/Chapters/IChapterRepository.cs
new file mode 100644
index 000000000..e22cb0f58
--- /dev/null
+++ b/MediaBrowser.Controller/Chapters/IChapterRepository.cs
@@ -0,0 +1,49 @@
+using System;
+using System.Collections.Generic;
+using MediaBrowser.Model.Dto;
+using MediaBrowser.Model.Entities;
+
+namespace MediaBrowser.Controller.Chapters;
+
+/// <summary>
+/// Interface IChapterManager.
+/// </summary>
+public interface IChapterRepository
+{
+    /// <summary>
+    /// Saves the chapters.
+    /// </summary>
+    /// <param name="itemId">The item.</param>
+    /// <param name="chapters">The set of chapters.</param>
+    void SaveChapters(Guid itemId, IReadOnlyList<ChapterInfo> chapters);
+
+    /// <summary>
+    /// Gets all chapters associated with the baseItem.
+    /// </summary>
+    /// <param name="baseItem">The baseitem.</param>
+    /// <returns>A readonly list of chapter instances.</returns>
+    IReadOnlyList<ChapterInfo> GetChapters(BaseItemDto baseItem);
+
+    /// <summary>
+    /// Gets a single chapter of a BaseItem on a specific index.
+    /// </summary>
+    /// <param name="baseItem">The baseitem.</param>
+    /// <param name="index">The index of that chapter.</param>
+    /// <returns>A chapter instance.</returns>
+    ChapterInfo? GetChapter(BaseItemDto baseItem, int index);
+
+    /// <summary>
+    /// Gets all chapters associated with the baseItem.
+    /// </summary>
+    /// <param name="baseItemId">The BaseItems id.</param>
+    /// <returns>A readonly list of chapter instances.</returns>
+    IReadOnlyList<ChapterInfo> GetChapters(Guid baseItemId);
+
+    /// <summary>
+    /// Gets a single chapter of a BaseItem on a specific index.
+    /// </summary>
+    /// <param name="baseItemId">The BaseItems id.</param>
+    /// <param name="index">The index of that chapter.</param>
+    /// <returns>A chapter instance.</returns>
+    ChapterInfo? GetChapter(Guid baseItemId, int index);
+}
diff --git a/MediaBrowser.Controller/Drawing/IImageProcessor.cs b/MediaBrowser.Controller/Drawing/IImageProcessor.cs
index 0d1e2a5a0..702ce39a2 100644
--- a/MediaBrowser.Controller/Drawing/IImageProcessor.cs
+++ b/MediaBrowser.Controller/Drawing/IImageProcessor.cs
@@ -6,6 +6,7 @@ using System.Threading.Tasks;
 using Jellyfin.Data.Entities;
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Model.Drawing;
+using MediaBrowser.Model.Dto;
 using MediaBrowser.Model.Entities;
 
 namespace MediaBrowser.Controller.Drawing
@@ -57,6 +58,22 @@ namespace MediaBrowser.Controller.Drawing
         /// <returns>BlurHash.</returns>
         string GetImageBlurHash(string path, ImageDimensions imageDimensions);
 
+        /// <summary>
+        /// Gets the image cache tag.
+        /// </summary>
+        /// <param name="baseItemPath">The items basePath.</param>
+        /// <param name="imageDateModified">The image last modification date.</param>
+        /// <returns>Guid.</returns>
+        string? GetImageCacheTag(string baseItemPath, DateTime imageDateModified);
+
+        /// <summary>
+        /// Gets the image cache tag.
+        /// </summary>
+        /// <param name="item">The item.</param>
+        /// <param name="image">The image.</param>
+        /// <returns>Guid.</returns>
+        string? GetImageCacheTag(BaseItemDto item, ChapterInfo image);
+
         /// <summary>
         /// Gets the image cache tag.
         /// </summary>
@@ -65,6 +82,14 @@ namespace MediaBrowser.Controller.Drawing
         /// <returns>Guid.</returns>
         string GetImageCacheTag(BaseItem item, ItemImageInfo image);
 
+        /// <summary>
+        /// Gets the image cache tag.
+        /// </summary>
+        /// <param name="item">The item.</param>
+        /// <param name="image">The image.</param>
+        /// <returns>Guid.</returns>
+        string GetImageCacheTag(BaseItemDto item, ItemImageInfo image);
+
         string? GetImageCacheTag(BaseItem item, ChapterInfo chapter);
 
         string? GetImageCacheTag(User user);
diff --git a/MediaBrowser.Controller/Entities/BaseItem.cs b/MediaBrowser.Controller/Entities/BaseItem.cs
index eb605f6c8..a4764dd33 100644
--- a/MediaBrowser.Controller/Entities/BaseItem.cs
+++ b/MediaBrowser.Controller/Entities/BaseItem.cs
@@ -16,6 +16,7 @@ using Jellyfin.Data.Enums;
 using Jellyfin.Extensions;
 using MediaBrowser.Common.Extensions;
 using MediaBrowser.Controller.Channels;
+using MediaBrowser.Controller.Chapters;
 using MediaBrowser.Controller.Configuration;
 using MediaBrowser.Controller.Dto;
 using MediaBrowser.Controller.Entities.Audio;
@@ -479,6 +480,8 @@ namespace MediaBrowser.Controller.Entities
 
         public static IItemRepository ItemRepository { get; set; }
 
+        public static IChapterRepository ChapterRepository { get; set; }
+
         public static IFileSystem FileSystem { get; set; }
 
         public static IUserDataManager UserDataManager { get; set; }
@@ -2031,7 +2034,7 @@ namespace MediaBrowser.Controller.Entities
         {
             if (imageType == ImageType.Chapter)
             {
-                var chapter = ItemRepository.GetChapter(this, imageIndex);
+                var chapter = ChapterRepository.GetChapter(this.Id, imageIndex);
 
                 if (chapter is null)
                 {
@@ -2081,7 +2084,7 @@ namespace MediaBrowser.Controller.Entities
 
             if (image.Type == ImageType.Chapter)
             {
-                var chapters = ItemRepository.GetChapters(this);
+                var chapters = ChapterRepository.GetChapters(this.Id);
                 for (var i = 0; i < chapters.Count; i++)
                 {
                     if (chapters[i].ImagePath == image.Path)
diff --git a/MediaBrowser.Controller/Persistence/IItemRepository.cs b/MediaBrowser.Controller/Persistence/IItemRepository.cs
index 313b1459a..b27f156ef 100644
--- a/MediaBrowser.Controller/Persistence/IItemRepository.cs
+++ b/MediaBrowser.Controller/Persistence/IItemRepository.cs
@@ -52,7 +52,6 @@ public interface IItemRepository : IDisposable
     /// <returns>List&lt;Guid&gt;.</returns>
     IReadOnlyList<Guid> GetItemIdsList(InternalItemsQuery filter);
 
-
     /// <summary>
     /// Gets the item list.
     /// </summary>
diff --git a/MediaBrowser.Controller/Persistence/IItemTypeLookup.cs b/MediaBrowser.Controller/Persistence/IItemTypeLookup.cs
new file mode 100644
index 000000000..1b2ca2acb
--- /dev/null
+++ b/MediaBrowser.Controller/Persistence/IItemTypeLookup.cs
@@ -0,0 +1,57 @@
+using System;
+using System.Collections.Generic;
+using Jellyfin.Data.Enums;
+using MediaBrowser.Model.Querying;
+
+namespace MediaBrowser.Controller.Persistence;
+
+/// <summary>
+/// Provides static lookup data for <see cref="ItemFields"/> and <see cref="BaseItemKind"/> for the domain.
+/// </summary>
+public interface IItemTypeLookup
+{
+    /// <summary>
+    /// Gets all values of the ItemFields type.
+    /// </summary>
+    public IReadOnlyList<ItemFields> AllItemFields { get; }
+
+    /// <summary>
+    /// Gets all BaseItemKinds that are considered Programs.
+    /// </summary>
+    public IReadOnlyList<BaseItemKind> ProgramTypes { get; }
+
+    /// <summary>
+    /// Gets all BaseItemKinds that should be excluded from parent lookup.
+    /// </summary>
+    public IReadOnlyList<BaseItemKind> ProgramExcludeParentTypes { get; }
+
+    /// <summary>
+    /// Gets all BaseItemKinds that are considered to be provided by services.
+    /// </summary>
+    public IReadOnlyList<BaseItemKind> ServiceTypes { get; }
+
+    /// <summary>
+    /// Gets all BaseItemKinds that have a StartDate.
+    /// </summary>
+    public IReadOnlyList<BaseItemKind> StartDateTypes { get; }
+
+    /// <summary>
+    /// Gets all BaseItemKinds that are considered Series.
+    /// </summary>
+    public IReadOnlyList<BaseItemKind> SeriesTypes { get; }
+
+    /// <summary>
+    /// Gets all BaseItemKinds that are not to be evaluated for Artists.
+    /// </summary>
+    public IReadOnlyList<BaseItemKind> ArtistExcludeParentTypes { get; }
+
+    /// <summary>
+    /// Gets all BaseItemKinds that are considered Artists.
+    /// </summary>
+    public IReadOnlyList<BaseItemKind> ArtistsTypes { get; }
+
+    /// <summary>
+    /// Gets mapping for all BaseItemKinds and their expected serialisaition target.
+    /// </summary>
+    public IDictionary<BaseItemKind, string?> BaseItemKindNames { get; }
+}
diff --git a/MediaBrowser.Controller/Persistence/IMediaAttachmentManager.cs b/MediaBrowser.Controller/Persistence/IMediaAttachmentManager.cs
deleted file mode 100644
index 210d80afa..000000000
--- a/MediaBrowser.Controller/Persistence/IMediaAttachmentManager.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-#nullable disable
-
-#pragma warning disable CS1591
-
-using System;
-using System.Collections.Generic;
-using System.Threading;
-using MediaBrowser.Model.Entities;
-
-namespace MediaBrowser.Controller.Persistence;
-
-public interface IMediaAttachmentManager
-{
-
-    /// <summary>
-    /// Gets the media attachments.
-    /// </summary>
-    /// <param name="filter">The query.</param>
-    /// <returns>IEnumerable{MediaAttachment}.</returns>
-    IReadOnlyList<MediaAttachment> GetMediaAttachments(MediaAttachmentQuery filter);
-
-    /// <summary>
-    /// Saves the media attachments.
-    /// </summary>
-    /// <param name="id">The identifier.</param>
-    /// <param name="attachments">The attachments.</param>
-    /// <param name="cancellationToken">The cancellation token.</param>
-    void SaveMediaAttachments(Guid id, IReadOnlyList<MediaAttachment> attachments, CancellationToken cancellationToken);
-}
diff --git a/MediaBrowser.Controller/Persistence/IMediaAttachmentRepository.cs b/MediaBrowser.Controller/Persistence/IMediaAttachmentRepository.cs
new file mode 100644
index 000000000..4773f4058
--- /dev/null
+++ b/MediaBrowser.Controller/Persistence/IMediaAttachmentRepository.cs
@@ -0,0 +1,28 @@
+#nullable disable
+
+#pragma warning disable CS1591
+
+using System;
+using System.Collections.Generic;
+using System.Threading;
+using MediaBrowser.Model.Entities;
+
+namespace MediaBrowser.Controller.Persistence;
+
+public interface IMediaAttachmentRepository
+{
+    /// <summary>
+    /// Gets the media attachments.
+    /// </summary>
+    /// <param name="filter">The query.</param>
+    /// <returns>IEnumerable{MediaAttachment}.</returns>
+    IReadOnlyList<MediaAttachment> GetMediaAttachments(MediaAttachmentQuery filter);
+
+    /// <summary>
+    /// Saves the media attachments.
+    /// </summary>
+    /// <param name="id">The identifier.</param>
+    /// <param name="attachments">The attachments.</param>
+    /// <param name="cancellationToken">The cancellation token.</param>
+    void SaveMediaAttachments(Guid id, IReadOnlyList<MediaAttachment> attachments, CancellationToken cancellationToken);
+}
diff --git a/MediaBrowser.Controller/Persistence/IMediaStreamManager.cs b/MediaBrowser.Controller/Persistence/IMediaStreamManager.cs
deleted file mode 100644
index ec7c72935..000000000
--- a/MediaBrowser.Controller/Persistence/IMediaStreamManager.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-#nullable disable
-
-#pragma warning disable CS1591
-
-using System;
-using System.Collections.Generic;
-using System.Threading;
-using MediaBrowser.Model.Entities;
-
-namespace MediaBrowser.Controller.Persistence;
-
-public interface IMediaStreamManager
-{
-    /// <summary>
-    /// Gets the media streams.
-    /// </summary>
-    /// <param name="filter">The query.</param>
-    /// <returns>IEnumerable{MediaStream}.</returns>
-    List<MediaStream> GetMediaStreams(MediaStreamQuery filter);
-
-    /// <summary>
-    /// Saves the media streams.
-    /// </summary>
-    /// <param name="id">The identifier.</param>
-    /// <param name="streams">The streams.</param>
-    /// <param name="cancellationToken">The cancellation token.</param>
-    void SaveMediaStreams(Guid id, IReadOnlyList<MediaStream> streams, CancellationToken cancellationToken);
-}
diff --git a/MediaBrowser.Controller/Persistence/IMediaStreamRepository.cs b/MediaBrowser.Controller/Persistence/IMediaStreamRepository.cs
new file mode 100644
index 000000000..665129eaf
--- /dev/null
+++ b/MediaBrowser.Controller/Persistence/IMediaStreamRepository.cs
@@ -0,0 +1,31 @@
+#nullable disable
+
+#pragma warning disable CS1591
+
+using System;
+using System.Collections.Generic;
+using System.Threading;
+using MediaBrowser.Model.Entities;
+
+namespace MediaBrowser.Controller.Persistence;
+
+/// <summary>
+/// Provides methods for accessing MediaStreams.
+/// </summary>
+public interface IMediaStreamRepository
+{
+    /// <summary>
+    /// Gets the media streams.
+    /// </summary>
+    /// <param name="filter">The query.</param>
+    /// <returns>IEnumerable{MediaStream}.</returns>
+    IReadOnlyList<MediaStream> GetMediaStreams(MediaStreamQuery filter);
+
+    /// <summary>
+    /// Saves the media streams.
+    /// </summary>
+    /// <param name="id">The identifier.</param>
+    /// <param name="streams">The streams.</param>
+    /// <param name="cancellationToken">The cancellation token.</param>
+    void SaveMediaStreams(Guid id, IReadOnlyList<MediaStream> streams, CancellationToken cancellationToken);
+}
diff --git a/MediaBrowser.Controller/Persistence/IPeopleManager.cs b/MediaBrowser.Controller/Persistence/IPeopleManager.cs
deleted file mode 100644
index 84e503fef..000000000
--- a/MediaBrowser.Controller/Persistence/IPeopleManager.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-#nullable disable
-
-#pragma warning disable CS1591
-
-using System;
-using System.Collections.Generic;
-using MediaBrowser.Controller.Entities;
-
-namespace MediaBrowser.Controller.Persistence;
-
-public interface IPeopleManager
-{
-    /// <summary>
-    /// Gets the people.
-    /// </summary>
-    /// <param name="filter">The query.</param>
-    /// <returns>List&lt;PersonInfo&gt;.</returns>
-    IReadOnlyList<PersonInfo> GetPeople(InternalPeopleQuery filter);
-
-    /// <summary>
-    /// Updates the people.
-    /// </summary>
-    /// <param name="itemId">The item identifier.</param>
-    /// <param name="people">The people.</param>
-    void UpdatePeople(Guid itemId, IReadOnlyList<PersonInfo> people);
-
-    /// <summary>
-    /// Gets the people names.
-    /// </summary>
-    /// <param name="filter">The query.</param>
-    /// <returns>List&lt;System.String&gt;.</returns>
-    IReadOnlyList<string> GetPeopleNames(InternalPeopleQuery filter);
-
-}
diff --git a/MediaBrowser.Controller/Persistence/IPeopleRepository.cs b/MediaBrowser.Controller/Persistence/IPeopleRepository.cs
new file mode 100644
index 000000000..43a24703e
--- /dev/null
+++ b/MediaBrowser.Controller/Persistence/IPeopleRepository.cs
@@ -0,0 +1,33 @@
+#nullable disable
+
+#pragma warning disable CS1591
+
+using System;
+using System.Collections.Generic;
+using MediaBrowser.Controller.Entities;
+
+namespace MediaBrowser.Controller.Persistence;
+
+public interface IPeopleRepository
+{
+    /// <summary>
+    /// Gets the people.
+    /// </summary>
+    /// <param name="filter">The query.</param>
+    /// <returns>List&lt;PersonInfo&gt;.</returns>
+    IReadOnlyList<PersonInfo> GetPeople(InternalPeopleQuery filter);
+
+    /// <summary>
+    /// Updates the people.
+    /// </summary>
+    /// <param name="itemId">The item identifier.</param>
+    /// <param name="people">The people.</param>
+    void UpdatePeople(Guid itemId, IReadOnlyList<PersonInfo> people);
+
+    /// <summary>
+    /// Gets the people names.
+    /// </summary>
+    /// <param name="filter">The query.</param>
+    /// <returns>List&lt;System.String&gt;.</returns>
+    IReadOnlyList<string> GetPeopleNames(InternalPeopleQuery filter);
+}
diff --git a/MediaBrowser.Providers/MediaInfo/FFProbeVideoInfo.cs b/MediaBrowser.Providers/MediaInfo/FFProbeVideoInfo.cs
index 246ba2733..62c590944 100644
--- a/MediaBrowser.Providers/MediaInfo/FFProbeVideoInfo.cs
+++ b/MediaBrowser.Providers/MediaInfo/FFProbeVideoInfo.cs
@@ -38,7 +38,7 @@ namespace MediaBrowser.Providers.MediaInfo
         private readonly IEncodingManager _encodingManager;
         private readonly IServerConfigurationManager _config;
         private readonly ISubtitleManager _subtitleManager;
-        private readonly IChapterManager _chapterManager;
+        private readonly IChapterRepository _chapterManager;
         private readonly ILibraryManager _libraryManager;
         private readonly AudioResolver _audioResolver;
         private readonly SubtitleResolver _subtitleResolver;
@@ -54,7 +54,7 @@ namespace MediaBrowser.Providers.MediaInfo
             IEncodingManager encodingManager,
             IServerConfigurationManager config,
             ISubtitleManager subtitleManager,
-            IChapterManager chapterManager,
+            IChapterRepository chapterManager,
             ILibraryManager libraryManager,
             AudioResolver audioResolver,
             SubtitleResolver subtitleResolver)
diff --git a/MediaBrowser.Providers/MediaInfo/ProbeProvider.cs b/MediaBrowser.Providers/MediaInfo/ProbeProvider.cs
index 04da8fb88..f5e9dddcf 100644
--- a/MediaBrowser.Providers/MediaInfo/ProbeProvider.cs
+++ b/MediaBrowser.Providers/MediaInfo/ProbeProvider.cs
@@ -61,7 +61,7 @@ namespace MediaBrowser.Providers.MediaInfo
         /// <param name="encodingManager">Instance of the <see cref="IEncodingManager"/> interface.</param>
         /// <param name="config">Instance of the <see cref="IServerConfigurationManager"/> interface.</param>
         /// <param name="subtitleManager">Instance of the <see cref="ISubtitleManager"/> interface.</param>
-        /// <param name="chapterManager">Instance of the <see cref="IChapterManager"/> interface.</param>
+        /// <param name="chapterManager">Instance of the <see cref="IChapterRepository"/> interface.</param>
         /// <param name="libraryManager">Instance of the <see cref="ILibraryManager"/> interface.</param>
         /// <param name="loggerFactory">Instance of the <see cref="ILoggerFactory"/>.</param>
         /// <param name="fileSystem">Instance of the <see cref="IFileSystem"/> interface.</param>
@@ -76,7 +76,7 @@ namespace MediaBrowser.Providers.MediaInfo
             IEncodingManager encodingManager,
             IServerConfigurationManager config,
             ISubtitleManager subtitleManager,
-            IChapterManager chapterManager,
+            IChapterRepository chapterManager,
             ILibraryManager libraryManager,
             IFileSystem fileSystem,
             ILoggerFactory loggerFactory,
diff --git a/src/Jellyfin.Drawing/ImageProcessor.cs b/src/Jellyfin.Drawing/ImageProcessor.cs
index 5d4732234..b57f2753f 100644
--- a/src/Jellyfin.Drawing/ImageProcessor.cs
+++ b/src/Jellyfin.Drawing/ImageProcessor.cs
@@ -15,6 +15,7 @@ using MediaBrowser.Controller.Configuration;
 using MediaBrowser.Controller.Drawing;
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Model.Drawing;
+using MediaBrowser.Model.Dto;
 using MediaBrowser.Model.Entities;
 using MediaBrowser.Model.IO;
 using MediaBrowser.Model.Net;
@@ -403,10 +404,34 @@ public sealed class ImageProcessor : IImageProcessor, IDisposable
         return _imageEncoder.GetImageBlurHash(xComp, yComp, path);
     }
 
+    /// <inheritdoc />
+    public string GetImageCacheTag(string baseItemPath, DateTime imageDateModified)
+        => (baseItemPath + imageDateModified.Ticks).GetMD5().ToString("N", CultureInfo.InvariantCulture);
+
     /// <inheritdoc />
     public string GetImageCacheTag(BaseItem item, ItemImageInfo image)
         => (item.Path + image.DateModified.Ticks).GetMD5().ToString("N", CultureInfo.InvariantCulture);
 
+    /// <inheritdoc />
+    public string GetImageCacheTag(BaseItemDto item, ItemImageInfo image)
+        => (item.Path + image.DateModified.Ticks).GetMD5().ToString("N", CultureInfo.InvariantCulture);
+
+    /// <inheritdoc />
+    public string? GetImageCacheTag(BaseItemDto item, ChapterInfo chapter)
+    {
+        if (chapter.ImagePath is null)
+        {
+            return null;
+        }
+
+        return GetImageCacheTag(item, new ItemImageInfo
+        {
+            Path = chapter.ImagePath,
+            Type = ImageType.Chapter,
+            DateModified = chapter.ImageDateModified
+        });
+    }
+
     /// <inheritdoc />
     public string? GetImageCacheTag(BaseItem item, ChapterInfo chapter)
     {
-- 
cgit v1.2.3


From b09a41ad1f05664a6099734cb44e068f993a8e93 Mon Sep 17 00:00:00 2001
From: JPVenson <6794763+JPVenson@users.noreply.github.com>
Date: Wed, 9 Oct 2024 10:36:08 +0000
Subject: WIP porting new Repository structure

---
 .editorconfig                                      |  3 ++
 Emby.Server.Implementations/Dto/DtoService.cs      | 12 +++++---
 .../Library/LibraryManager.cs                      | 35 ++++++++++++----------
 .../Library/MediaSourceManager.cs                  | 25 +++++++++-------
 .../Library/MusicManager.cs                        | 19 ++++++------
 .../Library/SearchEngine.cs                        |  2 +-
 .../ScheduledTasks/Tasks/ChapterImagesTask.cs      |  9 ++++--
 Jellyfin.Api/Controllers/LibraryController.cs      |  2 +-
 Jellyfin.Api/Controllers/MoviesController.cs       |  4 +--
 Jellyfin.Api/Controllers/YearsController.cs        |  7 +++--
 .../Item/MediaStreamRepository.cs                  |  2 +-
 .../Item/PeopleRepository.cs                       |  4 ++-
 .../ModelConfiguration/ChapterConfiguration.cs     |  1 -
 .../Trickplay/TrickplayManager.cs                  |  2 +-
 .../Entities/AggregateFolder.cs                    |  2 +-
 .../Entities/Audio/MusicArtist.cs                  |  2 +-
 .../Entities/Audio/MusicGenre.cs                   |  2 +-
 MediaBrowser.Controller/Entities/BaseItem.cs       |  9 +++---
 MediaBrowser.Controller/Entities/Folder.cs         | 31 ++++++++++---------
 MediaBrowser.Controller/Entities/Genre.cs          |  2 +-
 .../Entities/IHasMediaSources.cs                   |  4 +--
 MediaBrowser.Controller/Entities/IItemByName.cs    |  2 +-
 MediaBrowser.Controller/Entities/Movies/BoxSet.cs  | 13 ++++----
 MediaBrowser.Controller/Entities/PeopleHelper.cs   |  2 +-
 MediaBrowser.Controller/Entities/Person.cs         |  2 +-
 MediaBrowser.Controller/Entities/Studio.cs         |  2 +-
 MediaBrowser.Controller/Entities/TV/Series.cs      |  4 +--
 MediaBrowser.Controller/Entities/UserRootFolder.cs |  2 +-
 MediaBrowser.Controller/Entities/UserView.cs       |  4 +--
 .../Entities/UserViewBuilder.cs                    |  2 +-
 MediaBrowser.Controller/Entities/Year.cs           |  2 +-
 MediaBrowser.Controller/Library/ILibraryManager.cs | 18 +++++------
 .../Library/IMediaSourceManager.cs                 |  8 ++---
 MediaBrowser.Controller/Library/IMusicManager.cs   |  6 ++--
 MediaBrowser.Controller/LiveTv/LiveTvChannel.cs    |  9 +++---
 MediaBrowser.Controller/Playlists/Playlist.cs      | 10 +++----
 .../Providers/MetadataResult.cs                    | 16 ++++++----
 .../BoxSets/BoxSetMetadataService.cs               |  2 +-
 MediaBrowser.Providers/Manager/MetadataService.cs  | 25 +++++++---------
 .../MediaInfo/AudioFileProber.cs                   |  8 +++--
 .../MediaInfo/AudioImageProvider.cs                |  2 +-
 .../MediaInfo/FFProbeVideoInfo.cs                  | 15 +++++++---
 MediaBrowser.Providers/MediaInfo/ProbeProvider.cs  | 13 ++++++--
 .../MediaInfo/SubtitleDownloader.cs                |  6 ++--
 .../Music/AlbumMetadataService.cs                  |  4 +--
 .../Music/ArtistMetadataService.cs                 |  5 ++--
 .../Playlists/PlaylistMetadataService.cs           |  2 +-
 MediaBrowser.Providers/TV/SeasonMetadataService.cs |  6 ++--
 MediaBrowser.XbmcMetadata/Savers/ArtistNfoSaver.cs |  2 +-
 MediaBrowser.XbmcMetadata/Savers/BaseNfoSaver.cs   |  2 +-
 50 files changed, 211 insertions(+), 162 deletions(-)

(limited to 'MediaBrowser.Controller')

diff --git a/.editorconfig b/.editorconfig
index b84e563ef..147b76c14 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -192,3 +192,6 @@ csharp_space_between_method_call_empty_parameter_list_parentheses = false
 # Wrapping preferences
 csharp_preserve_single_line_statements = true
 csharp_preserve_single_line_blocks = true
+
+# CA1826: Do not use Enumerable methods on indexable collections
+dotnet_diagnostic.CA1826.severity = suggestion
diff --git a/Emby.Server.Implementations/Dto/DtoService.cs b/Emby.Server.Implementations/Dto/DtoService.cs
index 0c0ba7453..356d1e437 100644
--- a/Emby.Server.Implementations/Dto/DtoService.cs
+++ b/Emby.Server.Implementations/Dto/DtoService.cs
@@ -10,6 +10,7 @@ using Jellyfin.Data.Enums;
 using Jellyfin.Extensions;
 using MediaBrowser.Common;
 using MediaBrowser.Controller.Channels;
+using MediaBrowser.Controller.Chapters;
 using MediaBrowser.Controller.Drawing;
 using MediaBrowser.Controller.Dto;
 using MediaBrowser.Controller.Entities;
@@ -51,6 +52,7 @@ namespace Emby.Server.Implementations.Dto
         private readonly Lazy<ILiveTvManager> _livetvManagerFactory;
 
         private readonly ITrickplayManager _trickplayManager;
+        private readonly IChapterRepository _chapterRepository;
 
         public DtoService(
             ILogger<DtoService> logger,
@@ -63,7 +65,8 @@ namespace Emby.Server.Implementations.Dto
             IApplicationHost appHost,
             IMediaSourceManager mediaSourceManager,
             Lazy<ILiveTvManager> livetvManagerFactory,
-            ITrickplayManager trickplayManager)
+            ITrickplayManager trickplayManager,
+            IChapterRepository chapterRepository)
         {
             _logger = logger;
             _libraryManager = libraryManager;
@@ -76,6 +79,7 @@ namespace Emby.Server.Implementations.Dto
             _mediaSourceManager = mediaSourceManager;
             _livetvManagerFactory = livetvManagerFactory;
             _trickplayManager = trickplayManager;
+            _chapterRepository = chapterRepository;
         }
 
         private ILiveTvManager LivetvManager => _livetvManagerFactory.Value;
@@ -165,7 +169,7 @@ namespace Emby.Server.Implementations.Dto
             return dto;
         }
 
-        private static IList<BaseItem> GetTaggedItems(IItemByName byName, User? user, DtoOptions options)
+        private static IReadOnlyList<BaseItem> GetTaggedItems(IItemByName byName, User? user, DtoOptions options)
         {
             return byName.GetTaggedItems(
                 new InternalItemsQuery(user)
@@ -327,7 +331,7 @@ namespace Emby.Server.Implementations.Dto
             return dto;
         }
 
-        private static void SetItemByNameInfo(BaseItem item, BaseItemDto dto, IList<BaseItem> taggedItems)
+        private static void SetItemByNameInfo(BaseItem item, BaseItemDto dto, IReadOnlyList<BaseItem> taggedItems)
         {
             if (item is MusicArtist)
             {
@@ -1060,7 +1064,7 @@ namespace Emby.Server.Implementations.Dto
 
                 if (options.ContainsField(ItemFields.Chapters))
                 {
-                    dto.Chapters = _itemRepo.GetChapters(item);
+                    dto.Chapters = _chapterRepository.GetChapters(item.Id).ToList();
                 }
 
                 if (options.ContainsField(ItemFields.Trickplay))
diff --git a/Emby.Server.Implementations/Library/LibraryManager.cs b/Emby.Server.Implementations/Library/LibraryManager.cs
index 28f7ed659..0a98d5435 100644
--- a/Emby.Server.Implementations/Library/LibraryManager.cs
+++ b/Emby.Server.Implementations/Library/LibraryManager.cs
@@ -76,6 +76,7 @@ namespace Emby.Server.Implementations.Library
         private readonly IItemRepository _itemRepository;
         private readonly IImageProcessor _imageProcessor;
         private readonly NamingOptions _namingOptions;
+        private readonly IPeopleRepository _peopleRepository;
         private readonly ExtraResolver _extraResolver;
 
         /// <summary>
@@ -112,6 +113,7 @@ namespace Emby.Server.Implementations.Library
         /// <param name="imageProcessor">The image processor.</param>
         /// <param name="namingOptions">The naming options.</param>
         /// <param name="directoryService">The directory service.</param>
+        /// <param name="peopleRepository">The People Repository.</param>
         public LibraryManager(
             IServerApplicationHost appHost,
             ILoggerFactory loggerFactory,
@@ -127,7 +129,8 @@ namespace Emby.Server.Implementations.Library
             IItemRepository itemRepository,
             IImageProcessor imageProcessor,
             NamingOptions namingOptions,
-            IDirectoryService directoryService)
+            IDirectoryService directoryService,
+            IPeopleRepository peopleRepository)
         {
             _appHost = appHost;
             _logger = loggerFactory.CreateLogger<LibraryManager>();
@@ -144,7 +147,7 @@ namespace Emby.Server.Implementations.Library
             _imageProcessor = imageProcessor;
             _cache = new ConcurrentDictionary<Guid, BaseItem>();
             _namingOptions = namingOptions;
-
+            _peopleRepository = peopleRepository;
             _extraResolver = new ExtraResolver(loggerFactory.CreateLogger<ExtraResolver>(), namingOptions, directoryService);
 
             _configurationManager.ConfigurationUpdated += ConfigurationUpdated;
@@ -1274,7 +1277,7 @@ namespace Emby.Server.Implementations.Library
             return ItemIsVisible(item, user) ? item : null;
         }
 
-        public List<BaseItem> GetItemList(InternalItemsQuery query, bool allowExternalContent)
+        public IReadOnlyList<BaseItem> GetItemList(InternalItemsQuery query, bool allowExternalContent)
         {
             if (query.Recursive && !query.ParentId.IsEmpty())
             {
@@ -1300,7 +1303,7 @@ namespace Emby.Server.Implementations.Library
             return itemList;
         }
 
-        public List<BaseItem> GetItemList(InternalItemsQuery query)
+        public IReadOnlyList<BaseItem> GetItemList(InternalItemsQuery query)
         {
             return GetItemList(query, true);
         }
@@ -1324,7 +1327,7 @@ namespace Emby.Server.Implementations.Library
             return _itemRepository.GetCount(query);
         }
 
-        public List<BaseItem> GetItemList(InternalItemsQuery query, List<BaseItem> parents)
+        public IReadOnlyList<BaseItem> GetItemList(InternalItemsQuery query, List<BaseItem> parents)
         {
             SetTopParentIdsOrAncestors(query, parents);
 
@@ -1357,7 +1360,7 @@ namespace Emby.Server.Implementations.Library
                 _itemRepository.GetItemList(query));
         }
 
-        public List<Guid> GetItemIds(InternalItemsQuery query)
+        public IReadOnlyList<Guid> GetItemIds(InternalItemsQuery query)
         {
             if (query.User is not null)
             {
@@ -2736,12 +2739,12 @@ namespace Emby.Server.Implementations.Library
             return path;
         }
 
-        public List<PersonInfo> GetPeople(InternalPeopleQuery query)
+        public IReadOnlyList<PersonInfo> GetPeople(InternalPeopleQuery query)
         {
-            return _itemRepository.GetPeople(query);
+            return _peopleRepository.GetPeople(query);
         }
 
-        public List<PersonInfo> GetPeople(BaseItem item)
+        public IReadOnlyList<PersonInfo> GetPeople(BaseItem item)
         {
             if (item.SupportsPeople)
             {
@@ -2756,12 +2759,12 @@ namespace Emby.Server.Implementations.Library
                 }
             }
 
-            return new List<PersonInfo>();
+            return [];
         }
 
-        public List<Person> GetPeopleItems(InternalPeopleQuery query)
+        public IReadOnlyList<Person> GetPeopleItems(InternalPeopleQuery query)
         {
-            return _itemRepository.GetPeopleNames(query)
+            return _peopleRepository.GetPeopleNames(query)
             .Select(i =>
             {
                 try
@@ -2779,9 +2782,9 @@ namespace Emby.Server.Implementations.Library
             .ToList()!; // null values are filtered out
         }
 
-        public List<string> GetPeopleNames(InternalPeopleQuery query)
+        public IReadOnlyList<string> GetPeopleNames(InternalPeopleQuery query)
         {
-            return _itemRepository.GetPeopleNames(query);
+            return _peopleRepository.GetPeopleNames(query);
         }
 
         public void UpdatePeople(BaseItem item, List<PersonInfo> people)
@@ -2790,14 +2793,14 @@ namespace Emby.Server.Implementations.Library
         }
 
         /// <inheritdoc />
-        public async Task UpdatePeopleAsync(BaseItem item, List<PersonInfo> people, CancellationToken cancellationToken)
+        public async Task UpdatePeopleAsync(BaseItem item, IReadOnlyList<PersonInfo> people, CancellationToken cancellationToken)
         {
             if (!item.SupportsPeople)
             {
                 return;
             }
 
-            _itemRepository.UpdatePeople(item.Id, people);
+            _peopleRepository.UpdatePeople(item.Id, people);
             if (people is not null)
             {
                 await SavePeopleMetadataAsync(people, cancellationToken).ConfigureAwait(false);
diff --git a/Emby.Server.Implementations/Library/MediaSourceManager.cs b/Emby.Server.Implementations/Library/MediaSourceManager.cs
index 90a01c052..a5a715721 100644
--- a/Emby.Server.Implementations/Library/MediaSourceManager.cs
+++ b/Emby.Server.Implementations/Library/MediaSourceManager.cs
@@ -51,7 +51,8 @@ namespace Emby.Server.Implementations.Library
         private readonly ILocalizationManager _localizationManager;
         private readonly IApplicationPaths _appPaths;
         private readonly IDirectoryService _directoryService;
-
+        private readonly IMediaStreamRepository _mediaStreamRepository;
+        private readonly IMediaAttachmentRepository _mediaAttachmentRepository;
         private readonly ConcurrentDictionary<string, ILiveStream> _openStreams = new ConcurrentDictionary<string, ILiveStream>(StringComparer.OrdinalIgnoreCase);
         private readonly AsyncNonKeyedLocker _liveStreamLocker = new(1);
         private readonly JsonSerializerOptions _jsonOptions = JsonDefaults.Options;
@@ -69,7 +70,9 @@ namespace Emby.Server.Implementations.Library
             IFileSystem fileSystem,
             IUserDataManager userDataManager,
             IMediaEncoder mediaEncoder,
-            IDirectoryService directoryService)
+            IDirectoryService directoryService,
+            IMediaStreamRepository mediaStreamRepository,
+            IMediaAttachmentRepository mediaAttachmentRepository)
         {
             _appHost = appHost;
             _itemRepo = itemRepo;
@@ -82,6 +85,8 @@ namespace Emby.Server.Implementations.Library
             _localizationManager = localizationManager;
             _appPaths = applicationPaths;
             _directoryService = directoryService;
+            _mediaStreamRepository = mediaStreamRepository;
+            _mediaAttachmentRepository = mediaAttachmentRepository;
         }
 
         public void AddParts(IEnumerable<IMediaSourceProvider> providers)
@@ -89,9 +94,9 @@ namespace Emby.Server.Implementations.Library
             _providers = providers.ToArray();
         }
 
-        public List<MediaStream> GetMediaStreams(MediaStreamQuery query)
+        public IReadOnlyList<MediaStream> GetMediaStreams(MediaStreamQuery query)
         {
-            var list = _itemRepo.GetMediaStreams(query);
+            var list = _mediaStreamRepository.GetMediaStreams(query);
 
             foreach (var stream in list)
             {
@@ -121,7 +126,7 @@ namespace Emby.Server.Implementations.Library
             return false;
         }
 
-        public List<MediaStream> GetMediaStreams(Guid itemId)
+        public IReadOnlyList<MediaStream> GetMediaStreams(Guid itemId)
         {
             var list = GetMediaStreams(new MediaStreamQuery
             {
@@ -131,7 +136,7 @@ namespace Emby.Server.Implementations.Library
             return GetMediaStreamsForItem(list);
         }
 
-        private List<MediaStream> GetMediaStreamsForItem(List<MediaStream> streams)
+        private IReadOnlyList<MediaStream> GetMediaStreamsForItem(IReadOnlyList<MediaStream> streams)
         {
             foreach (var stream in streams)
             {
@@ -145,13 +150,13 @@ namespace Emby.Server.Implementations.Library
         }
 
         /// <inheritdoc />
-        public List<MediaAttachment> GetMediaAttachments(MediaAttachmentQuery query)
+        public IReadOnlyList<MediaAttachment> GetMediaAttachments(MediaAttachmentQuery query)
         {
-            return _itemRepo.GetMediaAttachments(query);
+            return _mediaAttachmentRepository.GetMediaAttachments(query);
         }
 
         /// <inheritdoc />
-        public List<MediaAttachment> GetMediaAttachments(Guid itemId)
+        public IReadOnlyList<MediaAttachment> GetMediaAttachments(Guid itemId)
         {
             return GetMediaAttachments(new MediaAttachmentQuery
             {
@@ -332,7 +337,7 @@ namespace Emby.Server.Implementations.Library
             return sources.FirstOrDefault(i => string.Equals(i.Id, mediaSourceId, StringComparison.OrdinalIgnoreCase));
         }
 
-        public List<MediaSourceInfo> GetStaticMediaSources(BaseItem item, bool enablePathSubstitution, User user = null)
+        public IReadOnlyList<MediaSourceInfo> GetStaticMediaSources(BaseItem item, bool enablePathSubstitution, User user = null)
         {
             ArgumentNullException.ThrowIfNull(item);
 
diff --git a/Emby.Server.Implementations/Library/MusicManager.cs b/Emby.Server.Implementations/Library/MusicManager.cs
index a69a0f33f..c83737cec 100644
--- a/Emby.Server.Implementations/Library/MusicManager.cs
+++ b/Emby.Server.Implementations/Library/MusicManager.cs
@@ -2,6 +2,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Collections.Immutable;
 using System.Linq;
 using Jellyfin.Data.Entities;
 using Jellyfin.Data.Enums;
@@ -24,7 +25,7 @@ namespace Emby.Server.Implementations.Library
             _libraryManager = libraryManager;
         }
 
-        public List<BaseItem> GetInstantMixFromSong(Audio item, User? user, DtoOptions dtoOptions)
+        public IReadOnlyList<BaseItem> GetInstantMixFromSong(Audio item, User? user, DtoOptions dtoOptions)
         {
             var list = new List<BaseItem>
             {
@@ -33,21 +34,21 @@ namespace Emby.Server.Implementations.Library
 
             list.AddRange(GetInstantMixFromGenres(item.Genres, user, dtoOptions));
 
-            return list;
+            return list.ToImmutableList();
         }
 
         /// <inheritdoc />
-        public List<BaseItem> GetInstantMixFromArtist(MusicArtist artist, User? user, DtoOptions dtoOptions)
+        public IReadOnlyList<BaseItem> GetInstantMixFromArtist(MusicArtist artist, User? user, DtoOptions dtoOptions)
         {
             return GetInstantMixFromGenres(artist.Genres, user, dtoOptions);
         }
 
-        public List<BaseItem> GetInstantMixFromAlbum(MusicAlbum item, User? user, DtoOptions dtoOptions)
+        public IReadOnlyList<BaseItem> GetInstantMixFromAlbum(MusicAlbum item, User? user, DtoOptions dtoOptions)
         {
             return GetInstantMixFromGenres(item.Genres, user, dtoOptions);
         }
 
-        public List<BaseItem> GetInstantMixFromFolder(Folder item, User? user, DtoOptions dtoOptions)
+        public IReadOnlyList<BaseItem> GetInstantMixFromFolder(Folder item, User? user, DtoOptions dtoOptions)
         {
             var genres = item
                .GetRecursiveChildren(user, new InternalItemsQuery(user)
@@ -63,12 +64,12 @@ namespace Emby.Server.Implementations.Library
             return GetInstantMixFromGenres(genres, user, dtoOptions);
         }
 
-        public List<BaseItem> GetInstantMixFromPlaylist(Playlist item, User? user, DtoOptions dtoOptions)
+        public IReadOnlyList<BaseItem> GetInstantMixFromPlaylist(Playlist item, User? user, DtoOptions dtoOptions)
         {
             return GetInstantMixFromGenres(item.Genres, user, dtoOptions);
         }
 
-        public List<BaseItem> GetInstantMixFromGenres(IEnumerable<string> genres, User? user, DtoOptions dtoOptions)
+        public IReadOnlyList<BaseItem> GetInstantMixFromGenres(IEnumerable<string> genres, User? user, DtoOptions dtoOptions)
         {
             var genreIds = genres.DistinctNames().Select(i =>
             {
@@ -85,7 +86,7 @@ namespace Emby.Server.Implementations.Library
             return GetInstantMixFromGenreIds(genreIds, user, dtoOptions);
         }
 
-        public List<BaseItem> GetInstantMixFromGenreIds(Guid[] genreIds, User? user, DtoOptions dtoOptions)
+        public IReadOnlyList<BaseItem> GetInstantMixFromGenreIds(Guid[] genreIds, User? user, DtoOptions dtoOptions)
         {
             return _libraryManager.GetItemList(new InternalItemsQuery(user)
             {
@@ -97,7 +98,7 @@ namespace Emby.Server.Implementations.Library
             });
         }
 
-        public List<BaseItem> GetInstantMixFromItem(BaseItem item, User? user, DtoOptions dtoOptions)
+        public IReadOnlyList<BaseItem> GetInstantMixFromItem(BaseItem item, User? user, DtoOptions dtoOptions)
         {
             if (item is MusicGenre)
             {
diff --git a/Emby.Server.Implementations/Library/SearchEngine.cs b/Emby.Server.Implementations/Library/SearchEngine.cs
index 7f3f8615e..3ac1d0219 100644
--- a/Emby.Server.Implementations/Library/SearchEngine.cs
+++ b/Emby.Server.Implementations/Library/SearchEngine.cs
@@ -171,7 +171,7 @@ namespace Emby.Server.Implementations.Library
                 }
             };
 
-            List<BaseItem> mediaItems;
+            IReadOnlyList<BaseItem> mediaItems;
 
             if (searchQuery.IncludeItemTypes.Length == 1 && searchQuery.IncludeItemTypes[0] == BaseItemKind.MusicArtist)
             {
diff --git a/Emby.Server.Implementations/ScheduledTasks/Tasks/ChapterImagesTask.cs b/Emby.Server.Implementations/ScheduledTasks/Tasks/ChapterImagesTask.cs
index cb3f5b836..c0ab535a3 100644
--- a/Emby.Server.Implementations/ScheduledTasks/Tasks/ChapterImagesTask.cs
+++ b/Emby.Server.Implementations/ScheduledTasks/Tasks/ChapterImagesTask.cs
@@ -7,6 +7,7 @@ using System.Threading.Tasks;
 using Jellyfin.Data.Enums;
 using Jellyfin.Extensions;
 using MediaBrowser.Common.Configuration;
+using MediaBrowser.Controller.Chapters;
 using MediaBrowser.Controller.Dto;
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Library;
@@ -32,6 +33,7 @@ namespace Emby.Server.Implementations.ScheduledTasks.Tasks
         private readonly IEncodingManager _encodingManager;
         private readonly IFileSystem _fileSystem;
         private readonly ILocalizationManager _localization;
+        private readonly IChapterRepository _chapterRepository;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="ChapterImagesTask" /> class.
@@ -43,6 +45,7 @@ namespace Emby.Server.Implementations.ScheduledTasks.Tasks
         /// <param name="encodingManager">Instance of the <see cref="IEncodingManager"/> interface.</param>
         /// <param name="fileSystem">Instance of the <see cref="IFileSystem"/> interface.</param>
         /// <param name="localization">Instance of the <see cref="ILocalizationManager"/> interface.</param>
+        /// <param name="chapterRepository">Instance of the <see cref="IChapterRepository"/> interface.</param>
         public ChapterImagesTask(
             ILogger<ChapterImagesTask> logger,
             ILibraryManager libraryManager,
@@ -50,7 +53,8 @@ namespace Emby.Server.Implementations.ScheduledTasks.Tasks
             IApplicationPaths appPaths,
             IEncodingManager encodingManager,
             IFileSystem fileSystem,
-            ILocalizationManager localization)
+            ILocalizationManager localization,
+            IChapterRepository chapterRepository)
         {
             _logger = logger;
             _libraryManager = libraryManager;
@@ -59,6 +63,7 @@ namespace Emby.Server.Implementations.ScheduledTasks.Tasks
             _encodingManager = encodingManager;
             _fileSystem = fileSystem;
             _localization = localization;
+            _chapterRepository = chapterRepository;
         }
 
         /// <inheritdoc />
@@ -141,7 +146,7 @@ namespace Emby.Server.Implementations.ScheduledTasks.Tasks
 
                 try
                 {
-                    var chapters = _itemRepo.GetChapters(video);
+                    var chapters = _chapterRepository.GetChapters(video.Id);
 
                     var success = await _encodingManager.RefreshChapterImages(video, directoryService, chapters, extract, true, cancellationToken).ConfigureAwait(false);
 
diff --git a/Jellyfin.Api/Controllers/LibraryController.cs b/Jellyfin.Api/Controllers/LibraryController.cs
index afc93c3a8..b2d75d5a3 100644
--- a/Jellyfin.Api/Controllers/LibraryController.cs
+++ b/Jellyfin.Api/Controllers/LibraryController.cs
@@ -793,7 +793,7 @@ public class LibraryController : BaseJellyfinApiController
             query.ExcludeArtistIds = excludeArtistIds;
         }
 
-        List<BaseItem> itemsResult = _libraryManager.GetItemList(query);
+        var itemsResult = _libraryManager.GetItemList(query);
 
         var returnList = _dtoService.GetBaseItemDtos(itemsResult, dtoOptions, user);
 
diff --git a/Jellyfin.Api/Controllers/MoviesController.cs b/Jellyfin.Api/Controllers/MoviesController.cs
index 471bcd096..11559419c 100644
--- a/Jellyfin.Api/Controllers/MoviesController.cs
+++ b/Jellyfin.Api/Controllers/MoviesController.cs
@@ -97,7 +97,7 @@ public class MoviesController : BaseJellyfinApiController
             DtoOptions = dtoOptions
         };
 
-        var recentlyPlayedMovies = _libraryManager.GetItemList(query);
+        var recentlyPlayedMovies = _libraryManager.GetItemList(query)!;
 
         var itemTypes = new List<BaseItemKind> { BaseItemKind.Movie };
         if (_serverConfigurationManager.Configuration.EnableExternalContentInSuggestions)
@@ -120,7 +120,7 @@ public class MoviesController : BaseJellyfinApiController
             DtoOptions = dtoOptions
         });
 
-        var mostRecentMovies = recentlyPlayedMovies.GetRange(0, Math.Min(recentlyPlayedMovies.Count, 6));
+        var mostRecentMovies = recentlyPlayedMovies.Take(Math.Min(recentlyPlayedMovies.Count, 6));
         // Get recently played directors
         var recentDirectors = GetDirectors(mostRecentMovies)
             .ToList();
diff --git a/Jellyfin.Api/Controllers/YearsController.cs b/Jellyfin.Api/Controllers/YearsController.cs
index e4aa0ea42..ffc34a5d9 100644
--- a/Jellyfin.Api/Controllers/YearsController.cs
+++ b/Jellyfin.Api/Controllers/YearsController.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Collections.Immutable;
 using System.ComponentModel.DataAnnotations;
 using System.Linq;
 using Jellyfin.Api.Extensions;
@@ -105,18 +106,18 @@ public class YearsController : BaseJellyfinApiController
 
         bool Filter(BaseItem i) => FilterItem(i, excludeItemTypes, includeItemTypes, mediaTypes);
 
-        IList<BaseItem> items;
+        IReadOnlyList<BaseItem> items;
         if (parentItem.IsFolder)
         {
             var folder = (Folder)parentItem;
 
             if (userId.IsNullOrEmpty())
             {
-                items = recursive ? folder.GetRecursiveChildren(Filter) : folder.Children.Where(Filter).ToList();
+                items = recursive ? folder.GetRecursiveChildren(Filter) : folder.Children.Where(Filter).ToImmutableList();
             }
             else
             {
-                items = recursive ? folder.GetRecursiveChildren(user, query).ToList() : folder.GetChildren(user, true).Where(Filter).ToList();
+                items = recursive ? folder.GetRecursiveChildren(user, query) : folder.GetChildren(user, true).Where(Filter).ToImmutableList();
             }
         }
         else
diff --git a/Jellyfin.Server.Implementations/Item/MediaStreamRepository.cs b/Jellyfin.Server.Implementations/Item/MediaStreamRepository.cs
index f7b714c29..f44ead6e0 100644
--- a/Jellyfin.Server.Implementations/Item/MediaStreamRepository.cs
+++ b/Jellyfin.Server.Implementations/Item/MediaStreamRepository.cs
@@ -174,7 +174,7 @@ public class MediaStreamRepository(IDbContextFactory<JellyfinDbContext> dbProvid
             Level = (float)dto.Level.GetValueOrDefault(),
             PixelFormat = dto.PixelFormat,
             BitDepth = dto.BitDepth.GetValueOrDefault(0),
-            IsAnamorphic = dto.IsAnamorphic.GetValueOrDefault(0),
+            IsAnamorphic = dto.IsAnamorphic.GetValueOrDefault(),
             RefFrames = dto.RefFrames.GetValueOrDefault(0),
             CodecTag = dto.CodecTag,
             Comment = dto.Comment,
diff --git a/Jellyfin.Server.Implementations/Item/PeopleRepository.cs b/Jellyfin.Server.Implementations/Item/PeopleRepository.cs
index 3ced6e24e..584dbd1b6 100644
--- a/Jellyfin.Server.Implementations/Item/PeopleRepository.cs
+++ b/Jellyfin.Server.Implementations/Item/PeopleRepository.cs
@@ -89,7 +89,9 @@ public class PeopleRepository(IDbContextFactory<JellyfinDbContext> dbProvider) :
             Name = people.Name,
             Role = people.Role,
             SortOrder = people.SortOrder,
-            PersonType = people.Type.ToString()
+            PersonType = people.Type.ToString(),
+            Item = null!,
+            ListOrder = people.SortOrder
         };
 
         return personInfo;
diff --git a/Jellyfin.Server.Implementations/ModelConfiguration/ChapterConfiguration.cs b/Jellyfin.Server.Implementations/ModelConfiguration/ChapterConfiguration.cs
index 0e7c88931..464fbfb01 100644
--- a/Jellyfin.Server.Implementations/ModelConfiguration/ChapterConfiguration.cs
+++ b/Jellyfin.Server.Implementations/ModelConfiguration/ChapterConfiguration.cs
@@ -5,7 +5,6 @@ using Microsoft.EntityFrameworkCore.Metadata.Builders;
 
 namespace Jellyfin.Server.Implementations.ModelConfiguration;
 
-
 /// <summary>
 /// Chapter configuration.
 /// </summary>
diff --git a/Jellyfin.Server.Implementations/Trickplay/TrickplayManager.cs b/Jellyfin.Server.Implementations/Trickplay/TrickplayManager.cs
index f6c48498c..9fe3ee010 100644
--- a/Jellyfin.Server.Implementations/Trickplay/TrickplayManager.cs
+++ b/Jellyfin.Server.Implementations/Trickplay/TrickplayManager.cs
@@ -179,7 +179,7 @@ public class TrickplayManager : ITrickplayManager
             {
                 // Extract images
                 // Note: Media sources under parent items exist as their own video/item as well. Only use this video stream for trickplay.
-                var mediaSource = video.GetMediaSources(false).Find(source => Guid.Parse(source.Id).Equals(video.Id));
+                var mediaSource = video.GetMediaSources(false).FirstOrDefault(source => Guid.Parse(source.Id).Equals(video.Id));
 
                 if (mediaSource is null)
                 {
diff --git a/MediaBrowser.Controller/Entities/AggregateFolder.cs b/MediaBrowser.Controller/Entities/AggregateFolder.cs
index 40cdd6c91..00b06dc79 100644
--- a/MediaBrowser.Controller/Entities/AggregateFolder.cs
+++ b/MediaBrowser.Controller/Entities/AggregateFolder.cs
@@ -64,7 +64,7 @@ namespace MediaBrowser.Controller.Entities
             return CreateResolveArgs(directoryService, true).FileSystemChildren;
         }
 
-        protected override List<BaseItem> LoadChildren()
+        protected override IReadOnlyList<BaseItem> LoadChildren()
         {
             lock (_childIdsLock)
             {
diff --git a/MediaBrowser.Controller/Entities/Audio/MusicArtist.cs b/MediaBrowser.Controller/Entities/Audio/MusicArtist.cs
index 1ab6c9706..6d3249399 100644
--- a/MediaBrowser.Controller/Entities/Audio/MusicArtist.cs
+++ b/MediaBrowser.Controller/Entities/Audio/MusicArtist.cs
@@ -84,7 +84,7 @@ namespace MediaBrowser.Controller.Entities.Audio
             return !IsAccessedByName;
         }
 
-        public IList<BaseItem> GetTaggedItems(InternalItemsQuery query)
+        public IReadOnlyList<BaseItem> GetTaggedItems(InternalItemsQuery query)
         {
             if (query.IncludeItemTypes.Length == 0)
             {
diff --git a/MediaBrowser.Controller/Entities/Audio/MusicGenre.cs b/MediaBrowser.Controller/Entities/Audio/MusicGenre.cs
index 7448d02ea..80f3902be 100644
--- a/MediaBrowser.Controller/Entities/Audio/MusicGenre.cs
+++ b/MediaBrowser.Controller/Entities/Audio/MusicGenre.cs
@@ -64,7 +64,7 @@ namespace MediaBrowser.Controller.Entities.Audio
             return true;
         }
 
-        public IList<BaseItem> GetTaggedItems(InternalItemsQuery query)
+        public IReadOnlyList<BaseItem> GetTaggedItems(InternalItemsQuery query)
         {
             query.GenreIds = new[] { Id };
             query.IncludeItemTypes = new[] { BaseItemKind.MusicVideo, BaseItemKind.Audio, BaseItemKind.MusicAlbum, BaseItemKind.MusicArtist };
diff --git a/MediaBrowser.Controller/Entities/BaseItem.cs b/MediaBrowser.Controller/Entities/BaseItem.cs
index a4764dd33..054c71db7 100644
--- a/MediaBrowser.Controller/Entities/BaseItem.cs
+++ b/MediaBrowser.Controller/Entities/BaseItem.cs
@@ -4,6 +4,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Collections.Immutable;
 using System.Globalization;
 using System.IO;
 using System.Linq;
@@ -1044,7 +1045,7 @@ namespace MediaBrowser.Controller.Entities
             return PlayAccess.Full;
         }
 
-        public virtual List<MediaStream> GetMediaStreams()
+        public virtual IReadOnlyList<MediaStream> GetMediaStreams()
         {
             return MediaSourceManager.GetMediaStreams(new MediaStreamQuery
             {
@@ -1057,7 +1058,7 @@ namespace MediaBrowser.Controller.Entities
             return false;
         }
 
-        public virtual List<MediaSourceInfo> GetMediaSources(bool enablePathSubstitution)
+        public virtual IReadOnlyList<MediaSourceInfo> GetMediaSources(bool enablePathSubstitution)
         {
             if (SourceType == SourceType.Channel)
             {
@@ -1091,7 +1092,7 @@ namespace MediaBrowser.Controller.Entities
                 return 1;
             }).ThenBy(i => i.Video3DFormat.HasValue ? 1 : 0)
             .ThenByDescending(i => i, new MediaSourceWidthComparator())
-            .ToList();
+            .ToImmutableList();
         }
 
         protected virtual IEnumerable<(BaseItem Item, MediaSourceType MediaSourceType)> GetAllItemsForMediaSources()
@@ -2527,7 +2528,7 @@ namespace MediaBrowser.Controller.Entities
         /// </summary>
         /// <param name="children">Media children.</param>
         /// <returns><c>true</c> if the rating was updated; otherwise <c>false</c>.</returns>
-        public bool UpdateRatingToItems(IList<BaseItem> children)
+        public bool UpdateRatingToItems(IReadOnlyList<BaseItem> children)
         {
             var currentOfficialRating = OfficialRating;
 
diff --git a/MediaBrowser.Controller/Entities/Folder.cs b/MediaBrowser.Controller/Entities/Folder.cs
index 83c19a54e..1bec66f95 100644
--- a/MediaBrowser.Controller/Entities/Folder.cs
+++ b/MediaBrowser.Controller/Entities/Folder.cs
@@ -4,6 +4,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Collections.Immutable;
 using System.IO;
 using System.Linq;
 using System.Security;
@@ -11,6 +12,7 @@ using System.Text.Json.Serialization;
 using System.Threading;
 using System.Threading.Tasks;
 using System.Threading.Tasks.Dataflow;
+using J2N.Collections.Generic.Extensions;
 using Jellyfin.Data.Entities;
 using Jellyfin.Data.Enums;
 using Jellyfin.Extensions;
@@ -247,7 +249,7 @@ namespace MediaBrowser.Controller.Entities
         /// We want this synchronous.
         /// </summary>
         /// <returns>Returns children.</returns>
-        protected virtual List<BaseItem> LoadChildren()
+        protected virtual IReadOnlyList<BaseItem> LoadChildren()
         {
             // logger.LogDebug("Loading children from {0} {1} {2}", GetType().Name, Id, Path);
             // just load our children from the repo - the library will be validated and maintained in other processes
@@ -659,7 +661,7 @@ namespace MediaBrowser.Controller.Entities
         /// Get our children from the repo - stubbed for now.
         /// </summary>
         /// <returns>IEnumerable{BaseItem}.</returns>
-        protected List<BaseItem> GetCachedChildren()
+        protected IReadOnlyList<BaseItem> GetCachedChildren()
         {
             return ItemRepository.GetItemList(new InternalItemsQuery
             {
@@ -1283,14 +1285,14 @@ namespace MediaBrowser.Controller.Entities
             return true;
         }
 
-        public List<BaseItem> GetChildren(User user, bool includeLinkedChildren)
+        public IReadOnlyList<BaseItem> GetChildren(User user, bool includeLinkedChildren)
         {
             ArgumentNullException.ThrowIfNull(user);
 
             return GetChildren(user, includeLinkedChildren, new InternalItemsQuery(user));
         }
 
-        public virtual List<BaseItem> GetChildren(User user, bool includeLinkedChildren, InternalItemsQuery query)
+        public virtual IReadOnlyList<BaseItem> GetChildren(User user, bool includeLinkedChildren, InternalItemsQuery query)
         {
             ArgumentNullException.ThrowIfNull(user);
 
@@ -1304,7 +1306,7 @@ namespace MediaBrowser.Controller.Entities
 
             AddChildren(user, includeLinkedChildren, result, false, query);
 
-            return result.Values.ToList();
+            return result.Values.ToImmutableList();
         }
 
         protected virtual IEnumerable<BaseItem> GetEligibleChildrenForRecursiveChildren(User user)
@@ -1369,7 +1371,7 @@ namespace MediaBrowser.Controller.Entities
             }
         }
 
-        public virtual IEnumerable<BaseItem> GetRecursiveChildren(User user, InternalItemsQuery query)
+        public virtual IReadOnlyList<BaseItem> GetRecursiveChildren(User user, InternalItemsQuery query)
         {
             ArgumentNullException.ThrowIfNull(user);
 
@@ -1377,35 +1379,35 @@ namespace MediaBrowser.Controller.Entities
 
             AddChildren(user, true, result, true, query);
 
-            return result.Values;
+            return result.Values.ToImmutableList();
         }
 
         /// <summary>
         /// Gets the recursive children.
         /// </summary>
         /// <returns>IList{BaseItem}.</returns>
-        public IList<BaseItem> GetRecursiveChildren()
+        public IReadOnlyList<BaseItem> GetRecursiveChildren()
         {
             return GetRecursiveChildren(true);
         }
 
-        public IList<BaseItem> GetRecursiveChildren(bool includeLinkedChildren)
+        public IReadOnlyList<BaseItem> GetRecursiveChildren(bool includeLinkedChildren)
         {
             return GetRecursiveChildren(i => true, includeLinkedChildren);
         }
 
-        public IList<BaseItem> GetRecursiveChildren(Func<BaseItem, bool> filter)
+        public IReadOnlyList<BaseItem> GetRecursiveChildren(Func<BaseItem, bool> filter)
         {
             return GetRecursiveChildren(filter, true);
         }
 
-        public IList<BaseItem> GetRecursiveChildren(Func<BaseItem, bool> filter, bool includeLinkedChildren)
+        public IReadOnlyList<BaseItem> GetRecursiveChildren(Func<BaseItem, bool> filter, bool includeLinkedChildren)
         {
             var result = new Dictionary<Guid, BaseItem>();
 
             AddChildrenToList(result, includeLinkedChildren, true, filter);
 
-            return result.Values.ToList();
+            return result.Values.ToImmutableList();
         }
 
         /// <summary>
@@ -1556,11 +1558,12 @@ namespace MediaBrowser.Controller.Entities
         /// Gets the linked children.
         /// </summary>
         /// <returns>IEnumerable{BaseItem}.</returns>
-        public IEnumerable<Tuple<LinkedChild, BaseItem>> GetLinkedChildrenInfos()
+        public IReadOnlyList<Tuple<LinkedChild, BaseItem>> GetLinkedChildrenInfos()
         {
             return LinkedChildren
                 .Select(i => new Tuple<LinkedChild, BaseItem>(i, GetLinkedChild(i)))
-                .Where(i => i.Item2 is not null);
+                .Where(i => i.Item2 is not null)
+                .ToImmutableList();
         }
 
         protected override async Task<bool> RefreshedOwnedItems(MetadataRefreshOptions options, IReadOnlyList<FileSystemMetadata> fileSystemChildren, CancellationToken cancellationToken)
diff --git a/MediaBrowser.Controller/Entities/Genre.cs b/MediaBrowser.Controller/Entities/Genre.cs
index ddf62dd4c..e5353d7bd 100644
--- a/MediaBrowser.Controller/Entities/Genre.cs
+++ b/MediaBrowser.Controller/Entities/Genre.cs
@@ -61,7 +61,7 @@ namespace MediaBrowser.Controller.Entities
             return false;
         }
 
-        public IList<BaseItem> GetTaggedItems(InternalItemsQuery query)
+        public IReadOnlyList<BaseItem> GetTaggedItems(InternalItemsQuery query)
         {
             query.GenreIds = new[] { Id };
             query.ExcludeItemTypes = new[]
diff --git a/MediaBrowser.Controller/Entities/IHasMediaSources.cs b/MediaBrowser.Controller/Entities/IHasMediaSources.cs
index 90d9bdd2d..ad35494c2 100644
--- a/MediaBrowser.Controller/Entities/IHasMediaSources.cs
+++ b/MediaBrowser.Controller/Entities/IHasMediaSources.cs
@@ -22,8 +22,8 @@ namespace MediaBrowser.Controller.Entities
         /// </summary>
         /// <param name="enablePathSubstitution"><c>true</c> to enable path substitution, <c>false</c> to not.</param>
         /// <returns>A list of media sources.</returns>
-        List<MediaSourceInfo> GetMediaSources(bool enablePathSubstitution);
+        IReadOnlyList<MediaSourceInfo> GetMediaSources(bool enablePathSubstitution);
 
-        List<MediaStream> GetMediaStreams();
+        IReadOnlyList<MediaStream> GetMediaStreams();
     }
 }
diff --git a/MediaBrowser.Controller/Entities/IItemByName.cs b/MediaBrowser.Controller/Entities/IItemByName.cs
index cac8aa61a..4928bda7a 100644
--- a/MediaBrowser.Controller/Entities/IItemByName.cs
+++ b/MediaBrowser.Controller/Entities/IItemByName.cs
@@ -9,7 +9,7 @@ namespace MediaBrowser.Controller.Entities
     /// </summary>
     public interface IItemByName
     {
-        IList<BaseItem> GetTaggedItems(InternalItemsQuery query);
+        IReadOnlyList<BaseItem> GetTaggedItems(InternalItemsQuery query);
     }
 
     public interface IHasDualAccess : IItemByName
diff --git a/MediaBrowser.Controller/Entities/Movies/BoxSet.cs b/MediaBrowser.Controller/Entities/Movies/BoxSet.cs
index a07187d2f..4cddc9125 100644
--- a/MediaBrowser.Controller/Entities/Movies/BoxSet.cs
+++ b/MediaBrowser.Controller/Entities/Movies/BoxSet.cs
@@ -4,6 +4,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Collections.Immutable;
 using System.Linq;
 using System.Text.Json.Serialization;
 using Jellyfin.Data.Entities;
@@ -91,7 +92,7 @@ namespace MediaBrowser.Controller.Entities.Movies
             return Enumerable.Empty<BaseItem>();
         }
 
-        protected override List<BaseItem> LoadChildren()
+        protected override IReadOnlyList<BaseItem> LoadChildren()
         {
             if (IsLegacyBoxSet)
             {
@@ -99,7 +100,7 @@ namespace MediaBrowser.Controller.Entities.Movies
             }
 
             // Save a trip to the database
-            return new List<BaseItem>();
+            return [];
         }
 
         public override bool IsAuthorizedToDelete(User user, List<Folder> allCollectionFolders)
@@ -127,16 +128,16 @@ namespace MediaBrowser.Controller.Entities.Movies
             return LibraryManager.Sort(items, user, new[] { sortBy }, SortOrder.Ascending);
         }
 
-        public override List<BaseItem> GetChildren(User user, bool includeLinkedChildren, InternalItemsQuery query)
+        public override IReadOnlyList<BaseItem> GetChildren(User user, bool includeLinkedChildren, InternalItemsQuery query)
         {
             var children = base.GetChildren(user, includeLinkedChildren, query);
-            return Sort(children, user).ToList();
+            return Sort(children, user).ToImmutableList();
         }
 
-        public override IEnumerable<BaseItem> GetRecursiveChildren(User user, InternalItemsQuery query)
+        public override IReadOnlyList<BaseItem> GetRecursiveChildren(User user, InternalItemsQuery query)
         {
             var children = base.GetRecursiveChildren(user, query);
-            return Sort(children, user).ToList();
+            return Sort(children, user).ToImmutableList();
         }
 
         public BoxSetInfo GetLookupInfo()
diff --git a/MediaBrowser.Controller/Entities/PeopleHelper.cs b/MediaBrowser.Controller/Entities/PeopleHelper.cs
index 5292bd772..4141b1712 100644
--- a/MediaBrowser.Controller/Entities/PeopleHelper.cs
+++ b/MediaBrowser.Controller/Entities/PeopleHelper.cs
@@ -10,7 +10,7 @@ namespace MediaBrowser.Controller.Entities
 {
     public static class PeopleHelper
     {
-        public static void AddPerson(List<PersonInfo> people, PersonInfo person)
+        public static void AddPerson(ICollection<PersonInfo> people, PersonInfo person)
         {
             ArgumentNullException.ThrowIfNull(person);
             ArgumentException.ThrowIfNullOrEmpty(person.Name);
diff --git a/MediaBrowser.Controller/Entities/Person.cs b/MediaBrowser.Controller/Entities/Person.cs
index 7f265084f..b0933d23f 100644
--- a/MediaBrowser.Controller/Entities/Person.cs
+++ b/MediaBrowser.Controller/Entities/Person.cs
@@ -62,7 +62,7 @@ namespace MediaBrowser.Controller.Entities
             return value;
         }
 
-        public IList<BaseItem> GetTaggedItems(InternalItemsQuery query)
+        public IReadOnlyList<BaseItem> GetTaggedItems(InternalItemsQuery query)
         {
             query.PersonIds = new[] { Id };
 
diff --git a/MediaBrowser.Controller/Entities/Studio.cs b/MediaBrowser.Controller/Entities/Studio.cs
index a3736a4bf..b46a3d1bc 100644
--- a/MediaBrowser.Controller/Entities/Studio.cs
+++ b/MediaBrowser.Controller/Entities/Studio.cs
@@ -63,7 +63,7 @@ namespace MediaBrowser.Controller.Entities
             return true;
         }
 
-        public IList<BaseItem> GetTaggedItems(InternalItemsQuery query)
+        public IReadOnlyList<BaseItem> GetTaggedItems(InternalItemsQuery query)
         {
             query.StudioIds = new[] { Id };
 
diff --git a/MediaBrowser.Controller/Entities/TV/Series.cs b/MediaBrowser.Controller/Entities/TV/Series.cs
index a324f79ef..137d91f1c 100644
--- a/MediaBrowser.Controller/Entities/TV/Series.cs
+++ b/MediaBrowser.Controller/Entities/TV/Series.cs
@@ -189,12 +189,12 @@ namespace MediaBrowser.Controller.Entities.TV
             return list;
         }
 
-        public override List<BaseItem> GetChildren(User user, bool includeLinkedChildren, InternalItemsQuery query)
+        public override IReadOnlyList<BaseItem> GetChildren(User user, bool includeLinkedChildren, InternalItemsQuery query)
         {
             return GetSeasons(user, new DtoOptions(true));
         }
 
-        public List<BaseItem> GetSeasons(User user, DtoOptions options)
+        public IReadOnlyList<BaseItem> GetSeasons(User user, DtoOptions options)
         {
             var query = new InternalItemsQuery(user)
             {
diff --git a/MediaBrowser.Controller/Entities/UserRootFolder.cs b/MediaBrowser.Controller/Entities/UserRootFolder.cs
index a687adedd..7cf447fb8 100644
--- a/MediaBrowser.Controller/Entities/UserRootFolder.cs
+++ b/MediaBrowser.Controller/Entities/UserRootFolder.cs
@@ -52,7 +52,7 @@ namespace MediaBrowser.Controller.Entities
             }
         }
 
-        protected override List<BaseItem> LoadChildren()
+        protected override IReadOnlyList<BaseItem> LoadChildren()
         {
             lock (_childIdsLock)
             {
diff --git a/MediaBrowser.Controller/Entities/UserView.cs b/MediaBrowser.Controller/Entities/UserView.cs
index e4fb340f7..f5ca3737c 100644
--- a/MediaBrowser.Controller/Entities/UserView.cs
+++ b/MediaBrowser.Controller/Entities/UserView.cs
@@ -134,7 +134,7 @@ namespace MediaBrowser.Controller.Entities
         }
 
         /// <inheritdoc />
-        public override IEnumerable<BaseItem> GetRecursiveChildren(User user, InternalItemsQuery query)
+        public override IReadOnlyList<BaseItem> GetRecursiveChildren(User user, InternalItemsQuery query)
         {
             query.SetUser(user);
             query.Recursive = true;
@@ -145,7 +145,7 @@ namespace MediaBrowser.Controller.Entities
         }
 
         /// <inheritdoc />
-        protected override IEnumerable<BaseItem> GetEligibleChildrenForRecursiveChildren(User user)
+        protected override IReadOnlyList<BaseItem> GetEligibleChildrenForRecursiveChildren(User user)
         {
             return GetChildren(user, false);
         }
diff --git a/MediaBrowser.Controller/Entities/UserViewBuilder.cs b/MediaBrowser.Controller/Entities/UserViewBuilder.cs
index 420349f35..4ec2e4c0a 100644
--- a/MediaBrowser.Controller/Entities/UserViewBuilder.cs
+++ b/MediaBrowser.Controller/Entities/UserViewBuilder.cs
@@ -236,7 +236,7 @@ namespace MediaBrowser.Controller.Entities
             return ConvertToResult(_libraryManager.GetItemList(query));
         }
 
-        private QueryResult<BaseItem> ConvertToResult(List<BaseItem> items)
+        private QueryResult<BaseItem> ConvertToResult(IReadOnlyList<BaseItem> items)
         {
             return new QueryResult<BaseItem>(items);
         }
diff --git a/MediaBrowser.Controller/Entities/Year.cs b/MediaBrowser.Controller/Entities/Year.cs
index afdaf448b..587d7ce7e 100644
--- a/MediaBrowser.Controller/Entities/Year.cs
+++ b/MediaBrowser.Controller/Entities/Year.cs
@@ -55,7 +55,7 @@ namespace MediaBrowser.Controller.Entities
             return true;
         }
 
-        public IList<BaseItem> GetTaggedItems(InternalItemsQuery query)
+        public IReadOnlyList<BaseItem> GetTaggedItems(InternalItemsQuery query)
         {
             if (!int.TryParse(Name, NumberStyles.Integer, CultureInfo.InvariantCulture, out var year))
             {
diff --git a/MediaBrowser.Controller/Library/ILibraryManager.cs b/MediaBrowser.Controller/Library/ILibraryManager.cs
index b802b7e6e..47b1cb16e 100644
--- a/MediaBrowser.Controller/Library/ILibraryManager.cs
+++ b/MediaBrowser.Controller/Library/ILibraryManager.cs
@@ -483,21 +483,21 @@ namespace MediaBrowser.Controller.Library
         /// </summary>
         /// <param name="item">The item.</param>
         /// <returns>List&lt;PersonInfo&gt;.</returns>
-        List<PersonInfo> GetPeople(BaseItem item);
+        IReadOnlyList<PersonInfo> GetPeople(BaseItem item);
 
         /// <summary>
         /// Gets the people.
         /// </summary>
         /// <param name="query">The query.</param>
         /// <returns>List&lt;PersonInfo&gt;.</returns>
-        List<PersonInfo> GetPeople(InternalPeopleQuery query);
+        IReadOnlyList<PersonInfo> GetPeople(InternalPeopleQuery query);
 
         /// <summary>
         /// Gets the people items.
         /// </summary>
         /// <param name="query">The query.</param>
         /// <returns>List&lt;Person&gt;.</returns>
-        List<Person> GetPeopleItems(InternalPeopleQuery query);
+        IReadOnlyList<Person> GetPeopleItems(InternalPeopleQuery query);
 
         /// <summary>
         /// Updates the people.
@@ -513,21 +513,21 @@ namespace MediaBrowser.Controller.Library
         /// <param name="people">The people.</param>
         /// <param name="cancellationToken">The cancellation token.</param>
         /// <returns>The async task.</returns>
-        Task UpdatePeopleAsync(BaseItem item, List<PersonInfo> people, CancellationToken cancellationToken);
+        Task UpdatePeopleAsync(BaseItem item, IReadOnlyList<PersonInfo> people, CancellationToken cancellationToken);
 
         /// <summary>
         /// Gets the item ids.
         /// </summary>
         /// <param name="query">The query.</param>
         /// <returns>List&lt;Guid&gt;.</returns>
-        List<Guid> GetItemIds(InternalItemsQuery query);
+        IReadOnlyList<Guid> GetItemIds(InternalItemsQuery query);
 
         /// <summary>
         /// Gets the people names.
         /// </summary>
         /// <param name="query">The query.</param>
         /// <returns>List&lt;System.String&gt;.</returns>
-        List<string> GetPeopleNames(InternalPeopleQuery query);
+        IReadOnlyList<string> GetPeopleNames(InternalPeopleQuery query);
 
         /// <summary>
         /// Queries the items.
@@ -553,9 +553,9 @@ namespace MediaBrowser.Controller.Library
         /// </summary>
         /// <param name="query">The query.</param>
         /// <returns>QueryResult&lt;BaseItem&gt;.</returns>
-        List<BaseItem> GetItemList(InternalItemsQuery query);
+        IReadOnlyList<BaseItem> GetItemList(InternalItemsQuery query);
 
-        List<BaseItem> GetItemList(InternalItemsQuery query, bool allowExternalContent);
+        IReadOnlyList<BaseItem> GetItemList(InternalItemsQuery query, bool allowExternalContent);
 
         /// <summary>
         /// Gets the items.
@@ -563,7 +563,7 @@ namespace MediaBrowser.Controller.Library
         /// <param name="query">The query to use.</param>
         /// <param name="parents">Items to use for query.</param>
         /// <returns>List of items.</returns>
-        List<BaseItem> GetItemList(InternalItemsQuery query, List<BaseItem> parents);
+        IReadOnlyList<BaseItem> GetItemList(InternalItemsQuery query, List<BaseItem> parents);
 
         /// <summary>
         /// Gets the items result.
diff --git a/MediaBrowser.Controller/Library/IMediaSourceManager.cs b/MediaBrowser.Controller/Library/IMediaSourceManager.cs
index 44a1a85e3..5ed3a49c3 100644
--- a/MediaBrowser.Controller/Library/IMediaSourceManager.cs
+++ b/MediaBrowser.Controller/Library/IMediaSourceManager.cs
@@ -29,28 +29,28 @@ namespace MediaBrowser.Controller.Library
         /// </summary>
         /// <param name="itemId">The item identifier.</param>
         /// <returns>IEnumerable&lt;MediaStream&gt;.</returns>
-        List<MediaStream> GetMediaStreams(Guid itemId);
+        IReadOnlyList<MediaStream> GetMediaStreams(Guid itemId);
 
         /// <summary>
         /// Gets the media streams.
         /// </summary>
         /// <param name="query">The query.</param>
         /// <returns>IEnumerable&lt;MediaStream&gt;.</returns>
-        List<MediaStream> GetMediaStreams(MediaStreamQuery query);
+        IReadOnlyList<MediaStream> GetMediaStreams(MediaStreamQuery query);
 
         /// <summary>
         /// Gets the media attachments.
         /// </summary>
         /// <param name="itemId">The item identifier.</param>
         /// <returns>IEnumerable&lt;MediaAttachment&gt;.</returns>
-        List<MediaAttachment> GetMediaAttachments(Guid itemId);
+        IReadOnlyList<MediaAttachment> GetMediaAttachments(Guid itemId);
 
         /// <summary>
         /// Gets the media attachments.
         /// </summary>
         /// <param name="query">The query.</param>
         /// <returns>IEnumerable&lt;MediaAttachment&gt;.</returns>
-        List<MediaAttachment> GetMediaAttachments(MediaAttachmentQuery query);
+        IReadOnlyList<MediaAttachment> GetMediaAttachments(MediaAttachmentQuery query);
 
         /// <summary>
         /// Gets the playack media sources.
diff --git a/MediaBrowser.Controller/Library/IMusicManager.cs b/MediaBrowser.Controller/Library/IMusicManager.cs
index 93073cc79..7ba8fc20c 100644
--- a/MediaBrowser.Controller/Library/IMusicManager.cs
+++ b/MediaBrowser.Controller/Library/IMusicManager.cs
@@ -17,7 +17,7 @@ namespace MediaBrowser.Controller.Library
         /// <param name="user">The user to use.</param>
         /// <param name="dtoOptions">The options to use.</param>
         /// <returns>List of items.</returns>
-        List<BaseItem> GetInstantMixFromItem(BaseItem item, User? user, DtoOptions dtoOptions);
+        IReadOnlyList<BaseItem> GetInstantMixFromItem(BaseItem item, User? user, DtoOptions dtoOptions);
 
         /// <summary>
         /// Gets the instant mix from artist.
@@ -26,7 +26,7 @@ namespace MediaBrowser.Controller.Library
         /// <param name="user">The user to use.</param>
         /// <param name="dtoOptions">The options to use.</param>
         /// <returns>List of items.</returns>
-        List<BaseItem> GetInstantMixFromArtist(MusicArtist artist, User? user, DtoOptions dtoOptions);
+        IReadOnlyList<BaseItem> GetInstantMixFromArtist(MusicArtist artist, User? user, DtoOptions dtoOptions);
 
         /// <summary>
         /// Gets the instant mix from genre.
@@ -35,6 +35,6 @@ namespace MediaBrowser.Controller.Library
         /// <param name="user">The user to use.</param>
         /// <param name="dtoOptions">The options to use.</param>
         /// <returns>List of items.</returns>
-        List<BaseItem> GetInstantMixFromGenres(IEnumerable<string> genres, User? user, DtoOptions dtoOptions);
+        IReadOnlyList<BaseItem> GetInstantMixFromGenres(IEnumerable<string> genres, User? user, DtoOptions dtoOptions);
     }
 }
diff --git a/MediaBrowser.Controller/LiveTv/LiveTvChannel.cs b/MediaBrowser.Controller/LiveTv/LiveTvChannel.cs
index 3c2cf8e3d..64d49d8c4 100644
--- a/MediaBrowser.Controller/LiveTv/LiveTvChannel.cs
+++ b/MediaBrowser.Controller/LiveTv/LiveTvChannel.cs
@@ -4,6 +4,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Collections.Immutable;
 using System.Globalization;
 using System.Linq;
 using System.Text.Json.Serialization;
@@ -122,7 +123,7 @@ namespace MediaBrowser.Controller.LiveTv
         public IEnumerable<BaseItem> GetTaggedItems()
             => Enumerable.Empty<BaseItem>();
 
-        public override List<MediaSourceInfo> GetMediaSources(bool enablePathSubstitution)
+        public override IReadOnlyList<MediaSourceInfo> GetMediaSources(bool enablePathSubstitution)
         {
             var list = new List<MediaSourceInfo>();
 
@@ -140,12 +141,12 @@ namespace MediaBrowser.Controller.LiveTv
 
             list.Add(info);
 
-            return list;
+            return list.ToImmutableList();
         }
 
-        public override List<MediaStream> GetMediaStreams()
+        public override IReadOnlyList<MediaStream> GetMediaStreams()
         {
-            return new List<MediaStream>();
+            return [];
         }
 
         protected override string GetInternalMetadataPath(string basePath)
diff --git a/MediaBrowser.Controller/Playlists/Playlist.cs b/MediaBrowser.Controller/Playlists/Playlist.cs
index 45aefacf6..bf6871a74 100644
--- a/MediaBrowser.Controller/Playlists/Playlist.cs
+++ b/MediaBrowser.Controller/Playlists/Playlist.cs
@@ -137,27 +137,27 @@ namespace MediaBrowser.Controller.Playlists
             return Task.CompletedTask;
         }
 
-        public override List<BaseItem> GetChildren(User user, bool includeLinkedChildren, InternalItemsQuery query)
+        public override IReadOnlyList<BaseItem> GetChildren(User user, bool includeLinkedChildren, InternalItemsQuery query)
         {
             return GetPlayableItems(user, query);
         }
 
-        protected override IEnumerable<BaseItem> GetNonCachedChildren(IDirectoryService directoryService)
+        protected override IReadOnlyList<BaseItem> GetNonCachedChildren(IDirectoryService directoryService)
         {
             return [];
         }
 
-        public override IEnumerable<BaseItem> GetRecursiveChildren(User user, InternalItemsQuery query)
+        public override IReadOnlyList<BaseItem> GetRecursiveChildren(User user, InternalItemsQuery query)
         {
             return GetPlayableItems(user, query);
         }
 
-        public IEnumerable<Tuple<LinkedChild, BaseItem>> GetManageableItems()
+        public IReadOnlyList<Tuple<LinkedChild, BaseItem>> GetManageableItems()
         {
             return GetLinkedChildrenInfos();
         }
 
-        private List<BaseItem> GetPlayableItems(User user, InternalItemsQuery query)
+        private IReadOnlyList<BaseItem> GetPlayableItems(User user, InternalItemsQuery query)
         {
             query ??= new InternalItemsQuery(user);
 
diff --git a/MediaBrowser.Controller/Providers/MetadataResult.cs b/MediaBrowser.Controller/Providers/MetadataResult.cs
index cfff3eb14..eabbe73cd 100644
--- a/MediaBrowser.Controller/Providers/MetadataResult.cs
+++ b/MediaBrowser.Controller/Providers/MetadataResult.cs
@@ -3,6 +3,7 @@
 #pragma warning disable CA1002, CA2227, CS1591
 
 using System.Collections.Generic;
+using System.Linq;
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Model.Entities;
 
@@ -13,6 +14,7 @@ namespace MediaBrowser.Controller.Providers
         // Images aren't always used so the allocation is a waste a lot of the time
         private List<LocalImageInfo> _images;
         private List<(string Url, ImageType Type)> _remoteImages;
+        private List<PersonInfo> _people;
 
         public MetadataResult()
         {
@@ -21,17 +23,21 @@ namespace MediaBrowser.Controller.Providers
 
         public List<LocalImageInfo> Images
         {
-            get => _images ??= new List<LocalImageInfo>();
+            get => _images ??= [];
             set => _images = value;
         }
 
         public List<(string Url, ImageType Type)> RemoteImages
         {
-            get => _remoteImages ??= new List<(string Url, ImageType Type)>();
+            get => _remoteImages ??= [];
             set => _remoteImages = value;
         }
 
-        public List<PersonInfo> People { get; set; }
+        public IReadOnlyList<PersonInfo> People
+        {
+            get => _people;
+            set => _people = value.ToList();
+        }
 
         public bool HasMetadata { get; set; }
 
@@ -47,7 +53,7 @@ namespace MediaBrowser.Controller.Providers
         {
             People ??= new List<PersonInfo>();
 
-            PeopleHelper.AddPerson(People, p);
+            PeopleHelper.AddPerson(_people, p);
         }
 
         /// <summary>
@@ -61,7 +67,7 @@ namespace MediaBrowser.Controller.Providers
             }
             else
             {
-                People.Clear();
+                _people.Clear();
             }
         }
     }
diff --git a/MediaBrowser.Providers/BoxSets/BoxSetMetadataService.cs b/MediaBrowser.Providers/BoxSets/BoxSetMetadataService.cs
index 32ab7716f..b51ab4c08 100644
--- a/MediaBrowser.Providers/BoxSets/BoxSetMetadataService.cs
+++ b/MediaBrowser.Providers/BoxSets/BoxSetMetadataService.cs
@@ -39,7 +39,7 @@ namespace MediaBrowser.Providers.BoxSets
         protected override bool EnableUpdatingPremiereDateFromChildren => true;
 
         /// <inheritdoc />
-        protected override IList<BaseItem> GetChildrenForMetadataUpdates(BoxSet item)
+        protected override IReadOnlyList<BaseItem> GetChildrenForMetadataUpdates(BoxSet item)
         {
             return item.GetLinkedChildren();
         }
diff --git a/MediaBrowser.Providers/Manager/MetadataService.cs b/MediaBrowser.Providers/Manager/MetadataService.cs
index 7203bf115..4c9d162c4 100644
--- a/MediaBrowser.Providers/Manager/MetadataService.cs
+++ b/MediaBrowser.Providers/Manager/MetadataService.cs
@@ -322,17 +322,17 @@ namespace MediaBrowser.Providers.Manager
             return false;
         }
 
-        protected virtual IList<BaseItem> GetChildrenForMetadataUpdates(TItemType item)
+        protected virtual IReadOnlyList<BaseItem> GetChildrenForMetadataUpdates(TItemType item)
         {
             if (item is Folder folder)
             {
                 return folder.GetRecursiveChildren();
             }
 
-            return Array.Empty<BaseItem>();
+            return [];
         }
 
-        protected virtual ItemUpdateType UpdateMetadataFromChildren(TItemType item, IList<BaseItem> children, bool isFullRefresh, ItemUpdateType currentUpdateType)
+        protected virtual ItemUpdateType UpdateMetadataFromChildren(TItemType item, IReadOnlyList<BaseItem> children, bool isFullRefresh, ItemUpdateType currentUpdateType)
         {
             var updateType = ItemUpdateType.None;
 
@@ -371,7 +371,7 @@ namespace MediaBrowser.Providers.Manager
             return updateType;
         }
 
-        private ItemUpdateType UpdateCumulativeRunTimeTicks(TItemType item, IList<BaseItem> children)
+        private ItemUpdateType UpdateCumulativeRunTimeTicks(TItemType item, IReadOnlyList<BaseItem> children)
         {
             if (item is Folder folder && folder.SupportsCumulativeRunTimeTicks)
             {
@@ -395,7 +395,7 @@ namespace MediaBrowser.Providers.Manager
             return ItemUpdateType.None;
         }
 
-        private ItemUpdateType UpdateDateLastMediaAdded(TItemType item, IList<BaseItem> children)
+        private ItemUpdateType UpdateDateLastMediaAdded(TItemType item, IReadOnlyList<BaseItem> children)
         {
             var updateType = ItemUpdateType.None;
 
@@ -429,7 +429,7 @@ namespace MediaBrowser.Providers.Manager
             return updateType;
         }
 
-        private ItemUpdateType UpdatePremiereDate(TItemType item, IList<BaseItem> children)
+        private ItemUpdateType UpdatePremiereDate(TItemType item, IReadOnlyList<BaseItem> children)
         {
             var updateType = ItemUpdateType.None;
 
@@ -467,7 +467,7 @@ namespace MediaBrowser.Providers.Manager
             return updateType;
         }
 
-        private ItemUpdateType UpdateGenres(TItemType item, IList<BaseItem> children)
+        private ItemUpdateType UpdateGenres(TItemType item, IReadOnlyList<BaseItem> children)
         {
             var updateType = ItemUpdateType.None;
 
@@ -488,7 +488,7 @@ namespace MediaBrowser.Providers.Manager
             return updateType;
         }
 
-        private ItemUpdateType UpdateStudios(TItemType item, IList<BaseItem> children)
+        private ItemUpdateType UpdateStudios(TItemType item, IReadOnlyList<BaseItem> children)
         {
             var updateType = ItemUpdateType.None;
 
@@ -509,7 +509,7 @@ namespace MediaBrowser.Providers.Manager
             return updateType;
         }
 
-        private ItemUpdateType UpdateOfficialRating(TItemType item, IList<BaseItem> children)
+        private ItemUpdateType UpdateOfficialRating(TItemType item, IReadOnlyList<BaseItem> children)
         {
             var updateType = ItemUpdateType.None;
 
@@ -1142,13 +1142,8 @@ namespace MediaBrowser.Providers.Manager
             }
         }
 
-        private static void MergePeople(List<PersonInfo> source, List<PersonInfo> target)
+        private static void MergePeople(IReadOnlyList<PersonInfo> source, IReadOnlyList<PersonInfo> target)
         {
-            if (target is null)
-            {
-                target = new List<PersonInfo>();
-            }
-
             foreach (var person in target)
             {
                 var normalizedName = person.Name.RemoveDiacritics();
diff --git a/MediaBrowser.Providers/MediaInfo/AudioFileProber.cs b/MediaBrowser.Providers/MediaInfo/AudioFileProber.cs
index 27f6d120f..3add439f9 100644
--- a/MediaBrowser.Providers/MediaInfo/AudioFileProber.cs
+++ b/MediaBrowser.Providers/MediaInfo/AudioFileProber.cs
@@ -36,6 +36,7 @@ namespace MediaBrowser.Providers.MediaInfo
         private readonly IMediaSourceManager _mediaSourceManager;
         private readonly LyricResolver _lyricResolver;
         private readonly ILyricManager _lyricManager;
+        private readonly IMediaStreamRepository _mediaStreamRepository;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="AudioFileProber"/> class.
@@ -47,6 +48,7 @@ namespace MediaBrowser.Providers.MediaInfo
         /// <param name="libraryManager">Instance of the <see cref="ILibraryManager"/> interface.</param>
         /// <param name="lyricResolver">Instance of the <see cref="LyricResolver"/> interface.</param>
         /// <param name="lyricManager">Instance of the <see cref="ILyricManager"/> interface.</param>
+        /// <param name="mediaStreamRepository">Instance of the <see cref="IMediaStreamRepository"/>.</param>
         public AudioFileProber(
             ILogger<AudioFileProber> logger,
             IMediaSourceManager mediaSourceManager,
@@ -54,7 +56,8 @@ namespace MediaBrowser.Providers.MediaInfo
             IItemRepository itemRepo,
             ILibraryManager libraryManager,
             LyricResolver lyricResolver,
-            ILyricManager lyricManager)
+            ILyricManager lyricManager,
+            IMediaStreamRepository mediaStreamRepository)
         {
             _mediaEncoder = mediaEncoder;
             _itemRepo = itemRepo;
@@ -63,6 +66,7 @@ namespace MediaBrowser.Providers.MediaInfo
             _mediaSourceManager = mediaSourceManager;
             _lyricResolver = lyricResolver;
             _lyricManager = lyricManager;
+            _mediaStreamRepository = mediaStreamRepository;
             ATL.Settings.DisplayValueSeparator = InternalValueSeparator;
             ATL.Settings.UseFileNameWhenNoTitle = false;
             ATL.Settings.ID3v2_separatev2v3Values = false;
@@ -149,7 +153,7 @@ namespace MediaBrowser.Providers.MediaInfo
 
             audio.HasLyrics = mediaStreams.Any(s => s.Type == MediaStreamType.Lyric);
 
-            _itemRepo.SaveMediaStreams(audio.Id, mediaStreams, cancellationToken);
+            _mediaStreamRepository.SaveMediaStreams(audio.Id, mediaStreams, cancellationToken);
         }
 
         /// <summary>
diff --git a/MediaBrowser.Providers/MediaInfo/AudioImageProvider.cs b/MediaBrowser.Providers/MediaInfo/AudioImageProvider.cs
index d1c0ddb37..bfe4f3300 100644
--- a/MediaBrowser.Providers/MediaInfo/AudioImageProvider.cs
+++ b/MediaBrowser.Providers/MediaInfo/AudioImageProvider.cs
@@ -74,7 +74,7 @@ namespace MediaBrowser.Providers.MediaInfo
             return GetImage((Audio)item, imageStreams, cancellationToken);
         }
 
-        private async Task<DynamicImageResponse> GetImage(Audio item, List<MediaStream> imageStreams, CancellationToken cancellationToken)
+        private async Task<DynamicImageResponse> GetImage(Audio item, IReadOnlyList<MediaStream> imageStreams, CancellationToken cancellationToken)
         {
             var path = GetAudioImagePath(item);
 
diff --git a/MediaBrowser.Providers/MediaInfo/FFProbeVideoInfo.cs b/MediaBrowser.Providers/MediaInfo/FFProbeVideoInfo.cs
index 62c590944..301555eef 100644
--- a/MediaBrowser.Providers/MediaInfo/FFProbeVideoInfo.cs
+++ b/MediaBrowser.Providers/MediaInfo/FFProbeVideoInfo.cs
@@ -31,6 +31,7 @@ namespace MediaBrowser.Providers.MediaInfo
     public class FFProbeVideoInfo
     {
         private readonly ILogger<FFProbeVideoInfo> _logger;
+        private readonly IMediaSourceManager _mediaSourceManager;
         private readonly IMediaEncoder _mediaEncoder;
         private readonly IItemRepository _itemRepo;
         private readonly IBlurayExaminer _blurayExaminer;
@@ -42,7 +43,8 @@ namespace MediaBrowser.Providers.MediaInfo
         private readonly ILibraryManager _libraryManager;
         private readonly AudioResolver _audioResolver;
         private readonly SubtitleResolver _subtitleResolver;
-        private readonly IMediaSourceManager _mediaSourceManager;
+        private readonly IMediaAttachmentRepository _mediaAttachmentRepository;
+        private readonly IMediaStreamRepository _mediaStreamRepository;
 
         public FFProbeVideoInfo(
             ILogger<FFProbeVideoInfo> logger,
@@ -57,7 +59,9 @@ namespace MediaBrowser.Providers.MediaInfo
             IChapterRepository chapterManager,
             ILibraryManager libraryManager,
             AudioResolver audioResolver,
-            SubtitleResolver subtitleResolver)
+            SubtitleResolver subtitleResolver,
+            IMediaAttachmentRepository mediaAttachmentRepository,
+            IMediaStreamRepository mediaStreamRepository)
         {
             _logger = logger;
             _mediaSourceManager = mediaSourceManager;
@@ -72,6 +76,9 @@ namespace MediaBrowser.Providers.MediaInfo
             _libraryManager = libraryManager;
             _audioResolver = audioResolver;
             _subtitleResolver = subtitleResolver;
+            _mediaAttachmentRepository = mediaAttachmentRepository;
+            _mediaStreamRepository = mediaStreamRepository;
+            _mediaStreamRepository = mediaStreamRepository;
         }
 
         public async Task<ItemUpdateType> ProbeVideo<T>(
@@ -267,11 +274,11 @@ namespace MediaBrowser.Providers.MediaInfo
 
             video.HasSubtitles = mediaStreams.Any(i => i.Type == MediaStreamType.Subtitle);
 
-            _itemRepo.SaveMediaStreams(video.Id, mediaStreams, cancellationToken);
+            _mediaStreamRepository.SaveMediaStreams(video.Id, mediaStreams, cancellationToken);
 
             if (mediaAttachments.Any())
             {
-                _itemRepo.SaveMediaAttachments(video.Id, mediaAttachments, cancellationToken);
+                _mediaAttachmentRepository.SaveMediaAttachments(video.Id, mediaAttachments, cancellationToken);
             }
 
             if (options.MetadataRefreshMode == MetadataRefreshMode.FullRefresh
diff --git a/MediaBrowser.Providers/MediaInfo/ProbeProvider.cs b/MediaBrowser.Providers/MediaInfo/ProbeProvider.cs
index f5e9dddcf..1c2f8b913 100644
--- a/MediaBrowser.Providers/MediaInfo/ProbeProvider.cs
+++ b/MediaBrowser.Providers/MediaInfo/ProbeProvider.cs
@@ -67,6 +67,8 @@ namespace MediaBrowser.Providers.MediaInfo
         /// <param name="fileSystem">Instance of the <see cref="IFileSystem"/> interface.</param>
         /// <param name="namingOptions">The <see cref="NamingOptions"/>.</param>
         /// <param name="lyricManager">Instance of the <see cref="ILyricManager"/> interface.</param>
+        /// <param name="mediaAttachmentRepository">Instance of the <see cref="IMediaAttachmentRepository"/> interface.</param>
+        /// <param name="mediaStreamRepository">Instance of the <see cref="IMediaStreamRepository"/> interface.</param>
         public ProbeProvider(
             IMediaSourceManager mediaSourceManager,
             IMediaEncoder mediaEncoder,
@@ -81,7 +83,9 @@ namespace MediaBrowser.Providers.MediaInfo
             IFileSystem fileSystem,
             ILoggerFactory loggerFactory,
             NamingOptions namingOptions,
-            ILyricManager lyricManager)
+            ILyricManager lyricManager,
+            IMediaAttachmentRepository mediaAttachmentRepository,
+            IMediaStreamRepository mediaStreamRepository)
         {
             _logger = loggerFactory.CreateLogger<ProbeProvider>();
             _audioResolver = new AudioResolver(loggerFactory.CreateLogger<AudioResolver>(), localization, mediaEncoder, fileSystem, namingOptions);
@@ -101,7 +105,9 @@ namespace MediaBrowser.Providers.MediaInfo
                 chapterManager,
                 libraryManager,
                 _audioResolver,
-                _subtitleResolver);
+                _subtitleResolver,
+                mediaAttachmentRepository,
+                mediaStreamRepository);
 
             _audioProber = new AudioFileProber(
                 loggerFactory.CreateLogger<AudioFileProber>(),
@@ -110,7 +116,8 @@ namespace MediaBrowser.Providers.MediaInfo
                 itemRepo,
                 libraryManager,
                 _lyricResolver,
-                lyricManager);
+                lyricManager,
+                mediaStreamRepository);
         }
 
         /// <inheritdoc />
diff --git a/MediaBrowser.Providers/MediaInfo/SubtitleDownloader.cs b/MediaBrowser.Providers/MediaInfo/SubtitleDownloader.cs
index 20fb4dab9..227f31025 100644
--- a/MediaBrowser.Providers/MediaInfo/SubtitleDownloader.cs
+++ b/MediaBrowser.Providers/MediaInfo/SubtitleDownloader.cs
@@ -31,7 +31,7 @@ namespace MediaBrowser.Providers.MediaInfo
 
         public async Task<List<string>> DownloadSubtitles(
             Video video,
-            List<MediaStream> mediaStreams,
+            IReadOnlyList<MediaStream> mediaStreams,
             bool skipIfEmbeddedSubtitlesPresent,
             bool skipIfAudioTrackMatches,
             bool requirePerfectMatch,
@@ -68,7 +68,7 @@ namespace MediaBrowser.Providers.MediaInfo
 
         public Task<bool> DownloadSubtitles(
             Video video,
-            List<MediaStream> mediaStreams,
+            IReadOnlyList<MediaStream> mediaStreams,
             bool skipIfEmbeddedSubtitlesPresent,
             bool skipIfAudioTrackMatches,
             bool requirePerfectMatch,
@@ -120,7 +120,7 @@ namespace MediaBrowser.Providers.MediaInfo
 
         private async Task<bool> DownloadSubtitles(
             Video video,
-            List<MediaStream> mediaStreams,
+            IReadOnlyList<MediaStream> mediaStreams,
             bool skipIfEmbeddedSubtitlesPresent,
             bool skipIfAudioTrackMatches,
             bool requirePerfectMatch,
diff --git a/MediaBrowser.Providers/Music/AlbumMetadataService.cs b/MediaBrowser.Providers/Music/AlbumMetadataService.cs
index a39bd16ce..25698d8cb 100644
--- a/MediaBrowser.Providers/Music/AlbumMetadataService.cs
+++ b/MediaBrowser.Providers/Music/AlbumMetadataService.cs
@@ -47,11 +47,11 @@ namespace MediaBrowser.Providers.Music
         protected override bool EnableUpdatingStudiosFromChildren => true;
 
         /// <inheritdoc />
-        protected override IList<BaseItem> GetChildrenForMetadataUpdates(MusicAlbum item)
+        protected override IReadOnlyList<BaseItem> GetChildrenForMetadataUpdates(MusicAlbum item)
             => item.GetRecursiveChildren(i => i is Audio);
 
         /// <inheritdoc />
-        protected override ItemUpdateType UpdateMetadataFromChildren(MusicAlbum item, IList<BaseItem> children, bool isFullRefresh, ItemUpdateType currentUpdateType)
+        protected override ItemUpdateType UpdateMetadataFromChildren(MusicAlbum item, IReadOnlyList<BaseItem> children, bool isFullRefresh, ItemUpdateType currentUpdateType)
         {
             var updateType = base.UpdateMetadataFromChildren(item, children, isFullRefresh, currentUpdateType);
 
diff --git a/MediaBrowser.Providers/Music/ArtistMetadataService.cs b/MediaBrowser.Providers/Music/ArtistMetadataService.cs
index 1f342c0db..8af6de925 100644
--- a/MediaBrowser.Providers/Music/ArtistMetadataService.cs
+++ b/MediaBrowser.Providers/Music/ArtistMetadataService.cs
@@ -1,6 +1,7 @@
 #pragma warning disable CS1591
 
 using System.Collections.Generic;
+using System.Collections.Immutable;
 using MediaBrowser.Controller.Configuration;
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Entities.Audio;
@@ -28,7 +29,7 @@ namespace MediaBrowser.Providers.Music
         protected override bool EnableUpdatingGenresFromChildren => true;
 
         /// <inheritdoc />
-        protected override IList<BaseItem> GetChildrenForMetadataUpdates(MusicArtist item)
+        protected override IReadOnlyList<BaseItem> GetChildrenForMetadataUpdates(MusicArtist item)
         {
             return item.IsAccessedByName
                 ? item.GetTaggedItems(new InternalItemsQuery
@@ -36,7 +37,7 @@ namespace MediaBrowser.Providers.Music
                     Recursive = true,
                     IsFolder = false
                 })
-                : item.GetRecursiveChildren(i => i is IHasArtist && !i.IsFolder);
+                : item.GetRecursiveChildren(i => i is IHasArtist && !i.IsFolder).ToImmutableArray();
         }
     }
 }
diff --git a/MediaBrowser.Providers/Playlists/PlaylistMetadataService.cs b/MediaBrowser.Providers/Playlists/PlaylistMetadataService.cs
index 43889bfbf..7be54453f 100644
--- a/MediaBrowser.Providers/Playlists/PlaylistMetadataService.cs
+++ b/MediaBrowser.Providers/Playlists/PlaylistMetadataService.cs
@@ -36,7 +36,7 @@ namespace MediaBrowser.Providers.Playlists
         protected override bool EnableUpdatingStudiosFromChildren => true;
 
         /// <inheritdoc />
-        protected override IList<BaseItem> GetChildrenForMetadataUpdates(Playlist item)
+        protected override IReadOnlyList<BaseItem> GetChildrenForMetadataUpdates(Playlist item)
             => item.GetLinkedChildren();
 
         /// <inheritdoc />
diff --git a/MediaBrowser.Providers/TV/SeasonMetadataService.cs b/MediaBrowser.Providers/TV/SeasonMetadataService.cs
index 8b690193e..b27ccaa6a 100644
--- a/MediaBrowser.Providers/TV/SeasonMetadataService.cs
+++ b/MediaBrowser.Providers/TV/SeasonMetadataService.cs
@@ -80,11 +80,11 @@ namespace MediaBrowser.Providers.TV
         }
 
         /// <inheritdoc />
-        protected override IList<BaseItem> GetChildrenForMetadataUpdates(Season item)
+        protected override IReadOnlyList<BaseItem> GetChildrenForMetadataUpdates(Season item)
             => item.GetEpisodes();
 
         /// <inheritdoc />
-        protected override ItemUpdateType UpdateMetadataFromChildren(Season item, IList<BaseItem> children, bool isFullRefresh, ItemUpdateType currentUpdateType)
+        protected override ItemUpdateType UpdateMetadataFromChildren(Season item, IReadOnlyList<BaseItem> children, bool isFullRefresh, ItemUpdateType currentUpdateType)
         {
             var updateType = base.UpdateMetadataFromChildren(item, children, isFullRefresh, currentUpdateType);
 
@@ -96,7 +96,7 @@ namespace MediaBrowser.Providers.TV
             return updateType;
         }
 
-        private ItemUpdateType SaveIsVirtualItem(Season item, IList<BaseItem> episodes)
+        private ItemUpdateType SaveIsVirtualItem(Season item, IReadOnlyList<BaseItem> episodes)
         {
             var isVirtualItem = item.LocationType == LocationType.Virtual && (episodes.Count == 0 || episodes.All(i => i.LocationType == LocationType.Virtual));
 
diff --git a/MediaBrowser.XbmcMetadata/Savers/ArtistNfoSaver.cs b/MediaBrowser.XbmcMetadata/Savers/ArtistNfoSaver.cs
index 813d75f6c..4cd676be1 100644
--- a/MediaBrowser.XbmcMetadata/Savers/ArtistNfoSaver.cs
+++ b/MediaBrowser.XbmcMetadata/Savers/ArtistNfoSaver.cs
@@ -67,7 +67,7 @@ namespace MediaBrowser.XbmcMetadata.Savers
             AddAlbums(albums, writer);
         }
 
-        private void AddAlbums(IList<BaseItem> albums, XmlWriter writer)
+        private void AddAlbums(IReadOnlyList<BaseItem> albums, XmlWriter writer)
         {
             foreach (var album in albums)
             {
diff --git a/MediaBrowser.XbmcMetadata/Savers/BaseNfoSaver.cs b/MediaBrowser.XbmcMetadata/Savers/BaseNfoSaver.cs
index 79e9e7503..51c5a2080 100644
--- a/MediaBrowser.XbmcMetadata/Savers/BaseNfoSaver.cs
+++ b/MediaBrowser.XbmcMetadata/Savers/BaseNfoSaver.cs
@@ -914,7 +914,7 @@ namespace MediaBrowser.XbmcMetadata.Savers
             writer.WriteEndElement();
         }
 
-        private void AddActors(List<PersonInfo> people, XmlWriter writer, ILibraryManager libraryManager, bool saveImagePath)
+        private void AddActors(IReadOnlyList<PersonInfo> people, XmlWriter writer, ILibraryManager libraryManager, bool saveImagePath)
         {
             foreach (var person in people)
             {
-- 
cgit v1.2.3


From 2014fa56b8ab0b0aec0b31ae0d2d9e2fce02ee53 Mon Sep 17 00:00:00 2001
From: JPVenson <6794763+JPVenson@users.noreply.github.com>
Date: Wed, 9 Oct 2024 10:41:54 +0000
Subject: Ported new Item Repository architecture

---
 .../Library/MediaSourceManager.cs                  | 17 +++----
 Jellyfin.Api/Controllers/InstantMixController.cs   |  6 ++-
 Jellyfin.Api/Helpers/StreamingHelpers.cs           |  2 +-
 .../Library/IMediaSourceManager.cs                 |  6 +--
 .../Data/SqliteItemRepositoryTests.cs              | 58 ++--------------------
 5 files changed, 20 insertions(+), 69 deletions(-)

(limited to 'MediaBrowser.Controller')

diff --git a/Emby.Server.Implementations/Library/MediaSourceManager.cs b/Emby.Server.Implementations/Library/MediaSourceManager.cs
index a5a715721..3bf1a4cde 100644
--- a/Emby.Server.Implementations/Library/MediaSourceManager.cs
+++ b/Emby.Server.Implementations/Library/MediaSourceManager.cs
@@ -5,6 +5,7 @@
 using System;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
+using System.Collections.Immutable;
 using System.Globalization;
 using System.IO;
 using System.Linq;
@@ -164,7 +165,7 @@ namespace Emby.Server.Implementations.Library
             });
         }
 
-        public async Task<List<MediaSourceInfo>> GetPlaybackMediaSources(BaseItem item, User user, bool allowMediaProbe, bool enablePathSubstitution, CancellationToken cancellationToken)
+        public async Task<IReadOnlyList<MediaSourceInfo>> GetPlaybackMediaSources(BaseItem item, User user, bool allowMediaProbe, bool enablePathSubstitution, CancellationToken cancellationToken)
         {
             var mediaSources = GetStaticMediaSources(item, enablePathSubstitution, user);
 
@@ -217,7 +218,7 @@ namespace Emby.Server.Implementations.Library
                 list.Add(source);
             }
 
-            return SortMediaSources(list);
+            return SortMediaSources(list).ToImmutableList();
         }
 
         /// <inheritdoc />>
@@ -458,7 +459,7 @@ namespace Emby.Server.Implementations.Library
             }
         }
 
-        private static List<MediaSourceInfo> SortMediaSources(IEnumerable<MediaSourceInfo> sources)
+        private static IEnumerable<MediaSourceInfo> SortMediaSources(IEnumerable<MediaSourceInfo> sources)
         {
             return sources.OrderBy(i =>
             {
@@ -475,8 +476,7 @@ namespace Emby.Server.Implementations.Library
 
                 return stream?.Width ?? 0;
             })
-            .Where(i => i.Type != MediaSourceType.Placeholder)
-            .ToList();
+            .Where(i => i.Type != MediaSourceType.Placeholder);
         }
 
         public async Task<Tuple<LiveStreamResponse, IDirectStreamProvider>> OpenLiveStreamInternal(LiveStreamRequest request, CancellationToken cancellationToken)
@@ -811,7 +811,7 @@ namespace Emby.Server.Implementations.Library
             return result.Item1;
         }
 
-        public async Task<List<MediaSourceInfo>> GetRecordingStreamMediaSources(ActiveRecordingInfo info, CancellationToken cancellationToken)
+        public async Task<IReadOnlyList<MediaSourceInfo>> GetRecordingStreamMediaSources(ActiveRecordingInfo info, CancellationToken cancellationToken)
         {
             var stream = new MediaSourceInfo
             {
@@ -834,10 +834,7 @@ namespace Emby.Server.Implementations.Library
             await new LiveStreamHelper(_mediaEncoder, _logger, _appPaths)
                 .AddMediaInfoWithProbe(stream, false, false, cancellationToken).ConfigureAwait(false);
 
-            return new List<MediaSourceInfo>
-            {
-                stream
-            };
+            return [stream];
         }
 
         public async Task CloseLiveStream(string id)
diff --git a/Jellyfin.Api/Controllers/InstantMixController.cs b/Jellyfin.Api/Controllers/InstantMixController.cs
index dcbacf1d7..e9dda19ca 100644
--- a/Jellyfin.Api/Controllers/InstantMixController.cs
+++ b/Jellyfin.Api/Controllers/InstantMixController.cs
@@ -1,6 +1,8 @@
 using System;
 using System.Collections.Generic;
+using System.Collections.Immutable;
 using System.ComponentModel.DataAnnotations;
+using System.Linq;
 using Jellyfin.Api.Extensions;
 using Jellyfin.Api.Helpers;
 using Jellyfin.Api.ModelBinders;
@@ -389,7 +391,7 @@ public class InstantMixController : BaseJellyfinApiController
         return GetResult(items, user, limit, dtoOptions);
     }
 
-    private QueryResult<BaseItemDto> GetResult(List<BaseItem> items, User? user, int? limit, DtoOptions dtoOptions)
+    private QueryResult<BaseItemDto> GetResult(IReadOnlyList<BaseItem> items, User? user, int? limit, DtoOptions dtoOptions)
     {
         var list = items;
 
@@ -397,7 +399,7 @@ public class InstantMixController : BaseJellyfinApiController
 
         if (limit.HasValue && limit < list.Count)
         {
-            list = list.GetRange(0, limit.Value);
+            list = list.Take(limit.Value).ToImmutableArray();
         }
 
         var returnList = _dtoService.GetBaseItemDtos(list, dtoOptions, user);
diff --git a/Jellyfin.Api/Helpers/StreamingHelpers.cs b/Jellyfin.Api/Helpers/StreamingHelpers.cs
index 3a5db2f3f..60b8804f7 100644
--- a/Jellyfin.Api/Helpers/StreamingHelpers.cs
+++ b/Jellyfin.Api/Helpers/StreamingHelpers.cs
@@ -132,7 +132,7 @@ public static class StreamingHelpers
 
                 mediaSource = string.IsNullOrEmpty(streamingRequest.MediaSourceId)
                     ? mediaSources[0]
-                    : mediaSources.Find(i => string.Equals(i.Id, streamingRequest.MediaSourceId, StringComparison.Ordinal));
+                    : mediaSources.FirstOrDefault(i => string.Equals(i.Id, streamingRequest.MediaSourceId, StringComparison.Ordinal));
 
                 if (mediaSource is null && Guid.Parse(streamingRequest.MediaSourceId).Equals(streamingRequest.Id))
                 {
diff --git a/MediaBrowser.Controller/Library/IMediaSourceManager.cs b/MediaBrowser.Controller/Library/IMediaSourceManager.cs
index 5ed3a49c3..729b385cf 100644
--- a/MediaBrowser.Controller/Library/IMediaSourceManager.cs
+++ b/MediaBrowser.Controller/Library/IMediaSourceManager.cs
@@ -61,7 +61,7 @@ namespace MediaBrowser.Controller.Library
         /// <param name="enablePathSubstitution">Option to enable path substitution.</param>
         /// <param name="cancellationToken">CancellationToken to use for operation.</param>
         /// <returns>List of media sources wrapped in an awaitable task.</returns>
-        Task<List<MediaSourceInfo>> GetPlaybackMediaSources(BaseItem item, User user, bool allowMediaProbe, bool enablePathSubstitution, CancellationToken cancellationToken);
+        Task<IReadOnlyList<MediaSourceInfo>> GetPlaybackMediaSources(BaseItem item, User user, bool allowMediaProbe, bool enablePathSubstitution, CancellationToken cancellationToken);
 
         /// <summary>
         /// Gets the static media sources.
@@ -70,7 +70,7 @@ namespace MediaBrowser.Controller.Library
         /// <param name="enablePathSubstitution">Option to enable path substitution.</param>
         /// <param name="user">User to use for operation.</param>
         /// <returns>List of media sources.</returns>
-        List<MediaSourceInfo> GetStaticMediaSources(BaseItem item, bool enablePathSubstitution, User user = null);
+        IReadOnlyList<MediaSourceInfo> GetStaticMediaSources(BaseItem item, bool enablePathSubstitution, User user = null);
 
         /// <summary>
         /// Gets the static media source.
@@ -123,7 +123,7 @@ namespace MediaBrowser.Controller.Library
         /// <param name="info">The <see cref="ActiveRecordingInfo"/>.</param>
         /// <param name="cancellationToken">The <see cref="CancellationToken"/>.</param>
         /// <returns>A task containing the <see cref="MediaSourceInfo"/>'s for the recording.</returns>
-        Task<List<MediaSourceInfo>> GetRecordingStreamMediaSources(ActiveRecordingInfo info, CancellationToken cancellationToken);
+        Task<IReadOnlyList<MediaSourceInfo>> GetRecordingStreamMediaSources(ActiveRecordingInfo info, CancellationToken cancellationToken);
 
         /// <summary>
         /// Closes the media source.
diff --git a/tests/Jellyfin.Server.Implementations.Tests/Data/SqliteItemRepositoryTests.cs b/tests/Jellyfin.Server.Implementations.Tests/Data/SqliteItemRepositoryTests.cs
index 0d2b488bc..1cf9e864d 100644
--- a/tests/Jellyfin.Server.Implementations.Tests/Data/SqliteItemRepositoryTests.cs
+++ b/tests/Jellyfin.Server.Implementations.Tests/Data/SqliteItemRepositoryTests.cs
@@ -3,8 +3,10 @@ using System.Collections.Generic;
 using AutoFixture;
 using AutoFixture.AutoMoq;
 using Emby.Server.Implementations.Data;
+using Jellyfin.Server.Implementations.Item;
 using MediaBrowser.Controller;
 using MediaBrowser.Controller.Entities;
+using MediaBrowser.Controller.Persistence;
 using MediaBrowser.Model.Entities;
 using Microsoft.Extensions.Configuration;
 using Moq;
@@ -18,7 +20,7 @@ namespace Jellyfin.Server.Implementations.Tests.Data
         public const string MetaDataPath = "/meta/data/path";
 
         private readonly IFixture _fixture;
-        private readonly SqliteItemRepository _sqliteItemRepository;
+        private readonly BaseItemRepository _sqliteItemRepository;
 
         public SqliteItemRepositoryTests()
         {
@@ -40,7 +42,7 @@ namespace Jellyfin.Server.Implementations.Tests.Data
             _fixture = new Fixture().Customize(new AutoMoqCustomization { ConfigureMembers = true });
             _fixture.Inject(appHost);
             _fixture.Inject(config);
-            _sqliteItemRepository = _fixture.Create<SqliteItemRepository>();
+            _sqliteItemRepository = _fixture.Create<BaseItemRepository>();
         }
 
         public static TheoryData<string, ItemImageInfo> ItemImageInfoFromValueString_Valid_TestData()
@@ -101,7 +103,7 @@ namespace Jellyfin.Server.Implementations.Tests.Data
         [MemberData(nameof(ItemImageInfoFromValueString_Valid_TestData))]
         public void ItemImageInfoFromValueString_Valid_Success(string value, ItemImageInfo expected)
         {
-            var result = _sqliteItemRepository.ItemImageInfoFromValueString(value);
+            var result = _sqliteItemRepository.ItemImageInfoFromValueString(value)!;
             Assert.Equal(expected.Path, result.Path);
             Assert.Equal(expected.Type, result.Type);
             Assert.Equal(expected.DateModified, result.DateModified);
@@ -243,56 +245,6 @@ namespace Jellyfin.Server.Implementations.Tests.Data
             Assert.Equal(expected, _sqliteItemRepository.SerializeImages(value));
         }
 
-        public static TheoryData<string, Dictionary<string, string>> DeserializeProviderIds_Valid_TestData()
-        {
-            var data = new TheoryData<string, Dictionary<string, string>>();
-
-            data.Add(
-                "Imdb=tt0119567",
-                new Dictionary<string, string>()
-                {
-                    { "Imdb", "tt0119567" },
-                });
-
-            data.Add(
-                "Imdb=tt0119567|Tmdb=330|TmdbCollection=328",
-                new Dictionary<string, string>()
-                {
-                    { "Imdb", "tt0119567" },
-                    { "Tmdb", "330" },
-                    { "TmdbCollection", "328" },
-                });
-
-            data.Add(
-                "MusicBrainzAlbum=9d363e43-f24f-4b39-bc5a-7ef305c677c7|MusicBrainzReleaseGroup=63eba062-847c-3b73-8b0f-6baf27bba6fa|AudioDbArtist=111352|AudioDbAlbum=2116560|MusicBrainzAlbumArtist=20244d07-534f-4eff-b4d4-930878889970",
-                new Dictionary<string, string>()
-                {
-                    { "MusicBrainzAlbum", "9d363e43-f24f-4b39-bc5a-7ef305c677c7" },
-                    { "MusicBrainzReleaseGroup", "63eba062-847c-3b73-8b0f-6baf27bba6fa" },
-                    { "AudioDbArtist", "111352" },
-                    { "AudioDbAlbum", "2116560" },
-                    { "MusicBrainzAlbumArtist", "20244d07-534f-4eff-b4d4-930878889970" },
-                });
-
-            return data;
-        }
-
-        [Theory]
-        [MemberData(nameof(DeserializeProviderIds_Valid_TestData))]
-        public void DeserializeProviderIds_Valid_Success(string value, Dictionary<string, string> expected)
-        {
-            var result = new ProviderIdsExtensionsTestsObject();
-            SqliteItemRepository.DeserializeProviderIds(value, result);
-            Assert.Equal(expected, result.ProviderIds);
-        }
-
-        [Theory]
-        [MemberData(nameof(DeserializeProviderIds_Valid_TestData))]
-        public void SerializeProviderIds_Valid_Success(string expected, Dictionary<string, string> values)
-        {
-            Assert.Equal(expected, SqliteItemRepository.SerializeProviderIds(values));
-        }
-
         private sealed class ProviderIdsExtensionsTestsObject : IHasProviderIds
         {
             public Dictionary<string, string> ProviderIds { get; set; } = new Dictionary<string, string>();
-- 
cgit v1.2.3


From 01d834f21abcb65d246b18762b79001929fe845b Mon Sep 17 00:00:00 2001
From: JPVenson <6794763+JPVenson@users.noreply.github.com>
Date: Wed, 9 Oct 2024 15:20:42 +0000
Subject: Fixed (most) tests

---
 Jellyfin.Data/Entities/BaseItemEntity.cs           |   26 +-
 .../Item/BaseItemRepository.cs                     |  134 +-
 .../JellyfinDbContext.cs                           |   26 +-
 .../20240907123425_UserDataInJfLib.Designer.cs     |  775 ----------
 .../Migrations/20240907123425_UserDataInJfLib.cs   |   79 --
 .../20241009112234_BaseItemRefactor.Designer.cs    | 1484 --------------------
 .../Migrations/20241009112234_BaseItemRefactor.cs  |  514 -------
 .../20241009132112_BaseItemRefactor.Designer.cs    | 1445 +++++++++++++++++++
 .../Migrations/20241009132112_BaseItemRefactor.cs  |  501 +++++++
 .../Migrations/DesignTimeJellyfinDbFactory.cs      |    3 +-
 .../Migrations/JellyfinDbModelSnapshot.cs          |   39 -
 .../ModelConfiguration/BaseItemConfiguration.cs    |    9 +-
 .../Providers/MetadataResult.cs                    |    2 +-
 .../Manager/MetadataServiceTests.cs                |    2 +-
 .../Controllers/LibraryStructureControllerTests.cs |   19 +-
 15 files changed, 2067 insertions(+), 2991 deletions(-)
 delete mode 100644 Jellyfin.Server.Implementations/Migrations/20240907123425_UserDataInJfLib.Designer.cs
 delete mode 100644 Jellyfin.Server.Implementations/Migrations/20240907123425_UserDataInJfLib.cs
 delete mode 100644 Jellyfin.Server.Implementations/Migrations/20241009112234_BaseItemRefactor.Designer.cs
 delete mode 100644 Jellyfin.Server.Implementations/Migrations/20241009112234_BaseItemRefactor.cs
 create mode 100644 Jellyfin.Server.Implementations/Migrations/20241009132112_BaseItemRefactor.Designer.cs
 create mode 100644 Jellyfin.Server.Implementations/Migrations/20241009132112_BaseItemRefactor.cs

(limited to 'MediaBrowser.Controller')

diff --git a/Jellyfin.Data/Entities/BaseItemEntity.cs b/Jellyfin.Data/Entities/BaseItemEntity.cs
index 5348c8746..dbe5a5372 100644
--- a/Jellyfin.Data/Entities/BaseItemEntity.cs
+++ b/Jellyfin.Data/Entities/BaseItemEntity.cs
@@ -156,28 +156,12 @@ public class BaseItemEntity
 
     public Guid? ParentId { get; set; }
 
-    public BaseItemEntity? Parent { get; set; }
-
-    public ICollection<BaseItemEntity>? DirectChildren { get; set; }
-
     public Guid? TopParentId { get; set; }
 
-    public BaseItemEntity? TopParent { get; set; }
-
-    public ICollection<BaseItemEntity>? AllChildren { get; set; }
-
     public Guid? SeasonId { get; set; }
 
-    public BaseItemEntity? Season { get; set; }
-
-    public ICollection<BaseItemEntity>? SeasonEpisodes { get; set; }
-
     public Guid? SeriesId { get; set; }
 
-    public ICollection<BaseItemEntity>? SeriesEpisodes { get; set; }
-
-    public BaseItemEntity? Series { get; set; }
-
     public ICollection<People>? Peoples { get; set; }
 
     public ICollection<UserData>? UserData { get; set; }
@@ -191,4 +175,14 @@ public class BaseItemEntity
     public ICollection<BaseItemProvider>? Provider { get; set; }
 
     public ICollection<AncestorId>? AncestorIds { get; set; }
+
+    // those are references to __LOCAL__ ids not DB ids ... TODO: Bring the whole folder structure into the DB
+    // public ICollection<BaseItemEntity>? SeriesEpisodes { get; set; }
+    // public BaseItemEntity? Series { get; set; }
+    // public BaseItemEntity? Season { get; set; }
+    // public BaseItemEntity? Parent { get; set; }
+    // public ICollection<BaseItemEntity>? DirectChildren { get; set; }
+    // public BaseItemEntity? TopParent { get; set; }
+    // public ICollection<BaseItemEntity>? AllChildren { get; set; }
+    // public ICollection<BaseItemEntity>? SeasonEpisodes { get; set; }
 }
diff --git a/Jellyfin.Server.Implementations/Item/BaseItemRepository.cs b/Jellyfin.Server.Implementations/Item/BaseItemRepository.cs
index d5a1be679..480d83eb1 100644
--- a/Jellyfin.Server.Implementations/Item/BaseItemRepository.cs
+++ b/Jellyfin.Server.Implementations/Item/BaseItemRepository.cs
@@ -5,20 +5,16 @@ using System.Collections.Immutable;
 using System.Globalization;
 using System.Linq;
 using System.Linq.Expressions;
-using System.Security.Cryptography.X509Certificates;
 using System.Text;
 using System.Threading;
-using System.Threading.Channels;
 using Jellyfin.Data.Enums;
 using Jellyfin.Extensions;
 using MediaBrowser.Controller;
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Entities.Audio;
-using MediaBrowser.Controller.Entities.Movies;
 using MediaBrowser.Controller.Entities.TV;
 using MediaBrowser.Controller.LiveTv;
 using MediaBrowser.Controller.Persistence;
-using MediaBrowser.Controller.Playlists;
 using MediaBrowser.Model.Dto;
 using MediaBrowser.Model.Entities;
 using MediaBrowser.Model.LiveTv;
@@ -26,6 +22,7 @@ using MediaBrowser.Model.Querying;
 using Microsoft.EntityFrameworkCore;
 using BaseItemDto = MediaBrowser.Controller.Entities.BaseItem;
 using BaseItemEntity = Jellyfin.Data.Entities.BaseItemEntity;
+#pragma warning disable RS0030 // Do not use banned APIs
 
 namespace Jellyfin.Server.Implementations.Item;
 
@@ -66,12 +63,12 @@ public sealed class BaseItemRepository(IDbContextFactory<JellyfinDbContext> dbPr
 
         using var context = dbProvider.CreateDbContext();
         using var transaction = context.Database.BeginTransaction();
-        context.Peoples.Where(e => e.ItemId.Equals(id)).ExecuteDelete();
-        context.Chapters.Where(e => e.ItemId.Equals(id)).ExecuteDelete();
-        context.MediaStreamInfos.Where(e => e.ItemId.Equals(id)).ExecuteDelete();
-        context.AncestorIds.Where(e => e.ItemId.Equals(id)).ExecuteDelete();
-        context.ItemValues.Where(e => e.ItemId.Equals(id)).ExecuteDelete();
-        context.BaseItems.Where(e => e.Id.Equals(id)).ExecuteDelete();
+        context.Peoples.Where(e => e.ItemId == id).ExecuteDelete();
+        context.Chapters.Where(e => e.ItemId == id).ExecuteDelete();
+        context.MediaStreamInfos.Where(e => e.ItemId == id).ExecuteDelete();
+        context.AncestorIds.Where(e => e.ItemId == id).ExecuteDelete();
+        context.ItemValues.Where(e => e.ItemId == id).ExecuteDelete();
+        context.BaseItems.Where(e => e.Id == id).ExecuteDelete();
         context.SaveChanges();
         transaction.Commit();
     }
@@ -113,8 +110,8 @@ public sealed class BaseItemRepository(IDbContextFactory<JellyfinDbContext> dbPr
         PrepareFilterQuery(filter);
 
         using var context = dbProvider.CreateDbContext();
-        var dbQuery = TranslateQuery(context.BaseItems.AsNoTracking(), context, filter)
-            .DistinctBy(e => e.Id);
+        var dbQuery = TranslateQuery(context.BaseItems.AsNoTracking(), context, filter);
+        // .DistinctBy(e => e.Id);
 
         var enableGroupByPresentationUniqueKey = EnableGroupByPresentationUniqueKey(filter);
         if (enableGroupByPresentationUniqueKey && filter.GroupBySeriesPresentationUniqueKey)
@@ -266,8 +263,7 @@ public sealed class BaseItemRepository(IDbContextFactory<JellyfinDbContext> dbPr
         PrepareFilterQuery(filter);
 
         using var context = dbProvider.CreateDbContext();
-        var dbQuery = TranslateQuery(context.BaseItems, context, filter)
-            .DistinctBy(e => e.Id);
+        var dbQuery = TranslateQuery(context.BaseItems, context, filter);
         if (filter.Limit.HasValue || filter.StartIndex.HasValue)
         {
             var offset = filter.StartIndex ?? 0;
@@ -299,6 +295,7 @@ public sealed class BaseItemRepository(IDbContextFactory<JellyfinDbContext> dbPr
         return dbQuery.Count();
     }
 
+#pragma warning disable CA1307 // Specify StringComparison for clarity
     private IQueryable<BaseItemEntity> TranslateQuery(
         IQueryable<BaseItemEntity> baseQuery,
         JellyfinDbContext context,
@@ -419,7 +416,7 @@ public sealed class BaseItemRepository(IDbContextFactory<JellyfinDbContext> dbPr
 
         if (!string.IsNullOrEmpty(filter.SearchTerm))
         {
-            baseQuery = baseQuery.Where(e => e.CleanName!.Contains(filter.SearchTerm, StringComparison.InvariantCultureIgnoreCase) || (e.OriginalTitle != null && e.OriginalTitle.Contains(filter.SearchTerm, StringComparison.InvariantCultureIgnoreCase)));
+            baseQuery = baseQuery.Where(e => e.CleanName!.Contains(filter.SearchTerm) || (e.OriginalTitle != null && e.OriginalTitle.Contains(filter.SearchTerm)));
         }
 
         if (filter.IsFolder.HasValue)
@@ -474,18 +471,15 @@ public sealed class BaseItemRepository(IDbContextFactory<JellyfinDbContext> dbPr
             baseQuery = baseQuery.Where(e => includeTypeName.Contains(e.Type));
         }
 
-        if (filter.ChannelIds.Count == 1)
+        if (filter.ChannelIds.Count > 0)
         {
-            baseQuery = baseQuery.Where(e => e.ChannelId == filter.ChannelIds[0].ToString("N", CultureInfo.InvariantCulture));
-        }
-        else if (filter.ChannelIds.Count > 1)
-        {
-            baseQuery = baseQuery.Where(e => filter.ChannelIds.Select(f => f.ToString("N", CultureInfo.InvariantCulture)).Contains(e.ChannelId));
+            var channelIds = filter.ChannelIds.Select(e => e.ToString("N", CultureInfo.InvariantCulture)).ToArray();
+            baseQuery = baseQuery.Where(e => channelIds.Contains(e.ChannelId));
         }
 
         if (!filter.ParentId.IsEmpty())
         {
-            baseQuery = baseQuery.Where(e => e.ParentId.Equals(filter.ParentId));
+            baseQuery = baseQuery.Where(e => e.ParentId!.Value == filter.ParentId);
         }
 
         if (!string.IsNullOrWhiteSpace(filter.Path))
@@ -591,7 +585,8 @@ public sealed class BaseItemRepository(IDbContextFactory<JellyfinDbContext> dbPr
 
         if (filter.TrailerTypes.Length > 0)
         {
-            baseQuery = baseQuery.Where(e => filter.TrailerTypes.Any(f => e.TrailerTypes!.Contains(f.ToString(), StringComparison.OrdinalIgnoreCase)));
+            var trailerTypes = filter.TrailerTypes.Select(e => e.ToString()).ToArray();
+            baseQuery = baseQuery.Where(e => trailerTypes.Any(f => e.TrailerTypes!.Contains(f)));
         }
 
         if (filter.IsAiring.HasValue)
@@ -611,7 +606,7 @@ public sealed class BaseItemRepository(IDbContextFactory<JellyfinDbContext> dbPr
             baseQuery = baseQuery
                 .Where(e =>
                     context.Peoples.Where(w => context.BaseItems.Where(w => filter.PersonIds.Contains(w.Id)).Any(f => f.Name == w.Name))
-                        .Any(f => f.ItemId.Equals(e.Id)));
+                        .Any(f => f.ItemId == e.Id));
         }
 
         if (!string.IsNullOrWhiteSpace(filter.Person))
@@ -649,12 +644,12 @@ public sealed class BaseItemRepository(IDbContextFactory<JellyfinDbContext> dbPr
         {
             baseQuery = baseQuery.Where(e =>
                 e.CleanName == filter.NameContains
-                || e.OriginalTitle!.Contains(filter.NameContains!, StringComparison.Ordinal));
+                || e.OriginalTitle!.Contains(filter.NameContains!));
         }
 
         if (!string.IsNullOrWhiteSpace(filter.NameStartsWith))
         {
-            baseQuery = baseQuery.Where(e => e.SortName!.Contains(filter.NameStartsWith, StringComparison.OrdinalIgnoreCase));
+            baseQuery = baseQuery.Where(e => e.SortName!.Contains(filter.NameStartsWith));
         }
 
         if (!string.IsNullOrWhiteSpace(filter.NameStartsWithOrGreater))
@@ -671,31 +666,32 @@ public sealed class BaseItemRepository(IDbContextFactory<JellyfinDbContext> dbPr
 
         if (filter.ImageTypes.Length > 0)
         {
-            baseQuery = baseQuery.Where(e => filter.ImageTypes.Any(f => e.Images!.Contains(f.ToString(), StringComparison.InvariantCulture)));
+            var imgTypes = filter.ImageTypes.Select(e => e.ToString()).ToArray();
+            baseQuery = baseQuery.Where(e => imgTypes.Any(f => e.Images!.Contains(f)));
         }
 
         if (filter.IsLiked.HasValue)
         {
             baseQuery = baseQuery
-                .Where(e => e.UserData!.FirstOrDefault(f => f.UserId.Equals(filter.User!.Id) && f.Key == e.UserDataKey)!.Rating >= UserItemData.MinLikeValue);
+                .Where(e => e.UserData!.FirstOrDefault(f => f.UserId == filter.User!.Id && f.Key == e.UserDataKey)!.Rating >= UserItemData.MinLikeValue);
         }
 
         if (filter.IsFavoriteOrLiked.HasValue)
         {
             baseQuery = baseQuery
-                .Where(e => e.UserData!.FirstOrDefault(f => f.UserId.Equals(filter.User!.Id) && f.Key == e.UserDataKey)!.IsFavorite == filter.IsFavoriteOrLiked);
+                .Where(e => e.UserData!.FirstOrDefault(f => f.UserId == filter.User!.Id && f.Key == e.UserDataKey)!.IsFavorite == filter.IsFavoriteOrLiked);
         }
 
         if (filter.IsFavorite.HasValue)
         {
             baseQuery = baseQuery
-                .Where(e => e.UserData!.FirstOrDefault(f => f.UserId.Equals(filter.User!.Id) && f.Key == e.UserDataKey)!.IsFavorite == filter.IsFavorite);
+                .Where(e => e.UserData!.FirstOrDefault(f => f.UserId == filter.User!.Id && f.Key == e.UserDataKey)!.IsFavorite == filter.IsFavorite);
         }
 
         if (filter.IsPlayed.HasValue)
         {
             baseQuery = baseQuery
-                   .Where(e => e.UserData!.FirstOrDefault(f => f.UserId.Equals(filter.User!.Id) && f.Key == e.UserDataKey)!.Played == filter.IsPlayed.Value);
+                   .Where(e => e.UserData!.FirstOrDefault(f => f.UserId == filter.User!.Id && f.Key == e.UserDataKey)!.Played == filter.IsPlayed.Value);
         }
 
         if (filter.IsResumable.HasValue)
@@ -703,12 +699,12 @@ public sealed class BaseItemRepository(IDbContextFactory<JellyfinDbContext> dbPr
             if (filter.IsResumable.Value)
             {
                 baseQuery = baseQuery
-                       .Where(e => e.UserData!.FirstOrDefault(f => f.UserId.Equals(filter.User!.Id) && f.Key == e.UserDataKey)!.PlaybackPositionTicks > 0);
+                       .Where(e => e.UserData!.FirstOrDefault(f => f.UserId == filter.User!.Id && f.Key == e.UserDataKey)!.PlaybackPositionTicks > 0);
             }
             else
             {
                 baseQuery = baseQuery
-                       .Where(e => e.UserData!.FirstOrDefault(f => f.UserId.Equals(filter.User!.Id) && f.Key == e.UserDataKey)!.PlaybackPositionTicks == 0);
+                       .Where(e => e.UserData!.FirstOrDefault(f => f.UserId == filter.User!.Id && f.Key == e.UserDataKey)!.PlaybackPositionTicks == 0);
             }
         }
 
@@ -925,7 +921,7 @@ public sealed class BaseItemRepository(IDbContextFactory<JellyfinDbContext> dbPr
         if (filter.HasDeadParentId.HasValue && filter.HasDeadParentId.Value)
         {
             baseQuery = baseQuery
-                .Where(e => e.ParentId.HasValue && context.BaseItems.Any(f => f.Id.Equals(e.ParentId.Value)));
+                .Where(e => e.ParentId.HasValue && context.BaseItems.Any(f => f.Id == e.ParentId.Value));
         }
 
         if (filter.IsDeadArtist.HasValue && filter.IsDeadArtist.Value)
@@ -1048,11 +1044,11 @@ public sealed class BaseItemRepository(IDbContextFactory<JellyfinDbContext> dbPr
             var enableItemsByName = (filter.IncludeItemsByName ?? false) && includedItemByNameTypes.Count > 0;
             if (enableItemsByName && includedItemByNameTypes.Count > 0)
             {
-                baseQuery = baseQuery.Where(e => includedItemByNameTypes.Contains(e.Type) || queryTopParentIds.Any(w => w.Equals(e.TopParentId!.Value)));
+                baseQuery = baseQuery.Where(e => includedItemByNameTypes.Contains(e.Type) || queryTopParentIds.Any(w => w == e.TopParentId!.Value));
             }
             else
             {
-                baseQuery = baseQuery.Where(e => queryTopParentIds.Any(w => w.Equals(e.TopParentId!.Value)));
+                baseQuery = baseQuery.Where(e => queryTopParentIds.Any(w => w == e.TopParentId!.Value));
             }
         }
 
@@ -1064,7 +1060,7 @@ public sealed class BaseItemRepository(IDbContextFactory<JellyfinDbContext> dbPr
         if (!string.IsNullOrWhiteSpace(filter.AncestorWithPresentationUniqueKey))
         {
             baseQuery = baseQuery
-                .Where(e => context.BaseItems.Where(f => f.PresentationUniqueKey == filter.AncestorWithPresentationUniqueKey).Any(f => f.AncestorIds!.Any(w => w.ItemId.Equals(f.Id))));
+                .Where(e => context.BaseItems.Where(f => f.PresentationUniqueKey == filter.AncestorWithPresentationUniqueKey).Any(f => f.AncestorIds!.Any(w => w.ItemId == f.Id)));
         }
 
         if (!string.IsNullOrWhiteSpace(filter.SeriesPresentationUniqueKey))
@@ -1090,7 +1086,7 @@ public sealed class BaseItemRepository(IDbContextFactory<JellyfinDbContext> dbPr
                     .Where(e => e.ItemValues!.Where(e => e.Type == 6)
                         .Any(f => filter.IncludeInheritedTags.Contains(f.CleanValue))
                         ||
-                        (e.ParentId.HasValue && context.ItemValues.Where(w => w.ItemId.Equals(e.ParentId.Value))!.Where(e => e.Type == 6)
+                        (e.ParentId.HasValue && context.ItemValues.Where(w => w.ItemId == e.ParentId.Value)!.Where(e => e.Type == 6)
                         .Any(f => filter.IncludeInheritedTags.Contains(f.CleanValue))));
             }
 
@@ -1112,21 +1108,23 @@ public sealed class BaseItemRepository(IDbContextFactory<JellyfinDbContext> dbPr
 
         if (filter.SeriesStatuses.Length > 0)
         {
+            var seriesStatus = filter.SeriesStatuses.Select(e => e.ToString()).ToArray();
             baseQuery = baseQuery
-                .Where(e => filter.SeriesStatuses.Any(f => e.Data!.Contains(f.ToString(), StringComparison.InvariantCultureIgnoreCase)));
+                .Where(e => seriesStatus.Any(f => e.Data!.Contains(f)));
         }
 
         if (filter.BoxSetLibraryFolders.Length > 0)
         {
+            var boxsetFolders = filter.BoxSetLibraryFolders.Select(e => e.ToString("N", CultureInfo.InvariantCulture)).ToArray();
             baseQuery = baseQuery
-                .Where(e => filter.BoxSetLibraryFolders.Any(f => e.Data!.Contains(f.ToString("N", CultureInfo.InvariantCulture), StringComparison.InvariantCultureIgnoreCase)));
+                .Where(e => boxsetFolders.Any(f => e.Data!.Contains(f)));
         }
 
         if (filter.VideoTypes.Length > 0)
         {
             var videoTypeBs = filter.VideoTypes.Select(e => $"\"VideoType\":\"" + e + "\"");
             baseQuery = baseQuery
-                .Where(e => videoTypeBs.Any(f => e.Data!.Contains(f, StringComparison.InvariantCultureIgnoreCase)));
+                .Where(e => videoTypeBs.Any(f => e.Data!.Contains(f)));
         }
 
         if (filter.Is3D.HasValue)
@@ -1134,12 +1132,12 @@ public sealed class BaseItemRepository(IDbContextFactory<JellyfinDbContext> dbPr
             if (filter.Is3D.Value)
             {
                 baseQuery = baseQuery
-                    .Where(e => e.Data!.Contains("Video3DFormat", StringComparison.InvariantCultureIgnoreCase));
+                    .Where(e => e.Data!.Contains("Video3DFormat"));
             }
             else
             {
                 baseQuery = baseQuery
-                    .Where(e => !e.Data!.Contains("Video3DFormat", StringComparison.InvariantCultureIgnoreCase));
+                    .Where(e => !e.Data!.Contains("Video3DFormat"));
             }
         }
 
@@ -1148,12 +1146,12 @@ public sealed class BaseItemRepository(IDbContextFactory<JellyfinDbContext> dbPr
             if (filter.IsPlaceHolder.Value)
             {
                 baseQuery = baseQuery
-                    .Where(e => e.Data!.Contains("IsPlaceHolder\":true", StringComparison.InvariantCultureIgnoreCase));
+                    .Where(e => e.Data!.Contains("IsPlaceHolder\":true"));
             }
             else
             {
                 baseQuery = baseQuery
-                    .Where(e => !e.Data!.Contains("IsPlaceHolder\":true", StringComparison.InvariantCultureIgnoreCase));
+                    .Where(e => !e.Data!.Contains("IsPlaceHolder\":true"));
             }
         }
 
@@ -1212,7 +1210,7 @@ public sealed class BaseItemRepository(IDbContextFactory<JellyfinDbContext> dbPr
         using var db = dbProvider.CreateDbContext();
 
         db.BaseItems
-            .Where(e => e.Id.Equals(item.Id))
+            .Where(e => e.Id == item.Id)
             .ExecuteUpdate(e => e.SetProperty(f => f.Images, images));
     }
 
@@ -1246,11 +1244,20 @@ public sealed class BaseItemRepository(IDbContextFactory<JellyfinDbContext> dbPr
         }
 
         using var context = dbProvider.CreateDbContext();
+        using var transaction = context.Database.BeginTransaction();
         foreach (var item in tuples)
         {
             var entity = Map(item.Item);
-            context.BaseItems.Add(entity);
+            if (!context.BaseItems.Any(e => e.Id == entity.Id))
+            {
+                context.BaseItems.Add(entity);
+            }
+            else
+            {
+                context.BaseItems.Attach(entity).State = EntityState.Modified;
+            }
 
+            context.AncestorIds.Where(e => e.ItemId == entity.Id).ExecuteDelete();
             if (item.Item.SupportsAncestors && item.AncestorIds != null)
             {
                 foreach (var ancestorId in item.AncestorIds)
@@ -1260,13 +1267,13 @@ public sealed class BaseItemRepository(IDbContextFactory<JellyfinDbContext> dbPr
                         Item = entity,
                         AncestorIdText = ancestorId.ToString(),
                         Id = ancestorId,
-                        ItemId = entity.Id
+                        ItemId = Guid.Empty
                     });
                 }
             }
 
             var itemValues = GetItemValuesToSave(item.Item, item.InheritedTags);
-            context.ItemValues.Where(e => e.ItemId.Equals(entity.Id)).ExecuteDelete();
+            context.ItemValues.Where(e => e.ItemId == entity.Id).ExecuteDelete();
             foreach (var itemValue in itemValues)
             {
                 context.ItemValues.Add(new()
@@ -1275,12 +1282,13 @@ public sealed class BaseItemRepository(IDbContextFactory<JellyfinDbContext> dbPr
                     Type = itemValue.MagicNumber,
                     Value = itemValue.Value,
                     CleanValue = GetCleanValue(itemValue.Value),
-                    ItemId = entity.Id
+                    ItemId = Guid.Empty
                 });
             }
         }
 
-        context.SaveChanges(true);
+        context.SaveChanges();
+        transaction.Commit();
     }
 
     /// <inheritdoc cref="IItemRepository" />
@@ -1292,7 +1300,7 @@ public sealed class BaseItemRepository(IDbContextFactory<JellyfinDbContext> dbPr
         }
 
         using var context = dbProvider.CreateDbContext();
-        var item = context.BaseItems.FirstOrDefault(e => e.Id.Equals(id));
+        var item = context.BaseItems.FirstOrDefault(e => e.Id == id);
         if (item is null)
         {
             return null;
@@ -1380,7 +1388,7 @@ public sealed class BaseItemRepository(IDbContextFactory<JellyfinDbContext> dbPr
             dto.Audio = Enum.Parse<ProgramAudio>(entity.Audio);
         }
 
-        dto.ExtraIds = entity.ExtraIds?.Split('|').Select(e => Guid.Parse(e)).ToArray();
+        dto.ExtraIds = string.IsNullOrWhiteSpace(entity.ExtraIds) ? null : entity.ExtraIds.Split('|').Select(e => Guid.Parse(e)).ToArray();
         dto.ProductionLocations = entity.ProductionLocations?.Split('|');
         dto.Studios = entity.Studios?.Split('|');
         dto.Tags = entity.Tags?.Split('|');
@@ -1535,8 +1543,8 @@ public sealed class BaseItemRepository(IDbContextFactory<JellyfinDbContext> dbPr
         entity.Audio = dto.Audio?.ToString();
         entity.ExtraType = dto.ExtraType?.ToString();
 
-        entity.ExtraIds = string.Join('|', dto.ExtraIds);
-        entity.ProductionLocations = string.Join('|', dto.ProductionLocations);
+        entity.ExtraIds = dto.ExtraIds is not null ? string.Join('|', dto.ExtraIds) : null;
+        entity.ProductionLocations = dto.ProductionLocations is not null ? string.Join('|', dto.ProductionLocations) : null;
         entity.Studios = dto.Studios is not null ? string.Join('|', dto.Studios) : null;
         entity.Tags = dto.Tags is not null ? string.Join('|', dto.Tags) : null;
         entity.LockedFields = dto.LockedFields is not null ? string.Join('|', dto.LockedFields) : null;
@@ -1628,15 +1636,15 @@ public sealed class BaseItemRepository(IDbContextFactory<JellyfinDbContext> dbPr
             .Where(e => itemValueTypes.Contains(e.Type));
         if (withItemTypes.Count > 0)
         {
-            query = query.Where(e => context.BaseItems.Where(e => withItemTypes.Contains(e.Type)).Any(f => f.ItemValues!.Any(w => w.ItemId.Equals(e.ItemId))));
+            query = query.Where(e => context.BaseItems.Where(e => withItemTypes.Contains(e.Type)).Any(f => f.ItemValues!.Any(w => w.ItemId == e.ItemId)));
         }
 
         if (excludeItemTypes.Count > 0)
         {
-            query = query.Where(e => !context.BaseItems.Where(e => withItemTypes.Contains(e.Type)).Any(f => f.ItemValues!.Any(w => w.ItemId.Equals(e.ItemId))));
+            query = query.Where(e => !context.BaseItems.Where(e => withItemTypes.Contains(e.Type)).Any(f => f.ItemValues!.Any(w => w.ItemId == e.ItemId)));
         }
 
-        query = query.DistinctBy(e => e.CleanValue);
+        // query = query.DistinctBy(e => e.CleanValue);
         return query.Select(e => e.CleanValue).ToImmutableArray();
     }
 
@@ -2131,12 +2139,12 @@ public sealed class BaseItemRepository(IDbContextFactory<JellyfinDbContext> dbPr
             ItemSortBy.AirTime => e => e.SortName, // TODO
             ItemSortBy.Runtime => e => e.RunTimeTicks,
             ItemSortBy.Random => e => EF.Functions.Random(),
-            ItemSortBy.DatePlayed => e => e.UserData!.FirstOrDefault(f => f.UserId.Equals(query.User!.Id) && f.Key == e.UserDataKey)!.LastPlayedDate,
-            ItemSortBy.PlayCount => e => e.UserData!.FirstOrDefault(f => f.UserId.Equals(query.User!.Id) && f.Key == e.UserDataKey)!.PlayCount,
-            ItemSortBy.IsFavoriteOrLiked => e => e.UserData!.FirstOrDefault(f => f.UserId.Equals(query.User!.Id) && f.Key == e.UserDataKey)!.IsFavorite,
+            ItemSortBy.DatePlayed => e => e.UserData!.FirstOrDefault(f => f.UserId == query.User!.Id && f.Key == e.UserDataKey)!.LastPlayedDate,
+            ItemSortBy.PlayCount => e => e.UserData!.FirstOrDefault(f => f.UserId == query.User!.Id && f.Key == e.UserDataKey)!.PlayCount,
+            ItemSortBy.IsFavoriteOrLiked => e => e.UserData!.FirstOrDefault(f => f.UserId == query.User!.Id && f.Key == e.UserDataKey)!.IsFavorite,
             ItemSortBy.IsFolder => e => e.IsFolder,
-            ItemSortBy.IsPlayed => e => e.UserData!.FirstOrDefault(f => f.UserId.Equals(query.User!.Id) && f.Key == e.UserDataKey)!.Played,
-            ItemSortBy.IsUnplayed => e => !e.UserData!.FirstOrDefault(f => f.UserId.Equals(query.User!.Id) && f.Key == e.UserDataKey)!.Played,
+            ItemSortBy.IsPlayed => e => e.UserData!.FirstOrDefault(f => f.UserId == query.User!.Id && f.Key == e.UserDataKey)!.Played,
+            ItemSortBy.IsUnplayed => e => !e.UserData!.FirstOrDefault(f => f.UserId == query.User!.Id && f.Key == e.UserDataKey)!.Played,
             ItemSortBy.DateLastContentAdded => e => e.DateLastMediaAdded,
             ItemSortBy.Artist => e => e.ItemValues!.Where(f => f.Type == 0).Select(f => f.CleanValue),
             ItemSortBy.AlbumArtist => e => e.ItemValues!.Where(f => f.Type == 1).Select(f => f.CleanValue),
diff --git a/Jellyfin.Server.Implementations/JellyfinDbContext.cs b/Jellyfin.Server.Implementations/JellyfinDbContext.cs
index c1d6d58cd..a9eda1b64 100644
--- a/Jellyfin.Server.Implementations/JellyfinDbContext.cs
+++ b/Jellyfin.Server.Implementations/JellyfinDbContext.cs
@@ -4,20 +4,18 @@ using Jellyfin.Data.Entities;
 using Jellyfin.Data.Entities.Security;
 using Jellyfin.Data.Interfaces;
 using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.Logging;
 
 namespace Jellyfin.Server.Implementations;
 
 /// <inheritdoc/>
-public class JellyfinDbContext : DbContext
+/// <summary>
+/// Initializes a new instance of the <see cref="JellyfinDbContext"/> class.
+/// </summary>
+/// <param name="options">The database context options.</param>
+/// <param name="logger">Logger.</param>
+public class JellyfinDbContext(DbContextOptions<JellyfinDbContext> options, ILogger<JellyfinDbContext> logger) : DbContext(options)
 {
-    /// <summary>
-    /// Initializes a new instance of the <see cref="JellyfinDbContext"/> class.
-    /// </summary>
-    /// <param name="options">The database context options.</param>
-    public JellyfinDbContext(DbContextOptions<JellyfinDbContext> options) : base(options)
-    {
-    }
-
     /// <summary>
     /// Gets the <see cref="DbSet{TEntity}"/> containing the access schedules.
     /// </summary>
@@ -228,7 +226,15 @@ public class JellyfinDbContext : DbContext
             saveEntity.OnSavingChanges();
         }
 
-        return base.SaveChanges();
+        try
+        {
+            return base.SaveChanges();
+        }
+        catch (Exception e)
+        {
+            logger.LogError(e, "Error trying to save changes.");
+            throw;
+        }
     }
 
     /// <inheritdoc />
diff --git a/Jellyfin.Server.Implementations/Migrations/20240907123425_UserDataInJfLib.Designer.cs b/Jellyfin.Server.Implementations/Migrations/20240907123425_UserDataInJfLib.Designer.cs
deleted file mode 100644
index 609faa1e6..000000000
--- a/Jellyfin.Server.Implementations/Migrations/20240907123425_UserDataInJfLib.Designer.cs
+++ /dev/null
@@ -1,775 +0,0 @@
-// <auto-generated />
-using System;
-using Jellyfin.Server.Implementations;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Infrastructure;
-using Microsoft.EntityFrameworkCore.Migrations;
-using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
-
-#nullable disable
-
-namespace Jellyfin.Server.Implementations.Migrations
-{
-    [DbContext(typeof(JellyfinDbContext))]
-    [Migration("20240907123425_UserDataInJfLib")]
-    partial class UserDataInJfLib
-    {
-        /// <inheritdoc />
-        protected override void BuildTargetModel(ModelBuilder modelBuilder)
-        {
-#pragma warning disable 612, 618
-            modelBuilder.HasAnnotation("ProductVersion", "8.0.8");
-
-            modelBuilder.Entity("Jellyfin.Data.Entities.AccessSchedule", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("INTEGER");
-
-                    b.Property<int>("DayOfWeek")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<double>("EndHour")
-                        .HasColumnType("REAL");
-
-                    b.Property<double>("StartHour")
-                        .HasColumnType("REAL");
-
-                    b.Property<Guid>("UserId")
-                        .HasColumnType("TEXT");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("UserId");
-
-                    b.ToTable("AccessSchedules");
-                });
-
-            modelBuilder.Entity("Jellyfin.Data.Entities.ActivityLog", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("INTEGER");
-
-                    b.Property<DateTime>("DateCreated")
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("ItemId")
-                        .HasMaxLength(256)
-                        .HasColumnType("TEXT");
-
-                    b.Property<int>("LogSeverity")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasMaxLength(512)
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("Overview")
-                        .HasMaxLength(512)
-                        .HasColumnType("TEXT");
-
-                    b.Property<uint>("RowVersion")
-                        .IsConcurrencyToken()
-                        .HasColumnType("INTEGER");
-
-                    b.Property<string>("ShortOverview")
-                        .HasMaxLength(512)
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("Type")
-                        .IsRequired()
-                        .HasMaxLength(256)
-                        .HasColumnType("TEXT");
-
-                    b.Property<Guid>("UserId")
-                        .HasColumnType("TEXT");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("DateCreated");
-
-                    b.ToTable("ActivityLogs");
-                });
-
-            modelBuilder.Entity("Jellyfin.Data.Entities.CustomItemDisplayPreferences", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("INTEGER");
-
-                    b.Property<string>("Client")
-                        .IsRequired()
-                        .HasMaxLength(32)
-                        .HasColumnType("TEXT");
-
-                    b.Property<Guid>("ItemId")
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("Key")
-                        .IsRequired()
-                        .HasColumnType("TEXT");
-
-                    b.Property<Guid>("UserId")
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("Value")
-                        .HasColumnType("TEXT");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("UserId", "ItemId", "Client", "Key")
-                        .IsUnique();
-
-                    b.ToTable("CustomItemDisplayPreferences");
-                });
-
-            modelBuilder.Entity("Jellyfin.Data.Entities.DisplayPreferences", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("INTEGER");
-
-                    b.Property<int>("ChromecastVersion")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<string>("Client")
-                        .IsRequired()
-                        .HasMaxLength(32)
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("DashboardTheme")
-                        .HasMaxLength(32)
-                        .HasColumnType("TEXT");
-
-                    b.Property<bool>("EnableNextVideoInfoOverlay")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<int?>("IndexBy")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<Guid>("ItemId")
-                        .HasColumnType("TEXT");
-
-                    b.Property<int>("ScrollDirection")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<bool>("ShowBackdrop")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<bool>("ShowSidebar")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<int>("SkipBackwardLength")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<int>("SkipForwardLength")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<string>("TvHome")
-                        .HasMaxLength(32)
-                        .HasColumnType("TEXT");
-
-                    b.Property<Guid>("UserId")
-                        .HasColumnType("TEXT");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("UserId", "ItemId", "Client")
-                        .IsUnique();
-
-                    b.ToTable("DisplayPreferences");
-                });
-
-            modelBuilder.Entity("Jellyfin.Data.Entities.HomeSection", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("INTEGER");
-
-                    b.Property<int>("DisplayPreferencesId")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<int>("Order")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<int>("Type")
-                        .HasColumnType("INTEGER");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("DisplayPreferencesId");
-
-                    b.ToTable("HomeSection");
-                });
-
-            modelBuilder.Entity("Jellyfin.Data.Entities.ImageInfo", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("INTEGER");
-
-                    b.Property<DateTime>("LastModified")
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("Path")
-                        .IsRequired()
-                        .HasMaxLength(512)
-                        .HasColumnType("TEXT");
-
-                    b.Property<Guid?>("UserId")
-                        .HasColumnType("TEXT");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("UserId")
-                        .IsUnique();
-
-                    b.ToTable("ImageInfos");
-                });
-
-            modelBuilder.Entity("Jellyfin.Data.Entities.ItemDisplayPreferences", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("INTEGER");
-
-                    b.Property<string>("Client")
-                        .IsRequired()
-                        .HasMaxLength(32)
-                        .HasColumnType("TEXT");
-
-                    b.Property<int?>("IndexBy")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<Guid>("ItemId")
-                        .HasColumnType("TEXT");
-
-                    b.Property<bool>("RememberIndexing")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<bool>("RememberSorting")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<string>("SortBy")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("TEXT");
-
-                    b.Property<int>("SortOrder")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<Guid>("UserId")
-                        .HasColumnType("TEXT");
-
-                    b.Property<int>("ViewType")
-                        .HasColumnType("INTEGER");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("UserId");
-
-                    b.ToTable("ItemDisplayPreferences");
-                });
-
-            modelBuilder.Entity("Jellyfin.Data.Entities.MediaSegment", b =>
-                {
-                    b.Property<Guid>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("TEXT");
-
-                    b.Property<long>("EndTicks")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<Guid>("ItemId")
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("SegmentProviderId")
-                        .IsRequired()
-                        .HasColumnType("TEXT");
-
-                    b.Property<long>("StartTicks")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<int>("Type")
-                        .HasColumnType("INTEGER");
-
-                    b.HasKey("Id");
-
-                    b.ToTable("MediaSegments");
-                });
-
-            modelBuilder.Entity("Jellyfin.Data.Entities.Permission", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("INTEGER");
-
-                    b.Property<int>("Kind")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<Guid?>("Permission_Permissions_Guid")
-                        .HasColumnType("TEXT");
-
-                    b.Property<uint>("RowVersion")
-                        .IsConcurrencyToken()
-                        .HasColumnType("INTEGER");
-
-                    b.Property<Guid?>("UserId")
-                        .HasColumnType("TEXT");
-
-                    b.Property<bool>("Value")
-                        .HasColumnType("INTEGER");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("UserId", "Kind")
-                        .IsUnique()
-                        .HasFilter("[UserId] IS NOT NULL");
-
-                    b.ToTable("Permissions");
-                });
-
-            modelBuilder.Entity("Jellyfin.Data.Entities.Preference", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("INTEGER");
-
-                    b.Property<int>("Kind")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<Guid?>("Preference_Preferences_Guid")
-                        .HasColumnType("TEXT");
-
-                    b.Property<uint>("RowVersion")
-                        .IsConcurrencyToken()
-                        .HasColumnType("INTEGER");
-
-                    b.Property<Guid?>("UserId")
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("Value")
-                        .IsRequired()
-                        .HasMaxLength(65535)
-                        .HasColumnType("TEXT");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("UserId", "Kind")
-                        .IsUnique()
-                        .HasFilter("[UserId] IS NOT NULL");
-
-                    b.ToTable("Preferences");
-                });
-
-            modelBuilder.Entity("Jellyfin.Data.Entities.Security.ApiKey", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("INTEGER");
-
-                    b.Property<string>("AccessToken")
-                        .IsRequired()
-                        .HasColumnType("TEXT");
-
-                    b.Property<DateTime>("DateCreated")
-                        .HasColumnType("TEXT");
-
-                    b.Property<DateTime>("DateLastActivity")
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("TEXT");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("AccessToken")
-                        .IsUnique();
-
-                    b.ToTable("ApiKeys");
-                });
-
-            modelBuilder.Entity("Jellyfin.Data.Entities.Security.Device", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("INTEGER");
-
-                    b.Property<string>("AccessToken")
-                        .IsRequired()
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("AppName")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("AppVersion")
-                        .IsRequired()
-                        .HasMaxLength(32)
-                        .HasColumnType("TEXT");
-
-                    b.Property<DateTime>("DateCreated")
-                        .HasColumnType("TEXT");
-
-                    b.Property<DateTime>("DateLastActivity")
-                        .HasColumnType("TEXT");
-
-                    b.Property<DateTime>("DateModified")
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("DeviceId")
-                        .IsRequired()
-                        .HasMaxLength(256)
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("DeviceName")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("TEXT");
-
-                    b.Property<bool>("IsActive")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<Guid>("UserId")
-                        .HasColumnType("TEXT");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("DeviceId");
-
-                    b.HasIndex("AccessToken", "DateLastActivity");
-
-                    b.HasIndex("DeviceId", "DateLastActivity");
-
-                    b.HasIndex("UserId", "DeviceId");
-
-                    b.ToTable("Devices");
-                });
-
-            modelBuilder.Entity("Jellyfin.Data.Entities.Security.DeviceOptions", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("INTEGER");
-
-                    b.Property<string>("CustomName")
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("DeviceId")
-                        .IsRequired()
-                        .HasColumnType("TEXT");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("DeviceId")
-                        .IsUnique();
-
-                    b.ToTable("DeviceOptions");
-                });
-
-            modelBuilder.Entity("Jellyfin.Data.Entities.TrickplayInfo", b =>
-                {
-                    b.Property<Guid>("ItemId")
-                        .HasColumnType("TEXT");
-
-                    b.Property<int>("Width")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<int>("Bandwidth")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<int>("Height")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<int>("Interval")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<int>("ThumbnailCount")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<int>("TileHeight")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<int>("TileWidth")
-                        .HasColumnType("INTEGER");
-
-                    b.HasKey("ItemId", "Width");
-
-                    b.ToTable("TrickplayInfos");
-                });
-
-            modelBuilder.Entity("Jellyfin.Data.Entities.User", b =>
-                {
-                    b.Property<Guid>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("AudioLanguagePreference")
-                        .HasMaxLength(255)
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("AuthenticationProviderId")
-                        .IsRequired()
-                        .HasMaxLength(255)
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("CastReceiverId")
-                        .HasMaxLength(32)
-                        .HasColumnType("TEXT");
-
-                    b.Property<bool>("DisplayCollectionsView")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<bool>("DisplayMissingEpisodes")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<bool>("EnableAutoLogin")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<bool>("EnableLocalPassword")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<bool>("EnableNextEpisodeAutoPlay")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<bool>("EnableUserPreferenceAccess")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<bool>("HidePlayedInLatest")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<long>("InternalId")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<int>("InvalidLoginAttemptCount")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<DateTime?>("LastActivityDate")
-                        .HasColumnType("TEXT");
-
-                    b.Property<DateTime?>("LastLoginDate")
-                        .HasColumnType("TEXT");
-
-                    b.Property<int?>("LoginAttemptsBeforeLockout")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<int>("MaxActiveSessions")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<int?>("MaxParentalAgeRating")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<bool>("MustUpdatePassword")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<string>("Password")
-                        .HasMaxLength(65535)
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("PasswordResetProviderId")
-                        .IsRequired()
-                        .HasMaxLength(255)
-                        .HasColumnType("TEXT");
-
-                    b.Property<bool>("PlayDefaultAudioTrack")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<bool>("RememberAudioSelections")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<bool>("RememberSubtitleSelections")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<int?>("RemoteClientBitrateLimit")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<uint>("RowVersion")
-                        .IsConcurrencyToken()
-                        .HasColumnType("INTEGER");
-
-                    b.Property<string>("SubtitleLanguagePreference")
-                        .HasMaxLength(255)
-                        .HasColumnType("TEXT");
-
-                    b.Property<int>("SubtitleMode")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<int>("SyncPlayAccess")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<string>("Username")
-                        .IsRequired()
-                        .HasMaxLength(255)
-                        .HasColumnType("TEXT")
-                        .UseCollation("NOCASE");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("Username")
-                        .IsUnique();
-
-                    b.ToTable("Users");
-                });
-
-            modelBuilder.Entity("Jellyfin.Data.Entities.UserData", b =>
-                {
-                    b.Property<int?>("AudioStreamIndex")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<bool>("IsFavorite")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<string>("Key")
-                        .IsRequired()
-                        .HasColumnType("TEXT");
-
-                    b.Property<DateTime?>("LastPlayedDate")
-                        .HasColumnType("TEXT");
-
-                    b.Property<bool?>("Likes")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<int>("PlayCount")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<long>("PlaybackPositionTicks")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<bool>("Played")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<double?>("Rating")
-                        .HasColumnType("REAL");
-
-                    b.Property<int?>("SubtitleStreamIndex")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<Guid>("UserId")
-                        .HasColumnType("TEXT");
-
-                    b.HasIndex("UserId");
-
-                    b.HasIndex("Key", "UserId")
-                        .IsUnique();
-
-                    b.HasIndex("Key", "UserId", "IsFavorite");
-
-                    b.HasIndex("Key", "UserId", "LastPlayedDate");
-
-                    b.HasIndex("Key", "UserId", "PlaybackPositionTicks");
-
-                    b.HasIndex("Key", "UserId", "Played");
-
-                    b.ToTable("UserData");
-                });
-
-            modelBuilder.Entity("Jellyfin.Data.Entities.AccessSchedule", b =>
-                {
-                    b.HasOne("Jellyfin.Data.Entities.User", null)
-                        .WithMany("AccessSchedules")
-                        .HasForeignKey("UserId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-                });
-
-            modelBuilder.Entity("Jellyfin.Data.Entities.DisplayPreferences", b =>
-                {
-                    b.HasOne("Jellyfin.Data.Entities.User", null)
-                        .WithMany("DisplayPreferences")
-                        .HasForeignKey("UserId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-                });
-
-            modelBuilder.Entity("Jellyfin.Data.Entities.HomeSection", b =>
-                {
-                    b.HasOne("Jellyfin.Data.Entities.DisplayPreferences", null)
-                        .WithMany("HomeSections")
-                        .HasForeignKey("DisplayPreferencesId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-                });
-
-            modelBuilder.Entity("Jellyfin.Data.Entities.ImageInfo", b =>
-                {
-                    b.HasOne("Jellyfin.Data.Entities.User", null)
-                        .WithOne("ProfileImage")
-                        .HasForeignKey("Jellyfin.Data.Entities.ImageInfo", "UserId")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-
-            modelBuilder.Entity("Jellyfin.Data.Entities.ItemDisplayPreferences", b =>
-                {
-                    b.HasOne("Jellyfin.Data.Entities.User", null)
-                        .WithMany("ItemDisplayPreferences")
-                        .HasForeignKey("UserId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-                });
-
-            modelBuilder.Entity("Jellyfin.Data.Entities.Permission", b =>
-                {
-                    b.HasOne("Jellyfin.Data.Entities.User", null)
-                        .WithMany("Permissions")
-                        .HasForeignKey("UserId")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-
-            modelBuilder.Entity("Jellyfin.Data.Entities.Preference", b =>
-                {
-                    b.HasOne("Jellyfin.Data.Entities.User", null)
-                        .WithMany("Preferences")
-                        .HasForeignKey("UserId")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-
-            modelBuilder.Entity("Jellyfin.Data.Entities.Security.Device", b =>
-                {
-                    b.HasOne("Jellyfin.Data.Entities.User", "User")
-                        .WithMany()
-                        .HasForeignKey("UserId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.Navigation("User");
-                });
-
-            modelBuilder.Entity("Jellyfin.Data.Entities.UserData", b =>
-                {
-                    b.HasOne("Jellyfin.Data.Entities.User", "User")
-                        .WithMany()
-                        .HasForeignKey("UserId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.Navigation("User");
-                });
-
-            modelBuilder.Entity("Jellyfin.Data.Entities.DisplayPreferences", b =>
-                {
-                    b.Navigation("HomeSections");
-                });
-
-            modelBuilder.Entity("Jellyfin.Data.Entities.User", b =>
-                {
-                    b.Navigation("AccessSchedules");
-
-                    b.Navigation("DisplayPreferences");
-
-                    b.Navigation("ItemDisplayPreferences");
-
-                    b.Navigation("Permissions");
-
-                    b.Navigation("Preferences");
-
-                    b.Navigation("ProfileImage");
-                });
-#pragma warning restore 612, 618
-        }
-    }
-}
diff --git a/Jellyfin.Server.Implementations/Migrations/20240907123425_UserDataInJfLib.cs b/Jellyfin.Server.Implementations/Migrations/20240907123425_UserDataInJfLib.cs
deleted file mode 100644
index cb9a01f5b..000000000
--- a/Jellyfin.Server.Implementations/Migrations/20240907123425_UserDataInJfLib.cs
+++ /dev/null
@@ -1,79 +0,0 @@
-using System;
-using Microsoft.EntityFrameworkCore.Migrations;
-
-#nullable disable
-
-namespace Jellyfin.Server.Implementations.Migrations
-{
-    /// <inheritdoc />
-    public partial class UserDataInJfLib : Migration
-    {
-        /// <inheritdoc />
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.CreateTable(
-                name: "UserData",
-                columns: table => new
-                {
-                    Key = table.Column<string>(type: "TEXT", nullable: false),
-                    Rating = table.Column<double>(type: "REAL", nullable: true),
-                    PlaybackPositionTicks = table.Column<long>(type: "INTEGER", nullable: false),
-                    PlayCount = table.Column<int>(type: "INTEGER", nullable: false),
-                    IsFavorite = table.Column<bool>(type: "INTEGER", nullable: false),
-                    LastPlayedDate = table.Column<DateTime>(type: "TEXT", nullable: true),
-                    Played = table.Column<bool>(type: "INTEGER", nullable: false),
-                    AudioStreamIndex = table.Column<int>(type: "INTEGER", nullable: true),
-                    SubtitleStreamIndex = table.Column<int>(type: "INTEGER", nullable: true),
-                    Likes = table.Column<bool>(type: "INTEGER", nullable: true),
-                    UserId = table.Column<Guid>(type: "TEXT", nullable: false)
-                },
-                constraints: table =>
-                {
-                    table.ForeignKey(
-                        name: "FK_UserData_Users_UserId",
-                        column: x => x.UserId,
-                        principalTable: "Users",
-                        principalColumn: "Id",
-                        onDelete: ReferentialAction.Cascade);
-                });
-
-            migrationBuilder.CreateIndex(
-                name: "IX_UserData_Key_UserId",
-                table: "UserData",
-                columns: new[] { "Key", "UserId" },
-                unique: true);
-
-            migrationBuilder.CreateIndex(
-                name: "IX_UserData_Key_UserId_IsFavorite",
-                table: "UserData",
-                columns: new[] { "Key", "UserId", "IsFavorite" });
-
-            migrationBuilder.CreateIndex(
-                name: "IX_UserData_Key_UserId_LastPlayedDate",
-                table: "UserData",
-                columns: new[] { "Key", "UserId", "LastPlayedDate" });
-
-            migrationBuilder.CreateIndex(
-                name: "IX_UserData_Key_UserId_PlaybackPositionTicks",
-                table: "UserData",
-                columns: new[] { "Key", "UserId", "PlaybackPositionTicks" });
-
-            migrationBuilder.CreateIndex(
-                name: "IX_UserData_Key_UserId_Played",
-                table: "UserData",
-                columns: new[] { "Key", "UserId", "Played" });
-
-            migrationBuilder.CreateIndex(
-                name: "IX_UserData_UserId",
-                table: "UserData",
-                column: "UserId");
-        }
-
-        /// <inheritdoc />
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropTable(
-                name: "UserData");
-        }
-    }
-}
diff --git a/Jellyfin.Server.Implementations/Migrations/20241009112234_BaseItemRefactor.Designer.cs b/Jellyfin.Server.Implementations/Migrations/20241009112234_BaseItemRefactor.Designer.cs
deleted file mode 100644
index b3e028298..000000000
--- a/Jellyfin.Server.Implementations/Migrations/20241009112234_BaseItemRefactor.Designer.cs
+++ /dev/null
@@ -1,1484 +0,0 @@
-// <auto-generated />
-using System;
-using Jellyfin.Server.Implementations;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Infrastructure;
-using Microsoft.EntityFrameworkCore.Migrations;
-using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
-
-#nullable disable
-
-namespace Jellyfin.Server.Implementations.Migrations
-{
-    [DbContext(typeof(JellyfinDbContext))]
-    [Migration("20241009112234_BaseItemRefactor")]
-    partial class BaseItemRefactor
-    {
-        /// <inheritdoc />
-        protected override void BuildTargetModel(ModelBuilder modelBuilder)
-        {
-#pragma warning disable 612, 618
-            modelBuilder.HasAnnotation("ProductVersion", "8.0.8");
-
-            modelBuilder.Entity("Jellyfin.Data.Entities.AccessSchedule", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("INTEGER");
-
-                    b.Property<int>("DayOfWeek")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<double>("EndHour")
-                        .HasColumnType("REAL");
-
-                    b.Property<double>("StartHour")
-                        .HasColumnType("REAL");
-
-                    b.Property<Guid>("UserId")
-                        .HasColumnType("TEXT");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("UserId");
-
-                    b.ToTable("AccessSchedules");
-                });
-
-            modelBuilder.Entity("Jellyfin.Data.Entities.ActivityLog", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("INTEGER");
-
-                    b.Property<DateTime>("DateCreated")
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("ItemId")
-                        .HasMaxLength(256)
-                        .HasColumnType("TEXT");
-
-                    b.Property<int>("LogSeverity")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasMaxLength(512)
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("Overview")
-                        .HasMaxLength(512)
-                        .HasColumnType("TEXT");
-
-                    b.Property<uint>("RowVersion")
-                        .IsConcurrencyToken()
-                        .HasColumnType("INTEGER");
-
-                    b.Property<string>("ShortOverview")
-                        .HasMaxLength(512)
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("Type")
-                        .IsRequired()
-                        .HasMaxLength(256)
-                        .HasColumnType("TEXT");
-
-                    b.Property<Guid>("UserId")
-                        .HasColumnType("TEXT");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("DateCreated");
-
-                    b.ToTable("ActivityLogs");
-                });
-
-            modelBuilder.Entity("Jellyfin.Data.Entities.AncestorId", b =>
-                {
-                    b.Property<Guid>("ItemId")
-                        .HasColumnType("TEXT");
-
-                    b.Property<Guid>("Id")
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("AncestorIdText")
-                        .HasColumnType("TEXT");
-
-                    b.HasKey("ItemId", "Id");
-
-                    b.HasIndex("Id");
-
-                    b.HasIndex("ItemId", "AncestorIdText");
-
-                    b.ToTable("AncestorIds");
-                });
-
-            modelBuilder.Entity("Jellyfin.Data.Entities.AttachmentStreamInfo", b =>
-                {
-                    b.Property<Guid>("ItemId")
-                        .HasColumnType("TEXT");
-
-                    b.Property<int>("Index")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<string>("Codec")
-                        .IsRequired()
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("CodecTag")
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("Comment")
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("Filename")
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("MimeType")
-                        .HasColumnType("TEXT");
-
-                    b.HasKey("ItemId", "Index");
-
-                    b.ToTable("AttachmentStreamInfos");
-                });
-
-            modelBuilder.Entity("Jellyfin.Data.Entities.BaseItemEntity", b =>
-                {
-                    b.Property<Guid>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("Album")
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("AlbumArtists")
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("Artists")
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("Audio")
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("ChannelId")
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("CleanName")
-                        .HasColumnType("TEXT");
-
-                    b.Property<float?>("CommunityRating")
-                        .HasColumnType("REAL");
-
-                    b.Property<float?>("CriticRating")
-                        .HasColumnType("REAL");
-
-                    b.Property<string>("CustomRating")
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("Data")
-                        .HasColumnType("TEXT");
-
-                    b.Property<DateTime?>("DateCreated")
-                        .HasColumnType("TEXT");
-
-                    b.Property<DateTime?>("DateLastMediaAdded")
-                        .HasColumnType("TEXT");
-
-                    b.Property<DateTime?>("DateLastRefreshed")
-                        .HasColumnType("TEXT");
-
-                    b.Property<DateTime?>("DateLastSaved")
-                        .HasColumnType("TEXT");
-
-                    b.Property<DateTime?>("DateModified")
-                        .HasColumnType("TEXT");
-
-                    b.Property<DateTime>("EndDate")
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("EpisodeTitle")
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("ExternalId")
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("ExternalSeriesId")
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("ExternalServiceId")
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("ExtraIds")
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("ExtraType")
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("ForcedSortName")
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("Genres")
-                        .HasColumnType("TEXT");
-
-                    b.Property<int?>("Height")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<string>("Images")
-                        .HasColumnType("TEXT");
-
-                    b.Property<int?>("IndexNumber")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<int?>("InheritedParentalRatingValue")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<bool>("IsFolder")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<bool>("IsInMixedFolder")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<bool>("IsLocked")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<bool>("IsMovie")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<bool>("IsRepeat")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<bool>("IsSeries")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<bool>("IsVirtualItem")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<float?>("LUFS")
-                        .HasColumnType("REAL");
-
-                    b.Property<string>("LockedFields")
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("MediaType")
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("Name")
-                        .HasColumnType("TEXT");
-
-                    b.Property<float?>("NormalizationGain")
-                        .HasColumnType("REAL");
-
-                    b.Property<string>("OfficialRating")
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("OriginalTitle")
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("Overview")
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("OwnerId")
-                        .HasColumnType("TEXT");
-
-                    b.Property<Guid?>("ParentId")
-                        .HasColumnType("TEXT");
-
-                    b.Property<int?>("ParentIndexNumber")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<string>("Path")
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("PreferredMetadataCountryCode")
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("PreferredMetadataLanguage")
-                        .HasColumnType("TEXT");
-
-                    b.Property<DateTime?>("PremiereDate")
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("PresentationUniqueKey")
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("PrimaryVersionId")
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("ProductionLocations")
-                        .HasColumnType("TEXT");
-
-                    b.Property<int?>("ProductionYear")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<long?>("RunTimeTicks")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<Guid?>("SeasonId")
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("SeasonName")
-                        .HasColumnType("TEXT");
-
-                    b.Property<Guid?>("SeriesId")
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("SeriesName")
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("SeriesPresentationUniqueKey")
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("ShowId")
-                        .HasColumnType("TEXT");
-
-                    b.Property<long?>("Size")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<string>("SortName")
-                        .HasColumnType("TEXT");
-
-                    b.Property<DateTime>("StartDate")
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("Studios")
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("Tagline")
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("Tags")
-                        .HasColumnType("TEXT");
-
-                    b.Property<Guid?>("TopParentId")
-                        .HasColumnType("TEXT");
-
-                    b.Property<int?>("TotalBitrate")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<string>("TrailerTypes")
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("Type")
-                        .IsRequired()
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("UnratedType")
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("UserDataKey")
-                        .HasColumnType("TEXT");
-
-                    b.Property<int?>("Width")
-                        .HasColumnType("INTEGER");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("ParentId");
-
-                    b.HasIndex("Path");
-
-                    b.HasIndex("PresentationUniqueKey");
-
-                    b.HasIndex("SeasonId");
-
-                    b.HasIndex("SeriesId");
-
-                    b.HasIndex("TopParentId", "Id");
-
-                    b.HasIndex("UserDataKey", "Type");
-
-                    b.HasIndex("Type", "TopParentId", "Id");
-
-                    b.HasIndex("Type", "TopParentId", "PresentationUniqueKey");
-
-                    b.HasIndex("Type", "TopParentId", "StartDate");
-
-                    b.HasIndex("Id", "Type", "IsFolder", "IsVirtualItem");
-
-                    b.HasIndex("MediaType", "TopParentId", "IsVirtualItem", "PresentationUniqueKey");
-
-                    b.HasIndex("Type", "SeriesPresentationUniqueKey", "IsFolder", "IsVirtualItem");
-
-                    b.HasIndex("Type", "SeriesPresentationUniqueKey", "PresentationUniqueKey", "SortName");
-
-                    b.HasIndex("IsFolder", "TopParentId", "IsVirtualItem", "PresentationUniqueKey", "DateCreated");
-
-                    b.HasIndex("Type", "TopParentId", "IsVirtualItem", "PresentationUniqueKey", "DateCreated");
-
-                    b.ToTable("BaseItems");
-                });
-
-            modelBuilder.Entity("Jellyfin.Data.Entities.BaseItemProvider", b =>
-                {
-                    b.Property<Guid>("ItemId")
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("ProviderId")
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("ProviderValue")
-                        .IsRequired()
-                        .HasColumnType("TEXT");
-
-                    b.HasKey("ItemId", "ProviderId");
-
-                    b.HasIndex("ProviderId", "ProviderValue", "ItemId");
-
-                    b.ToTable("BaseItemProviders");
-                });
-
-            modelBuilder.Entity("Jellyfin.Data.Entities.Chapter", b =>
-                {
-                    b.Property<Guid>("ItemId")
-                        .HasColumnType("TEXT");
-
-                    b.Property<int>("ChapterIndex")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<DateTime?>("ImageDateModified")
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("ImagePath")
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("Name")
-                        .HasColumnType("TEXT");
-
-                    b.Property<long>("StartPositionTicks")
-                        .HasColumnType("INTEGER");
-
-                    b.HasKey("ItemId", "ChapterIndex");
-
-                    b.ToTable("Chapters");
-                });
-
-            modelBuilder.Entity("Jellyfin.Data.Entities.CustomItemDisplayPreferences", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("INTEGER");
-
-                    b.Property<string>("Client")
-                        .IsRequired()
-                        .HasMaxLength(32)
-                        .HasColumnType("TEXT");
-
-                    b.Property<Guid>("ItemId")
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("Key")
-                        .IsRequired()
-                        .HasColumnType("TEXT");
-
-                    b.Property<Guid>("UserId")
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("Value")
-                        .HasColumnType("TEXT");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("UserId", "ItemId", "Client", "Key")
-                        .IsUnique();
-
-                    b.ToTable("CustomItemDisplayPreferences");
-                });
-
-            modelBuilder.Entity("Jellyfin.Data.Entities.DisplayPreferences", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("INTEGER");
-
-                    b.Property<int>("ChromecastVersion")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<string>("Client")
-                        .IsRequired()
-                        .HasMaxLength(32)
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("DashboardTheme")
-                        .HasMaxLength(32)
-                        .HasColumnType("TEXT");
-
-                    b.Property<bool>("EnableNextVideoInfoOverlay")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<int?>("IndexBy")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<Guid>("ItemId")
-                        .HasColumnType("TEXT");
-
-                    b.Property<int>("ScrollDirection")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<bool>("ShowBackdrop")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<bool>("ShowSidebar")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<int>("SkipBackwardLength")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<int>("SkipForwardLength")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<string>("TvHome")
-                        .HasMaxLength(32)
-                        .HasColumnType("TEXT");
-
-                    b.Property<Guid>("UserId")
-                        .HasColumnType("TEXT");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("UserId", "ItemId", "Client")
-                        .IsUnique();
-
-                    b.ToTable("DisplayPreferences");
-                });
-
-            modelBuilder.Entity("Jellyfin.Data.Entities.HomeSection", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("INTEGER");
-
-                    b.Property<int>("DisplayPreferencesId")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<int>("Order")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<int>("Type")
-                        .HasColumnType("INTEGER");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("DisplayPreferencesId");
-
-                    b.ToTable("HomeSection");
-                });
-
-            modelBuilder.Entity("Jellyfin.Data.Entities.ImageInfo", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("INTEGER");
-
-                    b.Property<DateTime>("LastModified")
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("Path")
-                        .IsRequired()
-                        .HasMaxLength(512)
-                        .HasColumnType("TEXT");
-
-                    b.Property<Guid?>("UserId")
-                        .HasColumnType("TEXT");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("UserId")
-                        .IsUnique();
-
-                    b.ToTable("ImageInfos");
-                });
-
-            modelBuilder.Entity("Jellyfin.Data.Entities.ItemDisplayPreferences", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("INTEGER");
-
-                    b.Property<string>("Client")
-                        .IsRequired()
-                        .HasMaxLength(32)
-                        .HasColumnType("TEXT");
-
-                    b.Property<int?>("IndexBy")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<Guid>("ItemId")
-                        .HasColumnType("TEXT");
-
-                    b.Property<bool>("RememberIndexing")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<bool>("RememberSorting")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<string>("SortBy")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("TEXT");
-
-                    b.Property<int>("SortOrder")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<Guid>("UserId")
-                        .HasColumnType("TEXT");
-
-                    b.Property<int>("ViewType")
-                        .HasColumnType("INTEGER");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("UserId");
-
-                    b.ToTable("ItemDisplayPreferences");
-                });
-
-            modelBuilder.Entity("Jellyfin.Data.Entities.ItemValue", b =>
-                {
-                    b.Property<Guid>("ItemId")
-                        .HasColumnType("TEXT");
-
-                    b.Property<int>("Type")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<string>("Value")
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("CleanValue")
-                        .IsRequired()
-                        .HasColumnType("TEXT");
-
-                    b.HasKey("ItemId", "Type", "Value");
-
-                    b.HasIndex("ItemId", "Type", "CleanValue");
-
-                    b.ToTable("ItemValues");
-                });
-
-            modelBuilder.Entity("Jellyfin.Data.Entities.MediaSegment", b =>
-                {
-                    b.Property<Guid>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("TEXT");
-
-                    b.Property<long>("EndTicks")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<Guid>("ItemId")
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("SegmentProviderId")
-                        .IsRequired()
-                        .HasColumnType("TEXT");
-
-                    b.Property<long>("StartTicks")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<int>("Type")
-                        .HasColumnType("INTEGER");
-
-                    b.HasKey("Id");
-
-                    b.ToTable("MediaSegments");
-                });
-
-            modelBuilder.Entity("Jellyfin.Data.Entities.MediaStreamInfo", b =>
-                {
-                    b.Property<Guid>("ItemId")
-                        .HasColumnType("TEXT");
-
-                    b.Property<int>("StreamIndex")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<string>("AspectRatio")
-                        .HasColumnType("TEXT");
-
-                    b.Property<float>("AverageFrameRate")
-                        .HasColumnType("REAL");
-
-                    b.Property<int>("BitDepth")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<int>("BitRate")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<int>("BlPresentFlag")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<string>("ChannelLayout")
-                        .HasColumnType("TEXT");
-
-                    b.Property<int>("Channels")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<string>("Codec")
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("CodecTag")
-                        .IsRequired()
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("CodecTimeBase")
-                        .IsRequired()
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("ColorPrimaries")
-                        .IsRequired()
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("ColorSpace")
-                        .IsRequired()
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("ColorTransfer")
-                        .IsRequired()
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("Comment")
-                        .IsRequired()
-                        .HasColumnType("TEXT");
-
-                    b.Property<int>("DvBlSignalCompatibilityId")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<int>("DvLevel")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<int>("DvProfile")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<int>("DvVersionMajor")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<int>("DvVersionMinor")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<int>("ElPresentFlag")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<int>("Height")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<bool>("IsAnamorphic")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<bool>("IsAvc")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<bool>("IsDefault")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<bool>("IsExternal")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<bool>("IsForced")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<bool>("IsHearingImpaired")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<bool>("IsInterlaced")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<string>("KeyFrames")
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("Language")
-                        .HasColumnType("TEXT");
-
-                    b.Property<float>("Level")
-                        .HasColumnType("REAL");
-
-                    b.Property<string>("NalLengthSize")
-                        .IsRequired()
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("Path")
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("PixelFormat")
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("Profile")
-                        .HasColumnType("TEXT");
-
-                    b.Property<float>("RealFrameRate")
-                        .HasColumnType("REAL");
-
-                    b.Property<int>("RefFrames")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<int>("Rotation")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<int>("RpuPresentFlag")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<int>("SampleRate")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<string>("StreamType")
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("TimeBase")
-                        .IsRequired()
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("Title")
-                        .IsRequired()
-                        .HasColumnType("TEXT");
-
-                    b.Property<int>("Width")
-                        .HasColumnType("INTEGER");
-
-                    b.HasKey("ItemId", "StreamIndex");
-
-                    b.HasIndex("StreamIndex");
-
-                    b.HasIndex("StreamType");
-
-                    b.HasIndex("StreamIndex", "StreamType");
-
-                    b.HasIndex("StreamIndex", "StreamType", "Language");
-
-                    b.ToTable("MediaStreamInfos");
-                });
-
-            modelBuilder.Entity("Jellyfin.Data.Entities.People", b =>
-                {
-                    b.Property<Guid>("ItemId")
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("Role")
-                        .HasColumnType("TEXT");
-
-                    b.Property<int?>("ListOrder")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("PersonType")
-                        .HasColumnType("TEXT");
-
-                    b.Property<int?>("SortOrder")
-                        .HasColumnType("INTEGER");
-
-                    b.HasKey("ItemId", "Role", "ListOrder");
-
-                    b.HasIndex("Name");
-
-                    b.HasIndex("ItemId", "ListOrder");
-
-                    b.ToTable("Peoples");
-                });
-
-            modelBuilder.Entity("Jellyfin.Data.Entities.Permission", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("INTEGER");
-
-                    b.Property<int>("Kind")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<Guid?>("Permission_Permissions_Guid")
-                        .HasColumnType("TEXT");
-
-                    b.Property<uint>("RowVersion")
-                        .IsConcurrencyToken()
-                        .HasColumnType("INTEGER");
-
-                    b.Property<Guid?>("UserId")
-                        .HasColumnType("TEXT");
-
-                    b.Property<bool>("Value")
-                        .HasColumnType("INTEGER");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("UserId", "Kind")
-                        .IsUnique()
-                        .HasFilter("[UserId] IS NOT NULL");
-
-                    b.ToTable("Permissions");
-                });
-
-            modelBuilder.Entity("Jellyfin.Data.Entities.Preference", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("INTEGER");
-
-                    b.Property<int>("Kind")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<Guid?>("Preference_Preferences_Guid")
-                        .HasColumnType("TEXT");
-
-                    b.Property<uint>("RowVersion")
-                        .IsConcurrencyToken()
-                        .HasColumnType("INTEGER");
-
-                    b.Property<Guid?>("UserId")
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("Value")
-                        .IsRequired()
-                        .HasMaxLength(65535)
-                        .HasColumnType("TEXT");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("UserId", "Kind")
-                        .IsUnique()
-                        .HasFilter("[UserId] IS NOT NULL");
-
-                    b.ToTable("Preferences");
-                });
-
-            modelBuilder.Entity("Jellyfin.Data.Entities.Security.ApiKey", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("INTEGER");
-
-                    b.Property<string>("AccessToken")
-                        .IsRequired()
-                        .HasColumnType("TEXT");
-
-                    b.Property<DateTime>("DateCreated")
-                        .HasColumnType("TEXT");
-
-                    b.Property<DateTime>("DateLastActivity")
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("TEXT");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("AccessToken")
-                        .IsUnique();
-
-                    b.ToTable("ApiKeys");
-                });
-
-            modelBuilder.Entity("Jellyfin.Data.Entities.Security.Device", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("INTEGER");
-
-                    b.Property<string>("AccessToken")
-                        .IsRequired()
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("AppName")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("AppVersion")
-                        .IsRequired()
-                        .HasMaxLength(32)
-                        .HasColumnType("TEXT");
-
-                    b.Property<DateTime>("DateCreated")
-                        .HasColumnType("TEXT");
-
-                    b.Property<DateTime>("DateLastActivity")
-                        .HasColumnType("TEXT");
-
-                    b.Property<DateTime>("DateModified")
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("DeviceId")
-                        .IsRequired()
-                        .HasMaxLength(256)
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("DeviceName")
-                        .IsRequired()
-                        .HasMaxLength(64)
-                        .HasColumnType("TEXT");
-
-                    b.Property<bool>("IsActive")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<Guid>("UserId")
-                        .HasColumnType("TEXT");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("DeviceId");
-
-                    b.HasIndex("AccessToken", "DateLastActivity");
-
-                    b.HasIndex("DeviceId", "DateLastActivity");
-
-                    b.HasIndex("UserId", "DeviceId");
-
-                    b.ToTable("Devices");
-                });
-
-            modelBuilder.Entity("Jellyfin.Data.Entities.Security.DeviceOptions", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("INTEGER");
-
-                    b.Property<string>("CustomName")
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("DeviceId")
-                        .IsRequired()
-                        .HasColumnType("TEXT");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("DeviceId")
-                        .IsUnique();
-
-                    b.ToTable("DeviceOptions");
-                });
-
-            modelBuilder.Entity("Jellyfin.Data.Entities.TrickplayInfo", b =>
-                {
-                    b.Property<Guid>("ItemId")
-                        .HasColumnType("TEXT");
-
-                    b.Property<int>("Width")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<int>("Bandwidth")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<int>("Height")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<int>("Interval")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<int>("ThumbnailCount")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<int>("TileHeight")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<int>("TileWidth")
-                        .HasColumnType("INTEGER");
-
-                    b.HasKey("ItemId", "Width");
-
-                    b.ToTable("TrickplayInfos");
-                });
-
-            modelBuilder.Entity("Jellyfin.Data.Entities.User", b =>
-                {
-                    b.Property<Guid>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("AudioLanguagePreference")
-                        .HasMaxLength(255)
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("AuthenticationProviderId")
-                        .IsRequired()
-                        .HasMaxLength(255)
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("CastReceiverId")
-                        .HasMaxLength(32)
-                        .HasColumnType("TEXT");
-
-                    b.Property<bool>("DisplayCollectionsView")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<bool>("DisplayMissingEpisodes")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<bool>("EnableAutoLogin")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<bool>("EnableLocalPassword")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<bool>("EnableNextEpisodeAutoPlay")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<bool>("EnableUserPreferenceAccess")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<bool>("HidePlayedInLatest")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<long>("InternalId")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<int>("InvalidLoginAttemptCount")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<DateTime?>("LastActivityDate")
-                        .HasColumnType("TEXT");
-
-                    b.Property<DateTime?>("LastLoginDate")
-                        .HasColumnType("TEXT");
-
-                    b.Property<int?>("LoginAttemptsBeforeLockout")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<int>("MaxActiveSessions")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<int?>("MaxParentalAgeRating")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<bool>("MustUpdatePassword")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<string>("Password")
-                        .HasMaxLength(65535)
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("PasswordResetProviderId")
-                        .IsRequired()
-                        .HasMaxLength(255)
-                        .HasColumnType("TEXT");
-
-                    b.Property<bool>("PlayDefaultAudioTrack")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<bool>("RememberAudioSelections")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<bool>("RememberSubtitleSelections")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<int?>("RemoteClientBitrateLimit")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<uint>("RowVersion")
-                        .IsConcurrencyToken()
-                        .HasColumnType("INTEGER");
-
-                    b.Property<string>("SubtitleLanguagePreference")
-                        .HasMaxLength(255)
-                        .HasColumnType("TEXT");
-
-                    b.Property<int>("SubtitleMode")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<int>("SyncPlayAccess")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<string>("Username")
-                        .IsRequired()
-                        .HasMaxLength(255)
-                        .HasColumnType("TEXT")
-                        .UseCollation("NOCASE");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("Username")
-                        .IsUnique();
-
-                    b.ToTable("Users");
-                });
-
-            modelBuilder.Entity("Jellyfin.Data.Entities.UserData", b =>
-                {
-                    b.Property<string>("Key")
-                        .HasColumnType("TEXT");
-
-                    b.Property<Guid>("UserId")
-                        .HasColumnType("TEXT");
-
-                    b.Property<int?>("AudioStreamIndex")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<Guid?>("BaseItemEntityId")
-                        .HasColumnType("TEXT");
-
-                    b.Property<bool>("IsFavorite")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<DateTime?>("LastPlayedDate")
-                        .HasColumnType("TEXT");
-
-                    b.Property<bool?>("Likes")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<int>("PlayCount")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<long>("PlaybackPositionTicks")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<bool>("Played")
-                        .HasColumnType("INTEGER");
-
-                    b.Property<double?>("Rating")
-                        .HasColumnType("REAL");
-
-                    b.Property<int?>("SubtitleStreamIndex")
-                        .HasColumnType("INTEGER");
-
-                    b.HasKey("Key", "UserId");
-
-                    b.HasIndex("BaseItemEntityId");
-
-                    b.HasIndex("UserId");
-
-                    b.HasIndex("Key", "UserId", "IsFavorite");
-
-                    b.HasIndex("Key", "UserId", "LastPlayedDate");
-
-                    b.HasIndex("Key", "UserId", "PlaybackPositionTicks");
-
-                    b.HasIndex("Key", "UserId", "Played");
-
-                    b.ToTable("UserData");
-                });
-
-            modelBuilder.Entity("Jellyfin.Data.Entities.AccessSchedule", b =>
-                {
-                    b.HasOne("Jellyfin.Data.Entities.User", null)
-                        .WithMany("AccessSchedules")
-                        .HasForeignKey("UserId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-                });
-
-            modelBuilder.Entity("Jellyfin.Data.Entities.AncestorId", b =>
-                {
-                    b.HasOne("Jellyfin.Data.Entities.BaseItemEntity", "Item")
-                        .WithMany("AncestorIds")
-                        .HasForeignKey("ItemId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.Navigation("Item");
-                });
-
-            modelBuilder.Entity("Jellyfin.Data.Entities.AttachmentStreamInfo", b =>
-                {
-                    b.HasOne("Jellyfin.Data.Entities.BaseItemEntity", "Item")
-                        .WithMany()
-                        .HasForeignKey("ItemId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.Navigation("Item");
-                });
-
-            modelBuilder.Entity("Jellyfin.Data.Entities.BaseItemEntity", b =>
-                {
-                    b.HasOne("Jellyfin.Data.Entities.BaseItemEntity", "Parent")
-                        .WithMany("DirectChildren")
-                        .HasForeignKey("ParentId");
-
-                    b.HasOne("Jellyfin.Data.Entities.BaseItemEntity", "Season")
-                        .WithMany("SeasonEpisodes")
-                        .HasForeignKey("SeasonId");
-
-                    b.HasOne("Jellyfin.Data.Entities.BaseItemEntity", "Series")
-                        .WithMany("SeriesEpisodes")
-                        .HasForeignKey("SeriesId");
-
-                    b.HasOne("Jellyfin.Data.Entities.BaseItemEntity", "TopParent")
-                        .WithMany("AllChildren")
-                        .HasForeignKey("TopParentId");
-
-                    b.Navigation("Parent");
-
-                    b.Navigation("Season");
-
-                    b.Navigation("Series");
-
-                    b.Navigation("TopParent");
-                });
-
-            modelBuilder.Entity("Jellyfin.Data.Entities.BaseItemProvider", b =>
-                {
-                    b.HasOne("Jellyfin.Data.Entities.BaseItemEntity", "Item")
-                        .WithMany("Provider")
-                        .HasForeignKey("ItemId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.Navigation("Item");
-                });
-
-            modelBuilder.Entity("Jellyfin.Data.Entities.Chapter", b =>
-                {
-                    b.HasOne("Jellyfin.Data.Entities.BaseItemEntity", "Item")
-                        .WithMany("Chapters")
-                        .HasForeignKey("ItemId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.Navigation("Item");
-                });
-
-            modelBuilder.Entity("Jellyfin.Data.Entities.DisplayPreferences", b =>
-                {
-                    b.HasOne("Jellyfin.Data.Entities.User", null)
-                        .WithMany("DisplayPreferences")
-                        .HasForeignKey("UserId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-                });
-
-            modelBuilder.Entity("Jellyfin.Data.Entities.HomeSection", b =>
-                {
-                    b.HasOne("Jellyfin.Data.Entities.DisplayPreferences", null)
-                        .WithMany("HomeSections")
-                        .HasForeignKey("DisplayPreferencesId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-                });
-
-            modelBuilder.Entity("Jellyfin.Data.Entities.ImageInfo", b =>
-                {
-                    b.HasOne("Jellyfin.Data.Entities.User", null)
-                        .WithOne("ProfileImage")
-                        .HasForeignKey("Jellyfin.Data.Entities.ImageInfo", "UserId")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-
-            modelBuilder.Entity("Jellyfin.Data.Entities.ItemDisplayPreferences", b =>
-                {
-                    b.HasOne("Jellyfin.Data.Entities.User", null)
-                        .WithMany("ItemDisplayPreferences")
-                        .HasForeignKey("UserId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-                });
-
-            modelBuilder.Entity("Jellyfin.Data.Entities.ItemValue", b =>
-                {
-                    b.HasOne("Jellyfin.Data.Entities.BaseItemEntity", "Item")
-                        .WithMany("ItemValues")
-                        .HasForeignKey("ItemId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.Navigation("Item");
-                });
-
-            modelBuilder.Entity("Jellyfin.Data.Entities.MediaStreamInfo", b =>
-                {
-                    b.HasOne("Jellyfin.Data.Entities.BaseItemEntity", "Item")
-                        .WithMany("MediaStreams")
-                        .HasForeignKey("ItemId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.Navigation("Item");
-                });
-
-            modelBuilder.Entity("Jellyfin.Data.Entities.People", b =>
-                {
-                    b.HasOne("Jellyfin.Data.Entities.BaseItemEntity", "Item")
-                        .WithMany("Peoples")
-                        .HasForeignKey("ItemId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.Navigation("Item");
-                });
-
-            modelBuilder.Entity("Jellyfin.Data.Entities.Permission", b =>
-                {
-                    b.HasOne("Jellyfin.Data.Entities.User", null)
-                        .WithMany("Permissions")
-                        .HasForeignKey("UserId")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-
-            modelBuilder.Entity("Jellyfin.Data.Entities.Preference", b =>
-                {
-                    b.HasOne("Jellyfin.Data.Entities.User", null)
-                        .WithMany("Preferences")
-                        .HasForeignKey("UserId")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-
-            modelBuilder.Entity("Jellyfin.Data.Entities.Security.Device", b =>
-                {
-                    b.HasOne("Jellyfin.Data.Entities.User", "User")
-                        .WithMany()
-                        .HasForeignKey("UserId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.Navigation("User");
-                });
-
-            modelBuilder.Entity("Jellyfin.Data.Entities.UserData", b =>
-                {
-                    b.HasOne("Jellyfin.Data.Entities.BaseItemEntity", null)
-                        .WithMany("UserData")
-                        .HasForeignKey("BaseItemEntityId");
-
-                    b.HasOne("Jellyfin.Data.Entities.User", "User")
-                        .WithMany()
-                        .HasForeignKey("UserId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.Navigation("User");
-                });
-
-            modelBuilder.Entity("Jellyfin.Data.Entities.BaseItemEntity", b =>
-                {
-                    b.Navigation("AllChildren");
-
-                    b.Navigation("AncestorIds");
-
-                    b.Navigation("Chapters");
-
-                    b.Navigation("DirectChildren");
-
-                    b.Navigation("ItemValues");
-
-                    b.Navigation("MediaStreams");
-
-                    b.Navigation("Peoples");
-
-                    b.Navigation("Provider");
-
-                    b.Navigation("SeasonEpisodes");
-
-                    b.Navigation("SeriesEpisodes");
-
-                    b.Navigation("UserData");
-                });
-
-            modelBuilder.Entity("Jellyfin.Data.Entities.DisplayPreferences", b =>
-                {
-                    b.Navigation("HomeSections");
-                });
-
-            modelBuilder.Entity("Jellyfin.Data.Entities.User", b =>
-                {
-                    b.Navigation("AccessSchedules");
-
-                    b.Navigation("DisplayPreferences");
-
-                    b.Navigation("ItemDisplayPreferences");
-
-                    b.Navigation("Permissions");
-
-                    b.Navigation("Preferences");
-
-                    b.Navigation("ProfileImage");
-                });
-#pragma warning restore 612, 618
-        }
-    }
-}
diff --git a/Jellyfin.Server.Implementations/Migrations/20241009112234_BaseItemRefactor.cs b/Jellyfin.Server.Implementations/Migrations/20241009112234_BaseItemRefactor.cs
deleted file mode 100644
index f51e385e0..000000000
--- a/Jellyfin.Server.Implementations/Migrations/20241009112234_BaseItemRefactor.cs
+++ /dev/null
@@ -1,514 +0,0 @@
-using System;
-using Microsoft.EntityFrameworkCore.Migrations;
-
-#nullable disable
-
-namespace Jellyfin.Server.Implementations.Migrations
-{
-    /// <inheritdoc />
-    public partial class BaseItemRefactor : Migration
-    {
-        /// <inheritdoc />
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropIndex(
-                name: "IX_UserData_Key_UserId",
-                table: "UserData");
-
-            migrationBuilder.AddColumn<Guid>(
-                name: "BaseItemEntityId",
-                table: "UserData",
-                type: "TEXT",
-                nullable: true);
-
-            migrationBuilder.AddPrimaryKey(
-                name: "PK_UserData",
-                table: "UserData",
-                columns: new[] { "Key", "UserId" });
-
-            migrationBuilder.CreateTable(
-                name: "BaseItems",
-                columns: table => new
-                {
-                    Id = table.Column<Guid>(type: "TEXT", nullable: false),
-                    Type = table.Column<string>(type: "TEXT", nullable: false),
-                    Data = table.Column<string>(type: "TEXT", nullable: true),
-                    Path = table.Column<string>(type: "TEXT", nullable: true),
-                    StartDate = table.Column<DateTime>(type: "TEXT", nullable: false),
-                    EndDate = table.Column<DateTime>(type: "TEXT", nullable: false),
-                    ChannelId = table.Column<string>(type: "TEXT", nullable: true),
-                    IsMovie = table.Column<bool>(type: "INTEGER", nullable: false),
-                    CommunityRating = table.Column<float>(type: "REAL", nullable: true),
-                    CustomRating = table.Column<string>(type: "TEXT", nullable: true),
-                    IndexNumber = table.Column<int>(type: "INTEGER", nullable: true),
-                    IsLocked = table.Column<bool>(type: "INTEGER", nullable: false),
-                    Name = table.Column<string>(type: "TEXT", nullable: true),
-                    OfficialRating = table.Column<string>(type: "TEXT", nullable: true),
-                    MediaType = table.Column<string>(type: "TEXT", nullable: true),
-                    Overview = table.Column<string>(type: "TEXT", nullable: true),
-                    ParentIndexNumber = table.Column<int>(type: "INTEGER", nullable: true),
-                    PremiereDate = table.Column<DateTime>(type: "TEXT", nullable: true),
-                    ProductionYear = table.Column<int>(type: "INTEGER", nullable: true),
-                    Genres = table.Column<string>(type: "TEXT", nullable: true),
-                    SortName = table.Column<string>(type: "TEXT", nullable: true),
-                    ForcedSortName = table.Column<string>(type: "TEXT", nullable: true),
-                    RunTimeTicks = table.Column<long>(type: "INTEGER", nullable: true),
-                    DateCreated = table.Column<DateTime>(type: "TEXT", nullable: true),
-                    DateModified = table.Column<DateTime>(type: "TEXT", nullable: true),
-                    IsSeries = table.Column<bool>(type: "INTEGER", nullable: false),
-                    EpisodeTitle = table.Column<string>(type: "TEXT", nullable: true),
-                    IsRepeat = table.Column<bool>(type: "INTEGER", nullable: false),
-                    PreferredMetadataLanguage = table.Column<string>(type: "TEXT", nullable: true),
-                    PreferredMetadataCountryCode = table.Column<string>(type: "TEXT", nullable: true),
-                    DateLastRefreshed = table.Column<DateTime>(type: "TEXT", nullable: true),
-                    DateLastSaved = table.Column<DateTime>(type: "TEXT", nullable: true),
-                    IsInMixedFolder = table.Column<bool>(type: "INTEGER", nullable: false),
-                    LockedFields = table.Column<string>(type: "TEXT", nullable: true),
-                    Studios = table.Column<string>(type: "TEXT", nullable: true),
-                    Audio = table.Column<string>(type: "TEXT", nullable: true),
-                    ExternalServiceId = table.Column<string>(type: "TEXT", nullable: true),
-                    Tags = table.Column<string>(type: "TEXT", nullable: true),
-                    IsFolder = table.Column<bool>(type: "INTEGER", nullable: false),
-                    InheritedParentalRatingValue = table.Column<int>(type: "INTEGER", nullable: true),
-                    UnratedType = table.Column<string>(type: "TEXT", nullable: true),
-                    TrailerTypes = table.Column<string>(type: "TEXT", nullable: true),
-                    CriticRating = table.Column<float>(type: "REAL", nullable: true),
-                    CleanName = table.Column<string>(type: "TEXT", nullable: true),
-                    PresentationUniqueKey = table.Column<string>(type: "TEXT", nullable: true),
-                    OriginalTitle = table.Column<string>(type: "TEXT", nullable: true),
-                    PrimaryVersionId = table.Column<string>(type: "TEXT", nullable: true),
-                    DateLastMediaAdded = table.Column<DateTime>(type: "TEXT", nullable: true),
-                    Album = table.Column<string>(type: "TEXT", nullable: true),
-                    LUFS = table.Column<float>(type: "REAL", nullable: true),
-                    NormalizationGain = table.Column<float>(type: "REAL", nullable: true),
-                    IsVirtualItem = table.Column<bool>(type: "INTEGER", nullable: false),
-                    SeriesName = table.Column<string>(type: "TEXT", nullable: true),
-                    UserDataKey = table.Column<string>(type: "TEXT", nullable: true),
-                    SeasonName = table.Column<string>(type: "TEXT", nullable: true),
-                    ExternalSeriesId = table.Column<string>(type: "TEXT", nullable: true),
-                    Tagline = table.Column<string>(type: "TEXT", nullable: true),
-                    Images = table.Column<string>(type: "TEXT", nullable: true),
-                    ProductionLocations = table.Column<string>(type: "TEXT", nullable: true),
-                    ExtraIds = table.Column<string>(type: "TEXT", nullable: true),
-                    TotalBitrate = table.Column<int>(type: "INTEGER", nullable: true),
-                    ExtraType = table.Column<string>(type: "TEXT", nullable: true),
-                    Artists = table.Column<string>(type: "TEXT", nullable: true),
-                    AlbumArtists = table.Column<string>(type: "TEXT", nullable: true),
-                    ExternalId = table.Column<string>(type: "TEXT", nullable: true),
-                    SeriesPresentationUniqueKey = table.Column<string>(type: "TEXT", nullable: true),
-                    ShowId = table.Column<string>(type: "TEXT", nullable: true),
-                    OwnerId = table.Column<string>(type: "TEXT", nullable: true),
-                    Width = table.Column<int>(type: "INTEGER", nullable: true),
-                    Height = table.Column<int>(type: "INTEGER", nullable: true),
-                    Size = table.Column<long>(type: "INTEGER", nullable: true),
-                    ParentId = table.Column<Guid>(type: "TEXT", nullable: true),
-                    TopParentId = table.Column<Guid>(type: "TEXT", nullable: true),
-                    SeasonId = table.Column<Guid>(type: "TEXT", nullable: true),
-                    SeriesId = table.Column<Guid>(type: "TEXT", nullable: true)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_BaseItems", x => x.Id);
-                    table.ForeignKey(
-                        name: "FK_BaseItems_BaseItems_ParentId",
-                        column: x => x.ParentId,
-                        principalTable: "BaseItems",
-                        principalColumn: "Id");
-                    table.ForeignKey(
-                        name: "FK_BaseItems_BaseItems_SeasonId",
-                        column: x => x.SeasonId,
-                        principalTable: "BaseItems",
-                        principalColumn: "Id");
-                    table.ForeignKey(
-                        name: "FK_BaseItems_BaseItems_SeriesId",
-                        column: x => x.SeriesId,
-                        principalTable: "BaseItems",
-                        principalColumn: "Id");
-                    table.ForeignKey(
-                        name: "FK_BaseItems_BaseItems_TopParentId",
-                        column: x => x.TopParentId,
-                        principalTable: "BaseItems",
-                        principalColumn: "Id");
-                });
-
-            migrationBuilder.CreateTable(
-                name: "AncestorIds",
-                columns: table => new
-                {
-                    Id = table.Column<Guid>(type: "TEXT", nullable: false),
-                    ItemId = table.Column<Guid>(type: "TEXT", nullable: false),
-                    AncestorIdText = table.Column<string>(type: "TEXT", nullable: true)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_AncestorIds", x => new { x.ItemId, x.Id });
-                    table.ForeignKey(
-                        name: "FK_AncestorIds_BaseItems_ItemId",
-                        column: x => x.ItemId,
-                        principalTable: "BaseItems",
-                        principalColumn: "Id",
-                        onDelete: ReferentialAction.Cascade);
-                });
-
-            migrationBuilder.CreateTable(
-                name: "AttachmentStreamInfos",
-                columns: table => new
-                {
-                    ItemId = table.Column<Guid>(type: "TEXT", nullable: false),
-                    Index = table.Column<int>(type: "INTEGER", nullable: false),
-                    Codec = table.Column<string>(type: "TEXT", nullable: false),
-                    CodecTag = table.Column<string>(type: "TEXT", nullable: true),
-                    Comment = table.Column<string>(type: "TEXT", nullable: true),
-                    Filename = table.Column<string>(type: "TEXT", nullable: true),
-                    MimeType = table.Column<string>(type: "TEXT", nullable: true)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_AttachmentStreamInfos", x => new { x.ItemId, x.Index });
-                    table.ForeignKey(
-                        name: "FK_AttachmentStreamInfos_BaseItems_ItemId",
-                        column: x => x.ItemId,
-                        principalTable: "BaseItems",
-                        principalColumn: "Id",
-                        onDelete: ReferentialAction.Cascade);
-                });
-
-            migrationBuilder.CreateTable(
-                name: "BaseItemProviders",
-                columns: table => new
-                {
-                    ItemId = table.Column<Guid>(type: "TEXT", nullable: false),
-                    ProviderId = table.Column<string>(type: "TEXT", nullable: false),
-                    ProviderValue = table.Column<string>(type: "TEXT", nullable: false)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_BaseItemProviders", x => new { x.ItemId, x.ProviderId });
-                    table.ForeignKey(
-                        name: "FK_BaseItemProviders_BaseItems_ItemId",
-                        column: x => x.ItemId,
-                        principalTable: "BaseItems",
-                        principalColumn: "Id",
-                        onDelete: ReferentialAction.Cascade);
-                });
-
-            migrationBuilder.CreateTable(
-                name: "Chapters",
-                columns: table => new
-                {
-                    ItemId = table.Column<Guid>(type: "TEXT", nullable: false),
-                    ChapterIndex = table.Column<int>(type: "INTEGER", nullable: false),
-                    StartPositionTicks = table.Column<long>(type: "INTEGER", nullable: false),
-                    Name = table.Column<string>(type: "TEXT", nullable: true),
-                    ImagePath = table.Column<string>(type: "TEXT", nullable: true),
-                    ImageDateModified = table.Column<DateTime>(type: "TEXT", nullable: true)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_Chapters", x => new { x.ItemId, x.ChapterIndex });
-                    table.ForeignKey(
-                        name: "FK_Chapters_BaseItems_ItemId",
-                        column: x => x.ItemId,
-                        principalTable: "BaseItems",
-                        principalColumn: "Id",
-                        onDelete: ReferentialAction.Cascade);
-                });
-
-            migrationBuilder.CreateTable(
-                name: "ItemValues",
-                columns: table => new
-                {
-                    ItemId = table.Column<Guid>(type: "TEXT", nullable: false),
-                    Type = table.Column<int>(type: "INTEGER", nullable: false),
-                    Value = table.Column<string>(type: "TEXT", nullable: false),
-                    CleanValue = table.Column<string>(type: "TEXT", nullable: false)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_ItemValues", x => new { x.ItemId, x.Type, x.Value });
-                    table.ForeignKey(
-                        name: "FK_ItemValues_BaseItems_ItemId",
-                        column: x => x.ItemId,
-                        principalTable: "BaseItems",
-                        principalColumn: "Id",
-                        onDelete: ReferentialAction.Cascade);
-                });
-
-            migrationBuilder.CreateTable(
-                name: "MediaStreamInfos",
-                columns: table => new
-                {
-                    ItemId = table.Column<Guid>(type: "TEXT", nullable: false),
-                    StreamIndex = table.Column<int>(type: "INTEGER", nullable: false),
-                    StreamType = table.Column<string>(type: "TEXT", nullable: true),
-                    Codec = table.Column<string>(type: "TEXT", nullable: true),
-                    Language = table.Column<string>(type: "TEXT", nullable: true),
-                    ChannelLayout = table.Column<string>(type: "TEXT", nullable: true),
-                    Profile = table.Column<string>(type: "TEXT", nullable: true),
-                    AspectRatio = table.Column<string>(type: "TEXT", nullable: true),
-                    Path = table.Column<string>(type: "TEXT", nullable: true),
-                    IsInterlaced = table.Column<bool>(type: "INTEGER", nullable: false),
-                    BitRate = table.Column<int>(type: "INTEGER", nullable: false),
-                    Channels = table.Column<int>(type: "INTEGER", nullable: false),
-                    SampleRate = table.Column<int>(type: "INTEGER", nullable: false),
-                    IsDefault = table.Column<bool>(type: "INTEGER", nullable: false),
-                    IsForced = table.Column<bool>(type: "INTEGER", nullable: false),
-                    IsExternal = table.Column<bool>(type: "INTEGER", nullable: false),
-                    Height = table.Column<int>(type: "INTEGER", nullable: false),
-                    Width = table.Column<int>(type: "INTEGER", nullable: false),
-                    AverageFrameRate = table.Column<float>(type: "REAL", nullable: false),
-                    RealFrameRate = table.Column<float>(type: "REAL", nullable: false),
-                    Level = table.Column<float>(type: "REAL", nullable: false),
-                    PixelFormat = table.Column<string>(type: "TEXT", nullable: true),
-                    BitDepth = table.Column<int>(type: "INTEGER", nullable: false),
-                    IsAnamorphic = table.Column<bool>(type: "INTEGER", nullable: false),
-                    RefFrames = table.Column<int>(type: "INTEGER", nullable: false),
-                    CodecTag = table.Column<string>(type: "TEXT", nullable: false),
-                    Comment = table.Column<string>(type: "TEXT", nullable: false),
-                    NalLengthSize = table.Column<string>(type: "TEXT", nullable: false),
-                    IsAvc = table.Column<bool>(type: "INTEGER", nullable: false),
-                    Title = table.Column<string>(type: "TEXT", nullable: false),
-                    TimeBase = table.Column<string>(type: "TEXT", nullable: false),
-                    CodecTimeBase = table.Column<string>(type: "TEXT", nullable: false),
-                    ColorPrimaries = table.Column<string>(type: "TEXT", nullable: false),
-                    ColorSpace = table.Column<string>(type: "TEXT", nullable: false),
-                    ColorTransfer = table.Column<string>(type: "TEXT", nullable: false),
-                    DvVersionMajor = table.Column<int>(type: "INTEGER", nullable: false),
-                    DvVersionMinor = table.Column<int>(type: "INTEGER", nullable: false),
-                    DvProfile = table.Column<int>(type: "INTEGER", nullable: false),
-                    DvLevel = table.Column<int>(type: "INTEGER", nullable: false),
-                    RpuPresentFlag = table.Column<int>(type: "INTEGER", nullable: false),
-                    ElPresentFlag = table.Column<int>(type: "INTEGER", nullable: false),
-                    BlPresentFlag = table.Column<int>(type: "INTEGER", nullable: false),
-                    DvBlSignalCompatibilityId = table.Column<int>(type: "INTEGER", nullable: false),
-                    IsHearingImpaired = table.Column<bool>(type: "INTEGER", nullable: false),
-                    Rotation = table.Column<int>(type: "INTEGER", nullable: false),
-                    KeyFrames = table.Column<string>(type: "TEXT", nullable: true)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_MediaStreamInfos", x => new { x.ItemId, x.StreamIndex });
-                    table.ForeignKey(
-                        name: "FK_MediaStreamInfos_BaseItems_ItemId",
-                        column: x => x.ItemId,
-                        principalTable: "BaseItems",
-                        principalColumn: "Id",
-                        onDelete: ReferentialAction.Cascade);
-                });
-
-            migrationBuilder.CreateTable(
-                name: "Peoples",
-                columns: table => new
-                {
-                    ItemId = table.Column<Guid>(type: "TEXT", nullable: false),
-                    Role = table.Column<string>(type: "TEXT", nullable: false),
-                    ListOrder = table.Column<int>(type: "INTEGER", nullable: false),
-                    Name = table.Column<string>(type: "TEXT", nullable: false),
-                    PersonType = table.Column<string>(type: "TEXT", nullable: true),
-                    SortOrder = table.Column<int>(type: "INTEGER", nullable: true)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_Peoples", x => new { x.ItemId, x.Role, x.ListOrder });
-                    table.ForeignKey(
-                        name: "FK_Peoples_BaseItems_ItemId",
-                        column: x => x.ItemId,
-                        principalTable: "BaseItems",
-                        principalColumn: "Id",
-                        onDelete: ReferentialAction.Cascade);
-                });
-
-            migrationBuilder.CreateIndex(
-                name: "IX_UserData_BaseItemEntityId",
-                table: "UserData",
-                column: "BaseItemEntityId");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_AncestorIds_Id",
-                table: "AncestorIds",
-                column: "Id");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_AncestorIds_ItemId_AncestorIdText",
-                table: "AncestorIds",
-                columns: new[] { "ItemId", "AncestorIdText" });
-
-            migrationBuilder.CreateIndex(
-                name: "IX_BaseItemProviders_ProviderId_ProviderValue_ItemId",
-                table: "BaseItemProviders",
-                columns: new[] { "ProviderId", "ProviderValue", "ItemId" });
-
-            migrationBuilder.CreateIndex(
-                name: "IX_BaseItems_Id_Type_IsFolder_IsVirtualItem",
-                table: "BaseItems",
-                columns: new[] { "Id", "Type", "IsFolder", "IsVirtualItem" });
-
-            migrationBuilder.CreateIndex(
-                name: "IX_BaseItems_IsFolder_TopParentId_IsVirtualItem_PresentationUniqueKey_DateCreated",
-                table: "BaseItems",
-                columns: new[] { "IsFolder", "TopParentId", "IsVirtualItem", "PresentationUniqueKey", "DateCreated" });
-
-            migrationBuilder.CreateIndex(
-                name: "IX_BaseItems_MediaType_TopParentId_IsVirtualItem_PresentationUniqueKey",
-                table: "BaseItems",
-                columns: new[] { "MediaType", "TopParentId", "IsVirtualItem", "PresentationUniqueKey" });
-
-            migrationBuilder.CreateIndex(
-                name: "IX_BaseItems_ParentId",
-                table: "BaseItems",
-                column: "ParentId");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_BaseItems_Path",
-                table: "BaseItems",
-                column: "Path");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_BaseItems_PresentationUniqueKey",
-                table: "BaseItems",
-                column: "PresentationUniqueKey");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_BaseItems_SeasonId",
-                table: "BaseItems",
-                column: "SeasonId");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_BaseItems_SeriesId",
-                table: "BaseItems",
-                column: "SeriesId");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_BaseItems_TopParentId_Id",
-                table: "BaseItems",
-                columns: new[] { "TopParentId", "Id" });
-
-            migrationBuilder.CreateIndex(
-                name: "IX_BaseItems_Type_SeriesPresentationUniqueKey_IsFolder_IsVirtualItem",
-                table: "BaseItems",
-                columns: new[] { "Type", "SeriesPresentationUniqueKey", "IsFolder", "IsVirtualItem" });
-
-            migrationBuilder.CreateIndex(
-                name: "IX_BaseItems_Type_SeriesPresentationUniqueKey_PresentationUniqueKey_SortName",
-                table: "BaseItems",
-                columns: new[] { "Type", "SeriesPresentationUniqueKey", "PresentationUniqueKey", "SortName" });
-
-            migrationBuilder.CreateIndex(
-                name: "IX_BaseItems_Type_TopParentId_Id",
-                table: "BaseItems",
-                columns: new[] { "Type", "TopParentId", "Id" });
-
-            migrationBuilder.CreateIndex(
-                name: "IX_BaseItems_Type_TopParentId_IsVirtualItem_PresentationUniqueKey_DateCreated",
-                table: "BaseItems",
-                columns: new[] { "Type", "TopParentId", "IsVirtualItem", "PresentationUniqueKey", "DateCreated" });
-
-            migrationBuilder.CreateIndex(
-                name: "IX_BaseItems_Type_TopParentId_PresentationUniqueKey",
-                table: "BaseItems",
-                columns: new[] { "Type", "TopParentId", "PresentationUniqueKey" });
-
-            migrationBuilder.CreateIndex(
-                name: "IX_BaseItems_Type_TopParentId_StartDate",
-                table: "BaseItems",
-                columns: new[] { "Type", "TopParentId", "StartDate" });
-
-            migrationBuilder.CreateIndex(
-                name: "IX_BaseItems_UserDataKey_Type",
-                table: "BaseItems",
-                columns: new[] { "UserDataKey", "Type" });
-
-            migrationBuilder.CreateIndex(
-                name: "IX_ItemValues_ItemId_Type_CleanValue",
-                table: "ItemValues",
-                columns: new[] { "ItemId", "Type", "CleanValue" });
-
-            migrationBuilder.CreateIndex(
-                name: "IX_MediaStreamInfos_StreamIndex",
-                table: "MediaStreamInfos",
-                column: "StreamIndex");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_MediaStreamInfos_StreamIndex_StreamType",
-                table: "MediaStreamInfos",
-                columns: new[] { "StreamIndex", "StreamType" });
-
-            migrationBuilder.CreateIndex(
-                name: "IX_MediaStreamInfos_StreamIndex_StreamType_Language",
-                table: "MediaStreamInfos",
-                columns: new[] { "StreamIndex", "StreamType", "Language" });
-
-            migrationBuilder.CreateIndex(
-                name: "IX_MediaStreamInfos_StreamType",
-                table: "MediaStreamInfos",
-                column: "StreamType");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_Peoples_ItemId_ListOrder",
-                table: "Peoples",
-                columns: new[] { "ItemId", "ListOrder" });
-
-            migrationBuilder.CreateIndex(
-                name: "IX_Peoples_Name",
-                table: "Peoples",
-                column: "Name");
-
-            migrationBuilder.AddForeignKey(
-                name: "FK_UserData_BaseItems_BaseItemEntityId",
-                table: "UserData",
-                column: "BaseItemEntityId",
-                principalTable: "BaseItems",
-                principalColumn: "Id");
-        }
-
-        /// <inheritdoc />
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropForeignKey(
-                name: "FK_UserData_BaseItems_BaseItemEntityId",
-                table: "UserData");
-
-            migrationBuilder.DropTable(
-                name: "AncestorIds");
-
-            migrationBuilder.DropTable(
-                name: "AttachmentStreamInfos");
-
-            migrationBuilder.DropTable(
-                name: "BaseItemProviders");
-
-            migrationBuilder.DropTable(
-                name: "Chapters");
-
-            migrationBuilder.DropTable(
-                name: "ItemValues");
-
-            migrationBuilder.DropTable(
-                name: "MediaStreamInfos");
-
-            migrationBuilder.DropTable(
-                name: "Peoples");
-
-            migrationBuilder.DropTable(
-                name: "BaseItems");
-
-            migrationBuilder.DropPrimaryKey(
-                name: "PK_UserData",
-                table: "UserData");
-
-            migrationBuilder.DropIndex(
-                name: "IX_UserData_BaseItemEntityId",
-                table: "UserData");
-
-            migrationBuilder.DropColumn(
-                name: "BaseItemEntityId",
-                table: "UserData");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_UserData_Key_UserId",
-                table: "UserData",
-                columns: new[] { "Key", "UserId" },
-                unique: true);
-        }
-    }
-}
diff --git a/Jellyfin.Server.Implementations/Migrations/20241009132112_BaseItemRefactor.Designer.cs b/Jellyfin.Server.Implementations/Migrations/20241009132112_BaseItemRefactor.Designer.cs
new file mode 100644
index 000000000..8e8e6c125
--- /dev/null
+++ b/Jellyfin.Server.Implementations/Migrations/20241009132112_BaseItemRefactor.Designer.cs
@@ -0,0 +1,1445 @@
+// <auto-generated />
+using System;
+using Jellyfin.Server.Implementations;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+
+#nullable disable
+
+namespace Jellyfin.Server.Implementations.Migrations
+{
+    [DbContext(typeof(JellyfinDbContext))]
+    [Migration("20241009132112_BaseItemRefactor")]
+    partial class BaseItemRefactor
+    {
+        /// <inheritdoc />
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder.HasAnnotation("ProductVersion", "8.0.8");
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.AccessSchedule", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("DayOfWeek")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<double>("EndHour")
+                        .HasColumnType("REAL");
+
+                    b.Property<double>("StartHour")
+                        .HasColumnType("REAL");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("UserId");
+
+                    b.ToTable("AccessSchedules");
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.ActivityLog", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<DateTime>("DateCreated")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("ItemId")
+                        .HasMaxLength(256)
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("LogSeverity")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasMaxLength(512)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Overview")
+                        .HasMaxLength(512)
+                        .HasColumnType("TEXT");
+
+                    b.Property<uint>("RowVersion")
+                        .IsConcurrencyToken()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("ShortOverview")
+                        .HasMaxLength(512)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Type")
+                        .IsRequired()
+                        .HasMaxLength(256)
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("DateCreated");
+
+                    b.ToTable("ActivityLogs");
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.AncestorId", b =>
+                {
+                    b.Property<Guid>("ItemId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("Id")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("AncestorIdText")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("ItemId", "Id");
+
+                    b.HasIndex("Id");
+
+                    b.HasIndex("ItemId", "AncestorIdText");
+
+                    b.ToTable("AncestorIds");
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.AttachmentStreamInfo", b =>
+                {
+                    b.Property<Guid>("ItemId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("Index")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Codec")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("CodecTag")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Comment")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Filename")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("MimeType")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("ItemId", "Index");
+
+                    b.ToTable("AttachmentStreamInfos");
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.BaseItemEntity", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Album")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("AlbumArtists")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Artists")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Audio")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("ChannelId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("CleanName")
+                        .HasColumnType("TEXT");
+
+                    b.Property<float?>("CommunityRating")
+                        .HasColumnType("REAL");
+
+                    b.Property<float?>("CriticRating")
+                        .HasColumnType("REAL");
+
+                    b.Property<string>("CustomRating")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Data")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("DateCreated")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("DateLastMediaAdded")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("DateLastRefreshed")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("DateLastSaved")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("DateModified")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("EndDate")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("EpisodeTitle")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("ExternalId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("ExternalSeriesId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("ExternalServiceId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("ExtraIds")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("ExtraType")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("ForcedSortName")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Genres")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int?>("Height")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Images")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int?>("IndexNumber")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int?>("InheritedParentalRatingValue")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("IsFolder")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("IsInMixedFolder")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("IsLocked")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("IsMovie")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("IsRepeat")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("IsSeries")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("IsVirtualItem")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<float?>("LUFS")
+                        .HasColumnType("REAL");
+
+                    b.Property<string>("LockedFields")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("MediaType")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("TEXT");
+
+                    b.Property<float?>("NormalizationGain")
+                        .HasColumnType("REAL");
+
+                    b.Property<string>("OfficialRating")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("OriginalTitle")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Overview")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("OwnerId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid?>("ParentId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int?>("ParentIndexNumber")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Path")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("PreferredMetadataCountryCode")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("PreferredMetadataLanguage")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("PremiereDate")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("PresentationUniqueKey")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("PrimaryVersionId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("ProductionLocations")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int?>("ProductionYear")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<long?>("RunTimeTicks")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<Guid?>("SeasonId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("SeasonName")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid?>("SeriesId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("SeriesName")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("SeriesPresentationUniqueKey")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("ShowId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<long?>("Size")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("SortName")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("StartDate")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Studios")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Tagline")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Tags")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid?>("TopParentId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int?>("TotalBitrate")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("TrailerTypes")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Type")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("UnratedType")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("UserDataKey")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int?>("Width")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ParentId");
+
+                    b.HasIndex("Path");
+
+                    b.HasIndex("PresentationUniqueKey");
+
+                    b.HasIndex("TopParentId", "Id");
+
+                    b.HasIndex("UserDataKey", "Type");
+
+                    b.HasIndex("Type", "TopParentId", "Id");
+
+                    b.HasIndex("Type", "TopParentId", "PresentationUniqueKey");
+
+                    b.HasIndex("Type", "TopParentId", "StartDate");
+
+                    b.HasIndex("Id", "Type", "IsFolder", "IsVirtualItem");
+
+                    b.HasIndex("MediaType", "TopParentId", "IsVirtualItem", "PresentationUniqueKey");
+
+                    b.HasIndex("Type", "SeriesPresentationUniqueKey", "IsFolder", "IsVirtualItem");
+
+                    b.HasIndex("Type", "SeriesPresentationUniqueKey", "PresentationUniqueKey", "SortName");
+
+                    b.HasIndex("IsFolder", "TopParentId", "IsVirtualItem", "PresentationUniqueKey", "DateCreated");
+
+                    b.HasIndex("Type", "TopParentId", "IsVirtualItem", "PresentationUniqueKey", "DateCreated");
+
+                    b.ToTable("BaseItems");
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.BaseItemProvider", b =>
+                {
+                    b.Property<Guid>("ItemId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("ProviderId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("ProviderValue")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("ItemId", "ProviderId");
+
+                    b.HasIndex("ProviderId", "ProviderValue", "ItemId");
+
+                    b.ToTable("BaseItemProviders");
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.Chapter", b =>
+                {
+                    b.Property<Guid>("ItemId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("ChapterIndex")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<DateTime?>("ImageDateModified")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("ImagePath")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("TEXT");
+
+                    b.Property<long>("StartPositionTicks")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("ItemId", "ChapterIndex");
+
+                    b.ToTable("Chapters");
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.CustomItemDisplayPreferences", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Client")
+                        .IsRequired()
+                        .HasMaxLength(32)
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("ItemId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Key")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Value")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("UserId", "ItemId", "Client", "Key")
+                        .IsUnique();
+
+                    b.ToTable("CustomItemDisplayPreferences");
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.DisplayPreferences", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("ChromecastVersion")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Client")
+                        .IsRequired()
+                        .HasMaxLength(32)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("DashboardTheme")
+                        .HasMaxLength(32)
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("EnableNextVideoInfoOverlay")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int?>("IndexBy")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<Guid>("ItemId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("ScrollDirection")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("ShowBackdrop")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("ShowSidebar")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("SkipBackwardLength")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("SkipForwardLength")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("TvHome")
+                        .HasMaxLength(32)
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("UserId", "ItemId", "Client")
+                        .IsUnique();
+
+                    b.ToTable("DisplayPreferences");
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.HomeSection", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("DisplayPreferencesId")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("Order")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("Type")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("DisplayPreferencesId");
+
+                    b.ToTable("HomeSection");
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.ImageInfo", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<DateTime>("LastModified")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Path")
+                        .IsRequired()
+                        .HasMaxLength(512)
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid?>("UserId")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("UserId")
+                        .IsUnique();
+
+                    b.ToTable("ImageInfos");
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.ItemDisplayPreferences", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Client")
+                        .IsRequired()
+                        .HasMaxLength(32)
+                        .HasColumnType("TEXT");
+
+                    b.Property<int?>("IndexBy")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<Guid>("ItemId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("RememberIndexing")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("RememberSorting")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("SortBy")
+                        .IsRequired()
+                        .HasMaxLength(64)
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("SortOrder")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("ViewType")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("UserId");
+
+                    b.ToTable("ItemDisplayPreferences");
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.ItemValue", b =>
+                {
+                    b.Property<Guid>("ItemId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("Type")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Value")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("CleanValue")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("ItemId", "Type", "Value");
+
+                    b.HasIndex("ItemId", "Type", "CleanValue");
+
+                    b.ToTable("ItemValues");
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.MediaSegment", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("TEXT");
+
+                    b.Property<long>("EndTicks")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<Guid>("ItemId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("SegmentProviderId")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<long>("StartTicks")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("Type")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("MediaSegments");
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.MediaStreamInfo", b =>
+                {
+                    b.Property<Guid>("ItemId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("StreamIndex")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("AspectRatio")
+                        .HasColumnType("TEXT");
+
+                    b.Property<float>("AverageFrameRate")
+                        .HasColumnType("REAL");
+
+                    b.Property<int>("BitDepth")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("BitRate")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("BlPresentFlag")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("ChannelLayout")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("Channels")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Codec")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("CodecTag")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("CodecTimeBase")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("ColorPrimaries")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("ColorSpace")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("ColorTransfer")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Comment")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("DvBlSignalCompatibilityId")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("DvLevel")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("DvProfile")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("DvVersionMajor")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("DvVersionMinor")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("ElPresentFlag")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("Height")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("IsAnamorphic")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("IsAvc")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("IsDefault")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("IsExternal")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("IsForced")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("IsHearingImpaired")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("IsInterlaced")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("KeyFrames")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Language")
+                        .HasColumnType("TEXT");
+
+                    b.Property<float>("Level")
+                        .HasColumnType("REAL");
+
+                    b.Property<string>("NalLengthSize")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Path")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("PixelFormat")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Profile")
+                        .HasColumnType("TEXT");
+
+                    b.Property<float>("RealFrameRate")
+                        .HasColumnType("REAL");
+
+                    b.Property<int>("RefFrames")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("Rotation")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("RpuPresentFlag")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("SampleRate")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("StreamType")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("TimeBase")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Title")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("Width")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("ItemId", "StreamIndex");
+
+                    b.HasIndex("StreamIndex");
+
+                    b.HasIndex("StreamType");
+
+                    b.HasIndex("StreamIndex", "StreamType");
+
+                    b.HasIndex("StreamIndex", "StreamType", "Language");
+
+                    b.ToTable("MediaStreamInfos");
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.People", b =>
+                {
+                    b.Property<Guid>("ItemId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Role")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int?>("ListOrder")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("PersonType")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int?>("SortOrder")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("ItemId", "Role", "ListOrder");
+
+                    b.HasIndex("Name");
+
+                    b.HasIndex("ItemId", "ListOrder");
+
+                    b.ToTable("Peoples");
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.Permission", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("Kind")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<Guid?>("Permission_Permissions_Guid")
+                        .HasColumnType("TEXT");
+
+                    b.Property<uint>("RowVersion")
+                        .IsConcurrencyToken()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<Guid?>("UserId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("Value")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("UserId", "Kind")
+                        .IsUnique()
+                        .HasFilter("[UserId] IS NOT NULL");
+
+                    b.ToTable("Permissions");
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.Preference", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("Kind")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<Guid?>("Preference_Preferences_Guid")
+                        .HasColumnType("TEXT");
+
+                    b.Property<uint>("RowVersion")
+                        .IsConcurrencyToken()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<Guid?>("UserId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Value")
+                        .IsRequired()
+                        .HasMaxLength(65535)
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("UserId", "Kind")
+                        .IsUnique()
+                        .HasFilter("[UserId] IS NOT NULL");
+
+                    b.ToTable("Preferences");
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.Security.ApiKey", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("AccessToken")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("DateCreated")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("DateLastActivity")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasMaxLength(64)
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("AccessToken")
+                        .IsUnique();
+
+                    b.ToTable("ApiKeys");
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.Security.Device", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("AccessToken")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("AppName")
+                        .IsRequired()
+                        .HasMaxLength(64)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("AppVersion")
+                        .IsRequired()
+                        .HasMaxLength(32)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("DateCreated")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("DateLastActivity")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("DateModified")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("DeviceId")
+                        .IsRequired()
+                        .HasMaxLength(256)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("DeviceName")
+                        .IsRequired()
+                        .HasMaxLength(64)
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("IsActive")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("DeviceId");
+
+                    b.HasIndex("AccessToken", "DateLastActivity");
+
+                    b.HasIndex("DeviceId", "DateLastActivity");
+
+                    b.HasIndex("UserId", "DeviceId");
+
+                    b.ToTable("Devices");
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.Security.DeviceOptions", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("CustomName")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("DeviceId")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("DeviceId")
+                        .IsUnique();
+
+                    b.ToTable("DeviceOptions");
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.TrickplayInfo", b =>
+                {
+                    b.Property<Guid>("ItemId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("Width")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("Bandwidth")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("Height")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("Interval")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("ThumbnailCount")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("TileHeight")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("TileWidth")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("ItemId", "Width");
+
+                    b.ToTable("TrickplayInfos");
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.User", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("AudioLanguagePreference")
+                        .HasMaxLength(255)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("AuthenticationProviderId")
+                        .IsRequired()
+                        .HasMaxLength(255)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("CastReceiverId")
+                        .HasMaxLength(32)
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("DisplayCollectionsView")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("DisplayMissingEpisodes")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("EnableAutoLogin")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("EnableLocalPassword")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("EnableNextEpisodeAutoPlay")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("EnableUserPreferenceAccess")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("HidePlayedInLatest")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<long>("InternalId")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("InvalidLoginAttemptCount")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<DateTime?>("LastActivityDate")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("LastLoginDate")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int?>("LoginAttemptsBeforeLockout")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("MaxActiveSessions")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int?>("MaxParentalAgeRating")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("MustUpdatePassword")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Password")
+                        .HasMaxLength(65535)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("PasswordResetProviderId")
+                        .IsRequired()
+                        .HasMaxLength(255)
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("PlayDefaultAudioTrack")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("RememberAudioSelections")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("RememberSubtitleSelections")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int?>("RemoteClientBitrateLimit")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<uint>("RowVersion")
+                        .IsConcurrencyToken()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("SubtitleLanguagePreference")
+                        .HasMaxLength(255)
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("SubtitleMode")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("SyncPlayAccess")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Username")
+                        .IsRequired()
+                        .HasMaxLength(255)
+                        .HasColumnType("TEXT")
+                        .UseCollation("NOCASE");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("Username")
+                        .IsUnique();
+
+                    b.ToTable("Users");
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.UserData", b =>
+                {
+                    b.Property<string>("Key")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int?>("AudioStreamIndex")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<Guid?>("BaseItemEntityId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("IsFavorite")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<DateTime?>("LastPlayedDate")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool?>("Likes")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("PlayCount")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<long>("PlaybackPositionTicks")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("Played")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<double?>("Rating")
+                        .HasColumnType("REAL");
+
+                    b.Property<int?>("SubtitleStreamIndex")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("Key", "UserId");
+
+                    b.HasIndex("BaseItemEntityId");
+
+                    b.HasIndex("UserId");
+
+                    b.HasIndex("Key", "UserId", "IsFavorite");
+
+                    b.HasIndex("Key", "UserId", "LastPlayedDate");
+
+                    b.HasIndex("Key", "UserId", "PlaybackPositionTicks");
+
+                    b.HasIndex("Key", "UserId", "Played");
+
+                    b.ToTable("UserData");
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.AccessSchedule", b =>
+                {
+                    b.HasOne("Jellyfin.Data.Entities.User", null)
+                        .WithMany("AccessSchedules")
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.AncestorId", b =>
+                {
+                    b.HasOne("Jellyfin.Data.Entities.BaseItemEntity", "Item")
+                        .WithMany("AncestorIds")
+                        .HasForeignKey("ItemId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Item");
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.AttachmentStreamInfo", b =>
+                {
+                    b.HasOne("Jellyfin.Data.Entities.BaseItemEntity", "Item")
+                        .WithMany()
+                        .HasForeignKey("ItemId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Item");
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.BaseItemProvider", b =>
+                {
+                    b.HasOne("Jellyfin.Data.Entities.BaseItemEntity", "Item")
+                        .WithMany("Provider")
+                        .HasForeignKey("ItemId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Item");
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.Chapter", b =>
+                {
+                    b.HasOne("Jellyfin.Data.Entities.BaseItemEntity", "Item")
+                        .WithMany("Chapters")
+                        .HasForeignKey("ItemId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Item");
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.DisplayPreferences", b =>
+                {
+                    b.HasOne("Jellyfin.Data.Entities.User", null)
+                        .WithMany("DisplayPreferences")
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.HomeSection", b =>
+                {
+                    b.HasOne("Jellyfin.Data.Entities.DisplayPreferences", null)
+                        .WithMany("HomeSections")
+                        .HasForeignKey("DisplayPreferencesId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.ImageInfo", b =>
+                {
+                    b.HasOne("Jellyfin.Data.Entities.User", null)
+                        .WithOne("ProfileImage")
+                        .HasForeignKey("Jellyfin.Data.Entities.ImageInfo", "UserId")
+                        .OnDelete(DeleteBehavior.Cascade);
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.ItemDisplayPreferences", b =>
+                {
+                    b.HasOne("Jellyfin.Data.Entities.User", null)
+                        .WithMany("ItemDisplayPreferences")
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.ItemValue", b =>
+                {
+                    b.HasOne("Jellyfin.Data.Entities.BaseItemEntity", "Item")
+                        .WithMany("ItemValues")
+                        .HasForeignKey("ItemId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Item");
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.MediaStreamInfo", b =>
+                {
+                    b.HasOne("Jellyfin.Data.Entities.BaseItemEntity", "Item")
+                        .WithMany("MediaStreams")
+                        .HasForeignKey("ItemId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Item");
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.People", b =>
+                {
+                    b.HasOne("Jellyfin.Data.Entities.BaseItemEntity", "Item")
+                        .WithMany("Peoples")
+                        .HasForeignKey("ItemId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Item");
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.Permission", b =>
+                {
+                    b.HasOne("Jellyfin.Data.Entities.User", null)
+                        .WithMany("Permissions")
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade);
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.Preference", b =>
+                {
+                    b.HasOne("Jellyfin.Data.Entities.User", null)
+                        .WithMany("Preferences")
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade);
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.Security.Device", b =>
+                {
+                    b.HasOne("Jellyfin.Data.Entities.User", "User")
+                        .WithMany()
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("User");
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.UserData", b =>
+                {
+                    b.HasOne("Jellyfin.Data.Entities.BaseItemEntity", null)
+                        .WithMany("UserData")
+                        .HasForeignKey("BaseItemEntityId");
+
+                    b.HasOne("Jellyfin.Data.Entities.User", "User")
+                        .WithMany()
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("User");
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.BaseItemEntity", b =>
+                {
+                    b.Navigation("AncestorIds");
+
+                    b.Navigation("Chapters");
+
+                    b.Navigation("ItemValues");
+
+                    b.Navigation("MediaStreams");
+
+                    b.Navigation("Peoples");
+
+                    b.Navigation("Provider");
+
+                    b.Navigation("UserData");
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.DisplayPreferences", b =>
+                {
+                    b.Navigation("HomeSections");
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.User", b =>
+                {
+                    b.Navigation("AccessSchedules");
+
+                    b.Navigation("DisplayPreferences");
+
+                    b.Navigation("ItemDisplayPreferences");
+
+                    b.Navigation("Permissions");
+
+                    b.Navigation("Preferences");
+
+                    b.Navigation("ProfileImage");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}
diff --git a/Jellyfin.Server.Implementations/Migrations/20241009132112_BaseItemRefactor.cs b/Jellyfin.Server.Implementations/Migrations/20241009132112_BaseItemRefactor.cs
new file mode 100644
index 000000000..caa731c15
--- /dev/null
+++ b/Jellyfin.Server.Implementations/Migrations/20241009132112_BaseItemRefactor.cs
@@ -0,0 +1,501 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Jellyfin.Server.Implementations.Migrations
+{
+    /// <inheritdoc />
+    public partial class BaseItemRefactor : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.CreateTable(
+                name: "BaseItems",
+                columns: table => new
+                {
+                    Id = table.Column<Guid>(type: "TEXT", nullable: false),
+                    Type = table.Column<string>(type: "TEXT", nullable: false),
+                    Data = table.Column<string>(type: "TEXT", nullable: true),
+                    Path = table.Column<string>(type: "TEXT", nullable: true),
+                    StartDate = table.Column<DateTime>(type: "TEXT", nullable: false),
+                    EndDate = table.Column<DateTime>(type: "TEXT", nullable: false),
+                    ChannelId = table.Column<string>(type: "TEXT", nullable: true),
+                    IsMovie = table.Column<bool>(type: "INTEGER", nullable: false),
+                    CommunityRating = table.Column<float>(type: "REAL", nullable: true),
+                    CustomRating = table.Column<string>(type: "TEXT", nullable: true),
+                    IndexNumber = table.Column<int>(type: "INTEGER", nullable: true),
+                    IsLocked = table.Column<bool>(type: "INTEGER", nullable: false),
+                    Name = table.Column<string>(type: "TEXT", nullable: true),
+                    OfficialRating = table.Column<string>(type: "TEXT", nullable: true),
+                    MediaType = table.Column<string>(type: "TEXT", nullable: true),
+                    Overview = table.Column<string>(type: "TEXT", nullable: true),
+                    ParentIndexNumber = table.Column<int>(type: "INTEGER", nullable: true),
+                    PremiereDate = table.Column<DateTime>(type: "TEXT", nullable: true),
+                    ProductionYear = table.Column<int>(type: "INTEGER", nullable: true),
+                    Genres = table.Column<string>(type: "TEXT", nullable: true),
+                    SortName = table.Column<string>(type: "TEXT", nullable: true),
+                    ForcedSortName = table.Column<string>(type: "TEXT", nullable: true),
+                    RunTimeTicks = table.Column<long>(type: "INTEGER", nullable: true),
+                    DateCreated = table.Column<DateTime>(type: "TEXT", nullable: true),
+                    DateModified = table.Column<DateTime>(type: "TEXT", nullable: true),
+                    IsSeries = table.Column<bool>(type: "INTEGER", nullable: false),
+                    EpisodeTitle = table.Column<string>(type: "TEXT", nullable: true),
+                    IsRepeat = table.Column<bool>(type: "INTEGER", nullable: false),
+                    PreferredMetadataLanguage = table.Column<string>(type: "TEXT", nullable: true),
+                    PreferredMetadataCountryCode = table.Column<string>(type: "TEXT", nullable: true),
+                    DateLastRefreshed = table.Column<DateTime>(type: "TEXT", nullable: true),
+                    DateLastSaved = table.Column<DateTime>(type: "TEXT", nullable: true),
+                    IsInMixedFolder = table.Column<bool>(type: "INTEGER", nullable: false),
+                    LockedFields = table.Column<string>(type: "TEXT", nullable: true),
+                    Studios = table.Column<string>(type: "TEXT", nullable: true),
+                    Audio = table.Column<string>(type: "TEXT", nullable: true),
+                    ExternalServiceId = table.Column<string>(type: "TEXT", nullable: true),
+                    Tags = table.Column<string>(type: "TEXT", nullable: true),
+                    IsFolder = table.Column<bool>(type: "INTEGER", nullable: false),
+                    InheritedParentalRatingValue = table.Column<int>(type: "INTEGER", nullable: true),
+                    UnratedType = table.Column<string>(type: "TEXT", nullable: true),
+                    TrailerTypes = table.Column<string>(type: "TEXT", nullable: true),
+                    CriticRating = table.Column<float>(type: "REAL", nullable: true),
+                    CleanName = table.Column<string>(type: "TEXT", nullable: true),
+                    PresentationUniqueKey = table.Column<string>(type: "TEXT", nullable: true),
+                    OriginalTitle = table.Column<string>(type: "TEXT", nullable: true),
+                    PrimaryVersionId = table.Column<string>(type: "TEXT", nullable: true),
+                    DateLastMediaAdded = table.Column<DateTime>(type: "TEXT", nullable: true),
+                    Album = table.Column<string>(type: "TEXT", nullable: true),
+                    LUFS = table.Column<float>(type: "REAL", nullable: true),
+                    NormalizationGain = table.Column<float>(type: "REAL", nullable: true),
+                    IsVirtualItem = table.Column<bool>(type: "INTEGER", nullable: false),
+                    SeriesName = table.Column<string>(type: "TEXT", nullable: true),
+                    UserDataKey = table.Column<string>(type: "TEXT", nullable: true),
+                    SeasonName = table.Column<string>(type: "TEXT", nullable: true),
+                    ExternalSeriesId = table.Column<string>(type: "TEXT", nullable: true),
+                    Tagline = table.Column<string>(type: "TEXT", nullable: true),
+                    Images = table.Column<string>(type: "TEXT", nullable: true),
+                    ProductionLocations = table.Column<string>(type: "TEXT", nullable: true),
+                    ExtraIds = table.Column<string>(type: "TEXT", nullable: true),
+                    TotalBitrate = table.Column<int>(type: "INTEGER", nullable: true),
+                    ExtraType = table.Column<string>(type: "TEXT", nullable: true),
+                    Artists = table.Column<string>(type: "TEXT", nullable: true),
+                    AlbumArtists = table.Column<string>(type: "TEXT", nullable: true),
+                    ExternalId = table.Column<string>(type: "TEXT", nullable: true),
+                    SeriesPresentationUniqueKey = table.Column<string>(type: "TEXT", nullable: true),
+                    ShowId = table.Column<string>(type: "TEXT", nullable: true),
+                    OwnerId = table.Column<string>(type: "TEXT", nullable: true),
+                    Width = table.Column<int>(type: "INTEGER", nullable: true),
+                    Height = table.Column<int>(type: "INTEGER", nullable: true),
+                    Size = table.Column<long>(type: "INTEGER", nullable: true),
+                    ParentId = table.Column<Guid>(type: "TEXT", nullable: true),
+                    TopParentId = table.Column<Guid>(type: "TEXT", nullable: true),
+                    SeasonId = table.Column<Guid>(type: "TEXT", nullable: true),
+                    SeriesId = table.Column<Guid>(type: "TEXT", nullable: true)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_BaseItems", x => x.Id);
+                });
+
+            migrationBuilder.CreateTable(
+                name: "AncestorIds",
+                columns: table => new
+                {
+                    Id = table.Column<Guid>(type: "TEXT", nullable: false),
+                    ItemId = table.Column<Guid>(type: "TEXT", nullable: false),
+                    AncestorIdText = table.Column<string>(type: "TEXT", nullable: true)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_AncestorIds", x => new { x.ItemId, x.Id });
+                    table.ForeignKey(
+                        name: "FK_AncestorIds_BaseItems_ItemId",
+                        column: x => x.ItemId,
+                        principalTable: "BaseItems",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Cascade);
+                });
+
+            migrationBuilder.CreateTable(
+                name: "AttachmentStreamInfos",
+                columns: table => new
+                {
+                    ItemId = table.Column<Guid>(type: "TEXT", nullable: false),
+                    Index = table.Column<int>(type: "INTEGER", nullable: false),
+                    Codec = table.Column<string>(type: "TEXT", nullable: false),
+                    CodecTag = table.Column<string>(type: "TEXT", nullable: true),
+                    Comment = table.Column<string>(type: "TEXT", nullable: true),
+                    Filename = table.Column<string>(type: "TEXT", nullable: true),
+                    MimeType = table.Column<string>(type: "TEXT", nullable: true)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_AttachmentStreamInfos", x => new { x.ItemId, x.Index });
+                    table.ForeignKey(
+                        name: "FK_AttachmentStreamInfos_BaseItems_ItemId",
+                        column: x => x.ItemId,
+                        principalTable: "BaseItems",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Cascade);
+                });
+
+            migrationBuilder.CreateTable(
+                name: "BaseItemProviders",
+                columns: table => new
+                {
+                    ItemId = table.Column<Guid>(type: "TEXT", nullable: false),
+                    ProviderId = table.Column<string>(type: "TEXT", nullable: false),
+                    ProviderValue = table.Column<string>(type: "TEXT", nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_BaseItemProviders", x => new { x.ItemId, x.ProviderId });
+                    table.ForeignKey(
+                        name: "FK_BaseItemProviders_BaseItems_ItemId",
+                        column: x => x.ItemId,
+                        principalTable: "BaseItems",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Cascade);
+                });
+
+            migrationBuilder.CreateTable(
+                name: "Chapters",
+                columns: table => new
+                {
+                    ItemId = table.Column<Guid>(type: "TEXT", nullable: false),
+                    ChapterIndex = table.Column<int>(type: "INTEGER", nullable: false),
+                    StartPositionTicks = table.Column<long>(type: "INTEGER", nullable: false),
+                    Name = table.Column<string>(type: "TEXT", nullable: true),
+                    ImagePath = table.Column<string>(type: "TEXT", nullable: true),
+                    ImageDateModified = table.Column<DateTime>(type: "TEXT", nullable: true)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_Chapters", x => new { x.ItemId, x.ChapterIndex });
+                    table.ForeignKey(
+                        name: "FK_Chapters_BaseItems_ItemId",
+                        column: x => x.ItemId,
+                        principalTable: "BaseItems",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Cascade);
+                });
+
+            migrationBuilder.CreateTable(
+                name: "ItemValues",
+                columns: table => new
+                {
+                    ItemId = table.Column<Guid>(type: "TEXT", nullable: false),
+                    Type = table.Column<int>(type: "INTEGER", nullable: false),
+                    Value = table.Column<string>(type: "TEXT", nullable: false),
+                    CleanValue = table.Column<string>(type: "TEXT", nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_ItemValues", x => new { x.ItemId, x.Type, x.Value });
+                    table.ForeignKey(
+                        name: "FK_ItemValues_BaseItems_ItemId",
+                        column: x => x.ItemId,
+                        principalTable: "BaseItems",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Cascade);
+                });
+
+            migrationBuilder.CreateTable(
+                name: "MediaStreamInfos",
+                columns: table => new
+                {
+                    ItemId = table.Column<Guid>(type: "TEXT", nullable: false),
+                    StreamIndex = table.Column<int>(type: "INTEGER", nullable: false),
+                    StreamType = table.Column<string>(type: "TEXT", nullable: true),
+                    Codec = table.Column<string>(type: "TEXT", nullable: true),
+                    Language = table.Column<string>(type: "TEXT", nullable: true),
+                    ChannelLayout = table.Column<string>(type: "TEXT", nullable: true),
+                    Profile = table.Column<string>(type: "TEXT", nullable: true),
+                    AspectRatio = table.Column<string>(type: "TEXT", nullable: true),
+                    Path = table.Column<string>(type: "TEXT", nullable: true),
+                    IsInterlaced = table.Column<bool>(type: "INTEGER", nullable: false),
+                    BitRate = table.Column<int>(type: "INTEGER", nullable: false),
+                    Channels = table.Column<int>(type: "INTEGER", nullable: false),
+                    SampleRate = table.Column<int>(type: "INTEGER", nullable: false),
+                    IsDefault = table.Column<bool>(type: "INTEGER", nullable: false),
+                    IsForced = table.Column<bool>(type: "INTEGER", nullable: false),
+                    IsExternal = table.Column<bool>(type: "INTEGER", nullable: false),
+                    Height = table.Column<int>(type: "INTEGER", nullable: false),
+                    Width = table.Column<int>(type: "INTEGER", nullable: false),
+                    AverageFrameRate = table.Column<float>(type: "REAL", nullable: false),
+                    RealFrameRate = table.Column<float>(type: "REAL", nullable: false),
+                    Level = table.Column<float>(type: "REAL", nullable: false),
+                    PixelFormat = table.Column<string>(type: "TEXT", nullable: true),
+                    BitDepth = table.Column<int>(type: "INTEGER", nullable: false),
+                    IsAnamorphic = table.Column<bool>(type: "INTEGER", nullable: false),
+                    RefFrames = table.Column<int>(type: "INTEGER", nullable: false),
+                    CodecTag = table.Column<string>(type: "TEXT", nullable: false),
+                    Comment = table.Column<string>(type: "TEXT", nullable: false),
+                    NalLengthSize = table.Column<string>(type: "TEXT", nullable: false),
+                    IsAvc = table.Column<bool>(type: "INTEGER", nullable: false),
+                    Title = table.Column<string>(type: "TEXT", nullable: false),
+                    TimeBase = table.Column<string>(type: "TEXT", nullable: false),
+                    CodecTimeBase = table.Column<string>(type: "TEXT", nullable: false),
+                    ColorPrimaries = table.Column<string>(type: "TEXT", nullable: false),
+                    ColorSpace = table.Column<string>(type: "TEXT", nullable: false),
+                    ColorTransfer = table.Column<string>(type: "TEXT", nullable: false),
+                    DvVersionMajor = table.Column<int>(type: "INTEGER", nullable: false),
+                    DvVersionMinor = table.Column<int>(type: "INTEGER", nullable: false),
+                    DvProfile = table.Column<int>(type: "INTEGER", nullable: false),
+                    DvLevel = table.Column<int>(type: "INTEGER", nullable: false),
+                    RpuPresentFlag = table.Column<int>(type: "INTEGER", nullable: false),
+                    ElPresentFlag = table.Column<int>(type: "INTEGER", nullable: false),
+                    BlPresentFlag = table.Column<int>(type: "INTEGER", nullable: false),
+                    DvBlSignalCompatibilityId = table.Column<int>(type: "INTEGER", nullable: false),
+                    IsHearingImpaired = table.Column<bool>(type: "INTEGER", nullable: false),
+                    Rotation = table.Column<int>(type: "INTEGER", nullable: false),
+                    KeyFrames = table.Column<string>(type: "TEXT", nullable: true)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_MediaStreamInfos", x => new { x.ItemId, x.StreamIndex });
+                    table.ForeignKey(
+                        name: "FK_MediaStreamInfos_BaseItems_ItemId",
+                        column: x => x.ItemId,
+                        principalTable: "BaseItems",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Cascade);
+                });
+
+            migrationBuilder.CreateTable(
+                name: "Peoples",
+                columns: table => new
+                {
+                    ItemId = table.Column<Guid>(type: "TEXT", nullable: false),
+                    Role = table.Column<string>(type: "TEXT", nullable: false),
+                    ListOrder = table.Column<int>(type: "INTEGER", nullable: false),
+                    Name = table.Column<string>(type: "TEXT", nullable: false),
+                    PersonType = table.Column<string>(type: "TEXT", nullable: true),
+                    SortOrder = table.Column<int>(type: "INTEGER", nullable: true)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_Peoples", x => new { x.ItemId, x.Role, x.ListOrder });
+                    table.ForeignKey(
+                        name: "FK_Peoples_BaseItems_ItemId",
+                        column: x => x.ItemId,
+                        principalTable: "BaseItems",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Cascade);
+                });
+
+            migrationBuilder.CreateTable(
+                name: "UserData",
+                columns: table => new
+                {
+                    Key = table.Column<string>(type: "TEXT", nullable: false),
+                    UserId = table.Column<Guid>(type: "TEXT", nullable: false),
+                    Rating = table.Column<double>(type: "REAL", nullable: true),
+                    PlaybackPositionTicks = table.Column<long>(type: "INTEGER", nullable: false),
+                    PlayCount = table.Column<int>(type: "INTEGER", nullable: false),
+                    IsFavorite = table.Column<bool>(type: "INTEGER", nullable: false),
+                    LastPlayedDate = table.Column<DateTime>(type: "TEXT", nullable: true),
+                    Played = table.Column<bool>(type: "INTEGER", nullable: false),
+                    AudioStreamIndex = table.Column<int>(type: "INTEGER", nullable: true),
+                    SubtitleStreamIndex = table.Column<int>(type: "INTEGER", nullable: true),
+                    Likes = table.Column<bool>(type: "INTEGER", nullable: true),
+                    BaseItemEntityId = table.Column<Guid>(type: "TEXT", nullable: true)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_UserData", x => new { x.Key, x.UserId });
+                    table.ForeignKey(
+                        name: "FK_UserData_BaseItems_BaseItemEntityId",
+                        column: x => x.BaseItemEntityId,
+                        principalTable: "BaseItems",
+                        principalColumn: "Id");
+                    table.ForeignKey(
+                        name: "FK_UserData_Users_UserId",
+                        column: x => x.UserId,
+                        principalTable: "Users",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Cascade);
+                });
+
+            migrationBuilder.CreateIndex(
+                name: "IX_AncestorIds_Id",
+                table: "AncestorIds",
+                column: "Id");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_AncestorIds_ItemId_AncestorIdText",
+                table: "AncestorIds",
+                columns: new[] { "ItemId", "AncestorIdText" });
+
+            migrationBuilder.CreateIndex(
+                name: "IX_BaseItemProviders_ProviderId_ProviderValue_ItemId",
+                table: "BaseItemProviders",
+                columns: new[] { "ProviderId", "ProviderValue", "ItemId" });
+
+            migrationBuilder.CreateIndex(
+                name: "IX_BaseItems_Id_Type_IsFolder_IsVirtualItem",
+                table: "BaseItems",
+                columns: new[] { "Id", "Type", "IsFolder", "IsVirtualItem" });
+
+            migrationBuilder.CreateIndex(
+                name: "IX_BaseItems_IsFolder_TopParentId_IsVirtualItem_PresentationUniqueKey_DateCreated",
+                table: "BaseItems",
+                columns: new[] { "IsFolder", "TopParentId", "IsVirtualItem", "PresentationUniqueKey", "DateCreated" });
+
+            migrationBuilder.CreateIndex(
+                name: "IX_BaseItems_MediaType_TopParentId_IsVirtualItem_PresentationUniqueKey",
+                table: "BaseItems",
+                columns: new[] { "MediaType", "TopParentId", "IsVirtualItem", "PresentationUniqueKey" });
+
+            migrationBuilder.CreateIndex(
+                name: "IX_BaseItems_ParentId",
+                table: "BaseItems",
+                column: "ParentId");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_BaseItems_Path",
+                table: "BaseItems",
+                column: "Path");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_BaseItems_PresentationUniqueKey",
+                table: "BaseItems",
+                column: "PresentationUniqueKey");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_BaseItems_TopParentId_Id",
+                table: "BaseItems",
+                columns: new[] { "TopParentId", "Id" });
+
+            migrationBuilder.CreateIndex(
+                name: "IX_BaseItems_Type_SeriesPresentationUniqueKey_IsFolder_IsVirtualItem",
+                table: "BaseItems",
+                columns: new[] { "Type", "SeriesPresentationUniqueKey", "IsFolder", "IsVirtualItem" });
+
+            migrationBuilder.CreateIndex(
+                name: "IX_BaseItems_Type_SeriesPresentationUniqueKey_PresentationUniqueKey_SortName",
+                table: "BaseItems",
+                columns: new[] { "Type", "SeriesPresentationUniqueKey", "PresentationUniqueKey", "SortName" });
+
+            migrationBuilder.CreateIndex(
+                name: "IX_BaseItems_Type_TopParentId_Id",
+                table: "BaseItems",
+                columns: new[] { "Type", "TopParentId", "Id" });
+
+            migrationBuilder.CreateIndex(
+                name: "IX_BaseItems_Type_TopParentId_IsVirtualItem_PresentationUniqueKey_DateCreated",
+                table: "BaseItems",
+                columns: new[] { "Type", "TopParentId", "IsVirtualItem", "PresentationUniqueKey", "DateCreated" });
+
+            migrationBuilder.CreateIndex(
+                name: "IX_BaseItems_Type_TopParentId_PresentationUniqueKey",
+                table: "BaseItems",
+                columns: new[] { "Type", "TopParentId", "PresentationUniqueKey" });
+
+            migrationBuilder.CreateIndex(
+                name: "IX_BaseItems_Type_TopParentId_StartDate",
+                table: "BaseItems",
+                columns: new[] { "Type", "TopParentId", "StartDate" });
+
+            migrationBuilder.CreateIndex(
+                name: "IX_BaseItems_UserDataKey_Type",
+                table: "BaseItems",
+                columns: new[] { "UserDataKey", "Type" });
+
+            migrationBuilder.CreateIndex(
+                name: "IX_ItemValues_ItemId_Type_CleanValue",
+                table: "ItemValues",
+                columns: new[] { "ItemId", "Type", "CleanValue" });
+
+            migrationBuilder.CreateIndex(
+                name: "IX_MediaStreamInfos_StreamIndex",
+                table: "MediaStreamInfos",
+                column: "StreamIndex");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_MediaStreamInfos_StreamIndex_StreamType",
+                table: "MediaStreamInfos",
+                columns: new[] { "StreamIndex", "StreamType" });
+
+            migrationBuilder.CreateIndex(
+                name: "IX_MediaStreamInfos_StreamIndex_StreamType_Language",
+                table: "MediaStreamInfos",
+                columns: new[] { "StreamIndex", "StreamType", "Language" });
+
+            migrationBuilder.CreateIndex(
+                name: "IX_MediaStreamInfos_StreamType",
+                table: "MediaStreamInfos",
+                column: "StreamType");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_Peoples_ItemId_ListOrder",
+                table: "Peoples",
+                columns: new[] { "ItemId", "ListOrder" });
+
+            migrationBuilder.CreateIndex(
+                name: "IX_Peoples_Name",
+                table: "Peoples",
+                column: "Name");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_UserData_BaseItemEntityId",
+                table: "UserData",
+                column: "BaseItemEntityId");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_UserData_Key_UserId_IsFavorite",
+                table: "UserData",
+                columns: new[] { "Key", "UserId", "IsFavorite" });
+
+            migrationBuilder.CreateIndex(
+                name: "IX_UserData_Key_UserId_LastPlayedDate",
+                table: "UserData",
+                columns: new[] { "Key", "UserId", "LastPlayedDate" });
+
+            migrationBuilder.CreateIndex(
+                name: "IX_UserData_Key_UserId_PlaybackPositionTicks",
+                table: "UserData",
+                columns: new[] { "Key", "UserId", "PlaybackPositionTicks" });
+
+            migrationBuilder.CreateIndex(
+                name: "IX_UserData_Key_UserId_Played",
+                table: "UserData",
+                columns: new[] { "Key", "UserId", "Played" });
+
+            migrationBuilder.CreateIndex(
+                name: "IX_UserData_UserId",
+                table: "UserData",
+                column: "UserId");
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropTable(
+                name: "AncestorIds");
+
+            migrationBuilder.DropTable(
+                name: "AttachmentStreamInfos");
+
+            migrationBuilder.DropTable(
+                name: "BaseItemProviders");
+
+            migrationBuilder.DropTable(
+                name: "Chapters");
+
+            migrationBuilder.DropTable(
+                name: "ItemValues");
+
+            migrationBuilder.DropTable(
+                name: "MediaStreamInfos");
+
+            migrationBuilder.DropTable(
+                name: "Peoples");
+
+            migrationBuilder.DropTable(
+                name: "UserData");
+
+            migrationBuilder.DropTable(
+                name: "BaseItems");
+        }
+    }
+}
diff --git a/Jellyfin.Server.Implementations/Migrations/DesignTimeJellyfinDbFactory.cs b/Jellyfin.Server.Implementations/Migrations/DesignTimeJellyfinDbFactory.cs
index 940cf7c5d..500c4a1c7 100644
--- a/Jellyfin.Server.Implementations/Migrations/DesignTimeJellyfinDbFactory.cs
+++ b/Jellyfin.Server.Implementations/Migrations/DesignTimeJellyfinDbFactory.cs
@@ -1,5 +1,6 @@
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Design;
+using Microsoft.Extensions.Logging.Abstractions;
 
 namespace Jellyfin.Server.Implementations.Migrations
 {
@@ -14,7 +15,7 @@ namespace Jellyfin.Server.Implementations.Migrations
             var optionsBuilder = new DbContextOptionsBuilder<JellyfinDbContext>();
             optionsBuilder.UseSqlite("Data Source=jellyfin.db");
 
-            return new JellyfinDbContext(optionsBuilder.Options);
+            return new JellyfinDbContext(optionsBuilder.Options, NullLogger<JellyfinDbContext>.Instance);
         }
     }
 }
diff --git a/Jellyfin.Server.Implementations/Migrations/JellyfinDbModelSnapshot.cs b/Jellyfin.Server.Implementations/Migrations/JellyfinDbModelSnapshot.cs
index f74f7d791..dd280489b 100644
--- a/Jellyfin.Server.Implementations/Migrations/JellyfinDbModelSnapshot.cs
+++ b/Jellyfin.Server.Implementations/Migrations/JellyfinDbModelSnapshot.cs
@@ -376,10 +376,6 @@ namespace Jellyfin.Server.Implementations.Migrations
 
                     b.HasIndex("PresentationUniqueKey");
 
-                    b.HasIndex("SeasonId");
-
-                    b.HasIndex("SeriesId");
-
                     b.HasIndex("TopParentId", "Id");
 
                     b.HasIndex("UserDataKey", "Type");
@@ -1272,33 +1268,6 @@ namespace Jellyfin.Server.Implementations.Migrations
                     b.Navigation("Item");
                 });
 
-            modelBuilder.Entity("Jellyfin.Data.Entities.BaseItemEntity", b =>
-                {
-                    b.HasOne("Jellyfin.Data.Entities.BaseItemEntity", "Parent")
-                        .WithMany("DirectChildren")
-                        .HasForeignKey("ParentId");
-
-                    b.HasOne("Jellyfin.Data.Entities.BaseItemEntity", "Season")
-                        .WithMany("SeasonEpisodes")
-                        .HasForeignKey("SeasonId");
-
-                    b.HasOne("Jellyfin.Data.Entities.BaseItemEntity", "Series")
-                        .WithMany("SeriesEpisodes")
-                        .HasForeignKey("SeriesId");
-
-                    b.HasOne("Jellyfin.Data.Entities.BaseItemEntity", "TopParent")
-                        .WithMany("AllChildren")
-                        .HasForeignKey("TopParentId");
-
-                    b.Navigation("Parent");
-
-                    b.Navigation("Season");
-
-                    b.Navigation("Series");
-
-                    b.Navigation("TopParent");
-                });
-
             modelBuilder.Entity("Jellyfin.Data.Entities.BaseItemProvider", b =>
                 {
                     b.HasOne("Jellyfin.Data.Entities.BaseItemEntity", "Item")
@@ -1433,14 +1402,10 @@ namespace Jellyfin.Server.Implementations.Migrations
 
             modelBuilder.Entity("Jellyfin.Data.Entities.BaseItemEntity", b =>
                 {
-                    b.Navigation("AllChildren");
-
                     b.Navigation("AncestorIds");
 
                     b.Navigation("Chapters");
 
-                    b.Navigation("DirectChildren");
-
                     b.Navigation("ItemValues");
 
                     b.Navigation("MediaStreams");
@@ -1449,10 +1414,6 @@ namespace Jellyfin.Server.Implementations.Migrations
 
                     b.Navigation("Provider");
 
-                    b.Navigation("SeasonEpisodes");
-
-                    b.Navigation("SeriesEpisodes");
-
                     b.Navigation("UserData");
                 });
 
diff --git a/Jellyfin.Server.Implementations/ModelConfiguration/BaseItemConfiguration.cs b/Jellyfin.Server.Implementations/ModelConfiguration/BaseItemConfiguration.cs
index d74b94784..6c36a1591 100644
--- a/Jellyfin.Server.Implementations/ModelConfiguration/BaseItemConfiguration.cs
+++ b/Jellyfin.Server.Implementations/ModelConfiguration/BaseItemConfiguration.cs
@@ -15,10 +15,11 @@ public class BaseItemConfiguration : IEntityTypeConfiguration<BaseItemEntity>
     public void Configure(EntityTypeBuilder<BaseItemEntity> builder)
     {
         builder.HasKey(e => e.Id);
-        builder.HasOne(e => e.Parent).WithMany(e => e.DirectChildren).HasForeignKey(e => e.ParentId);
-        builder.HasOne(e => e.TopParent).WithMany(e => e.AllChildren).HasForeignKey(e => e.TopParentId);
-        builder.HasOne(e => e.Season).WithMany(e => e.SeasonEpisodes).HasForeignKey(e => e.SeasonId);
-        builder.HasOne(e => e.Series).WithMany(e => e.SeriesEpisodes).HasForeignKey(e => e.SeriesId);
+        // TODO: See rant in entity file.
+        // builder.HasOne(e => e.Parent).WithMany(e => e.DirectChildren).HasForeignKey(e => e.ParentId);
+        // builder.HasOne(e => e.TopParent).WithMany(e => e.AllChildren).HasForeignKey(e => e.TopParentId);
+        // builder.HasOne(e => e.Season).WithMany(e => e.SeasonEpisodes).HasForeignKey(e => e.SeasonId);
+        // builder.HasOne(e => e.Series).WithMany(e => e.SeriesEpisodes).HasForeignKey(e => e.SeriesId);
         builder.HasMany(e => e.Peoples);
         builder.HasMany(e => e.UserData);
         builder.HasMany(e => e.ItemValues);
diff --git a/MediaBrowser.Controller/Providers/MetadataResult.cs b/MediaBrowser.Controller/Providers/MetadataResult.cs
index eabbe73cd..ef69885fc 100644
--- a/MediaBrowser.Controller/Providers/MetadataResult.cs
+++ b/MediaBrowser.Controller/Providers/MetadataResult.cs
@@ -36,7 +36,7 @@ namespace MediaBrowser.Controller.Providers
         public IReadOnlyList<PersonInfo> People
         {
             get => _people;
-            set => _people = value.ToList();
+            set => _people = value?.ToList();
         }
 
         public bool HasMetadata { get; set; }
diff --git a/tests/Jellyfin.Providers.Tests/Manager/MetadataServiceTests.cs b/tests/Jellyfin.Providers.Tests/Manager/MetadataServiceTests.cs
index cedcaf9c0..b32ecf6ec 100644
--- a/tests/Jellyfin.Providers.Tests/Manager/MetadataServiceTests.cs
+++ b/tests/Jellyfin.Providers.Tests/Manager/MetadataServiceTests.cs
@@ -330,7 +330,7 @@ namespace Jellyfin.Providers.Tests.Manager
             MetadataService<Movie, MovieInfo>.MergeBaseItemData(source, target, lockedFields, replaceData, false);
 
             actualValue = target.People;
-            return newValue?.Equals(actualValue) ?? actualValue is null;
+            return newValue?.SequenceEqual((IEnumerable<PersonInfo>)actualValue!) ?? actualValue is null;
         }
 
         /// <summary>
diff --git a/tests/Jellyfin.Server.Integration.Tests/Controllers/LibraryStructureControllerTests.cs b/tests/Jellyfin.Server.Integration.Tests/Controllers/LibraryStructureControllerTests.cs
index bf3bfdad4..02a77516f 100644
--- a/tests/Jellyfin.Server.Integration.Tests/Controllers/LibraryStructureControllerTests.cs
+++ b/tests/Jellyfin.Server.Integration.Tests/Controllers/LibraryStructureControllerTests.cs
@@ -13,7 +13,7 @@ using Xunit.Priority;
 
 namespace Jellyfin.Server.Integration.Tests.Controllers;
 
-[TestCaseOrderer(PriorityOrderer.Name, PriorityOrderer.Assembly)]
+// [TestCaseOrderer(PriorityOrderer.Name, PriorityOrderer.Assembly)]
 public sealed class LibraryStructureControllerTests : IClassFixture<JellyfinApplicationFactory>
 {
     private readonly JellyfinApplicationFactory _factory;
@@ -62,12 +62,23 @@ public sealed class LibraryStructureControllerTests : IClassFixture<JellyfinAppl
     }
 
     [Fact]
-    [Priority(0)]
+    [Priority(-2)]
     public async Task UpdateLibraryOptions_Valid_Success()
     {
         var client = _factory.CreateClient();
         client.DefaultRequestHeaders.AddAuthHeader(_accessToken ??= await AuthHelper.CompleteStartupAsync(client));
 
+        var createBody = new AddVirtualFolderDto()
+        {
+            LibraryOptions = new LibraryOptions()
+            {
+                Enabled = false
+            }
+        };
+
+        using var createResponse = await client.PostAsJsonAsync("Library/VirtualFolders?name=test&refreshLibrary=true", createBody, _jsonOptions);
+        Assert.Equal(HttpStatusCode.NoContent, createResponse.StatusCode);
+
         using var response = await client.GetAsync("Library/VirtualFolders");
         Assert.Equal(HttpStatusCode.OK, response.StatusCode);
 
@@ -80,13 +91,13 @@ public sealed class LibraryStructureControllerTests : IClassFixture<JellyfinAppl
         Assert.False(options.Enabled);
         options.Enabled = true;
 
-        var body = new UpdateLibraryOptionsDto()
+        var existBody = new UpdateLibraryOptionsDto()
         {
             Id = Guid.Parse(library.ItemId),
             LibraryOptions = options
         };
 
-        using var response2 = await client.PostAsJsonAsync("Library/VirtualFolders/LibraryOptions", body, _jsonOptions);
+        using var response2 = await client.PostAsJsonAsync("Library/VirtualFolders/LibraryOptions", existBody, _jsonOptions);
         Assert.Equal(HttpStatusCode.NoContent, response2.StatusCode);
     }
 
-- 
cgit v1.2.3


From 473628ba3a9f68479e0051e76594dc47f7fa08f3 Mon Sep 17 00:00:00 2001
From: JPVenson <ger-delta-07@hotmail.de>
Date: Wed, 9 Oct 2024 21:03:57 +0200
Subject: Apply suggestions from code review

Co-authored-by: Cody Robibero <cody@robibe.ro>
---
 Emby.Server.Implementations/Data/ItemTypeLookup.cs            | 2 +-
 Jellyfin.Api/Controllers/MoviesController.cs                  | 2 +-
 Jellyfin.Data/Entities/BaseItemProvider.cs                    | 2 +-
 Jellyfin.Data/Entities/MediaStreamInfo.cs                     | 4 ----
 Jellyfin.Server.Implementations/Item/MediaStreamRepository.cs | 2 +-
 MediaBrowser.Controller/Persistence/IItemTypeLookup.cs        | 2 +-
 MediaBrowser.Controller/Persistence/IPeopleRepository.cs      | 4 ++--
 7 files changed, 7 insertions(+), 11 deletions(-)

(limited to 'MediaBrowser.Controller')

diff --git a/Emby.Server.Implementations/Data/ItemTypeLookup.cs b/Emby.Server.Implementations/Data/ItemTypeLookup.cs
index 14dc68a32..1f73755f5 100644
--- a/Emby.Server.Implementations/Data/ItemTypeLookup.cs
+++ b/Emby.Server.Implementations/Data/ItemTypeLookup.cs
@@ -12,7 +12,7 @@ using MediaBrowser.Controller.Persistence;
 using MediaBrowser.Controller.Playlists;
 using MediaBrowser.Model.Querying;
 
-namespace Jellyfin.Server.Implementations.Item;
+namespace Emby.Server.Implementations.Data;
 
 /// <summary>
 /// Provides static topic based lookups for the BaseItemKind.
diff --git a/Jellyfin.Api/Controllers/MoviesController.cs b/Jellyfin.Api/Controllers/MoviesController.cs
index 11559419c..f537ffa11 100644
--- a/Jellyfin.Api/Controllers/MoviesController.cs
+++ b/Jellyfin.Api/Controllers/MoviesController.cs
@@ -97,7 +97,7 @@ public class MoviesController : BaseJellyfinApiController
             DtoOptions = dtoOptions
         };
 
-        var recentlyPlayedMovies = _libraryManager.GetItemList(query)!;
+        var recentlyPlayedMovies = _libraryManager.GetItemList(query);
 
         var itemTypes = new List<BaseItemKind> { BaseItemKind.Movie };
         if (_serverConfigurationManager.Configuration.EnableExternalContentInSuggestions)
diff --git a/Jellyfin.Data/Entities/BaseItemProvider.cs b/Jellyfin.Data/Entities/BaseItemProvider.cs
index 1fc721d6a..9a1565728 100644
--- a/Jellyfin.Data/Entities/BaseItemProvider.cs
+++ b/Jellyfin.Data/Entities/BaseItemProvider.cs
@@ -6,7 +6,7 @@ using System.ComponentModel.DataAnnotations.Schema;
 namespace Jellyfin.Data.Entities;
 
 /// <summary>
-/// Represents an Key-Value relaten of an BaseItem's provider.
+/// Represents a Key-Value relation of an BaseItem's provider.
 /// </summary>
 public class BaseItemProvider
 {
diff --git a/Jellyfin.Data/Entities/MediaStreamInfo.cs b/Jellyfin.Data/Entities/MediaStreamInfo.cs
index a46d3f195..1198026e7 100644
--- a/Jellyfin.Data/Entities/MediaStreamInfo.cs
+++ b/Jellyfin.Data/Entities/MediaStreamInfo.cs
@@ -6,10 +6,6 @@ namespace Jellyfin.Data.Entities;
 #pragma warning disable CS1591 // Missing XML comment for publicly visible type or member
 public class MediaStreamInfo
 {
-    public MediaStreamInfo()
-    {
-    }
-
     public required Guid ItemId { get; set; }
 
     public required BaseItemEntity Item { get; set; }
diff --git a/Jellyfin.Server.Implementations/Item/MediaStreamRepository.cs b/Jellyfin.Server.Implementations/Item/MediaStreamRepository.cs
index f44ead6e0..df434fdb3 100644
--- a/Jellyfin.Server.Implementations/Item/MediaStreamRepository.cs
+++ b/Jellyfin.Server.Implementations/Item/MediaStreamRepository.cs
@@ -37,7 +37,7 @@ public class MediaStreamRepository(IDbContextFactory<JellyfinDbContext> dbProvid
     public IReadOnlyList<MediaStream> GetMediaStreams(MediaStreamQuery filter)
     {
         using var context = dbProvider.CreateDbContext();
-        return TranslateQuery(context.MediaStreamInfos, filter).ToList().Select(Map).ToImmutableArray();
+        return TranslateQuery(context.MediaStreamInfos, filter).AsEnumerable().Select(Map).ToImmutableArray();
     }
 
     private string? GetPathToSave(string? path)
diff --git a/MediaBrowser.Controller/Persistence/IItemTypeLookup.cs b/MediaBrowser.Controller/Persistence/IItemTypeLookup.cs
index 1b2ca2acb..6ad8380d7 100644
--- a/MediaBrowser.Controller/Persistence/IItemTypeLookup.cs
+++ b/MediaBrowser.Controller/Persistence/IItemTypeLookup.cs
@@ -51,7 +51,7 @@ public interface IItemTypeLookup
     public IReadOnlyList<BaseItemKind> ArtistsTypes { get; }
 
     /// <summary>
-    /// Gets mapping for all BaseItemKinds and their expected serialisaition target.
+    /// Gets mapping for all BaseItemKinds and their expected serialization target.
     /// </summary>
     public IDictionary<BaseItemKind, string?> BaseItemKindNames { get; }
 }
diff --git a/MediaBrowser.Controller/Persistence/IPeopleRepository.cs b/MediaBrowser.Controller/Persistence/IPeopleRepository.cs
index 43a24703e..418289cb4 100644
--- a/MediaBrowser.Controller/Persistence/IPeopleRepository.cs
+++ b/MediaBrowser.Controller/Persistence/IPeopleRepository.cs
@@ -14,7 +14,7 @@ public interface IPeopleRepository
     /// Gets the people.
     /// </summary>
     /// <param name="filter">The query.</param>
-    /// <returns>List&lt;PersonInfo&gt;.</returns>
+    /// <returns>The list of people matching the filter.</returns>
     IReadOnlyList<PersonInfo> GetPeople(InternalPeopleQuery filter);
 
     /// <summary>
@@ -28,6 +28,6 @@ public interface IPeopleRepository
     /// Gets the people names.
     /// </summary>
     /// <param name="filter">The query.</param>
-    /// <returns>List&lt;System.String&gt;.</returns>
+    /// <returns>The list of people names matching the filter.</returns>
     IReadOnlyList<string> GetPeopleNames(InternalPeopleQuery filter);
 }
-- 
cgit v1.2.3


From 3e7ce5e1df9c6820a6dfd4c23aea29eed83b43ba Mon Sep 17 00:00:00 2001
From: JPVenson <github@jpb.email>
Date: Thu, 10 Oct 2024 00:57:19 +0000
Subject: Removed obsolete Score and Similiarity values for search

---
 Jellyfin.Api/Controllers/LibraryController.cs              | 2 --
 Jellyfin.Api/Controllers/MoviesController.cs               | 1 -
 Jellyfin.Server.Implementations/Item/BaseItemRepository.cs | 1 -
 MediaBrowser.Controller/Entities/InternalItemsQuery.cs     | 5 -----
 4 files changed, 9 deletions(-)

(limited to 'MediaBrowser.Controller')

diff --git a/Jellyfin.Api/Controllers/LibraryController.cs b/Jellyfin.Api/Controllers/LibraryController.cs
index b2d75d5a3..72129a585 100644
--- a/Jellyfin.Api/Controllers/LibraryController.cs
+++ b/Jellyfin.Api/Controllers/LibraryController.cs
@@ -780,11 +780,9 @@ public class LibraryController : BaseJellyfinApiController
             Genres = item.Genres,
             Limit = limit,
             IncludeItemTypes = includeItemTypes.ToArray(),
-            SimilarTo = item,
             DtoOptions = dtoOptions,
             EnableTotalRecordCount = !isMovie ?? true,
             EnableGroupByMetadataKey = isMovie ?? false,
-            MinSimilarityScore = 2 // A remnant from album/artist scoring
         };
 
         // ExcludeArtistIds
diff --git a/Jellyfin.Api/Controllers/MoviesController.cs b/Jellyfin.Api/Controllers/MoviesController.cs
index c2bdf71c5..ae67b6710 100644
--- a/Jellyfin.Api/Controllers/MoviesController.cs
+++ b/Jellyfin.Api/Controllers/MoviesController.cs
@@ -277,7 +277,6 @@ public class MoviesController : BaseJellyfinApiController
                 Limit = itemLimit,
                 IncludeItemTypes = itemTypes.ToArray(),
                 IsMovie = true,
-                SimilarTo = item,
                 EnableGroupByMetadataKey = true,
                 DtoOptions = dtoOptions
             });
diff --git a/Jellyfin.Server.Implementations/Item/BaseItemRepository.cs b/Jellyfin.Server.Implementations/Item/BaseItemRepository.cs
index d82de097c..86c682027 100644
--- a/Jellyfin.Server.Implementations/Item/BaseItemRepository.cs
+++ b/Jellyfin.Server.Implementations/Item/BaseItemRepository.cs
@@ -1708,7 +1708,6 @@ public sealed class BaseItemRepository(IDbContextFactory<JellyfinDbContext> dbPr
         query = query.Where(e => e.Type == returnType && e.ItemValues!.Any(f => e.CleanName == f.CleanValue && itemValueTypes.Any(w => (ItemValueType)w == f.Type)));
 
         if (filter.OrderBy.Count != 0
-            || filter.SimilarTo is not null
             || !string.IsNullOrEmpty(filter.SearchTerm))
         {
             query = ApplyOrder(query, filter);
diff --git a/MediaBrowser.Controller/Entities/InternalItemsQuery.cs b/MediaBrowser.Controller/Entities/InternalItemsQuery.cs
index 1461a3680..43f02fb72 100644
--- a/MediaBrowser.Controller/Entities/InternalItemsQuery.cs
+++ b/MediaBrowser.Controller/Entities/InternalItemsQuery.cs
@@ -37,7 +37,6 @@ namespace MediaBrowser.Controller.Entities
             IncludeItemTypes = Array.Empty<BaseItemKind>();
             ItemIds = Array.Empty<Guid>();
             MediaTypes = Array.Empty<MediaType>();
-            MinSimilarityScore = 20;
             OfficialRatings = Array.Empty<string>();
             OrderBy = Array.Empty<(ItemSortBy, SortOrder)>();
             PersonIds = Array.Empty<Guid>();
@@ -71,8 +70,6 @@ namespace MediaBrowser.Controller.Entities
 
         public User? User { get; set; }
 
-        public BaseItem? SimilarTo { get; set; }
-
         public bool? IsFolder { get; set; }
 
         public bool? IsFavorite { get; set; }
@@ -295,8 +292,6 @@ namespace MediaBrowser.Controller.Entities
 
         public DtoOptions DtoOptions { get; set; }
 
-        public int MinSimilarityScore { get; set; }
-
         public string? HasNoAudioTrackWithLanguage { get; set; }
 
         public string? HasNoInternalSubtitleTrackWithLanguage { get; set; }
-- 
cgit v1.2.3


From 439a997fca67ff5fcbca38c87dfef5acf04e05e3 Mon Sep 17 00:00:00 2001
From: JPVenson <github@jpb.email>
Date: Thu, 10 Oct 2024 18:01:14 +0000
Subject: Readded custom serialisation

---
 .../Playlists/PlaylistsFolder.cs                   |  2 +
 .../Item/BaseItemRepository.cs                     | 60 +++++++++++++++++++---
 .../RequiresSourceSerialisationAttribute.cs        | 11 ++++
 .../Entities/Audio/MusicAlbum.cs                   |  1 +
 .../Entities/Audio/MusicArtist.cs                  |  1 +
 .../Entities/Audio/MusicGenre.cs                   |  1 +
 MediaBrowser.Controller/Entities/AudioBook.cs      |  1 +
 MediaBrowser.Controller/Entities/Book.cs           |  1 +
 MediaBrowser.Controller/Entities/Genre.cs          |  1 +
 MediaBrowser.Controller/Entities/Person.cs         |  1 +
 MediaBrowser.Controller/Entities/PhotoAlbum.cs     |  1 +
 MediaBrowser.Controller/Entities/Studio.cs         |  1 +
 MediaBrowser.Controller/Entities/TV/Season.cs      |  2 +
 MediaBrowser.Controller/Entities/Year.cs           |  1 +
 MediaBrowser.Controller/LiveTv/LiveTvProgram.cs    |  1 +
 15 files changed, 79 insertions(+), 7 deletions(-)
 create mode 100644 MediaBrowser.Common/RequiresSourceSerialisationAttribute.cs

(limited to 'MediaBrowser.Controller')

diff --git a/Emby.Server.Implementations/Playlists/PlaylistsFolder.cs b/Emby.Server.Implementations/Playlists/PlaylistsFolder.cs
index f65d609c7..db3aeaaf3 100644
--- a/Emby.Server.Implementations/Playlists/PlaylistsFolder.cs
+++ b/Emby.Server.Implementations/Playlists/PlaylistsFolder.cs
@@ -5,12 +5,14 @@ using System.Linq;
 using System.Text.Json.Serialization;
 using Jellyfin.Data.Entities;
 using Jellyfin.Data.Enums;
+using MediaBrowser.Common;
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Playlists;
 using MediaBrowser.Model.Querying;
 
 namespace Emby.Server.Implementations.Playlists
 {
+    [RequiresSourceSerialisation]
     public class PlaylistsFolder : BasePluginFolder
     {
         public PlaylistsFolder()
diff --git a/Jellyfin.Server.Implementations/Item/BaseItemRepository.cs b/Jellyfin.Server.Implementations/Item/BaseItemRepository.cs
index 7e7873f6d..f92f526bc 100644
--- a/Jellyfin.Server.Implementations/Item/BaseItemRepository.cs
+++ b/Jellyfin.Server.Implementations/Item/BaseItemRepository.cs
@@ -3,14 +3,21 @@ using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Collections.Immutable;
 using System.Globalization;
+using System.IO;
 using System.Linq;
 using System.Linq.Expressions;
+using System.Reflection;
 using System.Text;
+using System.Text.Json;
 using System.Threading;
 using Jellyfin.Data.Entities;
 using Jellyfin.Data.Enums;
 using Jellyfin.Extensions;
+using Jellyfin.Extensions.Json;
+using MediaBrowser.Common;
 using MediaBrowser.Controller;
+using MediaBrowser.Controller.Channels;
+using MediaBrowser.Controller.Configuration;
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Entities.Audio;
 using MediaBrowser.Controller.Entities.TV;
@@ -21,7 +28,7 @@ using MediaBrowser.Model.Entities;
 using MediaBrowser.Model.LiveTv;
 using MediaBrowser.Model.Querying;
 using Microsoft.EntityFrameworkCore;
-using SQLitePCL;
+using Microsoft.Extensions.Logging;
 using BaseItemDto = MediaBrowser.Controller.Entities.BaseItem;
 using BaseItemEntity = Jellyfin.Data.Entities.BaseItemEntity;
 #pragma warning disable RS0030 // Do not use banned APIs
@@ -37,7 +44,14 @@ namespace Jellyfin.Server.Implementations.Item;
 /// <param name="dbProvider">The db factory.</param>
 /// <param name="appHost">The Application host.</param>
 /// <param name="itemTypeLookup">The static type lookup.</param>
-public sealed class BaseItemRepository(IDbContextFactory<JellyfinDbContext> dbProvider, IServerApplicationHost appHost, IItemTypeLookup itemTypeLookup)
+/// <param name="serverConfigurationManager">The server Configuration manager.</param>
+/// <param name="logger">System logger.</param>
+public sealed class BaseItemRepository(
+    IDbContextFactory<JellyfinDbContext> dbProvider,
+    IServerApplicationHost appHost,
+    IItemTypeLookup itemTypeLookup,
+    IServerConfigurationManager serverConfigurationManager,
+    ILogger<BaseItemRepository> logger)
     : IItemRepository, IDisposable
 {
     /// <summary>
@@ -244,7 +258,7 @@ public sealed class BaseItemRepository(IDbContextFactory<JellyfinDbContext> dbPr
             }
         }
 
-        result.Items = dbQuery.ToList().Select(DeserialiseBaseItem).ToImmutableArray();
+        result.Items = dbQuery.ToList().Select(w => DeserialiseBaseItem(w, filter.SkipDeserialization)).ToImmutableArray();
         result.StartIndex = filter.StartIndex ?? 0;
         return result;
     }
@@ -272,7 +286,7 @@ public sealed class BaseItemRepository(IDbContextFactory<JellyfinDbContext> dbPr
             }
         }
 
-        return dbQuery.ToList().Select(DeserialiseBaseItem).ToImmutableArray();
+        return dbQuery.ToList().Select(w => DeserialiseBaseItem(w, filter.SkipDeserialization)).ToImmutableArray();
     }
 
     /// <inheritdoc/>
@@ -1675,10 +1689,42 @@ public sealed class BaseItemRepository(IDbContextFactory<JellyfinDbContext> dbPr
         return query.Select(e => e.ItemValue.CleanValue).ToImmutableArray();
     }
 
-    private BaseItemDto DeserialiseBaseItem(BaseItemEntity baseItemEntity)
+    private bool TypeRequiresDeserialization(Type type)
+    {
+        if (serverConfigurationManager.Configuration.SkipDeserializationForBasicTypes)
+        {
+            if (type == typeof(Channel)
+                || type == typeof(UserRootFolder))
+            {
+                return false;
+            }
+        }
+
+        return type.GetCustomAttribute<RequiresSourceSerialisationAttribute>() == null;
+    }
+
+    private BaseItemDto DeserialiseBaseItem(BaseItemEntity baseItemEntity, bool skipDeserialization = false)
     {
         var type = GetType(baseItemEntity.Type) ?? throw new InvalidOperationException("Cannot deserialise unkown type.");
-        var dto = Activator.CreateInstance(type) as BaseItemDto ?? throw new InvalidOperationException("Cannot deserialise unkown type.");
+        BaseItemDto? dto = null;
+        if (TypeRequiresDeserialization(type) && baseItemEntity.Data is not null && !skipDeserialization)
+        {
+            try
+            {
+                using var dataAsStream = new MemoryStream(Encoding.UTF8.GetBytes(baseItemEntity.Data!));
+                dto = JsonSerializer.Deserialize(dataAsStream, type, JsonDefaults.Options) as BaseItemDto;
+            }
+            catch (JsonException ex)
+            {
+                logger.LogError(ex, "Error deserializing item with JSON: {Data}", baseItemEntity.Data);
+            }
+        }
+
+        if (dto is null)
+        {
+            dto = Activator.CreateInstance(type) as BaseItemDto ?? throw new InvalidOperationException("Cannot deserialise unkown type.");
+        }
+
         return Map(baseItemEntity, dto);
     }
 
@@ -1764,7 +1810,7 @@ public sealed class BaseItemRepository(IDbContextFactory<JellyfinDbContext> dbPr
         result.StartIndex = filter.StartIndex ?? 0;
         result.Items = resultQuery.ToImmutableArray().Select(e =>
         {
-            return (DeserialiseBaseItem(e.item), e.itemCount);
+            return (DeserialiseBaseItem(e.item, filter.SkipDeserialization), e.itemCount);
         }).ToImmutableArray();
 
         return result;
diff --git a/MediaBrowser.Common/RequiresSourceSerialisationAttribute.cs b/MediaBrowser.Common/RequiresSourceSerialisationAttribute.cs
new file mode 100644
index 000000000..b22e7cba1
--- /dev/null
+++ b/MediaBrowser.Common/RequiresSourceSerialisationAttribute.cs
@@ -0,0 +1,11 @@
+using System;
+
+namespace MediaBrowser.Common;
+
+/// <summary>
+/// Marks a BaseItem as needing custom serialisation from the Data field of the db.
+/// </summary>
+[System.AttributeUsage(System.AttributeTargets.Class, Inherited = true, AllowMultiple = false)]
+public sealed class RequiresSourceSerialisationAttribute : System.Attribute
+{
+}
diff --git a/MediaBrowser.Controller/Entities/Audio/MusicAlbum.cs b/MediaBrowser.Controller/Entities/Audio/MusicAlbum.cs
index a0aae8769..f3873775b 100644
--- a/MediaBrowser.Controller/Entities/Audio/MusicAlbum.cs
+++ b/MediaBrowser.Controller/Entities/Audio/MusicAlbum.cs
@@ -21,6 +21,7 @@ namespace MediaBrowser.Controller.Entities.Audio
     /// <summary>
     /// Class MusicAlbum.
     /// </summary>
+    [Common.RequiresSourceSerialisation]
     public class MusicAlbum : Folder, IHasAlbumArtist, IHasArtist, IHasMusicGenres, IHasLookupInfo<AlbumInfo>, IMetadataContainer
     {
         public MusicAlbum()
diff --git a/MediaBrowser.Controller/Entities/Audio/MusicArtist.cs b/MediaBrowser.Controller/Entities/Audio/MusicArtist.cs
index 6d3249399..537550925 100644
--- a/MediaBrowser.Controller/Entities/Audio/MusicArtist.cs
+++ b/MediaBrowser.Controller/Entities/Audio/MusicArtist.cs
@@ -21,6 +21,7 @@ namespace MediaBrowser.Controller.Entities.Audio
     /// <summary>
     /// Class MusicArtist.
     /// </summary>
+    [Common.RequiresSourceSerialisation]
     public class MusicArtist : Folder, IItemByName, IHasMusicGenres, IHasDualAccess, IHasLookupInfo<ArtistInfo>
     {
         [JsonIgnore]
diff --git a/MediaBrowser.Controller/Entities/Audio/MusicGenre.cs b/MediaBrowser.Controller/Entities/Audio/MusicGenre.cs
index 80f3902be..65669e680 100644
--- a/MediaBrowser.Controller/Entities/Audio/MusicGenre.cs
+++ b/MediaBrowser.Controller/Entities/Audio/MusicGenre.cs
@@ -14,6 +14,7 @@ namespace MediaBrowser.Controller.Entities.Audio
     /// <summary>
     /// Class MusicGenre.
     /// </summary>
+    [Common.RequiresSourceSerialisation]
     public class MusicGenre : BaseItem, IItemByName
     {
         [JsonIgnore]
diff --git a/MediaBrowser.Controller/Entities/AudioBook.cs b/MediaBrowser.Controller/Entities/AudioBook.cs
index 782481fbc..666bf2a75 100644
--- a/MediaBrowser.Controller/Entities/AudioBook.cs
+++ b/MediaBrowser.Controller/Entities/AudioBook.cs
@@ -9,6 +9,7 @@ using MediaBrowser.Controller.Providers;
 
 namespace MediaBrowser.Controller.Entities
 {
+    [Common.RequiresSourceSerialisation]
     public class AudioBook : Audio.Audio, IHasSeries, IHasLookupInfo<SongInfo>
     {
         [JsonIgnore]
diff --git a/MediaBrowser.Controller/Entities/Book.cs b/MediaBrowser.Controller/Entities/Book.cs
index 66dea1084..518766937 100644
--- a/MediaBrowser.Controller/Entities/Book.cs
+++ b/MediaBrowser.Controller/Entities/Book.cs
@@ -10,6 +10,7 @@ using MediaBrowser.Controller.Providers;
 
 namespace MediaBrowser.Controller.Entities
 {
+    [Common.RequiresSourceSerialisation]
     public class Book : BaseItem, IHasLookupInfo<BookInfo>, IHasSeries
     {
         public Book()
diff --git a/MediaBrowser.Controller/Entities/Genre.cs b/MediaBrowser.Controller/Entities/Genre.cs
index e5353d7bd..6ec78a270 100644
--- a/MediaBrowser.Controller/Entities/Genre.cs
+++ b/MediaBrowser.Controller/Entities/Genre.cs
@@ -14,6 +14,7 @@ namespace MediaBrowser.Controller.Entities
     /// <summary>
     /// Class Genre.
     /// </summary>
+    [Common.RequiresSourceSerialisation]
     public class Genre : BaseItem, IItemByName
     {
         /// <summary>
diff --git a/MediaBrowser.Controller/Entities/Person.cs b/MediaBrowser.Controller/Entities/Person.cs
index b0933d23f..5cc4d322f 100644
--- a/MediaBrowser.Controller/Entities/Person.cs
+++ b/MediaBrowser.Controller/Entities/Person.cs
@@ -14,6 +14,7 @@ namespace MediaBrowser.Controller.Entities
     /// <summary>
     /// This is the full Person object that can be retrieved with all of it's data.
     /// </summary>
+    [Common.RequiresSourceSerialisation]
     public class Person : BaseItem, IItemByName, IHasLookupInfo<PersonLookupInfo>
     {
         /// <summary>
diff --git a/MediaBrowser.Controller/Entities/PhotoAlbum.cs b/MediaBrowser.Controller/Entities/PhotoAlbum.cs
index a7ecb9061..5b31b4f11 100644
--- a/MediaBrowser.Controller/Entities/PhotoAlbum.cs
+++ b/MediaBrowser.Controller/Entities/PhotoAlbum.cs
@@ -4,6 +4,7 @@ using System.Text.Json.Serialization;
 
 namespace MediaBrowser.Controller.Entities
 {
+    [Common.RequiresSourceSerialisation]
     public class PhotoAlbum : Folder
     {
         [JsonIgnore]
diff --git a/MediaBrowser.Controller/Entities/Studio.cs b/MediaBrowser.Controller/Entities/Studio.cs
index b46a3d1bc..9103b09a9 100644
--- a/MediaBrowser.Controller/Entities/Studio.cs
+++ b/MediaBrowser.Controller/Entities/Studio.cs
@@ -13,6 +13,7 @@ namespace MediaBrowser.Controller.Entities
     /// <summary>
     /// Class Studio.
     /// </summary>
+    [Common.RequiresSourceSerialisation]
     public class Studio : BaseItem, IItemByName
     {
         /// <summary>
diff --git a/MediaBrowser.Controller/Entities/TV/Season.cs b/MediaBrowser.Controller/Entities/TV/Season.cs
index 181b9be2b..8e9f5818d 100644
--- a/MediaBrowser.Controller/Entities/TV/Season.cs
+++ b/MediaBrowser.Controller/Entities/TV/Season.cs
@@ -10,6 +10,7 @@ using System.Text.Json.Serialization;
 using Jellyfin.Data.Entities;
 using Jellyfin.Data.Enums;
 using Jellyfin.Extensions;
+using MediaBrowser.Common;
 using MediaBrowser.Controller.Dto;
 using MediaBrowser.Controller.Providers;
 using MediaBrowser.Model.Querying;
@@ -19,6 +20,7 @@ namespace MediaBrowser.Controller.Entities.TV
     /// <summary>
     /// Class Season.
     /// </summary>
+    [RequiresSourceSerialisation]
     public class Season : Folder, IHasSeries, IHasLookupInfo<SeasonInfo>
     {
         [JsonIgnore]
diff --git a/MediaBrowser.Controller/Entities/Year.cs b/MediaBrowser.Controller/Entities/Year.cs
index 587d7ce7e..37820296c 100644
--- a/MediaBrowser.Controller/Entities/Year.cs
+++ b/MediaBrowser.Controller/Entities/Year.cs
@@ -13,6 +13,7 @@ namespace MediaBrowser.Controller.Entities
     /// <summary>
     /// Class Year.
     /// </summary>
+    [Common.RequiresSourceSerialisation]
     public class Year : BaseItem, IItemByName
     {
         [JsonIgnore]
diff --git a/MediaBrowser.Controller/LiveTv/LiveTvProgram.cs b/MediaBrowser.Controller/LiveTv/LiveTvProgram.cs
index 2ac6f9963..83944f741 100644
--- a/MediaBrowser.Controller/LiveTv/LiveTvProgram.cs
+++ b/MediaBrowser.Controller/LiveTv/LiveTvProgram.cs
@@ -18,6 +18,7 @@ using MediaBrowser.Model.Providers;
 
 namespace MediaBrowser.Controller.LiveTv
 {
+    [Common.RequiresSourceSerialisation]
     public class LiveTvProgram : BaseItem, IHasLookupInfo<ItemLookupInfo>, IHasStartDate, IHasProgramAttributes
     {
         private const string EmbyServiceName = "Emby";
-- 
cgit v1.2.3


From ae641b7f3af5117612b3917d93013d26191a71d8 Mon Sep 17 00:00:00 2001
From: JPVenson <github@jpb.email>
Date: Thu, 10 Oct 2024 19:27:26 +0000
Subject: Applied review comments

---
 Emby.Server.Implementations/Data/ItemTypeLookup.cs |  73 ++++----
 .../Item/BaseItemRepository.cs                     | 193 ++++++++++-----------
 .../Persistence/IItemTypeLookup.cs                 |   7 +-
 3 files changed, 136 insertions(+), 137 deletions(-)

(limited to 'MediaBrowser.Controller')

diff --git a/Emby.Server.Implementations/Data/ItemTypeLookup.cs b/Emby.Server.Implementations/Data/ItemTypeLookup.cs
index df0f4ea20..dc55211d8 100644
--- a/Emby.Server.Implementations/Data/ItemTypeLookup.cs
+++ b/Emby.Server.Implementations/Data/ItemTypeLookup.cs
@@ -1,6 +1,8 @@
 using System;
 using System.Collections.Frozen;
 using System.Collections.Generic;
+using System.Collections.Immutable;
+using System.Linq;
 using System.Threading.Channels;
 using Emby.Server.Implementations.Playlists;
 using Jellyfin.Data.Enums;
@@ -82,40 +84,43 @@ public class ItemTypeLookup : IItemTypeLookup
     ];
 
     /// <inheritdoc />
-    public IDictionary<BaseItemKind, string?> BaseItemKindNames { get; } = new Dictionary<BaseItemKind, string?>()
+    public IReadOnlyList<string> MusicGenreTypes => BaseItemKindNames.Where(e => e.Key is BaseItemKind.Audio or BaseItemKind.MusicVideo or BaseItemKind.MusicAlbum or BaseItemKind.MusicArtist).Select(e => e.Value).ToImmutableArray();
+
+    /// <inheritdoc />
+    public IDictionary<BaseItemKind, string> BaseItemKindNames { get; } = new Dictionary<BaseItemKind, string>()
     {
-        { BaseItemKind.AggregateFolder, typeof(AggregateFolder).FullName },
-        { BaseItemKind.Audio, typeof(Audio).FullName },
-        { BaseItemKind.AudioBook, typeof(AudioBook).FullName },
-        { BaseItemKind.BasePluginFolder, typeof(BasePluginFolder).FullName },
-        { BaseItemKind.Book, typeof(Book).FullName },
-        { BaseItemKind.BoxSet, typeof(BoxSet).FullName },
-        { BaseItemKind.Channel, typeof(Channel).FullName },
-        { BaseItemKind.CollectionFolder, typeof(CollectionFolder).FullName },
-        { BaseItemKind.Episode, typeof(Episode).FullName },
-        { BaseItemKind.Folder, typeof(Folder).FullName },
-        { BaseItemKind.Genre, typeof(Genre).FullName },
-        { BaseItemKind.Movie, typeof(Movie).FullName },
-        { BaseItemKind.LiveTvChannel, typeof(LiveTvChannel).FullName },
-        { BaseItemKind.LiveTvProgram, typeof(LiveTvProgram).FullName },
-        { BaseItemKind.MusicAlbum, typeof(MusicAlbum).FullName },
-        { BaseItemKind.MusicArtist, typeof(MusicArtist).FullName },
-        { BaseItemKind.MusicGenre, typeof(MusicGenre).FullName },
-        { BaseItemKind.MusicVideo, typeof(MusicVideo).FullName },
-        { BaseItemKind.Person, typeof(Person).FullName },
-        { BaseItemKind.Photo, typeof(Photo).FullName },
-        { BaseItemKind.PhotoAlbum, typeof(PhotoAlbum).FullName },
-        { BaseItemKind.Playlist, typeof(Playlist).FullName },
-        { BaseItemKind.PlaylistsFolder, typeof(PlaylistsFolder).FullName },
-        { BaseItemKind.Season, typeof(Season).FullName },
-        { BaseItemKind.Series, typeof(Series).FullName },
-        { BaseItemKind.Studio, typeof(Studio).FullName },
-        { BaseItemKind.Trailer, typeof(Trailer).FullName },
-        { BaseItemKind.TvChannel, typeof(LiveTvChannel).FullName },
-        { BaseItemKind.TvProgram, typeof(LiveTvProgram).FullName },
-        { BaseItemKind.UserRootFolder, typeof(UserRootFolder).FullName },
-        { BaseItemKind.UserView, typeof(UserView).FullName },
-        { BaseItemKind.Video, typeof(Video).FullName },
-        { BaseItemKind.Year, typeof(Year).FullName }
+        { BaseItemKind.AggregateFolder, typeof(AggregateFolder).FullName! },
+        { BaseItemKind.Audio, typeof(Audio).FullName! },
+        { BaseItemKind.AudioBook, typeof(AudioBook).FullName! },
+        { BaseItemKind.BasePluginFolder, typeof(BasePluginFolder).FullName! },
+        { BaseItemKind.Book, typeof(Book).FullName! },
+        { BaseItemKind.BoxSet, typeof(BoxSet).FullName! },
+        { BaseItemKind.Channel, typeof(Channel).FullName! },
+        { BaseItemKind.CollectionFolder, typeof(CollectionFolder).FullName! },
+        { BaseItemKind.Episode, typeof(Episode).FullName! },
+        { BaseItemKind.Folder, typeof(Folder).FullName! },
+        { BaseItemKind.Genre, typeof(Genre).FullName! },
+        { BaseItemKind.Movie, typeof(Movie).FullName! },
+        { BaseItemKind.LiveTvChannel, typeof(LiveTvChannel).FullName! },
+        { BaseItemKind.LiveTvProgram, typeof(LiveTvProgram).FullName! },
+        { BaseItemKind.MusicAlbum, typeof(MusicAlbum).FullName! },
+        { BaseItemKind.MusicArtist, typeof(MusicArtist).FullName! },
+        { BaseItemKind.MusicGenre, typeof(MusicGenre).FullName! },
+        { BaseItemKind.MusicVideo, typeof(MusicVideo).FullName! },
+        { BaseItemKind.Person, typeof(Person).FullName! },
+        { BaseItemKind.Photo, typeof(Photo).FullName! },
+        { BaseItemKind.PhotoAlbum, typeof(PhotoAlbum).FullName! },
+        { BaseItemKind.Playlist, typeof(Playlist).FullName! },
+        { BaseItemKind.PlaylistsFolder, typeof(PlaylistsFolder).FullName! },
+        { BaseItemKind.Season, typeof(Season).FullName! },
+        { BaseItemKind.Series, typeof(Series).FullName! },
+        { BaseItemKind.Studio, typeof(Studio).FullName! },
+        { BaseItemKind.Trailer, typeof(Trailer).FullName! },
+        { BaseItemKind.TvChannel, typeof(LiveTvChannel).FullName! },
+        { BaseItemKind.TvProgram, typeof(LiveTvProgram).FullName! },
+        { BaseItemKind.UserRootFolder, typeof(UserRootFolder).FullName! },
+        { BaseItemKind.UserView, typeof(UserView).FullName! },
+        { BaseItemKind.Video, typeof(Video).FullName! },
+        { BaseItemKind.Year, typeof(Year).FullName! }
     }.ToFrozenDictionary();
 }
diff --git a/Jellyfin.Server.Implementations/Item/BaseItemRepository.cs b/Jellyfin.Server.Implementations/Item/BaseItemRepository.cs
index d8ce4a135..5708391a5 100644
--- a/Jellyfin.Server.Implementations/Item/BaseItemRepository.cs
+++ b/Jellyfin.Server.Implementations/Item/BaseItemRepository.cs
@@ -23,6 +23,7 @@ using MediaBrowser.Controller.Entities.Audio;
 using MediaBrowser.Controller.Entities.TV;
 using MediaBrowser.Controller.LiveTv;
 using MediaBrowser.Controller.Persistence;
+using MediaBrowser.Controller.Providers;
 using MediaBrowser.Model.Dto;
 using MediaBrowser.Model.Entities;
 using MediaBrowser.Model.LiveTv;
@@ -139,63 +140,57 @@ public sealed class BaseItemRepository(
     /// <inheritdoc />
     public QueryResult<(BaseItem Item, ItemCounts ItemCounts)> GetAllArtists(InternalItemsQuery filter)
     {
-        return GetItemValues(filter, [0, 1], typeof(MusicArtist).FullName!);
+        return GetItemValues(filter, [ItemValueType.Artist, ItemValueType.AlbumArtist], itemTypeLookup.BaseItemKindNames[BaseItemKind.MusicArtist]!);
     }
 
     /// <inheritdoc />
     public QueryResult<(BaseItem Item, ItemCounts ItemCounts)> GetArtists(InternalItemsQuery filter)
     {
-        return GetItemValues(filter, [0], typeof(MusicArtist).FullName!);
+        return GetItemValues(filter, [ItemValueType.Artist], itemTypeLookup.BaseItemKindNames[BaseItemKind.MusicArtist]!);
     }
 
     /// <inheritdoc />
     public QueryResult<(BaseItem Item, ItemCounts ItemCounts)> GetAlbumArtists(InternalItemsQuery filter)
     {
-        return GetItemValues(filter, [1], typeof(MusicArtist).FullName!);
+        return GetItemValues(filter, [ItemValueType.AlbumArtist], itemTypeLookup.BaseItemKindNames[BaseItemKind.MusicArtist]!);
     }
 
     /// <inheritdoc />
     public QueryResult<(BaseItem Item, ItemCounts ItemCounts)> GetStudios(InternalItemsQuery filter)
     {
-        return GetItemValues(filter, [3], typeof(Studio).FullName!);
+        return GetItemValues(filter, [ItemValueType.Studios], itemTypeLookup.BaseItemKindNames[BaseItemKind.Studio]!);
     }
 
     /// <inheritdoc />
     public QueryResult<(BaseItem Item, ItemCounts ItemCounts)> GetGenres(InternalItemsQuery filter)
     {
-        return GetItemValues(filter, [2], typeof(Genre).FullName!);
+        return GetItemValues(filter, [ItemValueType.Genre], itemTypeLookup.BaseItemKindNames[BaseItemKind.Genre]!);
     }
 
     /// <inheritdoc />
     public QueryResult<(BaseItem Item, ItemCounts ItemCounts)> GetMusicGenres(InternalItemsQuery filter)
     {
-        return GetItemValues(filter, [2], typeof(MusicGenre).FullName!);
+        return GetItemValues(filter, [ItemValueType.Genre], itemTypeLookup.BaseItemKindNames[BaseItemKind.MusicGenre]!);
     }
 
     /// <inheritdoc />
     public IReadOnlyList<string> GetStudioNames()
     {
-        return GetItemValueNames([3], Array.Empty<string>(), Array.Empty<string>());
+        return GetItemValueNames([ItemValueType.Studios], Array.Empty<string>(), Array.Empty<string>());
     }
 
     /// <inheritdoc />
     public IReadOnlyList<string> GetAllArtistNames()
     {
-        return GetItemValueNames([0, 1], Array.Empty<string>(), Array.Empty<string>());
+        return GetItemValueNames([ItemValueType.Artist, ItemValueType.AlbumArtist], Array.Empty<string>(), Array.Empty<string>());
     }
 
     /// <inheritdoc />
     public IReadOnlyList<string> GetMusicGenreNames()
     {
         return GetItemValueNames(
-            [2],
-            new string[]
-            {
-                    typeof(Audio).FullName!,
-                    typeof(MusicVideo).FullName!,
-                    typeof(MusicAlbum).FullName!,
-                    typeof(MusicArtist).FullName!
-            },
+            [ItemValueType.Genre],
+            itemTypeLookup.MusicGenreTypes,
             Array.Empty<string>());
     }
 
@@ -203,15 +198,9 @@ public sealed class BaseItemRepository(
     public IReadOnlyList<string> GetGenreNames()
     {
         return GetItemValueNames(
-            [2],
+            [ItemValueType.Genre],
             Array.Empty<string>(),
-            new string[]
-            {
-                    typeof(Audio).FullName!,
-                    typeof(MusicVideo).FullName!,
-                    typeof(MusicAlbum).FullName!,
-                    typeof(MusicArtist).FullName!
-            });
+            itemTypeLookup.MusicGenreTypes);
     }
 
     /// <inheritdoc cref="IItemRepository"/>
@@ -1084,7 +1073,7 @@ public sealed class BaseItemRepository(
             if (includeTypes.Length == 1 && includeTypes.FirstOrDefault() is BaseItemKind.Episode)
             {
                 baseQuery = baseQuery
-                    .Where(e => e.ItemValues!.Where(e => e.ItemValue.Type == ItemValueType.InheritedTags)
+                    .Where(e => e.ItemValues!.Where(f => f.ItemValue.Type == ItemValueType.InheritedTags)
                         .Any(f => filter.IncludeInheritedTags.Contains(f.ItemValue.CleanValue))
                         ||
                         (e.ParentId.HasValue && context.ItemValuesMap.Where(w => w.ItemId == e.ParentId.Value)!.Where(w => w.ItemValue.Type == ItemValueType.InheritedTags)
@@ -1246,84 +1235,76 @@ public sealed class BaseItemRepository(
             tuples[i] = (item, ancestorIds, topParent, userdataKey, inheritedTags);
         }
 
-        try
+        using var context = dbProvider.CreateDbContext();
+        using var transaction = context.Database.BeginTransaction();
+        foreach (var item in tuples)
         {
-            using var context = dbProvider.CreateDbContext();
-            using var transaction = context.Database.BeginTransaction();
-            foreach (var item in tuples)
+            var entity = Map(item.Item);
+            if (!context.BaseItems.Any(e => e.Id == entity.Id))
             {
-                var entity = Map(item.Item);
-                if (!context.BaseItems.Any(e => e.Id == entity.Id))
-                {
-                    context.BaseItems.Add(entity);
-                }
-                else
-                {
-                    context.BaseItems.Attach(entity).State = EntityState.Modified;
-                }
+                context.BaseItems.Add(entity);
+            }
+            else
+            {
+                context.BaseItems.Attach(entity).State = EntityState.Modified;
+            }
 
-                context.AncestorIds.Where(e => e.ItemId == entity.Id).ExecuteDelete();
-                if (item.Item.SupportsAncestors && item.AncestorIds != null)
+            context.AncestorIds.Where(e => e.ItemId == entity.Id).ExecuteDelete();
+            if (item.Item.SupportsAncestors && item.AncestorIds != null)
+            {
+                entity.AncestorIds = new List<AncestorId>();
+                foreach (var ancestorId in item.AncestorIds)
                 {
-                    entity.AncestorIds = new List<AncestorId>();
-                    foreach (var ancestorId in item.AncestorIds)
+                    entity.AncestorIds.Add(new AncestorId()
                     {
-                        entity.AncestorIds.Add(new AncestorId()
-                        {
-                            ParentItemId = ancestorId,
-                            ItemId = entity.Id,
-                            Item = null!,
-                            ParentItem = null!
-                        });
-                    }
+                        ParentItemId = ancestorId,
+                        ItemId = entity.Id,
+                        Item = null!,
+                        ParentItem = null!
+                    });
                 }
+            }
 
-                var itemValuesToSave = GetItemValuesToSave(item.Item, item.InheritedTags);
-                var itemValues = itemValuesToSave.Select(e => e.Value).ToArray();
-                context.ItemValuesMap.Where(e => e.ItemId == entity.Id).ExecuteDelete();
-                entity.ItemValues = new List<ItemValueMap>();
-                var referenceValues = context.ItemValues.Where(e => itemValues.Any(f => f == e.CleanValue)).ToArray();
+            var itemValuesToSave = GetItemValuesToSave(item.Item, item.InheritedTags);
+            var itemValues = itemValuesToSave.Select(e => e.Value).ToArray();
+            context.ItemValuesMap.Where(e => e.ItemId == entity.Id).ExecuteDelete();
+            entity.ItemValues = new List<ItemValueMap>();
+            var referenceValues = context.ItemValues.Where(e => itemValues.Any(f => f == e.CleanValue)).ToArray();
 
-                foreach (var itemValue in itemValuesToSave)
+            foreach (var itemValue in itemValuesToSave)
+            {
+                var refValue = referenceValues.FirstOrDefault(f => f.CleanValue == itemValue.Value && (int)f.Type == itemValue.MagicNumber);
+                if (refValue is not null)
                 {
-                    var refValue = referenceValues.FirstOrDefault(f => f.CleanValue == itemValue.Value && (int)f.Type == itemValue.MagicNumber);
-                    if (refValue is not null)
+                    entity.ItemValues.Add(new ItemValueMap()
                     {
-                        entity.ItemValues.Add(new ItemValueMap()
-                        {
-                            Item = entity,
-                            ItemId = entity.Id,
-                            ItemValue = null!,
-                            ItemValueId = refValue.ItemValueId
-                        });
-                    }
-                    else
+                        Item = entity,
+                        ItemId = entity.Id,
+                        ItemValue = null!,
+                        ItemValueId = refValue.ItemValueId
+                    });
+                }
+                else
+                {
+                    entity.ItemValues.Add(new ItemValueMap()
                     {
-                        entity.ItemValues.Add(new ItemValueMap()
+                        Item = entity,
+                        ItemId = entity.Id,
+                        ItemValue = new ItemValue()
                         {
-                            Item = entity,
-                            ItemId = entity.Id,
-                            ItemValue = new ItemValue()
-                            {
-                                CleanValue = GetCleanValue(itemValue.Value),
-                                Type = (ItemValueType)itemValue.MagicNumber,
-                                ItemValueId = Guid.NewGuid(),
-                                Value = itemValue.Value
-                            },
-                            ItemValueId = Guid.Empty
-                        });
-                    }
+                            CleanValue = GetCleanValue(itemValue.Value),
+                            Type = (ItemValueType)itemValue.MagicNumber,
+                            ItemValueId = Guid.NewGuid(),
+                            Value = itemValue.Value
+                        },
+                        ItemValueId = Guid.Empty
+                    });
                 }
             }
-
-            context.SaveChanges();
-            transaction.Commit();
-        }
-        catch (System.Exception)
-        {
-            System.Console.WriteLine();
-            throw;
         }
+
+        context.SaveChanges();
+        transaction.Commit();
     }
 
     /// <inheritdoc cref="IItemRepository" />
@@ -1665,7 +1646,7 @@ public sealed class BaseItemRepository(
         return entity;
     }
 
-    private IReadOnlyList<string> GetItemValueNames(int[] itemValueTypes, IReadOnlyList<string> withItemTypes, IReadOnlyList<string> excludeItemTypes)
+    private IReadOnlyList<string> GetItemValueNames(ItemValueType[] itemValueTypes, IReadOnlyList<string> withItemTypes, IReadOnlyList<string> excludeItemTypes)
     {
         using var context = dbProvider.CreateDbContext();
 
@@ -1725,7 +1706,7 @@ public sealed class BaseItemRepository(
         return Map(baseItemEntity, dto);
     }
 
-    private QueryResult<(BaseItemDto Item, ItemCounts ItemCounts)> GetItemValues(InternalItemsQuery filter, int[] itemValueTypes, string returnType)
+    private QueryResult<(BaseItemDto Item, ItemCounts ItemCounts)> GetItemValues(InternalItemsQuery filter, ItemValueType[] itemValueTypes, string returnType)
     {
         ArgumentNullException.ThrowIfNull(filter);
 
@@ -1787,19 +1768,27 @@ public sealed class BaseItemRepository(
             result.TotalRecordCount = query.DistinctBy(e => e.PresentationUniqueKey).Count();
         }
 
+        var seriesTypeName = itemTypeLookup.BaseItemKindNames[BaseItemKind.Series];
+        var movieTypeName = itemTypeLookup.BaseItemKindNames[BaseItemKind.Movie];
+        var episodeTypeName = itemTypeLookup.BaseItemKindNames[BaseItemKind.Episode];
+        var musicAlbumTypeName = itemTypeLookup.BaseItemKindNames[BaseItemKind.MusicAlbum];
+        var musicArtistTypeName = itemTypeLookup.BaseItemKindNames[BaseItemKind.MusicArtist];
+        var audioTypeName = itemTypeLookup.BaseItemKindNames[BaseItemKind.Audio];
+        var trailerTypeName = itemTypeLookup.BaseItemKindNames[BaseItemKind.Trailer];
+
         var resultQuery = query.Select(e => new
         {
             item = e,
             // TODO: This is bad refactor!
             itemCount = new ItemCounts()
             {
-                SeriesCount = e.ItemValues!.Count(f => f.Item.Type == typeof(Series).FullName),
-                EpisodeCount = e.ItemValues!.Count(f => f.Item.Type == typeof(Data.Entities.Libraries.Movie).FullName),
-                MovieCount = e.ItemValues!.Count(f => f.Item.Type == typeof(Series).FullName),
-                AlbumCount = e.ItemValues!.Count(f => f.Item.Type == typeof(MusicAlbum).FullName),
-                ArtistCount = e.ItemValues!.Count(f => f.Item.Type == typeof(MusicArtist).FullName),
-                SongCount = e.ItemValues!.Count(f => f.Item.Type == typeof(Audio).FullName),
-                TrailerCount = e.ItemValues!.Count(f => f.Item.Type == typeof(Trailer).FullName),
+                SeriesCount = e.ItemValues!.Count(f => f.Item.Type == seriesTypeName),
+                EpisodeCount = e.ItemValues!.Count(f => f.Item.Type == episodeTypeName),
+                MovieCount = e.ItemValues!.Count(f => f.Item.Type == movieTypeName),
+                AlbumCount = e.ItemValues!.Count(f => f.Item.Type == musicAlbumTypeName),
+                ArtistCount = e.ItemValues!.Count(f => f.Item.Type == musicArtistTypeName),
+                SongCount = e.ItemValues!.Count(f => f.Item.Type == audioTypeName),
+                TrailerCount = e.ItemValues!.Count(f => f.Item.Type == trailerTypeName),
             }
         });
 
@@ -1958,27 +1947,27 @@ public sealed class BaseItemRepository(
 
         if (IsTypeInQuery(BaseItemKind.Person, query))
         {
-            list.Add(typeof(Person).FullName!);
+            list.Add(itemTypeLookup.BaseItemKindNames[BaseItemKind.Person]!);
         }
 
         if (IsTypeInQuery(BaseItemKind.Genre, query))
         {
-            list.Add(typeof(Genre).FullName!);
+            list.Add(itemTypeLookup.BaseItemKindNames[BaseItemKind.Genre]!);
         }
 
         if (IsTypeInQuery(BaseItemKind.MusicGenre, query))
         {
-            list.Add(typeof(MusicGenre).FullName!);
+            list.Add(itemTypeLookup.BaseItemKindNames[BaseItemKind.MusicGenre]!);
         }
 
         if (IsTypeInQuery(BaseItemKind.MusicArtist, query))
         {
-            list.Add(typeof(MusicArtist).FullName!);
+            list.Add(itemTypeLookup.BaseItemKindNames[BaseItemKind.MusicArtist]!);
         }
 
         if (IsTypeInQuery(BaseItemKind.Studio, query))
         {
-            list.Add(typeof(Studio).FullName!);
+            list.Add(itemTypeLookup.BaseItemKindNames[BaseItemKind.Studio]!);
         }
 
         return list;
diff --git a/MediaBrowser.Controller/Persistence/IItemTypeLookup.cs b/MediaBrowser.Controller/Persistence/IItemTypeLookup.cs
index 6ad8380d7..343b95e9e 100644
--- a/MediaBrowser.Controller/Persistence/IItemTypeLookup.cs
+++ b/MediaBrowser.Controller/Persistence/IItemTypeLookup.cs
@@ -50,8 +50,13 @@ public interface IItemTypeLookup
     /// </summary>
     public IReadOnlyList<BaseItemKind> ArtistsTypes { get; }
 
+    /// <summary>
+    /// Gets all serialisation target types for music related kinds.
+    /// </summary>
+    IReadOnlyList<string> MusicGenreTypes { get; }
+
     /// <summary>
     /// Gets mapping for all BaseItemKinds and their expected serialization target.
     /// </summary>
-    public IDictionary<BaseItemKind, string?> BaseItemKindNames { get; }
+    public IDictionary<BaseItemKind, string> BaseItemKindNames { get; }
 }
-- 
cgit v1.2.3


From b73985e04f76924ec91692890687461bcfdb4e11 Mon Sep 17 00:00:00 2001
From: JPVenson <github@jpb.email>
Date: Fri, 11 Oct 2024 11:11:15 +0000
Subject: Expanded People architecture and fixed migration

---
 Jellyfin.Data/Entities/BaseItemEntity.cs           |    2 +-
 Jellyfin.Data/Entities/People.cs                   |   26 +-
 Jellyfin.Data/Entities/PeopleBaseItemMap.cs        |   44 +
 .../Item/BaseItemRepository.cs                     |    9 +-
 .../Item/PeopleRepository.cs                       |   47 +-
 .../JellyfinDbContext.cs                           |   11 +-
 ...241011095125_LibraryPeopleMigration.Designer.cs | 1613 ++++++++++++++++++++
 .../20241011095125_LibraryPeopleMigration.cs       |  152 ++
 ...11100757_LibraryPeopleRoleMigration.Designer.cs | 1613 ++++++++++++++++++++
 .../20241011100757_LibraryPeopleRoleMigration.cs   |   38 +
 .../Migrations/JellyfinDbModelSnapshot.cs          |   51 +-
 .../PeopleBaseItemMapConfiguration.cs              |   22 +
 .../ModelConfiguration/PeopleConfiguration.cs      |    4 +-
 Jellyfin.Server/Migrations/MigrationRunner.cs      |    3 +-
 .../Migrations/Routines/MigrateLibraryDb.cs        |  167 +-
 MediaBrowser.Controller/Entities/PersonInfo.cs     |    6 +
 16 files changed, 3708 insertions(+), 100 deletions(-)
 create mode 100644 Jellyfin.Data/Entities/PeopleBaseItemMap.cs
 create mode 100644 Jellyfin.Server.Implementations/Migrations/20241011095125_LibraryPeopleMigration.Designer.cs
 create mode 100644 Jellyfin.Server.Implementations/Migrations/20241011095125_LibraryPeopleMigration.cs
 create mode 100644 Jellyfin.Server.Implementations/Migrations/20241011100757_LibraryPeopleRoleMigration.Designer.cs
 create mode 100644 Jellyfin.Server.Implementations/Migrations/20241011100757_LibraryPeopleRoleMigration.cs
 create mode 100644 Jellyfin.Server.Implementations/ModelConfiguration/PeopleBaseItemMapConfiguration.cs

(limited to 'MediaBrowser.Controller')

diff --git a/Jellyfin.Data/Entities/BaseItemEntity.cs b/Jellyfin.Data/Entities/BaseItemEntity.cs
index 7670c1893..a9f9b1793 100644
--- a/Jellyfin.Data/Entities/BaseItemEntity.cs
+++ b/Jellyfin.Data/Entities/BaseItemEntity.cs
@@ -154,7 +154,7 @@ public class BaseItemEntity
 
     public Guid? SeriesId { get; set; }
 
-    public ICollection<People>? Peoples { get; set; }
+    public ICollection<PeopleBaseItemMap>? Peoples { get; set; }
 
     public ICollection<UserData>? UserData { get; set; }
 
diff --git a/Jellyfin.Data/Entities/People.cs b/Jellyfin.Data/Entities/People.cs
index 8eb23f5e4..b1834a70d 100644
--- a/Jellyfin.Data/Entities/People.cs
+++ b/Jellyfin.Data/Entities/People.cs
@@ -1,9 +1,8 @@
 using System;
 using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
-using System.ComponentModel.DataAnnotations.Schema;
 
 namespace Jellyfin.Data.Entities;
+#pragma warning disable CA2227 // Collection properties should be read only
 
 /// <summary>
 /// People entity.
@@ -11,37 +10,22 @@ namespace Jellyfin.Data.Entities;
 public class People
 {
     /// <summary>
-    /// Gets or Sets The ItemId.
+    /// Gets or Sets the PeopleId.
     /// </summary>
-    public required Guid ItemId { get; set; }
-
-    /// <summary>
-    /// Gets or Sets Reference Item.
-    /// </summary>
-    public required BaseItemEntity Item { get; set; }
+    public required Guid Id { get; set; }
 
     /// <summary>
     /// Gets or Sets the Persons Name.
     /// </summary>
     public required string Name { get; set; }
 
-    /// <summary>
-    /// Gets or Sets the Role.
-    /// </summary>
-    public string? Role { get; set; }
-
     /// <summary>
     /// Gets or Sets the Type.
     /// </summary>
     public string? PersonType { get; set; }
 
     /// <summary>
-    /// Gets or Sets the SortOrder.
-    /// </summary>
-    public int? SortOrder { get; set; }
-
-    /// <summary>
-    /// Gets or Sets the ListOrder.
+    /// Gets or Sets the mapping of People to BaseItems.
     /// </summary>
-    public int? ListOrder { get; set; }
+    public ICollection<PeopleBaseItemMap>? BaseItems { get; set; }
 }
diff --git a/Jellyfin.Data/Entities/PeopleBaseItemMap.cs b/Jellyfin.Data/Entities/PeopleBaseItemMap.cs
new file mode 100644
index 000000000..5ce7300b5
--- /dev/null
+++ b/Jellyfin.Data/Entities/PeopleBaseItemMap.cs
@@ -0,0 +1,44 @@
+using System;
+
+namespace Jellyfin.Data.Entities;
+
+/// <summary>
+/// Mapping table for People to BaseItems.
+/// </summary>
+public class PeopleBaseItemMap
+{
+    /// <summary>
+    /// Gets or Sets the SortOrder.
+    /// </summary>
+    public int? SortOrder { get; set; }
+
+    /// <summary>
+    /// Gets or Sets the ListOrder.
+    /// </summary>
+    public int? ListOrder { get; set; }
+
+    /// <summary>
+    /// Gets or Sets the Role name the assosiated actor played in the <see cref="BaseItemEntity"/>.
+    /// </summary>
+    public string? Role { get; set; }
+
+    /// <summary>
+    /// Gets or Sets The ItemId.
+    /// </summary>
+    public required Guid ItemId { get; set; }
+
+    /// <summary>
+    /// Gets or Sets Reference Item.
+    /// </summary>
+    public required BaseItemEntity Item { get; set; }
+
+    /// <summary>
+    /// Gets or Sets The PeopleId.
+    /// </summary>
+    public required Guid PeopleId { get; set; }
+
+    /// <summary>
+    /// Gets or Sets Reference People.
+    /// </summary>
+    public required People People { get; set; }
+}
diff --git a/Jellyfin.Server.Implementations/Item/BaseItemRepository.cs b/Jellyfin.Server.Implementations/Item/BaseItemRepository.cs
index 208bb4198..36d976a43 100644
--- a/Jellyfin.Server.Implementations/Item/BaseItemRepository.cs
+++ b/Jellyfin.Server.Implementations/Item/BaseItemRepository.cs
@@ -81,7 +81,8 @@ public sealed class BaseItemRepository(
 
         using var context = dbProvider.CreateDbContext();
         using var transaction = context.Database.BeginTransaction();
-        context.Peoples.Where(e => e.ItemId == id).ExecuteDelete();
+        context.PeopleBaseItemMap.Where(e => e.ItemId == id).ExecuteDelete();
+        context.Peoples.Where(e => e.BaseItems!.Count == 0).ExecuteDelete();
         context.Chapters.Where(e => e.ItemId == id).ExecuteDelete();
         context.MediaStreamInfos.Where(e => e.ItemId == id).ExecuteDelete();
         context.AncestorIds.Where(e => e.ItemId == id).ExecuteDelete();
@@ -602,13 +603,13 @@ public sealed class BaseItemRepository(
         {
             baseQuery = baseQuery
                 .Where(e =>
-                    context.Peoples.Where(w => context.BaseItems.Where(r => filter.PersonIds.Contains(r.Id)).Any(f => f.Name == w.Name))
+                    context.PeopleBaseItemMap.Where(w => context.BaseItems.Where(r => filter.PersonIds.Contains(r.Id)).Any(f => f.Name == w.People.Name))
                         .Any(f => f.ItemId == e.Id));
         }
 
         if (!string.IsNullOrWhiteSpace(filter.Person))
         {
-            baseQuery = baseQuery.Where(e => e.Peoples!.Any(f => f.Name == filter.Person));
+            baseQuery = baseQuery.Where(e => e.Peoples!.Any(f => f.People.Name == filter.Person));
         }
 
         if (!string.IsNullOrWhiteSpace(filter.MinSortName))
@@ -934,7 +935,7 @@ public sealed class BaseItemRepository(
         if (filter.IsDeadPerson.HasValue && filter.IsDeadPerson.Value)
         {
             baseQuery = baseQuery
-                .Where(e => !e.Peoples!.Any(f => f.Name == e.Name));
+                .Where(e => !e.Peoples!.Any(f => f.People.Name == e.Name));
         }
 
         if (filter.Years.Length == 1)
diff --git a/Jellyfin.Server.Implementations/Item/PeopleRepository.cs b/Jellyfin.Server.Implementations/Item/PeopleRepository.cs
index 57f0503b9..dee87f48f 100644
--- a/Jellyfin.Server.Implementations/Item/PeopleRepository.cs
+++ b/Jellyfin.Server.Implementations/Item/PeopleRepository.cs
@@ -10,6 +10,7 @@ using MediaBrowser.Controller.Persistence;
 using Microsoft.EntityFrameworkCore;
 
 namespace Jellyfin.Server.Implementations.Item;
+#pragma warning disable RS0030 // Do not use banned APIs
 
 /// <summary>
 /// Manager for handling people.
@@ -28,7 +29,7 @@ public class PeopleRepository(IDbContextFactory<JellyfinDbContext> dbProvider) :
         using var context = _dbProvider.CreateDbContext();
         var dbQuery = TranslateQuery(context.Peoples.AsNoTracking(), context, filter);
 
-        dbQuery = dbQuery.OrderBy(e => e.ListOrder);
+        // dbQuery = dbQuery.OrderBy(e => e.ListOrder);
         if (filter.Limit > 0)
         {
             dbQuery = dbQuery.Take(filter.Limit);
@@ -43,7 +44,7 @@ public class PeopleRepository(IDbContextFactory<JellyfinDbContext> dbProvider) :
         using var context = _dbProvider.CreateDbContext();
         var dbQuery = TranslateQuery(context.Peoples.AsNoTracking(), context, filter);
 
-        dbQuery = dbQuery.OrderBy(e => e.ListOrder);
+        // dbQuery = dbQuery.OrderBy(e => e.ListOrder);
         if (filter.Limit > 0)
         {
             dbQuery = dbQuery.Take(filter.Limit);
@@ -58,7 +59,29 @@ public class PeopleRepository(IDbContextFactory<JellyfinDbContext> dbProvider) :
         using var context = _dbProvider.CreateDbContext();
         using var transaction = context.Database.BeginTransaction();
 
-        context.Peoples.Where(e => e.ItemId.Equals(itemId)).ExecuteDelete();
+        context.PeopleBaseItemMap.Where(e => e.ItemId == itemId).ExecuteDelete();
+        foreach (var item in people)
+        {
+            var personEntity = Map(item);
+            var existingEntity = context.Peoples.FirstOrDefault(e => e.Id == personEntity.Id);
+            if (existingEntity is null)
+            {
+                context.Peoples.Add(personEntity);
+                existingEntity = personEntity;
+            }
+
+            context.PeopleBaseItemMap.Add(new PeopleBaseItemMap()
+            {
+                Item = null!,
+                ItemId = itemId,
+                People = existingEntity,
+                PeopleId = existingEntity.Id,
+                ListOrder = item.SortOrder,
+                SortOrder = item.SortOrder,
+                Role = item.Role
+            });
+        }
+
         context.Peoples.AddRange(people.Select(Map));
         context.SaveChanges();
         transaction.Commit();
@@ -68,10 +91,8 @@ public class PeopleRepository(IDbContextFactory<JellyfinDbContext> dbProvider) :
     {
         var personInfo = new PersonInfo()
         {
-            ItemId = people.ItemId,
+            Id = people.Id,
             Name = people.Name,
-            Role = people.Role,
-            SortOrder = people.SortOrder,
         };
         if (Enum.TryParse<PersonKind>(people.PersonType, out var kind))
         {
@@ -85,13 +106,9 @@ public class PeopleRepository(IDbContextFactory<JellyfinDbContext> dbProvider) :
     {
         var personInfo = new People()
         {
-            ItemId = people.ItemId,
             Name = people.Name,
-            Role = people.Role,
-            SortOrder = people.SortOrder,
             PersonType = people.Type.ToString(),
-            Item = null!,
-            ListOrder = people.SortOrder
+            Id = people.Id,
         };
 
         return personInfo;
@@ -108,12 +125,12 @@ public class PeopleRepository(IDbContextFactory<JellyfinDbContext> dbProvider) :
 
         if (!filter.ItemId.IsEmpty())
         {
-            query = query.Where(e => e.ItemId.Equals(filter.ItemId));
+            query = query.Where(e => e.BaseItems!.Any(w => w.ItemId.Equals(filter.ItemId)));
         }
 
         if (!filter.AppearsInItemId.IsEmpty())
         {
-            query = query.Where(e => context.Peoples.Where(f => f.ItemId.Equals(filter.AppearsInItemId)).Select(e => e.Name).Contains(e.Name));
+            query = query.Where(e => e.BaseItems!.Any(w => w.ItemId.Equals(filter.AppearsInItemId)));
         }
 
         var queryPersonTypes = filter.PersonTypes.Where(IsValidPersonType).ToList();
@@ -129,9 +146,9 @@ public class PeopleRepository(IDbContextFactory<JellyfinDbContext> dbProvider) :
             query = query.Where(e => !queryPersonTypes.Contains(e.PersonType));
         }
 
-        if (filter.MaxListOrder.HasValue)
+        if (filter.MaxListOrder.HasValue && !filter.ItemId.IsEmpty())
         {
-            query = query.Where(e => e.ListOrder <= filter.MaxListOrder.Value);
+            query = query.Where(e => e.BaseItems!.First(w => w.ItemId == filter.ItemId).ListOrder <= filter.MaxListOrder.Value);
         }
 
         if (!string.IsNullOrWhiteSpace(filter.NameContains))
diff --git a/Jellyfin.Server.Implementations/JellyfinDbContext.cs b/Jellyfin.Server.Implementations/JellyfinDbContext.cs
index 284897c99..becfd81a4 100644
--- a/Jellyfin.Server.Implementations/JellyfinDbContext.cs
+++ b/Jellyfin.Server.Implementations/JellyfinDbContext.cs
@@ -112,7 +112,7 @@ public class JellyfinDbContext(DbContextOptions<JellyfinDbContext> options, ILog
     public DbSet<Chapter> Chapters => Set<Chapter>();
 
     /// <summary>
-    /// Gets the <see cref="DbSet{TEntity}"/> containing the user data.
+    /// Gets the <see cref="DbSet{TEntity}"/>.
     /// </summary>
     public DbSet<ItemValue> ItemValues => Set<ItemValue>();
 
@@ -122,15 +122,20 @@ public class JellyfinDbContext(DbContextOptions<JellyfinDbContext> options, ILog
     public DbSet<ItemValueMap> ItemValuesMap => Set<ItemValueMap>();
 
     /// <summary>
-    /// Gets the <see cref="DbSet{TEntity}"/> containing the user data.
+    /// Gets the <see cref="DbSet{TEntity}"/>.
     /// </summary>
     public DbSet<MediaStreamInfo> MediaStreamInfos => Set<MediaStreamInfo>();
 
     /// <summary>
-    /// Gets the <see cref="DbSet{TEntity}"/> containing the user data.
+    /// Gets the <see cref="DbSet{TEntity}"/>.
     /// </summary>
     public DbSet<People> Peoples => Set<People>();
 
+    /// <summary>
+    /// Gets the <see cref="DbSet{TEntity}"/>.
+    /// </summary>
+    public DbSet<PeopleBaseItemMap> PeopleBaseItemMap => Set<PeopleBaseItemMap>();
+
     /// <summary>
     /// Gets the <see cref="DbSet{TEntity}"/> containing the referenced Providers with ids.
     /// </summary>
diff --git a/Jellyfin.Server.Implementations/Migrations/20241011095125_LibraryPeopleMigration.Designer.cs b/Jellyfin.Server.Implementations/Migrations/20241011095125_LibraryPeopleMigration.Designer.cs
new file mode 100644
index 000000000..9e33b8eff
--- /dev/null
+++ b/Jellyfin.Server.Implementations/Migrations/20241011095125_LibraryPeopleMigration.Designer.cs
@@ -0,0 +1,1613 @@
+// <auto-generated />
+using System;
+using Jellyfin.Server.Implementations;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+
+#nullable disable
+
+namespace Jellyfin.Server.Implementations.Migrations
+{
+    [DbContext(typeof(JellyfinDbContext))]
+    [Migration("20241011095125_LibraryPeopleMigration")]
+    partial class LibraryPeopleMigration
+    {
+        /// <inheritdoc />
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder.HasAnnotation("ProductVersion", "8.0.10");
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.AccessSchedule", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("DayOfWeek")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<double>("EndHour")
+                        .HasColumnType("REAL");
+
+                    b.Property<double>("StartHour")
+                        .HasColumnType("REAL");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("UserId");
+
+                    b.ToTable("AccessSchedules");
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.ActivityLog", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<DateTime>("DateCreated")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("ItemId")
+                        .HasMaxLength(256)
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("LogSeverity")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasMaxLength(512)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Overview")
+                        .HasMaxLength(512)
+                        .HasColumnType("TEXT");
+
+                    b.Property<uint>("RowVersion")
+                        .IsConcurrencyToken()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("ShortOverview")
+                        .HasMaxLength(512)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Type")
+                        .IsRequired()
+                        .HasMaxLength(256)
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("DateCreated");
+
+                    b.ToTable("ActivityLogs");
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.AncestorId", b =>
+                {
+                    b.Property<Guid>("ItemId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("ParentItemId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid?>("BaseItemEntityId")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("ItemId", "ParentItemId");
+
+                    b.HasIndex("BaseItemEntityId");
+
+                    b.HasIndex("ParentItemId");
+
+                    b.ToTable("AncestorIds");
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.AttachmentStreamInfo", b =>
+                {
+                    b.Property<Guid>("ItemId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("Index")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Codec")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("CodecTag")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Comment")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Filename")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("MimeType")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("ItemId", "Index");
+
+                    b.ToTable("AttachmentStreamInfos");
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.BaseItemEntity", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Album")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("AlbumArtists")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Artists")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int?>("Audio")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("ChannelId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("CleanName")
+                        .HasColumnType("TEXT");
+
+                    b.Property<float?>("CommunityRating")
+                        .HasColumnType("REAL");
+
+                    b.Property<float?>("CriticRating")
+                        .HasColumnType("REAL");
+
+                    b.Property<string>("CustomRating")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Data")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("DateCreated")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("DateLastMediaAdded")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("DateLastRefreshed")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("DateLastSaved")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("DateModified")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("EndDate")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("EpisodeTitle")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("ExternalId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("ExternalSeriesId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("ExternalServiceId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("ExtraIds")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int?>("ExtraType")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("ForcedSortName")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Genres")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int?>("Height")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int?>("IndexNumber")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int?>("InheritedParentalRatingValue")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("IsFolder")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("IsInMixedFolder")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("IsLocked")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("IsMovie")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("IsRepeat")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("IsSeries")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("IsVirtualItem")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<float?>("LUFS")
+                        .HasColumnType("REAL");
+
+                    b.Property<string>("MediaType")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("TEXT");
+
+                    b.Property<float?>("NormalizationGain")
+                        .HasColumnType("REAL");
+
+                    b.Property<string>("OfficialRating")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("OriginalTitle")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Overview")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("OwnerId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid?>("ParentId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int?>("ParentIndexNumber")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Path")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("PreferredMetadataCountryCode")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("PreferredMetadataLanguage")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("PremiereDate")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("PresentationUniqueKey")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("PrimaryVersionId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("ProductionLocations")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int?>("ProductionYear")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<long?>("RunTimeTicks")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<Guid?>("SeasonId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("SeasonName")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid?>("SeriesId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("SeriesName")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("SeriesPresentationUniqueKey")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("ShowId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<long?>("Size")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("SortName")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("StartDate")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Studios")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Tagline")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Tags")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid?>("TopParentId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int?>("TotalBitrate")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Type")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("UnratedType")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("UserDataKey")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int?>("Width")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ParentId");
+
+                    b.HasIndex("Path");
+
+                    b.HasIndex("PresentationUniqueKey");
+
+                    b.HasIndex("TopParentId", "Id");
+
+                    b.HasIndex("UserDataKey", "Type");
+
+                    b.HasIndex("Type", "TopParentId", "Id");
+
+                    b.HasIndex("Type", "TopParentId", "PresentationUniqueKey");
+
+                    b.HasIndex("Type", "TopParentId", "StartDate");
+
+                    b.HasIndex("Id", "Type", "IsFolder", "IsVirtualItem");
+
+                    b.HasIndex("MediaType", "TopParentId", "IsVirtualItem", "PresentationUniqueKey");
+
+                    b.HasIndex("Type", "SeriesPresentationUniqueKey", "IsFolder", "IsVirtualItem");
+
+                    b.HasIndex("Type", "SeriesPresentationUniqueKey", "PresentationUniqueKey", "SortName");
+
+                    b.HasIndex("IsFolder", "TopParentId", "IsVirtualItem", "PresentationUniqueKey", "DateCreated");
+
+                    b.HasIndex("Type", "TopParentId", "IsVirtualItem", "PresentationUniqueKey", "DateCreated");
+
+                    b.ToTable("BaseItems");
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.BaseItemImageInfo", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("TEXT");
+
+                    b.Property<byte[]>("Blurhash")
+                        .HasColumnType("BLOB");
+
+                    b.Property<DateTime>("DateModified")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("Height")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("ImageType")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<Guid>("ItemId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Path")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("Width")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ItemId");
+
+                    b.ToTable("BaseItemImageInfos");
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.BaseItemMetadataField", b =>
+                {
+                    b.Property<int>("Id")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<Guid>("ItemId")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id", "ItemId");
+
+                    b.HasIndex("ItemId");
+
+                    b.ToTable("BaseItemMetadataFields");
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.BaseItemProvider", b =>
+                {
+                    b.Property<Guid>("ItemId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("ProviderId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("ProviderValue")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("ItemId", "ProviderId");
+
+                    b.HasIndex("ProviderId", "ProviderValue", "ItemId");
+
+                    b.ToTable("BaseItemProviders");
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.BaseItemTrailerType", b =>
+                {
+                    b.Property<int>("Id")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<Guid>("ItemId")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id", "ItemId");
+
+                    b.HasIndex("ItemId");
+
+                    b.ToTable("BaseItemTrailerTypes");
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.Chapter", b =>
+                {
+                    b.Property<Guid>("ItemId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("ChapterIndex")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<DateTime?>("ImageDateModified")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("ImagePath")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("TEXT");
+
+                    b.Property<long>("StartPositionTicks")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("ItemId", "ChapterIndex");
+
+                    b.ToTable("Chapters");
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.CustomItemDisplayPreferences", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Client")
+                        .IsRequired()
+                        .HasMaxLength(32)
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("ItemId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Key")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Value")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("UserId", "ItemId", "Client", "Key")
+                        .IsUnique();
+
+                    b.ToTable("CustomItemDisplayPreferences");
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.DisplayPreferences", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("ChromecastVersion")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Client")
+                        .IsRequired()
+                        .HasMaxLength(32)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("DashboardTheme")
+                        .HasMaxLength(32)
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("EnableNextVideoInfoOverlay")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int?>("IndexBy")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<Guid>("ItemId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("ScrollDirection")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("ShowBackdrop")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("ShowSidebar")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("SkipBackwardLength")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("SkipForwardLength")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("TvHome")
+                        .HasMaxLength(32)
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("UserId", "ItemId", "Client")
+                        .IsUnique();
+
+                    b.ToTable("DisplayPreferences");
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.HomeSection", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("DisplayPreferencesId")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("Order")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("Type")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("DisplayPreferencesId");
+
+                    b.ToTable("HomeSection");
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.ImageInfo", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<DateTime>("LastModified")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Path")
+                        .IsRequired()
+                        .HasMaxLength(512)
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid?>("UserId")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("UserId")
+                        .IsUnique();
+
+                    b.ToTable("ImageInfos");
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.ItemDisplayPreferences", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Client")
+                        .IsRequired()
+                        .HasMaxLength(32)
+                        .HasColumnType("TEXT");
+
+                    b.Property<int?>("IndexBy")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<Guid>("ItemId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("RememberIndexing")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("RememberSorting")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("SortBy")
+                        .IsRequired()
+                        .HasMaxLength(64)
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("SortOrder")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("ViewType")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("UserId");
+
+                    b.ToTable("ItemDisplayPreferences");
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.ItemValue", b =>
+                {
+                    b.Property<Guid>("ItemValueId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("CleanValue")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("Type")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Value")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("ItemValueId");
+
+                    b.HasIndex("Type", "CleanValue");
+
+                    b.ToTable("ItemValues");
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.ItemValueMap", b =>
+                {
+                    b.Property<Guid>("ItemValueId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("ItemId")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("ItemValueId", "ItemId");
+
+                    b.HasIndex("ItemId");
+
+                    b.ToTable("ItemValuesMap");
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.MediaSegment", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("TEXT");
+
+                    b.Property<long>("EndTicks")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<Guid>("ItemId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("SegmentProviderId")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<long>("StartTicks")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("Type")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("MediaSegments");
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.MediaStreamInfo", b =>
+                {
+                    b.Property<Guid>("ItemId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("StreamIndex")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("AspectRatio")
+                        .HasColumnType("TEXT");
+
+                    b.Property<float>("AverageFrameRate")
+                        .HasColumnType("REAL");
+
+                    b.Property<int>("BitDepth")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("BitRate")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("BlPresentFlag")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("ChannelLayout")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("Channels")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Codec")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("CodecTag")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("CodecTimeBase")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("ColorPrimaries")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("ColorSpace")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("ColorTransfer")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Comment")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("DvBlSignalCompatibilityId")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("DvLevel")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("DvProfile")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("DvVersionMajor")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("DvVersionMinor")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("ElPresentFlag")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("Height")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("IsAnamorphic")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("IsAvc")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("IsDefault")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("IsExternal")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("IsForced")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("IsHearingImpaired")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("IsInterlaced")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("KeyFrames")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Language")
+                        .HasColumnType("TEXT");
+
+                    b.Property<float>("Level")
+                        .HasColumnType("REAL");
+
+                    b.Property<string>("NalLengthSize")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Path")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("PixelFormat")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Profile")
+                        .HasColumnType("TEXT");
+
+                    b.Property<float>("RealFrameRate")
+                        .HasColumnType("REAL");
+
+                    b.Property<int>("RefFrames")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("Rotation")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("RpuPresentFlag")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("SampleRate")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int?>("StreamType")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("TimeBase")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Title")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("Width")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("ItemId", "StreamIndex");
+
+                    b.HasIndex("StreamIndex");
+
+                    b.HasIndex("StreamType");
+
+                    b.HasIndex("StreamIndex", "StreamType");
+
+                    b.HasIndex("StreamIndex", "StreamType", "Language");
+
+                    b.ToTable("MediaStreamInfos");
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.People", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("PersonType")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Role")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("Name");
+
+                    b.ToTable("Peoples");
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.PeopleBaseItemMap", b =>
+                {
+                    b.Property<Guid>("ItemId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("PeopleId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int?>("ListOrder")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int?>("SortOrder")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("ItemId", "PeopleId");
+
+                    b.HasIndex("PeopleId");
+
+                    b.HasIndex("ItemId", "ListOrder");
+
+                    b.HasIndex("ItemId", "SortOrder");
+
+                    b.ToTable("PeopleBaseItemMap");
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.Permission", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("Kind")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<Guid?>("Permission_Permissions_Guid")
+                        .HasColumnType("TEXT");
+
+                    b.Property<uint>("RowVersion")
+                        .IsConcurrencyToken()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<Guid?>("UserId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("Value")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("UserId", "Kind")
+                        .IsUnique()
+                        .HasFilter("[UserId] IS NOT NULL");
+
+                    b.ToTable("Permissions");
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.Preference", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("Kind")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<Guid?>("Preference_Preferences_Guid")
+                        .HasColumnType("TEXT");
+
+                    b.Property<uint>("RowVersion")
+                        .IsConcurrencyToken()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<Guid?>("UserId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Value")
+                        .IsRequired()
+                        .HasMaxLength(65535)
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("UserId", "Kind")
+                        .IsUnique()
+                        .HasFilter("[UserId] IS NOT NULL");
+
+                    b.ToTable("Preferences");
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.Security.ApiKey", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("AccessToken")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("DateCreated")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("DateLastActivity")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasMaxLength(64)
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("AccessToken")
+                        .IsUnique();
+
+                    b.ToTable("ApiKeys");
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.Security.Device", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("AccessToken")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("AppName")
+                        .IsRequired()
+                        .HasMaxLength(64)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("AppVersion")
+                        .IsRequired()
+                        .HasMaxLength(32)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("DateCreated")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("DateLastActivity")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("DateModified")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("DeviceId")
+                        .IsRequired()
+                        .HasMaxLength(256)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("DeviceName")
+                        .IsRequired()
+                        .HasMaxLength(64)
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("IsActive")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("DeviceId");
+
+                    b.HasIndex("AccessToken", "DateLastActivity");
+
+                    b.HasIndex("DeviceId", "DateLastActivity");
+
+                    b.HasIndex("UserId", "DeviceId");
+
+                    b.ToTable("Devices");
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.Security.DeviceOptions", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("CustomName")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("DeviceId")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("DeviceId")
+                        .IsUnique();
+
+                    b.ToTable("DeviceOptions");
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.TrickplayInfo", b =>
+                {
+                    b.Property<Guid>("ItemId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("Width")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("Bandwidth")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("Height")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("Interval")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("ThumbnailCount")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("TileHeight")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("TileWidth")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("ItemId", "Width");
+
+                    b.ToTable("TrickplayInfos");
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.User", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("AudioLanguagePreference")
+                        .HasMaxLength(255)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("AuthenticationProviderId")
+                        .IsRequired()
+                        .HasMaxLength(255)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("CastReceiverId")
+                        .HasMaxLength(32)
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("DisplayCollectionsView")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("DisplayMissingEpisodes")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("EnableAutoLogin")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("EnableLocalPassword")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("EnableNextEpisodeAutoPlay")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("EnableUserPreferenceAccess")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("HidePlayedInLatest")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<long>("InternalId")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("InvalidLoginAttemptCount")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<DateTime?>("LastActivityDate")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("LastLoginDate")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int?>("LoginAttemptsBeforeLockout")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("MaxActiveSessions")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int?>("MaxParentalAgeRating")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("MustUpdatePassword")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Password")
+                        .HasMaxLength(65535)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("PasswordResetProviderId")
+                        .IsRequired()
+                        .HasMaxLength(255)
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("PlayDefaultAudioTrack")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("RememberAudioSelections")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("RememberSubtitleSelections")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int?>("RemoteClientBitrateLimit")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<uint>("RowVersion")
+                        .IsConcurrencyToken()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("SubtitleLanguagePreference")
+                        .HasMaxLength(255)
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("SubtitleMode")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("SyncPlayAccess")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Username")
+                        .IsRequired()
+                        .HasMaxLength(255)
+                        .HasColumnType("TEXT")
+                        .UseCollation("NOCASE");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("Username")
+                        .IsUnique();
+
+                    b.ToTable("Users");
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.UserData", b =>
+                {
+                    b.Property<string>("Key")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int?>("AudioStreamIndex")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<Guid?>("BaseItemEntityId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("IsFavorite")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<DateTime?>("LastPlayedDate")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool?>("Likes")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("PlayCount")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<long>("PlaybackPositionTicks")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("Played")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<double?>("Rating")
+                        .HasColumnType("REAL");
+
+                    b.Property<int?>("SubtitleStreamIndex")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("Key", "UserId");
+
+                    b.HasIndex("BaseItemEntityId");
+
+                    b.HasIndex("UserId");
+
+                    b.HasIndex("Key", "UserId", "IsFavorite");
+
+                    b.HasIndex("Key", "UserId", "LastPlayedDate");
+
+                    b.HasIndex("Key", "UserId", "PlaybackPositionTicks");
+
+                    b.HasIndex("Key", "UserId", "Played");
+
+                    b.ToTable("UserData");
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.AccessSchedule", b =>
+                {
+                    b.HasOne("Jellyfin.Data.Entities.User", null)
+                        .WithMany("AccessSchedules")
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.AncestorId", b =>
+                {
+                    b.HasOne("Jellyfin.Data.Entities.BaseItemEntity", null)
+                        .WithMany("AncestorIds")
+                        .HasForeignKey("BaseItemEntityId");
+
+                    b.HasOne("Jellyfin.Data.Entities.BaseItemEntity", "Item")
+                        .WithMany()
+                        .HasForeignKey("ItemId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Jellyfin.Data.Entities.BaseItemEntity", "ParentItem")
+                        .WithMany()
+                        .HasForeignKey("ParentItemId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Item");
+
+                    b.Navigation("ParentItem");
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.AttachmentStreamInfo", b =>
+                {
+                    b.HasOne("Jellyfin.Data.Entities.BaseItemEntity", "Item")
+                        .WithMany()
+                        .HasForeignKey("ItemId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Item");
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.BaseItemImageInfo", b =>
+                {
+                    b.HasOne("Jellyfin.Data.Entities.BaseItemEntity", "Item")
+                        .WithMany("Images")
+                        .HasForeignKey("ItemId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Item");
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.BaseItemMetadataField", b =>
+                {
+                    b.HasOne("Jellyfin.Data.Entities.BaseItemEntity", "Item")
+                        .WithMany("LockedFields")
+                        .HasForeignKey("ItemId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Item");
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.BaseItemProvider", b =>
+                {
+                    b.HasOne("Jellyfin.Data.Entities.BaseItemEntity", "Item")
+                        .WithMany("Provider")
+                        .HasForeignKey("ItemId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Item");
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.BaseItemTrailerType", b =>
+                {
+                    b.HasOne("Jellyfin.Data.Entities.BaseItemEntity", "Item")
+                        .WithMany("TrailerTypes")
+                        .HasForeignKey("ItemId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Item");
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.Chapter", b =>
+                {
+                    b.HasOne("Jellyfin.Data.Entities.BaseItemEntity", "Item")
+                        .WithMany("Chapters")
+                        .HasForeignKey("ItemId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Item");
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.DisplayPreferences", b =>
+                {
+                    b.HasOne("Jellyfin.Data.Entities.User", null)
+                        .WithMany("DisplayPreferences")
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.HomeSection", b =>
+                {
+                    b.HasOne("Jellyfin.Data.Entities.DisplayPreferences", null)
+                        .WithMany("HomeSections")
+                        .HasForeignKey("DisplayPreferencesId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.ImageInfo", b =>
+                {
+                    b.HasOne("Jellyfin.Data.Entities.User", null)
+                        .WithOne("ProfileImage")
+                        .HasForeignKey("Jellyfin.Data.Entities.ImageInfo", "UserId")
+                        .OnDelete(DeleteBehavior.Cascade);
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.ItemDisplayPreferences", b =>
+                {
+                    b.HasOne("Jellyfin.Data.Entities.User", null)
+                        .WithMany("ItemDisplayPreferences")
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.ItemValueMap", b =>
+                {
+                    b.HasOne("Jellyfin.Data.Entities.BaseItemEntity", "Item")
+                        .WithMany("ItemValues")
+                        .HasForeignKey("ItemId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Jellyfin.Data.Entities.ItemValue", "ItemValue")
+                        .WithMany("BaseItemsMap")
+                        .HasForeignKey("ItemValueId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Item");
+
+                    b.Navigation("ItemValue");
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.MediaStreamInfo", b =>
+                {
+                    b.HasOne("Jellyfin.Data.Entities.BaseItemEntity", "Item")
+                        .WithMany("MediaStreams")
+                        .HasForeignKey("ItemId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Item");
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.PeopleBaseItemMap", b =>
+                {
+                    b.HasOne("Jellyfin.Data.Entities.BaseItemEntity", "Item")
+                        .WithMany("Peoples")
+                        .HasForeignKey("ItemId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Jellyfin.Data.Entities.People", "People")
+                        .WithMany("BaseItems")
+                        .HasForeignKey("PeopleId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Item");
+
+                    b.Navigation("People");
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.Permission", b =>
+                {
+                    b.HasOne("Jellyfin.Data.Entities.User", null)
+                        .WithMany("Permissions")
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade);
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.Preference", b =>
+                {
+                    b.HasOne("Jellyfin.Data.Entities.User", null)
+                        .WithMany("Preferences")
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade);
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.Security.Device", b =>
+                {
+                    b.HasOne("Jellyfin.Data.Entities.User", "User")
+                        .WithMany()
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("User");
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.UserData", b =>
+                {
+                    b.HasOne("Jellyfin.Data.Entities.BaseItemEntity", null)
+                        .WithMany("UserData")
+                        .HasForeignKey("BaseItemEntityId");
+
+                    b.HasOne("Jellyfin.Data.Entities.User", "User")
+                        .WithMany()
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("User");
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.BaseItemEntity", b =>
+                {
+                    b.Navigation("AncestorIds");
+
+                    b.Navigation("Chapters");
+
+                    b.Navigation("Images");
+
+                    b.Navigation("ItemValues");
+
+                    b.Navigation("LockedFields");
+
+                    b.Navigation("MediaStreams");
+
+                    b.Navigation("Peoples");
+
+                    b.Navigation("Provider");
+
+                    b.Navigation("TrailerTypes");
+
+                    b.Navigation("UserData");
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.DisplayPreferences", b =>
+                {
+                    b.Navigation("HomeSections");
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.ItemValue", b =>
+                {
+                    b.Navigation("BaseItemsMap");
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.People", b =>
+                {
+                    b.Navigation("BaseItems");
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.User", b =>
+                {
+                    b.Navigation("AccessSchedules");
+
+                    b.Navigation("DisplayPreferences");
+
+                    b.Navigation("ItemDisplayPreferences");
+
+                    b.Navigation("Permissions");
+
+                    b.Navigation("Preferences");
+
+                    b.Navigation("ProfileImage");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}
diff --git a/Jellyfin.Server.Implementations/Migrations/20241011095125_LibraryPeopleMigration.cs b/Jellyfin.Server.Implementations/Migrations/20241011095125_LibraryPeopleMigration.cs
new file mode 100644
index 000000000..2541260c9
--- /dev/null
+++ b/Jellyfin.Server.Implementations/Migrations/20241011095125_LibraryPeopleMigration.cs
@@ -0,0 +1,152 @@
+using System;
+using System.Runtime.CompilerServices;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Jellyfin.Server.Implementations.Migrations
+{
+    /// <inheritdoc />
+    public partial class LibraryPeopleMigration : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropForeignKey(
+                name: "FK_Peoples_BaseItems_ItemId",
+                table: "Peoples");
+
+            migrationBuilder.DropPrimaryKey(
+                name: "PK_Peoples",
+                table: "Peoples");
+
+            migrationBuilder.DropIndex(
+                name: "IX_Peoples_ItemId_ListOrder",
+                table: "Peoples");
+
+            migrationBuilder.DropColumn(
+                name: "ListOrder",
+                table: "Peoples");
+
+            migrationBuilder.DropColumn(
+                name: "SortOrder",
+                table: "Peoples");
+
+            migrationBuilder.RenameColumn(
+                name: "ItemId",
+                table: "Peoples",
+                newName: "Id");
+
+            migrationBuilder.AlterColumn<string>(
+                name: "Role",
+                table: "Peoples",
+                type: "TEXT",
+                nullable: true,
+                oldClrType: typeof(string),
+                oldType: "TEXT");
+
+            migrationBuilder.AddPrimaryKey(
+                name: "PK_Peoples",
+                table: "Peoples",
+                column: "Id");
+
+            migrationBuilder.CreateTable(
+                name: "PeopleBaseItemMap",
+                columns: table => new
+                {
+                    ItemId = table.Column<Guid>(type: "TEXT", nullable: false),
+                    PeopleId = table.Column<Guid>(type: "TEXT", nullable: false),
+                    SortOrder = table.Column<int>(type: "INTEGER", nullable: true),
+                    ListOrder = table.Column<int>(type: "INTEGER", nullable: true)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_PeopleBaseItemMap", x => new { x.ItemId, x.PeopleId });
+                    table.ForeignKey(
+                        name: "FK_PeopleBaseItemMap_BaseItems_ItemId",
+                        column: x => x.ItemId,
+                        principalTable: "BaseItems",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Cascade);
+                    table.ForeignKey(
+                        name: "FK_PeopleBaseItemMap_Peoples_PeopleId",
+                        column: x => x.PeopleId,
+                        principalTable: "Peoples",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Cascade);
+                });
+
+            migrationBuilder.CreateIndex(
+                name: "IX_PeopleBaseItemMap_ItemId_ListOrder",
+                table: "PeopleBaseItemMap",
+                columns: new[] { "ItemId", "ListOrder" });
+
+            migrationBuilder.CreateIndex(
+                name: "IX_PeopleBaseItemMap_ItemId_SortOrder",
+                table: "PeopleBaseItemMap",
+                columns: new[] { "ItemId", "SortOrder" });
+
+            migrationBuilder.CreateIndex(
+                name: "IX_PeopleBaseItemMap_PeopleId",
+                table: "PeopleBaseItemMap",
+                column: "PeopleId");
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropTable(
+                name: "PeopleBaseItemMap");
+
+            migrationBuilder.DropPrimaryKey(
+                name: "PK_Peoples",
+                table: "Peoples");
+
+            migrationBuilder.RenameColumn(
+                name: "Id",
+                table: "Peoples",
+                newName: "ItemId");
+
+            migrationBuilder.AlterColumn<string>(
+                name: "Role",
+                table: "Peoples",
+                type: "TEXT",
+                nullable: false,
+                defaultValue: string.Empty,
+                oldClrType: typeof(string),
+                oldType: "TEXT",
+                oldNullable: true);
+
+            migrationBuilder.AddColumn<int>(
+                name: "ListOrder",
+                table: "Peoples",
+                type: "INTEGER",
+                nullable: false,
+                defaultValue: 0);
+
+            migrationBuilder.AddColumn<int>(
+                name: "SortOrder",
+                table: "Peoples",
+                type: "INTEGER",
+                nullable: true);
+
+            migrationBuilder.AddPrimaryKey(
+                name: "PK_Peoples",
+                table: "Peoples",
+                columns: new[] { "ItemId", "Role", "ListOrder" });
+
+            migrationBuilder.CreateIndex(
+                name: "IX_Peoples_ItemId_ListOrder",
+                table: "Peoples",
+                columns: new[] { "ItemId", "ListOrder" });
+
+            migrationBuilder.AddForeignKey(
+                name: "FK_Peoples_BaseItems_ItemId",
+                table: "Peoples",
+                column: "ItemId",
+                principalTable: "BaseItems",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Cascade);
+        }
+    }
+}
diff --git a/Jellyfin.Server.Implementations/Migrations/20241011100757_LibraryPeopleRoleMigration.Designer.cs b/Jellyfin.Server.Implementations/Migrations/20241011100757_LibraryPeopleRoleMigration.Designer.cs
new file mode 100644
index 000000000..7a754d78d
--- /dev/null
+++ b/Jellyfin.Server.Implementations/Migrations/20241011100757_LibraryPeopleRoleMigration.Designer.cs
@@ -0,0 +1,1613 @@
+// <auto-generated />
+using System;
+using Jellyfin.Server.Implementations;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+
+#nullable disable
+
+namespace Jellyfin.Server.Implementations.Migrations
+{
+    [DbContext(typeof(JellyfinDbContext))]
+    [Migration("20241011100757_LibraryPeopleRoleMigration")]
+    partial class LibraryPeopleRoleMigration
+    {
+        /// <inheritdoc />
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder.HasAnnotation("ProductVersion", "8.0.10");
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.AccessSchedule", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("DayOfWeek")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<double>("EndHour")
+                        .HasColumnType("REAL");
+
+                    b.Property<double>("StartHour")
+                        .HasColumnType("REAL");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("UserId");
+
+                    b.ToTable("AccessSchedules");
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.ActivityLog", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<DateTime>("DateCreated")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("ItemId")
+                        .HasMaxLength(256)
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("LogSeverity")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasMaxLength(512)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Overview")
+                        .HasMaxLength(512)
+                        .HasColumnType("TEXT");
+
+                    b.Property<uint>("RowVersion")
+                        .IsConcurrencyToken()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("ShortOverview")
+                        .HasMaxLength(512)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Type")
+                        .IsRequired()
+                        .HasMaxLength(256)
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("DateCreated");
+
+                    b.ToTable("ActivityLogs");
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.AncestorId", b =>
+                {
+                    b.Property<Guid>("ItemId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("ParentItemId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid?>("BaseItemEntityId")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("ItemId", "ParentItemId");
+
+                    b.HasIndex("BaseItemEntityId");
+
+                    b.HasIndex("ParentItemId");
+
+                    b.ToTable("AncestorIds");
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.AttachmentStreamInfo", b =>
+                {
+                    b.Property<Guid>("ItemId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("Index")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Codec")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("CodecTag")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Comment")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Filename")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("MimeType")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("ItemId", "Index");
+
+                    b.ToTable("AttachmentStreamInfos");
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.BaseItemEntity", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Album")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("AlbumArtists")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Artists")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int?>("Audio")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("ChannelId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("CleanName")
+                        .HasColumnType("TEXT");
+
+                    b.Property<float?>("CommunityRating")
+                        .HasColumnType("REAL");
+
+                    b.Property<float?>("CriticRating")
+                        .HasColumnType("REAL");
+
+                    b.Property<string>("CustomRating")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Data")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("DateCreated")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("DateLastMediaAdded")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("DateLastRefreshed")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("DateLastSaved")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("DateModified")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("EndDate")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("EpisodeTitle")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("ExternalId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("ExternalSeriesId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("ExternalServiceId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("ExtraIds")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int?>("ExtraType")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("ForcedSortName")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Genres")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int?>("Height")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int?>("IndexNumber")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int?>("InheritedParentalRatingValue")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("IsFolder")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("IsInMixedFolder")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("IsLocked")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("IsMovie")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("IsRepeat")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("IsSeries")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("IsVirtualItem")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<float?>("LUFS")
+                        .HasColumnType("REAL");
+
+                    b.Property<string>("MediaType")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("TEXT");
+
+                    b.Property<float?>("NormalizationGain")
+                        .HasColumnType("REAL");
+
+                    b.Property<string>("OfficialRating")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("OriginalTitle")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Overview")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("OwnerId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid?>("ParentId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int?>("ParentIndexNumber")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Path")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("PreferredMetadataCountryCode")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("PreferredMetadataLanguage")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("PremiereDate")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("PresentationUniqueKey")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("PrimaryVersionId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("ProductionLocations")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int?>("ProductionYear")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<long?>("RunTimeTicks")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<Guid?>("SeasonId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("SeasonName")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid?>("SeriesId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("SeriesName")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("SeriesPresentationUniqueKey")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("ShowId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<long?>("Size")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("SortName")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("StartDate")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Studios")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Tagline")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Tags")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid?>("TopParentId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int?>("TotalBitrate")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Type")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("UnratedType")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("UserDataKey")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int?>("Width")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ParentId");
+
+                    b.HasIndex("Path");
+
+                    b.HasIndex("PresentationUniqueKey");
+
+                    b.HasIndex("TopParentId", "Id");
+
+                    b.HasIndex("UserDataKey", "Type");
+
+                    b.HasIndex("Type", "TopParentId", "Id");
+
+                    b.HasIndex("Type", "TopParentId", "PresentationUniqueKey");
+
+                    b.HasIndex("Type", "TopParentId", "StartDate");
+
+                    b.HasIndex("Id", "Type", "IsFolder", "IsVirtualItem");
+
+                    b.HasIndex("MediaType", "TopParentId", "IsVirtualItem", "PresentationUniqueKey");
+
+                    b.HasIndex("Type", "SeriesPresentationUniqueKey", "IsFolder", "IsVirtualItem");
+
+                    b.HasIndex("Type", "SeriesPresentationUniqueKey", "PresentationUniqueKey", "SortName");
+
+                    b.HasIndex("IsFolder", "TopParentId", "IsVirtualItem", "PresentationUniqueKey", "DateCreated");
+
+                    b.HasIndex("Type", "TopParentId", "IsVirtualItem", "PresentationUniqueKey", "DateCreated");
+
+                    b.ToTable("BaseItems");
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.BaseItemImageInfo", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("TEXT");
+
+                    b.Property<byte[]>("Blurhash")
+                        .HasColumnType("BLOB");
+
+                    b.Property<DateTime>("DateModified")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("Height")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("ImageType")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<Guid>("ItemId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Path")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("Width")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ItemId");
+
+                    b.ToTable("BaseItemImageInfos");
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.BaseItemMetadataField", b =>
+                {
+                    b.Property<int>("Id")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<Guid>("ItemId")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id", "ItemId");
+
+                    b.HasIndex("ItemId");
+
+                    b.ToTable("BaseItemMetadataFields");
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.BaseItemProvider", b =>
+                {
+                    b.Property<Guid>("ItemId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("ProviderId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("ProviderValue")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("ItemId", "ProviderId");
+
+                    b.HasIndex("ProviderId", "ProviderValue", "ItemId");
+
+                    b.ToTable("BaseItemProviders");
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.BaseItemTrailerType", b =>
+                {
+                    b.Property<int>("Id")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<Guid>("ItemId")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id", "ItemId");
+
+                    b.HasIndex("ItemId");
+
+                    b.ToTable("BaseItemTrailerTypes");
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.Chapter", b =>
+                {
+                    b.Property<Guid>("ItemId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("ChapterIndex")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<DateTime?>("ImageDateModified")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("ImagePath")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("TEXT");
+
+                    b.Property<long>("StartPositionTicks")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("ItemId", "ChapterIndex");
+
+                    b.ToTable("Chapters");
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.CustomItemDisplayPreferences", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Client")
+                        .IsRequired()
+                        .HasMaxLength(32)
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("ItemId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Key")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Value")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("UserId", "ItemId", "Client", "Key")
+                        .IsUnique();
+
+                    b.ToTable("CustomItemDisplayPreferences");
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.DisplayPreferences", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("ChromecastVersion")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Client")
+                        .IsRequired()
+                        .HasMaxLength(32)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("DashboardTheme")
+                        .HasMaxLength(32)
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("EnableNextVideoInfoOverlay")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int?>("IndexBy")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<Guid>("ItemId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("ScrollDirection")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("ShowBackdrop")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("ShowSidebar")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("SkipBackwardLength")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("SkipForwardLength")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("TvHome")
+                        .HasMaxLength(32)
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("UserId", "ItemId", "Client")
+                        .IsUnique();
+
+                    b.ToTable("DisplayPreferences");
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.HomeSection", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("DisplayPreferencesId")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("Order")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("Type")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("DisplayPreferencesId");
+
+                    b.ToTable("HomeSection");
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.ImageInfo", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<DateTime>("LastModified")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Path")
+                        .IsRequired()
+                        .HasMaxLength(512)
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid?>("UserId")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("UserId")
+                        .IsUnique();
+
+                    b.ToTable("ImageInfos");
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.ItemDisplayPreferences", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Client")
+                        .IsRequired()
+                        .HasMaxLength(32)
+                        .HasColumnType("TEXT");
+
+                    b.Property<int?>("IndexBy")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<Guid>("ItemId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("RememberIndexing")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("RememberSorting")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("SortBy")
+                        .IsRequired()
+                        .HasMaxLength(64)
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("SortOrder")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("ViewType")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("UserId");
+
+                    b.ToTable("ItemDisplayPreferences");
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.ItemValue", b =>
+                {
+                    b.Property<Guid>("ItemValueId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("CleanValue")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("Type")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Value")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("ItemValueId");
+
+                    b.HasIndex("Type", "CleanValue");
+
+                    b.ToTable("ItemValues");
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.ItemValueMap", b =>
+                {
+                    b.Property<Guid>("ItemValueId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("ItemId")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("ItemValueId", "ItemId");
+
+                    b.HasIndex("ItemId");
+
+                    b.ToTable("ItemValuesMap");
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.MediaSegment", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("TEXT");
+
+                    b.Property<long>("EndTicks")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<Guid>("ItemId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("SegmentProviderId")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<long>("StartTicks")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("Type")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("MediaSegments");
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.MediaStreamInfo", b =>
+                {
+                    b.Property<Guid>("ItemId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("StreamIndex")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("AspectRatio")
+                        .HasColumnType("TEXT");
+
+                    b.Property<float>("AverageFrameRate")
+                        .HasColumnType("REAL");
+
+                    b.Property<int>("BitDepth")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("BitRate")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("BlPresentFlag")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("ChannelLayout")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("Channels")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Codec")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("CodecTag")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("CodecTimeBase")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("ColorPrimaries")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("ColorSpace")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("ColorTransfer")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Comment")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("DvBlSignalCompatibilityId")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("DvLevel")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("DvProfile")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("DvVersionMajor")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("DvVersionMinor")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("ElPresentFlag")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("Height")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("IsAnamorphic")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("IsAvc")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("IsDefault")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("IsExternal")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("IsForced")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("IsHearingImpaired")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("IsInterlaced")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("KeyFrames")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Language")
+                        .HasColumnType("TEXT");
+
+                    b.Property<float>("Level")
+                        .HasColumnType("REAL");
+
+                    b.Property<string>("NalLengthSize")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Path")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("PixelFormat")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Profile")
+                        .HasColumnType("TEXT");
+
+                    b.Property<float>("RealFrameRate")
+                        .HasColumnType("REAL");
+
+                    b.Property<int>("RefFrames")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("Rotation")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("RpuPresentFlag")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("SampleRate")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int?>("StreamType")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("TimeBase")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Title")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("Width")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("ItemId", "StreamIndex");
+
+                    b.HasIndex("StreamIndex");
+
+                    b.HasIndex("StreamType");
+
+                    b.HasIndex("StreamIndex", "StreamType");
+
+                    b.HasIndex("StreamIndex", "StreamType", "Language");
+
+                    b.ToTable("MediaStreamInfos");
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.People", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("PersonType")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("Name");
+
+                    b.ToTable("Peoples");
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.PeopleBaseItemMap", b =>
+                {
+                    b.Property<Guid>("ItemId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("PeopleId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int?>("ListOrder")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Role")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int?>("SortOrder")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("ItemId", "PeopleId");
+
+                    b.HasIndex("PeopleId");
+
+                    b.HasIndex("ItemId", "ListOrder");
+
+                    b.HasIndex("ItemId", "SortOrder");
+
+                    b.ToTable("PeopleBaseItemMap");
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.Permission", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("Kind")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<Guid?>("Permission_Permissions_Guid")
+                        .HasColumnType("TEXT");
+
+                    b.Property<uint>("RowVersion")
+                        .IsConcurrencyToken()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<Guid?>("UserId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("Value")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("UserId", "Kind")
+                        .IsUnique()
+                        .HasFilter("[UserId] IS NOT NULL");
+
+                    b.ToTable("Permissions");
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.Preference", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("Kind")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<Guid?>("Preference_Preferences_Guid")
+                        .HasColumnType("TEXT");
+
+                    b.Property<uint>("RowVersion")
+                        .IsConcurrencyToken()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<Guid?>("UserId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Value")
+                        .IsRequired()
+                        .HasMaxLength(65535)
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("UserId", "Kind")
+                        .IsUnique()
+                        .HasFilter("[UserId] IS NOT NULL");
+
+                    b.ToTable("Preferences");
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.Security.ApiKey", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("AccessToken")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("DateCreated")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("DateLastActivity")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasMaxLength(64)
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("AccessToken")
+                        .IsUnique();
+
+                    b.ToTable("ApiKeys");
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.Security.Device", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("AccessToken")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("AppName")
+                        .IsRequired()
+                        .HasMaxLength(64)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("AppVersion")
+                        .IsRequired()
+                        .HasMaxLength(32)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("DateCreated")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("DateLastActivity")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("DateModified")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("DeviceId")
+                        .IsRequired()
+                        .HasMaxLength(256)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("DeviceName")
+                        .IsRequired()
+                        .HasMaxLength(64)
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("IsActive")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("DeviceId");
+
+                    b.HasIndex("AccessToken", "DateLastActivity");
+
+                    b.HasIndex("DeviceId", "DateLastActivity");
+
+                    b.HasIndex("UserId", "DeviceId");
+
+                    b.ToTable("Devices");
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.Security.DeviceOptions", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("CustomName")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("DeviceId")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("DeviceId")
+                        .IsUnique();
+
+                    b.ToTable("DeviceOptions");
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.TrickplayInfo", b =>
+                {
+                    b.Property<Guid>("ItemId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("Width")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("Bandwidth")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("Height")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("Interval")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("ThumbnailCount")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("TileHeight")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("TileWidth")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("ItemId", "Width");
+
+                    b.ToTable("TrickplayInfos");
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.User", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("AudioLanguagePreference")
+                        .HasMaxLength(255)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("AuthenticationProviderId")
+                        .IsRequired()
+                        .HasMaxLength(255)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("CastReceiverId")
+                        .HasMaxLength(32)
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("DisplayCollectionsView")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("DisplayMissingEpisodes")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("EnableAutoLogin")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("EnableLocalPassword")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("EnableNextEpisodeAutoPlay")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("EnableUserPreferenceAccess")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("HidePlayedInLatest")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<long>("InternalId")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("InvalidLoginAttemptCount")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<DateTime?>("LastActivityDate")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("LastLoginDate")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int?>("LoginAttemptsBeforeLockout")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("MaxActiveSessions")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int?>("MaxParentalAgeRating")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("MustUpdatePassword")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Password")
+                        .HasMaxLength(65535)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("PasswordResetProviderId")
+                        .IsRequired()
+                        .HasMaxLength(255)
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("PlayDefaultAudioTrack")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("RememberAudioSelections")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("RememberSubtitleSelections")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int?>("RemoteClientBitrateLimit")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<uint>("RowVersion")
+                        .IsConcurrencyToken()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("SubtitleLanguagePreference")
+                        .HasMaxLength(255)
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("SubtitleMode")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("SyncPlayAccess")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Username")
+                        .IsRequired()
+                        .HasMaxLength(255)
+                        .HasColumnType("TEXT")
+                        .UseCollation("NOCASE");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("Username")
+                        .IsUnique();
+
+                    b.ToTable("Users");
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.UserData", b =>
+                {
+                    b.Property<string>("Key")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int?>("AudioStreamIndex")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<Guid?>("BaseItemEntityId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("IsFavorite")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<DateTime?>("LastPlayedDate")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool?>("Likes")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("PlayCount")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<long>("PlaybackPositionTicks")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("Played")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<double?>("Rating")
+                        .HasColumnType("REAL");
+
+                    b.Property<int?>("SubtitleStreamIndex")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("Key", "UserId");
+
+                    b.HasIndex("BaseItemEntityId");
+
+                    b.HasIndex("UserId");
+
+                    b.HasIndex("Key", "UserId", "IsFavorite");
+
+                    b.HasIndex("Key", "UserId", "LastPlayedDate");
+
+                    b.HasIndex("Key", "UserId", "PlaybackPositionTicks");
+
+                    b.HasIndex("Key", "UserId", "Played");
+
+                    b.ToTable("UserData");
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.AccessSchedule", b =>
+                {
+                    b.HasOne("Jellyfin.Data.Entities.User", null)
+                        .WithMany("AccessSchedules")
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.AncestorId", b =>
+                {
+                    b.HasOne("Jellyfin.Data.Entities.BaseItemEntity", null)
+                        .WithMany("AncestorIds")
+                        .HasForeignKey("BaseItemEntityId");
+
+                    b.HasOne("Jellyfin.Data.Entities.BaseItemEntity", "Item")
+                        .WithMany()
+                        .HasForeignKey("ItemId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Jellyfin.Data.Entities.BaseItemEntity", "ParentItem")
+                        .WithMany()
+                        .HasForeignKey("ParentItemId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Item");
+
+                    b.Navigation("ParentItem");
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.AttachmentStreamInfo", b =>
+                {
+                    b.HasOne("Jellyfin.Data.Entities.BaseItemEntity", "Item")
+                        .WithMany()
+                        .HasForeignKey("ItemId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Item");
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.BaseItemImageInfo", b =>
+                {
+                    b.HasOne("Jellyfin.Data.Entities.BaseItemEntity", "Item")
+                        .WithMany("Images")
+                        .HasForeignKey("ItemId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Item");
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.BaseItemMetadataField", b =>
+                {
+                    b.HasOne("Jellyfin.Data.Entities.BaseItemEntity", "Item")
+                        .WithMany("LockedFields")
+                        .HasForeignKey("ItemId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Item");
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.BaseItemProvider", b =>
+                {
+                    b.HasOne("Jellyfin.Data.Entities.BaseItemEntity", "Item")
+                        .WithMany("Provider")
+                        .HasForeignKey("ItemId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Item");
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.BaseItemTrailerType", b =>
+                {
+                    b.HasOne("Jellyfin.Data.Entities.BaseItemEntity", "Item")
+                        .WithMany("TrailerTypes")
+                        .HasForeignKey("ItemId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Item");
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.Chapter", b =>
+                {
+                    b.HasOne("Jellyfin.Data.Entities.BaseItemEntity", "Item")
+                        .WithMany("Chapters")
+                        .HasForeignKey("ItemId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Item");
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.DisplayPreferences", b =>
+                {
+                    b.HasOne("Jellyfin.Data.Entities.User", null)
+                        .WithMany("DisplayPreferences")
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.HomeSection", b =>
+                {
+                    b.HasOne("Jellyfin.Data.Entities.DisplayPreferences", null)
+                        .WithMany("HomeSections")
+                        .HasForeignKey("DisplayPreferencesId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.ImageInfo", b =>
+                {
+                    b.HasOne("Jellyfin.Data.Entities.User", null)
+                        .WithOne("ProfileImage")
+                        .HasForeignKey("Jellyfin.Data.Entities.ImageInfo", "UserId")
+                        .OnDelete(DeleteBehavior.Cascade);
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.ItemDisplayPreferences", b =>
+                {
+                    b.HasOne("Jellyfin.Data.Entities.User", null)
+                        .WithMany("ItemDisplayPreferences")
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.ItemValueMap", b =>
+                {
+                    b.HasOne("Jellyfin.Data.Entities.BaseItemEntity", "Item")
+                        .WithMany("ItemValues")
+                        .HasForeignKey("ItemId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Jellyfin.Data.Entities.ItemValue", "ItemValue")
+                        .WithMany("BaseItemsMap")
+                        .HasForeignKey("ItemValueId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Item");
+
+                    b.Navigation("ItemValue");
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.MediaStreamInfo", b =>
+                {
+                    b.HasOne("Jellyfin.Data.Entities.BaseItemEntity", "Item")
+                        .WithMany("MediaStreams")
+                        .HasForeignKey("ItemId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Item");
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.PeopleBaseItemMap", b =>
+                {
+                    b.HasOne("Jellyfin.Data.Entities.BaseItemEntity", "Item")
+                        .WithMany("Peoples")
+                        .HasForeignKey("ItemId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Jellyfin.Data.Entities.People", "People")
+                        .WithMany("BaseItems")
+                        .HasForeignKey("PeopleId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Item");
+
+                    b.Navigation("People");
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.Permission", b =>
+                {
+                    b.HasOne("Jellyfin.Data.Entities.User", null)
+                        .WithMany("Permissions")
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade);
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.Preference", b =>
+                {
+                    b.HasOne("Jellyfin.Data.Entities.User", null)
+                        .WithMany("Preferences")
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade);
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.Security.Device", b =>
+                {
+                    b.HasOne("Jellyfin.Data.Entities.User", "User")
+                        .WithMany()
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("User");
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.UserData", b =>
+                {
+                    b.HasOne("Jellyfin.Data.Entities.BaseItemEntity", null)
+                        .WithMany("UserData")
+                        .HasForeignKey("BaseItemEntityId");
+
+                    b.HasOne("Jellyfin.Data.Entities.User", "User")
+                        .WithMany()
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("User");
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.BaseItemEntity", b =>
+                {
+                    b.Navigation("AncestorIds");
+
+                    b.Navigation("Chapters");
+
+                    b.Navigation("Images");
+
+                    b.Navigation("ItemValues");
+
+                    b.Navigation("LockedFields");
+
+                    b.Navigation("MediaStreams");
+
+                    b.Navigation("Peoples");
+
+                    b.Navigation("Provider");
+
+                    b.Navigation("TrailerTypes");
+
+                    b.Navigation("UserData");
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.DisplayPreferences", b =>
+                {
+                    b.Navigation("HomeSections");
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.ItemValue", b =>
+                {
+                    b.Navigation("BaseItemsMap");
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.People", b =>
+                {
+                    b.Navigation("BaseItems");
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.User", b =>
+                {
+                    b.Navigation("AccessSchedules");
+
+                    b.Navigation("DisplayPreferences");
+
+                    b.Navigation("ItemDisplayPreferences");
+
+                    b.Navigation("Permissions");
+
+                    b.Navigation("Preferences");
+
+                    b.Navigation("ProfileImage");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}
diff --git a/Jellyfin.Server.Implementations/Migrations/20241011100757_LibraryPeopleRoleMigration.cs b/Jellyfin.Server.Implementations/Migrations/20241011100757_LibraryPeopleRoleMigration.cs
new file mode 100644
index 000000000..6f0590c13
--- /dev/null
+++ b/Jellyfin.Server.Implementations/Migrations/20241011100757_LibraryPeopleRoleMigration.cs
@@ -0,0 +1,38 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Jellyfin.Server.Implementations.Migrations
+{
+    /// <inheritdoc />
+    public partial class LibraryPeopleRoleMigration : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "Role",
+                table: "Peoples");
+
+            migrationBuilder.AddColumn<string>(
+                name: "Role",
+                table: "PeopleBaseItemMap",
+                type: "TEXT",
+                nullable: true);
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "Role",
+                table: "PeopleBaseItemMap");
+
+            migrationBuilder.AddColumn<string>(
+                name: "Role",
+                table: "Peoples",
+                type: "TEXT",
+                nullable: true);
+        }
+    }
+}
diff --git a/Jellyfin.Server.Implementations/Migrations/JellyfinDbModelSnapshot.cs b/Jellyfin.Server.Implementations/Migrations/JellyfinDbModelSnapshot.cs
index 20d7cf3dd..4a63cd926 100644
--- a/Jellyfin.Server.Implementations/Migrations/JellyfinDbModelSnapshot.cs
+++ b/Jellyfin.Server.Implementations/Migrations/JellyfinDbModelSnapshot.cs
@@ -910,33 +910,51 @@ namespace Jellyfin.Server.Implementations.Migrations
                 });
 
             modelBuilder.Entity("Jellyfin.Data.Entities.People", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("PersonType")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("Name");
+
+                    b.ToTable("Peoples");
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.PeopleBaseItemMap", b =>
                 {
                     b.Property<Guid>("ItemId")
                         .HasColumnType("TEXT");
 
-                    b.Property<string>("Role")
+                    b.Property<Guid>("PeopleId")
                         .HasColumnType("TEXT");
 
                     b.Property<int?>("ListOrder")
                         .HasColumnType("INTEGER");
 
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasColumnType("TEXT");
-
-                    b.Property<string>("PersonType")
+                    b.Property<string>("Role")
                         .HasColumnType("TEXT");
 
                     b.Property<int?>("SortOrder")
                         .HasColumnType("INTEGER");
 
-                    b.HasKey("ItemId", "Role", "ListOrder");
+                    b.HasKey("ItemId", "PeopleId");
 
-                    b.HasIndex("Name");
+                    b.HasIndex("PeopleId");
 
                     b.HasIndex("ItemId", "ListOrder");
 
-                    b.ToTable("Peoples");
+                    b.HasIndex("ItemId", "SortOrder");
+
+                    b.ToTable("PeopleBaseItemMap");
                 });
 
             modelBuilder.Entity("Jellyfin.Data.Entities.Permission", b =>
@@ -1473,7 +1491,7 @@ namespace Jellyfin.Server.Implementations.Migrations
                     b.Navigation("Item");
                 });
 
-            modelBuilder.Entity("Jellyfin.Data.Entities.People", b =>
+            modelBuilder.Entity("Jellyfin.Data.Entities.PeopleBaseItemMap", b =>
                 {
                     b.HasOne("Jellyfin.Data.Entities.BaseItemEntity", "Item")
                         .WithMany("Peoples")
@@ -1481,7 +1499,15 @@ namespace Jellyfin.Server.Implementations.Migrations
                         .OnDelete(DeleteBehavior.Cascade)
                         .IsRequired();
 
+                    b.HasOne("Jellyfin.Data.Entities.People", "People")
+                        .WithMany("BaseItems")
+                        .HasForeignKey("PeopleId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
                     b.Navigation("Item");
+
+                    b.Navigation("People");
                 });
 
             modelBuilder.Entity("Jellyfin.Data.Entities.Permission", b =>
@@ -1559,6 +1585,11 @@ namespace Jellyfin.Server.Implementations.Migrations
                     b.Navigation("BaseItemsMap");
                 });
 
+            modelBuilder.Entity("Jellyfin.Data.Entities.People", b =>
+                {
+                    b.Navigation("BaseItems");
+                });
+
             modelBuilder.Entity("Jellyfin.Data.Entities.User", b =>
                 {
                     b.Navigation("AccessSchedules");
diff --git a/Jellyfin.Server.Implementations/ModelConfiguration/PeopleBaseItemMapConfiguration.cs b/Jellyfin.Server.Implementations/ModelConfiguration/PeopleBaseItemMapConfiguration.cs
new file mode 100644
index 000000000..cdaee9161
--- /dev/null
+++ b/Jellyfin.Server.Implementations/ModelConfiguration/PeopleBaseItemMapConfiguration.cs
@@ -0,0 +1,22 @@
+using System;
+using Jellyfin.Data.Entities;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Metadata.Builders;
+
+namespace Jellyfin.Server.Implementations.ModelConfiguration;
+
+/// <summary>
+/// People configuration.
+/// </summary>
+public class PeopleBaseItemMapConfiguration : IEntityTypeConfiguration<PeopleBaseItemMap>
+{
+    /// <inheritdoc/>
+    public void Configure(EntityTypeBuilder<PeopleBaseItemMap> builder)
+    {
+        builder.HasKey(e => new { e.ItemId, e.PeopleId });
+        builder.HasIndex(e => new { e.ItemId, e.SortOrder });
+        builder.HasIndex(e => new { e.ItemId, e.ListOrder });
+        builder.HasOne(e => e.Item);
+        builder.HasOne(e => e.People);
+    }
+}
diff --git a/Jellyfin.Server.Implementations/ModelConfiguration/PeopleConfiguration.cs b/Jellyfin.Server.Implementations/ModelConfiguration/PeopleConfiguration.cs
index 5f5b4dfc7..f3cccb13f 100644
--- a/Jellyfin.Server.Implementations/ModelConfiguration/PeopleConfiguration.cs
+++ b/Jellyfin.Server.Implementations/ModelConfiguration/PeopleConfiguration.cs
@@ -13,8 +13,8 @@ public class PeopleConfiguration : IEntityTypeConfiguration<People>
     /// <inheritdoc/>
     public void Configure(EntityTypeBuilder<People> builder)
     {
-        builder.HasKey(e => new { e.ItemId, e.Role, e.ListOrder });
-        builder.HasIndex(e => new { e.ItemId, e.ListOrder });
+        builder.HasKey(e => e.Id);
         builder.HasIndex(e => e.Name);
+        builder.HasMany(e => e.BaseItems);
     }
 }
diff --git a/Jellyfin.Server/Migrations/MigrationRunner.cs b/Jellyfin.Server/Migrations/MigrationRunner.cs
index 9d4441ac3..0459436b1 100644
--- a/Jellyfin.Server/Migrations/MigrationRunner.cs
+++ b/Jellyfin.Server/Migrations/MigrationRunner.cs
@@ -47,7 +47,8 @@ namespace Jellyfin.Server.Migrations
             typeof(Routines.AddDefaultCastReceivers),
             typeof(Routines.UpdateDefaultPluginRepository),
             typeof(Routines.FixAudioData),
-            typeof(Routines.MoveTrickplayFiles)
+            typeof(Routines.MoveTrickplayFiles),
+            typeof(Routines.MigrateLibraryDb),
         };
 
         /// <summary>
diff --git a/Jellyfin.Server/Migrations/Routines/MigrateLibraryDb.cs b/Jellyfin.Server/Migrations/Routines/MigrateLibraryDb.cs
index bad99c92f..c88a609b6 100644
--- a/Jellyfin.Server/Migrations/Routines/MigrateLibraryDb.cs
+++ b/Jellyfin.Server/Migrations/Routines/MigrateLibraryDb.cs
@@ -1,26 +1,25 @@
 using System;
-using System.Collections.Generic;
 using System.Collections.Immutable;
-using System.Diagnostics.CodeAnalysis;
+using System.Data;
+using System.Diagnostics;
 using System.Globalization;
 using System.IO;
 using System.Linq;
 using System.Text;
 using Emby.Server.Implementations.Data;
 using Jellyfin.Data.Entities;
-using Jellyfin.Data.Entities.Libraries;
 using Jellyfin.Extensions;
 using Jellyfin.Server.Implementations;
 using MediaBrowser.Controller;
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Model.Entities;
-using MediaBrowser.Model.LiveTv;
 using Microsoft.Data.Sqlite;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Logging;
 using Chapter = Jellyfin.Data.Entities.Chapter;
 
 namespace Jellyfin.Server.Migrations.Routines;
+#pragma warning disable RS0030 // Do not use banned APIs
 
 /// <summary>
 /// The migration routine for migrating the userdata database to EF Core.
@@ -50,13 +49,13 @@ public class MigrateLibraryDb : IMigrationRoutine
     }
 
     /// <inheritdoc/>
-    public Guid Id => Guid.Parse("5bcb4197-e7c0-45aa-9902-963bceab5798");
+    public Guid Id => Guid.Parse("36445464-849f-429f-9ad0-bb130efa0664");
 
     /// <inheritdoc/>
-    public string Name => "MigrateUserData";
+    public string Name => "MigrateLibraryDbData";
 
     /// <inheritdoc/>
-    public bool PerformOnNewInstall => false;
+    public bool PerformOnNewInstall => false; // TODO Change back after testing
 
     /// <inheritdoc/>
     public void Perform()
@@ -66,24 +65,38 @@ public class MigrateLibraryDb : IMigrationRoutine
         var dataPath = _paths.DataPath;
         var libraryDbPath = Path.Combine(dataPath, DbFilename);
         using var connection = new SqliteConnection($"Filename={libraryDbPath}");
+        var stopwatch = new Stopwatch();
+        stopwatch.Start();
 
         connection.Open();
         using var dbContext = _provider.CreateDbContext();
 
+        _logger.LogInformation("Start moving UserData.");
         var queryResult = connection.Query("SELECT key, userId, rating, played, playCount, isFavorite, playbackPositionTicks, lastPlayedDate, AudioStreamIndex, SubtitleStreamIndex FROM UserDatas");
 
         dbContext.UserData.ExecuteDelete();
 
         var users = dbContext.Users.AsNoTracking().ToImmutableArray();
 
-        foreach (SqliteDataReader dto in queryResult)
+        foreach (var entity in queryResult)
         {
-            dbContext.UserData.Add(GetUserData(users, dto));
+            var userData = GetUserData(users, entity);
+            if (userData is null)
+            {
+                _logger.LogError("Was not able to migrate user data with key {0}", entity.GetString(0));
+                continue;
+            }
+
+            dbContext.UserData.Add(userData);
         }
 
+        _logger.LogInformation("Try saving {0} UserData entries.", dbContext.UserData.Local.Count);
         dbContext.SaveChanges();
+        var stepElapsed = stopwatch.Elapsed;
+        _logger.LogInformation("Saving UserData entries took {0}.", stepElapsed);
 
-        var typedBaseItemsQuery = "SELECT type, data, StartDate, EndDate, ChannelId, IsMovie, IsSeries, EpisodeTitle, IsRepeat, CommunityRating, CustomRating, IndexNumber, IsLocked, PreferredMetadataLanguage, PreferredMetadataCountryCode, Width, Height, DateLastRefreshed, Name, Path, PremiereDate, Overview, ParentIndexNumber, ProductionYear, OfficialRating, ForcedSortName, RunTimeTicks, Size, DateCreated, DateModified, guid, Genres, ParentId, Audio, ExternalServiceId, IsInMixedFolder, DateLastSaved, LockedFields, Studios, Tags, TrailerTypes, OriginalTitle, PrimaryVersionId, DateLastMediaAdded, Album, LUFS, NormalizationGain, CriticRating, IsVirtualItem, SeriesName, SeasonName, SeasonId, SeriesId, PresentationUniqueKey, InheritedParentalRatingValue, ExternalSeriesId, Tagline, ProviderIds, Images, ProductionLocations, ExtraIds, TotalBitrate, ExtraType, Artists, AlbumArtists, ExternalId, SeriesPresentationUniqueKey, ShowId, OwnerId FROM TypeBaseItems";
+        _logger.LogInformation("Start moving TypedBaseItem.");
+        var typedBaseItemsQuery = "SELECT type, data, StartDate, EndDate, ChannelId, IsMovie, IsSeries, EpisodeTitle, IsRepeat, CommunityRating, CustomRating, IndexNumber, IsLocked, PreferredMetadataLanguage, PreferredMetadataCountryCode, Width, Height, DateLastRefreshed, Name, Path, PremiereDate, Overview, ParentIndexNumber, ProductionYear, OfficialRating, ForcedSortName, RunTimeTicks, Size, DateCreated, DateModified, guid, Genres, ParentId, Audio, ExternalServiceId, IsInMixedFolder, DateLastSaved, LockedFields, Studios, Tags, TrailerTypes, OriginalTitle, PrimaryVersionId, DateLastMediaAdded, Album, LUFS, NormalizationGain, CriticRating, IsVirtualItem, SeriesName, SeasonName, SeasonId, SeriesId, PresentationUniqueKey, InheritedParentalRatingValue, ExternalSeriesId, Tagline, ProviderIds, Images, ProductionLocations, ExtraIds, TotalBitrate, ExtraType, Artists, AlbumArtists, ExternalId, SeriesPresentationUniqueKey, ShowId, OwnerId FROM TypedBaseItems";
         dbContext.BaseItems.ExecuteDelete();
 
         foreach (SqliteDataReader dto in connection.Query(typedBaseItemsQuery))
@@ -91,9 +104,13 @@ public class MigrateLibraryDb : IMigrationRoutine
             dbContext.BaseItems.Add(GetItem(dto));
         }
 
+        _logger.LogInformation("Try saving {0} BaseItem entries.", dbContext.BaseItems.Local.Count);
         dbContext.SaveChanges();
+        stepElapsed = stopwatch.Elapsed - stepElapsed;
+        _logger.LogInformation("Saving BaseItems entries took {0}.", stepElapsed);
 
-        var mediaStreamQuery = "SELECT ItemId, StreamIndex, StreamType, Codec, Language, ChannelLayout, Profile, AspectRatio, Path, IsInterlaced, BitRate, Channels, SampleRate, IsDefault, IsForced, IsExternal, Height, Width, AverageFrameRate, RealFrameRate, Level, PixelFormat, BitDepth, IsAnamorphic, RefFrames, CodecTag, Comment, NalLengthSize, IsAvc, Title, TimeBase, CodecTimeBase, ColorPrimaries, ColorSpace, ColorTransfer, DvVersionMajor, DvVersionMinor, DvProfile, DvLevel, RpuPresentFlag, ElPresentFlag, BlPresentFlag, DvBlSignalCompatibilityId, IsHearingImpaired, Rotation FROM MediaStreams";
+        _logger.LogInformation("Start moving MediaStreamInfos.");
+        var mediaStreamQuery = "SELECT ItemId, StreamIndex, StreamType, Codec, Language, ChannelLayout, Profile, AspectRatio, Path, IsInterlaced, BitRate, Channels, SampleRate, IsDefault, IsForced, IsExternal, Height, Width, AverageFrameRate, RealFrameRate, Level, PixelFormat, BitDepth, IsAnamorphic, RefFrames, CodecTag, Comment, NalLengthSize, IsAvc, Title, TimeBase, CodecTimeBase, ColorPrimaries, ColorSpace, ColorTransfer, DvVersionMajor, DvVersionMinor, DvProfile, DvLevel, RpuPresentFlag, ElPresentFlag, BlPresentFlag, DvBlSignalCompatibilityId, IsHearingImpaired FROM MediaStreams";
         dbContext.MediaStreamInfos.ExecuteDelete();
 
         foreach (SqliteDataReader dto in connection.Query(mediaStreamQuery))
@@ -101,18 +118,59 @@ public class MigrateLibraryDb : IMigrationRoutine
             dbContext.MediaStreamInfos.Add(GetMediaStream(dto));
         }
 
+        _logger.LogInformation("Try saving {0} MediaStreamInfos entries.", dbContext.MediaStreamInfos.Local.Count);
         dbContext.SaveChanges();
+        stepElapsed = stopwatch.Elapsed - stepElapsed;
+        _logger.LogInformation("Saving MediaStreamInfos entries took {0}.", stepElapsed);
 
+        _logger.LogInformation("Start moving People.");
         var personsQuery = "select ItemId, Name, Role, PersonType, SortOrder from People p";
         dbContext.Peoples.ExecuteDelete();
+        dbContext.PeopleBaseItemMap.ExecuteDelete();
 
-        foreach (SqliteDataReader dto in connection.Query(personsQuery))
+        foreach (SqliteDataReader reader in connection.Query(personsQuery))
         {
-            dbContext.Peoples.Add(GetPerson(dto));
+            var itemId = reader.GetGuid(0);
+            if (!dbContext.BaseItems.Any(f => f.Id == itemId))
+            {
+                _logger.LogError("Dont save person {0} because its not in use by any BaseItem", reader.GetString(1));
+                continue;
+            }
+
+            var entity = GetPerson(reader);
+            var existingPerson = dbContext.Peoples.FirstOrDefault(e => e.Name == entity.Name);
+            if (existingPerson is null)
+            {
+                dbContext.Peoples.Add(entity);
+                existingPerson = entity;
+            }
+
+            if (reader.TryGetString(2, out var role))
+            {
+            }
+
+            if (reader.TryGetInt32(4, out var sortOrder))
+            {
+            }
+
+            dbContext.PeopleBaseItemMap.Add(new PeopleBaseItemMap()
+            {
+                Item = null!,
+                ItemId = itemId,
+                People = existingPerson,
+                PeopleId = existingPerson.Id,
+                ListOrder = sortOrder,
+                SortOrder = sortOrder,
+                Role = role
+            });
         }
 
+        _logger.LogInformation("Try saving {0} People entries.", dbContext.MediaStreamInfos.Local.Count);
         dbContext.SaveChanges();
+        stepElapsed = stopwatch.Elapsed - stepElapsed;
+        _logger.LogInformation("Saving People entries took {0}.", stepElapsed);
 
+        _logger.LogInformation("Start moving ItemValues.");
         // do not migrate inherited types as they are now properly mapped in search and lookup.
         var itemValueQuery = "select ItemId, Type, Value, CleanValue FROM ItemValues WHERE Type <> 6";
         dbContext.ItemValues.ExecuteDelete();
@@ -140,32 +198,60 @@ public class MigrateLibraryDb : IMigrationRoutine
             });
         }
 
+        _logger.LogInformation("Try saving {0} ItemValues entries.", dbContext.ItemValues.Local.Count);
         dbContext.SaveChanges();
+        stepElapsed = stopwatch.Elapsed - stepElapsed;
+        _logger.LogInformation("Saving People ItemValues took {0}.", stepElapsed);
 
-        var chapterQuery = "select StartPositionTicks,Name,ImagePath,ImageDateModified from Chapters2";
+        _logger.LogInformation("Start moving Chapters.");
+        var chapterQuery = "select ItemId,StartPositionTicks,Name,ImagePath,ImageDateModified,ChapterIndex from Chapters2";
         dbContext.Chapters.ExecuteDelete();
 
         foreach (SqliteDataReader dto in connection.Query(chapterQuery))
         {
-            dbContext.Chapters.Add(GetChapter(dto));
+            var chapter = GetChapter(dto);
+            dbContext.Chapters.Add(chapter);
         }
 
+        _logger.LogInformation("Try saving {0} Chapters entries.", dbContext.Chapters.Local.Count);
         dbContext.SaveChanges();
+        stepElapsed = stopwatch.Elapsed - stepElapsed;
+        _logger.LogInformation("Saving Chapters took {0}.", stepElapsed);
 
+        _logger.LogInformation("Start moving AncestorIds.");
         var ancestorIdsQuery = "select ItemId, AncestorId, AncestorIdText from AncestorIds";
         dbContext.Chapters.ExecuteDelete();
 
         foreach (SqliteDataReader dto in connection.Query(ancestorIdsQuery))
         {
-            dbContext.AncestorIds.Add(GetAncestorId(dto));
+            var ancestorId = GetAncestorId(dto);
+            if (!dbContext.BaseItems.Any(e => e.Id == ancestorId.ItemId))
+            {
+                _logger.LogInformation("Dont move AncestorId ({0}, {1}) because no Item found.", ancestorId.ItemId, ancestorId.ParentItemId);
+                continue;
+            }
+
+            if (!dbContext.BaseItems.Any(e => e.Id == ancestorId.ParentItemId))
+            {
+                _logger.LogInformation("Dont move AncestorId ({0}, {1}) because no parent Item found.", ancestorId.ItemId, ancestorId.ParentItemId);
+                continue;
+            }
+
+            dbContext.AncestorIds.Add(ancestorId);
         }
 
+        _logger.LogInformation("Try saving {0} AncestorIds entries.", dbContext.Chapters.Local.Count);
+
         dbContext.SaveChanges();
+        stepElapsed = stopwatch.Elapsed - stepElapsed;
+        _logger.LogInformation("Saving AncestorIds took {0}.", stepElapsed);
 
         connection.Close();
-        _logger.LogInformation("Migration of the Library.db done.");
-        _logger.LogInformation("Move {0} to {1}.", libraryDbPath, libraryDbPath + ".old");
-        File.Move(libraryDbPath, libraryDbPath + ".old");
+        // _logger.LogInformation("Migration of the Library.db done.");
+        // _logger.LogInformation("Move {0} to {1}.", libraryDbPath, libraryDbPath + ".old");
+        // File.Move(libraryDbPath, libraryDbPath + ".old");
+
+        _logger.LogInformation("Migrating Library db took {0}.", stopwatch.Elapsed);
 
         if (dbContext.Database.IsSqlite())
         {
@@ -180,12 +266,18 @@ public class MigrateLibraryDb : IMigrationRoutine
         }
     }
 
-    private static UserData GetUserData(ImmutableArray<User> users, SqliteDataReader dto)
+    private static UserData? GetUserData(ImmutableArray<User> users, SqliteDataReader dto)
     {
+        var indexOfUser = dto.GetInt32(1);
+        if (users.Length < indexOfUser)
+        {
+            return null;
+        }
+
         return new UserData()
         {
             Key = dto.GetString(0),
-            UserId = users.ElementAt(dto.GetInt32(1)).Id,
+            UserId = users.ElementAt(indexOfUser).Id,
             Rating = dto.IsDBNull(2) ? null : dto.GetDouble(2),
             Played = dto.GetBoolean(3),
             PlayCount = dto.GetInt32(4),
@@ -219,23 +311,23 @@ public class MigrateLibraryDb : IMigrationRoutine
     {
         var chapter = new Chapter
         {
-            StartPositionTicks = reader.GetInt64(0),
-            ChapterIndex = 0,
+            StartPositionTicks = reader.GetInt64(1),
+            ChapterIndex = reader.GetInt32(5),
             Item = null!,
-            ItemId = Guid.Empty
+            ItemId = reader.GetGuid(0),
         };
 
-        if (reader.TryGetString(1, out var chapterName))
+        if (reader.TryGetString(2, out var chapterName))
         {
             chapter.Name = chapterName;
         }
 
-        if (reader.TryGetString(2, out var imagePath))
+        if (reader.TryGetString(3, out var imagePath))
         {
             chapter.ImagePath = imagePath;
         }
 
-        if (reader.TryReadDateTime(3, out var imageDateModified))
+        if (reader.TryReadDateTime(4, out var imageDateModified))
         {
             chapter.ImageDateModified = imageDateModified;
         }
@@ -258,26 +350,15 @@ public class MigrateLibraryDb : IMigrationRoutine
     {
         var item = new People
         {
-            ItemId = reader.GetGuid(0),
+            Id = Guid.NewGuid(),
             Name = reader.GetString(1),
-            Item = null!
         };
 
-        if (reader.TryGetString(2, out var role))
-        {
-            item.Role = role;
-        }
-
         if (reader.TryGetString(3, out var type))
         {
             item.PersonType = type;
         }
 
-        if (reader.TryGetInt32(4, out var sortOrder))
-        {
-            item.SortOrder = sortOrder;
-        }
-
         return item;
     }
 
@@ -515,10 +596,10 @@ public class MigrateLibraryDb : IMigrationRoutine
 
         item.IsHearingImpaired = reader.TryGetBoolean(43, out var result) && result;
 
-        if (reader.TryGetInt32(44, out var rotation))
-        {
-            item.Rotation = rotation;
-        }
+        // if (reader.TryGetInt32(44, out var rotation))
+        // {
+        //     item.Rotation = rotation;
+        // }
 
         return item;
     }
diff --git a/MediaBrowser.Controller/Entities/PersonInfo.cs b/MediaBrowser.Controller/Entities/PersonInfo.cs
index 3df0b0b78..0ed870bac 100644
--- a/MediaBrowser.Controller/Entities/PersonInfo.cs
+++ b/MediaBrowser.Controller/Entities/PersonInfo.cs
@@ -17,8 +17,14 @@ namespace MediaBrowser.Controller.Entities
         public PersonInfo()
         {
             ProviderIds = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);
+            Id = Guid.NewGuid();
         }
 
+        /// <summary>
+        /// Gets or Sets the PersonId.
+        /// </summary>
+        public Guid Id { get; set; }
+
         public Guid ItemId { get; set; }
 
         /// <summary>
-- 
cgit v1.2.3


From 05ffa7b4130dd86e386714792e253262cec0dcf9 Mon Sep 17 00:00:00 2001
From: JPVenson <github@jpb.email>
Date: Fri, 11 Oct 2024 11:42:49 +0000
Subject: Applied Review Comments

---
 Emby.Server.Implementations/Library/MusicManager.cs |  2 +-
 Jellyfin.Api/Controllers/InstantMixController.cs    | 12 ++++--------
 MediaBrowser.Controller/LiveTv/LiveTvChannel.cs     |  9 ++-------
 3 files changed, 7 insertions(+), 16 deletions(-)

(limited to 'MediaBrowser.Controller')

diff --git a/Emby.Server.Implementations/Library/MusicManager.cs b/Emby.Server.Implementations/Library/MusicManager.cs
index c83737cec..3f2909947 100644
--- a/Emby.Server.Implementations/Library/MusicManager.cs
+++ b/Emby.Server.Implementations/Library/MusicManager.cs
@@ -34,7 +34,7 @@ namespace Emby.Server.Implementations.Library
 
             list.AddRange(GetInstantMixFromGenres(item.Genres, user, dtoOptions));
 
-            return list.ToImmutableList();
+            return [.. list];
         }
 
         /// <inheritdoc />
diff --git a/Jellyfin.Api/Controllers/InstantMixController.cs b/Jellyfin.Api/Controllers/InstantMixController.cs
index e9dda19ca..e89e7ce26 100644
--- a/Jellyfin.Api/Controllers/InstantMixController.cs
+++ b/Jellyfin.Api/Controllers/InstantMixController.cs
@@ -393,21 +393,17 @@ public class InstantMixController : BaseJellyfinApiController
 
     private QueryResult<BaseItemDto> GetResult(IReadOnlyList<BaseItem> items, User? user, int? limit, DtoOptions dtoOptions)
     {
-        var list = items;
+        var totalCount = items.Count;
 
-        var totalCount = list.Count;
-
-        if (limit.HasValue && limit < list.Count)
+        if (limit.HasValue && limit < items.Count)
         {
-            list = list.Take(limit.Value).ToImmutableArray();
+            items = items.Take(limit.Value).ToImmutableArray();
         }
 
-        var returnList = _dtoService.GetBaseItemDtos(list, dtoOptions, user);
-
         var result = new QueryResult<BaseItemDto>(
             0,
             totalCount,
-            returnList);
+            _dtoService.GetBaseItemDtos(items, dtoOptions, user));
 
         return result;
     }
diff --git a/MediaBrowser.Controller/LiveTv/LiveTvChannel.cs b/MediaBrowser.Controller/LiveTv/LiveTvChannel.cs
index 64d49d8c4..b10e77e10 100644
--- a/MediaBrowser.Controller/LiveTv/LiveTvChannel.cs
+++ b/MediaBrowser.Controller/LiveTv/LiveTvChannel.cs
@@ -120,13 +120,10 @@ namespace MediaBrowser.Controller.LiveTv
             return "TvChannel";
         }
 
-        public IEnumerable<BaseItem> GetTaggedItems()
-            => Enumerable.Empty<BaseItem>();
+        public IEnumerable<BaseItem> GetTaggedItems() => [];
 
         public override IReadOnlyList<MediaSourceInfo> GetMediaSources(bool enablePathSubstitution)
         {
-            var list = new List<MediaSourceInfo>();
-
             var info = new MediaSourceInfo
             {
                 Id = Id.ToString("N", CultureInfo.InvariantCulture),
@@ -139,9 +136,7 @@ namespace MediaBrowser.Controller.LiveTv
                 IsInfiniteStream = RunTimeTicks is null
             };
 
-            list.Add(info);
-
-            return list.ToImmutableList();
+            return [info];
         }
 
         public override IReadOnlyList<MediaStream> GetMediaStreams()
-- 
cgit v1.2.3


From 058a567e0025d2a3086de8530be613fdf2b08c8c Mon Sep 17 00:00:00 2001
From: JPVenson <github@jpb.email>
Date: Fri, 11 Oct 2024 11:46:43 +0000
Subject: Removed unused mapping tables

---
 Emby.Server.Implementations/Data/ItemTypeLookup.cs | 62 ----------------------
 .../Persistence/IItemTypeLookup.cs                 | 40 --------------
 2 files changed, 102 deletions(-)

(limited to 'MediaBrowser.Controller')

diff --git a/Emby.Server.Implementations/Data/ItemTypeLookup.cs b/Emby.Server.Implementations/Data/ItemTypeLookup.cs
index dc55211d8..5504012bf 100644
--- a/Emby.Server.Implementations/Data/ItemTypeLookup.cs
+++ b/Emby.Server.Implementations/Data/ItemTypeLookup.cs
@@ -21,68 +21,6 @@ namespace Emby.Server.Implementations.Data;
 /// <inheritdoc />
 public class ItemTypeLookup : IItemTypeLookup
 {
-    /// <inheritdoc />
-    public IReadOnlyList<ItemFields> AllItemFields { get; } = Enum.GetValues<ItemFields>();
-
-    /// <inheritdoc />
-    public IReadOnlyList<BaseItemKind> ProgramTypes { get; } =
-    [
-            BaseItemKind.Program,
-            BaseItemKind.TvChannel,
-            BaseItemKind.LiveTvProgram,
-            BaseItemKind.LiveTvChannel
-    ];
-
-    /// <inheritdoc />
-    public IReadOnlyList<BaseItemKind> ProgramExcludeParentTypes { get; } =
-    [
-            BaseItemKind.Series,
-            BaseItemKind.Season,
-            BaseItemKind.MusicAlbum,
-            BaseItemKind.MusicArtist,
-            BaseItemKind.PhotoAlbum
-    ];
-
-    /// <inheritdoc />
-    public IReadOnlyList<BaseItemKind> ServiceTypes { get; } =
-    [
-            BaseItemKind.TvChannel,
-            BaseItemKind.LiveTvChannel
-    ];
-
-    /// <inheritdoc />
-    public IReadOnlyList<BaseItemKind> StartDateTypes { get; } =
-    [
-            BaseItemKind.Program,
-            BaseItemKind.LiveTvProgram
-    ];
-
-    /// <inheritdoc />
-    public IReadOnlyList<BaseItemKind> SeriesTypes { get; } =
-    [
-            BaseItemKind.Book,
-            BaseItemKind.AudioBook,
-            BaseItemKind.Episode,
-            BaseItemKind.Season
-    ];
-
-    /// <inheritdoc />
-    public IReadOnlyList<BaseItemKind> ArtistExcludeParentTypes { get; } =
-    [
-            BaseItemKind.Series,
-            BaseItemKind.Season,
-            BaseItemKind.PhotoAlbum
-    ];
-
-    /// <inheritdoc />
-    public IReadOnlyList<BaseItemKind> ArtistsTypes { get; } =
-    [
-            BaseItemKind.Audio,
-            BaseItemKind.MusicAlbum,
-            BaseItemKind.MusicVideo,
-            BaseItemKind.AudioBook
-    ];
-
     /// <inheritdoc />
     public IReadOnlyList<string> MusicGenreTypes => BaseItemKindNames.Where(e => e.Key is BaseItemKind.Audio or BaseItemKind.MusicVideo or BaseItemKind.MusicAlbum or BaseItemKind.MusicArtist).Select(e => e.Value).ToImmutableArray();
 
diff --git a/MediaBrowser.Controller/Persistence/IItemTypeLookup.cs b/MediaBrowser.Controller/Persistence/IItemTypeLookup.cs
index 343b95e9e..d2c6ff365 100644
--- a/MediaBrowser.Controller/Persistence/IItemTypeLookup.cs
+++ b/MediaBrowser.Controller/Persistence/IItemTypeLookup.cs
@@ -10,46 +10,6 @@ namespace MediaBrowser.Controller.Persistence;
 /// </summary>
 public interface IItemTypeLookup
 {
-    /// <summary>
-    /// Gets all values of the ItemFields type.
-    /// </summary>
-    public IReadOnlyList<ItemFields> AllItemFields { get; }
-
-    /// <summary>
-    /// Gets all BaseItemKinds that are considered Programs.
-    /// </summary>
-    public IReadOnlyList<BaseItemKind> ProgramTypes { get; }
-
-    /// <summary>
-    /// Gets all BaseItemKinds that should be excluded from parent lookup.
-    /// </summary>
-    public IReadOnlyList<BaseItemKind> ProgramExcludeParentTypes { get; }
-
-    /// <summary>
-    /// Gets all BaseItemKinds that are considered to be provided by services.
-    /// </summary>
-    public IReadOnlyList<BaseItemKind> ServiceTypes { get; }
-
-    /// <summary>
-    /// Gets all BaseItemKinds that have a StartDate.
-    /// </summary>
-    public IReadOnlyList<BaseItemKind> StartDateTypes { get; }
-
-    /// <summary>
-    /// Gets all BaseItemKinds that are considered Series.
-    /// </summary>
-    public IReadOnlyList<BaseItemKind> SeriesTypes { get; }
-
-    /// <summary>
-    /// Gets all BaseItemKinds that are not to be evaluated for Artists.
-    /// </summary>
-    public IReadOnlyList<BaseItemKind> ArtistExcludeParentTypes { get; }
-
-    /// <summary>
-    /// Gets all BaseItemKinds that are considered Artists.
-    /// </summary>
-    public IReadOnlyList<BaseItemKind> ArtistsTypes { get; }
-
     /// <summary>
     /// Gets all serialisation target types for music related kinds.
     /// </summary>
-- 
cgit v1.2.3


From e20ecfc670c9ef8977b0795c85e35ce165fee46e Mon Sep 17 00:00:00 2001
From: JPVenson <github@jpb.email>
Date: Fri, 11 Oct 2024 14:16:42 +0000
Subject: applied review comments

---
 Emby.Server.Implementations/Data/ItemTypeLookup.cs       | 10 ++++++++--
 Emby.Server.Implementations/Library/MusicManager.cs      |  9 +--------
 Jellyfin.Server.Implementations/Item/PeopleRepository.cs |  8 +++++---
 MediaBrowser.Controller/Persistence/IItemTypeLookup.cs   |  2 +-
 4 files changed, 15 insertions(+), 14 deletions(-)

(limited to 'MediaBrowser.Controller')

diff --git a/Emby.Server.Implementations/Data/ItemTypeLookup.cs b/Emby.Server.Implementations/Data/ItemTypeLookup.cs
index 5504012bf..f5db28c7a 100644
--- a/Emby.Server.Implementations/Data/ItemTypeLookup.cs
+++ b/Emby.Server.Implementations/Data/ItemTypeLookup.cs
@@ -22,10 +22,16 @@ namespace Emby.Server.Implementations.Data;
 public class ItemTypeLookup : IItemTypeLookup
 {
     /// <inheritdoc />
-    public IReadOnlyList<string> MusicGenreTypes => BaseItemKindNames.Where(e => e.Key is BaseItemKind.Audio or BaseItemKind.MusicVideo or BaseItemKind.MusicAlbum or BaseItemKind.MusicArtist).Select(e => e.Value).ToImmutableArray();
+    public IReadOnlyList<string> MusicGenreTypes { get; } = [
+
+         typeof(Audio).FullName!,
+         typeof(MusicVideo).FullName!,
+         typeof(MusicAlbum).FullName!,
+         typeof(MusicArtist).FullName!,
+    ];
 
     /// <inheritdoc />
-    public IDictionary<BaseItemKind, string> BaseItemKindNames { get; } = new Dictionary<BaseItemKind, string>()
+    public IReadOnlyDictionary<BaseItemKind, string> BaseItemKindNames { get; } = new Dictionary<BaseItemKind, string>()
     {
         { BaseItemKind.AggregateFolder, typeof(AggregateFolder).FullName! },
         { BaseItemKind.Audio, typeof(Audio).FullName! },
diff --git a/Emby.Server.Implementations/Library/MusicManager.cs b/Emby.Server.Implementations/Library/MusicManager.cs
index 3f2909947..71c69ec50 100644
--- a/Emby.Server.Implementations/Library/MusicManager.cs
+++ b/Emby.Server.Implementations/Library/MusicManager.cs
@@ -27,14 +27,7 @@ namespace Emby.Server.Implementations.Library
 
         public IReadOnlyList<BaseItem> GetInstantMixFromSong(Audio item, User? user, DtoOptions dtoOptions)
         {
-            var list = new List<BaseItem>
-            {
-                item
-            };
-
-            list.AddRange(GetInstantMixFromGenres(item.Genres, user, dtoOptions));
-
-            return [.. list];
+            return GetInstantMixFromGenres(item.Genres, user, dtoOptions);
         }
 
         /// <inheritdoc />
diff --git a/Jellyfin.Server.Implementations/Item/PeopleRepository.cs b/Jellyfin.Server.Implementations/Item/PeopleRepository.cs
index dee87f48f..5f5bf09af 100644
--- a/Jellyfin.Server.Implementations/Item/PeopleRepository.cs
+++ b/Jellyfin.Server.Implementations/Item/PeopleRepository.cs
@@ -16,10 +16,11 @@ namespace Jellyfin.Server.Implementations.Item;
 /// Manager for handling people.
 /// </summary>
 /// <param name="dbProvider">Efcore Factory.</param>
+/// <param name="itemTypeLookup">Items lookup service.</param>
 /// <remarks>
 /// Initializes a new instance of the <see cref="PeopleRepository"/> class.
 /// </remarks>
-public class PeopleRepository(IDbContextFactory<JellyfinDbContext> dbProvider) : IPeopleRepository
+public class PeopleRepository(IDbContextFactory<JellyfinDbContext> dbProvider, IItemTypeLookup itemTypeLookup) : IPeopleRepository
 {
     private readonly IDbContextFactory<JellyfinDbContext> _dbProvider = dbProvider;
 
@@ -118,8 +119,9 @@ public class PeopleRepository(IDbContextFactory<JellyfinDbContext> dbProvider) :
     {
         if (filter.User is not null && filter.IsFavorite.HasValue)
         {
-            query = query.Where(e => e.PersonType == typeof(Person).FullName)
-                .Where(e => context.BaseItems.Where(d => context.UserData.Where(e => e.IsFavorite == filter.IsFavorite && e.UserId.Equals(filter.User.Id)).Any(f => f.Key == d.UserDataKey))
+            var personType = itemTypeLookup.BaseItemKindNames[BaseItemKind.Person];
+            query = query.Where(e => e.PersonType == personType)
+                .Where(e => context.BaseItems.Where(d => context.UserData.Where(w => w.IsFavorite == filter.IsFavorite && w.UserId.Equals(filter.User.Id)).Any(f => f.Key == d.UserDataKey))
                     .Select(f => f.Name).Contains(e.Name));
         }
 
diff --git a/MediaBrowser.Controller/Persistence/IItemTypeLookup.cs b/MediaBrowser.Controller/Persistence/IItemTypeLookup.cs
index d2c6ff365..9507f79d3 100644
--- a/MediaBrowser.Controller/Persistence/IItemTypeLookup.cs
+++ b/MediaBrowser.Controller/Persistence/IItemTypeLookup.cs
@@ -18,5 +18,5 @@ public interface IItemTypeLookup
     /// <summary>
     /// Gets mapping for all BaseItemKinds and their expected serialization target.
     /// </summary>
-    public IDictionary<BaseItemKind, string> BaseItemKindNames { get; }
+    public IReadOnlyDictionary<BaseItemKind, string> BaseItemKindNames { get; }
 }
-- 
cgit v1.2.3


From 6813db06d7d092e89eaa7ee291f6b5b1eb7dc4cb Mon Sep 17 00:00:00 2001
From: gnattu <gnattu@users.noreply.github.com>
Date: Sat, 19 Oct 2024 19:23:48 +0800
Subject: Infer more audio codec from containers (#12837)

---
 .../MediaEncoding/EncodingHelper.cs                | 46 +++++-----------------
 1 file changed, 9 insertions(+), 37 deletions(-)

(limited to 'MediaBrowser.Controller')

diff --git a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
index c120e08fa..bd5897a84 100644
--- a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
+++ b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
@@ -629,49 +629,21 @@ namespace MediaBrowser.Controller.MediaEncoding
         /// <returns>Codec string.</returns>
         public string InferAudioCodec(string container)
         {
-            var ext = "." + (container ?? string.Empty);
-
-            if (string.Equals(ext, ".mp3", StringComparison.OrdinalIgnoreCase))
-            {
-                return "mp3";
-            }
-
-            if (string.Equals(ext, ".aac", StringComparison.OrdinalIgnoreCase))
+            if (string.IsNullOrWhiteSpace(container))
             {
+                // this may not work, but if the client is that broken we can not do anything better
                 return "aac";
             }
 
-            if (string.Equals(ext, ".wma", StringComparison.OrdinalIgnoreCase))
-            {
-                return "wma";
-            }
-
-            if (string.Equals(ext, ".ogg", StringComparison.OrdinalIgnoreCase))
-            {
-                return "vorbis";
-            }
-
-            if (string.Equals(ext, ".oga", StringComparison.OrdinalIgnoreCase))
-            {
-                return "vorbis";
-            }
-
-            if (string.Equals(ext, ".ogv", StringComparison.OrdinalIgnoreCase))
-            {
-                return "vorbis";
-            }
+            var inferredCodec = container.ToLowerInvariant();
 
-            if (string.Equals(ext, ".webm", StringComparison.OrdinalIgnoreCase))
+            return inferredCodec switch
             {
-                return "vorbis";
-            }
-
-            if (string.Equals(ext, ".webma", StringComparison.OrdinalIgnoreCase))
-            {
-                return "vorbis";
-            }
-
-            return "copy";
+                "ogg" or "oga" or "ogv" or "webm" or "webma" => "opus",
+                "m4a" or "m4b" or "mp4" or "mov" or "mkv" or "mka" => "aac",
+                "ts" or "avi" or "flv" or "f4v" or "swf" => "mp3",
+                _ => inferredCodec
+            };
         }
 
         /// <summary>
-- 
cgit v1.2.3


From df8edaa083232bd0fe45401501186e31d82e9f2e Mon Sep 17 00:00:00 2001
From: Nyanmisaka <nst799610810@gmail.com>
Date: Sat, 19 Oct 2024 14:46:13 +0000
Subject: Fix seeking beyond EOF in HWA transcoding (#12847)

---
 MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'MediaBrowser.Controller')

diff --git a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
index bd5897a84..28f0d1fff 100644
--- a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
+++ b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
@@ -2668,6 +2668,7 @@ namespace MediaBrowser.Controller.MediaEncoding
         public string GetFastSeekCommandLineParameter(EncodingJobInfo state, EncodingOptions options, string segmentContainer)
         {
             var time = state.BaseRequest.StartTimeTicks ?? 0;
+            var maxTime = state.RunTimeTicks ?? 0;
             var seekParam = string.Empty;
 
             if (time > 0)
@@ -2678,6 +2679,14 @@ namespace MediaBrowser.Controller.MediaEncoding
                 // This will help subtitle syncing.
                 var isHlsRemuxing = state.IsVideoRequest && state.TranscodingType is TranscodingJobType.Hls && IsCopyCodec(state.OutputVideoCodec);
                 var seekTick = isHlsRemuxing ? time + 5000000L : time;
+
+                // Seeking beyond EOF makes no sense in transcoding. Clamp the seekTick value to
+                // [0, RuntimeTicks - 0.5s], so that the muxer gets packets and avoid error codes.
+                if (maxTime > 0)
+                {
+                    seekTick = Math.Clamp(seekTick, 0, Math.Max(maxTime - 5000000L, 0));
+                }
+
                 seekParam += string.Format(CultureInfo.InvariantCulture, "-ss {0}", _mediaEncoder.GetTimeParameter(seekTick));
 
                 if (state.IsVideoRequest)
-- 
cgit v1.2.3


From a0c634a6edcebdf0ee1ed28fc51dfefaab8b9392 Mon Sep 17 00:00:00 2001
From: Jellyfin Release Bot <team@jellyfin.org>
Date: Sat, 26 Oct 2024 13:32:51 -0400
Subject: Bump version to 10.11.0

---
 Emby.Naming/Emby.Naming.csproj                         | 2 +-
 Jellyfin.Data/Jellyfin.Data.csproj                     | 2 +-
 MediaBrowser.Common/MediaBrowser.Common.csproj         | 2 +-
 MediaBrowser.Controller/MediaBrowser.Controller.csproj | 2 +-
 MediaBrowser.Model/MediaBrowser.Model.csproj           | 2 +-
 SharedVersion.cs                                       | 4 ++--
 src/Jellyfin.Extensions/Jellyfin.Extensions.csproj     | 2 +-
 7 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'MediaBrowser.Controller')

diff --git a/Emby.Naming/Emby.Naming.csproj b/Emby.Naming/Emby.Naming.csproj
index 7eb131575..53b297b06 100644
--- a/Emby.Naming/Emby.Naming.csproj
+++ b/Emby.Naming/Emby.Naming.csproj
@@ -36,7 +36,7 @@
   <PropertyGroup>
     <Authors>Jellyfin Contributors</Authors>
     <PackageId>Jellyfin.Naming</PackageId>
-    <VersionPrefix>10.10.0</VersionPrefix>
+    <VersionPrefix>10.11.0</VersionPrefix>
     <RepositoryUrl>https://github.com/jellyfin/jellyfin</RepositoryUrl>
     <PackageLicenseExpression>GPL-3.0-only</PackageLicenseExpression>
   </PropertyGroup>
diff --git a/Jellyfin.Data/Jellyfin.Data.csproj b/Jellyfin.Data/Jellyfin.Data.csproj
index e24e37740..0c17d71e7 100644
--- a/Jellyfin.Data/Jellyfin.Data.csproj
+++ b/Jellyfin.Data/Jellyfin.Data.csproj
@@ -18,7 +18,7 @@
   <PropertyGroup>
     <Authors>Jellyfin Contributors</Authors>
     <PackageId>Jellyfin.Data</PackageId>
-    <VersionPrefix>10.10.0</VersionPrefix>
+    <VersionPrefix>10.11.0</VersionPrefix>
     <RepositoryUrl>https://github.com/jellyfin/jellyfin</RepositoryUrl>
     <PackageLicenseExpression>GPL-3.0-only</PackageLicenseExpression>
   </PropertyGroup>
diff --git a/MediaBrowser.Common/MediaBrowser.Common.csproj b/MediaBrowser.Common/MediaBrowser.Common.csproj
index c1945bf93..51787d6a0 100644
--- a/MediaBrowser.Common/MediaBrowser.Common.csproj
+++ b/MediaBrowser.Common/MediaBrowser.Common.csproj
@@ -8,7 +8,7 @@
   <PropertyGroup>
     <Authors>Jellyfin Contributors</Authors>
     <PackageId>Jellyfin.Common</PackageId>
-    <VersionPrefix>10.10.0</VersionPrefix>
+    <VersionPrefix>10.11.0</VersionPrefix>
     <RepositoryUrl>https://github.com/jellyfin/jellyfin</RepositoryUrl>
     <PackageLicenseExpression>GPL-3.0-only</PackageLicenseExpression>
   </PropertyGroup>
diff --git a/MediaBrowser.Controller/MediaBrowser.Controller.csproj b/MediaBrowser.Controller/MediaBrowser.Controller.csproj
index 1ef2eb343..62f36bf28 100644
--- a/MediaBrowser.Controller/MediaBrowser.Controller.csproj
+++ b/MediaBrowser.Controller/MediaBrowser.Controller.csproj
@@ -8,7 +8,7 @@
   <PropertyGroup>
     <Authors>Jellyfin Contributors</Authors>
     <PackageId>Jellyfin.Controller</PackageId>
-    <VersionPrefix>10.10.0</VersionPrefix>
+    <VersionPrefix>10.11.0</VersionPrefix>
     <RepositoryUrl>https://github.com/jellyfin/jellyfin</RepositoryUrl>
     <PackageLicenseExpression>GPL-3.0-only</PackageLicenseExpression>
   </PropertyGroup>
diff --git a/MediaBrowser.Model/MediaBrowser.Model.csproj b/MediaBrowser.Model/MediaBrowser.Model.csproj
index 9489fe190..a3a575c0f 100644
--- a/MediaBrowser.Model/MediaBrowser.Model.csproj
+++ b/MediaBrowser.Model/MediaBrowser.Model.csproj
@@ -8,7 +8,7 @@
   <PropertyGroup>
     <Authors>Jellyfin Contributors</Authors>
     <PackageId>Jellyfin.Model</PackageId>
-    <VersionPrefix>10.10.0</VersionPrefix>
+    <VersionPrefix>10.11.0</VersionPrefix>
     <RepositoryUrl>https://github.com/jellyfin/jellyfin</RepositoryUrl>
     <PackageLicenseExpression>GPL-3.0-only</PackageLicenseExpression>
   </PropertyGroup>
diff --git a/SharedVersion.cs b/SharedVersion.cs
index f98cfbc74..d26eb31ae 100644
--- a/SharedVersion.cs
+++ b/SharedVersion.cs
@@ -1,4 +1,4 @@
 using System.Reflection;
 
-[assembly: AssemblyVersion("10.10.0")]
-[assembly: AssemblyFileVersion("10.10.0")]
+[assembly: AssemblyVersion("10.11.0")]
+[assembly: AssemblyFileVersion("10.11.0")]
diff --git a/src/Jellyfin.Extensions/Jellyfin.Extensions.csproj b/src/Jellyfin.Extensions/Jellyfin.Extensions.csproj
index f786cc3b4..1a42679fc 100644
--- a/src/Jellyfin.Extensions/Jellyfin.Extensions.csproj
+++ b/src/Jellyfin.Extensions/Jellyfin.Extensions.csproj
@@ -15,7 +15,7 @@
   <PropertyGroup>
     <Authors>Jellyfin Contributors</Authors>
     <PackageId>Jellyfin.Extensions</PackageId>
-    <VersionPrefix>10.10.0</VersionPrefix>
+    <VersionPrefix>10.11.0</VersionPrefix>
     <RepositoryUrl>https://github.com/jellyfin/jellyfin</RepositoryUrl>
     <PackageLicenseExpression>GPL-3.0-only</PackageLicenseExpression>
   </PropertyGroup>
-- 
cgit v1.2.3


From 76df4c48bcc3f56d8a786fc349aa09543f7e2d9b Mon Sep 17 00:00:00 2001
From: JPVenson <github@jpb.email>
Date: Mon, 28 Oct 2024 11:54:39 +0000
Subject: Changed from ImmuntableList to ImmutableArray

---
 MediaBrowser.Controller/Entities/Movies/BoxSet.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'MediaBrowser.Controller')

diff --git a/MediaBrowser.Controller/Entities/Movies/BoxSet.cs b/MediaBrowser.Controller/Entities/Movies/BoxSet.cs
index 4cddc9125..cb17e3faf 100644
--- a/MediaBrowser.Controller/Entities/Movies/BoxSet.cs
+++ b/MediaBrowser.Controller/Entities/Movies/BoxSet.cs
@@ -131,13 +131,13 @@ namespace MediaBrowser.Controller.Entities.Movies
         public override IReadOnlyList<BaseItem> GetChildren(User user, bool includeLinkedChildren, InternalItemsQuery query)
         {
             var children = base.GetChildren(user, includeLinkedChildren, query);
-            return Sort(children, user).ToImmutableList();
+            return Sort(children, user).ToImmutableArray();
         }
 
         public override IReadOnlyList<BaseItem> GetRecursiveChildren(User user, InternalItemsQuery query)
         {
             var children = base.GetRecursiveChildren(user, query);
-            return Sort(children, user).ToImmutableList();
+            return Sort(children, user).ToImmutableArray();
         }
 
         public BoxSetInfo GetLookupInfo()
-- 
cgit v1.2.3


From 0639758abd157330c17bdc1831020bfbf6c0ce73 Mon Sep 17 00:00:00 2001
From: JPVenson <github@jpb.email>
Date: Mon, 28 Oct 2024 14:34:29 +0000
Subject: Updated all instances of ImmutableList to ImmutableArray

---
 Emby.Server.Implementations/Library/MediaSourceManager.cs         | 2 +-
 Jellyfin.Api/Controllers/YearsController.cs                       | 4 ++--
 .../MediaSegments/MediaSegmentManager.cs                          | 2 +-
 MediaBrowser.Controller/Entities/BaseItem.cs                      | 2 +-
 MediaBrowser.Controller/Entities/Folder.cs                        | 8 ++++----
 5 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'MediaBrowser.Controller')

diff --git a/Emby.Server.Implementations/Library/MediaSourceManager.cs b/Emby.Server.Implementations/Library/MediaSourceManager.cs
index 3bf1a4cde..2fb571a10 100644
--- a/Emby.Server.Implementations/Library/MediaSourceManager.cs
+++ b/Emby.Server.Implementations/Library/MediaSourceManager.cs
@@ -218,7 +218,7 @@ namespace Emby.Server.Implementations.Library
                 list.Add(source);
             }
 
-            return SortMediaSources(list).ToImmutableList();
+            return SortMediaSources(list).ToImmutableArray();
         }
 
         /// <inheritdoc />>
diff --git a/Jellyfin.Api/Controllers/YearsController.cs b/Jellyfin.Api/Controllers/YearsController.cs
index ffc34a5d9..907724e04 100644
--- a/Jellyfin.Api/Controllers/YearsController.cs
+++ b/Jellyfin.Api/Controllers/YearsController.cs
@@ -113,11 +113,11 @@ public class YearsController : BaseJellyfinApiController
 
             if (userId.IsNullOrEmpty())
             {
-                items = recursive ? folder.GetRecursiveChildren(Filter) : folder.Children.Where(Filter).ToImmutableList();
+                items = recursive ? folder.GetRecursiveChildren(Filter) : folder.Children.Where(Filter).ToImmutableArray();
             }
             else
             {
-                items = recursive ? folder.GetRecursiveChildren(user, query) : folder.GetChildren(user, true).Where(Filter).ToImmutableList();
+                items = recursive ? folder.GetRecursiveChildren(user, query) : folder.GetChildren(user, true).Where(Filter).ToImmutableArray();
             }
         }
         else
diff --git a/Jellyfin.Server.Implementations/MediaSegments/MediaSegmentManager.cs b/Jellyfin.Server.Implementations/MediaSegments/MediaSegmentManager.cs
index d641f521b..151b616f7 100644
--- a/Jellyfin.Server.Implementations/MediaSegments/MediaSegmentManager.cs
+++ b/Jellyfin.Server.Implementations/MediaSegments/MediaSegmentManager.cs
@@ -154,7 +154,7 @@ public class MediaSegmentManager : IMediaSegmentManager
         return query
             .OrderBy(e => e.StartTicks)
             .AsNoTracking()
-            .ToImmutableList()
+            .ToImmutableArray()
             .Select(Map);
     }
 
diff --git a/MediaBrowser.Controller/Entities/BaseItem.cs b/MediaBrowser.Controller/Entities/BaseItem.cs
index 054c71db7..58fae1771 100644
--- a/MediaBrowser.Controller/Entities/BaseItem.cs
+++ b/MediaBrowser.Controller/Entities/BaseItem.cs
@@ -1092,7 +1092,7 @@ namespace MediaBrowser.Controller.Entities
                 return 1;
             }).ThenBy(i => i.Video3DFormat.HasValue ? 1 : 0)
             .ThenByDescending(i => i, new MediaSourceWidthComparator())
-            .ToImmutableList();
+            .ToImmutableArray();
         }
 
         protected virtual IEnumerable<(BaseItem Item, MediaSourceType MediaSourceType)> GetAllItemsForMediaSources()
diff --git a/MediaBrowser.Controller/Entities/Folder.cs b/MediaBrowser.Controller/Entities/Folder.cs
index 1bec66f95..8fff7dbc4 100644
--- a/MediaBrowser.Controller/Entities/Folder.cs
+++ b/MediaBrowser.Controller/Entities/Folder.cs
@@ -1306,7 +1306,7 @@ namespace MediaBrowser.Controller.Entities
 
             AddChildren(user, includeLinkedChildren, result, false, query);
 
-            return result.Values.ToImmutableList();
+            return result.Values.ToImmutableArray();
         }
 
         protected virtual IEnumerable<BaseItem> GetEligibleChildrenForRecursiveChildren(User user)
@@ -1379,7 +1379,7 @@ namespace MediaBrowser.Controller.Entities
 
             AddChildren(user, true, result, true, query);
 
-            return result.Values.ToImmutableList();
+            return result.Values.ToImmutableArray();
         }
 
         /// <summary>
@@ -1407,7 +1407,7 @@ namespace MediaBrowser.Controller.Entities
 
             AddChildrenToList(result, includeLinkedChildren, true, filter);
 
-            return result.Values.ToImmutableList();
+            return result.Values.ToImmutableArray();
         }
 
         /// <summary>
@@ -1563,7 +1563,7 @@ namespace MediaBrowser.Controller.Entities
             return LinkedChildren
                 .Select(i => new Tuple<LinkedChild, BaseItem>(i, GetLinkedChild(i)))
                 .Where(i => i.Item2 is not null)
-                .ToImmutableList();
+                .ToImmutableArray();
         }
 
         protected override async Task<bool> RefreshedOwnedItems(MetadataRefreshOptions options, IReadOnlyList<FileSystemMetadata> fileSystemChildren, CancellationToken cancellationToken)
-- 
cgit v1.2.3


From d2db7004024c6bbdd541a381c673f1e0b0aebfcb Mon Sep 17 00:00:00 2001
From: Bond_009 <bond.009@outlook.com>
Date: Thu, 31 Oct 2024 17:02:06 +0100
Subject: Always await instead of directly returning Task

https://github.com/davidfowl/AspNetCoreDiagnosticScenarios/blob/master/AsyncGuidance.md#prefer-asyncawait-over-directly-returning-task

The performance impact is negligible (and it's me saying that!)
---
 .../HttpServer/WebSocketConnection.cs              | 14 ++++++-------
 .../HttpServer/WebSocketManager.cs                 |  4 ++--
 .../Session/SessionWebSocketListener.cs            |  6 +++---
 Jellyfin.Api/Controllers/DynamicHlsController.cs   |  6 +++---
 Jellyfin.Api/Formatters/CssOutputFormatter.cs      | 24 ++++------------------
 Jellyfin.Api/Formatters/XmlOutputFormatter.cs      | 15 +-------------
 .../SymlinkFollowingPhysicalFileResultExecutor.cs  | 16 ++++++++-------
 .../Entities/Audio/MusicArtist.cs                  |  6 +++---
 MediaBrowser.Controller/Entities/BaseItem.cs       | 20 ++++++++----------
 MediaBrowser.Controller/Entities/Folder.cs         | 12 +++++------
 .../Savers/PlaylistXmlSaver.cs                     |  6 +++---
 .../Plugins/AudioDb/AudioDbAlbumProvider.cs        | 12 +++++------
 .../Plugins/AudioDb/AudioDbArtistProvider.cs       |  6 +++---
 .../Plugins/StudioImages/StudiosImageProvider.cs   |  4 ++--
 14 files changed, 60 insertions(+), 91 deletions(-)

(limited to 'MediaBrowser.Controller')

diff --git a/Emby.Server.Implementations/HttpServer/WebSocketConnection.cs b/Emby.Server.Implementations/HttpServer/WebSocketConnection.cs
index cb6f7e1d3..a720c86fb 100644
--- a/Emby.Server.Implementations/HttpServer/WebSocketConnection.cs
+++ b/Emby.Server.Implementations/HttpServer/WebSocketConnection.cs
@@ -82,17 +82,17 @@ namespace Emby.Server.Implementations.HttpServer
         public WebSocketState State => _socket.State;
 
         /// <inheritdoc />
-        public Task SendAsync(OutboundWebSocketMessage message, CancellationToken cancellationToken)
+        public async Task SendAsync(OutboundWebSocketMessage message, CancellationToken cancellationToken)
         {
             var json = JsonSerializer.SerializeToUtf8Bytes(message, _jsonOptions);
-            return _socket.SendAsync(json, WebSocketMessageType.Text, true, cancellationToken);
+            await _socket.SendAsync(json, WebSocketMessageType.Text, true, cancellationToken).ConfigureAwait(false);
         }
 
         /// <inheritdoc />
-        public Task SendAsync<T>(OutboundWebSocketMessage<T> message, CancellationToken cancellationToken)
+        public async Task SendAsync<T>(OutboundWebSocketMessage<T> message, CancellationToken cancellationToken)
         {
             var json = JsonSerializer.SerializeToUtf8Bytes(message, _jsonOptions);
-            return _socket.SendAsync(json, WebSocketMessageType.Text, true, cancellationToken);
+            await _socket.SendAsync(json, WebSocketMessageType.Text, true, cancellationToken).ConfigureAwait(false);
         }
 
         /// <inheritdoc />
@@ -224,12 +224,12 @@ namespace Emby.Server.Implementations.HttpServer
             return ret;
         }
 
-        private Task SendKeepAliveResponse()
+        private async Task SendKeepAliveResponse()
         {
             LastKeepAliveDate = DateTime.UtcNow;
-            return SendAsync(
+            await SendAsync(
                 new OutboundKeepAliveMessage(),
-                CancellationToken.None);
+                CancellationToken.None).ConfigureAwait(false);
         }
 
         /// <inheritdoc />
diff --git a/Emby.Server.Implementations/HttpServer/WebSocketManager.cs b/Emby.Server.Implementations/HttpServer/WebSocketManager.cs
index 774d3563c..cb5b3993b 100644
--- a/Emby.Server.Implementations/HttpServer/WebSocketManager.cs
+++ b/Emby.Server.Implementations/HttpServer/WebSocketManager.cs
@@ -84,7 +84,7 @@ namespace Emby.Server.Implementations.HttpServer
         /// Processes the web socket message received.
         /// </summary>
         /// <param name="result">The result.</param>
-        private Task ProcessWebSocketMessageReceived(WebSocketMessageInfo result)
+        private async Task ProcessWebSocketMessageReceived(WebSocketMessageInfo result)
         {
             var tasks = new Task[_webSocketListeners.Length];
             for (var i = 0; i < _webSocketListeners.Length; ++i)
@@ -92,7 +92,7 @@ namespace Emby.Server.Implementations.HttpServer
                 tasks[i] = _webSocketListeners[i].ProcessMessageAsync(result);
             }
 
-            return Task.WhenAll(tasks);
+            await Task.WhenAll(tasks).ConfigureAwait(false);
         }
     }
 }
diff --git a/Emby.Server.Implementations/Session/SessionWebSocketListener.cs b/Emby.Server.Implementations/Session/SessionWebSocketListener.cs
index aba51de8f..75a50f7f5 100644
--- a/Emby.Server.Implementations/Session/SessionWebSocketListener.cs
+++ b/Emby.Server.Implementations/Session/SessionWebSocketListener.cs
@@ -276,11 +276,11 @@ namespace Emby.Server.Implementations.Session
         /// </summary>
         /// <param name="webSocket">The WebSocket.</param>
         /// <returns>Task.</returns>
-        private Task SendForceKeepAlive(IWebSocketConnection webSocket)
+        private async Task SendForceKeepAlive(IWebSocketConnection webSocket)
         {
-            return webSocket.SendAsync(
+            await webSocket.SendAsync(
                 new ForceKeepAliveMessage(WebSocketLostTimeout),
-                CancellationToken.None);
+                CancellationToken.None).ConfigureAwait(false);
         }
     }
 }
diff --git a/Jellyfin.Api/Controllers/DynamicHlsController.cs b/Jellyfin.Api/Controllers/DynamicHlsController.cs
index 54e0527c9..948592712 100644
--- a/Jellyfin.Api/Controllers/DynamicHlsController.cs
+++ b/Jellyfin.Api/Controllers/DynamicHlsController.cs
@@ -2059,16 +2059,16 @@ public class DynamicHlsController : BaseJellyfinApiController
         }
     }
 
-    private Task DeleteLastFile(string playlistPath, string segmentExtension, int retryCount)
+    private async Task DeleteLastFile(string playlistPath, string segmentExtension, int retryCount)
     {
         var file = GetLastTranscodingFile(playlistPath, segmentExtension, _fileSystem);
 
         if (file is null)
         {
-            return Task.CompletedTask;
+            return;
         }
 
-        return DeleteFile(file.FullName, retryCount);
+        await DeleteFile(file.FullName, retryCount).ConfigureAwait(false);
     }
 
     private async Task DeleteFile(string path, int retryCount)
diff --git a/Jellyfin.Api/Formatters/CssOutputFormatter.cs b/Jellyfin.Api/Formatters/CssOutputFormatter.cs
index 495f771e1..9ad1c863e 100644
--- a/Jellyfin.Api/Formatters/CssOutputFormatter.cs
+++ b/Jellyfin.Api/Formatters/CssOutputFormatter.cs
@@ -1,6 +1,4 @@
-using System.Text;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Http;
+using System.Net.Mime;
 using Microsoft.AspNetCore.Mvc.Formatters;
 
 namespace Jellyfin.Api.Formatters;
@@ -8,28 +6,14 @@ namespace Jellyfin.Api.Formatters;
 /// <summary>
 /// Css output formatter.
 /// </summary>
-public class CssOutputFormatter : TextOutputFormatter
+public sealed class CssOutputFormatter : StringOutputFormatter
 {
     /// <summary>
     /// Initializes a new instance of the <see cref="CssOutputFormatter"/> class.
     /// </summary>
     public CssOutputFormatter()
     {
-        SupportedMediaTypes.Add("text/css");
-
-        SupportedEncodings.Add(Encoding.UTF8);
-        SupportedEncodings.Add(Encoding.Unicode);
-    }
-
-    /// <summary>
-    /// Write context object to stream.
-    /// </summary>
-    /// <param name="context">Writer context.</param>
-    /// <param name="selectedEncoding">Unused. Writer encoding.</param>
-    /// <returns>Write stream task.</returns>
-    public override Task WriteResponseBodyAsync(OutputFormatterWriteContext context, Encoding selectedEncoding)
-    {
-        var stringResponse = context.Object?.ToString();
-        return stringResponse is null ? Task.CompletedTask : context.HttpContext.Response.WriteAsync(stringResponse);
+        SupportedMediaTypes.Clear();
+        SupportedMediaTypes.Add(MediaTypeNames.Text.Css);
     }
 }
diff --git a/Jellyfin.Api/Formatters/XmlOutputFormatter.cs b/Jellyfin.Api/Formatters/XmlOutputFormatter.cs
index 1c9feedcb..8dbb91d0a 100644
--- a/Jellyfin.Api/Formatters/XmlOutputFormatter.cs
+++ b/Jellyfin.Api/Formatters/XmlOutputFormatter.cs
@@ -1,7 +1,4 @@
 using System.Net.Mime;
-using System.Text;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc.Formatters;
 
 namespace Jellyfin.Api.Formatters;
@@ -9,7 +6,7 @@ namespace Jellyfin.Api.Formatters;
 /// <summary>
 /// Xml output formatter.
 /// </summary>
-public class XmlOutputFormatter : TextOutputFormatter
+public sealed class XmlOutputFormatter : StringOutputFormatter
 {
     /// <summary>
     /// Initializes a new instance of the <see cref="XmlOutputFormatter"/> class.
@@ -18,15 +15,5 @@ public class XmlOutputFormatter : TextOutputFormatter
     {
         SupportedMediaTypes.Clear();
         SupportedMediaTypes.Add(MediaTypeNames.Text.Xml);
-
-        SupportedEncodings.Add(Encoding.UTF8);
-        SupportedEncodings.Add(Encoding.Unicode);
-    }
-
-    /// <inheritdoc />
-    public override Task WriteResponseBodyAsync(OutputFormatterWriteContext context, Encoding selectedEncoding)
-    {
-        var stringResponse = context.Object?.ToString();
-        return stringResponse is null ? Task.CompletedTask : context.HttpContext.Response.WriteAsync(stringResponse);
     }
 }
diff --git a/Jellyfin.Server/Infrastructure/SymlinkFollowingPhysicalFileResultExecutor.cs b/Jellyfin.Server/Infrastructure/SymlinkFollowingPhysicalFileResultExecutor.cs
index 801026c54..999e08384 100644
--- a/Jellyfin.Server/Infrastructure/SymlinkFollowingPhysicalFileResultExecutor.cs
+++ b/Jellyfin.Server/Infrastructure/SymlinkFollowingPhysicalFileResultExecutor.cs
@@ -67,38 +67,40 @@ namespace Jellyfin.Server.Infrastructure
         }
 
         /// <inheritdoc />
-        protected override Task WriteFileAsync(ActionContext context, PhysicalFileResult result, RangeItemHeaderValue? range, long rangeLength)
+        protected override async Task WriteFileAsync(ActionContext context, PhysicalFileResult result, RangeItemHeaderValue? range, long rangeLength)
         {
             ArgumentNullException.ThrowIfNull(context);
             ArgumentNullException.ThrowIfNull(result);
 
             if (range is not null && rangeLength == 0)
             {
-                return Task.CompletedTask;
+                return;
             }
 
             // It's a bit of wasted IO to perform this check again, but non-symlinks shouldn't use this code
             if (!IsSymLink(result.FileName))
             {
-                return base.WriteFileAsync(context, result, range, rangeLength);
+                await base.WriteFileAsync(context, result, range, rangeLength).ConfigureAwait(false);
+                return;
             }
 
             var response = context.HttpContext.Response;
 
             if (range is not null)
             {
-                return SendFileAsync(
+                await SendFileAsync(
                     result.FileName,
                     response,
                     offset: range.From ?? 0L,
-                    count: rangeLength);
+                    count: rangeLength).ConfigureAwait(false);
+                return;
             }
 
-            return SendFileAsync(
+            await SendFileAsync(
                 result.FileName,
                 response,
                 offset: 0,
-                count: null);
+                count: null).ConfigureAwait(false);
         }
 
         private async Task SendFileAsync(string filePath, HttpResponse response, long offset, long? count)
diff --git a/MediaBrowser.Controller/Entities/Audio/MusicArtist.cs b/MediaBrowser.Controller/Entities/Audio/MusicArtist.cs
index 1ab6c9706..5b7b03de2 100644
--- a/MediaBrowser.Controller/Entities/Audio/MusicArtist.cs
+++ b/MediaBrowser.Controller/Entities/Audio/MusicArtist.cs
@@ -110,15 +110,15 @@ namespace MediaBrowser.Controller.Entities.Audio
             return base.IsSaveLocalMetadataEnabled();
         }
 
-        protected override Task ValidateChildrenInternal(IProgress<double> progress, bool recursive, bool refreshChildMetadata, bool allowRemoveRoot, MetadataRefreshOptions refreshOptions, IDirectoryService directoryService, CancellationToken cancellationToken)
+        protected override async Task ValidateChildrenInternal(IProgress<double> progress, bool recursive, bool refreshChildMetadata, bool allowRemoveRoot, MetadataRefreshOptions refreshOptions, IDirectoryService directoryService, CancellationToken cancellationToken)
         {
             if (IsAccessedByName)
             {
                 // Should never get in here anyway
-                return Task.CompletedTask;
+                return;
             }
 
-            return base.ValidateChildrenInternal(progress, recursive, refreshChildMetadata, false, refreshOptions, directoryService, cancellationToken);
+            await base.ValidateChildrenInternal(progress, recursive, refreshChildMetadata, false, refreshOptions, directoryService, cancellationToken).ConfigureAwait(false);
         }
 
         public override List<string> GetUserDataKeys()
diff --git a/MediaBrowser.Controller/Entities/BaseItem.cs b/MediaBrowser.Controller/Entities/BaseItem.cs
index eb605f6c8..a9caa8453 100644
--- a/MediaBrowser.Controller/Entities/BaseItem.cs
+++ b/MediaBrowser.Controller/Entities/BaseItem.cs
@@ -1977,8 +1977,8 @@ namespace MediaBrowser.Controller.Entities
             ImageInfos = [..ImageInfos, image];
         }
 
-        public virtual Task UpdateToRepositoryAsync(ItemUpdateType updateReason, CancellationToken cancellationToken)
-         => LibraryManager.UpdateItemAsync(this, GetParent(), updateReason, cancellationToken);
+        public virtual async Task UpdateToRepositoryAsync(ItemUpdateType updateReason, CancellationToken cancellationToken)
+         => await LibraryManager.UpdateItemAsync(this, GetParent(), updateReason, cancellationToken).ConfigureAwait(false);
 
         /// <summary>
         /// Validates that images within the item are still on the filesystem.
@@ -2367,7 +2367,7 @@ namespace MediaBrowser.Controller.Entities
             }
         }
 
-        protected Task RefreshMetadataForOwnedItem(BaseItem ownedItem, bool copyTitleMetadata, MetadataRefreshOptions options, CancellationToken cancellationToken)
+        protected async Task RefreshMetadataForOwnedItem(BaseItem ownedItem, bool copyTitleMetadata, MetadataRefreshOptions options, CancellationToken cancellationToken)
         {
             var newOptions = new MetadataRefreshOptions(options)
             {
@@ -2428,10 +2428,10 @@ namespace MediaBrowser.Controller.Entities
                 }
             }
 
-            return ownedItem.RefreshMetadata(newOptions, cancellationToken);
+            await ownedItem.RefreshMetadata(newOptions, cancellationToken).ConfigureAwait(false);
         }
 
-        protected Task RefreshMetadataForOwnedVideo(MetadataRefreshOptions options, bool copyTitleMetadata, string path, CancellationToken cancellationToken)
+        protected async Task RefreshMetadataForOwnedVideo(MetadataRefreshOptions options, bool copyTitleMetadata, string path, CancellationToken cancellationToken)
         {
             var newOptions = new MetadataRefreshOptions(options)
             {
@@ -2441,9 +2441,7 @@ namespace MediaBrowser.Controller.Entities
             var id = LibraryManager.GetNewItemId(path, typeof(Video));
 
             // Try to retrieve it from the db. If we don't find it, use the resolved version
-            var video = LibraryManager.GetItemById(id) as Video;
-
-            if (video is null)
+            if (LibraryManager.GetItemById(id) is not Video video)
             {
                 video = LibraryManager.ResolvePath(FileSystem.GetFileSystemInfo(path)) as Video;
 
@@ -2452,15 +2450,15 @@ namespace MediaBrowser.Controller.Entities
 
             if (video is null)
             {
-                return Task.FromResult(true);
+                return;
             }
 
             if (video.OwnerId.IsEmpty())
             {
-                video.OwnerId = this.Id;
+                video.OwnerId = Id;
             }
 
-            return RefreshMetadataForOwnedItem(video, copyTitleMetadata, newOptions, cancellationToken);
+            await RefreshMetadataForOwnedItem(video, copyTitleMetadata, newOptions, cancellationToken).ConfigureAwait(false);
         }
 
         public string GetEtag(User user)
diff --git a/MediaBrowser.Controller/Entities/Folder.cs b/MediaBrowser.Controller/Entities/Folder.cs
index 83c19a54e..41e26fc9a 100644
--- a/MediaBrowser.Controller/Entities/Folder.cs
+++ b/MediaBrowser.Controller/Entities/Folder.cs
@@ -528,13 +528,13 @@ namespace MediaBrowser.Controller.Entities
             }
         }
 
-        private Task RefreshMetadataRecursive(IList<BaseItem> children, MetadataRefreshOptions refreshOptions, bool recursive, IProgress<double> progress, CancellationToken cancellationToken)
+        private async Task RefreshMetadataRecursive(IList<BaseItem> children, MetadataRefreshOptions refreshOptions, bool recursive, IProgress<double> progress, CancellationToken cancellationToken)
         {
-            return RunTasks(
+            await RunTasks(
                 (baseItem, innerProgress) => RefreshChildMetadata(baseItem, refreshOptions, recursive && baseItem.IsFolder, innerProgress, cancellationToken),
                 children,
                 progress,
-                cancellationToken);
+                cancellationToken).ConfigureAwait(false);
         }
 
         private async Task RefreshAllMetadataForContainer(IMetadataContainer container, MetadataRefreshOptions refreshOptions, IProgress<double> progress, CancellationToken cancellationToken)
@@ -575,13 +575,13 @@ namespace MediaBrowser.Controller.Entities
         /// <param name="progress">The progress.</param>
         /// <param name="cancellationToken">The cancellation token.</param>
         /// <returns>Task.</returns>
-        private Task ValidateSubFolders(IList<Folder> children, IDirectoryService directoryService, IProgress<double> progress, CancellationToken cancellationToken)
+        private async Task ValidateSubFolders(IList<Folder> children, IDirectoryService directoryService, IProgress<double> progress, CancellationToken cancellationToken)
         {
-            return RunTasks(
+            await RunTasks(
                 (folder, innerProgress) => folder.ValidateChildrenInternal(innerProgress, true, false, false, null, directoryService, cancellationToken),
                 children,
                 progress,
-                cancellationToken);
+                cancellationToken).ConfigureAwait(false);
         }
 
         /// <summary>
diff --git a/MediaBrowser.LocalMetadata/Savers/PlaylistXmlSaver.cs b/MediaBrowser.LocalMetadata/Savers/PlaylistXmlSaver.cs
index 3f018cae9..ae767a72a 100644
--- a/MediaBrowser.LocalMetadata/Savers/PlaylistXmlSaver.cs
+++ b/MediaBrowser.LocalMetadata/Savers/PlaylistXmlSaver.cs
@@ -45,16 +45,16 @@ namespace MediaBrowser.LocalMetadata.Savers
         }
 
         /// <inheritdoc />
-        protected override Task WriteCustomElementsAsync(BaseItem item, XmlWriter writer)
+        protected override async Task WriteCustomElementsAsync(BaseItem item, XmlWriter writer)
         {
             var game = (Playlist)item;
 
             if (game.PlaylistMediaType == MediaType.Unknown)
             {
-                return Task.CompletedTask;
+                return;
             }
 
-            return writer.WriteElementStringAsync(null, "PlaylistMediaType", null, game.PlaylistMediaType.ToString());
+            await writer.WriteElementStringAsync(null, "PlaylistMediaType", null, game.PlaylistMediaType.ToString()).ConfigureAwait(false);
         }
 
         /// <inheritdoc />
diff --git a/MediaBrowser.Providers/Plugins/AudioDb/AudioDbAlbumProvider.cs b/MediaBrowser.Providers/Plugins/AudioDb/AudioDbAlbumProvider.cs
index daad9706c..ff30af879 100644
--- a/MediaBrowser.Providers/Plugins/AudioDb/AudioDbAlbumProvider.cs
+++ b/MediaBrowser.Providers/Plugins/AudioDb/AudioDbAlbumProvider.cs
@@ -148,21 +148,19 @@ namespace MediaBrowser.Providers.Plugins.AudioDb
             item.Overview = (overview ?? string.Empty).StripHtml();
         }
 
-        internal Task EnsureInfo(string musicBrainzReleaseGroupId, CancellationToken cancellationToken)
+        internal async Task EnsureInfo(string musicBrainzReleaseGroupId, CancellationToken cancellationToken)
         {
             var xmlPath = GetAlbumInfoPath(_config.ApplicationPaths, musicBrainzReleaseGroupId);
 
             var fileInfo = _fileSystem.GetFileSystemInfo(xmlPath);
 
-            if (fileInfo.Exists)
+            if (fileInfo.Exists
+                && (DateTime.UtcNow - _fileSystem.GetLastWriteTimeUtc(fileInfo)).TotalDays <= 2)
             {
-                if ((DateTime.UtcNow - _fileSystem.GetLastWriteTimeUtc(fileInfo)).TotalDays <= 2)
-                {
-                    return Task.CompletedTask;
-                }
+                return;
             }
 
-            return DownloadInfo(musicBrainzReleaseGroupId, cancellationToken);
+            await DownloadInfo(musicBrainzReleaseGroupId, cancellationToken).ConfigureAwait(false);
         }
 
         internal async Task DownloadInfo(string musicBrainzReleaseGroupId, CancellationToken cancellationToken)
diff --git a/MediaBrowser.Providers/Plugins/AudioDb/AudioDbArtistProvider.cs b/MediaBrowser.Providers/Plugins/AudioDb/AudioDbArtistProvider.cs
index 92742b1aa..00bd96282 100644
--- a/MediaBrowser.Providers/Plugins/AudioDb/AudioDbArtistProvider.cs
+++ b/MediaBrowser.Providers/Plugins/AudioDb/AudioDbArtistProvider.cs
@@ -131,7 +131,7 @@ namespace MediaBrowser.Providers.Plugins.AudioDb
             item.Overview = (overview ?? string.Empty).StripHtml();
         }
 
-        internal Task EnsureArtistInfo(string musicBrainzId, CancellationToken cancellationToken)
+        internal async Task EnsureArtistInfo(string musicBrainzId, CancellationToken cancellationToken)
         {
             var xmlPath = GetArtistInfoPath(_config.ApplicationPaths, musicBrainzId);
 
@@ -140,10 +140,10 @@ namespace MediaBrowser.Providers.Plugins.AudioDb
             if (fileInfo.Exists
                 && (DateTime.UtcNow - _fileSystem.GetLastWriteTimeUtc(fileInfo)).TotalDays <= 2)
             {
-                return Task.CompletedTask;
+                return;
             }
 
-            return DownloadArtistInfo(musicBrainzId, cancellationToken);
+            await DownloadArtistInfo(musicBrainzId, cancellationToken).ConfigureAwait(false);
         }
 
         internal async Task DownloadArtistInfo(string musicBrainzId, CancellationToken cancellationToken)
diff --git a/MediaBrowser.Providers/Plugins/StudioImages/StudiosImageProvider.cs b/MediaBrowser.Providers/Plugins/StudioImages/StudiosImageProvider.cs
index 5ca9f6f9a..a50d69df5 100644
--- a/MediaBrowser.Providers/Plugins/StudioImages/StudiosImageProvider.cs
+++ b/MediaBrowser.Providers/Plugins/StudioImages/StudiosImageProvider.cs
@@ -101,11 +101,11 @@ namespace MediaBrowser.Providers.Plugins.StudioImages
             return string.Format(CultureInfo.InvariantCulture, "{0}/images/{1}/{2}.jpg", GetRepositoryUrl(), image, filename);
         }
 
-        private Task EnsureThumbsList(string file, CancellationToken cancellationToken)
+        private async Task EnsureThumbsList(string file, CancellationToken cancellationToken)
         {
             string url = string.Format(CultureInfo.InvariantCulture, "{0}/thumbs.txt", GetRepositoryUrl());
 
-            return EnsureList(url, file, _fileSystem, cancellationToken);
+            await EnsureList(url, file, _fileSystem, cancellationToken).ConfigureAwait(false);
         }
 
         /// <inheritdoc />
-- 
cgit v1.2.3


From 46fb6c157931309147b5267a54074c8228759419 Mon Sep 17 00:00:00 2001
From: gnattu <gnattu@users.noreply.github.com>
Date: Sun, 3 Nov 2024 10:55:53 -0500
Subject: Backport pull request #12940 from jellyfin/release-10.10.z

Remove DynamicImageResponse local image after saved to metadata folder

Original-merge: 3a9b48a2aa535d38ad9e8937345b4e610b426606

Merged-by: joshuaboniface <joshua@boniface.me>

Backported-by: Joshua M. Boniface <joshua@boniface.me>
---
 .../Images/BaseDynamicImageProvider.cs              |  1 -
 .../Providers/IProviderManager.cs                   |  3 ++-
 MediaBrowser.Providers/Manager/ItemImageProvider.cs |  4 +---
 MediaBrowser.Providers/Manager/ProviderManager.cs   | 21 ++++++++++++++++++---
 .../Manager/ItemImageProviderTests.cs               |  3 +++
 5 files changed, 24 insertions(+), 8 deletions(-)

(limited to 'MediaBrowser.Controller')

diff --git a/Emby.Server.Implementations/Images/BaseDynamicImageProvider.cs b/Emby.Server.Implementations/Images/BaseDynamicImageProvider.cs
index 82db7c46b..0a3d740cc 100644
--- a/Emby.Server.Implementations/Images/BaseDynamicImageProvider.cs
+++ b/Emby.Server.Implementations/Images/BaseDynamicImageProvider.cs
@@ -122,7 +122,6 @@ namespace Emby.Server.Implementations.Images
             }
 
             await ProviderManager.SaveImage(item, outputPath, mimeType, imageType, null, false, cancellationToken).ConfigureAwait(false);
-            File.Delete(outputPath);
 
             return ItemUpdateType.ImageUpdate;
         }
diff --git a/MediaBrowser.Controller/Providers/IProviderManager.cs b/MediaBrowser.Controller/Providers/IProviderManager.cs
index 38fc5f2cc..0d3a334df 100644
--- a/MediaBrowser.Controller/Providers/IProviderManager.cs
+++ b/MediaBrowser.Controller/Providers/IProviderManager.cs
@@ -77,7 +77,8 @@ namespace MediaBrowser.Controller.Providers
         Task SaveImage(BaseItem item, Stream source, string mimeType, ImageType type, int? imageIndex, CancellationToken cancellationToken);
 
         /// <summary>
-        /// Saves the image.
+        /// Saves the image by giving the image path on filesystem.
+        /// This method will remove the image on the source path after saving it to the destination.
         /// </summary>
         /// <param name="item">Image to save.</param>
         /// <param name="source">Source of image.</param>
diff --git a/MediaBrowser.Providers/Manager/ItemImageProvider.cs b/MediaBrowser.Providers/Manager/ItemImageProvider.cs
index 9b738ce6f..64954818a 100644
--- a/MediaBrowser.Providers/Manager/ItemImageProvider.cs
+++ b/MediaBrowser.Providers/Manager/ItemImageProvider.cs
@@ -229,9 +229,7 @@ namespace MediaBrowser.Providers.Manager
                                 {
                                     var mimeType = MimeTypes.GetMimeType(response.Path);
 
-                                    var stream = AsyncFile.OpenRead(response.Path);
-
-                                    await _providerManager.SaveImage(item, stream, mimeType, imageType, null, cancellationToken).ConfigureAwait(false);
+                                    await _providerManager.SaveImage(item, response.Path, mimeType, imageType, null, null, cancellationToken).ConfigureAwait(false);
                                 }
                             }
 
diff --git a/MediaBrowser.Providers/Manager/ProviderManager.cs b/MediaBrowser.Providers/Manager/ProviderManager.cs
index 81a9af68b..c5689550d 100644
--- a/MediaBrowser.Providers/Manager/ProviderManager.cs
+++ b/MediaBrowser.Providers/Manager/ProviderManager.cs
@@ -7,6 +7,7 @@ using System.Linq;
 using System.Net;
 using System.Net.Http;
 using System.Net.Mime;
+using System.Runtime.ExceptionServices;
 using System.Threading;
 using System.Threading.Tasks;
 using AsyncKeyedLock;
@@ -251,15 +252,29 @@ namespace MediaBrowser.Providers.Manager
         }
 
         /// <inheritdoc/>
-        public Task SaveImage(BaseItem item, string source, string mimeType, ImageType type, int? imageIndex, bool? saveLocallyWithMedia, CancellationToken cancellationToken)
+        public async Task SaveImage(BaseItem item, string source, string mimeType, ImageType type, int? imageIndex, bool? saveLocallyWithMedia, CancellationToken cancellationToken)
         {
             if (string.IsNullOrWhiteSpace(source))
             {
                 throw new ArgumentNullException(nameof(source));
             }
 
-            var fileStream = AsyncFile.OpenRead(source);
-            return new ImageSaver(_configurationManager, _libraryMonitor, _fileSystem, _logger).SaveImage(item, fileStream, mimeType, type, imageIndex, saveLocallyWithMedia, cancellationToken);
+            try
+            {
+                var fileStream = AsyncFile.OpenRead(source);
+                await new ImageSaver(_configurationManager, _libraryMonitor, _fileSystem, _logger).SaveImage(item, fileStream, mimeType, type, imageIndex, saveLocallyWithMedia, cancellationToken);
+            }
+            finally
+            {
+                try
+                {
+                    File.Delete(source);
+                }
+                catch (Exception ex)
+                {
+                    _logger.LogError(ex, "Source file {Source} not found or in use, skip removing", source);
+                }
+            }
         }
 
         /// <inheritdoc/>
diff --git a/tests/Jellyfin.Providers.Tests/Manager/ItemImageProviderTests.cs b/tests/Jellyfin.Providers.Tests/Manager/ItemImageProviderTests.cs
index 0c7d2487c..0d99e9af0 100644
--- a/tests/Jellyfin.Providers.Tests/Manager/ItemImageProviderTests.cs
+++ b/tests/Jellyfin.Providers.Tests/Manager/ItemImageProviderTests.cs
@@ -292,6 +292,9 @@ namespace Jellyfin.Providers.Tests.Manager
             providerManager.Setup(pm => pm.SaveImage(item, It.IsAny<Stream>(), It.IsAny<string>(), imageType, null, It.IsAny<CancellationToken>()))
                 .Callback<BaseItem, Stream, string, ImageType, int?, CancellationToken>((callbackItem, _, _, callbackType, _, _) => callbackItem.SetImagePath(callbackType, 0, new FileSystemMetadata()))
                 .Returns(Task.CompletedTask);
+            providerManager.Setup(pm => pm.SaveImage(item, It.IsAny<string>(), It.IsAny<string>(), imageType, null, null, It.IsAny<CancellationToken>()))
+                .Callback<BaseItem, string, string, ImageType, int?, bool?, CancellationToken>((callbackItem, _, _, callbackType, _, _, _) => callbackItem.SetImagePath(callbackType, 0, new FileSystemMetadata()))
+                .Returns(Task.CompletedTask);
             var itemImageProvider = GetItemImageProvider(providerManager.Object, null);
             var result = await itemImageProvider.RefreshImages(item, libraryOptions, new List<IImageProvider> { dynamicProvider.Object }, refreshOptions, CancellationToken.None);
 
-- 
cgit v1.2.3


From 4959232b271ca83b6a38571f7cbb7a1ce112ab2f Mon Sep 17 00:00:00 2001
From: JPVenson <github@jpb.email>
Date: Sun, 10 Nov 2024 19:28:41 +0000
Subject: Fixed tags aggregation

---
 MediaBrowser.Controller/Entities/BaseItem.cs | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

(limited to 'MediaBrowser.Controller')

diff --git a/MediaBrowser.Controller/Entities/BaseItem.cs b/MediaBrowser.Controller/Entities/BaseItem.cs
index 58fae1771..7b279fa69 100644
--- a/MediaBrowser.Controller/Entities/BaseItem.cs
+++ b/MediaBrowser.Controller/Entities/BaseItem.cs
@@ -1588,16 +1588,26 @@ namespace MediaBrowser.Controller.Entities
         public List<string> GetInheritedTags()
         {
             var list = new List<string>();
-            list.AddRange(Tags);
+            if (Tags is not null)
+            {
+                list.AddRange(Tags);
+            }
 
             foreach (var parent in GetParents())
             {
-                list.AddRange(parent.Tags);
+                if (parent.Tags is not null)
+                {
+                    list.AddRange(parent.Tags);
+                }
             }
 
             foreach (var folder in LibraryManager.GetCollectionFolders(this))
             {
-                list.AddRange(folder.Tags);
+                if (folder.Tags is not null)
+                {
+                    list.AddRange(folder.Tags);
+                }
+
             }
 
             return list.Distinct(StringComparer.OrdinalIgnoreCase).ToList();
@@ -1785,7 +1795,7 @@ namespace MediaBrowser.Controller.Entities
                 }
                 else
                 {
-                    Studios = [..current, name];
+                    Studios = [.. current, name];
                 }
             }
         }
@@ -1807,7 +1817,7 @@ namespace MediaBrowser.Controller.Entities
             var genres = Genres;
             if (!genres.Contains(name, StringComparison.OrdinalIgnoreCase))
             {
-                Genres = [..genres, name];
+                Genres = [.. genres, name];
             }
         }
 
@@ -1978,7 +1988,7 @@ namespace MediaBrowser.Controller.Entities
 
         public void AddImage(ItemImageInfo image)
         {
-            ImageInfos = [..ImageInfos, image];
+            ImageInfos = [.. ImageInfos, image];
         }
 
         public virtual Task UpdateToRepositoryAsync(ItemUpdateType updateReason, CancellationToken cancellationToken)
-- 
cgit v1.2.3


From dfbbbf023d7dbbb7bedb9cd8c30cb8acb584a00f Mon Sep 17 00:00:00 2001
From: JPVenson <github@jpb.email>
Date: Sun, 10 Nov 2024 20:10:59 +0000
Subject: reverted tag enumeration

---
 MediaBrowser.Controller/Entities/BaseItem.cs | 16 +++-------------
 1 file changed, 3 insertions(+), 13 deletions(-)

(limited to 'MediaBrowser.Controller')

diff --git a/MediaBrowser.Controller/Entities/BaseItem.cs b/MediaBrowser.Controller/Entities/BaseItem.cs
index 7b279fa69..0c698bb94 100644
--- a/MediaBrowser.Controller/Entities/BaseItem.cs
+++ b/MediaBrowser.Controller/Entities/BaseItem.cs
@@ -1588,26 +1588,16 @@ namespace MediaBrowser.Controller.Entities
         public List<string> GetInheritedTags()
         {
             var list = new List<string>();
-            if (Tags is not null)
-            {
-                list.AddRange(Tags);
-            }
+            list.AddRange(Tags);
 
             foreach (var parent in GetParents())
             {
-                if (parent.Tags is not null)
-                {
-                    list.AddRange(parent.Tags);
-                }
+                list.AddRange(parent.Tags);
             }
 
             foreach (var folder in LibraryManager.GetCollectionFolders(this))
             {
-                if (folder.Tags is not null)
-                {
-                    list.AddRange(folder.Tags);
-                }
-
+                list.AddRange(folder.Tags);
             }
 
             return list.Distinct(StringComparer.OrdinalIgnoreCase).ToList();
-- 
cgit v1.2.3


From 2d4f7f725fb3d93dfa21f0ce4c48d292575d6fb1 Mon Sep 17 00:00:00 2001
From: JPVenson <github@jpb.email>
Date: Mon, 11 Nov 2024 00:27:30 +0000
Subject: Fixed TopParent not beeing migrated

---
 .../EntryPoints/UserDataChangeNotifier.cs                     |  6 ++++++
 Emby.Server.Implementations/Library/UserDataManager.cs        | 11 ++++++++---
 Jellyfin.Api/Controllers/ItemsController.cs                   |  8 ++++----
 Jellyfin.Api/Controllers/PlaystateController.cs               |  2 +-
 Jellyfin.Api/Controllers/UserLibraryController.cs             |  4 ++--
 Jellyfin.Server.Implementations/Item/BaseItemRepository.cs    |  6 +++---
 Jellyfin.Server/Migrations/Routines/MigrateLibraryDb.cs       |  7 ++++++-
 MediaBrowser.Controller/Library/IUserDataManager.cs           |  4 ++--
 8 files changed, 32 insertions(+), 16 deletions(-)

(limited to 'MediaBrowser.Controller')

diff --git a/Emby.Server.Implementations/EntryPoints/UserDataChangeNotifier.cs b/Emby.Server.Implementations/EntryPoints/UserDataChangeNotifier.cs
index aef02ce6b..9646f13e9 100644
--- a/Emby.Server.Implementations/EntryPoints/UserDataChangeNotifier.cs
+++ b/Emby.Server.Implementations/EntryPoints/UserDataChangeNotifier.cs
@@ -144,9 +144,15 @@ namespace Emby.Server.Implementations.EntryPoints
                     .Select(i =>
                     {
                         var dto = _userDataManager.GetUserDataDto(i, user);
+                        if (dto is null)
+                        {
+                            return null!;
+                        }
+
                         dto.ItemId = i.Id;
                         return dto;
                     })
+                    .Where(e => e is not null)
                     .ToArray()
             };
         }
diff --git a/Emby.Server.Implementations/Library/UserDataManager.cs b/Emby.Server.Implementations/Library/UserDataManager.cs
index aec2773e3..371fc22c7 100644
--- a/Emby.Server.Implementations/Library/UserDataManager.cs
+++ b/Emby.Server.Implementations/Library/UserDataManager.cs
@@ -224,13 +224,18 @@ namespace Emby.Server.Implementations.Library
         }
 
         /// <inheritdoc />
-        public UserItemDataDto GetUserDataDto(BaseItem item, User user)
+        public UserItemDataDto? GetUserDataDto(BaseItem item, User user)
             => GetUserDataDto(item, null, user, new DtoOptions());
 
         /// <inheritdoc />
-        public UserItemDataDto GetUserDataDto(BaseItem item, BaseItemDto? itemDto, User user, DtoOptions options)
+        public UserItemDataDto? GetUserDataDto(BaseItem item, BaseItemDto? itemDto, User user, DtoOptions options)
         {
-            var userData = GetUserData(user, item) ?? throw new InvalidOperationException("Did not expect UserData to be null.");
+            var userData = GetUserData(user, item);
+            if (userData is null)
+            {
+                return null;
+            }
+
             var dto = GetUserItemDataDto(userData);
 
             item.FillUserDataDtoValues(dto, userData, itemDto, user, options);
diff --git a/Jellyfin.Api/Controllers/ItemsController.cs b/Jellyfin.Api/Controllers/ItemsController.cs
index 828bd5174..775d723b0 100644
--- a/Jellyfin.Api/Controllers/ItemsController.cs
+++ b/Jellyfin.Api/Controllers/ItemsController.cs
@@ -967,7 +967,7 @@ public class ItemsController : BaseJellyfinApiController
     [HttpGet("UserItems/{itemId}/UserData")]
     [ProducesResponseType(StatusCodes.Status200OK)]
     [ProducesResponseType(StatusCodes.Status404NotFound)]
-    public ActionResult<UserItemDataDto> GetItemUserData(
+    public ActionResult<UserItemDataDto?> GetItemUserData(
         [FromQuery] Guid? userId,
         [FromRoute, Required] Guid itemId)
     {
@@ -1005,7 +1005,7 @@ public class ItemsController : BaseJellyfinApiController
     [ProducesResponseType(StatusCodes.Status404NotFound)]
     [Obsolete("Kept for backwards compatibility")]
     [ApiExplorerSettings(IgnoreApi = true)]
-    public ActionResult<UserItemDataDto> GetItemUserDataLegacy(
+    public ActionResult<UserItemDataDto?> GetItemUserDataLegacy(
         [FromRoute, Required] Guid userId,
         [FromRoute, Required] Guid itemId)
         => GetItemUserData(userId, itemId);
@@ -1022,7 +1022,7 @@ public class ItemsController : BaseJellyfinApiController
     [HttpPost("UserItems/{itemId}/UserData")]
     [ProducesResponseType(StatusCodes.Status200OK)]
     [ProducesResponseType(StatusCodes.Status404NotFound)]
-    public ActionResult<UserItemDataDto> UpdateItemUserData(
+    public ActionResult<UserItemDataDto?> UpdateItemUserData(
         [FromQuery] Guid? userId,
         [FromRoute, Required] Guid itemId,
         [FromBody, Required] UpdateUserItemDataDto userDataDto)
@@ -1064,7 +1064,7 @@ public class ItemsController : BaseJellyfinApiController
     [ProducesResponseType(StatusCodes.Status404NotFound)]
     [Obsolete("Kept for backwards compatibility")]
     [ApiExplorerSettings(IgnoreApi = true)]
-    public ActionResult<UserItemDataDto> UpdateItemUserDataLegacy(
+    public ActionResult<UserItemDataDto?> UpdateItemUserDataLegacy(
         [FromRoute, Required] Guid userId,
         [FromRoute, Required] Guid itemId,
         [FromBody, Required] UpdateUserItemDataDto userDataDto)
diff --git a/Jellyfin.Api/Controllers/PlaystateController.cs b/Jellyfin.Api/Controllers/PlaystateController.cs
index 88aa0178f..292344c9d 100644
--- a/Jellyfin.Api/Controllers/PlaystateController.cs
+++ b/Jellyfin.Api/Controllers/PlaystateController.cs
@@ -513,7 +513,7 @@ public class PlaystateController : BaseJellyfinApiController
             item.MarkUnplayed(user);
         }
 
-        return _userDataRepository.GetUserDataDto(item, user);
+        return _userDataRepository.GetUserDataDto(item, user)!;
     }
 
     private PlayMethod ValidatePlayMethod(PlayMethod method, string? playSessionId)
diff --git a/Jellyfin.Api/Controllers/UserLibraryController.cs b/Jellyfin.Api/Controllers/UserLibraryController.cs
index b34daba7f..5330db48b 100644
--- a/Jellyfin.Api/Controllers/UserLibraryController.cs
+++ b/Jellyfin.Api/Controllers/UserLibraryController.cs
@@ -670,7 +670,7 @@ public class UserLibraryController : BaseJellyfinApiController
             _userDataRepository.SaveUserData(user, item, data, UserDataSaveReason.UpdateUserRating, CancellationToken.None);
         }
 
-        return _userDataRepository.GetUserDataDto(item, user);
+        return _userDataRepository.GetUserDataDto(item, user)!;
     }
 
     /// <summary>
@@ -691,6 +691,6 @@ public class UserLibraryController : BaseJellyfinApiController
             _userDataRepository.SaveUserData(user, item, data, UserDataSaveReason.UpdateUserRating, CancellationToken.None);
         }
 
-        return _userDataRepository.GetUserDataDto(item, user);
+        return _userDataRepository.GetUserDataDto(item, user)!;
     }
 }
diff --git a/Jellyfin.Server.Implementations/Item/BaseItemRepository.cs b/Jellyfin.Server.Implementations/Item/BaseItemRepository.cs
index aca5c071a..d862ecf6c 100644
--- a/Jellyfin.Server.Implementations/Item/BaseItemRepository.cs
+++ b/Jellyfin.Server.Implementations/Item/BaseItemRepository.cs
@@ -227,8 +227,8 @@ public sealed class BaseItemRepository(
             .Include(e => e.Provider)
             .Include(e => e.Images)
             .Include(e => e.LockedFields);
-        dbQuery = TranslateQuery(dbQuery, context, filter)
-            .DistinctBy(e => e.Id);
+        dbQuery = TranslateQuery(dbQuery, context, filter);
+            // .DistinctBy(e => e.Id);
         if (filter.EnableTotalRecordCount)
         {
             result.TotalRecordCount = dbQuery.Count();
@@ -1040,7 +1040,7 @@ public sealed class BaseItemRepository(
             }
             else
             {
-                baseQuery = baseQuery.Where(e => queryTopParentIds.Any(w => w == e.TopParentId!.Value));
+                baseQuery = baseQuery.Where(e => queryTopParentIds.Contains(e.TopParentId!.Value));
             }
         }
 
diff --git a/Jellyfin.Server/Migrations/Routines/MigrateLibraryDb.cs b/Jellyfin.Server/Migrations/Routines/MigrateLibraryDb.cs
index ec0fbddb6..571ac95eb 100644
--- a/Jellyfin.Server/Migrations/Routines/MigrateLibraryDb.cs
+++ b/Jellyfin.Server/Migrations/Routines/MigrateLibraryDb.cs
@@ -79,7 +79,7 @@ public class MigrateLibraryDb : IMigrationRoutine
         stopwatch.Restart();
 
         _logger.LogInformation("Start moving TypedBaseItem.");
-        var typedBaseItemsQuery = "SELECT guid, type, data, StartDate, EndDate, ChannelId, IsMovie, IsSeries, EpisodeTitle, IsRepeat, CommunityRating, CustomRating, IndexNumber, IsLocked, PreferredMetadataLanguage, PreferredMetadataCountryCode, Width, Height, DateLastRefreshed, Name, Path, PremiereDate, Overview, ParentIndexNumber, ProductionYear, OfficialRating, ForcedSortName, RunTimeTicks, Size, DateCreated, DateModified, Genres, ParentId, Audio, ExternalServiceId, IsInMixedFolder, DateLastSaved, LockedFields, Studios, Tags, TrailerTypes, OriginalTitle, PrimaryVersionId, DateLastMediaAdded, Album, LUFS, NormalizationGain, CriticRating, IsVirtualItem, SeriesName, UserDataKey, SeasonName, SeasonId, SeriesId, PresentationUniqueKey, InheritedParentalRatingValue, ExternalSeriesId, Tagline, ProviderIds, Images, ProductionLocations, ExtraIds, TotalBitrate, ExtraType, Artists, AlbumArtists, ExternalId, SeriesPresentationUniqueKey, ShowId, OwnerId FROM TypedBaseItems";
+        var typedBaseItemsQuery = "SELECT guid, type, data, StartDate, EndDate, ChannelId, IsMovie, IsSeries, EpisodeTitle, IsRepeat, CommunityRating, CustomRating, IndexNumber, IsLocked, PreferredMetadataLanguage, PreferredMetadataCountryCode, Width, Height, DateLastRefreshed, Name, Path, PremiereDate, Overview, ParentIndexNumber, ProductionYear, OfficialRating, ForcedSortName, RunTimeTicks, Size, DateCreated, DateModified, Genres, ParentId, TopParentId, Audio, ExternalServiceId, IsInMixedFolder, DateLastSaved, LockedFields, Studios, Tags, TrailerTypes, OriginalTitle, PrimaryVersionId, DateLastMediaAdded, Album, LUFS, NormalizationGain, CriticRating, IsVirtualItem, SeriesName, UserDataKey, SeasonName, SeasonId, SeriesId, PresentationUniqueKey, InheritedParentalRatingValue, ExternalSeriesId, Tagline, ProviderIds, Images, ProductionLocations, ExtraIds, TotalBitrate, ExtraType, Artists, AlbumArtists, ExternalId, SeriesPresentationUniqueKey, ShowId, OwnerId FROM TypedBaseItems";
         dbContext.BaseItems.ExecuteDelete();
 
         var legacyBaseItemWithUserKeys = new Dictionary<string, BaseItemEntity>();
@@ -798,6 +798,11 @@ public class MigrateLibraryDb : IMigrationRoutine
             entity.ParentId = parentId;
         }
 
+        if (reader.TryGetGuid(index++, out var topParentId))
+        {
+            entity.TopParentId = topParentId;
+        }
+
         if (reader.TryGetString(index++, out var audioString) && Enum.TryParse<ProgramAudioEntity>(audioString, out var audioType))
         {
             entity.Audio = audioType;
diff --git a/MediaBrowser.Controller/Library/IUserDataManager.cs b/MediaBrowser.Controller/Library/IUserDataManager.cs
index b43c62708..5a2deda66 100644
--- a/MediaBrowser.Controller/Library/IUserDataManager.cs
+++ b/MediaBrowser.Controller/Library/IUserDataManager.cs
@@ -52,7 +52,7 @@ namespace MediaBrowser.Controller.Library
         /// <param name="item">Item to use.</param>
         /// <param name="user">User to use.</param>
         /// <returns>User data dto.</returns>
-        UserItemDataDto GetUserDataDto(BaseItem item, User user);
+        UserItemDataDto? GetUserDataDto(BaseItem item, User user);
 
         /// <summary>
         /// Gets the user data dto.
@@ -62,7 +62,7 @@ namespace MediaBrowser.Controller.Library
         /// <param name="user">User to use.</param>
         /// <param name="options">Dto options to use.</param>
         /// <returns>User data dto.</returns>
-        UserItemDataDto GetUserDataDto(BaseItem item, BaseItemDto? itemDto, User user, DtoOptions options);
+        UserItemDataDto? GetUserDataDto(BaseItem item, BaseItemDto? itemDto, User user, DtoOptions options);
 
         /// <summary>
         /// Updates playstate for an item and returns true or false indicating if it was played to completion.
-- 
cgit v1.2.3


From 508b27f15643dc04d0ca1dda92a3b18bdeb43a5a Mon Sep 17 00:00:00 2001
From: JPVenson <github@jpb.email>
Date: Mon, 11 Nov 2024 17:39:50 +0000
Subject: Fixed Duplicate returns on grouping Fixed UserDataKey not stored

---
 .../Library/UserDataManager.cs                     |   35 +-
 Jellyfin.Data/Entities/UserData.cs                 |    6 +
 .../Item/BaseItemRepository.cs                     |   53 +-
 .../20241111131257_AddedCustomDataKey.Designer.cs  | 1610 ++++++++++++++++++++
 .../20241111131257_AddedCustomDataKey.cs           |   28 +
 ...0241111135439_AddedCustomDataKeyKey.Designer.cs | 1610 ++++++++++++++++++++
 .../20241111135439_AddedCustomDataKeyKey.cs        |   54 +
 .../Migrations/JellyfinDbModelSnapshot.cs          |    5 +-
 .../ModelConfiguration/UserDataConfiguration.cs    |    2 +-
 .../Migrations/Routines/MigrateLibraryDb.cs        |   17 +-
 MediaBrowser.Controller/Entities/BaseItem.cs       |    5 +-
 11 files changed, 3391 insertions(+), 34 deletions(-)
 create mode 100644 Jellyfin.Server.Implementations/Migrations/20241111131257_AddedCustomDataKey.Designer.cs
 create mode 100644 Jellyfin.Server.Implementations/Migrations/20241111131257_AddedCustomDataKey.cs
 create mode 100644 Jellyfin.Server.Implementations/Migrations/20241111135439_AddedCustomDataKeyKey.Designer.cs
 create mode 100644 Jellyfin.Server.Implementations/Migrations/20241111135439_AddedCustomDataKeyKey.cs

(limited to 'MediaBrowser.Controller')

diff --git a/Emby.Server.Implementations/Library/UserDataManager.cs b/Emby.Server.Implementations/Library/UserDataManager.cs
index 371fc22c7..6974c0480 100644
--- a/Emby.Server.Implementations/Library/UserDataManager.cs
+++ b/Emby.Server.Implementations/Library/UserDataManager.cs
@@ -6,6 +6,7 @@ using System.Globalization;
 using System.Linq;
 using System.Threading;
 using Jellyfin.Data.Entities;
+using Jellyfin.Extensions;
 using Jellyfin.Server.Implementations;
 using MediaBrowser.Controller.Configuration;
 using MediaBrowser.Controller.Dto;
@@ -65,7 +66,15 @@ namespace Emby.Server.Implementations.Library
             foreach (var key in keys)
             {
                 userData.Key = key;
-                repository.UserData.Add(Map(userData, user.Id));
+                var userDataEntry = Map(userData, user.Id, item.Id);
+                if (repository.UserData.Any(f => f.ItemId == item.Id && f.UserId == user.Id && f.CustomDataKey == key))
+                {
+                    repository.UserData.Attach(userDataEntry).State = EntityState.Modified;
+                }
+                else
+                {
+                    repository.UserData.Add(userDataEntry);
+                }
             }
 
             repository.SaveChanges();
@@ -131,11 +140,12 @@ namespace Emby.Server.Implementations.Library
             SaveUserData(user, item, userData, reason, CancellationToken.None);
         }
 
-        private UserData Map(UserItemData dto, Guid userId)
+        private UserData Map(UserItemData dto, Guid userId, Guid itemId)
         {
             return new UserData()
             {
-                ItemId = Guid.Parse(dto.Key),
+                ItemId = itemId,
+                CustomDataKey = dto.Key,
                 Item = null!,
                 User = null!,
                 AudioStreamIndex = dto.AudioStreamIndex,
@@ -155,7 +165,7 @@ namespace Emby.Server.Implementations.Library
         {
             return new UserItemData()
             {
-                Key = dto.ItemId.ToString("D"),
+                Key = dto.CustomDataKey!,
                 AudioStreamIndex = dto.AudioStreamIndex,
                 IsFavorite = dto.IsFavorite,
                 LastPlayedDate = dto.LastPlayedDate,
@@ -175,7 +185,10 @@ namespace Emby.Server.Implementations.Library
 
             if (data is null)
             {
-                return null;
+                return new UserItemData()
+                {
+                    Key = keys[0],
+                };
             }
 
             return _userData.GetOrAdd(cacheKey, data);
@@ -184,13 +197,9 @@ namespace Emby.Server.Implementations.Library
         private UserItemData? GetUserDataInternal(Guid userId, List<string> keys)
         {
             var key = keys.FirstOrDefault();
-            if (key is null || !Guid.TryParse(key, out var itemId))
-            {
-                return null;
-            }
 
             using var context = _repository.CreateDbContext();
-            var userData = context.UserData.AsNoTracking().FirstOrDefault(e => e.ItemId == itemId && e.UserId.Equals(userId));
+            var userData = context.UserData.AsNoTracking().FirstOrDefault(e => e.CustomDataKey == key && e.UserId.Equals(userId));
 
             if (userData is not null)
             {
@@ -236,7 +245,7 @@ namespace Emby.Server.Implementations.Library
                 return null;
             }
 
-            var dto = GetUserItemDataDto(userData);
+            var dto = GetUserItemDataDto(userData, item.Id);
 
             item.FillUserDataDtoValues(dto, userData, itemDto, user, options);
             return dto;
@@ -246,9 +255,10 @@ namespace Emby.Server.Implementations.Library
         /// Converts a UserItemData to a DTOUserItemData.
         /// </summary>
         /// <param name="data">The data.</param>
+        /// <param name="itemId">The the reference key to an Item.</param>
         /// <returns>DtoUserItemData.</returns>
         /// <exception cref="ArgumentNullException"><paramref name="data"/> is <c>null</c>.</exception>
-        private UserItemDataDto GetUserItemDataDto(UserItemData data)
+        private UserItemDataDto GetUserItemDataDto(UserItemData data, Guid itemId)
         {
             ArgumentNullException.ThrowIfNull(data);
 
@@ -261,6 +271,7 @@ namespace Emby.Server.Implementations.Library
                 Rating = data.Rating,
                 Played = data.Played,
                 LastPlayedDate = data.LastPlayedDate,
+                ItemId = itemId,
                 Key = data.Key
             };
         }
diff --git a/Jellyfin.Data/Entities/UserData.cs b/Jellyfin.Data/Entities/UserData.cs
index fe8c8c5ce..05ab6dd2d 100644
--- a/Jellyfin.Data/Entities/UserData.cs
+++ b/Jellyfin.Data/Entities/UserData.cs
@@ -8,6 +8,12 @@ namespace Jellyfin.Data.Entities;
 /// </summary>
 public class UserData
 {
+    /// <summary>
+    /// Gets or sets the custom data key.
+    /// </summary>
+    /// <value>The rating.</value>
+    public required string CustomDataKey { get; set; }
+
     /// <summary>
     /// Gets or sets the users 0-10 rating.
     /// </summary>
diff --git a/Jellyfin.Server.Implementations/Item/BaseItemRepository.cs b/Jellyfin.Server.Implementations/Item/BaseItemRepository.cs
index 4af03abf1..151b65089 100644
--- a/Jellyfin.Server.Implementations/Item/BaseItemRepository.cs
+++ b/Jellyfin.Server.Implementations/Item/BaseItemRepository.cs
@@ -116,22 +116,23 @@ public sealed class BaseItemRepository(
 
         using var context = dbProvider.CreateDbContext();
         var dbQuery = TranslateQuery(context.BaseItems.AsNoTracking(), context, filter);
-        // .DistinctBy(e => e.Id);
 
         var enableGroupByPresentationUniqueKey = EnableGroupByPresentationUniqueKey(filter);
         if (enableGroupByPresentationUniqueKey && filter.GroupBySeriesPresentationUniqueKey)
         {
-            dbQuery = dbQuery.GroupBy(e => new { e.PresentationUniqueKey, e.SeriesPresentationUniqueKey }).SelectMany(e => e);
+            dbQuery = dbQuery.GroupBy(e => new { e.PresentationUniqueKey, e.SeriesPresentationUniqueKey }).Select(e => e.First());
         }
-
-        if (enableGroupByPresentationUniqueKey)
+        else if (enableGroupByPresentationUniqueKey)
         {
-            dbQuery = dbQuery.GroupBy(e => e.PresentationUniqueKey).SelectMany(e => e);
+            dbQuery = dbQuery.GroupBy(e => e.PresentationUniqueKey).Select(e => e.First());
         }
-
-        if (filter.GroupBySeriesPresentationUniqueKey)
+        else if (filter.GroupBySeriesPresentationUniqueKey)
+        {
+            dbQuery = dbQuery.GroupBy(e => e.SeriesPresentationUniqueKey).Select(e => e.First());
+        }
+        else
         {
-            dbQuery = dbQuery.GroupBy(e => e.SeriesPresentationUniqueKey).SelectMany(e => e);
+            dbQuery = dbQuery.Distinct();
         }
 
         dbQuery = ApplyOrder(dbQuery, filter);
@@ -225,9 +226,15 @@ public sealed class BaseItemRepository(
         IQueryable<BaseItemEntity> dbQuery = context.BaseItems.AsNoTracking()
             .Include(e => e.TrailerTypes)
             .Include(e => e.Provider)
-            .Include(e => e.Images)
             .Include(e => e.LockedFields);
+
+        if (filter.DtoOptions.EnableImages)
+        {
+            dbQuery = dbQuery.Include(e => e.Images);
+        }
+
         dbQuery = TranslateQuery(dbQuery, context, filter);
+        dbQuery = dbQuery.Distinct();
         // .DistinctBy(e => e.Id);
         if (filter.EnableTotalRecordCount)
         {
@@ -266,10 +273,34 @@ public sealed class BaseItemRepository(
         IQueryable<BaseItemEntity> dbQuery = context.BaseItems.AsNoTracking()
             .Include(e => e.TrailerTypes)
             .Include(e => e.Provider)
-            .Include(e => e.Images)
             .Include(e => e.LockedFields);
+
+        if (filter.DtoOptions.EnableImages)
+        {
+            dbQuery = dbQuery.Include(e => e.Images);
+        }
+
         dbQuery = TranslateQuery(dbQuery, context, filter);
         dbQuery = ApplyOrder(dbQuery, filter);
+
+        var enableGroupByPresentationUniqueKey = EnableGroupByPresentationUniqueKey(filter);
+        if (enableGroupByPresentationUniqueKey && filter.GroupBySeriesPresentationUniqueKey)
+        {
+            dbQuery = dbQuery.GroupBy(e => new { e.PresentationUniqueKey, e.SeriesPresentationUniqueKey }).Select(e => e.First());
+        }
+        else if (enableGroupByPresentationUniqueKey)
+        {
+            dbQuery = dbQuery.GroupBy(e => e.PresentationUniqueKey).Select(e => e.First());
+        }
+        else if (filter.GroupBySeriesPresentationUniqueKey)
+        {
+            dbQuery = dbQuery.GroupBy(e => e.SeriesPresentationUniqueKey).Select(e => e.First());
+        }
+        else
+        {
+            dbQuery = dbQuery.Distinct();
+        }
+
         if (filter.Limit.HasValue || filter.StartIndex.HasValue)
         {
             var offset = filter.StartIndex ?? 0;
@@ -1330,7 +1361,7 @@ public sealed class BaseItemRepository(
             .Include(e => e.TrailerTypes)
             .Include(e => e.Provider)
             .Include(e => e.Images)
-            .Include(e => e.LockedFields).AsNoTracking().FirstOrDefault(e => e.Id == id);
+            .Include(e => e.LockedFields).AsNoTracking().AsSingleQuery().FirstOrDefault(e => e.Id == id);
         if (item is null)
         {
             return null;
diff --git a/Jellyfin.Server.Implementations/Migrations/20241111131257_AddedCustomDataKey.Designer.cs b/Jellyfin.Server.Implementations/Migrations/20241111131257_AddedCustomDataKey.Designer.cs
new file mode 100644
index 000000000..1fbf21492
--- /dev/null
+++ b/Jellyfin.Server.Implementations/Migrations/20241111131257_AddedCustomDataKey.Designer.cs
@@ -0,0 +1,1610 @@
+// <auto-generated />
+using System;
+using Jellyfin.Server.Implementations;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+
+#nullable disable
+
+namespace Jellyfin.Server.Implementations.Migrations
+{
+    [DbContext(typeof(JellyfinDbContext))]
+    [Migration("20241111131257_AddedCustomDataKey")]
+    partial class AddedCustomDataKey
+    {
+        /// <inheritdoc />
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder.HasAnnotation("ProductVersion", "8.0.10");
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.AccessSchedule", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("DayOfWeek")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<double>("EndHour")
+                        .HasColumnType("REAL");
+
+                    b.Property<double>("StartHour")
+                        .HasColumnType("REAL");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("UserId");
+
+                    b.ToTable("AccessSchedules");
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.ActivityLog", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<DateTime>("DateCreated")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("ItemId")
+                        .HasMaxLength(256)
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("LogSeverity")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasMaxLength(512)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Overview")
+                        .HasMaxLength(512)
+                        .HasColumnType("TEXT");
+
+                    b.Property<uint>("RowVersion")
+                        .IsConcurrencyToken()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("ShortOverview")
+                        .HasMaxLength(512)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Type")
+                        .IsRequired()
+                        .HasMaxLength(256)
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("DateCreated");
+
+                    b.ToTable("ActivityLogs");
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.AncestorId", b =>
+                {
+                    b.Property<Guid>("ItemId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("ParentItemId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid?>("BaseItemEntityId")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("ItemId", "ParentItemId");
+
+                    b.HasIndex("BaseItemEntityId");
+
+                    b.HasIndex("ParentItemId");
+
+                    b.ToTable("AncestorIds");
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.AttachmentStreamInfo", b =>
+                {
+                    b.Property<Guid>("ItemId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("Index")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Codec")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("CodecTag")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Comment")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Filename")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("MimeType")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("ItemId", "Index");
+
+                    b.ToTable("AttachmentStreamInfos");
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.BaseItemEntity", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Album")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("AlbumArtists")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Artists")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int?>("Audio")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("ChannelId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("CleanName")
+                        .HasColumnType("TEXT");
+
+                    b.Property<float?>("CommunityRating")
+                        .HasColumnType("REAL");
+
+                    b.Property<float?>("CriticRating")
+                        .HasColumnType("REAL");
+
+                    b.Property<string>("CustomRating")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Data")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("DateCreated")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("DateLastMediaAdded")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("DateLastRefreshed")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("DateLastSaved")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("DateModified")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("EndDate")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("EpisodeTitle")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("ExternalId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("ExternalSeriesId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("ExternalServiceId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("ExtraIds")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int?>("ExtraType")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("ForcedSortName")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Genres")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int?>("Height")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int?>("IndexNumber")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int?>("InheritedParentalRatingValue")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("IsFolder")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("IsInMixedFolder")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("IsLocked")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("IsMovie")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("IsRepeat")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("IsSeries")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("IsVirtualItem")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<float?>("LUFS")
+                        .HasColumnType("REAL");
+
+                    b.Property<string>("MediaType")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("TEXT");
+
+                    b.Property<float?>("NormalizationGain")
+                        .HasColumnType("REAL");
+
+                    b.Property<string>("OfficialRating")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("OriginalTitle")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Overview")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("OwnerId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid?>("ParentId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int?>("ParentIndexNumber")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Path")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("PreferredMetadataCountryCode")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("PreferredMetadataLanguage")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("PremiereDate")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("PresentationUniqueKey")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("PrimaryVersionId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("ProductionLocations")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int?>("ProductionYear")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<long?>("RunTimeTicks")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<Guid?>("SeasonId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("SeasonName")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid?>("SeriesId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("SeriesName")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("SeriesPresentationUniqueKey")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("ShowId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<long?>("Size")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("SortName")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("StartDate")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Studios")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Tagline")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Tags")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid?>("TopParentId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int?>("TotalBitrate")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Type")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("UnratedType")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int?>("Width")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ParentId");
+
+                    b.HasIndex("Path");
+
+                    b.HasIndex("PresentationUniqueKey");
+
+                    b.HasIndex("TopParentId", "Id");
+
+                    b.HasIndex("Type", "TopParentId", "Id");
+
+                    b.HasIndex("Type", "TopParentId", "PresentationUniqueKey");
+
+                    b.HasIndex("Type", "TopParentId", "StartDate");
+
+                    b.HasIndex("Id", "Type", "IsFolder", "IsVirtualItem");
+
+                    b.HasIndex("MediaType", "TopParentId", "IsVirtualItem", "PresentationUniqueKey");
+
+                    b.HasIndex("Type", "SeriesPresentationUniqueKey", "IsFolder", "IsVirtualItem");
+
+                    b.HasIndex("Type", "SeriesPresentationUniqueKey", "PresentationUniqueKey", "SortName");
+
+                    b.HasIndex("IsFolder", "TopParentId", "IsVirtualItem", "PresentationUniqueKey", "DateCreated");
+
+                    b.HasIndex("Type", "TopParentId", "IsVirtualItem", "PresentationUniqueKey", "DateCreated");
+
+                    b.ToTable("BaseItems");
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.BaseItemImageInfo", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("TEXT");
+
+                    b.Property<byte[]>("Blurhash")
+                        .HasColumnType("BLOB");
+
+                    b.Property<DateTime>("DateModified")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("Height")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("ImageType")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<Guid>("ItemId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Path")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("Width")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ItemId");
+
+                    b.ToTable("BaseItemImageInfos");
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.BaseItemMetadataField", b =>
+                {
+                    b.Property<int>("Id")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<Guid>("ItemId")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id", "ItemId");
+
+                    b.HasIndex("ItemId");
+
+                    b.ToTable("BaseItemMetadataFields");
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.BaseItemProvider", b =>
+                {
+                    b.Property<Guid>("ItemId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("ProviderId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("ProviderValue")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("ItemId", "ProviderId");
+
+                    b.HasIndex("ProviderId", "ProviderValue", "ItemId");
+
+                    b.ToTable("BaseItemProviders");
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.BaseItemTrailerType", b =>
+                {
+                    b.Property<int>("Id")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<Guid>("ItemId")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id", "ItemId");
+
+                    b.HasIndex("ItemId");
+
+                    b.ToTable("BaseItemTrailerTypes");
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.Chapter", b =>
+                {
+                    b.Property<Guid>("ItemId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("ChapterIndex")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<DateTime?>("ImageDateModified")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("ImagePath")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("TEXT");
+
+                    b.Property<long>("StartPositionTicks")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("ItemId", "ChapterIndex");
+
+                    b.ToTable("Chapters");
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.CustomItemDisplayPreferences", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Client")
+                        .IsRequired()
+                        .HasMaxLength(32)
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("ItemId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Key")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Value")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("UserId", "ItemId", "Client", "Key")
+                        .IsUnique();
+
+                    b.ToTable("CustomItemDisplayPreferences");
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.DisplayPreferences", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("ChromecastVersion")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Client")
+                        .IsRequired()
+                        .HasMaxLength(32)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("DashboardTheme")
+                        .HasMaxLength(32)
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("EnableNextVideoInfoOverlay")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int?>("IndexBy")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<Guid>("ItemId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("ScrollDirection")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("ShowBackdrop")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("ShowSidebar")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("SkipBackwardLength")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("SkipForwardLength")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("TvHome")
+                        .HasMaxLength(32)
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("UserId", "ItemId", "Client")
+                        .IsUnique();
+
+                    b.ToTable("DisplayPreferences");
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.HomeSection", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("DisplayPreferencesId")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("Order")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("Type")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("DisplayPreferencesId");
+
+                    b.ToTable("HomeSection");
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.ImageInfo", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<DateTime>("LastModified")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Path")
+                        .IsRequired()
+                        .HasMaxLength(512)
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid?>("UserId")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("UserId")
+                        .IsUnique();
+
+                    b.ToTable("ImageInfos");
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.ItemDisplayPreferences", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Client")
+                        .IsRequired()
+                        .HasMaxLength(32)
+                        .HasColumnType("TEXT");
+
+                    b.Property<int?>("IndexBy")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<Guid>("ItemId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("RememberIndexing")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("RememberSorting")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("SortBy")
+                        .IsRequired()
+                        .HasMaxLength(64)
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("SortOrder")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("ViewType")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("UserId");
+
+                    b.ToTable("ItemDisplayPreferences");
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.ItemValue", b =>
+                {
+                    b.Property<Guid>("ItemValueId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("CleanValue")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("Type")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Value")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("ItemValueId");
+
+                    b.HasIndex("Type", "CleanValue");
+
+                    b.ToTable("ItemValues");
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.ItemValueMap", b =>
+                {
+                    b.Property<Guid>("ItemValueId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("ItemId")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("ItemValueId", "ItemId");
+
+                    b.HasIndex("ItemId");
+
+                    b.ToTable("ItemValuesMap");
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.MediaSegment", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("TEXT");
+
+                    b.Property<long>("EndTicks")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<Guid>("ItemId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("SegmentProviderId")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<long>("StartTicks")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("Type")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("MediaSegments");
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.MediaStreamInfo", b =>
+                {
+                    b.Property<Guid>("ItemId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("StreamIndex")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("AspectRatio")
+                        .HasColumnType("TEXT");
+
+                    b.Property<float>("AverageFrameRate")
+                        .HasColumnType("REAL");
+
+                    b.Property<int>("BitDepth")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("BitRate")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("BlPresentFlag")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("ChannelLayout")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("Channels")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Codec")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("CodecTag")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("CodecTimeBase")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("ColorPrimaries")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("ColorSpace")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("ColorTransfer")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Comment")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("DvBlSignalCompatibilityId")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("DvLevel")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("DvProfile")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("DvVersionMajor")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("DvVersionMinor")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("ElPresentFlag")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("Height")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("IsAnamorphic")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("IsAvc")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("IsDefault")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("IsExternal")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("IsForced")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("IsHearingImpaired")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("IsInterlaced")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("KeyFrames")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Language")
+                        .HasColumnType("TEXT");
+
+                    b.Property<float>("Level")
+                        .HasColumnType("REAL");
+
+                    b.Property<string>("NalLengthSize")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Path")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("PixelFormat")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Profile")
+                        .HasColumnType("TEXT");
+
+                    b.Property<float>("RealFrameRate")
+                        .HasColumnType("REAL");
+
+                    b.Property<int>("RefFrames")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("Rotation")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("RpuPresentFlag")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("SampleRate")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int?>("StreamType")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("TimeBase")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Title")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("Width")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("ItemId", "StreamIndex");
+
+                    b.HasIndex("StreamIndex");
+
+                    b.HasIndex("StreamType");
+
+                    b.HasIndex("StreamIndex", "StreamType");
+
+                    b.HasIndex("StreamIndex", "StreamType", "Language");
+
+                    b.ToTable("MediaStreamInfos");
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.People", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("PersonType")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("Name");
+
+                    b.ToTable("Peoples");
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.PeopleBaseItemMap", b =>
+                {
+                    b.Property<Guid>("ItemId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("PeopleId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int?>("ListOrder")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Role")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int?>("SortOrder")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("ItemId", "PeopleId");
+
+                    b.HasIndex("PeopleId");
+
+                    b.HasIndex("ItemId", "ListOrder");
+
+                    b.HasIndex("ItemId", "SortOrder");
+
+                    b.ToTable("PeopleBaseItemMap");
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.Permission", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("Kind")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<Guid?>("Permission_Permissions_Guid")
+                        .HasColumnType("TEXT");
+
+                    b.Property<uint>("RowVersion")
+                        .IsConcurrencyToken()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<Guid?>("UserId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("Value")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("UserId", "Kind")
+                        .IsUnique()
+                        .HasFilter("[UserId] IS NOT NULL");
+
+                    b.ToTable("Permissions");
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.Preference", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("Kind")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<Guid?>("Preference_Preferences_Guid")
+                        .HasColumnType("TEXT");
+
+                    b.Property<uint>("RowVersion")
+                        .IsConcurrencyToken()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<Guid?>("UserId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Value")
+                        .IsRequired()
+                        .HasMaxLength(65535)
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("UserId", "Kind")
+                        .IsUnique()
+                        .HasFilter("[UserId] IS NOT NULL");
+
+                    b.ToTable("Preferences");
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.Security.ApiKey", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("AccessToken")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("DateCreated")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("DateLastActivity")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasMaxLength(64)
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("AccessToken")
+                        .IsUnique();
+
+                    b.ToTable("ApiKeys");
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.Security.Device", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("AccessToken")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("AppName")
+                        .IsRequired()
+                        .HasMaxLength(64)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("AppVersion")
+                        .IsRequired()
+                        .HasMaxLength(32)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("DateCreated")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("DateLastActivity")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("DateModified")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("DeviceId")
+                        .IsRequired()
+                        .HasMaxLength(256)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("DeviceName")
+                        .IsRequired()
+                        .HasMaxLength(64)
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("IsActive")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("DeviceId");
+
+                    b.HasIndex("AccessToken", "DateLastActivity");
+
+                    b.HasIndex("DeviceId", "DateLastActivity");
+
+                    b.HasIndex("UserId", "DeviceId");
+
+                    b.ToTable("Devices");
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.Security.DeviceOptions", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("CustomName")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("DeviceId")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("DeviceId")
+                        .IsUnique();
+
+                    b.ToTable("DeviceOptions");
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.TrickplayInfo", b =>
+                {
+                    b.Property<Guid>("ItemId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("Width")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("Bandwidth")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("Height")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("Interval")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("ThumbnailCount")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("TileHeight")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("TileWidth")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("ItemId", "Width");
+
+                    b.ToTable("TrickplayInfos");
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.User", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("AudioLanguagePreference")
+                        .HasMaxLength(255)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("AuthenticationProviderId")
+                        .IsRequired()
+                        .HasMaxLength(255)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("CastReceiverId")
+                        .HasMaxLength(32)
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("DisplayCollectionsView")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("DisplayMissingEpisodes")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("EnableAutoLogin")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("EnableLocalPassword")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("EnableNextEpisodeAutoPlay")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("EnableUserPreferenceAccess")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("HidePlayedInLatest")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<long>("InternalId")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("InvalidLoginAttemptCount")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<DateTime?>("LastActivityDate")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("LastLoginDate")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int?>("LoginAttemptsBeforeLockout")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("MaxActiveSessions")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int?>("MaxParentalAgeRating")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("MustUpdatePassword")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Password")
+                        .HasMaxLength(65535)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("PasswordResetProviderId")
+                        .IsRequired()
+                        .HasMaxLength(255)
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("PlayDefaultAudioTrack")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("RememberAudioSelections")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("RememberSubtitleSelections")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int?>("RemoteClientBitrateLimit")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<uint>("RowVersion")
+                        .IsConcurrencyToken()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("SubtitleLanguagePreference")
+                        .HasMaxLength(255)
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("SubtitleMode")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("SyncPlayAccess")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Username")
+                        .IsRequired()
+                        .HasMaxLength(255)
+                        .HasColumnType("TEXT")
+                        .UseCollation("NOCASE");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("Username")
+                        .IsUnique();
+
+                    b.ToTable("Users");
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.UserData", b =>
+                {
+                    b.Property<Guid>("ItemId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int?>("AudioStreamIndex")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("CustomDataKey")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("IsFavorite")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<DateTime?>("LastPlayedDate")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool?>("Likes")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("PlayCount")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<long>("PlaybackPositionTicks")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("Played")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<double?>("Rating")
+                        .HasColumnType("REAL");
+
+                    b.Property<int?>("SubtitleStreamIndex")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("ItemId", "UserId");
+
+                    b.HasIndex("UserId");
+
+                    b.HasIndex("ItemId", "UserId", "IsFavorite");
+
+                    b.HasIndex("ItemId", "UserId", "LastPlayedDate");
+
+                    b.HasIndex("ItemId", "UserId", "PlaybackPositionTicks");
+
+                    b.HasIndex("ItemId", "UserId", "Played");
+
+                    b.ToTable("UserData");
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.AccessSchedule", b =>
+                {
+                    b.HasOne("Jellyfin.Data.Entities.User", null)
+                        .WithMany("AccessSchedules")
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.AncestorId", b =>
+                {
+                    b.HasOne("Jellyfin.Data.Entities.BaseItemEntity", null)
+                        .WithMany("AncestorIds")
+                        .HasForeignKey("BaseItemEntityId");
+
+                    b.HasOne("Jellyfin.Data.Entities.BaseItemEntity", "Item")
+                        .WithMany()
+                        .HasForeignKey("ItemId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Jellyfin.Data.Entities.BaseItemEntity", "ParentItem")
+                        .WithMany()
+                        .HasForeignKey("ParentItemId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Item");
+
+                    b.Navigation("ParentItem");
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.AttachmentStreamInfo", b =>
+                {
+                    b.HasOne("Jellyfin.Data.Entities.BaseItemEntity", "Item")
+                        .WithMany()
+                        .HasForeignKey("ItemId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Item");
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.BaseItemImageInfo", b =>
+                {
+                    b.HasOne("Jellyfin.Data.Entities.BaseItemEntity", "Item")
+                        .WithMany("Images")
+                        .HasForeignKey("ItemId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Item");
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.BaseItemMetadataField", b =>
+                {
+                    b.HasOne("Jellyfin.Data.Entities.BaseItemEntity", "Item")
+                        .WithMany("LockedFields")
+                        .HasForeignKey("ItemId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Item");
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.BaseItemProvider", b =>
+                {
+                    b.HasOne("Jellyfin.Data.Entities.BaseItemEntity", "Item")
+                        .WithMany("Provider")
+                        .HasForeignKey("ItemId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Item");
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.BaseItemTrailerType", b =>
+                {
+                    b.HasOne("Jellyfin.Data.Entities.BaseItemEntity", "Item")
+                        .WithMany("TrailerTypes")
+                        .HasForeignKey("ItemId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Item");
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.Chapter", b =>
+                {
+                    b.HasOne("Jellyfin.Data.Entities.BaseItemEntity", "Item")
+                        .WithMany("Chapters")
+                        .HasForeignKey("ItemId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Item");
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.DisplayPreferences", b =>
+                {
+                    b.HasOne("Jellyfin.Data.Entities.User", null)
+                        .WithMany("DisplayPreferences")
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.HomeSection", b =>
+                {
+                    b.HasOne("Jellyfin.Data.Entities.DisplayPreferences", null)
+                        .WithMany("HomeSections")
+                        .HasForeignKey("DisplayPreferencesId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.ImageInfo", b =>
+                {
+                    b.HasOne("Jellyfin.Data.Entities.User", null)
+                        .WithOne("ProfileImage")
+                        .HasForeignKey("Jellyfin.Data.Entities.ImageInfo", "UserId")
+                        .OnDelete(DeleteBehavior.Cascade);
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.ItemDisplayPreferences", b =>
+                {
+                    b.HasOne("Jellyfin.Data.Entities.User", null)
+                        .WithMany("ItemDisplayPreferences")
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.ItemValueMap", b =>
+                {
+                    b.HasOne("Jellyfin.Data.Entities.BaseItemEntity", "Item")
+                        .WithMany("ItemValues")
+                        .HasForeignKey("ItemId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Jellyfin.Data.Entities.ItemValue", "ItemValue")
+                        .WithMany("BaseItemsMap")
+                        .HasForeignKey("ItemValueId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Item");
+
+                    b.Navigation("ItemValue");
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.MediaStreamInfo", b =>
+                {
+                    b.HasOne("Jellyfin.Data.Entities.BaseItemEntity", "Item")
+                        .WithMany("MediaStreams")
+                        .HasForeignKey("ItemId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Item");
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.PeopleBaseItemMap", b =>
+                {
+                    b.HasOne("Jellyfin.Data.Entities.BaseItemEntity", "Item")
+                        .WithMany("Peoples")
+                        .HasForeignKey("ItemId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Jellyfin.Data.Entities.People", "People")
+                        .WithMany("BaseItems")
+                        .HasForeignKey("PeopleId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Item");
+
+                    b.Navigation("People");
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.Permission", b =>
+                {
+                    b.HasOne("Jellyfin.Data.Entities.User", null)
+                        .WithMany("Permissions")
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade);
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.Preference", b =>
+                {
+                    b.HasOne("Jellyfin.Data.Entities.User", null)
+                        .WithMany("Preferences")
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade);
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.Security.Device", b =>
+                {
+                    b.HasOne("Jellyfin.Data.Entities.User", "User")
+                        .WithMany()
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("User");
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.UserData", b =>
+                {
+                    b.HasOne("Jellyfin.Data.Entities.BaseItemEntity", "Item")
+                        .WithMany("UserData")
+                        .HasForeignKey("ItemId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Jellyfin.Data.Entities.User", "User")
+                        .WithMany()
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Item");
+
+                    b.Navigation("User");
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.BaseItemEntity", b =>
+                {
+                    b.Navigation("AncestorIds");
+
+                    b.Navigation("Chapters");
+
+                    b.Navigation("Images");
+
+                    b.Navigation("ItemValues");
+
+                    b.Navigation("LockedFields");
+
+                    b.Navigation("MediaStreams");
+
+                    b.Navigation("Peoples");
+
+                    b.Navigation("Provider");
+
+                    b.Navigation("TrailerTypes");
+
+                    b.Navigation("UserData");
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.DisplayPreferences", b =>
+                {
+                    b.Navigation("HomeSections");
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.ItemValue", b =>
+                {
+                    b.Navigation("BaseItemsMap");
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.People", b =>
+                {
+                    b.Navigation("BaseItems");
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.User", b =>
+                {
+                    b.Navigation("AccessSchedules");
+
+                    b.Navigation("DisplayPreferences");
+
+                    b.Navigation("ItemDisplayPreferences");
+
+                    b.Navigation("Permissions");
+
+                    b.Navigation("Preferences");
+
+                    b.Navigation("ProfileImage");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}
diff --git a/Jellyfin.Server.Implementations/Migrations/20241111131257_AddedCustomDataKey.cs b/Jellyfin.Server.Implementations/Migrations/20241111131257_AddedCustomDataKey.cs
new file mode 100644
index 000000000..ac78019ed
--- /dev/null
+++ b/Jellyfin.Server.Implementations/Migrations/20241111131257_AddedCustomDataKey.cs
@@ -0,0 +1,28 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Jellyfin.Server.Implementations.Migrations
+{
+    /// <inheritdoc />
+    public partial class AddedCustomDataKey : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<string>(
+                name: "CustomDataKey",
+                table: "UserData",
+                type: "TEXT",
+                nullable: true);
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "CustomDataKey",
+                table: "UserData");
+        }
+    }
+}
diff --git a/Jellyfin.Server.Implementations/Migrations/20241111135439_AddedCustomDataKeyKey.Designer.cs b/Jellyfin.Server.Implementations/Migrations/20241111135439_AddedCustomDataKeyKey.Designer.cs
new file mode 100644
index 000000000..bac6fd5b5
--- /dev/null
+++ b/Jellyfin.Server.Implementations/Migrations/20241111135439_AddedCustomDataKeyKey.Designer.cs
@@ -0,0 +1,1610 @@
+// <auto-generated />
+using System;
+using Jellyfin.Server.Implementations;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+
+#nullable disable
+
+namespace Jellyfin.Server.Implementations.Migrations
+{
+    [DbContext(typeof(JellyfinDbContext))]
+    [Migration("20241111135439_AddedCustomDataKeyKey")]
+    partial class AddedCustomDataKeyKey
+    {
+        /// <inheritdoc />
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder.HasAnnotation("ProductVersion", "8.0.10");
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.AccessSchedule", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("DayOfWeek")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<double>("EndHour")
+                        .HasColumnType("REAL");
+
+                    b.Property<double>("StartHour")
+                        .HasColumnType("REAL");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("UserId");
+
+                    b.ToTable("AccessSchedules");
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.ActivityLog", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<DateTime>("DateCreated")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("ItemId")
+                        .HasMaxLength(256)
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("LogSeverity")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasMaxLength(512)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Overview")
+                        .HasMaxLength(512)
+                        .HasColumnType("TEXT");
+
+                    b.Property<uint>("RowVersion")
+                        .IsConcurrencyToken()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("ShortOverview")
+                        .HasMaxLength(512)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Type")
+                        .IsRequired()
+                        .HasMaxLength(256)
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("DateCreated");
+
+                    b.ToTable("ActivityLogs");
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.AncestorId", b =>
+                {
+                    b.Property<Guid>("ItemId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("ParentItemId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid?>("BaseItemEntityId")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("ItemId", "ParentItemId");
+
+                    b.HasIndex("BaseItemEntityId");
+
+                    b.HasIndex("ParentItemId");
+
+                    b.ToTable("AncestorIds");
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.AttachmentStreamInfo", b =>
+                {
+                    b.Property<Guid>("ItemId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("Index")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Codec")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("CodecTag")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Comment")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Filename")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("MimeType")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("ItemId", "Index");
+
+                    b.ToTable("AttachmentStreamInfos");
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.BaseItemEntity", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Album")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("AlbumArtists")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Artists")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int?>("Audio")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("ChannelId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("CleanName")
+                        .HasColumnType("TEXT");
+
+                    b.Property<float?>("CommunityRating")
+                        .HasColumnType("REAL");
+
+                    b.Property<float?>("CriticRating")
+                        .HasColumnType("REAL");
+
+                    b.Property<string>("CustomRating")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Data")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("DateCreated")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("DateLastMediaAdded")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("DateLastRefreshed")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("DateLastSaved")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("DateModified")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("EndDate")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("EpisodeTitle")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("ExternalId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("ExternalSeriesId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("ExternalServiceId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("ExtraIds")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int?>("ExtraType")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("ForcedSortName")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Genres")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int?>("Height")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int?>("IndexNumber")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int?>("InheritedParentalRatingValue")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("IsFolder")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("IsInMixedFolder")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("IsLocked")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("IsMovie")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("IsRepeat")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("IsSeries")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("IsVirtualItem")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<float?>("LUFS")
+                        .HasColumnType("REAL");
+
+                    b.Property<string>("MediaType")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("TEXT");
+
+                    b.Property<float?>("NormalizationGain")
+                        .HasColumnType("REAL");
+
+                    b.Property<string>("OfficialRating")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("OriginalTitle")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Overview")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("OwnerId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid?>("ParentId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int?>("ParentIndexNumber")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Path")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("PreferredMetadataCountryCode")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("PreferredMetadataLanguage")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("PremiereDate")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("PresentationUniqueKey")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("PrimaryVersionId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("ProductionLocations")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int?>("ProductionYear")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<long?>("RunTimeTicks")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<Guid?>("SeasonId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("SeasonName")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid?>("SeriesId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("SeriesName")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("SeriesPresentationUniqueKey")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("ShowId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<long?>("Size")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("SortName")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("StartDate")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Studios")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Tagline")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Tags")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid?>("TopParentId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int?>("TotalBitrate")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Type")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("UnratedType")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int?>("Width")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ParentId");
+
+                    b.HasIndex("Path");
+
+                    b.HasIndex("PresentationUniqueKey");
+
+                    b.HasIndex("TopParentId", "Id");
+
+                    b.HasIndex("Type", "TopParentId", "Id");
+
+                    b.HasIndex("Type", "TopParentId", "PresentationUniqueKey");
+
+                    b.HasIndex("Type", "TopParentId", "StartDate");
+
+                    b.HasIndex("Id", "Type", "IsFolder", "IsVirtualItem");
+
+                    b.HasIndex("MediaType", "TopParentId", "IsVirtualItem", "PresentationUniqueKey");
+
+                    b.HasIndex("Type", "SeriesPresentationUniqueKey", "IsFolder", "IsVirtualItem");
+
+                    b.HasIndex("Type", "SeriesPresentationUniqueKey", "PresentationUniqueKey", "SortName");
+
+                    b.HasIndex("IsFolder", "TopParentId", "IsVirtualItem", "PresentationUniqueKey", "DateCreated");
+
+                    b.HasIndex("Type", "TopParentId", "IsVirtualItem", "PresentationUniqueKey", "DateCreated");
+
+                    b.ToTable("BaseItems");
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.BaseItemImageInfo", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("TEXT");
+
+                    b.Property<byte[]>("Blurhash")
+                        .HasColumnType("BLOB");
+
+                    b.Property<DateTime>("DateModified")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("Height")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("ImageType")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<Guid>("ItemId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Path")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("Width")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ItemId");
+
+                    b.ToTable("BaseItemImageInfos");
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.BaseItemMetadataField", b =>
+                {
+                    b.Property<int>("Id")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<Guid>("ItemId")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id", "ItemId");
+
+                    b.HasIndex("ItemId");
+
+                    b.ToTable("BaseItemMetadataFields");
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.BaseItemProvider", b =>
+                {
+                    b.Property<Guid>("ItemId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("ProviderId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("ProviderValue")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("ItemId", "ProviderId");
+
+                    b.HasIndex("ProviderId", "ProviderValue", "ItemId");
+
+                    b.ToTable("BaseItemProviders");
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.BaseItemTrailerType", b =>
+                {
+                    b.Property<int>("Id")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<Guid>("ItemId")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id", "ItemId");
+
+                    b.HasIndex("ItemId");
+
+                    b.ToTable("BaseItemTrailerTypes");
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.Chapter", b =>
+                {
+                    b.Property<Guid>("ItemId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("ChapterIndex")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<DateTime?>("ImageDateModified")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("ImagePath")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("TEXT");
+
+                    b.Property<long>("StartPositionTicks")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("ItemId", "ChapterIndex");
+
+                    b.ToTable("Chapters");
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.CustomItemDisplayPreferences", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Client")
+                        .IsRequired()
+                        .HasMaxLength(32)
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("ItemId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Key")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Value")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("UserId", "ItemId", "Client", "Key")
+                        .IsUnique();
+
+                    b.ToTable("CustomItemDisplayPreferences");
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.DisplayPreferences", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("ChromecastVersion")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Client")
+                        .IsRequired()
+                        .HasMaxLength(32)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("DashboardTheme")
+                        .HasMaxLength(32)
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("EnableNextVideoInfoOverlay")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int?>("IndexBy")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<Guid>("ItemId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("ScrollDirection")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("ShowBackdrop")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("ShowSidebar")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("SkipBackwardLength")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("SkipForwardLength")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("TvHome")
+                        .HasMaxLength(32)
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("UserId", "ItemId", "Client")
+                        .IsUnique();
+
+                    b.ToTable("DisplayPreferences");
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.HomeSection", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("DisplayPreferencesId")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("Order")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("Type")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("DisplayPreferencesId");
+
+                    b.ToTable("HomeSection");
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.ImageInfo", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<DateTime>("LastModified")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Path")
+                        .IsRequired()
+                        .HasMaxLength(512)
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid?>("UserId")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("UserId")
+                        .IsUnique();
+
+                    b.ToTable("ImageInfos");
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.ItemDisplayPreferences", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Client")
+                        .IsRequired()
+                        .HasMaxLength(32)
+                        .HasColumnType("TEXT");
+
+                    b.Property<int?>("IndexBy")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<Guid>("ItemId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("RememberIndexing")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("RememberSorting")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("SortBy")
+                        .IsRequired()
+                        .HasMaxLength(64)
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("SortOrder")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("ViewType")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("UserId");
+
+                    b.ToTable("ItemDisplayPreferences");
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.ItemValue", b =>
+                {
+                    b.Property<Guid>("ItemValueId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("CleanValue")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("Type")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Value")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("ItemValueId");
+
+                    b.HasIndex("Type", "CleanValue");
+
+                    b.ToTable("ItemValues");
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.ItemValueMap", b =>
+                {
+                    b.Property<Guid>("ItemValueId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("ItemId")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("ItemValueId", "ItemId");
+
+                    b.HasIndex("ItemId");
+
+                    b.ToTable("ItemValuesMap");
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.MediaSegment", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("TEXT");
+
+                    b.Property<long>("EndTicks")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<Guid>("ItemId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("SegmentProviderId")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<long>("StartTicks")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("Type")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("MediaSegments");
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.MediaStreamInfo", b =>
+                {
+                    b.Property<Guid>("ItemId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("StreamIndex")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("AspectRatio")
+                        .HasColumnType("TEXT");
+
+                    b.Property<float>("AverageFrameRate")
+                        .HasColumnType("REAL");
+
+                    b.Property<int>("BitDepth")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("BitRate")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("BlPresentFlag")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("ChannelLayout")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("Channels")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Codec")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("CodecTag")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("CodecTimeBase")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("ColorPrimaries")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("ColorSpace")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("ColorTransfer")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Comment")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("DvBlSignalCompatibilityId")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("DvLevel")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("DvProfile")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("DvVersionMajor")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("DvVersionMinor")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("ElPresentFlag")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("Height")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("IsAnamorphic")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("IsAvc")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("IsDefault")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("IsExternal")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("IsForced")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("IsHearingImpaired")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("IsInterlaced")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("KeyFrames")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Language")
+                        .HasColumnType("TEXT");
+
+                    b.Property<float>("Level")
+                        .HasColumnType("REAL");
+
+                    b.Property<string>("NalLengthSize")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Path")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("PixelFormat")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Profile")
+                        .HasColumnType("TEXT");
+
+                    b.Property<float>("RealFrameRate")
+                        .HasColumnType("REAL");
+
+                    b.Property<int>("RefFrames")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("Rotation")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("RpuPresentFlag")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("SampleRate")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int?>("StreamType")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("TimeBase")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Title")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("Width")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("ItemId", "StreamIndex");
+
+                    b.HasIndex("StreamIndex");
+
+                    b.HasIndex("StreamType");
+
+                    b.HasIndex("StreamIndex", "StreamType");
+
+                    b.HasIndex("StreamIndex", "StreamType", "Language");
+
+                    b.ToTable("MediaStreamInfos");
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.People", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("PersonType")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("Name");
+
+                    b.ToTable("Peoples");
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.PeopleBaseItemMap", b =>
+                {
+                    b.Property<Guid>("ItemId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("PeopleId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int?>("ListOrder")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Role")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int?>("SortOrder")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("ItemId", "PeopleId");
+
+                    b.HasIndex("PeopleId");
+
+                    b.HasIndex("ItemId", "ListOrder");
+
+                    b.HasIndex("ItemId", "SortOrder");
+
+                    b.ToTable("PeopleBaseItemMap");
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.Permission", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("Kind")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<Guid?>("Permission_Permissions_Guid")
+                        .HasColumnType("TEXT");
+
+                    b.Property<uint>("RowVersion")
+                        .IsConcurrencyToken()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<Guid?>("UserId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("Value")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("UserId", "Kind")
+                        .IsUnique()
+                        .HasFilter("[UserId] IS NOT NULL");
+
+                    b.ToTable("Permissions");
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.Preference", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("Kind")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<Guid?>("Preference_Preferences_Guid")
+                        .HasColumnType("TEXT");
+
+                    b.Property<uint>("RowVersion")
+                        .IsConcurrencyToken()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<Guid?>("UserId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Value")
+                        .IsRequired()
+                        .HasMaxLength(65535)
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("UserId", "Kind")
+                        .IsUnique()
+                        .HasFilter("[UserId] IS NOT NULL");
+
+                    b.ToTable("Preferences");
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.Security.ApiKey", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("AccessToken")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("DateCreated")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("DateLastActivity")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasMaxLength(64)
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("AccessToken")
+                        .IsUnique();
+
+                    b.ToTable("ApiKeys");
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.Security.Device", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("AccessToken")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("AppName")
+                        .IsRequired()
+                        .HasMaxLength(64)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("AppVersion")
+                        .IsRequired()
+                        .HasMaxLength(32)
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("DateCreated")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("DateLastActivity")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("DateModified")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("DeviceId")
+                        .IsRequired()
+                        .HasMaxLength(256)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("DeviceName")
+                        .IsRequired()
+                        .HasMaxLength(64)
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("IsActive")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("DeviceId");
+
+                    b.HasIndex("AccessToken", "DateLastActivity");
+
+                    b.HasIndex("DeviceId", "DateLastActivity");
+
+                    b.HasIndex("UserId", "DeviceId");
+
+                    b.ToTable("Devices");
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.Security.DeviceOptions", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("CustomName")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("DeviceId")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("DeviceId")
+                        .IsUnique();
+
+                    b.ToTable("DeviceOptions");
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.TrickplayInfo", b =>
+                {
+                    b.Property<Guid>("ItemId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("Width")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("Bandwidth")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("Height")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("Interval")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("ThumbnailCount")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("TileHeight")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("TileWidth")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("ItemId", "Width");
+
+                    b.ToTable("TrickplayInfos");
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.User", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("AudioLanguagePreference")
+                        .HasMaxLength(255)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("AuthenticationProviderId")
+                        .IsRequired()
+                        .HasMaxLength(255)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("CastReceiverId")
+                        .HasMaxLength(32)
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("DisplayCollectionsView")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("DisplayMissingEpisodes")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("EnableAutoLogin")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("EnableLocalPassword")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("EnableNextEpisodeAutoPlay")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("EnableUserPreferenceAccess")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("HidePlayedInLatest")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<long>("InternalId")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("InvalidLoginAttemptCount")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<DateTime?>("LastActivityDate")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("LastLoginDate")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int?>("LoginAttemptsBeforeLockout")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("MaxActiveSessions")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int?>("MaxParentalAgeRating")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("MustUpdatePassword")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Password")
+                        .HasMaxLength(65535)
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("PasswordResetProviderId")
+                        .IsRequired()
+                        .HasMaxLength(255)
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("PlayDefaultAudioTrack")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("RememberAudioSelections")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("RememberSubtitleSelections")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int?>("RemoteClientBitrateLimit")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<uint>("RowVersion")
+                        .IsConcurrencyToken()
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("SubtitleLanguagePreference")
+                        .HasMaxLength(255)
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("SubtitleMode")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("SyncPlayAccess")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("Username")
+                        .IsRequired()
+                        .HasMaxLength(255)
+                        .HasColumnType("TEXT")
+                        .UseCollation("NOCASE");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("Username")
+                        .IsUnique();
+
+                    b.ToTable("Users");
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.UserData", b =>
+                {
+                    b.Property<Guid>("ItemId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("CustomDataKey")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int?>("AudioStreamIndex")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("IsFavorite")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<DateTime?>("LastPlayedDate")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool?>("Likes")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("PlayCount")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<long>("PlaybackPositionTicks")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<bool>("Played")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<double?>("Rating")
+                        .HasColumnType("REAL");
+
+                    b.Property<int?>("SubtitleStreamIndex")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("ItemId", "UserId", "CustomDataKey");
+
+                    b.HasIndex("UserId");
+
+                    b.HasIndex("ItemId", "UserId", "IsFavorite");
+
+                    b.HasIndex("ItemId", "UserId", "LastPlayedDate");
+
+                    b.HasIndex("ItemId", "UserId", "PlaybackPositionTicks");
+
+                    b.HasIndex("ItemId", "UserId", "Played");
+
+                    b.ToTable("UserData");
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.AccessSchedule", b =>
+                {
+                    b.HasOne("Jellyfin.Data.Entities.User", null)
+                        .WithMany("AccessSchedules")
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.AncestorId", b =>
+                {
+                    b.HasOne("Jellyfin.Data.Entities.BaseItemEntity", null)
+                        .WithMany("AncestorIds")
+                        .HasForeignKey("BaseItemEntityId");
+
+                    b.HasOne("Jellyfin.Data.Entities.BaseItemEntity", "Item")
+                        .WithMany()
+                        .HasForeignKey("ItemId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Jellyfin.Data.Entities.BaseItemEntity", "ParentItem")
+                        .WithMany()
+                        .HasForeignKey("ParentItemId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Item");
+
+                    b.Navigation("ParentItem");
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.AttachmentStreamInfo", b =>
+                {
+                    b.HasOne("Jellyfin.Data.Entities.BaseItemEntity", "Item")
+                        .WithMany()
+                        .HasForeignKey("ItemId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Item");
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.BaseItemImageInfo", b =>
+                {
+                    b.HasOne("Jellyfin.Data.Entities.BaseItemEntity", "Item")
+                        .WithMany("Images")
+                        .HasForeignKey("ItemId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Item");
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.BaseItemMetadataField", b =>
+                {
+                    b.HasOne("Jellyfin.Data.Entities.BaseItemEntity", "Item")
+                        .WithMany("LockedFields")
+                        .HasForeignKey("ItemId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Item");
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.BaseItemProvider", b =>
+                {
+                    b.HasOne("Jellyfin.Data.Entities.BaseItemEntity", "Item")
+                        .WithMany("Provider")
+                        .HasForeignKey("ItemId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Item");
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.BaseItemTrailerType", b =>
+                {
+                    b.HasOne("Jellyfin.Data.Entities.BaseItemEntity", "Item")
+                        .WithMany("TrailerTypes")
+                        .HasForeignKey("ItemId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Item");
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.Chapter", b =>
+                {
+                    b.HasOne("Jellyfin.Data.Entities.BaseItemEntity", "Item")
+                        .WithMany("Chapters")
+                        .HasForeignKey("ItemId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Item");
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.DisplayPreferences", b =>
+                {
+                    b.HasOne("Jellyfin.Data.Entities.User", null)
+                        .WithMany("DisplayPreferences")
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.HomeSection", b =>
+                {
+                    b.HasOne("Jellyfin.Data.Entities.DisplayPreferences", null)
+                        .WithMany("HomeSections")
+                        .HasForeignKey("DisplayPreferencesId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.ImageInfo", b =>
+                {
+                    b.HasOne("Jellyfin.Data.Entities.User", null)
+                        .WithOne("ProfileImage")
+                        .HasForeignKey("Jellyfin.Data.Entities.ImageInfo", "UserId")
+                        .OnDelete(DeleteBehavior.Cascade);
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.ItemDisplayPreferences", b =>
+                {
+                    b.HasOne("Jellyfin.Data.Entities.User", null)
+                        .WithMany("ItemDisplayPreferences")
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.ItemValueMap", b =>
+                {
+                    b.HasOne("Jellyfin.Data.Entities.BaseItemEntity", "Item")
+                        .WithMany("ItemValues")
+                        .HasForeignKey("ItemId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Jellyfin.Data.Entities.ItemValue", "ItemValue")
+                        .WithMany("BaseItemsMap")
+                        .HasForeignKey("ItemValueId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Item");
+
+                    b.Navigation("ItemValue");
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.MediaStreamInfo", b =>
+                {
+                    b.HasOne("Jellyfin.Data.Entities.BaseItemEntity", "Item")
+                        .WithMany("MediaStreams")
+                        .HasForeignKey("ItemId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Item");
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.PeopleBaseItemMap", b =>
+                {
+                    b.HasOne("Jellyfin.Data.Entities.BaseItemEntity", "Item")
+                        .WithMany("Peoples")
+                        .HasForeignKey("ItemId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Jellyfin.Data.Entities.People", "People")
+                        .WithMany("BaseItems")
+                        .HasForeignKey("PeopleId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Item");
+
+                    b.Navigation("People");
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.Permission", b =>
+                {
+                    b.HasOne("Jellyfin.Data.Entities.User", null)
+                        .WithMany("Permissions")
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade);
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.Preference", b =>
+                {
+                    b.HasOne("Jellyfin.Data.Entities.User", null)
+                        .WithMany("Preferences")
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade);
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.Security.Device", b =>
+                {
+                    b.HasOne("Jellyfin.Data.Entities.User", "User")
+                        .WithMany()
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("User");
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.UserData", b =>
+                {
+                    b.HasOne("Jellyfin.Data.Entities.BaseItemEntity", "Item")
+                        .WithMany("UserData")
+                        .HasForeignKey("ItemId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Jellyfin.Data.Entities.User", "User")
+                        .WithMany()
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Item");
+
+                    b.Navigation("User");
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.BaseItemEntity", b =>
+                {
+                    b.Navigation("AncestorIds");
+
+                    b.Navigation("Chapters");
+
+                    b.Navigation("Images");
+
+                    b.Navigation("ItemValues");
+
+                    b.Navigation("LockedFields");
+
+                    b.Navigation("MediaStreams");
+
+                    b.Navigation("Peoples");
+
+                    b.Navigation("Provider");
+
+                    b.Navigation("TrailerTypes");
+
+                    b.Navigation("UserData");
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.DisplayPreferences", b =>
+                {
+                    b.Navigation("HomeSections");
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.ItemValue", b =>
+                {
+                    b.Navigation("BaseItemsMap");
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.People", b =>
+                {
+                    b.Navigation("BaseItems");
+                });
+
+            modelBuilder.Entity("Jellyfin.Data.Entities.User", b =>
+                {
+                    b.Navigation("AccessSchedules");
+
+                    b.Navigation("DisplayPreferences");
+
+                    b.Navigation("ItemDisplayPreferences");
+
+                    b.Navigation("Permissions");
+
+                    b.Navigation("Preferences");
+
+                    b.Navigation("ProfileImage");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}
diff --git a/Jellyfin.Server.Implementations/Migrations/20241111135439_AddedCustomDataKeyKey.cs b/Jellyfin.Server.Implementations/Migrations/20241111135439_AddedCustomDataKeyKey.cs
new file mode 100644
index 000000000..4558d7c49
--- /dev/null
+++ b/Jellyfin.Server.Implementations/Migrations/20241111135439_AddedCustomDataKeyKey.cs
@@ -0,0 +1,54 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Jellyfin.Server.Implementations.Migrations
+{
+    /// <inheritdoc />
+    public partial class AddedCustomDataKeyKey : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropPrimaryKey(
+                name: "PK_UserData",
+                table: "UserData");
+
+            migrationBuilder.AlterColumn<string>(
+                name: "CustomDataKey",
+                table: "UserData",
+                type: "TEXT",
+                nullable: false,
+                defaultValue: string.Empty,
+                oldClrType: typeof(string),
+                oldType: "TEXT",
+                oldNullable: true);
+
+            migrationBuilder.AddPrimaryKey(
+                name: "PK_UserData",
+                table: "UserData",
+                columns: new[] { "ItemId", "UserId", "CustomDataKey" });
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropPrimaryKey(
+                name: "PK_UserData",
+                table: "UserData");
+
+            migrationBuilder.AlterColumn<string>(
+                name: "CustomDataKey",
+                table: "UserData",
+                type: "TEXT",
+                nullable: true,
+                oldClrType: typeof(string),
+                oldType: "TEXT");
+
+            migrationBuilder.AddPrimaryKey(
+                name: "PK_UserData",
+                table: "UserData",
+                columns: new[] { "ItemId", "UserId" });
+        }
+    }
+}
diff --git a/Jellyfin.Server.Implementations/Migrations/JellyfinDbModelSnapshot.cs b/Jellyfin.Server.Implementations/Migrations/JellyfinDbModelSnapshot.cs
index 6a9d9a55a..f3424434d 100644
--- a/Jellyfin.Server.Implementations/Migrations/JellyfinDbModelSnapshot.cs
+++ b/Jellyfin.Server.Implementations/Migrations/JellyfinDbModelSnapshot.cs
@@ -1276,6 +1276,9 @@ namespace Jellyfin.Server.Implementations.Migrations
                     b.Property<Guid>("UserId")
                         .HasColumnType("TEXT");
 
+                    b.Property<string>("CustomDataKey")
+                        .HasColumnType("TEXT");
+
                     b.Property<int?>("AudioStreamIndex")
                         .HasColumnType("INTEGER");
 
@@ -1303,7 +1306,7 @@ namespace Jellyfin.Server.Implementations.Migrations
                     b.Property<int?>("SubtitleStreamIndex")
                         .HasColumnType("INTEGER");
 
-                    b.HasKey("ItemId", "UserId");
+                    b.HasKey("ItemId", "UserId", "CustomDataKey");
 
                     b.HasIndex("UserId");
 
diff --git a/Jellyfin.Server.Implementations/ModelConfiguration/UserDataConfiguration.cs b/Jellyfin.Server.Implementations/ModelConfiguration/UserDataConfiguration.cs
index 5ebdf8d59..7bbb28d43 100644
--- a/Jellyfin.Server.Implementations/ModelConfiguration/UserDataConfiguration.cs
+++ b/Jellyfin.Server.Implementations/ModelConfiguration/UserDataConfiguration.cs
@@ -13,7 +13,7 @@ public class UserDataConfiguration : IEntityTypeConfiguration<UserData>
     /// <inheritdoc/>
     public void Configure(EntityTypeBuilder<UserData> builder)
     {
-        builder.HasKey(d => new { d.ItemId, d.UserId });
+        builder.HasKey(d => new { d.ItemId, d.UserId, d.CustomDataKey });
         builder.HasIndex(d => new { d.ItemId, d.UserId, d.Played });
         builder.HasIndex(d => new { d.ItemId, d.UserId, d.PlaybackPositionTicks });
         builder.HasIndex(d => new { d.ItemId, d.UserId, d.IsFavorite });
diff --git a/Jellyfin.Server/Migrations/Routines/MigrateLibraryDb.cs b/Jellyfin.Server/Migrations/Routines/MigrateLibraryDb.cs
index 571ac95eb..a440bc6d6 100644
--- a/Jellyfin.Server/Migrations/Routines/MigrateLibraryDb.cs
+++ b/Jellyfin.Server/Migrations/Routines/MigrateLibraryDb.cs
@@ -107,20 +107,20 @@ public class MigrateLibraryDb : IMigrationRoutine
         foreach (var entity in queryResult)
         {
             var userData = GetUserData(users, entity);
-            if (userData.Data is null)
+            if (userData is null)
             {
                 _logger.LogError("Was not able to migrate user data with key {0}", entity.GetString(0));
                 continue;
             }
 
-            if (!legacyBaseItemWithUserKeys.TryGetValue(userData.LegacyUserDataKey!, out var refItem))
+            if (!legacyBaseItemWithUserKeys.TryGetValue(userData.CustomDataKey!, out var refItem))
             {
                 _logger.LogError("Was not able to migrate user data with key {0} because it does not reference a valid BaseItem.", entity.GetString(0));
                 continue;
             }
 
-            userData.Data.ItemId = refItem.Id;
-            dbContext.UserData.Add(userData.Data);
+            userData.ItemId = refItem.Id;
+            dbContext.UserData.Add(userData);
         }
 
         _logger.LogInformation("Try saving {0} UserData entries.", dbContext.UserData.Local.Count);
@@ -289,7 +289,7 @@ public class MigrateLibraryDb : IMigrationRoutine
         }
     }
 
-    private (UserData? Data, string? LegacyUserDataKey) GetUserData(ImmutableArray<User> users, SqliteDataReader dto)
+    private UserData? GetUserData(ImmutableArray<User> users, SqliteDataReader dto)
     {
         var indexOfUser = dto.GetInt32(1);
         var user = users.ElementAtOrDefault(indexOfUser - 1);
@@ -297,14 +297,15 @@ public class MigrateLibraryDb : IMigrationRoutine
         if (user is null)
         {
             _logger.LogError("Tried to find user with index '{Idx}' but there are only '{MaxIdx}' users.", indexOfUser, users.Length);
-            return (null, null);
+            return null;
         }
 
         var oldKey = dto.GetString(0);
 
-        return (new UserData()
+        return new UserData()
         {
             ItemId = Guid.NewGuid(),
+            CustomDataKey = oldKey,
             UserId = user.Id,
             Rating = dto.IsDBNull(2) ? null : dto.GetDouble(2),
             Played = dto.GetBoolean(3),
@@ -317,7 +318,7 @@ public class MigrateLibraryDb : IMigrationRoutine
             Likes = null,
             User = null!,
             Item = null!
-        }, oldKey);
+        };
     }
 
     private AncestorId GetAncestorId(SqliteDataReader reader)
diff --git a/MediaBrowser.Controller/Entities/BaseItem.cs b/MediaBrowser.Controller/Entities/BaseItem.cs
index 0c698bb94..d92407a3f 100644
--- a/MediaBrowser.Controller/Entities/BaseItem.cs
+++ b/MediaBrowser.Controller/Entities/BaseItem.cs
@@ -1825,7 +1825,10 @@ namespace MediaBrowser.Controller.Entities
         {
             ArgumentNullException.ThrowIfNull(user);
 
-            var data = UserDataManager.GetUserData(user, this);
+            var data = UserDataManager.GetUserData(user, this) ?? new UserItemData()
+            {
+                Key = GetUserDataKeys().First(),
+            };
 
             if (datePlayed.HasValue)
             {
-- 
cgit v1.2.3


From ceb850c77052c465af8422dcf152f1d1d1530457 Mon Sep 17 00:00:00 2001
From: Bond-009 <bond.009@outlook.com>
Date: Sat, 16 Nov 2024 18:11:01 +0100
Subject: Update projects to .NET 9 (#13023)

---
 .devcontainer/Dev - Server Ffmpeg/devcontainer.json               | 6 +++---
 .devcontainer/devcontainer.json                                   | 6 +++---
 .github/workflows/ci-codeql-analysis.yml                          | 2 +-
 .github/workflows/ci-openapi.yml                                  | 8 ++++----
 .github/workflows/ci-tests.yml                                    | 2 +-
 .vscode/launch.json                                               | 6 +++---
 Directory.Build.props                                             | 1 +
 Emby.Naming/Emby.Naming.csproj                                    | 2 +-
 Emby.Photos/Emby.Photos.csproj                                    | 2 +-
 Emby.Server.Implementations/ApplicationHost.cs                    | 2 +-
 Emby.Server.Implementations/Emby.Server.Implementations.csproj    | 2 +-
 Emby.Server.Implementations/Library/UserDataManager.cs            | 1 -
 Emby.Server.Implementations/Plugins/PluginManager.cs              | 2 +-
 Jellyfin.Api/Controllers/ItemUpdateController.cs                  | 2 +-
 Jellyfin.Api/Jellyfin.Api.csproj                                  | 2 +-
 Jellyfin.Data/Entities/User.cs                                    | 2 +-
 Jellyfin.Data/Jellyfin.Data.csproj                                | 2 +-
 .../Jellyfin.Server.Implementations.csproj                        | 2 +-
 Jellyfin.Server/Helpers/StartupHelpers.cs                         | 8 --------
 Jellyfin.Server/Jellyfin.Server.csproj                            | 2 +-
 MediaBrowser.Common/MediaBrowser.Common.csproj                    | 2 +-
 MediaBrowser.Common/Plugins/BasePluginOfT.cs                      | 2 +-
 MediaBrowser.Controller/MediaBrowser.Controller.csproj            | 2 +-
 MediaBrowser.LocalMetadata/MediaBrowser.LocalMetadata.csproj      | 2 +-
 MediaBrowser.MediaEncoding/MediaBrowser.MediaEncoding.csproj      | 2 +-
 MediaBrowser.MediaEncoding/Probing/ProbeResultNormalizer.cs       | 2 +-
 MediaBrowser.Model/MediaBrowser.Model.csproj                      | 4 ++--
 MediaBrowser.Providers/Manager/ProviderManager.cs                 | 3 +--
 MediaBrowser.Providers/MediaBrowser.Providers.csproj              | 2 +-
 MediaBrowser.XbmcMetadata/MediaBrowser.XbmcMetadata.csproj        | 2 +-
 README.md                                                         | 4 ++--
 .../Emby.Server.Implementations.Fuzz.csproj                       | 2 +-
 fuzz/Emby.Server.Implementations.Fuzz/fuzz.sh                     | 2 +-
 fuzz/Jellyfin.Api.Fuzz/Jellyfin.Api.Fuzz.csproj                   | 2 +-
 fuzz/Jellyfin.Api.Fuzz/fuzz.sh                                    | 2 +-
 global.json                                                       | 2 +-
 jellyfin.ruleset                                                  | 4 ++++
 src/Jellyfin.Drawing.Skia/Jellyfin.Drawing.Skia.csproj            | 2 +-
 src/Jellyfin.Drawing/Jellyfin.Drawing.csproj                      | 2 +-
 src/Jellyfin.Extensions/Jellyfin.Extensions.csproj                | 2 +-
 .../Json/Converters/JsonDelimitedArrayConverter.cs                | 1 -
 src/Jellyfin.LiveTv/Jellyfin.LiveTv.csproj                        | 2 +-
 src/Jellyfin.MediaEncoding.Hls/Jellyfin.MediaEncoding.Hls.csproj  | 2 +-
 .../Jellyfin.MediaEncoding.Keyframes.csproj                       | 2 +-
 src/Jellyfin.Networking/Jellyfin.Networking.csproj                | 2 +-
 src/Jellyfin.Networking/Manager/NetworkManager.cs                 | 2 +-
 tests/Directory.Build.props                                       | 2 +-
 .../Json/Models/GenericBodyArrayModel.cs                          | 2 +-
 .../Json/Models/GenericBodyIReadOnlyListModel.cs                  | 2 +-
 tests/Jellyfin.LiveTv.Tests/Jellyfin.LiveTv.Tests.csproj          | 4 ++--
 .../TypedBaseItem/BaseItemKindTests.cs                            | 2 +-
 51 files changed, 63 insertions(+), 69 deletions(-)

(limited to 'MediaBrowser.Controller')

diff --git a/.devcontainer/Dev - Server Ffmpeg/devcontainer.json b/.devcontainer/Dev - Server Ffmpeg/devcontainer.json
index 0b848d9f3..a934512f4 100644
--- a/.devcontainer/Dev - Server Ffmpeg/devcontainer.json	
+++ b/.devcontainer/Dev - Server Ffmpeg/devcontainer.json	
@@ -1,6 +1,6 @@
 {
     "name": "Development Jellyfin Server - FFmpeg",
-    "image":"mcr.microsoft.com/devcontainers/dotnet:8.0-jammy",
+    "image":"mcr.microsoft.com/devcontainers/dotnet:9.0-jammy",
     // restores nuget packages, installs the dotnet workloads and installs the dev https certificate
     "postStartCommand": "dotnet restore; dotnet workload update; dotnet dev-certs https --trust; sudo bash \"./.devcontainer/Dev - Server Ffmpeg/install-ffmpeg.sh\"",
     // reads the extensions list and installs them
@@ -8,8 +8,8 @@
     "features": {
         "ghcr.io/devcontainers/features/dotnet:2": {
             "version": "none",
-            "dotnetRuntimeVersions": "8.0",
-            "aspNetCoreRuntimeVersions": "8.0"
+            "dotnetRuntimeVersions": "9.0",
+            "aspNetCoreRuntimeVersions": "9.0"
         },
         "ghcr.io/devcontainers-contrib/features/apt-packages:1": {
             "preserve_apt_list": false,
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 063901c80..0cf768f1f 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -1,6 +1,6 @@
 {
     "name": "Development Jellyfin Server",
-    "image":"mcr.microsoft.com/devcontainers/dotnet:8.0-jammy",
+    "image":"mcr.microsoft.com/devcontainers/dotnet:9.0-jammy",
     // restores nuget packages, installs the dotnet workloads and installs the dev https certificate
     "postStartCommand": "dotnet restore; dotnet workload update; dotnet dev-certs https --trust",
     // reads the extensions list and installs them
@@ -8,8 +8,8 @@
     "features": {
         "ghcr.io/devcontainers/features/dotnet:2": {
             "version": "none",
-            "dotnetRuntimeVersions": "8.0",
-            "aspNetCoreRuntimeVersions": "8.0"
+            "dotnetRuntimeVersions": "9.0",
+            "aspNetCoreRuntimeVersions": "9.0"
         },
         "ghcr.io/devcontainers-contrib/features/apt-packages:1": {
             "preserve_apt_list": false,
diff --git a/.github/workflows/ci-codeql-analysis.yml b/.github/workflows/ci-codeql-analysis.yml
index d6983c683..e6993d39d 100644
--- a/.github/workflows/ci-codeql-analysis.yml
+++ b/.github/workflows/ci-codeql-analysis.yml
@@ -24,7 +24,7 @@ jobs:
     - name: Setup .NET
       uses: actions/setup-dotnet@3e891b0cb619bf60e2c25674b222b8940e2c1c25 # v4.1.0
       with:
-        dotnet-version: '8.0.x'
+        dotnet-version: '9.0.x'
 
     - name: Initialize CodeQL
       uses: github/codeql-action/init@ea9e4e37992a54ee68a9622e985e60c8e8f12d9f # v3.27.4
diff --git a/.github/workflows/ci-openapi.yml b/.github/workflows/ci-openapi.yml
index 4633461ad..353c47c54 100644
--- a/.github/workflows/ci-openapi.yml
+++ b/.github/workflows/ci-openapi.yml
@@ -23,7 +23,7 @@ jobs:
       - name: Setup .NET
         uses: actions/setup-dotnet@3e891b0cb619bf60e2c25674b222b8940e2c1c25 # v4.1.0
         with:
-          dotnet-version: '8.0.x'
+          dotnet-version: '9.0.x'
       - name: Generate openapi.json
         run: dotnet test tests/Jellyfin.Server.Integration.Tests/Jellyfin.Server.Integration.Tests.csproj -c Release --filter "Jellyfin.Server.Integration.Tests.OpenApiSpecTests"
       - name: Upload openapi.json
@@ -32,7 +32,7 @@ jobs:
           name: openapi-head
           retention-days: 14
           if-no-files-found: error
-          path: tests/Jellyfin.Server.Integration.Tests/bin/Release/net8.0/openapi.json
+          path: tests/Jellyfin.Server.Integration.Tests/bin/Release/net9.0/openapi.json
 
   openapi-base:
     name: OpenAPI - BASE
@@ -57,7 +57,7 @@ jobs:
       - name: Setup .NET
         uses: actions/setup-dotnet@3e891b0cb619bf60e2c25674b222b8940e2c1c25 # v4.1.0
         with:
-          dotnet-version: '8.0.x'
+          dotnet-version: '9.0.x'
       - name: Generate openapi.json
         run: dotnet test tests/Jellyfin.Server.Integration.Tests/Jellyfin.Server.Integration.Tests.csproj -c Release --filter "Jellyfin.Server.Integration.Tests.OpenApiSpecTests"
       - name: Upload openapi.json
@@ -66,7 +66,7 @@ jobs:
           name: openapi-base
           retention-days: 14
           if-no-files-found: error
-          path: tests/Jellyfin.Server.Integration.Tests/bin/Release/net8.0/openapi.json
+          path: tests/Jellyfin.Server.Integration.Tests/bin/Release/net9.0/openapi.json
 
   openapi-diff:
     permissions:
diff --git a/.github/workflows/ci-tests.yml b/.github/workflows/ci-tests.yml
index aee3ebbf7..30aacc7a0 100644
--- a/.github/workflows/ci-tests.yml
+++ b/.github/workflows/ci-tests.yml
@@ -9,7 +9,7 @@ on:
   pull_request:
 
 env:
-  SDK_VERSION: "8.0.x"
+  SDK_VERSION: "9.0.x"
 
 jobs:
   run-tests:
diff --git a/.vscode/launch.json b/.vscode/launch.json
index 7e50d4f0a..d97d8de84 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -6,7 +6,7 @@
             "type": "coreclr",
             "request": "launch",
             "preLaunchTask": "build",
-            "program": "${workspaceFolder}/Jellyfin.Server/bin/Debug/net8.0/jellyfin.dll",
+            "program": "${workspaceFolder}/Jellyfin.Server/bin/Debug/net9.0/jellyfin.dll",
             "args": [],
             "cwd": "${workspaceFolder}/Jellyfin.Server",
             "console": "internalConsole",
@@ -22,7 +22,7 @@
             "type": "coreclr",
             "request": "launch",
             "preLaunchTask": "build",
-            "program": "${workspaceFolder}/Jellyfin.Server/bin/Debug/net8.0/jellyfin.dll",
+            "program": "${workspaceFolder}/Jellyfin.Server/bin/Debug/net9.0/jellyfin.dll",
             "args": ["--nowebclient"],
             "cwd": "${workspaceFolder}/Jellyfin.Server",
             "console": "internalConsole",
@@ -34,7 +34,7 @@
             "type": "coreclr",
             "request": "launch",
             "preLaunchTask": "build",
-            "program": "${workspaceFolder}/Jellyfin.Server/bin/Debug/net8.0/jellyfin.dll",
+            "program": "${workspaceFolder}/Jellyfin.Server/bin/Debug/net9.0/jellyfin.dll",
             "args": ["--nowebclient", "--ffmpeg", "/usr/lib/jellyfin-ffmpeg/ffmpeg"],
             "cwd": "${workspaceFolder}/Jellyfin.Server",
             "console": "internalConsole",
diff --git a/Directory.Build.props b/Directory.Build.props
index 44a60ffb5..831188015 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -8,6 +8,7 @@
 
   <PropertyGroup>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+    <WarningsNotAsErrors>NU1902;NU1903</WarningsNotAsErrors>
   </PropertyGroup>
 
   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
diff --git a/Emby.Naming/Emby.Naming.csproj b/Emby.Naming/Emby.Naming.csproj
index 53b297b06..20b32f3a6 100644
--- a/Emby.Naming/Emby.Naming.csproj
+++ b/Emby.Naming/Emby.Naming.csproj
@@ -6,7 +6,7 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <PublishRepositoryUrl>true</PublishRepositoryUrl>
diff --git a/Emby.Photos/Emby.Photos.csproj b/Emby.Photos/Emby.Photos.csproj
index 55dbe393c..645a74aea 100644
--- a/Emby.Photos/Emby.Photos.csproj
+++ b/Emby.Photos/Emby.Photos.csproj
@@ -19,7 +19,7 @@
   </ItemGroup>
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
   </PropertyGroup>
diff --git a/Emby.Server.Implementations/ApplicationHost.cs b/Emby.Server.Implementations/ApplicationHost.cs
index 5292003f0..13516896a 100644
--- a/Emby.Server.Implementations/ApplicationHost.cs
+++ b/Emby.Server.Implementations/ApplicationHost.cs
@@ -607,7 +607,7 @@ namespace Emby.Server.Implementations
                 // Don't use an empty string password
                 password = string.IsNullOrWhiteSpace(password) ? null : password;
 
-                var localCert = new X509Certificate2(path, password, X509KeyStorageFlags.UserKeySet);
+                var localCert = X509CertificateLoader.LoadPkcs12FromFile(path, password, X509KeyStorageFlags.UserKeySet);
                 if (!localCert.HasPrivateKey)
                 {
                     Logger.LogError("No private key included in SSL cert {CertificateLocation}.", path);
diff --git a/Emby.Server.Implementations/Emby.Server.Implementations.csproj b/Emby.Server.Implementations/Emby.Server.Implementations.csproj
index 34276355a..70dd5eb9a 100644
--- a/Emby.Server.Implementations/Emby.Server.Implementations.csproj
+++ b/Emby.Server.Implementations/Emby.Server.Implementations.csproj
@@ -37,7 +37,7 @@
   </ItemGroup>
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
   </PropertyGroup>
diff --git a/Emby.Server.Implementations/Library/UserDataManager.cs b/Emby.Server.Implementations/Library/UserDataManager.cs
index 62d22b23f..ceb3d65a4 100644
--- a/Emby.Server.Implementations/Library/UserDataManager.cs
+++ b/Emby.Server.Implementations/Library/UserDataManager.cs
@@ -84,7 +84,6 @@ namespace Emby.Server.Implementations.Library
         {
             ArgumentNullException.ThrowIfNull(user);
             ArgumentNullException.ThrowIfNull(item);
-            ArgumentNullException.ThrowIfNull(reason);
             ArgumentNullException.ThrowIfNull(userDataDto);
 
             var userData = GetUserData(user, item);
diff --git a/Emby.Server.Implementations/Plugins/PluginManager.cs b/Emby.Server.Implementations/Plugins/PluginManager.cs
index db82a2900..e7323d9d0 100644
--- a/Emby.Server.Implementations/Plugins/PluginManager.cs
+++ b/Emby.Server.Implementations/Plugins/PluginManager.cs
@@ -835,7 +835,7 @@ namespace Emby.Server.Implementations.Plugins
         /// <exception cref="ArgumentNullException">If the <see cref="LocalPlugin"/> is null.</exception>
         private bool TryGetPluginDlls(LocalPlugin plugin, out IReadOnlyList<string> whitelistedDlls)
         {
-            ArgumentNullException.ThrowIfNull(nameof(plugin));
+            ArgumentNullException.ThrowIfNull(plugin);
 
             IReadOnlyList<string> pluginDlls = Directory.GetFiles(plugin.Path, "*.dll", SearchOption.AllDirectories);
 
diff --git a/Jellyfin.Api/Controllers/ItemUpdateController.cs b/Jellyfin.Api/Controllers/ItemUpdateController.cs
index 4001a6add..d49e0753e 100644
--- a/Jellyfin.Api/Controllers/ItemUpdateController.cs
+++ b/Jellyfin.Api/Controllers/ItemUpdateController.cs
@@ -457,7 +457,7 @@ public class ItemUpdateController : BaseJellyfinApiController
             return null;
         }
 
-        return (SeriesStatus)Enum.Parse(typeof(SeriesStatus), item.Status, true);
+        return Enum.Parse<SeriesStatus>(item.Status, true);
     }
 
     private DateTime NormalizeDateTime(DateTime val)
diff --git a/Jellyfin.Api/Jellyfin.Api.csproj b/Jellyfin.Api/Jellyfin.Api.csproj
index 5f86a6b6b..25feaa2d7 100644
--- a/Jellyfin.Api/Jellyfin.Api.csproj
+++ b/Jellyfin.Api/Jellyfin.Api.csproj
@@ -6,7 +6,7 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
   </PropertyGroup>
 
diff --git a/Jellyfin.Data/Entities/User.cs b/Jellyfin.Data/Entities/User.cs
index 2c9cc8d78..9bbe9efe8 100644
--- a/Jellyfin.Data/Entities/User.cs
+++ b/Jellyfin.Data/Entities/User.cs
@@ -514,7 +514,7 @@ namespace Jellyfin.Data.Entities
         /// </summary>
         public void AddDefaultPreferences()
         {
-            foreach (var val in Enum.GetValues(typeof(PreferenceKind)).Cast<PreferenceKind>())
+            foreach (var val in Enum.GetValues<PreferenceKind>())
             {
                 Preferences.Add(new Preference(val, string.Empty));
             }
diff --git a/Jellyfin.Data/Jellyfin.Data.csproj b/Jellyfin.Data/Jellyfin.Data.csproj
index 0c17d71e7..921cf2d8c 100644
--- a/Jellyfin.Data/Jellyfin.Data.csproj
+++ b/Jellyfin.Data/Jellyfin.Data.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <PublishRepositoryUrl>true</PublishRepositoryUrl>
diff --git a/Jellyfin.Server.Implementations/Jellyfin.Server.Implementations.csproj b/Jellyfin.Server.Implementations/Jellyfin.Server.Implementations.csproj
index 20944ee4b..31cf24fb2 100644
--- a/Jellyfin.Server.Implementations/Jellyfin.Server.Implementations.csproj
+++ b/Jellyfin.Server.Implementations/Jellyfin.Server.Implementations.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
   </PropertyGroup>
diff --git a/Jellyfin.Server/Helpers/StartupHelpers.cs b/Jellyfin.Server/Helpers/StartupHelpers.cs
index 0802b23ad..bbf6d31f1 100644
--- a/Jellyfin.Server/Helpers/StartupHelpers.cs
+++ b/Jellyfin.Server/Helpers/StartupHelpers.cs
@@ -292,13 +292,5 @@ public static class StartupHelpers
         // Make sure we have all the code pages we can get
         // Ref: https://docs.microsoft.com/en-us/dotnet/api/system.text.codepagesencodingprovider.instance?view=netcore-3.0#remarks
         Encoding.RegisterProvider(CodePagesEncodingProvider.Instance);
-
-        // Increase the max http request limit
-        // The default connection limit is 10 for ASP.NET hosted applications and 2 for all others.
-        ServicePointManager.DefaultConnectionLimit = Math.Max(96, ServicePointManager.DefaultConnectionLimit);
-
-        // Disable the "Expect: 100-Continue" header by default
-        // http://stackoverflow.com/questions/566437/http-post-returns-the-error-417-expectation-failed-c
-        ServicePointManager.Expect100Continue = false;
     }
 }
diff --git a/Jellyfin.Server/Jellyfin.Server.csproj b/Jellyfin.Server/Jellyfin.Server.csproj
index e18212908..ebb12ba4e 100644
--- a/Jellyfin.Server/Jellyfin.Server.csproj
+++ b/Jellyfin.Server/Jellyfin.Server.csproj
@@ -8,7 +8,7 @@
   <PropertyGroup>
     <AssemblyName>jellyfin</AssemblyName>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <ServerGarbageCollection>false</ServerGarbageCollection>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
diff --git a/MediaBrowser.Common/MediaBrowser.Common.csproj b/MediaBrowser.Common/MediaBrowser.Common.csproj
index 51787d6a0..de6be4707 100644
--- a/MediaBrowser.Common/MediaBrowser.Common.csproj
+++ b/MediaBrowser.Common/MediaBrowser.Common.csproj
@@ -28,7 +28,7 @@
   </ItemGroup>
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <PublishRepositoryUrl>true</PublishRepositoryUrl>
diff --git a/MediaBrowser.Common/Plugins/BasePluginOfT.cs b/MediaBrowser.Common/Plugins/BasePluginOfT.cs
index 116e9cef8..bf2f12cb9 100644
--- a/MediaBrowser.Common/Plugins/BasePluginOfT.cs
+++ b/MediaBrowser.Common/Plugins/BasePluginOfT.cs
@@ -193,7 +193,7 @@ namespace MediaBrowser.Common.Plugins
             }
             catch
             {
-                var config = (TConfigurationType)Activator.CreateInstance(typeof(TConfigurationType));
+                var config = Activator.CreateInstance<TConfigurationType>();
                 SaveConfiguration(config);
                 return config;
             }
diff --git a/MediaBrowser.Controller/MediaBrowser.Controller.csproj b/MediaBrowser.Controller/MediaBrowser.Controller.csproj
index 62f36bf28..ba4a2a59c 100644
--- a/MediaBrowser.Controller/MediaBrowser.Controller.csproj
+++ b/MediaBrowser.Controller/MediaBrowser.Controller.csproj
@@ -34,7 +34,7 @@
   </ItemGroup>
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <PublishRepositoryUrl>true</PublishRepositoryUrl>
diff --git a/MediaBrowser.LocalMetadata/MediaBrowser.LocalMetadata.csproj b/MediaBrowser.LocalMetadata/MediaBrowser.LocalMetadata.csproj
index 05177ac39..8e3c8cf7f 100644
--- a/MediaBrowser.LocalMetadata/MediaBrowser.LocalMetadata.csproj
+++ b/MediaBrowser.LocalMetadata/MediaBrowser.LocalMetadata.csproj
@@ -11,7 +11,7 @@
   </ItemGroup>
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
   </PropertyGroup>
diff --git a/MediaBrowser.MediaEncoding/MediaBrowser.MediaEncoding.csproj b/MediaBrowser.MediaEncoding/MediaBrowser.MediaEncoding.csproj
index be63513a7..be7eeda92 100644
--- a/MediaBrowser.MediaEncoding/MediaBrowser.MediaEncoding.csproj
+++ b/MediaBrowser.MediaEncoding/MediaBrowser.MediaEncoding.csproj
@@ -6,7 +6,7 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
   </PropertyGroup>
diff --git a/MediaBrowser.MediaEncoding/Probing/ProbeResultNormalizer.cs b/MediaBrowser.MediaEncoding/Probing/ProbeResultNormalizer.cs
index 334796f58..c730f4cda 100644
--- a/MediaBrowser.MediaEncoding/Probing/ProbeResultNormalizer.cs
+++ b/MediaBrowser.MediaEncoding/Probing/ProbeResultNormalizer.cs
@@ -1648,7 +1648,7 @@ namespace MediaBrowser.MediaEncoding.Probing
 
             using (var fs = new FileStream(path, FileMode.Open, FileAccess.Read, FileShare.Read, 1))
             {
-                fs.Read(packetBuffer);
+                fs.ReadExactly(packetBuffer);
             }
 
             if (packetBuffer[0] == 71)
diff --git a/MediaBrowser.Model/MediaBrowser.Model.csproj b/MediaBrowser.Model/MediaBrowser.Model.csproj
index a3a575c0f..e9dab6bc8 100644
--- a/MediaBrowser.Model/MediaBrowser.Model.csproj
+++ b/MediaBrowser.Model/MediaBrowser.Model.csproj
@@ -14,7 +14,7 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <PublishRepositoryUrl>true</PublishRepositoryUrl>
@@ -35,7 +35,7 @@
   <ItemGroup>
     <FrameworkReference Include="Microsoft.AspNetCore.App" />
   </ItemGroup>
-  
+
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" />
     <PackageReference Include="MimeTypes">
diff --git a/MediaBrowser.Providers/Manager/ProviderManager.cs b/MediaBrowser.Providers/Manager/ProviderManager.cs
index c5689550d..e43da1350 100644
--- a/MediaBrowser.Providers/Manager/ProviderManager.cs
+++ b/MediaBrowser.Providers/Manager/ProviderManager.cs
@@ -262,7 +262,7 @@ namespace MediaBrowser.Providers.Manager
             try
             {
                 var fileStream = AsyncFile.OpenRead(source);
-                await new ImageSaver(_configurationManager, _libraryMonitor, _fileSystem, _logger).SaveImage(item, fileStream, mimeType, type, imageIndex, saveLocallyWithMedia, cancellationToken);
+                await new ImageSaver(_configurationManager, _libraryMonitor, _fileSystem, _logger).SaveImage(item, fileStream, mimeType, type, imageIndex, saveLocallyWithMedia, cancellationToken).ConfigureAwait(false);
             }
             finally
             {
@@ -1031,7 +1031,6 @@ namespace MediaBrowser.Providers.Manager
         /// <inheritdoc/>
         public void QueueRefresh(Guid itemId, MetadataRefreshOptions options, RefreshPriority priority)
         {
-            ArgumentNullException.ThrowIfNull(itemId);
             if (itemId.IsEmpty())
             {
                 throw new ArgumentException("Guid can't be empty", nameof(itemId));
diff --git a/MediaBrowser.Providers/MediaBrowser.Providers.csproj b/MediaBrowser.Providers/MediaBrowser.Providers.csproj
index 9a65852f0..a3e0acf1b 100644
--- a/MediaBrowser.Providers/MediaBrowser.Providers.csproj
+++ b/MediaBrowser.Providers/MediaBrowser.Providers.csproj
@@ -28,7 +28,7 @@
   </ItemGroup>
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <CodeAnalysisRuleSet>../jellyfin.ruleset</CodeAnalysisRuleSet>
diff --git a/MediaBrowser.XbmcMetadata/MediaBrowser.XbmcMetadata.csproj b/MediaBrowser.XbmcMetadata/MediaBrowser.XbmcMetadata.csproj
index c20073eea..b195af96c 100644
--- a/MediaBrowser.XbmcMetadata/MediaBrowser.XbmcMetadata.csproj
+++ b/MediaBrowser.XbmcMetadata/MediaBrowser.XbmcMetadata.csproj
@@ -15,7 +15,7 @@
   </ItemGroup>
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
   </PropertyGroup>
diff --git a/README.md b/README.md
index 7da0cb30d..a07fd32ce 100644
--- a/README.md
+++ b/README.md
@@ -74,7 +74,7 @@ These instructions will help you get set up with a local development environment
 
 ### Prerequisites
 
-Before the project can be built, you must first install the [.NET 8.0 SDK](https://dotnet.microsoft.com/download/dotnet) on your system.
+Before the project can be built, you must first install the [.NET 9.0 SDK](https://dotnet.microsoft.com/download/dotnet) on your system.
 
 Instructions to run this project from the command line are included here, but you will also need to install an IDE if you want to debug the server while it is running. Any IDE that supports .NET 6 development will work, but two options are recent versions of [Visual Studio](https://visualstudio.microsoft.com/downloads/) (at least 2022) and [Visual Studio Code](https://code.visualstudio.com/Download).
 
@@ -131,7 +131,7 @@ A second option is to build the project and then run the resulting executable fi
 
 ```bash
 dotnet build                       # Build the project
-cd Jellyfin.Server/bin/Debug/net8.0 # Change into the build output directory
+cd Jellyfin.Server/bin/Debug/net9.0 # Change into the build output directory
 ```
 
 2. Execute the build output. On Linux, Mac, etc. use `./jellyfin` and on Windows use `jellyfin.exe`.
diff --git a/fuzz/Emby.Server.Implementations.Fuzz/Emby.Server.Implementations.Fuzz.csproj b/fuzz/Emby.Server.Implementations.Fuzz/Emby.Server.Implementations.Fuzz.csproj
index 73aae3f3d..1373d2fe0 100644
--- a/fuzz/Emby.Server.Implementations.Fuzz/Emby.Server.Implementations.Fuzz.csproj
+++ b/fuzz/Emby.Server.Implementations.Fuzz/Emby.Server.Implementations.Fuzz.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/fuzz/Emby.Server.Implementations.Fuzz/fuzz.sh b/fuzz/Emby.Server.Implementations.Fuzz/fuzz.sh
index 80a5cd7c1..8183bb37a 100755
--- a/fuzz/Emby.Server.Implementations.Fuzz/fuzz.sh
+++ b/fuzz/Emby.Server.Implementations.Fuzz/fuzz.sh
@@ -8,4 +8,4 @@ cp bin/Emby.Server.Implementations.dll .
 
 dotnet build
 mkdir -p Findings
-AFL_SKIP_BIN_CHECK=1 afl-fuzz -i "Testcases/$1" -o "Findings/$1" -t 5000 ./bin/Debug/net8.0/Emby.Server.Implementations.Fuzz "$1"
+AFL_SKIP_BIN_CHECK=1 afl-fuzz -i "Testcases/$1" -o "Findings/$1" -t 5000 ./bin/Debug/net9.0/Emby.Server.Implementations.Fuzz "$1"
diff --git a/fuzz/Jellyfin.Api.Fuzz/Jellyfin.Api.Fuzz.csproj b/fuzz/Jellyfin.Api.Fuzz/Jellyfin.Api.Fuzz.csproj
index faac7d976..04c7be11d 100644
--- a/fuzz/Jellyfin.Api.Fuzz/Jellyfin.Api.Fuzz.csproj
+++ b/fuzz/Jellyfin.Api.Fuzz/Jellyfin.Api.Fuzz.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/fuzz/Jellyfin.Api.Fuzz/fuzz.sh b/fuzz/Jellyfin.Api.Fuzz/fuzz.sh
index 96b0192cf..15148e1bb 100755
--- a/fuzz/Jellyfin.Api.Fuzz/fuzz.sh
+++ b/fuzz/Jellyfin.Api.Fuzz/fuzz.sh
@@ -8,4 +8,4 @@ cp bin/Jellyfin.Api.dll .
 
 dotnet build
 mkdir -p Findings
-AFL_SKIP_BIN_CHECK=1 afl-fuzz -i "Testcases/$1" -o "Findings/$1" -t 5000 ./bin/Debug/net8.0/Jellyfin.Api.Fuzz "$1"
+AFL_SKIP_BIN_CHECK=1 afl-fuzz -i "Testcases/$1" -o "Findings/$1" -t 5000 ./bin/Debug/net9.0/Jellyfin.Api.Fuzz "$1"
diff --git a/global.json b/global.json
index c9b932026..2e13a6387 100644
--- a/global.json
+++ b/global.json
@@ -1,6 +1,6 @@
 {
     "sdk": {
-        "version": "8.0.404",
+        "version": "9.0.0",
         "rollForward": "latestMinor"
     }
 }
diff --git a/jellyfin.ruleset b/jellyfin.ruleset
index 67ffd9a37..ba04a70c2 100644
--- a/jellyfin.ruleset
+++ b/jellyfin.ruleset
@@ -154,6 +154,8 @@
     <!-- TODO: enable when false positives are fixed -->
     <!-- disable warning CA1508: Avoid dead conditional code -->
     <Rule Id="CA1508" Action="Info" />
+    <!-- disable warning CA1515: Consider making public types internal -->
+    <Rule Id="CA1515" Action="Info" />
     <!-- disable warning CA1716: Identifiers should not match keywords -->
     <Rule Id="CA1716" Action="Info" />
     <!-- disable warning CA1720: Identifiers should not contain type names -->
@@ -168,6 +170,8 @@
     <Rule Id="CA1812" Action="Info" />
     <!-- disable warning CA1822: Member does not access instance data and can be marked as static -->
     <Rule Id="CA1822" Action="Info" />
+    <!-- CA1859: Use concrete types when possible for improved performance -->
+    <Rule Id="CA1859" Action="Info" />
     <!-- TODO: Enable -->
     <!-- CA1861: Prefer 'static readonly' fields over constant array arguments if the called method is called repeatedly and is not mutating the passed array -->
     <Rule Id="CA1861" Action="Info" />
diff --git a/src/Jellyfin.Drawing.Skia/Jellyfin.Drawing.Skia.csproj b/src/Jellyfin.Drawing.Skia/Jellyfin.Drawing.Skia.csproj
index 0590ded32..ba402dfe0 100644
--- a/src/Jellyfin.Drawing.Skia/Jellyfin.Drawing.Skia.csproj
+++ b/src/Jellyfin.Drawing.Skia/Jellyfin.Drawing.Skia.csproj
@@ -6,7 +6,7 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <!-- TODO: Remove once we update SkiaSharp > 2.88.5 -->
diff --git a/src/Jellyfin.Drawing/Jellyfin.Drawing.csproj b/src/Jellyfin.Drawing/Jellyfin.Drawing.csproj
index 4a02f90f9..5f4b3fe8d 100644
--- a/src/Jellyfin.Drawing/Jellyfin.Drawing.csproj
+++ b/src/Jellyfin.Drawing/Jellyfin.Drawing.csproj
@@ -6,7 +6,7 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
   </PropertyGroup>
diff --git a/src/Jellyfin.Extensions/Jellyfin.Extensions.csproj b/src/Jellyfin.Extensions/Jellyfin.Extensions.csproj
index 1a42679fc..1613d83bc 100644
--- a/src/Jellyfin.Extensions/Jellyfin.Extensions.csproj
+++ b/src/Jellyfin.Extensions/Jellyfin.Extensions.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <PublishRepositoryUrl>true</PublishRepositoryUrl>
diff --git a/src/Jellyfin.Extensions/Json/Converters/JsonDelimitedArrayConverter.cs b/src/Jellyfin.Extensions/Json/Converters/JsonDelimitedArrayConverter.cs
index 936a5a97c..cdeaf29b0 100644
--- a/src/Jellyfin.Extensions/Json/Converters/JsonDelimitedArrayConverter.cs
+++ b/src/Jellyfin.Extensions/Json/Converters/JsonDelimitedArrayConverter.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
-using System.Linq;
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
diff --git a/src/Jellyfin.LiveTv/Jellyfin.LiveTv.csproj b/src/Jellyfin.LiveTv/Jellyfin.LiveTv.csproj
index c58889740..f04c02504 100644
--- a/src/Jellyfin.LiveTv/Jellyfin.LiveTv.csproj
+++ b/src/Jellyfin.LiveTv/Jellyfin.LiveTv.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
   </PropertyGroup>
 
diff --git a/src/Jellyfin.MediaEncoding.Hls/Jellyfin.MediaEncoding.Hls.csproj b/src/Jellyfin.MediaEncoding.Hls/Jellyfin.MediaEncoding.Hls.csproj
index ee79802a1..dc581724a 100644
--- a/src/Jellyfin.MediaEncoding.Hls/Jellyfin.MediaEncoding.Hls.csproj
+++ b/src/Jellyfin.MediaEncoding.Hls/Jellyfin.MediaEncoding.Hls.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
   </PropertyGroup>
 
diff --git a/src/Jellyfin.MediaEncoding.Keyframes/Jellyfin.MediaEncoding.Keyframes.csproj b/src/Jellyfin.MediaEncoding.Keyframes/Jellyfin.MediaEncoding.Keyframes.csproj
index c79dcee3c..c826d3d9c 100644
--- a/src/Jellyfin.MediaEncoding.Keyframes/Jellyfin.MediaEncoding.Keyframes.csproj
+++ b/src/Jellyfin.MediaEncoding.Keyframes/Jellyfin.MediaEncoding.Keyframes.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
   </PropertyGroup>
 
diff --git a/src/Jellyfin.Networking/Jellyfin.Networking.csproj b/src/Jellyfin.Networking/Jellyfin.Networking.csproj
index 24b3ecaab..472cdb7ef 100644
--- a/src/Jellyfin.Networking/Jellyfin.Networking.csproj
+++ b/src/Jellyfin.Networking/Jellyfin.Networking.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
   </PropertyGroup>
diff --git a/src/Jellyfin.Networking/Manager/NetworkManager.cs b/src/Jellyfin.Networking/Manager/NetworkManager.cs
index 5a13cc417..10aed673b 100644
--- a/src/Jellyfin.Networking/Manager/NetworkManager.cs
+++ b/src/Jellyfin.Networking/Manager/NetworkManager.cs
@@ -57,7 +57,7 @@ public class NetworkManager : INetworkManager, IDisposable
     /// <summary>
     /// Dictionary containing interface addresses and their subnets.
     /// </summary>
-    private IReadOnlyList<IPData> _interfaces;
+    private List<IPData> _interfaces;
 
     /// <summary>
     /// Unfiltered user defined LAN subnets (<see cref="NetworkConfiguration.LocalNetworkSubnets"/>)
diff --git a/tests/Directory.Build.props b/tests/Directory.Build.props
index bec3481cb..146ad8dc2 100644
--- a/tests/Directory.Build.props
+++ b/tests/Directory.Build.props
@@ -4,7 +4,7 @@
   <Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))" />
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <IsPackable>false</IsPackable>
     <CodeAnalysisRuleSet>$(MSBuildThisFileDirectory)/jellyfin-tests.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
diff --git a/tests/Jellyfin.Extensions.Tests/Json/Models/GenericBodyArrayModel.cs b/tests/Jellyfin.Extensions.Tests/Json/Models/GenericBodyArrayModel.cs
index ef135278f..76669ea19 100644
--- a/tests/Jellyfin.Extensions.Tests/Json/Models/GenericBodyArrayModel.cs
+++ b/tests/Jellyfin.Extensions.Tests/Json/Models/GenericBodyArrayModel.cs
@@ -8,7 +8,7 @@ namespace Jellyfin.Extensions.Tests.Json.Models
     /// The generic body model.
     /// </summary>
     /// <typeparam name="T">The value type.</typeparam>
-    public class GenericBodyArrayModel<T>
+    public sealed class GenericBodyArrayModel<T>
     {
         /// <summary>
         /// Gets or sets the value.
diff --git a/tests/Jellyfin.Extensions.Tests/Json/Models/GenericBodyIReadOnlyListModel.cs b/tests/Jellyfin.Extensions.Tests/Json/Models/GenericBodyIReadOnlyListModel.cs
index 8e7b5a35b..7e6b97afe 100644
--- a/tests/Jellyfin.Extensions.Tests/Json/Models/GenericBodyIReadOnlyListModel.cs
+++ b/tests/Jellyfin.Extensions.Tests/Json/Models/GenericBodyIReadOnlyListModel.cs
@@ -8,7 +8,7 @@ namespace Jellyfin.Extensions.Tests.Json.Models
     /// The generic body <c>IReadOnlyList</c> model.
     /// </summary>
     /// <typeparam name="T">The value type.</typeparam>
-    public class GenericBodyIReadOnlyListModel<T>
+    public sealed class GenericBodyIReadOnlyListModel<T>
     {
         /// <summary>
         /// Gets or sets the value.
diff --git a/tests/Jellyfin.LiveTv.Tests/Jellyfin.LiveTv.Tests.csproj b/tests/Jellyfin.LiveTv.Tests/Jellyfin.LiveTv.Tests.csproj
index cf967b84c..fdcf7d61e 100644
--- a/tests/Jellyfin.LiveTv.Tests/Jellyfin.LiveTv.Tests.csproj
+++ b/tests/Jellyfin.LiveTv.Tests/Jellyfin.LiveTv.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
@@ -22,7 +22,7 @@
     <PackageReference Include="Xunit.SkippableFact" />
     <PackageReference Include="coverlet.collector" />
   </ItemGroup>
-  
+
   <ItemGroup>
     <ProjectReference Include="..\..\src\Jellyfin.LiveTv\Jellyfin.LiveTv.csproj" />
   </ItemGroup>
diff --git a/tests/Jellyfin.Server.Implementations.Tests/TypedBaseItem/BaseItemKindTests.cs b/tests/Jellyfin.Server.Implementations.Tests/TypedBaseItem/BaseItemKindTests.cs
index 1bd51b246..9a4389e7a 100644
--- a/tests/Jellyfin.Server.Implementations.Tests/TypedBaseItem/BaseItemKindTests.cs
+++ b/tests/Jellyfin.Server.Implementations.Tests/TypedBaseItem/BaseItemKindTests.cs
@@ -35,7 +35,7 @@ namespace Jellyfin.Server.Implementations.Tests.TypedBaseItem
         public void EnumParse_GivenValidBaseItemType_ReturnsEnumValue(Type baseItemDescendantType)
         {
             var enumValue = Enum.Parse<BaseItemKind>(baseItemDescendantType.Name);
-            Assert.True(Enum.IsDefined(typeof(BaseItemKind), enumValue));
+            Assert.True(Enum.IsDefined(enumValue));
         }
 
         [Theory]
-- 
cgit v1.2.3


From b39553611d0d6702ef657f76573cefa2ee437745 Mon Sep 17 00:00:00 2001
From: JPVenson <github@jpb.email>
Date: Sun, 17 Nov 2024 11:03:43 +0000
Subject: Applied coding style

---
 .../Data/CleanDatabaseScheduledTask.cs                       |  4 ++--
 Emby.Server.Implementations/Data/ItemTypeLookup.cs           |  6 ------
 Emby.Server.Implementations/Library/LibraryManager.cs        |  7 ++++---
 Emby.Server.Implementations/Library/MediaSourceManager.cs    |  2 +-
 Jellyfin.Api/Controllers/InstantMixController.cs             |  2 +-
 Jellyfin.Api/Controllers/YearsController.cs                  |  4 ++--
 Jellyfin.Server.Implementations/Item/BaseItemRepository.cs   | 12 ++++++------
 Jellyfin.Server.Implementations/Item/ChapterRepository.cs    |  2 +-
 .../Item/MediaAttachmentRepository.cs                        |  2 +-
 .../Item/MediaStreamRepository.cs                            |  2 +-
 Jellyfin.Server.Implementations/Item/PeopleRepository.cs     |  4 ++--
 .../MediaSegments/MediaSegmentManager.cs                     |  2 +-
 MediaBrowser.Controller/Entities/BaseItem.cs                 |  2 +-
 MediaBrowser.Controller/Entities/Folder.cs                   | 10 +++++-----
 MediaBrowser.Controller/Entities/Movies/BoxSet.cs            |  4 ++--
 MediaBrowser.Controller/Library/ILibraryManager.cs           |  2 +-
 MediaBrowser.Providers/Music/ArtistMetadataService.cs        |  2 +-
 src/Jellyfin.LiveTv/Guide/GuideManager.cs                    |  2 +-
 18 files changed, 33 insertions(+), 38 deletions(-)

(limited to 'MediaBrowser.Controller')

diff --git a/Emby.Server.Implementations/Data/CleanDatabaseScheduledTask.cs b/Emby.Server.Implementations/Data/CleanDatabaseScheduledTask.cs
index 6ea7d9197..aceff8b53 100644
--- a/Emby.Server.Implementations/Data/CleanDatabaseScheduledTask.cs
+++ b/Emby.Server.Implementations/Data/CleanDatabaseScheduledTask.cs
@@ -28,9 +28,9 @@ namespace Emby.Server.Implementations.Data
             _dbProvider = dbProvider;
         }
 
-        public Task Run(IProgress<double> progress, CancellationToken cancellationToken)
+        public async Task Run(IProgress<double> progress, CancellationToken cancellationToken)
         {
-            return CleanDeadItems(cancellationToken, progress);
+            await CleanDeadItems(cancellationToken, progress).ConfigureAwait(false);
         }
 
         private async Task CleanDeadItems(CancellationToken cancellationToken, IProgress<double> progress)
diff --git a/Emby.Server.Implementations/Data/ItemTypeLookup.cs b/Emby.Server.Implementations/Data/ItemTypeLookup.cs
index f5db28c7a..82c0a8b6c 100644
--- a/Emby.Server.Implementations/Data/ItemTypeLookup.cs
+++ b/Emby.Server.Implementations/Data/ItemTypeLookup.cs
@@ -1,12 +1,8 @@
-using System;
 using System.Collections.Frozen;
 using System.Collections.Generic;
-using System.Collections.Immutable;
-using System.Linq;
 using System.Threading.Channels;
 using Emby.Server.Implementations.Playlists;
 using Jellyfin.Data.Enums;
-using Jellyfin.Server.Implementations;
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Entities.Audio;
 using MediaBrowser.Controller.Entities.Movies;
@@ -14,7 +10,6 @@ using MediaBrowser.Controller.Entities.TV;
 using MediaBrowser.Controller.LiveTv;
 using MediaBrowser.Controller.Persistence;
 using MediaBrowser.Controller.Playlists;
-using MediaBrowser.Model.Querying;
 
 namespace Emby.Server.Implementations.Data;
 
@@ -23,7 +18,6 @@ public class ItemTypeLookup : IItemTypeLookup
 {
     /// <inheritdoc />
     public IReadOnlyList<string> MusicGenreTypes { get; } = [
-
          typeof(Audio).FullName!,
          typeof(MusicVideo).FullName!,
          typeof(MusicAlbum).FullName!,
diff --git a/Emby.Server.Implementations/Library/LibraryManager.cs b/Emby.Server.Implementations/Library/LibraryManager.cs
index 7e059be23..7b37011cb 100644
--- a/Emby.Server.Implementations/Library/LibraryManager.cs
+++ b/Emby.Server.Implementations/Library/LibraryManager.cs
@@ -1810,11 +1810,11 @@ namespace Emby.Server.Implementations.Library
         /// <inheritdoc />
         public void CreateItem(BaseItem item, BaseItem? parent)
         {
-            CreateItems(new[] { item }, parent, CancellationToken.None);
+            CreateOrUpdateItems(new[] { item }, parent, CancellationToken.None);
         }
 
         /// <inheritdoc />
-        public void CreateItems(IReadOnlyList<BaseItem> items, BaseItem? parent, CancellationToken cancellationToken)
+        public void CreateOrUpdateItems(IReadOnlyList<BaseItem> items, BaseItem? parent, CancellationToken cancellationToken)
         {
             _itemRepository.SaveItems(items, cancellationToken);
 
@@ -2971,10 +2971,11 @@ namespace Emby.Server.Implementations.Library
                 {
                     if (createEntity)
                     {
-                        CreateItems([personEntity], null, CancellationToken.None);
+                        CreateOrUpdateItems([personEntity], null, CancellationToken.None);
                     }
 
                     await RunMetadataSavers(personEntity, itemUpdateType).ConfigureAwait(false);
+                    CreateOrUpdateItems([personEntity], null, CancellationToken.None);
                 }
             }
         }
diff --git a/Emby.Server.Implementations/Library/MediaSourceManager.cs b/Emby.Server.Implementations/Library/MediaSourceManager.cs
index 2fb571a10..d0f5e60f7 100644
--- a/Emby.Server.Implementations/Library/MediaSourceManager.cs
+++ b/Emby.Server.Implementations/Library/MediaSourceManager.cs
@@ -218,7 +218,7 @@ namespace Emby.Server.Implementations.Library
                 list.Add(source);
             }
 
-            return SortMediaSources(list).ToImmutableArray();
+            return SortMediaSources(list).ToArray();
         }
 
         /// <inheritdoc />>
diff --git a/Jellyfin.Api/Controllers/InstantMixController.cs b/Jellyfin.Api/Controllers/InstantMixController.cs
index e89e7ce26..87a856d38 100644
--- a/Jellyfin.Api/Controllers/InstantMixController.cs
+++ b/Jellyfin.Api/Controllers/InstantMixController.cs
@@ -397,7 +397,7 @@ public class InstantMixController : BaseJellyfinApiController
 
         if (limit.HasValue && limit < items.Count)
         {
-            items = items.Take(limit.Value).ToImmutableArray();
+            items = items.Take(limit.Value).ToArray();
         }
 
         var result = new QueryResult<BaseItemDto>(
diff --git a/Jellyfin.Api/Controllers/YearsController.cs b/Jellyfin.Api/Controllers/YearsController.cs
index 907724e04..e709e43e2 100644
--- a/Jellyfin.Api/Controllers/YearsController.cs
+++ b/Jellyfin.Api/Controllers/YearsController.cs
@@ -113,11 +113,11 @@ public class YearsController : BaseJellyfinApiController
 
             if (userId.IsNullOrEmpty())
             {
-                items = recursive ? folder.GetRecursiveChildren(Filter) : folder.Children.Where(Filter).ToImmutableArray();
+                items = recursive ? folder.GetRecursiveChildren(Filter) : folder.Children.Where(Filter).ToArray();
             }
             else
             {
-                items = recursive ? folder.GetRecursiveChildren(user, query) : folder.GetChildren(user, true).Where(Filter).ToImmutableArray();
+                items = recursive ? folder.GetRecursiveChildren(user, query) : folder.GetChildren(user, true).Where(Filter).ToArray();
             }
         }
         else
diff --git a/Jellyfin.Server.Implementations/Item/BaseItemRepository.cs b/Jellyfin.Server.Implementations/Item/BaseItemRepository.cs
index 0183685be..8670b06cc 100644
--- a/Jellyfin.Server.Implementations/Item/BaseItemRepository.cs
+++ b/Jellyfin.Server.Implementations/Item/BaseItemRepository.cs
@@ -117,7 +117,7 @@ public sealed class BaseItemRepository(
         PrepareFilterQuery(filter);
 
         using var context = dbProvider.CreateDbContext();
-        return ApplyQueryFilter(context.BaseItems.AsNoTracking(), context, filter).Select(e => e.Id).ToImmutableArray();
+        return ApplyQueryFilter(context.BaseItems.AsNoTracking(), context, filter).Select(e => e.Id).ToArray();
     }
 
     /// <inheritdoc />
@@ -216,7 +216,7 @@ public sealed class BaseItemRepository(
         dbQuery = ApplyGroupingFilter(dbQuery, filter);
         dbQuery = ApplyQueryPageing(dbQuery, filter);
 
-        result.Items = dbQuery.AsEnumerable().Where(e => e is not null).Select(w => DeserialiseBaseItem(w, filter.SkipDeserialization)).ToImmutableArray();
+        result.Items = dbQuery.AsEnumerable().Where(e => e is not null).Select(w => DeserialiseBaseItem(w, filter.SkipDeserialization)).ToArray();
         result.StartIndex = filter.StartIndex ?? 0;
         return result;
     }
@@ -235,7 +235,7 @@ public sealed class BaseItemRepository(
         dbQuery = ApplyGroupingFilter(dbQuery, filter);
         dbQuery = ApplyQueryPageing(dbQuery, filter);
 
-        return dbQuery.AsEnumerable().Where(e => e is not null).Select(w => DeserialiseBaseItem(w, filter.SkipDeserialization)).ToImmutableArray();
+        return dbQuery.AsEnumerable().Where(e => e is not null).Select(w => DeserialiseBaseItem(w, filter.SkipDeserialization)).ToArray();
     }
 
     private IQueryable<BaseItemEntity> ApplyGroupingFilter(IQueryable<BaseItemEntity> dbQuery, InternalItemsQuery filter)
@@ -831,7 +831,7 @@ public sealed class BaseItemRepository(
         }
 
         // query = query.DistinctBy(e => e.CleanValue);
-        return query.Select(e => e.ItemValue.CleanValue).ToImmutableArray();
+        return query.Select(e => e.ItemValue.CleanValue).ToArray();
     }
 
     private static bool TypeRequiresDeserialization(Type type)
@@ -976,10 +976,10 @@ public sealed class BaseItemRepository(
         });
 
         result.StartIndex = filter.StartIndex ?? 0;
-        result.Items = resultQuery.ToImmutableArray().Where(e => e is not null).Select(e =>
+        result.Items = resultQuery.ToArray().Where(e => e is not null).Select(e =>
         {
             return (DeserialiseBaseItem(e.item, filter.SkipDeserialization), e.itemCount);
-        }).ToImmutableArray();
+        }).ToArray();
 
         return result;
     }
diff --git a/Jellyfin.Server.Implementations/Item/ChapterRepository.cs b/Jellyfin.Server.Implementations/Item/ChapterRepository.cs
index dc55484c9..16e8c205d 100644
--- a/Jellyfin.Server.Implementations/Item/ChapterRepository.cs
+++ b/Jellyfin.Server.Implementations/Item/ChapterRepository.cs
@@ -73,7 +73,7 @@ public class ChapterRepository : IChapterRepository
             })
             .ToList()
             .Select(e => Map(e.chapter, e.baseItemPath!))
-            .ToImmutableArray();
+            .ToArray();
     }
 
     /// <inheritdoc cref="IChapterRepository"/>
diff --git a/Jellyfin.Server.Implementations/Item/MediaAttachmentRepository.cs b/Jellyfin.Server.Implementations/Item/MediaAttachmentRepository.cs
index c6488f321..155798209 100644
--- a/Jellyfin.Server.Implementations/Item/MediaAttachmentRepository.cs
+++ b/Jellyfin.Server.Implementations/Item/MediaAttachmentRepository.cs
@@ -40,7 +40,7 @@ public class MediaAttachmentRepository(IDbContextFactory<JellyfinDbContext> dbPr
             query = query.Where(e => e.Index == filter.Index);
         }
 
-        return query.AsEnumerable().Select(Map).ToImmutableArray();
+        return query.AsEnumerable().Select(Map).ToArray();
     }
 
     private MediaAttachment Map(AttachmentStreamInfo attachment)
diff --git a/Jellyfin.Server.Implementations/Item/MediaStreamRepository.cs b/Jellyfin.Server.Implementations/Item/MediaStreamRepository.cs
index 0617dd81e..d6bfc1a8f 100644
--- a/Jellyfin.Server.Implementations/Item/MediaStreamRepository.cs
+++ b/Jellyfin.Server.Implementations/Item/MediaStreamRepository.cs
@@ -51,7 +51,7 @@ public class MediaStreamRepository : IMediaStreamRepository
     public IReadOnlyList<MediaStream> GetMediaStreams(MediaStreamQuery filter)
     {
         using var context = _dbProvider.CreateDbContext();
-        return TranslateQuery(context.MediaStreamInfos.AsNoTracking(), filter).AsEnumerable().Select(Map).ToImmutableArray();
+        return TranslateQuery(context.MediaStreamInfos.AsNoTracking(), filter).AsEnumerable().Select(Map).ToArray();
     }
 
     private string? GetPathToSave(string? path)
diff --git a/Jellyfin.Server.Implementations/Item/PeopleRepository.cs b/Jellyfin.Server.Implementations/Item/PeopleRepository.cs
index 417212ba4..d1823514a 100644
--- a/Jellyfin.Server.Implementations/Item/PeopleRepository.cs
+++ b/Jellyfin.Server.Implementations/Item/PeopleRepository.cs
@@ -36,7 +36,7 @@ public class PeopleRepository(IDbContextFactory<JellyfinDbContext> dbProvider, I
             dbQuery = dbQuery.Take(filter.Limit);
         }
 
-        return dbQuery.AsEnumerable().Select(Map).ToImmutableArray();
+        return dbQuery.AsEnumerable().Select(Map).ToArray();
     }
 
     /// <inheritdoc/>
@@ -51,7 +51,7 @@ public class PeopleRepository(IDbContextFactory<JellyfinDbContext> dbProvider, I
             dbQuery = dbQuery.Take(filter.Limit);
         }
 
-        return dbQuery.Select(e => e.Name).ToImmutableArray();
+        return dbQuery.Select(e => e.Name).ToArray();
     }
 
     /// <inheritdoc />
diff --git a/Jellyfin.Server.Implementations/MediaSegments/MediaSegmentManager.cs b/Jellyfin.Server.Implementations/MediaSegments/MediaSegmentManager.cs
index 151b616f7..d0f41c6fa 100644
--- a/Jellyfin.Server.Implementations/MediaSegments/MediaSegmentManager.cs
+++ b/Jellyfin.Server.Implementations/MediaSegments/MediaSegmentManager.cs
@@ -154,7 +154,7 @@ public class MediaSegmentManager : IMediaSegmentManager
         return query
             .OrderBy(e => e.StartTicks)
             .AsNoTracking()
-            .ToImmutableArray()
+            .ToArray()
             .Select(Map);
     }
 
diff --git a/MediaBrowser.Controller/Entities/BaseItem.cs b/MediaBrowser.Controller/Entities/BaseItem.cs
index d92407a3f..a6bc35a9f 100644
--- a/MediaBrowser.Controller/Entities/BaseItem.cs
+++ b/MediaBrowser.Controller/Entities/BaseItem.cs
@@ -1092,7 +1092,7 @@ namespace MediaBrowser.Controller.Entities
                 return 1;
             }).ThenBy(i => i.Video3DFormat.HasValue ? 1 : 0)
             .ThenByDescending(i => i, new MediaSourceWidthComparator())
-            .ToImmutableArray();
+            .ToArray();
         }
 
         protected virtual IEnumerable<(BaseItem Item, MediaSourceType MediaSourceType)> GetAllItemsForMediaSources()
diff --git a/MediaBrowser.Controller/Entities/Folder.cs b/MediaBrowser.Controller/Entities/Folder.cs
index 8fff7dbc4..a13f04614 100644
--- a/MediaBrowser.Controller/Entities/Folder.cs
+++ b/MediaBrowser.Controller/Entities/Folder.cs
@@ -452,7 +452,7 @@ namespace MediaBrowser.Controller.Entities
 
                 if (newItems.Count > 0)
                 {
-                    LibraryManager.CreateItems(newItems, this, cancellationToken);
+                    LibraryManager.CreateOrUpdateItems(newItems, this, cancellationToken);
                 }
             }
             else
@@ -1306,7 +1306,7 @@ namespace MediaBrowser.Controller.Entities
 
             AddChildren(user, includeLinkedChildren, result, false, query);
 
-            return result.Values.ToImmutableArray();
+            return result.Values.ToArray();
         }
 
         protected virtual IEnumerable<BaseItem> GetEligibleChildrenForRecursiveChildren(User user)
@@ -1379,7 +1379,7 @@ namespace MediaBrowser.Controller.Entities
 
             AddChildren(user, true, result, true, query);
 
-            return result.Values.ToImmutableArray();
+            return result.Values.ToArray();
         }
 
         /// <summary>
@@ -1407,7 +1407,7 @@ namespace MediaBrowser.Controller.Entities
 
             AddChildrenToList(result, includeLinkedChildren, true, filter);
 
-            return result.Values.ToImmutableArray();
+            return result.Values.ToArray();
         }
 
         /// <summary>
@@ -1563,7 +1563,7 @@ namespace MediaBrowser.Controller.Entities
             return LinkedChildren
                 .Select(i => new Tuple<LinkedChild, BaseItem>(i, GetLinkedChild(i)))
                 .Where(i => i.Item2 is not null)
-                .ToImmutableArray();
+                .ToArray();
         }
 
         protected override async Task<bool> RefreshedOwnedItems(MetadataRefreshOptions options, IReadOnlyList<FileSystemMetadata> fileSystemChildren, CancellationToken cancellationToken)
diff --git a/MediaBrowser.Controller/Entities/Movies/BoxSet.cs b/MediaBrowser.Controller/Entities/Movies/BoxSet.cs
index cb17e3faf..d0c9f049a 100644
--- a/MediaBrowser.Controller/Entities/Movies/BoxSet.cs
+++ b/MediaBrowser.Controller/Entities/Movies/BoxSet.cs
@@ -131,13 +131,13 @@ namespace MediaBrowser.Controller.Entities.Movies
         public override IReadOnlyList<BaseItem> GetChildren(User user, bool includeLinkedChildren, InternalItemsQuery query)
         {
             var children = base.GetChildren(user, includeLinkedChildren, query);
-            return Sort(children, user).ToImmutableArray();
+            return Sort(children, user).ToArray();
         }
 
         public override IReadOnlyList<BaseItem> GetRecursiveChildren(User user, InternalItemsQuery query)
         {
             var children = base.GetRecursiveChildren(user, query);
-            return Sort(children, user).ToImmutableArray();
+            return Sort(children, user).ToArray();
         }
 
         public BoxSetInfo GetLookupInfo()
diff --git a/MediaBrowser.Controller/Library/ILibraryManager.cs b/MediaBrowser.Controller/Library/ILibraryManager.cs
index 47b1cb16e..8fcd5f605 100644
--- a/MediaBrowser.Controller/Library/ILibraryManager.cs
+++ b/MediaBrowser.Controller/Library/ILibraryManager.cs
@@ -258,7 +258,7 @@ namespace MediaBrowser.Controller.Library
         /// <param name="items">Items to create.</param>
         /// <param name="parent">Parent of new items.</param>
         /// <param name="cancellationToken">CancellationToken to use for operation.</param>
-        void CreateItems(IReadOnlyList<BaseItem> items, BaseItem? parent, CancellationToken cancellationToken);
+        void CreateOrUpdateItems(IReadOnlyList<BaseItem> items, BaseItem? parent, CancellationToken cancellationToken);
 
         /// <summary>
         /// Updates the item.
diff --git a/MediaBrowser.Providers/Music/ArtistMetadataService.cs b/MediaBrowser.Providers/Music/ArtistMetadataService.cs
index 8af6de925..c47f9a500 100644
--- a/MediaBrowser.Providers/Music/ArtistMetadataService.cs
+++ b/MediaBrowser.Providers/Music/ArtistMetadataService.cs
@@ -37,7 +37,7 @@ namespace MediaBrowser.Providers.Music
                     Recursive = true,
                     IsFolder = false
                 })
-                : item.GetRecursiveChildren(i => i is IHasArtist && !i.IsFolder).ToImmutableArray();
+                : item.GetRecursiveChildren(i => i is IHasArtist && !i.IsFolder);
         }
     }
 }
diff --git a/src/Jellyfin.LiveTv/Guide/GuideManager.cs b/src/Jellyfin.LiveTv/Guide/GuideManager.cs
index f657422a0..ff31b7123 100644
--- a/src/Jellyfin.LiveTv/Guide/GuideManager.cs
+++ b/src/Jellyfin.LiveTv/Guide/GuideManager.cs
@@ -265,7 +265,7 @@ public class GuideManager : IGuideManager
 
                 if (newPrograms.Count > 0)
                 {
-                    _libraryManager.CreateItems(newPrograms, null, cancellationToken);
+                    _libraryManager.CreateOrUpdateItems(newPrograms, null, cancellationToken);
                     await PrecacheImages(newPrograms, maxCacheDate).ConfigureAwait(false);
                 }
 
-- 
cgit v1.2.3


From 27b044493a24df6abe92c811c8e6dbdcb316b6aa Mon Sep 17 00:00:00 2001
From: JPVenson <github@jpb.email>
Date: Tue, 19 Nov 2024 15:43:17 -0500
Subject: Backport pull request #12916 from jellyfin/release-10.10.z

Added query filter to disregard disabled Providers

Original-merge: 38c08c4fadf9c44625c0baa49929f7e905efdf70

Merged-by: joshuaboniface <joshua@boniface.me>

Backported-by: Joshua M. Boniface <joshua@boniface.me>
---
 .../Controllers/MediaSegmentsController.cs         |  2 +-
 .../MediaSegments/MediaSegmentManager.cs           | 38 +++++++++++++++++++---
 .../MediaSegements/IMediaSegmentManager.cs         | 12 ++++++-
 3 files changed, 46 insertions(+), 6 deletions(-)

(limited to 'MediaBrowser.Controller')

diff --git a/Jellyfin.Api/Controllers/MediaSegmentsController.cs b/Jellyfin.Api/Controllers/MediaSegmentsController.cs
index 3dc5167a2..2d1d4e2c8 100644
--- a/Jellyfin.Api/Controllers/MediaSegmentsController.cs
+++ b/Jellyfin.Api/Controllers/MediaSegmentsController.cs
@@ -55,7 +55,7 @@ public class MediaSegmentsController : BaseJellyfinApiController
             return NotFound();
         }
 
-        var items = await _mediaSegmentManager.GetSegmentsAsync(item.Id, includeSegmentTypes).ConfigureAwait(false);
+        var items = await _mediaSegmentManager.GetSegmentsAsync(item, includeSegmentTypes).ConfigureAwait(false);
         return Ok(new QueryResult<MediaSegmentDto>(items.ToArray()));
     }
 }
diff --git a/Jellyfin.Server.Implementations/MediaSegments/MediaSegmentManager.cs b/Jellyfin.Server.Implementations/MediaSegments/MediaSegmentManager.cs
index d641f521b..a044fec0d 100644
--- a/Jellyfin.Server.Implementations/MediaSegments/MediaSegmentManager.cs
+++ b/Jellyfin.Server.Implementations/MediaSegments/MediaSegmentManager.cs
@@ -139,23 +139,53 @@ public class MediaSegmentManager : IMediaSegmentManager
     }
 
     /// <inheritdoc />
-    public async Task<IEnumerable<MediaSegmentDto>> GetSegmentsAsync(Guid itemId, IEnumerable<MediaSegmentType>? typeFilter)
+    public async Task<IEnumerable<MediaSegmentDto>> GetSegmentsAsync(Guid itemId, IEnumerable<MediaSegmentType>? typeFilter, bool filterByProvider = true)
+    {
+        var baseItem = _libraryManager.GetItemById(itemId);
+
+        if (baseItem is null)
+        {
+            _logger.LogError("Tried to request segments for an invalid item");
+            return [];
+        }
+
+        return await GetSegmentsAsync(baseItem, typeFilter, filterByProvider).ConfigureAwait(false);
+    }
+
+    /// <inheritdoc />
+    public async Task<IEnumerable<MediaSegmentDto>> GetSegmentsAsync(BaseItem item, IEnumerable<MediaSegmentType>? typeFilter, bool filterByProvider = true)
     {
         using var db = await _dbProvider.CreateDbContextAsync().ConfigureAwait(false);
 
         var query = db.MediaSegments
-            .Where(e => e.ItemId.Equals(itemId));
+            .Where(e => e.ItemId.Equals(item.Id));
 
         if (typeFilter is not null)
         {
             query = query.Where(e => typeFilter.Contains(e.Type));
         }
 
+        if (filterByProvider)
+        {
+            var libraryOptions = _libraryManager.GetLibraryOptions(item);
+            var providerIds = _segmentProviders
+                .Where(e => !libraryOptions.DisabledMediaSegmentProviders.Contains(GetProviderId(e.Name)))
+                .Select(f => GetProviderId(f.Name))
+                .ToArray();
+            if (providerIds.Length == 0)
+            {
+                return [];
+            }
+
+            query = query.Where(e => providerIds.Contains(e.SegmentProviderId));
+        }
+
         return query
             .OrderBy(e => e.StartTicks)
             .AsNoTracking()
-            .ToImmutableList()
-            .Select(Map);
+            .AsEnumerable()
+            .Select(Map)
+            .ToArray();
     }
 
     private static MediaSegmentDto Map(MediaSegment segment)
diff --git a/MediaBrowser.Controller/MediaSegements/IMediaSegmentManager.cs b/MediaBrowser.Controller/MediaSegements/IMediaSegmentManager.cs
index 010d7edb4..672f27eca 100644
--- a/MediaBrowser.Controller/MediaSegements/IMediaSegmentManager.cs
+++ b/MediaBrowser.Controller/MediaSegements/IMediaSegmentManager.cs
@@ -50,8 +50,18 @@ public interface IMediaSegmentManager
     /// </summary>
     /// <param name="itemId">The id of the <see cref="BaseItem"/>.</param>
     /// <param name="typeFilter">filteres all media segments of the given type to be included. If null all types are included.</param>
+    /// <param name="filterByProvider">When set filteres the segments to only return those that which providers are currently enabled on their library.</param>
     /// <returns>An enumerator of <see cref="MediaSegmentDto"/>'s.</returns>
-    Task<IEnumerable<MediaSegmentDto>> GetSegmentsAsync(Guid itemId, IEnumerable<MediaSegmentType>? typeFilter);
+    Task<IEnumerable<MediaSegmentDto>> GetSegmentsAsync(Guid itemId, IEnumerable<MediaSegmentType>? typeFilter, bool filterByProvider = true);
+
+    /// <summary>
+    /// Obtains all segments accociated with the itemId.
+    /// </summary>
+    /// <param name="item">The <see cref="BaseItem"/>.</param>
+    /// <param name="typeFilter">filteres all media segments of the given type to be included. If null all types are included.</param>
+    /// <param name="filterByProvider">When set filteres the segments to only return those that which providers are currently enabled on their library.</param>
+    /// <returns>An enumerator of <see cref="MediaSegmentDto"/>'s.</returns>
+    Task<IEnumerable<MediaSegmentDto>> GetSegmentsAsync(BaseItem item, IEnumerable<MediaSegmentType>? typeFilter, bool filterByProvider = true);
 
     /// <summary>
     /// Gets information about any media segments stored for the given itemId.
-- 
cgit v1.2.3


From 6e7118eff1e6bc9c5ca70d80e5ff5e6eff7c90e5 Mon Sep 17 00:00:00 2001
From: Shadowghost <Shadowghost@users.noreply.github.com>
Date: Tue, 19 Nov 2024 15:43:18 -0500
Subject: Backport pull request #12934 from jellyfin/release-10.10.z

Fix playlists

Original-merge: 8bee67f1f8dab604d745b3d077330085f7f111d4

Merged-by: crobibero <cody@robibe.ro>

Backported-by: Joshua M. Boniface <joshua@boniface.me>
---
 .../ConfigurationOptions.cs                        |  1 -
 .../Playlists/PlaylistManager.cs                   | 40 ++++++++-----
 Jellyfin.Api/Controllers/PlaylistsController.cs    | 10 ++--
 Jellyfin.Server/Migrations/MigrationRunner.cs      |  3 +-
 .../Migrations/Routines/FixPlaylistOwner.cs        |  4 +-
 .../Routines/RemoveDuplicatePlaylistChildren.cs    | 68 ++++++++++++++++++++++
 MediaBrowser.Controller/Entities/LinkedChild.cs    |  7 +--
 .../Extensions/ConfigurationExtensions.cs          | 13 -----
 .../Playlists/IPlaylistManager.cs                  |  3 +-
 9 files changed, 107 insertions(+), 42 deletions(-)
 create mode 100644 Jellyfin.Server/Migrations/Routines/RemoveDuplicatePlaylistChildren.cs

(limited to 'MediaBrowser.Controller')

diff --git a/Emby.Server.Implementations/ConfigurationOptions.cs b/Emby.Server.Implementations/ConfigurationOptions.cs
index 91791a1c8..a06f6e7fe 100644
--- a/Emby.Server.Implementations/ConfigurationOptions.cs
+++ b/Emby.Server.Implementations/ConfigurationOptions.cs
@@ -17,7 +17,6 @@ namespace Emby.Server.Implementations
             { DefaultRedirectKey, "web/" },
             { FfmpegProbeSizeKey, "1G" },
             { FfmpegAnalyzeDurationKey, "200M" },
-            { PlaylistsAllowDuplicatesKey, bool.FalseString },
             { BindToUnixSocketKey, bool.FalseString },
             { SqliteCacheSizeKey, "20000" },
             { FfmpegSkipValidationKey, bool.FalseString },
diff --git a/Emby.Server.Implementations/Playlists/PlaylistManager.cs b/Emby.Server.Implementations/Playlists/PlaylistManager.cs
index 47ff22c0b..daeb7fed8 100644
--- a/Emby.Server.Implementations/Playlists/PlaylistManager.cs
+++ b/Emby.Server.Implementations/Playlists/PlaylistManager.cs
@@ -216,14 +216,11 @@ namespace Emby.Server.Implementations.Playlists
             var newItems = GetPlaylistItems(newItemIds, user, options)
                 .Where(i => i.SupportsAddingToPlaylist);
 
-            // Filter out duplicate items, if necessary
-            if (!_appConfig.DoPlaylistsAllowDuplicates())
-            {
-                var existingIds = playlist.LinkedChildren.Select(c => c.ItemId).ToHashSet();
-                newItems = newItems
-                    .Where(i => !existingIds.Contains(i.Id))
-                    .Distinct();
-            }
+            // Filter out duplicate items
+            var existingIds = playlist.LinkedChildren.Select(c => c.ItemId).ToHashSet();
+            newItems = newItems
+                .Where(i => !existingIds.Contains(i.Id))
+                .Distinct();
 
             // Create a list of the new linked children to add to the playlist
             var childrenToAdd = newItems
@@ -269,7 +266,7 @@ namespace Emby.Server.Implementations.Playlists
 
             var idList = entryIds.ToList();
 
-            var removals = children.Where(i => idList.Contains(i.Item1.Id));
+            var removals = children.Where(i => idList.Contains(i.Item1.ItemId?.ToString("N", CultureInfo.InvariantCulture)));
 
             playlist.LinkedChildren = children.Except(removals)
                 .Select(i => i.Item1)
@@ -286,26 +283,39 @@ namespace Emby.Server.Implementations.Playlists
                 RefreshPriority.High);
         }
 
-        public async Task MoveItemAsync(string playlistId, string entryId, int newIndex)
+        public async Task MoveItemAsync(string playlistId, string entryId, int newIndex, Guid callingUserId)
         {
             if (_libraryManager.GetItemById(playlistId) is not Playlist playlist)
             {
                 throw new ArgumentException("No Playlist exists with the supplied Id");
             }
 
+            var user = _userManager.GetUserById(callingUserId);
             var children = playlist.GetManageableItems().ToList();
+            var accessibleChildren = children.Where(c => c.Item2.IsVisible(user)).ToArray();
 
-            var oldIndex = children.FindIndex(i => string.Equals(entryId, i.Item1.Id, StringComparison.OrdinalIgnoreCase));
+            var oldIndexAll = children.FindIndex(i => string.Equals(entryId, i.Item1.ItemId?.ToString("N", CultureInfo.InvariantCulture), StringComparison.OrdinalIgnoreCase));
+            var oldIndexAccessible = accessibleChildren.FindIndex(i => string.Equals(entryId, i.Item1.ItemId?.ToString("N", CultureInfo.InvariantCulture), StringComparison.OrdinalIgnoreCase));
 
-            if (oldIndex == newIndex)
+            if (oldIndexAccessible == newIndex)
             {
                 return;
             }
 
-            var item = playlist.LinkedChildren[oldIndex];
+            var newPriorItemIndex = newIndex > oldIndexAccessible ? newIndex : newIndex - 1 < 0 ? 0 : newIndex - 1;
+            var newPriorItemId = accessibleChildren[newPriorItemIndex].Item1.ItemId;
+            var newPriorItemIndexOnAllChildren = children.FindIndex(c => c.Item1.ItemId.Equals(newPriorItemId));
+            var adjustedNewIndex = newPriorItemIndexOnAllChildren + 1;
 
-            var newList = playlist.LinkedChildren.ToList();
+            var item = playlist.LinkedChildren.FirstOrDefault(i => string.Equals(entryId, i.ItemId?.ToString("N", CultureInfo.InvariantCulture), StringComparison.OrdinalIgnoreCase));
+            if (item is null)
+            {
+                _logger.LogWarning("Modified item not found in playlist. ItemId: {ItemId}, PlaylistId: {PlaylistId}", item.ItemId, playlistId);
 
+                return;
+            }
+
+            var newList = playlist.LinkedChildren.ToList();
             newList.Remove(item);
 
             if (newIndex >= newList.Count)
@@ -314,7 +324,7 @@ namespace Emby.Server.Implementations.Playlists
             }
             else
             {
-                newList.Insert(newIndex, item);
+                newList.Insert(adjustedNewIndex, item);
             }
 
             playlist.LinkedChildren = [.. newList];
diff --git a/Jellyfin.Api/Controllers/PlaylistsController.cs b/Jellyfin.Api/Controllers/PlaylistsController.cs
index e6f23b136..1ab36ccc6 100644
--- a/Jellyfin.Api/Controllers/PlaylistsController.cs
+++ b/Jellyfin.Api/Controllers/PlaylistsController.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
+using System.Globalization;
 using System.Linq;
 using System.Threading.Tasks;
 using Jellyfin.Api.Attributes;
@@ -426,7 +427,7 @@ public class PlaylistsController : BaseJellyfinApiController
             return Forbid();
         }
 
-        await _playlistManager.MoveItemAsync(playlistId, itemId, newIndex).ConfigureAwait(false);
+        await _playlistManager.MoveItemAsync(playlistId, itemId, newIndex, callingUserId).ConfigureAwait(false);
         return NoContent();
     }
 
@@ -514,7 +515,8 @@ public class PlaylistsController : BaseJellyfinApiController
             return Forbid();
         }
 
-        var items = playlist.GetManageableItems().ToArray();
+        var user = _userManager.GetUserById(callingUserId);
+        var items = playlist.GetManageableItems().Where(i => i.Item2.IsVisible(user)).ToArray();
         var count = items.Length;
         if (startIndex.HasValue)
         {
@@ -529,11 +531,11 @@ public class PlaylistsController : BaseJellyfinApiController
         var dtoOptions = new DtoOptions { Fields = fields }
             .AddClientFields(User)
             .AddAdditionalDtoOptions(enableImages, enableUserData, imageTypeLimit, enableImageTypes);
-        var user = _userManager.GetUserById(callingUserId);
+
         var dtos = _dtoService.GetBaseItemDtos(items.Select(i => i.Item2).ToList(), dtoOptions, user);
         for (int index = 0; index < dtos.Count; index++)
         {
-            dtos[index].PlaylistItemId = items[index].Item1.Id;
+            dtos[index].PlaylistItemId = items[index].Item1.ItemId?.ToString("N", CultureInfo.InvariantCulture);
         }
 
         var result = new QueryResult<BaseItemDto>(
diff --git a/Jellyfin.Server/Migrations/MigrationRunner.cs b/Jellyfin.Server/Migrations/MigrationRunner.cs
index 9d4441ac3..2ab130eef 100644
--- a/Jellyfin.Server/Migrations/MigrationRunner.cs
+++ b/Jellyfin.Server/Migrations/MigrationRunner.cs
@@ -47,7 +47,8 @@ namespace Jellyfin.Server.Migrations
             typeof(Routines.AddDefaultCastReceivers),
             typeof(Routines.UpdateDefaultPluginRepository),
             typeof(Routines.FixAudioData),
-            typeof(Routines.MoveTrickplayFiles)
+            typeof(Routines.MoveTrickplayFiles),
+            typeof(Routines.RemoveDuplicatePlaylistChildren)
         };
 
         /// <summary>
diff --git a/Jellyfin.Server/Migrations/Routines/FixPlaylistOwner.cs b/Jellyfin.Server/Migrations/Routines/FixPlaylistOwner.cs
index 3655a610d..192c170b2 100644
--- a/Jellyfin.Server/Migrations/Routines/FixPlaylistOwner.cs
+++ b/Jellyfin.Server/Migrations/Routines/FixPlaylistOwner.cs
@@ -15,12 +15,12 @@ namespace Jellyfin.Server.Migrations.Routines;
 /// </summary>
 internal class FixPlaylistOwner : IMigrationRoutine
 {
-    private readonly ILogger<RemoveDuplicateExtras> _logger;
+    private readonly ILogger<FixPlaylistOwner> _logger;
     private readonly ILibraryManager _libraryManager;
     private readonly IPlaylistManager _playlistManager;
 
     public FixPlaylistOwner(
-        ILogger<RemoveDuplicateExtras> logger,
+        ILogger<FixPlaylistOwner> logger,
         ILibraryManager libraryManager,
         IPlaylistManager playlistManager)
     {
diff --git a/Jellyfin.Server/Migrations/Routines/RemoveDuplicatePlaylistChildren.cs b/Jellyfin.Server/Migrations/Routines/RemoveDuplicatePlaylistChildren.cs
new file mode 100644
index 000000000..99047b2a2
--- /dev/null
+++ b/Jellyfin.Server/Migrations/Routines/RemoveDuplicatePlaylistChildren.cs
@@ -0,0 +1,68 @@
+using System;
+using System.Linq;
+using System.Threading;
+
+using Jellyfin.Data.Enums;
+using MediaBrowser.Controller.Entities;
+using MediaBrowser.Controller.Library;
+using MediaBrowser.Controller.Playlists;
+using Microsoft.Extensions.Logging;
+
+namespace Jellyfin.Server.Migrations.Routines;
+
+/// <summary>
+/// Remove duplicate playlist entries.
+/// </summary>
+internal class RemoveDuplicatePlaylistChildren : IMigrationRoutine
+{
+    private readonly ILogger<RemoveDuplicatePlaylistChildren> _logger;
+    private readonly ILibraryManager _libraryManager;
+    private readonly IPlaylistManager _playlistManager;
+
+    public RemoveDuplicatePlaylistChildren(
+        ILogger<RemoveDuplicatePlaylistChildren> logger,
+        ILibraryManager libraryManager,
+        IPlaylistManager playlistManager)
+    {
+        _logger = logger;
+        _libraryManager = libraryManager;
+        _playlistManager = playlistManager;
+    }
+
+    /// <inheritdoc/>
+    public Guid Id => Guid.Parse("{96C156A2-7A13-4B3B-A8B8-FB80C94D20C0}");
+
+    /// <inheritdoc/>
+    public string Name => "RemoveDuplicatePlaylistChildren";
+
+    /// <inheritdoc/>
+    public bool PerformOnNewInstall => false;
+
+    /// <inheritdoc/>
+    public void Perform()
+    {
+        var playlists = _libraryManager.GetItemList(new InternalItemsQuery
+        {
+            IncludeItemTypes = [BaseItemKind.Playlist]
+        })
+        .Cast<Playlist>()
+        .ToArray();
+
+        if (playlists.Length > 0)
+        {
+            foreach (var playlist in playlists)
+            {
+                var linkedChildren = playlist.LinkedChildren;
+                if (linkedChildren.Length > 0)
+                {
+                    var nullItemChildren = linkedChildren.Where(c => c.ItemId is null);
+                    var deduplicatedChildren = linkedChildren.DistinctBy(c => c.ItemId);
+                    var newLinkedChildren = nullItemChildren.Concat(deduplicatedChildren);
+                    playlist.LinkedChildren = linkedChildren;
+                    playlist.UpdateToRepositoryAsync(ItemUpdateType.MetadataEdit, CancellationToken.None).GetAwaiter().GetResult();
+                    _playlistManager.SavePlaylistFile(playlist);
+                }
+            }
+        }
+    }
+}
diff --git a/MediaBrowser.Controller/Entities/LinkedChild.cs b/MediaBrowser.Controller/Entities/LinkedChild.cs
index fd5fef3dc..98e4f525f 100644
--- a/MediaBrowser.Controller/Entities/LinkedChild.cs
+++ b/MediaBrowser.Controller/Entities/LinkedChild.cs
@@ -4,7 +4,6 @@
 
 using System;
 using System.Globalization;
-using System.Text.Json.Serialization;
 
 namespace MediaBrowser.Controller.Entities
 {
@@ -12,7 +11,6 @@ namespace MediaBrowser.Controller.Entities
     {
         public LinkedChild()
         {
-            Id = Guid.NewGuid().ToString("N", CultureInfo.InvariantCulture);
         }
 
         public string Path { get; set; }
@@ -21,9 +19,6 @@ namespace MediaBrowser.Controller.Entities
 
         public string LibraryItemId { get; set; }
 
-        [JsonIgnore]
-        public string Id { get; set; }
-
         /// <summary>
         /// Gets or sets the linked item id.
         /// </summary>
@@ -31,6 +26,8 @@ namespace MediaBrowser.Controller.Entities
 
         public static LinkedChild Create(BaseItem item)
         {
+            ArgumentNullException.ThrowIfNull(item);
+
             var child = new LinkedChild
             {
                 Path = item.Path,
diff --git a/MediaBrowser.Controller/Extensions/ConfigurationExtensions.cs b/MediaBrowser.Controller/Extensions/ConfigurationExtensions.cs
index f8049cd48..e4806109a 100644
--- a/MediaBrowser.Controller/Extensions/ConfigurationExtensions.cs
+++ b/MediaBrowser.Controller/Extensions/ConfigurationExtensions.cs
@@ -49,11 +49,6 @@ namespace MediaBrowser.Controller.Extensions
         /// </summary>
         public const string FfmpegPathKey = "ffmpeg";
 
-        /// <summary>
-        /// The key for a setting that indicates whether playlists should allow duplicate entries.
-        /// </summary>
-        public const string PlaylistsAllowDuplicatesKey = "playlists:allowDuplicates";
-
         /// <summary>
         /// The key for a setting that indicates whether kestrel should bind to a unix socket.
         /// </summary>
@@ -120,14 +115,6 @@ namespace MediaBrowser.Controller.Extensions
         public static bool GetFFmpegImgExtractPerfTradeoff(this IConfiguration configuration)
             => configuration.GetValue<bool>(FfmpegImgExtractPerfTradeoffKey);
 
-        /// <summary>
-        /// Gets a value indicating whether playlists should allow duplicate entries from the <see cref="IConfiguration"/>.
-        /// </summary>
-        /// <param name="configuration">The configuration to read the setting from.</param>
-        /// <returns>True if playlists should allow duplicates, otherwise false.</returns>
-        public static bool DoPlaylistsAllowDuplicates(this IConfiguration configuration)
-            => configuration.GetValue<bool>(PlaylistsAllowDuplicatesKey);
-
         /// <summary>
         /// Gets a value indicating whether kestrel should bind to a unix socket from the <see cref="IConfiguration" />.
         /// </summary>
diff --git a/MediaBrowser.Controller/Playlists/IPlaylistManager.cs b/MediaBrowser.Controller/Playlists/IPlaylistManager.cs
index 038cbd2d6..497c4a511 100644
--- a/MediaBrowser.Controller/Playlists/IPlaylistManager.cs
+++ b/MediaBrowser.Controller/Playlists/IPlaylistManager.cs
@@ -92,8 +92,9 @@ namespace MediaBrowser.Controller.Playlists
         /// <param name="playlistId">The playlist identifier.</param>
         /// <param name="entryId">The entry identifier.</param>
         /// <param name="newIndex">The new index.</param>
+        /// <param name="callingUserId">The calling user.</param>
         /// <returns>Task.</returns>
-        Task MoveItemAsync(string playlistId, string entryId, int newIndex);
+        Task MoveItemAsync(string playlistId, string entryId, int newIndex, Guid callingUserId);
 
         /// <summary>
         /// Removed all playlists of a user.
-- 
cgit v1.2.3


From 4f562d67b036092891b24585527869ec8c64d7cc Mon Sep 17 00:00:00 2001
From: gnattu <gnattu@users.noreply.github.com>
Date: Tue, 19 Nov 2024 15:43:19 -0500
Subject: Backport pull request #12947 from jellyfin/release-10.10.z

Add a small tolerance value to remux fps check

Original-merge: 954950dc145db4edf85cc2c1e3ce068274097b71

Merged-by: crobibero <cody@robibe.ro>

Backported-by: Joshua M. Boniface <joshua@boniface.me>
---
 MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'MediaBrowser.Controller')

diff --git a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
index 28f0d1fff..eaae34cad 100644
--- a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
+++ b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
@@ -2196,7 +2196,10 @@ namespace MediaBrowser.Controller.MediaEncoding
             {
                 var videoFrameRate = videoStream.ReferenceFrameRate;
 
-                if (!videoFrameRate.HasValue || videoFrameRate.Value > requestedFramerate.Value)
+                // Add a little tolerance to the framerate check because some videos might record a framerate
+                // that is slightly higher than the intended framerate, but the device can still play it correctly.
+                // 0.05 fps tolerance should be safe enough.
+                if (!videoFrameRate.HasValue || videoFrameRate.Value > requestedFramerate.Value + 0.05f)
                 {
                     return false;
                 }
-- 
cgit v1.2.3


From 87a3c5d11c9fcfa5e14598c028ac7a665906fd17 Mon Sep 17 00:00:00 2001
From: nyanmisaka <nst799610810@gmail.com>
Date: Tue, 19 Nov 2024 15:43:24 -0500
Subject: Backport pull request #12973 from jellyfin/release-10.10.z

Fix pixel format in HEVC RExt SDR transcoding

Original-merge: aa08d3f2bf155d55f748bff1f0a0c7f071f79ae7

Merged-by: crobibero <cody@robibe.ro>

Backported-by: Joshua M. Boniface <joshua@boniface.me>
---
 MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'MediaBrowser.Controller')

diff --git a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
index eaae34cad..e1d0ed0a0 100644
--- a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
+++ b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
@@ -4131,7 +4131,7 @@ namespace MediaBrowser.Controller.MediaEncoding
             else if (isD3d11vaDecoder || isQsvDecoder)
             {
                 var isRext = IsVideoStreamHevcRext(state);
-                var twoPassVppTonemap = isRext;
+                var twoPassVppTonemap = false;
                 var doVppFullRangeOut = isMjpegEncoder
                     && _mediaEncoder.EncoderVersion >= _minFFmpegQsvVppOutRangeOption;
                 var doVppScaleModeHq = isMjpegEncoder
@@ -4140,6 +4140,12 @@ namespace MediaBrowser.Controller.MediaEncoding
                 var procampParams = string.Empty;
                 if (doVppTonemap)
                 {
+                    if (isRext)
+                    {
+                        // VPP tonemap requires p010 input
+                        twoPassVppTonemap = true;
+                    }
+
                     if (options.VppTonemappingBrightness != 0
                         && options.VppTonemappingBrightness >= -100
                         && options.VppTonemappingBrightness <= 100)
-- 
cgit v1.2.3


From 661caa62e27c191750350c0e3397f433d5a0c7ec Mon Sep 17 00:00:00 2001
From: nyanmisaka <nst799610810@gmail.com>
Date: Tue, 19 Nov 2024 15:43:26 -0500
Subject: Backport pull request #12989 from jellyfin/release-10.10.z

Fix InvariantCulture in VPP tonemap options

Original-merge: 25321d7f80a3b065a8d3061a93adb78d701b7412

Merged-by: crobibero <cody@robibe.ro>

Backported-by: Joshua M. Boniface <joshua@boniface.me>
---
 .../MediaEncoding/EncodingHelper.cs                | 26 +++++++++++++++-------
 1 file changed, 18 insertions(+), 8 deletions(-)

(limited to 'MediaBrowser.Controller')

diff --git a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
index e1d0ed0a0..92ceb2c54 100644
--- a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
+++ b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
@@ -3321,24 +3321,25 @@ namespace MediaBrowser.Controller.MediaEncoding
                     && options.VppTonemappingBrightness >= -100
                     && options.VppTonemappingBrightness <= 100)
                 {
-                    procampParams += $"=b={options.VppTonemappingBrightness}";
+                    procampParams += "procamp_vaapi=b={0}";
                     doVaVppProcamp = true;
                 }
 
                 if (options.VppTonemappingContrast > 1
                     && options.VppTonemappingContrast <= 10)
                 {
-                    procampParams += doVaVppProcamp ? ":" : "=";
-                    procampParams += $"c={options.VppTonemappingContrast}";
+                    procampParams += doVaVppProcamp ? ":c={1}" : "procamp_vaapi=c={1}";
                     doVaVppProcamp = true;
                 }
 
-                args = "{0}tonemap_vaapi=format={1}:p=bt709:t=bt709:m=bt709:extra_hw_frames=32";
+                args = "{2}tonemap_vaapi=format={3}:p=bt709:t=bt709:m=bt709:extra_hw_frames=32";
 
                 return string.Format(
                         CultureInfo.InvariantCulture,
                         args,
-                        doVaVppProcamp ? $"procamp_vaapi{procampParams}," : string.Empty,
+                        options.VppTonemappingBrightness,
+                        options.VppTonemappingContrast,
+                        doVaVppProcamp ? "," : string.Empty,
                         videoFormat ?? "nv12");
             }
             else
@@ -4138,6 +4139,7 @@ namespace MediaBrowser.Controller.MediaEncoding
                     && _mediaEncoder.EncoderVersion >= _minFFmpegQsvVppScaleModeOption;
                 var doVppProcamp = false;
                 var procampParams = string.Empty;
+                var procampParamsString = string.Empty;
                 if (doVppTonemap)
                 {
                     if (isRext)
@@ -4150,18 +4152,26 @@ namespace MediaBrowser.Controller.MediaEncoding
                         && options.VppTonemappingBrightness >= -100
                         && options.VppTonemappingBrightness <= 100)
                     {
-                        procampParams += $":brightness={options.VppTonemappingBrightness}";
+                        procampParamsString += ":brightness={0}";
                         twoPassVppTonemap = doVppProcamp = true;
                     }
 
                     if (options.VppTonemappingContrast > 1
                         && options.VppTonemappingContrast <= 10)
                     {
-                        procampParams += $":contrast={options.VppTonemappingContrast}";
+                        procampParamsString += ":contrast={1}";
                         twoPassVppTonemap = doVppProcamp = true;
                     }
 
-                    procampParams += doVppProcamp ? ":procamp=1:async_depth=2" : string.Empty;
+                    if (doVppProcamp)
+                    {
+                        procampParamsString += ":procamp=1:async_depth=2";
+                        procampParams = string.Format(
+                            CultureInfo.InvariantCulture,
+                            procampParamsString,
+                            options.VppTonemappingBrightness,
+                            options.VppTonemappingContrast);
+                    }
                 }
 
                 var outFormat = doOclTonemap ? ((doVppTranspose || isRext) ? "p010" : string.Empty) : "nv12";
-- 
cgit v1.2.3


From fbdbf77a5992235df5a1bbfff5d409f7d9b7f7e3 Mon Sep 17 00:00:00 2001
From: gnattu <gnattu@users.noreply.github.com>
Date: Tue, 19 Nov 2024 15:43:27 -0500
Subject: Backport pull request #12991 from jellyfin/release-10.10.z

Use invariant culture for tonemap options

Original-merge: d292fde9e29609b58278e46e4edb155698b2fe1c

Merged-by: crobibero <cody@robibe.ro>

Backported-by: Joshua M. Boniface <joshua@boniface.me>
---
 MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

(limited to 'MediaBrowser.Controller')

diff --git a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
index 92ceb2c54..21c4798af 100644
--- a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
+++ b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
@@ -3527,20 +3527,29 @@ namespace MediaBrowser.Controller.MediaEncoding
             {
                 // tonemapx requires yuv420p10 input for dovi reshaping, let ffmpeg convert the frame when necessary
                 var tonemapFormat = requireDoviReshaping ? "yuv420p" : outFormat;
-
-                var tonemapArgs = $"tonemapx=tonemap={options.TonemappingAlgorithm}:desat={options.TonemappingDesat}:peak={options.TonemappingPeak}:t=bt709:m=bt709:p=bt709:format={tonemapFormat}";
+                var tonemapArgString = "tonemapx=tonemap={0}:desat={1}:peak={2}:t=bt709:m=bt709:p=bt709:format={3}";
 
                 if (options.TonemappingParam != 0)
                 {
-                    tonemapArgs += $":param={options.TonemappingParam}";
+                    tonemapArgString += ":param={4}";
                 }
 
                 var range = options.TonemappingRange;
                 if (range == TonemappingRange.tv || range == TonemappingRange.pc)
                 {
-                    tonemapArgs += $":range={options.TonemappingRange}";
+                    tonemapArgString += ":range={5}";
                 }
 
+                var tonemapArgs = string.Format(
+                    CultureInfo.InvariantCulture,
+                    tonemapArgString,
+                    options.TonemappingAlgorithm,
+                    options.TonemappingDesat,
+                    options.TonemappingPeak,
+                    tonemapFormat,
+                    options.TonemappingParam,
+                    options.TonemappingRange);
+
                 mainFilters.Add(tonemapArgs);
             }
             else
-- 
cgit v1.2.3


From 9f86f8748cc173a065b21c35641407a8cfa08bf7 Mon Sep 17 00:00:00 2001
From: nyanmisaka <nst799610810@gmail.com>
Date: Tue, 19 Nov 2024 15:43:29 -0500
Subject: Backport pull request #13026 from jellyfin/release-10.10.z

Fix missing procamp vaapi filter

Original-merge: cf11a2dc1eec3cde51713df745934933102a2dd5

Merged-by: crobibero <cody@robibe.ro>

Backported-by: Joshua M. Boniface <joshua@boniface.me>
---
 MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'MediaBrowser.Controller')

diff --git a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
index 21c4798af..9399679a4 100644
--- a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
+++ b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
@@ -3332,7 +3332,7 @@ namespace MediaBrowser.Controller.MediaEncoding
                     doVaVppProcamp = true;
                 }
 
-                args = "{2}tonemap_vaapi=format={3}:p=bt709:t=bt709:m=bt709:extra_hw_frames=32";
+                args = procampParams + "{2}tonemap_vaapi=format={3}:p=bt709:t=bt709:m=bt709:extra_hw_frames=32";
 
                 return string.Format(
                         CultureInfo.InvariantCulture,
-- 
cgit v1.2.3


From 6a08361f6fcbd6e24ca90705dba453a22a49fb57 Mon Sep 17 00:00:00 2001
From: JPVenson <github@jpb.email>
Date: Sun, 24 Nov 2024 10:58:09 +0000
Subject: Applied review comments

---
 .../Item/BaseItemRepository.cs                     | 158 ++++++++++++---------
 .../Persistence/IItemTypeLookup.cs                 |   2 +-
 2 files changed, 92 insertions(+), 68 deletions(-)

(limited to 'MediaBrowser.Controller')

diff --git a/Jellyfin.Server.Implementations/Item/BaseItemRepository.cs b/Jellyfin.Server.Implementations/Item/BaseItemRepository.cs
index 0705c3cbd..c82c70376 100644
--- a/Jellyfin.Server.Implementations/Item/BaseItemRepository.cs
+++ b/Jellyfin.Server.Implementations/Item/BaseItemRepository.cs
@@ -42,20 +42,7 @@ namespace Jellyfin.Server.Implementations.Item;
 /// <summary>
 /// Handles all storage logic for BaseItems.
 /// </summary>
-/// <remarks>
-/// Initializes a new instance of the <see cref="BaseItemRepository"/> class.
-/// </remarks>
-/// <param name="dbProvider">The db factory.</param>
-/// <param name="appHost">The Application host.</param>
-/// <param name="itemTypeLookup">The static type lookup.</param>
-/// <param name="serverConfigurationManager">The server Configuration manager.</param>
-/// <param name="logger">System logger.</param>
-public sealed class BaseItemRepository(
-    IDbContextFactory<JellyfinDbContext> dbProvider,
-    IServerApplicationHost appHost,
-    IItemTypeLookup itemTypeLookup,
-    IServerConfigurationManager serverConfigurationManager,
-    ILogger<BaseItemRepository> logger)
+public sealed class BaseItemRepository
     : IItemRepository, IDisposable
 {
     /// <summary>
@@ -63,8 +50,41 @@ public sealed class BaseItemRepository(
     /// so that we can de-serialize properly when we don't have strong types.
     /// </summary>
     private static readonly ConcurrentDictionary<string, Type?> _typeMap = new ConcurrentDictionary<string, Type?>();
+    private readonly IDbContextFactory<JellyfinDbContext> _dbProvider;
+    private readonly IServerApplicationHost _appHost;
+    private readonly IItemTypeLookup _itemTypeLookup;
+    private readonly IServerConfigurationManager _serverConfigurationManager;
+    private readonly ILogger<BaseItemRepository> _logger;
     private bool _disposed;
 
+    private static readonly IReadOnlyList<ItemValueType> _getAllArtistsValueTypes = [ItemValueType.Artist, ItemValueType.AlbumArtist];
+    private static readonly IReadOnlyList<ItemValueType> _getArtistValueTypes = [ItemValueType.Artist];
+    private static readonly IReadOnlyList<ItemValueType> _getAlbumArtistValueTypes = [ItemValueType.AlbumArtist];
+    private static readonly IReadOnlyList<ItemValueType> _getStudiosValueTypes = [ItemValueType.Studios];
+    private static readonly IReadOnlyList<ItemValueType> _getGenreValueTypes = [ItemValueType.Studios];
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="BaseItemRepository"/> class.
+    /// </summary>
+    /// <param name="dbProvider">The db factory.</param>
+    /// <param name="appHost">The Application host.</param>
+    /// <param name="itemTypeLookup">The static type lookup.</param>
+    /// <param name="serverConfigurationManager">The server Configuration manager.</param>
+    /// <param name="logger">System logger.</param>
+    public BaseItemRepository(
+        IDbContextFactory<JellyfinDbContext> dbProvider,
+        IServerApplicationHost appHost,
+        IItemTypeLookup itemTypeLookup,
+        IServerConfigurationManager serverConfigurationManager,
+        ILogger<BaseItemRepository> logger)
+    {
+        _dbProvider = dbProvider;
+        _appHost = appHost;
+        _itemTypeLookup = itemTypeLookup;
+        _serverConfigurationManager = serverConfigurationManager;
+        _logger = logger;
+    }
+
     /// <inheritdoc/>
     public void Dispose()
     {
@@ -81,7 +101,7 @@ public sealed class BaseItemRepository(
     {
         ArgumentNullException.ThrowIfNull(id.IsEmpty() ? null : id);
 
-        using var context = dbProvider.CreateDbContext();
+        using var context = _dbProvider.CreateDbContext();
         using var transaction = context.Database.BeginTransaction();
         context.PeopleBaseItemMap.Where(e => e.ItemId == id).ExecuteDelete();
         context.Peoples.Where(e => e.BaseItems!.Count == 0).ExecuteDelete();
@@ -100,11 +120,11 @@ public sealed class BaseItemRepository(
     /// <inheritdoc />
     public void UpdateInheritedValues()
     {
-        using var context = dbProvider.CreateDbContext();
+        using var context = _dbProvider.CreateDbContext();
         using var transaction = context.Database.BeginTransaction();
 
         context.ItemValuesMap.Where(e => e.ItemValue.Type == ItemValueType.InheritedTags).ExecuteDelete();
-        // ItemValue Inheritence is now correctly mapped via AncestorId on demand
+        // ItemValue Inheritance is now correctly mapped via AncestorId on demand
         context.SaveChanges();
 
         transaction.Commit();
@@ -116,64 +136,64 @@ public sealed class BaseItemRepository(
         ArgumentNullException.ThrowIfNull(filter);
         PrepareFilterQuery(filter);
 
-        using var context = dbProvider.CreateDbContext();
+        using var context = _dbProvider.CreateDbContext();
         return ApplyQueryFilter(context.BaseItems.AsNoTracking(), context, filter).Select(e => e.Id).ToArray();
     }
 
     /// <inheritdoc />
     public QueryResult<(BaseItemDto Item, ItemCounts ItemCounts)> GetAllArtists(InternalItemsQuery filter)
     {
-        return GetItemValues(filter, [ItemValueType.Artist, ItemValueType.AlbumArtist], itemTypeLookup.BaseItemKindNames[BaseItemKind.MusicArtist]!);
+        return GetItemValues(filter, _getAllArtistsValueTypes, _itemTypeLookup.BaseItemKindNames[BaseItemKind.MusicArtist]);
     }
 
     /// <inheritdoc />
     public QueryResult<(BaseItemDto Item, ItemCounts ItemCounts)> GetArtists(InternalItemsQuery filter)
     {
-        return GetItemValues(filter, [ItemValueType.Artist], itemTypeLookup.BaseItemKindNames[BaseItemKind.MusicArtist]!);
+        return GetItemValues(filter, _getArtistValueTypes, _itemTypeLookup.BaseItemKindNames[BaseItemKind.MusicArtist]);
     }
 
     /// <inheritdoc />
     public QueryResult<(BaseItemDto Item, ItemCounts ItemCounts)> GetAlbumArtists(InternalItemsQuery filter)
     {
-        return GetItemValues(filter, [ItemValueType.AlbumArtist], itemTypeLookup.BaseItemKindNames[BaseItemKind.MusicArtist]!);
+        return GetItemValues(filter, _getAlbumArtistValueTypes, _itemTypeLookup.BaseItemKindNames[BaseItemKind.MusicArtist]);
     }
 
     /// <inheritdoc />
     public QueryResult<(BaseItemDto Item, ItemCounts ItemCounts)> GetStudios(InternalItemsQuery filter)
     {
-        return GetItemValues(filter, [ItemValueType.Studios], itemTypeLookup.BaseItemKindNames[BaseItemKind.Studio]!);
+        return GetItemValues(filter, _getStudiosValueTypes, _itemTypeLookup.BaseItemKindNames[BaseItemKind.Studio]);
     }
 
     /// <inheritdoc />
     public QueryResult<(BaseItemDto Item, ItemCounts ItemCounts)> GetGenres(InternalItemsQuery filter)
     {
-        return GetItemValues(filter, [ItemValueType.Genre], itemTypeLookup.BaseItemKindNames[BaseItemKind.Genre]!);
+        return GetItemValues(filter, _getGenreValueTypes, _itemTypeLookup.BaseItemKindNames[BaseItemKind.Genre]);
     }
 
     /// <inheritdoc />
     public QueryResult<(BaseItemDto Item, ItemCounts ItemCounts)> GetMusicGenres(InternalItemsQuery filter)
     {
-        return GetItemValues(filter, [ItemValueType.Genre], itemTypeLookup.BaseItemKindNames[BaseItemKind.MusicGenre]!);
+        return GetItemValues(filter, _getGenreValueTypes, _itemTypeLookup.BaseItemKindNames[BaseItemKind.MusicGenre]);
     }
 
     /// <inheritdoc />
     public IReadOnlyList<string> GetStudioNames()
     {
-        return GetItemValueNames([ItemValueType.Studios], [], []);
+        return GetItemValueNames(_getStudiosValueTypes, [], []);
     }
 
     /// <inheritdoc />
     public IReadOnlyList<string> GetAllArtistNames()
     {
-        return GetItemValueNames([ItemValueType.Artist, ItemValueType.AlbumArtist], [], []);
+        return GetItemValueNames(_getAllArtistsValueTypes, [], []);
     }
 
     /// <inheritdoc />
     public IReadOnlyList<string> GetMusicGenreNames()
     {
         return GetItemValueNames(
-            [ItemValueType.Genre],
-            itemTypeLookup.MusicGenreTypes,
+            _getGenreValueTypes,
+            _itemTypeLookup.MusicGenreTypes,
             []);
     }
 
@@ -181,9 +201,9 @@ public sealed class BaseItemRepository(
     public IReadOnlyList<string> GetGenreNames()
     {
         return GetItemValueNames(
-            [ItemValueType.Genre],
+            _getGenreValueTypes,
             [],
-            itemTypeLookup.MusicGenreTypes);
+            _itemTypeLookup.MusicGenreTypes);
     }
 
     /// <inheritdoc cref="IItemRepository"/>
@@ -202,12 +222,11 @@ public sealed class BaseItemRepository(
         PrepareFilterQuery(filter);
         var result = new QueryResult<BaseItemDto>();
 
-        using var context = dbProvider.CreateDbContext();
+        using var context = _dbProvider.CreateDbContext();
 
         IQueryable<BaseItemEntity> dbQuery = PrepareItemQuery(context, filter);
 
         dbQuery = TranslateQuery(dbQuery, context, filter);
-        // dbQuery = dbQuery.Distinct();
         if (filter.EnableTotalRecordCount)
         {
             result.TotalRecordCount = dbQuery.Count();
@@ -227,11 +246,11 @@ public sealed class BaseItemRepository(
         ArgumentNullException.ThrowIfNull(filter);
         PrepareFilterQuery(filter);
 
-        using var context = dbProvider.CreateDbContext();
+        using var context = _dbProvider.CreateDbContext();
         IQueryable<BaseItemEntity> dbQuery = PrepareItemQuery(context, filter);
 
         dbQuery = TranslateQuery(dbQuery, context, filter);
-        // dbQuery = dbQuery.Distinct();
+
         dbQuery = ApplyGroupingFilter(dbQuery, filter);
         dbQuery = ApplyQueryPageing(dbQuery, filter);
 
@@ -240,6 +259,11 @@ public sealed class BaseItemRepository(
 
     private IQueryable<BaseItemEntity> ApplyGroupingFilter(IQueryable<BaseItemEntity> dbQuery, InternalItemsQuery filter)
     {
+        // This whole block is needed to filter duplicate entries on request
+        // for the time beeing it cannot be used because it would destroy the ordering
+        // this results in "duplicate" responses for queries that try to lookup individual series or multiple versions but
+        // for that case the invoker has to run a DistinctBy(e => e.PresentationUniqueKey) on their own
+
         // var enableGroupByPresentationUniqueKey = EnableGroupByPresentationUniqueKey(filter);
         // if (enableGroupByPresentationUniqueKey && filter.GroupBySeriesPresentationUniqueKey)
         // {
@@ -318,7 +342,7 @@ public sealed class BaseItemRepository(
         // Hack for right now since we currently don't support filtering out these duplicates within a query
         PrepareFilterQuery(filter);
 
-        using var context = dbProvider.CreateDbContext();
+        using var context = _dbProvider.CreateDbContext();
         var dbQuery = TranslateQuery(context.BaseItems.AsNoTracking(), context, filter);
 
         return dbQuery.Count();
@@ -346,7 +370,7 @@ public sealed class BaseItemRepository(
         ArgumentNullException.ThrowIfNull(item);
 
         var images = item.ImageInfos.Select(e => Map(item.Id, e));
-        using var context = dbProvider.CreateDbContext();
+        using var context = _dbProvider.CreateDbContext();
         using var transaction = context.Database.BeginTransaction();
         context.BaseItemImageInfos.Where(e => e.ItemId == item.Id).ExecuteDelete();
         context.BaseItemImageInfos.AddRange(images);
@@ -382,9 +406,9 @@ public sealed class BaseItemRepository(
             tuples.Add((item, ancestorIds, topParent, userdataKey, inheritedTags));
         }
 
-        var localFuckingItemValueCache = new Dictionary<(int MagicNumber, string Value), Guid>();
+        var localItemValueCache = new Dictionary<(int MagicNumber, string Value), Guid>();
 
-        using var context = dbProvider.CreateDbContext();
+        using var context = _dbProvider.CreateDbContext();
         using var transaction = context.Database.BeginTransaction();
         foreach (var item in tuples)
         {
@@ -427,7 +451,7 @@ public sealed class BaseItemRepository(
             context.ItemValuesMap.Where(e => e.ItemId == entity.Id).ExecuteDelete();
             foreach (var itemValue in itemValuesToSave)
             {
-                if (!localFuckingItemValueCache.TryGetValue(itemValue, out var refValue))
+                if (!localItemValueCache.TryGetValue(itemValue, out var refValue))
                 {
                     refValue = context.ItemValues
                                 .Where(f => f.CleanValue == GetCleanValue(itemValue.Value) && (int)f.Type == itemValue.MagicNumber)
@@ -444,7 +468,7 @@ public sealed class BaseItemRepository(
                         ItemValueId = refValue = Guid.NewGuid(),
                         Value = itemValue.Value
                     });
-                    localFuckingItemValueCache[itemValue] = refValue;
+                    localItemValueCache[itemValue] = refValue;
                 }
 
                 context.ItemValuesMap.Add(new ItemValueMap()
@@ -469,7 +493,7 @@ public sealed class BaseItemRepository(
             throw new ArgumentException("Guid can't be empty", nameof(id));
         }
 
-        using var context = dbProvider.CreateDbContext();
+        using var context = _dbProvider.CreateDbContext();
         var item = PrepareItemQuery(context, new()
         {
             DtoOptions = new()
@@ -813,9 +837,9 @@ public sealed class BaseItemRepository(
         return entity;
     }
 
-    private string[] GetItemValueNames(ItemValueType[] itemValueTypes, IReadOnlyList<string> withItemTypes, IReadOnlyList<string> excludeItemTypes)
+    private string[] GetItemValueNames(IReadOnlyList<ItemValueType> itemValueTypes, IReadOnlyList<string> withItemTypes, IReadOnlyList<string> excludeItemTypes)
     {
-        using var context = dbProvider.CreateDbContext();
+        using var context = _dbProvider.CreateDbContext();
 
         var query = context.ItemValuesMap
             .AsNoTracking()
@@ -842,7 +866,7 @@ public sealed class BaseItemRepository(
     private BaseItemDto DeserialiseBaseItem(BaseItemEntity baseItemEntity, bool skipDeserialization = false)
     {
         ArgumentNullException.ThrowIfNull(baseItemEntity, nameof(baseItemEntity));
-        if (serverConfigurationManager?.Configuration is null)
+        if (_serverConfigurationManager?.Configuration is null)
         {
             throw new InvalidOperationException("Server Configuration manager or configuration is null");
         }
@@ -850,9 +874,9 @@ public sealed class BaseItemRepository(
         var typeToSerialise = GetType(baseItemEntity.Type);
         return BaseItemRepository.DeserialiseBaseItem(
             baseItemEntity,
-            logger,
-            appHost,
-            skipDeserialization || (serverConfigurationManager.Configuration.SkipDeserializationForBasicTypes && (typeToSerialise == typeof(Channel) || typeToSerialise == typeof(UserRootFolder))));
+            _logger,
+            _appHost,
+            skipDeserialization || (_serverConfigurationManager.Configuration.SkipDeserializationForBasicTypes && (typeToSerialise == typeof(Channel) || typeToSerialise == typeof(UserRootFolder))));
     }
 
     /// <summary>
@@ -889,7 +913,7 @@ public sealed class BaseItemRepository(
         return Map(baseItemEntity, dto, appHost);
     }
 
-    private QueryResult<(BaseItemDto Item, ItemCounts ItemCounts)> GetItemValues(InternalItemsQuery filter, ItemValueType[] itemValueTypes, string returnType)
+    private QueryResult<(BaseItemDto Item, ItemCounts ItemCounts)> GetItemValues(InternalItemsQuery filter, IReadOnlyList<ItemValueType> itemValueTypes, string returnType)
     {
         ArgumentNullException.ThrowIfNull(filter);
 
@@ -898,7 +922,7 @@ public sealed class BaseItemRepository(
             filter.EnableTotalRecordCount = false;
         }
 
-        using var context = dbProvider.CreateDbContext();
+        using var context = _dbProvider.CreateDbContext();
 
         var innerQuery = new InternalItemsQuery(filter.User)
         {
@@ -951,13 +975,13 @@ public sealed class BaseItemRepository(
             result.TotalRecordCount = query.GroupBy(e => e.PresentationUniqueKey).Select(e => e.First()).Count();
         }
 
-        var seriesTypeName = itemTypeLookup.BaseItemKindNames[BaseItemKind.Series];
-        var movieTypeName = itemTypeLookup.BaseItemKindNames[BaseItemKind.Movie];
-        var episodeTypeName = itemTypeLookup.BaseItemKindNames[BaseItemKind.Episode];
-        var musicAlbumTypeName = itemTypeLookup.BaseItemKindNames[BaseItemKind.MusicAlbum];
-        var musicArtistTypeName = itemTypeLookup.BaseItemKindNames[BaseItemKind.MusicArtist];
-        var audioTypeName = itemTypeLookup.BaseItemKindNames[BaseItemKind.Audio];
-        var trailerTypeName = itemTypeLookup.BaseItemKindNames[BaseItemKind.Trailer];
+        var seriesTypeName = _itemTypeLookup.BaseItemKindNames[BaseItemKind.Series];
+        var movieTypeName = _itemTypeLookup.BaseItemKindNames[BaseItemKind.Movie];
+        var episodeTypeName = _itemTypeLookup.BaseItemKindNames[BaseItemKind.Episode];
+        var musicAlbumTypeName = _itemTypeLookup.BaseItemKindNames[BaseItemKind.MusicAlbum];
+        var musicArtistTypeName = _itemTypeLookup.BaseItemKindNames[BaseItemKind.MusicArtist];
+        var audioTypeName = _itemTypeLookup.BaseItemKindNames[BaseItemKind.Audio];
+        var trailerTypeName = _itemTypeLookup.BaseItemKindNames[BaseItemKind.Trailer];
 
         var resultQuery = query.Select(e => new
         {
@@ -1071,7 +1095,7 @@ public sealed class BaseItemRepository(
             return null;
         }
 
-        return appHost.ReverseVirtualPath(path);
+        return _appHost.ReverseVirtualPath(path);
     }
 
     private List<string> GetItemByNameTypesInQuery(InternalItemsQuery query)
@@ -1080,27 +1104,27 @@ public sealed class BaseItemRepository(
 
         if (IsTypeInQuery(BaseItemKind.Person, query))
         {
-            list.Add(itemTypeLookup.BaseItemKindNames[BaseItemKind.Person]!);
+            list.Add(_itemTypeLookup.BaseItemKindNames[BaseItemKind.Person]!);
         }
 
         if (IsTypeInQuery(BaseItemKind.Genre, query))
         {
-            list.Add(itemTypeLookup.BaseItemKindNames[BaseItemKind.Genre]!);
+            list.Add(_itemTypeLookup.BaseItemKindNames[BaseItemKind.Genre]!);
         }
 
         if (IsTypeInQuery(BaseItemKind.MusicGenre, query))
         {
-            list.Add(itemTypeLookup.BaseItemKindNames[BaseItemKind.MusicGenre]!);
+            list.Add(_itemTypeLookup.BaseItemKindNames[BaseItemKind.MusicGenre]!);
         }
 
         if (IsTypeInQuery(BaseItemKind.MusicArtist, query))
         {
-            list.Add(itemTypeLookup.BaseItemKindNames[BaseItemKind.MusicArtist]!);
+            list.Add(_itemTypeLookup.BaseItemKindNames[BaseItemKind.MusicArtist]!);
         }
 
         if (IsTypeInQuery(BaseItemKind.Studio, query))
         {
-            list.Add(itemTypeLookup.BaseItemKindNames[BaseItemKind.Studio]!);
+            list.Add(_itemTypeLookup.BaseItemKindNames[BaseItemKind.Studio]!);
         }
 
         return list;
@@ -1193,7 +1217,7 @@ public sealed class BaseItemRepository(
     private IQueryable<BaseItemEntity> ApplyOrder(IQueryable<BaseItemEntity> query, InternalItemsQuery filter)
     {
         var orderBy = filter.OrderBy;
-        bool hasSearch = !string.IsNullOrEmpty(filter.SearchTerm);
+        var hasSearch = !string.IsNullOrEmpty(filter.SearchTerm);
 
         if (hasSearch)
         {
@@ -1390,7 +1414,7 @@ public sealed class BaseItemRepository(
             var excludeTypes = filter.ExcludeItemTypes;
             if (excludeTypes.Length == 1)
             {
-                if (itemTypeLookup.BaseItemKindNames.TryGetValue(excludeTypes[0], out var excludeTypeName))
+                if (_itemTypeLookup.BaseItemKindNames.TryGetValue(excludeTypes[0], out var excludeTypeName))
                 {
                     baseQuery = baseQuery.Where(e => e.Type != excludeTypeName);
                 }
@@ -1400,7 +1424,7 @@ public sealed class BaseItemRepository(
                 var excludeTypeName = new List<string>();
                 foreach (var excludeType in excludeTypes)
                 {
-                    if (itemTypeLookup.BaseItemKindNames.TryGetValue(excludeType, out var baseItemKindName))
+                    if (_itemTypeLookup.BaseItemKindNames.TryGetValue(excludeType, out var baseItemKindName))
                     {
                         excludeTypeName.Add(baseItemKindName!);
                     }
@@ -1411,7 +1435,7 @@ public sealed class BaseItemRepository(
         }
         else if (includeTypes.Length == 1)
         {
-            if (itemTypeLookup.BaseItemKindNames.TryGetValue(includeTypes[0], out var includeTypeName))
+            if (_itemTypeLookup.BaseItemKindNames.TryGetValue(includeTypes[0], out var includeTypeName))
             {
                 baseQuery = baseQuery.Where(e => e.Type == includeTypeName);
             }
@@ -1421,7 +1445,7 @@ public sealed class BaseItemRepository(
             var includeTypeName = new List<string>();
             foreach (var includeType in includeTypes)
             {
-                if (itemTypeLookup.BaseItemKindNames.TryGetValue(includeType, out var baseItemKindName))
+                if (_itemTypeLookup.BaseItemKindNames.TryGetValue(includeType, out var baseItemKindName))
                 {
                     includeTypeName.Add(baseItemKindName!);
                 }
diff --git a/MediaBrowser.Controller/Persistence/IItemTypeLookup.cs b/MediaBrowser.Controller/Persistence/IItemTypeLookup.cs
index 9507f79d3..6699d3a4d 100644
--- a/MediaBrowser.Controller/Persistence/IItemTypeLookup.cs
+++ b/MediaBrowser.Controller/Persistence/IItemTypeLookup.cs
@@ -18,5 +18,5 @@ public interface IItemTypeLookup
     /// <summary>
     /// Gets mapping for all BaseItemKinds and their expected serialization target.
     /// </summary>
-    public IReadOnlyDictionary<BaseItemKind, string> BaseItemKindNames { get; }
+    IReadOnlyDictionary<BaseItemKind, string> BaseItemKindNames { get; }
 }
-- 
cgit v1.2.3


From 2614fecf8df6e04b0d0a2b33722923c239ed0f91 Mon Sep 17 00:00:00 2001
From: Daniyar Alpyspayev <daniyara@thereachagency.com>
Date: Thu, 12 Dec 2024 18:10:06 +0500
Subject: move to new System.Threading.Lock type for better performance

---
 Emby.Server.Implementations/AppBase/BaseConfigurationManager.cs   | 3 ++-
 Emby.Server.Implementations/Devices/DeviceId.cs                   | 3 ++-
 Emby.Server.Implementations/EntryPoints/LibraryChangedNotifier.cs | 2 +-
 Emby.Server.Implementations/EntryPoints/UserDataChangeNotifier.cs | 2 +-
 Emby.Server.Implementations/IO/FileRefresher.cs                   | 4 ++--
 Emby.Server.Implementations/Library/LibraryManager.cs             | 4 ++--
 Emby.Server.Implementations/ScheduledTasks/ScheduledTaskWorker.cs | 2 +-
 Emby.Server.Implementations/Session/SessionWebSocketListener.cs   | 2 +-
 Emby.Server.Implementations/SyncPlay/SyncPlayManager.cs           | 2 +-
 Emby.Server.Implementations/Updates/InstallationManager.cs        | 2 +-
 MediaBrowser.Common/Plugins/BasePluginOfT.cs                      | 5 +++--
 MediaBrowser.Controller/Entities/AggregateFolder.cs               | 2 +-
 MediaBrowser.Controller/Entities/UserRootFolder.cs                | 2 +-
 MediaBrowser.Controller/MediaEncoding/TranscodingJob.cs           | 4 ++--
 MediaBrowser.Controller/Net/BasePeriodicWebSocketListener.cs      | 2 +-
 MediaBrowser.Controller/Session/SessionInfo.cs                    | 2 +-
 MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs                | 2 +-
 MediaBrowser.Providers/Manager/ProviderManager.cs                 | 2 +-
 src/Jellyfin.LiveTv/Timers/ItemDataProvider.cs                    | 3 ++-
 src/Jellyfin.Networking/Manager/NetworkManager.cs                 | 6 +++---
 20 files changed, 30 insertions(+), 26 deletions(-)

(limited to 'MediaBrowser.Controller')

diff --git a/Emby.Server.Implementations/AppBase/BaseConfigurationManager.cs b/Emby.Server.Implementations/AppBase/BaseConfigurationManager.cs
index 9e98d5ce0..9bc3a0204 100644
--- a/Emby.Server.Implementations/AppBase/BaseConfigurationManager.cs
+++ b/Emby.Server.Implementations/AppBase/BaseConfigurationManager.cs
@@ -4,6 +4,7 @@ using System.Collections.Generic;
 using System.Globalization;
 using System.IO;
 using System.Linq;
+using System.Threading;
 using MediaBrowser.Common.Configuration;
 using MediaBrowser.Common.Events;
 using MediaBrowser.Common.Extensions;
@@ -19,7 +20,7 @@ namespace Emby.Server.Implementations.AppBase
     public abstract class BaseConfigurationManager : IConfigurationManager
     {
         private readonly ConcurrentDictionary<string, object> _configurations = new();
-        private readonly object _configurationSyncLock = new();
+        private readonly Lock _configurationSyncLock = new();
 
         private ConfigurationStore[] _configurationStores = Array.Empty<ConfigurationStore>();
         private IConfigurationFactory[] _configurationFactories = Array.Empty<IConfigurationFactory>();
diff --git a/Emby.Server.Implementations/Devices/DeviceId.cs b/Emby.Server.Implementations/Devices/DeviceId.cs
index 2459178d8..0b3c3bbd4 100644
--- a/Emby.Server.Implementations/Devices/DeviceId.cs
+++ b/Emby.Server.Implementations/Devices/DeviceId.cs
@@ -4,6 +4,7 @@ using System;
 using System.Globalization;
 using System.IO;
 using System.Text;
+using System.Threading;
 using MediaBrowser.Common.Configuration;
 using Microsoft.Extensions.Logging;
 
@@ -13,7 +14,7 @@ namespace Emby.Server.Implementations.Devices
     {
         private readonly IApplicationPaths _appPaths;
         private readonly ILogger<DeviceId> _logger;
-        private readonly object _syncLock = new object();
+        private readonly Lock _syncLock = new();
 
         private string? _id;
 
diff --git a/Emby.Server.Implementations/EntryPoints/LibraryChangedNotifier.cs b/Emby.Server.Implementations/EntryPoints/LibraryChangedNotifier.cs
index 4c668379c..fb0a55135 100644
--- a/Emby.Server.Implementations/EntryPoints/LibraryChangedNotifier.cs
+++ b/Emby.Server.Implementations/EntryPoints/LibraryChangedNotifier.cs
@@ -34,7 +34,7 @@ public sealed class LibraryChangedNotifier : IHostedService, IDisposable
     private readonly IUserManager _userManager;
     private readonly ILogger<LibraryChangedNotifier> _logger;
 
-    private readonly object _libraryChangedSyncLock = new();
+    private readonly Lock _libraryChangedSyncLock = new();
     private readonly List<Folder> _foldersAddedTo = new();
     private readonly List<Folder> _foldersRemovedFrom = new();
     private readonly List<BaseItem> _itemsAdded = new();
diff --git a/Emby.Server.Implementations/EntryPoints/UserDataChangeNotifier.cs b/Emby.Server.Implementations/EntryPoints/UserDataChangeNotifier.cs
index aef02ce6b..aa1c3064b 100644
--- a/Emby.Server.Implementations/EntryPoints/UserDataChangeNotifier.cs
+++ b/Emby.Server.Implementations/EntryPoints/UserDataChangeNotifier.cs
@@ -24,7 +24,7 @@ namespace Emby.Server.Implementations.EntryPoints
         private readonly IUserManager _userManager;
 
         private readonly Dictionary<Guid, List<BaseItem>> _changedItems = new();
-        private readonly object _syncLock = new();
+        private readonly Lock _syncLock = new();
 
         private Timer? _updateTimer;
 
diff --git a/Emby.Server.Implementations/IO/FileRefresher.cs b/Emby.Server.Implementations/IO/FileRefresher.cs
index e75cab64c..7378cf885 100644
--- a/Emby.Server.Implementations/IO/FileRefresher.cs
+++ b/Emby.Server.Implementations/IO/FileRefresher.cs
@@ -18,8 +18,8 @@ namespace Emby.Server.Implementations.IO
         private readonly ILibraryManager _libraryManager;
         private readonly IServerConfigurationManager _configurationManager;
 
-        private readonly List<string> _affectedPaths = new List<string>();
-        private readonly object _timerLock = new object();
+        private readonly List<string> _affectedPaths = new();
+        private readonly Lock _timerLock = new();
         private Timer? _timer;
         private bool _disposed;
 
diff --git a/Emby.Server.Implementations/Library/LibraryManager.cs b/Emby.Server.Implementations/Library/LibraryManager.cs
index 28f7ed659..2d1af82b3 100644
--- a/Emby.Server.Implementations/Library/LibraryManager.cs
+++ b/Emby.Server.Implementations/Library/LibraryManager.cs
@@ -81,8 +81,8 @@ namespace Emby.Server.Implementations.Library
         /// <summary>
         /// The _root folder sync lock.
         /// </summary>
-        private readonly object _rootFolderSyncLock = new object();
-        private readonly object _userRootFolderSyncLock = new object();
+        private readonly Lock _rootFolderSyncLock = new();
+        private readonly Lock _userRootFolderSyncLock = new();
 
         private readonly TimeSpan _viewRefreshInterval = TimeSpan.FromHours(24);
 
diff --git a/Emby.Server.Implementations/ScheduledTasks/ScheduledTaskWorker.cs b/Emby.Server.Implementations/ScheduledTasks/ScheduledTaskWorker.cs
index fe769baf9..0bc67bc47 100644
--- a/Emby.Server.Implementations/ScheduledTasks/ScheduledTaskWorker.cs
+++ b/Emby.Server.Implementations/ScheduledTasks/ScheduledTaskWorker.cs
@@ -27,7 +27,7 @@ namespace Emby.Server.Implementations.ScheduledTasks
         private readonly IApplicationPaths _applicationPaths;
         private readonly ILogger _logger;
         private readonly ITaskManager _taskManager;
-        private readonly object _lastExecutionResultSyncLock = new();
+        private readonly Lock _lastExecutionResultSyncLock = new();
         private bool _readFromFile;
         private TaskResult _lastExecutionResult;
         private Task _currentTask;
diff --git a/Emby.Server.Implementations/Session/SessionWebSocketListener.cs b/Emby.Server.Implementations/Session/SessionWebSocketListener.cs
index aba51de8f..c4f6a6285 100644
--- a/Emby.Server.Implementations/Session/SessionWebSocketListener.cs
+++ b/Emby.Server.Implementations/Session/SessionWebSocketListener.cs
@@ -41,7 +41,7 @@ namespace Emby.Server.Implementations.Session
         /// <summary>
         /// Lock used for accessing the WebSockets watchlist.
         /// </summary>
-        private readonly object _webSocketsLock = new object();
+        private readonly Lock _webSocketsLock = new();
 
         private readonly ISessionManager _sessionManager;
         private readonly ILogger<SessionWebSocketListener> _logger;
diff --git a/Emby.Server.Implementations/SyncPlay/SyncPlayManager.cs b/Emby.Server.Implementations/SyncPlay/SyncPlayManager.cs
index 00c655634..fdfff8f3b 100644
--- a/Emby.Server.Implementations/SyncPlay/SyncPlayManager.cs
+++ b/Emby.Server.Implementations/SyncPlay/SyncPlayManager.cs
@@ -67,7 +67,7 @@ namespace Emby.Server.Implementations.SyncPlay
         /// <remarks>
         /// This lock has priority on locks made on <see cref="Group"/>.
         /// </remarks>
-        private readonly object _groupsLock = new object();
+        private readonly Lock _groupsLock = new();
 
         private bool _disposed = false;
 
diff --git a/Emby.Server.Implementations/Updates/InstallationManager.cs b/Emby.Server.Implementations/Updates/InstallationManager.cs
index ce3d6cab8..c4d697be5 100644
--- a/Emby.Server.Implementations/Updates/InstallationManager.cs
+++ b/Emby.Server.Implementations/Updates/InstallationManager.cs
@@ -48,7 +48,7 @@ namespace Emby.Server.Implementations.Updates
         /// </summary>
         /// <value>The application host.</value>
         private readonly IServerApplicationHost _applicationHost;
-        private readonly object _currentInstallationsLock = new object();
+        private readonly Lock _currentInstallationsLock = new();
 
         /// <summary>
         /// The current installations.
diff --git a/MediaBrowser.Common/Plugins/BasePluginOfT.cs b/MediaBrowser.Common/Plugins/BasePluginOfT.cs
index bf2f12cb9..58992ecd7 100644
--- a/MediaBrowser.Common/Plugins/BasePluginOfT.cs
+++ b/MediaBrowser.Common/Plugins/BasePluginOfT.cs
@@ -4,6 +4,7 @@
 using System;
 using System.IO;
 using System.Runtime.InteropServices;
+using System.Threading;
 using MediaBrowser.Common.Configuration;
 using MediaBrowser.Model.Plugins;
 using MediaBrowser.Model.Serialization;
@@ -20,12 +21,12 @@ namespace MediaBrowser.Common.Plugins
         /// <summary>
         /// The configuration sync lock.
         /// </summary>
-        private readonly object _configurationSyncLock = new object();
+        private readonly Lock _configurationSyncLock = new();
 
         /// <summary>
         /// The configuration save lock.
         /// </summary>
-        private readonly object _configurationSaveLock = new object();
+        private readonly Lock _configurationSaveLock = new();
 
         /// <summary>
         /// The configuration.
diff --git a/MediaBrowser.Controller/Entities/AggregateFolder.cs b/MediaBrowser.Controller/Entities/AggregateFolder.cs
index 40cdd6c91..5e0d1bb45 100644
--- a/MediaBrowser.Controller/Entities/AggregateFolder.cs
+++ b/MediaBrowser.Controller/Entities/AggregateFolder.cs
@@ -23,7 +23,7 @@ namespace MediaBrowser.Controller.Entities
     /// </summary>
     public class AggregateFolder : Folder
     {
-        private readonly object _childIdsLock = new object();
+        private readonly Lock _childIdsLock = new();
 
         /// <summary>
         /// The _virtual children.
diff --git a/MediaBrowser.Controller/Entities/UserRootFolder.cs b/MediaBrowser.Controller/Entities/UserRootFolder.cs
index a687adedd..65d81b23e 100644
--- a/MediaBrowser.Controller/Entities/UserRootFolder.cs
+++ b/MediaBrowser.Controller/Entities/UserRootFolder.cs
@@ -21,7 +21,7 @@ namespace MediaBrowser.Controller.Entities
     /// </summary>
     public class UserRootFolder : Folder
     {
-        private readonly object _childIdsLock = new object();
+        private readonly Lock _childIdsLock = new();
         private List<Guid> _childrenIds = null;
 
         /// <summary>
diff --git a/MediaBrowser.Controller/MediaEncoding/TranscodingJob.cs b/MediaBrowser.Controller/MediaEncoding/TranscodingJob.cs
index fefa66cdb..56990d0b8 100644
--- a/MediaBrowser.Controller/MediaEncoding/TranscodingJob.cs
+++ b/MediaBrowser.Controller/MediaEncoding/TranscodingJob.cs
@@ -12,8 +12,8 @@ namespace MediaBrowser.Controller.MediaEncoding;
 public sealed class TranscodingJob : IDisposable
 {
     private readonly ILogger<TranscodingJob> _logger;
-    private readonly object _processLock = new();
-    private readonly object _timerLock = new();
+    private readonly Lock _processLock = new();
+    private readonly Lock _timerLock = new();
 
     private Timer? _killTimer;
 
diff --git a/MediaBrowser.Controller/Net/BasePeriodicWebSocketListener.cs b/MediaBrowser.Controller/Net/BasePeriodicWebSocketListener.cs
index a47d2fa45..4757bfa30 100644
--- a/MediaBrowser.Controller/Net/BasePeriodicWebSocketListener.cs
+++ b/MediaBrowser.Controller/Net/BasePeriodicWebSocketListener.cs
@@ -33,7 +33,7 @@ namespace MediaBrowser.Controller.Net
             SingleWriter = false
         });
 
-        private readonly object _activeConnectionsLock = new();
+        private readonly Lock _activeConnectionsLock = new();
 
         /// <summary>
         /// The _active connections.
diff --git a/MediaBrowser.Controller/Session/SessionInfo.cs b/MediaBrowser.Controller/Session/SessionInfo.cs
index 3ba1bfce4..cbef5d011 100644
--- a/MediaBrowser.Controller/Session/SessionInfo.cs
+++ b/MediaBrowser.Controller/Session/SessionInfo.cs
@@ -25,7 +25,7 @@ namespace MediaBrowser.Controller.Session
         private readonly ISessionManager _sessionManager;
         private readonly ILogger _logger;
 
-        private readonly object _progressLock = new();
+        private readonly Lock _progressLock = new();
         private Timer _progressTimer;
         private PlaybackProgressInfo _lastProgressInfo;
 
diff --git a/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs b/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
index a34238cd6..e084bda27 100644
--- a/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
+++ b/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
@@ -62,7 +62,7 @@ namespace MediaBrowser.MediaEncoding.Encoder
 
         private readonly AsyncNonKeyedLocker _thumbnailResourcePool;
 
-        private readonly object _runningProcessesLock = new object();
+        private readonly Lock _runningProcessesLock = new();
         private readonly List<ProcessWrapper> _runningProcesses = new List<ProcessWrapper>();
 
         // MediaEncoder is registered as a Singleton
diff --git a/MediaBrowser.Providers/Manager/ProviderManager.cs b/MediaBrowser.Providers/Manager/ProviderManager.cs
index 010e9c3b6..854ac6b9c 100644
--- a/MediaBrowser.Providers/Manager/ProviderManager.cs
+++ b/MediaBrowser.Providers/Manager/ProviderManager.cs
@@ -48,7 +48,7 @@ namespace MediaBrowser.Providers.Manager
     /// </summary>
     public class ProviderManager : IProviderManager, IDisposable
     {
-        private readonly object _refreshQueueLock = new();
+        private readonly Lock _refreshQueueLock = new();
         private readonly ILogger<ProviderManager> _logger;
         private readonly IHttpClientFactory _httpClientFactory;
         private readonly ILibraryMonitor _libraryMonitor;
diff --git a/src/Jellyfin.LiveTv/Timers/ItemDataProvider.cs b/src/Jellyfin.LiveTv/Timers/ItemDataProvider.cs
index 9e7323f5b..6a68b8c25 100644
--- a/src/Jellyfin.LiveTv/Timers/ItemDataProvider.cs
+++ b/src/Jellyfin.LiveTv/Timers/ItemDataProvider.cs
@@ -6,6 +6,7 @@ using System.Diagnostics.CodeAnalysis;
 using System.IO;
 using System.Linq;
 using System.Text.Json;
+using System.Threading;
 using Jellyfin.Extensions.Json;
 using Microsoft.Extensions.Logging;
 
@@ -15,7 +16,7 @@ namespace Jellyfin.LiveTv.Timers
         where T : class
     {
         private readonly string _dataPath;
-        private readonly object _fileDataLock = new object();
+        private readonly Lock _fileDataLock = new();
         private readonly JsonSerializerOptions _jsonOptions = JsonDefaults.Options;
         private T[]? _items;
 
diff --git a/src/Jellyfin.Networking/Manager/NetworkManager.cs b/src/Jellyfin.Networking/Manager/NetworkManager.cs
index 10aed673b..b1fc5d406 100644
--- a/src/Jellyfin.Networking/Manager/NetworkManager.cs
+++ b/src/Jellyfin.Networking/Manager/NetworkManager.cs
@@ -27,7 +27,7 @@ public class NetworkManager : INetworkManager, IDisposable
     /// <summary>
     /// Threading lock for network properties.
     /// </summary>
-    private readonly object _initLock;
+    private readonly Lock _initLock;
 
     private readonly ILogger<NetworkManager> _logger;
 
@@ -35,7 +35,7 @@ public class NetworkManager : INetworkManager, IDisposable
 
     private readonly IConfiguration _startupConfig;
 
-    private readonly object _networkEventLock;
+    private readonly Lock _networkEventLock;
 
     /// <summary>
     /// Holds the published server URLs and the IPs to use them on.
@@ -93,7 +93,7 @@ public class NetworkManager : INetworkManager, IDisposable
         _interfaces = new List<IPData>();
         _macAddresses = new List<PhysicalAddress>();
         _publishedServerUrls = new List<PublishedServerUriOverride>();
-        _networkEventLock = new object();
+        _networkEventLock = new();
         _remoteAddressFilter = new List<IPNetwork>();
 
         _ = bool.TryParse(startupConfig[DetectNetworkChangeKey], out var detectNetworkChange);
-- 
cgit v1.2.3


From d716a53ec2433c6af43dfbce7f92fc9c2927592a Mon Sep 17 00:00:00 2001
From: JPVenson <github@jpb.email>
Date: Sat, 11 Jan 2025 18:13:16 +0000
Subject: Applied review comments

---
 .../Item/BaseItemRepository.cs                         | 18 +++---------------
 MediaBrowser.Controller/Persistence/IItemRepository.cs |  2 +-
 2 files changed, 4 insertions(+), 16 deletions(-)

(limited to 'MediaBrowser.Controller')

diff --git a/Jellyfin.Server.Implementations/Item/BaseItemRepository.cs b/Jellyfin.Server.Implementations/Item/BaseItemRepository.cs
index e087bd328..01e23f56d 100644
--- a/Jellyfin.Server.Implementations/Item/BaseItemRepository.cs
+++ b/Jellyfin.Server.Implementations/Item/BaseItemRepository.cs
@@ -41,8 +41,8 @@ using BaseItemEntity = Jellyfin.Data.Entities.BaseItemEntity;
 namespace Jellyfin.Server.Implementations.Item;
 
 /*
-    All queries in this class and all other nullable enabled EFCore repository classes will make libraral use of the null-forgiving operator "!".
-    This is done as the code isn't actually executed client side, but only the expressions are interpretet and the compiler cannot know that.
+    All queries in this class and all other nullable enabled EFCore repository classes will make liberal use of the null-forgiving operator "!".
+    This is done as the code isn't actually executed client side, but only the expressions are interpret and the compiler cannot know that.
     This is your only warning/message regarding this topic.
 */
 
@@ -50,7 +50,7 @@ namespace Jellyfin.Server.Implementations.Item;
 /// Handles all storage logic for BaseItems.
 /// </summary>
 public sealed class BaseItemRepository
-    : IItemRepository, IDisposable
+    : IItemRepository
 {
     /// <summary>
     /// This holds all the types in the running assemblies
@@ -62,7 +62,6 @@ public sealed class BaseItemRepository
     private readonly IItemTypeLookup _itemTypeLookup;
     private readonly IServerConfigurationManager _serverConfigurationManager;
     private readonly ILogger<BaseItemRepository> _logger;
-    private bool _disposed;
 
     private static readonly IReadOnlyList<ItemValueType> _getAllArtistsValueTypes = [ItemValueType.Artist, ItemValueType.AlbumArtist];
     private static readonly IReadOnlyList<ItemValueType> _getArtistValueTypes = [ItemValueType.Artist];
@@ -92,17 +91,6 @@ public sealed class BaseItemRepository
         _logger = logger;
     }
 
-    /// <inheritdoc/>
-    public void Dispose()
-    {
-        if (_disposed)
-        {
-            return;
-        }
-
-        _disposed = true;
-    }
-
     /// <inheritdoc />
     public void DeleteItem(Guid id)
     {
diff --git a/MediaBrowser.Controller/Persistence/IItemRepository.cs b/MediaBrowser.Controller/Persistence/IItemRepository.cs
index b27f156ef..afe2d833d 100644
--- a/MediaBrowser.Controller/Persistence/IItemRepository.cs
+++ b/MediaBrowser.Controller/Persistence/IItemRepository.cs
@@ -14,7 +14,7 @@ namespace MediaBrowser.Controller.Persistence;
 /// <summary>
 /// Provides an interface to implement an Item repository.
 /// </summary>
-public interface IItemRepository : IDisposable
+public interface IItemRepository
 {
     /// <summary>
     /// Deletes the item.
-- 
cgit v1.2.3


From 47f798827b956dbacfed2a870bab02e7ffc0da12 Mon Sep 17 00:00:00 2001
From: Bond_009 <bond.009@outlook.com>
Date: Wed, 22 Jan 2025 17:31:52 +0100
Subject: Remove useless checks and dead code

---
 .../Library/LibraryManager.cs                      |  9 +------
 .../Library/UserViewManager.cs                     | 30 ++++++++++------------
 Jellyfin.Api/Auth/CustomAuthenticationHandler.cs   |  2 +-
 Jellyfin.Api/Helpers/DynamicHlsHelper.cs           |  2 +-
 MediaBrowser.Common/Net/NetworkUtils.cs            |  3 ++-
 MediaBrowser.Controller/Entities/Folder.cs         |  5 ----
 MediaBrowser.Controller/Entities/TV/Season.cs      |  2 +-
 MediaBrowser.Model/Dlna/StreamBuilder.cs           |  8 +++---
 .../MediaInfo/FFProbeVideoInfo.cs                  |  2 +-
 src/Jellyfin.LiveTv/IO/EncodedRecorder.cs          | 30 +---------------------
 10 files changed, 25 insertions(+), 68 deletions(-)

(limited to 'MediaBrowser.Controller')

diff --git a/Emby.Server.Implementations/Library/LibraryManager.cs b/Emby.Server.Implementations/Library/LibraryManager.cs
index 2d1af82b3..4a6f1716d 100644
--- a/Emby.Server.Implementations/Library/LibraryManager.cs
+++ b/Emby.Server.Implementations/Library/LibraryManager.cs
@@ -751,14 +751,7 @@ namespace Emby.Server.Implementations.Library
 
             if (folder.Id.IsEmpty())
             {
-                if (string.IsNullOrEmpty(folder.Path))
-                {
-                    folder.Id = GetNewItemId(folder.GetType().Name, folder.GetType());
-                }
-                else
-                {
-                    folder.Id = GetNewItemId(folder.Path, folder.GetType());
-                }
+                folder.Id = GetNewItemId(folder.Path, folder.GetType());
             }
 
             var dbItem = GetItemById(folder.Id) as BasePluginFolder;
diff --git a/Emby.Server.Implementations/Library/UserViewManager.cs b/Emby.Server.Implementations/Library/UserViewManager.cs
index e9cf47d46..d42a0e7d2 100644
--- a/Emby.Server.Implementations/Library/UserViewManager.cs
+++ b/Emby.Server.Implementations/Library/UserViewManager.cs
@@ -308,39 +308,40 @@ namespace Emby.Server.Implementations.Library
                 }
             }
 
-            var mediaTypes = new List<MediaType>();
+            MediaType[] mediaTypes = [];
 
             if (includeItemTypes.Length == 0)
             {
+                HashSet<MediaType> tmpMediaTypes = [];
                 foreach (var parent in parents.OfType<ICollectionFolder>())
                 {
                     switch (parent.CollectionType)
                     {
                         case CollectionType.books:
-                            mediaTypes.Add(MediaType.Book);
-                            mediaTypes.Add(MediaType.Audio);
+                            tmpMediaTypes.Add(MediaType.Book);
+                            tmpMediaTypes.Add(MediaType.Audio);
                             break;
                         case CollectionType.music:
-                            mediaTypes.Add(MediaType.Audio);
+                            tmpMediaTypes.Add(MediaType.Audio);
                             break;
                         case CollectionType.photos:
-                            mediaTypes.Add(MediaType.Photo);
-                            mediaTypes.Add(MediaType.Video);
+                            tmpMediaTypes.Add(MediaType.Photo);
+                            tmpMediaTypes.Add(MediaType.Video);
                             break;
                         case CollectionType.homevideos:
-                            mediaTypes.Add(MediaType.Photo);
-                            mediaTypes.Add(MediaType.Video);
+                            tmpMediaTypes.Add(MediaType.Photo);
+                            tmpMediaTypes.Add(MediaType.Video);
                             break;
                         default:
-                            mediaTypes.Add(MediaType.Video);
+                            tmpMediaTypes.Add(MediaType.Video);
                             break;
                     }
                 }
 
-                mediaTypes = mediaTypes.Distinct().ToList();
+                mediaTypes = tmpMediaTypes.ToArray();
             }
 
-            var excludeItemTypes = includeItemTypes.Length == 0 && mediaTypes.Count == 0
+            var excludeItemTypes = includeItemTypes.Length == 0 && mediaTypes.Length == 0
                 ? new[]
                 {
                     BaseItemKind.Person,
@@ -366,14 +367,9 @@ namespace Emby.Server.Implementations.Library
                 Limit = limit * 5,
                 IsPlayed = isPlayed,
                 DtoOptions = options,
-                MediaTypes = mediaTypes.ToArray()
+                MediaTypes = mediaTypes
             };
 
-            if (parents.Count == 0)
-            {
-                return _libraryManager.GetItemList(query, false);
-            }
-
             return _libraryManager.GetItemList(query, parents);
         }
     }
diff --git a/Jellyfin.Api/Auth/CustomAuthenticationHandler.cs b/Jellyfin.Api/Auth/CustomAuthenticationHandler.cs
index 2853e69b0..c2398f71b 100644
--- a/Jellyfin.Api/Auth/CustomAuthenticationHandler.cs
+++ b/Jellyfin.Api/Auth/CustomAuthenticationHandler.cs
@@ -57,7 +57,7 @@ namespace Jellyfin.Api.Auth
 
                 var claims = new[]
                 {
-                    new Claim(ClaimTypes.Name, authorizationInfo.User?.Username ?? string.Empty),
+                    new Claim(ClaimTypes.Name, authorizationInfo.User.Username),
                     new Claim(ClaimTypes.Role, role),
                     new Claim(InternalClaimTypes.UserId, authorizationInfo.UserId.ToString("N", CultureInfo.InvariantCulture)),
                     new Claim(InternalClaimTypes.DeviceId, authorizationInfo.DeviceId),
diff --git a/Jellyfin.Api/Helpers/DynamicHlsHelper.cs b/Jellyfin.Api/Helpers/DynamicHlsHelper.cs
index 9802be7f4..6221836fc 100644
--- a/Jellyfin.Api/Helpers/DynamicHlsHelper.cs
+++ b/Jellyfin.Api/Helpers/DynamicHlsHelper.cs
@@ -616,7 +616,7 @@ public class DynamicHlsHelper
             && state.VideoStream is not null
             && state.VideoStream.Level.HasValue)
         {
-            levelString = state.VideoStream.Level.Value.ToString(CultureInfo.InvariantCulture) ?? string.Empty;
+            levelString = state.VideoStream.Level.Value.ToString(CultureInfo.InvariantCulture);
         }
         else
         {
diff --git a/MediaBrowser.Common/Net/NetworkUtils.cs b/MediaBrowser.Common/Net/NetworkUtils.cs
index e482089f0..738096352 100644
--- a/MediaBrowser.Common/Net/NetworkUtils.cs
+++ b/MediaBrowser.Common/Net/NetworkUtils.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
 using System.Net;
 using System.Net.Sockets;
 using System.Text.RegularExpressions;
@@ -102,7 +103,7 @@ public static partial class NetworkUtils
         Span<byte> bytes = stackalloc byte[mask.AddressFamily == AddressFamily.InterNetwork ? NetworkConstants.IPv4MaskBytes : NetworkConstants.IPv6MaskBytes];
         if (!mask.TryWriteBytes(bytes, out var bytesWritten))
         {
-            Console.WriteLine("Unable to write address bytes, only ${bytesWritten} bytes written.");
+            Console.WriteLine("Unable to write address bytes, only {0} bytes written.", bytesWritten.ToString(CultureInfo.InvariantCulture));
         }
 
         var zeroed = false;
diff --git a/MediaBrowser.Controller/Entities/Folder.cs b/MediaBrowser.Controller/Entities/Folder.cs
index 83c19a54e..f3d893a2e 100644
--- a/MediaBrowser.Controller/Entities/Folder.cs
+++ b/MediaBrowser.Controller/Entities/Folder.cs
@@ -1240,11 +1240,6 @@ namespace MediaBrowser.Controller.Entities
                 return false;
             }
 
-            if (request.GenreIds.Count > 0)
-            {
-                return false;
-            }
-
             if (request.VideoTypes.Length > 0)
             {
                 return false;
diff --git a/MediaBrowser.Controller/Entities/TV/Season.cs b/MediaBrowser.Controller/Entities/TV/Season.cs
index 181b9be2b..c717c5cbb 100644
--- a/MediaBrowser.Controller/Entities/TV/Season.cs
+++ b/MediaBrowser.Controller/Entities/TV/Season.cs
@@ -132,7 +132,7 @@ namespace MediaBrowser.Controller.Entities.TV
                 var series = Series;
                 if (series is not null)
                 {
-                    return series.PresentationUniqueKey + "-" + (IndexNumber ?? 0).ToString("000", CultureInfo.InvariantCulture);
+                    return series.PresentationUniqueKey + "-" + IndexNumber.Value.ToString("000", CultureInfo.InvariantCulture);
                 }
             }
 
diff --git a/MediaBrowser.Model/Dlna/StreamBuilder.cs b/MediaBrowser.Model/Dlna/StreamBuilder.cs
index 767e01202..8771e4f1c 100644
--- a/MediaBrowser.Model/Dlna/StreamBuilder.cs
+++ b/MediaBrowser.Model/Dlna/StreamBuilder.cs
@@ -1087,12 +1087,12 @@ namespace MediaBrowser.Model.Dlna
 
             _logger.LogDebug(
                 "Transcode Result for Profile: {Profile}, Path: {Path}, PlayMethod: {PlayMethod}, AudioStreamIndex: {AudioStreamIndex}, SubtitleStreamIndex: {SubtitleStreamIndex}, Reasons: {TranscodeReason}",
-                options.Profile?.Name ?? "Anonymous Profile",
+                options.Profile.Name ?? "Anonymous Profile",
                 item.Path ?? "Unknown path",
-                playlistItem?.PlayMethod,
+                playlistItem.PlayMethod,
                 audioStream?.Index,
-                playlistItem?.SubtitleStreamIndex,
-                playlistItem?.TranscodeReasons);
+                playlistItem.SubtitleStreamIndex,
+                playlistItem.TranscodeReasons);
         }
 
         private static int GetDefaultAudioBitrate(string? audioCodec, int? audioChannels)
diff --git a/MediaBrowser.Providers/MediaInfo/FFProbeVideoInfo.cs b/MediaBrowser.Providers/MediaInfo/FFProbeVideoInfo.cs
index 246ba2733..8d94725cd 100644
--- a/MediaBrowser.Providers/MediaInfo/FFProbeVideoInfo.cs
+++ b/MediaBrowser.Providers/MediaInfo/FFProbeVideoInfo.cs
@@ -354,7 +354,7 @@ namespace MediaBrowser.Providers.MediaInfo
                 blurayVideoStream.Codec = ffmpegVideoStream.Codec;
                 blurayVideoStream.BitRate = blurayVideoStream.BitRate.GetValueOrDefault() == 0 ? ffmpegVideoStream.BitRate : blurayVideoStream.BitRate;
                 blurayVideoStream.Width = blurayVideoStream.Width.GetValueOrDefault() == 0 ? ffmpegVideoStream.Width : blurayVideoStream.Width;
-                blurayVideoStream.Height = blurayVideoStream.Height.GetValueOrDefault() == 0 ? ffmpegVideoStream.Width : blurayVideoStream.Height;
+                blurayVideoStream.Height = blurayVideoStream.Height.GetValueOrDefault() == 0 ? ffmpegVideoStream.Height : blurayVideoStream.Height;
                 blurayVideoStream.ColorRange = ffmpegVideoStream.ColorRange;
                 blurayVideoStream.ColorSpace = ffmpegVideoStream.ColorSpace;
                 blurayVideoStream.ColorTransfer = ffmpegVideoStream.ColorTransfer;
diff --git a/src/Jellyfin.LiveTv/IO/EncodedRecorder.cs b/src/Jellyfin.LiveTv/IO/EncodedRecorder.cs
index 0c660637f..c04954207 100644
--- a/src/Jellyfin.LiveTv/IO/EncodedRecorder.cs
+++ b/src/Jellyfin.LiveTv/IO/EncodedRecorder.cs
@@ -124,22 +124,7 @@ namespace Jellyfin.LiveTv.IO
 
         private string GetCommandLineArgs(MediaSourceInfo mediaSource, string inputTempFile, string targetFile)
         {
-            string videoArgs;
-            if (EncodeVideo(mediaSource))
-            {
-                const int MaxBitrate = 25000000;
-                videoArgs = string.Format(
-                    CultureInfo.InvariantCulture,
-                    "-codec:v:0 libx264 -force_key_frames \"expr:gte(t,n_forced*5)\" {0} -pix_fmt yuv420p -preset superfast -crf 23 -b:v {1} -maxrate {1} -bufsize ({1}*2) -profile:v high -level 41",
-                    GetOutputSizeParam(),
-                    MaxBitrate);
-            }
-            else
-            {
-                videoArgs = "-codec:v:0 copy";
-            }
-
-            videoArgs += " -fflags +genpts";
+            string videoArgs = "-codec:v:0 copy -fflags +genpts";
 
             var flags = new List<string>();
             if (mediaSource.IgnoreDts)
@@ -205,19 +190,6 @@ namespace Jellyfin.LiveTv.IO
         private static string GetAudioArgs(MediaSourceInfo mediaSource)
         {
             return "-codec:a:0 copy";
-
-            // var audioChannels = 2;
-            // var audioStream = mediaStreams.FirstOrDefault(i => i.Type == MediaStreamType.Audio);
-            // if (audioStream is not null)
-            // {
-            //    audioChannels = audioStream.Channels ?? audioChannels;
-            // }
-            // return "-codec:a:0 aac -strict experimental -ab 320000";
-        }
-
-        private static bool EncodeVideo(MediaSourceInfo mediaSource)
-        {
-            return false;
         }
 
         protected string GetOutputSizeParam()
-- 
cgit v1.2.3


From 044cf9fb8597c6507a249d17cea443305881c4f6 Mon Sep 17 00:00:00 2001
From: Josh Soref <2119212+jsoref@users.noreply.github.com>
Date: Sat, 7 Dec 2024 21:52:54 -1000
Subject: chore: fix spelling

* a
* acceleration
* addition
* altogether
* api clients
* artist
* associated
* bandwidth
* cannot
* capabilities
* case-insensitive
* case-sensitive
* configuration
* delimiter
* dependent
* diacritics
* directors
* enable
* explicitly
* filters
* finish
* have
* hierarchy
* implicit
* include
* information
* into
* its
* keepalive
* localization
* macos
* manual
* matching
* metadata
* nonexistent
* options
* overridden
* parsed
* parser
* playback
* preferring
* processes
* processing
* provider
* ratings
* retrieval
* running
* segments
* separate
* should
* station
* subdirectories
* superseded
* supported
* system
* than
* the
* throws
* transpose
* valid
* was

link: forum or chat rooms

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>
---
 .devcontainer/install-ffmpeg.sh                    |  2 +-
 .github/ISSUE_TEMPLATE/issue report.yml            |  2 +-
 .../IO/ManagedFileSystem.cs                        |  4 +-
 .../Library/MediaSourceManager.cs                  |  8 +--
 .../Localization/LocalizationManager.cs            |  4 +-
 .../Plugins/PluginManager.cs                       | 14 ++--
 .../ScheduledTasks/ScheduledTaskWorker.cs          |  4 +-
 .../ScheduledTasks/Tasks/PluginUpdateTask.cs       |  2 +-
 .../Session/SessionManager.cs                      |  4 +-
 .../Updates/InstallationManager.cs                 |  2 +-
 Jellyfin.Api/Controllers/DynamicHlsController.cs   |  2 +-
 Jellyfin.Api/Controllers/UserLibraryController.cs  |  6 +-
 .../Models/MediaInfoDtos/OpenLiveStreamDto.cs      |  2 +-
 .../Models/MediaInfoDtos/PlaybackInfoDto.cs        |  2 +-
 Jellyfin.Data/Entities/Libraries/CollectionItem.cs |  4 +-
 Jellyfin.Data/Entities/Libraries/Series.cs         |  2 +-
 Jellyfin.Data/Entities/TrickplayInfo.cs            |  2 +-
 .../Item/BaseItemRepository.cs                     |  2 +-
 .../JellyfinDbContext.cs                           |  2 +-
 .../MediaSegments/MediaSegmentManager.cs           |  2 +-
 .../Trickplay/TrickplayManager.cs                  |  2 +-
 .../Routines/CreateUserLoggingConfigFile.cs        |  2 +-
 .../Configuration/IConfigurationManager.cs         |  2 +-
 MediaBrowser.Controller/Devices/IDeviceManager.cs  |  4 +-
 MediaBrowser.Controller/Entities/BaseItem.cs       |  2 +-
 .../Library/IMediaSourceManager.cs                 |  2 +-
 .../MediaEncoding/EncodingHelper.cs                | 60 ++++++++--------
 .../MediaSegements/IMediaSegmentManager.cs         | 80 ----------------------
 .../MediaSegements/IMediaSegmentProvider.cs        | 36 ----------
 .../MediaSegments/IMediaSegmentManager.cs          | 80 ++++++++++++++++++++++
 .../MediaSegments/IMediaSegmentProvider.cs         | 36 ++++++++++
 .../Net/IWebSocketConnection.cs                    |  4 +-
 .../Sorting/IUserBaseItemComparer.cs               |  2 +-
 MediaBrowser.Controller/Streaming/StreamState.cs   |  2 +-
 .../Images/LocalImageProvider.cs                   |  2 +-
 .../Parsers/BoxSetXmlParser.cs                     |  2 +-
 .../BdInfo/BdInfoDirectoryInfo.cs                  |  4 +-
 MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs |  6 +-
 .../Probing/FFProbeHelpers.cs                      |  4 +-
 .../Configuration/ServerConfiguration.cs           |  6 +-
 MediaBrowser.Model/Dlna/ConditionProcessor.cs      |  4 +-
 MediaBrowser.Model/Dlna/DirectPlayProfile.cs       |  2 +-
 .../Entities/HardwareAccelerationType.cs           |  2 +-
 MediaBrowser.Model/Entities/MetadataProvider.cs    |  2 +-
 .../Entities/ProviderIdsExtensions.cs              |  6 +-
 .../Globalization/ILocalizationManager.cs          |  2 +-
 MediaBrowser.Model/IO/IFileSystem.cs               |  4 +-
 MediaBrowser.Model/Plugins/PluginStatus.cs         |  7 +-
 MediaBrowser.Model/Session/TranscodingInfo.cs      |  2 +-
 MediaBrowser.Model/System/PublicSystemInfo.cs      |  2 +-
 MediaBrowser.XbmcMetadata/Parsers/BaseNfoParser.cs |  4 +-
 MediaBrowser.XbmcMetadata/Savers/ArtistNfoSaver.cs |  2 +-
 src/Jellyfin.LiveTv/Listings/SchedulesDirect.cs    |  2 +-
 .../Listings/SchedulesDirectDtos/MapDto.cs         |  2 +-
 .../SchedulesDirectDtos/ProgramDetailsDto.cs       |  2 +-
 src/Jellyfin.Networking/Manager/NetworkManager.cs  |  2 +-
 .../Converters/JsonCommaDelimitedArrayTests.cs     |  2 +-
 .../StringExtensionsTests.cs                       |  8 +--
 .../SchedulesDirectDeserializeTests.cs             |  2 +-
 .../TV/TvParserHelpersTest.cs                      |  8 +--
 .../Jellyfin.Networking.Tests/NetworkParseTests.cs |  2 +-
 .../Omdb/JsonOmdbConverterTests.cs                 |  4 +-
 .../Test Data/Updates/manifest.json                |  2 +-
 .../Controllers/DashboardControllerTests.cs        |  6 +-
 .../Controllers/ItemsControllerTests.cs            |  2 +-
 .../Controllers/LibraryControllerTests.cs          |  6 +-
 .../Controllers/PlaystateControllerTests.cs        |  8 +--
 .../Controllers/UserControllerTests.cs             | 16 ++---
 .../Controllers/UserLibraryControllerTests.cs      |  6 +-
 .../Controllers/VideosControllerTests.cs           |  2 +-
 .../Parsers/EpisodeNfoProviderTests.cs             |  2 +-
 71 files changed, 269 insertions(+), 264 deletions(-)
 delete mode 100644 MediaBrowser.Controller/MediaSegements/IMediaSegmentManager.cs
 delete mode 100644 MediaBrowser.Controller/MediaSegements/IMediaSegmentProvider.cs
 create mode 100644 MediaBrowser.Controller/MediaSegments/IMediaSegmentManager.cs
 create mode 100644 MediaBrowser.Controller/MediaSegments/IMediaSegmentProvider.cs

(limited to 'MediaBrowser.Controller')

diff --git a/.devcontainer/install-ffmpeg.sh b/.devcontainer/install-ffmpeg.sh
index 842a53255..1e58e6ef4 100644
--- a/.devcontainer/install-ffmpeg.sh
+++ b/.devcontainer/install-ffmpeg.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-## configure the following for a manuall install of a specific version from the repo
+## configure the following for a manual install of a specific version from the repo
 
 # wget https://repo.jellyfin.org/releases/server/ubuntu/versions/jellyfin-ffmpeg/6.0.1-1/jellyfin-ffmpeg6_6.0.1-1-jammy_amd64.deb -O ffmpeg.deb
 
diff --git a/.github/ISSUE_TEMPLATE/issue report.yml b/.github/ISSUE_TEMPLATE/issue report.yml
index 9181a1e7d..4f58c5bc5 100644
--- a/.github/ISSUE_TEMPLATE/issue report.yml	
+++ b/.github/ISSUE_TEMPLATE/issue report.yml	
@@ -14,7 +14,7 @@ body:
       label: "This issue respects the following points:"
       description: All conditions are **required**. Failure to comply with any of these conditions may cause your issue to be closed without comment.
       options:
-        - label: This is a **bug**, not a question or a configuration issue; Please visit our forum or chat rooms first to troubleshoot with volunteers, before creating a report. The links can be found [here](https://jellyfin.org/contact/).
+        - label: This is a **bug**, not a question or a configuration issue; Please visit our [forum or chat rooms](https://jellyfin.org/contact/) first to troubleshoot with volunteers, before creating a report.
           required: true
         - label: This issue is **not** already reported on [GitHub](https://github.com/jellyfin/jellyfin/issues?q=is%3Aopen+is%3Aissue) _(I've searched it)_.
           required: true
diff --git a/Emby.Server.Implementations/IO/ManagedFileSystem.cs b/Emby.Server.Implementations/IO/ManagedFileSystem.cs
index 4b68f21d5..46c128ded 100644
--- a/Emby.Server.Implementations/IO/ManagedFileSystem.cs
+++ b/Emby.Server.Implementations/IO/ManagedFileSystem.cs
@@ -561,7 +561,7 @@ namespace Emby.Server.Implementations.IO
         {
             var enumerationOptions = GetEnumerationOptions(recursive);
 
-            // On linux and osx the search pattern is case sensitive
+            // On linux and macOS the search pattern is case-sensitive
             // If we're OK with case-sensitivity, and we're only filtering for one extension, then use the native method
             if ((enableCaseSensitiveExtensions || _isEnvironmentCaseInsensitive) && extensions is not null && extensions.Count == 1)
             {
@@ -618,7 +618,7 @@ namespace Emby.Server.Implementations.IO
         {
             var enumerationOptions = GetEnumerationOptions(recursive);
 
-            // On linux and osx the search pattern is case sensitive
+            // On linux and macOS the search pattern is case-sensitive
             // If we're OK with case-sensitivity, and we're only filtering for one extension, then use the native method
             if ((enableCaseSensitiveExtensions || _isEnvironmentCaseInsensitive) && extensions is not null && extensions.Length == 1)
             {
diff --git a/Emby.Server.Implementations/Library/MediaSourceManager.cs b/Emby.Server.Implementations/Library/MediaSourceManager.cs
index d0f5e60f7..5795c47cc 100644
--- a/Emby.Server.Implementations/Library/MediaSourceManager.cs
+++ b/Emby.Server.Implementations/Library/MediaSourceManager.cs
@@ -39,7 +39,7 @@ namespace Emby.Server.Implementations.Library
     public class MediaSourceManager : IMediaSourceManager, IDisposable
     {
         // Do not use a pipe here because Roku http requests to the server will fail, without any explicit error message.
-        private const char LiveStreamIdDelimeter = '_';
+        private const char LiveStreamIdDelimiter = '_';
 
         private readonly IServerApplicationHost _appHost;
         private readonly IItemRepository _itemRepo;
@@ -313,7 +313,7 @@ namespace Emby.Server.Implementations.Library
 
         private static void SetKeyProperties(IMediaSourceProvider provider, MediaSourceInfo mediaSource)
         {
-            var prefix = provider.GetType().FullName.GetMD5().ToString("N", CultureInfo.InvariantCulture) + LiveStreamIdDelimeter;
+            var prefix = provider.GetType().FullName.GetMD5().ToString("N", CultureInfo.InvariantCulture) + LiveStreamIdDelimiter;
 
             if (!string.IsNullOrEmpty(mediaSource.OpenToken) && !mediaSource.OpenToken.StartsWith(prefix, StringComparison.OrdinalIgnoreCase))
             {
@@ -866,11 +866,11 @@ namespace Emby.Server.Implementations.Library
         {
             ArgumentException.ThrowIfNullOrEmpty(key);
 
-            var keys = key.Split(LiveStreamIdDelimeter, 2);
+            var keys = key.Split(LiveStreamIdDelimiter, 2);
 
             var provider = _providers.FirstOrDefault(i => string.Equals(i.GetType().FullName.GetMD5().ToString("N", CultureInfo.InvariantCulture), keys[0], StringComparison.OrdinalIgnoreCase));
 
-            var splitIndex = key.IndexOf(LiveStreamIdDelimeter, StringComparison.Ordinal);
+            var splitIndex = key.IndexOf(LiveStreamIdDelimiter, StringComparison.Ordinal);
             var keyId = key.Substring(splitIndex + 1);
 
             return (provider, keyId);
diff --git a/Emby.Server.Implementations/Localization/LocalizationManager.cs b/Emby.Server.Implementations/Localization/LocalizationManager.cs
index ac453a5b0..c939a5e09 100644
--- a/Emby.Server.Implementations/Localization/LocalizationManager.cs
+++ b/Emby.Server.Implementations/Localization/LocalizationManager.cs
@@ -231,13 +231,13 @@ namespace Emby.Server.Implementations.Localization
                 ratings.Add(new ParentalRating("21", 21));
             }
 
-            // A lot of countries don't excplicitly have a seperate rating for adult content
+            // A lot of countries don't explicitly have a separate rating for adult content
             if (ratings.All(x => x.Value != 1000))
             {
                 ratings.Add(new ParentalRating("XXX", 1000));
             }
 
-            // A lot of countries don't excplicitly have a seperate rating for banned content
+            // A lot of countries don't explicitly have a separate rating for banned content
             if (ratings.All(x => x.Value != 1001))
             {
                 ratings.Add(new ParentalRating("Banned", 1001));
diff --git a/Emby.Server.Implementations/Plugins/PluginManager.cs b/Emby.Server.Implementations/Plugins/PluginManager.cs
index 4c32d5717..8eeca3667 100644
--- a/Emby.Server.Implementations/Plugins/PluginManager.cs
+++ b/Emby.Server.Implementations/Plugins/PluginManager.cs
@@ -119,7 +119,7 @@ namespace Emby.Server.Implementations.Plugins
             // Now load the assemblies..
             foreach (var plugin in _plugins)
             {
-                UpdatePluginSuperceedStatus(plugin);
+                UpdatePluginSupersededStatus(plugin);
 
                 if (plugin.IsEnabledAndSupported == false)
                 {
@@ -214,7 +214,7 @@ namespace Emby.Server.Implementations.Plugins
                     continue;
                 }
 
-                UpdatePluginSuperceedStatus(plugin);
+                UpdatePluginSupersededStatus(plugin);
                 if (!plugin.IsEnabledAndSupported)
                 {
                     continue;
@@ -624,9 +624,9 @@ namespace Emby.Server.Implementations.Plugins
             }
         }
 
-        private void UpdatePluginSuperceedStatus(LocalPlugin plugin)
+        private void UpdatePluginSupersededStatus(LocalPlugin plugin)
         {
-            if (plugin.Manifest.Status != PluginStatus.Superceded)
+            if (plugin.Manifest.Status != PluginStatus.Superseded)
             {
                 return;
             }
@@ -876,7 +876,7 @@ namespace Emby.Server.Implementations.Plugins
         }
 
         /// <summary>
-        /// Changes the status of the other versions of the plugin to "Superceded".
+        /// Changes the status of the other versions of the plugin to "Superseded".
         /// </summary>
         /// <param name="plugin">The <see cref="LocalPlugin"/> that's master.</param>
         private void ProcessAlternative(LocalPlugin plugin)
@@ -896,11 +896,11 @@ namespace Emby.Server.Implementations.Plugins
                 return;
             }
 
-            if (plugin.Manifest.Status == PluginStatus.Active && !ChangePluginState(previousVersion, PluginStatus.Superceded))
+            if (plugin.Manifest.Status == PluginStatus.Active && !ChangePluginState(previousVersion, PluginStatus.Superseded))
             {
                 _logger.LogError("Unable to enable version {Version} of {Name}", previousVersion.Version, previousVersion.Name);
             }
-            else if (plugin.Manifest.Status == PluginStatus.Superceded && !ChangePluginState(previousVersion, PluginStatus.Active))
+            else if (plugin.Manifest.Status == PluginStatus.Superseded && !ChangePluginState(previousVersion, PluginStatus.Active))
             {
                 _logger.LogError("Unable to supercede version {Version} of {Name}", previousVersion.Version, previousVersion.Name);
             }
diff --git a/Emby.Server.Implementations/ScheduledTasks/ScheduledTaskWorker.cs b/Emby.Server.Implementations/ScheduledTasks/ScheduledTaskWorker.cs
index 0bc67bc47..985f0a8f8 100644
--- a/Emby.Server.Implementations/ScheduledTasks/ScheduledTaskWorker.cs
+++ b/Emby.Server.Implementations/ScheduledTasks/ScheduledTaskWorker.cs
@@ -543,7 +543,7 @@ namespace Emby.Server.Implementations.ScheduledTasks
             {
                 DisposeTriggers();
 
-                var wassRunning = State == TaskState.Running;
+                var wasRunning = State == TaskState.Running;
                 var startTime = CurrentExecutionStartTime;
 
                 var token = CurrentCancellationTokenSource;
@@ -596,7 +596,7 @@ namespace Emby.Server.Implementations.ScheduledTasks
                     }
                 }
 
-                if (wassRunning)
+                if (wasRunning)
                 {
                     OnTaskCompleted(startTime, DateTime.UtcNow, TaskCompletionStatus.Aborted, null);
                 }
diff --git a/Emby.Server.Implementations/ScheduledTasks/Tasks/PluginUpdateTask.cs b/Emby.Server.Implementations/ScheduledTasks/Tasks/PluginUpdateTask.cs
index c597103dd..b74f4d1b2 100644
--- a/Emby.Server.Implementations/ScheduledTasks/Tasks/PluginUpdateTask.cs
+++ b/Emby.Server.Implementations/ScheduledTasks/Tasks/PluginUpdateTask.cs
@@ -88,7 +88,7 @@ namespace Emby.Server.Implementations.ScheduledTasks.Tasks
                 }
                 catch (OperationCanceledException)
                 {
-                    // InstallPackage has it's own inner cancellation token, so only throw this if it's ours
+                    // InstallPackage has its own inner cancellation token, so only throw this if it's ours
                     if (cancellationToken.IsCancellationRequested)
                     {
                         throw;
diff --git a/Emby.Server.Implementations/Session/SessionManager.cs b/Emby.Server.Implementations/Session/SessionManager.cs
index fe2c3d24f..030da6f73 100644
--- a/Emby.Server.Implementations/Session/SessionManager.cs
+++ b/Emby.Server.Implementations/Session/SessionManager.cs
@@ -1303,7 +1303,7 @@ namespace Emby.Server.Implementations.Session
 
             if (item is null)
             {
-                _logger.LogError("A non-existent item Id {0} was passed into TranslateItemForPlayback", id);
+                _logger.LogError("A nonexistent item Id {0} was passed into TranslateItemForPlayback", id);
                 return Array.Empty<BaseItem>();
             }
 
@@ -1356,7 +1356,7 @@ namespace Emby.Server.Implementations.Session
 
             if (item is null)
             {
-                _logger.LogError("A non-existent item Id {0} was passed into TranslateItemForInstantMix", id);
+                _logger.LogError("A nonexistent item Id {0} was passed into TranslateItemForInstantMix", id);
                 return new List<BaseItem>();
             }
 
diff --git a/Emby.Server.Implementations/Updates/InstallationManager.cs b/Emby.Server.Implementations/Updates/InstallationManager.cs
index c4d697be5..678475b31 100644
--- a/Emby.Server.Implementations/Updates/InstallationManager.cs
+++ b/Emby.Server.Implementations/Updates/InstallationManager.cs
@@ -187,7 +187,7 @@ namespace Emby.Server.Implementations.Updates
                                 await _pluginManager.PopulateManifest(package, version.VersionNumber, plugin.Path, plugin.Manifest.Status).ConfigureAwait(false);
                             }
 
-                            // Remove versions with a target ABI greater then the current application version.
+                            // Remove versions with a target ABI greater than the current application version.
                             if (Version.TryParse(version.TargetAbi, out var targetAbi) && _applicationHost.ApplicationVersion < targetAbi)
                             {
                                 package.Versions.RemoveAt(i);
diff --git a/Jellyfin.Api/Controllers/DynamicHlsController.cs b/Jellyfin.Api/Controllers/DynamicHlsController.cs
index a641ec209..60b99c7ae 100644
--- a/Jellyfin.Api/Controllers/DynamicHlsController.cs
+++ b/Jellyfin.Api/Controllers/DynamicHlsController.cs
@@ -1778,7 +1778,7 @@ public class DynamicHlsController : BaseJellyfinApiController
         }
         else if (state.AudioStream?.CodecTag is not null && state.AudioStream.CodecTag.Equals("ac-4", StringComparison.Ordinal))
         {
-            // ac-4 audio tends to hava a super weird sample rate that will fail most encoders
+            // ac-4 audio tends to have a super weird sample rate that will fail most encoders
             // force resample it to 48KHz
             args += " -ar 48000";
         }
diff --git a/Jellyfin.Api/Controllers/UserLibraryController.cs b/Jellyfin.Api/Controllers/UserLibraryController.cs
index 272a59559..7cce13e42 100644
--- a/Jellyfin.Api/Controllers/UserLibraryController.cs
+++ b/Jellyfin.Api/Controllers/UserLibraryController.cs
@@ -634,10 +634,10 @@ public class UserLibraryController : BaseJellyfinApiController
     {
         if (item is Person)
         {
-            var hasMetdata = !string.IsNullOrWhiteSpace(item.Overview) && item.HasImage(ImageType.Primary);
-            var performFullRefresh = !hasMetdata && (DateTime.UtcNow - item.DateLastRefreshed).TotalDays >= 3;
+            var hasMetadata = !string.IsNullOrWhiteSpace(item.Overview) && item.HasImage(ImageType.Primary);
+            var performFullRefresh = !hasMetadata && (DateTime.UtcNow - item.DateLastRefreshed).TotalDays >= 3;
 
-            if (!hasMetdata)
+            if (!hasMetadata)
             {
                 var options = new MetadataRefreshOptions(new DirectoryService(_fileSystem))
                 {
diff --git a/Jellyfin.Api/Models/MediaInfoDtos/OpenLiveStreamDto.cs b/Jellyfin.Api/Models/MediaInfoDtos/OpenLiveStreamDto.cs
index 978e99b35..758c89938 100644
--- a/Jellyfin.Api/Models/MediaInfoDtos/OpenLiveStreamDto.cs
+++ b/Jellyfin.Api/Models/MediaInfoDtos/OpenLiveStreamDto.cs
@@ -61,7 +61,7 @@ public class OpenLiveStreamDto
     public bool? EnableDirectPlay { get; set; }
 
     /// <summary>
-    /// Gets or sets a value indicating whether to enale direct stream.
+    /// Gets or sets a value indicating whether to enable direct stream.
     /// </summary>
     public bool? EnableDirectStream { get; set; }
 
diff --git a/Jellyfin.Api/Models/MediaInfoDtos/PlaybackInfoDto.cs b/Jellyfin.Api/Models/MediaInfoDtos/PlaybackInfoDto.cs
index 82f603ca1..73ab76817 100644
--- a/Jellyfin.Api/Models/MediaInfoDtos/PlaybackInfoDto.cs
+++ b/Jellyfin.Api/Models/MediaInfoDtos/PlaybackInfoDto.cs
@@ -4,7 +4,7 @@ using MediaBrowser.Model.Dlna;
 namespace Jellyfin.Api.Models.MediaInfoDtos;
 
 /// <summary>
-/// Plabyback info dto.
+/// Playback info dto.
 /// </summary>
 public class PlaybackInfoDto
 {
diff --git a/Jellyfin.Data/Entities/Libraries/CollectionItem.cs b/Jellyfin.Data/Entities/Libraries/CollectionItem.cs
index 0cb4716db..15b356a74 100644
--- a/Jellyfin.Data/Entities/Libraries/CollectionItem.cs
+++ b/Jellyfin.Data/Entities/Libraries/CollectionItem.cs
@@ -43,7 +43,7 @@ namespace Jellyfin.Data.Entities.Libraries
         /// Gets or sets the next item in the collection.
         /// </summary>
         /// <remarks>
-        /// TODO check if this properly updated Dependant and has the proper principal relationship.
+        /// TODO check if this properly updated Dependent and has the proper principal relationship.
         /// </remarks>
         public virtual CollectionItem? Next { get; set; }
 
@@ -51,7 +51,7 @@ namespace Jellyfin.Data.Entities.Libraries
         /// Gets or sets the previous item in the collection.
         /// </summary>
         /// <remarks>
-        /// TODO check if this properly updated Dependant and has the proper principal relationship.
+        /// TODO check if this properly updated Dependent and has the proper principal relationship.
         /// </remarks>
         public virtual CollectionItem? Previous { get; set; }
 
diff --git a/Jellyfin.Data/Entities/Libraries/Series.cs b/Jellyfin.Data/Entities/Libraries/Series.cs
index 0354433e0..ab484c96d 100644
--- a/Jellyfin.Data/Entities/Libraries/Series.cs
+++ b/Jellyfin.Data/Entities/Libraries/Series.cs
@@ -4,7 +4,7 @@ using System.Collections.Generic;
 namespace Jellyfin.Data.Entities.Libraries
 {
     /// <summary>
-    /// An entity representing a a series.
+    /// An entity representing a series.
     /// </summary>
     public class Series : LibraryItem
     {
diff --git a/Jellyfin.Data/Entities/TrickplayInfo.cs b/Jellyfin.Data/Entities/TrickplayInfo.cs
index 64e7da1b5..ff9a68bef 100644
--- a/Jellyfin.Data/Entities/TrickplayInfo.cs
+++ b/Jellyfin.Data/Entities/TrickplayInfo.cs
@@ -66,7 +66,7 @@ public class TrickplayInfo
     public int Interval { get; set; }
 
     /// <summary>
-    /// Gets or sets peak bandwith usage in bits per second.
+    /// Gets or sets peak bandwidth usage in bits per second.
     /// </summary>
     /// <remarks>
     /// Required.
diff --git a/Jellyfin.Server.Implementations/Item/BaseItemRepository.cs b/Jellyfin.Server.Implementations/Item/BaseItemRepository.cs
index 8516301a8..952269b7e 100644
--- a/Jellyfin.Server.Implementations/Item/BaseItemRepository.cs
+++ b/Jellyfin.Server.Implementations/Item/BaseItemRepository.cs
@@ -2065,7 +2065,7 @@ public sealed class BaseItemRepository
         if (filter.IncludeInheritedTags.Length > 0)
         {
             // Episodes do not store inherit tags from their parents in the database, and the tag may be still required by the client.
-            // In addtion to the tags for the episodes themselves, we need to manually query its parent (the season)'s tags as well.
+            // In addition to the tags for the episodes themselves, we need to manually query its parent (the season)'s tags as well.
             if (includeTypes.Length == 1 && includeTypes.FirstOrDefault() is BaseItemKind.Episode)
             {
                 baseQuery = baseQuery
diff --git a/Jellyfin.Server.Implementations/JellyfinDbContext.cs b/Jellyfin.Server.Implementations/JellyfinDbContext.cs
index becfd81a4..34d9e3960 100644
--- a/Jellyfin.Server.Implementations/JellyfinDbContext.cs
+++ b/Jellyfin.Server.Implementations/JellyfinDbContext.cs
@@ -268,7 +268,7 @@ public class JellyfinDbContext(DbContextOptions<JellyfinDbContext> options, ILog
         modelBuilder.SetDefaultDateTimeKind(DateTimeKind.Utc);
         base.OnModelCreating(modelBuilder);
 
-        // Configuration for each entity is in it's own class inside 'ModelConfiguration'.
+        // Configuration for each entity is in its own class inside 'ModelConfiguration'.
         modelBuilder.ApplyConfigurationsFromAssembly(typeof(JellyfinDbContext).Assembly);
     }
 }
diff --git a/Jellyfin.Server.Implementations/MediaSegments/MediaSegmentManager.cs b/Jellyfin.Server.Implementations/MediaSegments/MediaSegmentManager.cs
index 2d3a25357..59ec418ce 100644
--- a/Jellyfin.Server.Implementations/MediaSegments/MediaSegmentManager.cs
+++ b/Jellyfin.Server.Implementations/MediaSegments/MediaSegmentManager.cs
@@ -22,7 +22,7 @@ using Microsoft.Extensions.Logging;
 namespace Jellyfin.Server.Implementations.MediaSegments;
 
 /// <summary>
-/// Manages media segments retrival and storage.
+/// Manages media segments retrieval and storage.
 /// </summary>
 public class MediaSegmentManager : IMediaSegmentManager
 {
diff --git a/Jellyfin.Server.Implementations/Trickplay/TrickplayManager.cs b/Jellyfin.Server.Implementations/Trickplay/TrickplayManager.cs
index cd73d67c3..dfc63b63f 100644
--- a/Jellyfin.Server.Implementations/Trickplay/TrickplayManager.cs
+++ b/Jellyfin.Server.Implementations/Trickplay/TrickplayManager.cs
@@ -46,7 +46,7 @@ public class TrickplayManager : ITrickplayManager
     /// </summary>
     /// <param name="logger">The logger.</param>
     /// <param name="mediaEncoder">The media encoder.</param>
-    /// <param name="fileSystem">The file systen.</param>
+    /// <param name="fileSystem">The file system.</param>
     /// <param name="encodingHelper">The encoding helper.</param>
     /// <param name="libraryManager">The library manager.</param>
     /// <param name="config">The server configuration manager.</param>
diff --git a/Jellyfin.Server/Migrations/Routines/CreateUserLoggingConfigFile.cs b/Jellyfin.Server/Migrations/Routines/CreateUserLoggingConfigFile.cs
index ee4f8b0ba..5a8ef2e1c 100644
--- a/Jellyfin.Server/Migrations/Routines/CreateUserLoggingConfigFile.cs
+++ b/Jellyfin.Server/Migrations/Routines/CreateUserLoggingConfigFile.cs
@@ -46,7 +46,7 @@ namespace Jellyfin.Server.Migrations.Routines
         public Guid Id => Guid.Parse("{EF103419-8451-40D8-9F34-D1A8E93A1679}");
 
         /// <inheritdoc/>
-        public string Name => "CreateLoggingConfigHeirarchy";
+        public string Name => "CreateLoggingConfigHierarchy";
 
         /// <inheritdoc/>
         public bool PerformOnNewInstall => false;
diff --git a/MediaBrowser.Common/Configuration/IConfigurationManager.cs b/MediaBrowser.Common/Configuration/IConfigurationManager.cs
index e6696a571..18a8d3e7b 100644
--- a/MediaBrowser.Common/Configuration/IConfigurationManager.cs
+++ b/MediaBrowser.Common/Configuration/IConfigurationManager.cs
@@ -61,7 +61,7 @@ namespace MediaBrowser.Common.Configuration
         object GetConfiguration(string key);
 
         /// <summary>
-        /// Gets the array of coniguration stores.
+        /// Gets the array of configuration stores.
         /// </summary>
         /// <returns>Array of ConfigurationStore.</returns>
         ConfigurationStore[] GetConfigurationStores();
diff --git a/MediaBrowser.Controller/Devices/IDeviceManager.cs b/MediaBrowser.Controller/Devices/IDeviceManager.cs
index cade53d99..fe7dc1cf9 100644
--- a/MediaBrowser.Controller/Devices/IDeviceManager.cs
+++ b/MediaBrowser.Controller/Devices/IDeviceManager.cs
@@ -58,7 +58,7 @@ public interface IDeviceManager
     QueryResult<Device> GetDevices(DeviceQuery query);
 
     /// <summary>
-    /// Gets device infromation based on the provided query.
+    /// Gets device information based on the provided query.
     /// </summary>
     /// <param name="query">The device query.</param>
     /// <returns>A <see cref="Task{QueryResult}"/> representing the retrieval of the device information.</returns>
@@ -109,7 +109,7 @@ public interface IDeviceManager
     DeviceOptionsDto? GetDeviceOptions(string deviceId);
 
     /// <summary>
-    /// Gets the dto for client capabilites.
+    /// Gets the dto for client capabilities.
     /// </summary>
     /// <param name="capabilities">The client capabilities.</param>
     /// <returns><see cref="ClientCapabilitiesDto"/> of the device.</returns>
diff --git a/MediaBrowser.Controller/Entities/BaseItem.cs b/MediaBrowser.Controller/Entities/BaseItem.cs
index a6bc35a9f..9276989b4 100644
--- a/MediaBrowser.Controller/Entities/BaseItem.cs
+++ b/MediaBrowser.Controller/Entities/BaseItem.cs
@@ -1799,7 +1799,7 @@ namespace MediaBrowser.Controller.Entities
         /// Adds a genre to the item.
         /// </summary>
         /// <param name="name">The name.</param>
-        /// <exception cref="ArgumentNullException">Throwns if name is null.</exception>
+        /// <exception cref="ArgumentNullException">Throws if name is null.</exception>
         public void AddGenre(string name)
         {
             ArgumentException.ThrowIfNullOrEmpty(name);
diff --git a/MediaBrowser.Controller/Library/IMediaSourceManager.cs b/MediaBrowser.Controller/Library/IMediaSourceManager.cs
index 729b385cf..eb697268c 100644
--- a/MediaBrowser.Controller/Library/IMediaSourceManager.cs
+++ b/MediaBrowser.Controller/Library/IMediaSourceManager.cs
@@ -53,7 +53,7 @@ namespace MediaBrowser.Controller.Library
         IReadOnlyList<MediaAttachment> GetMediaAttachments(MediaAttachmentQuery query);
 
         /// <summary>
-        /// Gets the playack media sources.
+        /// Gets the playback media sources.
         /// </summary>
         /// <param name="item">Item to use.</param>
         /// <param name="user">User to use for operation.</param>
diff --git a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
index 9399679a4..ff2d2345d 100644
--- a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
+++ b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
@@ -60,7 +60,7 @@ namespace MediaBrowser.Controller.MediaEncoding
         private readonly Version _minFixedKernel60i915Hang = new Version(6, 0, 18);
         private readonly Version _minKernelVersionAmdVkFmtModifier = new Version(5, 15);
 
-        private readonly Version _minFFmpegImplictHwaccel = new Version(6, 0);
+        private readonly Version _minFFmpegImplicitHwaccel = new Version(6, 0);
         private readonly Version _minFFmpegHwaUnsafeOutput = new Version(6, 0);
         private readonly Version _minFFmpegOclCuTonemapMode = new Version(5, 1, 3);
         private readonly Version _minFFmpegSvtAv1Params = new Version(5, 1);
@@ -631,7 +631,7 @@ namespace MediaBrowser.Controller.MediaEncoding
         {
             if (string.IsNullOrWhiteSpace(container))
             {
-                // this may not work, but if the client is that broken we can not do anything better
+                // this may not work, but if the client is that broken we cannot do anything better
                 return "aac";
             }
 
@@ -3649,8 +3649,8 @@ namespace MediaBrowser.Controller.MediaEncoding
             var subH = state.SubtitleStream?.Height;
 
             var rotation = state.VideoStream?.Rotation ?? 0;
-            var tranposeDir = rotation == 0 ? string.Empty : GetVideoTransposeDirection(state);
-            var doCuTranspose = !string.IsNullOrEmpty(tranposeDir) && _mediaEncoder.SupportsFilter("transpose_cuda");
+            var transposeDir = rotation == 0 ? string.Empty : GetVideoTransposeDirection(state);
+            var doCuTranspose = !string.IsNullOrEmpty(transposeDir) && _mediaEncoder.SupportsFilter("transpose_cuda");
             var swapWAndH = Math.Abs(rotation) == 90 && (isSwDecoder || (isNvDecoder && doCuTranspose));
             var swpInW = swapWAndH ? inH : inW;
             var swpInH = swapWAndH ? inW : inH;
@@ -3696,7 +3696,7 @@ namespace MediaBrowser.Controller.MediaEncoding
                 // hw transpose
                 if (doCuTranspose)
                 {
-                    mainFilters.Add($"transpose_cuda=dir={tranposeDir}");
+                    mainFilters.Add($"transpose_cuda=dir={transposeDir}");
                 }
 
                 var isRext = IsVideoStreamHevcRext(state);
@@ -3856,8 +3856,8 @@ namespace MediaBrowser.Controller.MediaEncoding
             var subH = state.SubtitleStream?.Height;
 
             var rotation = state.VideoStream?.Rotation ?? 0;
-            var tranposeDir = rotation == 0 ? string.Empty : GetVideoTransposeDirection(state);
-            var doOclTranspose = !string.IsNullOrEmpty(tranposeDir)
+            var transposeDir = rotation == 0 ? string.Empty : GetVideoTransposeDirection(state);
+            var doOclTranspose = !string.IsNullOrEmpty(transposeDir)
                 && _mediaEncoder.SupportsFilterWithOption(FilterOptionType.TransposeOpenclReversal);
             var swapWAndH = Math.Abs(rotation) == 90 && (isSwDecoder || (isD3d11vaDecoder && doOclTranspose));
             var swpInW = swapWAndH ? inH : inW;
@@ -3901,12 +3901,12 @@ namespace MediaBrowser.Controller.MediaEncoding
                 // map from d3d11va to opencl via d3d11-opencl interop.
                 mainFilters.Add("hwmap=derive_device=opencl:mode=read");
 
-                // hw deint <= TODO: finsh the 'yadif_opencl' filter
+                // hw deint <= TODO: finish the 'yadif_opencl' filter
 
                 // hw transpose
                 if (doOclTranspose)
                 {
-                    mainFilters.Add($"transpose_opencl=dir={tranposeDir}");
+                    mainFilters.Add($"transpose_opencl=dir={transposeDir}");
                 }
 
                 var outFormat = doOclTonemap ? string.Empty : "nv12";
@@ -4097,8 +4097,8 @@ namespace MediaBrowser.Controller.MediaEncoding
             var subH = state.SubtitleStream?.Height;
 
             var rotation = state.VideoStream?.Rotation ?? 0;
-            var tranposeDir = rotation == 0 ? string.Empty : GetVideoTransposeDirection(state);
-            var doVppTranspose = !string.IsNullOrEmpty(tranposeDir);
+            var transposeDir = rotation == 0 ? string.Empty : GetVideoTransposeDirection(state);
+            var doVppTranspose = !string.IsNullOrEmpty(transposeDir);
             var swapWAndH = Math.Abs(rotation) == 90 && (isSwDecoder || ((isD3d11vaDecoder || isQsvDecoder) && doVppTranspose));
             var swpInW = swapWAndH ? inH : inW;
             var swpInH = swapWAndH ? inW : inH;
@@ -4191,7 +4191,7 @@ namespace MediaBrowser.Controller.MediaEncoding
 
                 if (!string.IsNullOrEmpty(hwScaleFilter) && doVppTranspose)
                 {
-                    hwScaleFilter += $":transpose={tranposeDir}";
+                    hwScaleFilter += $":transpose={transposeDir}";
                 }
 
                 if (!string.IsNullOrEmpty(hwScaleFilter) && isMjpegEncoder)
@@ -4384,8 +4384,8 @@ namespace MediaBrowser.Controller.MediaEncoding
             var subH = state.SubtitleStream?.Height;
 
             var rotation = state.VideoStream?.Rotation ?? 0;
-            var tranposeDir = rotation == 0 ? string.Empty : GetVideoTransposeDirection(state);
-            var doVppTranspose = !string.IsNullOrEmpty(tranposeDir);
+            var transposeDir = rotation == 0 ? string.Empty : GetVideoTransposeDirection(state);
+            var doVppTranspose = !string.IsNullOrEmpty(transposeDir);
             var swapWAndH = Math.Abs(rotation) == 90 && (isSwDecoder || ((isVaapiDecoder || isQsvDecoder) && doVppTranspose));
             var swpInW = swapWAndH ? inH : inW;
             var swpInH = swapWAndH ? inW : inH;
@@ -4445,7 +4445,7 @@ namespace MediaBrowser.Controller.MediaEncoding
                 // hw transpose(vaapi vpp)
                 if (isVaapiDecoder && doVppTranspose)
                 {
-                    mainFilters.Add($"transpose_vaapi=dir={tranposeDir}");
+                    mainFilters.Add($"transpose_vaapi=dir={transposeDir}");
                 }
 
                 var outFormat = doTonemap ? (((isQsvDecoder && doVppTranspose) || isRext) ? "p010" : string.Empty) : "nv12";
@@ -4455,7 +4455,7 @@ namespace MediaBrowser.Controller.MediaEncoding
 
                 if (!string.IsNullOrEmpty(hwScaleFilter) && isQsvDecoder && doVppTranspose)
                 {
-                    hwScaleFilter += $":transpose={tranposeDir}";
+                    hwScaleFilter += $":transpose={transposeDir}";
                 }
 
                 if (!string.IsNullOrEmpty(hwScaleFilter) && isMjpegEncoder)
@@ -4715,8 +4715,8 @@ namespace MediaBrowser.Controller.MediaEncoding
             var subH = state.SubtitleStream?.Height;
 
             var rotation = state.VideoStream?.Rotation ?? 0;
-            var tranposeDir = rotation == 0 ? string.Empty : GetVideoTransposeDirection(state);
-            var doVaVppTranspose = !string.IsNullOrEmpty(tranposeDir);
+            var transposeDir = rotation == 0 ? string.Empty : GetVideoTransposeDirection(state);
+            var doVaVppTranspose = !string.IsNullOrEmpty(transposeDir);
             var swapWAndH = Math.Abs(rotation) == 90 && (isSwDecoder || (isVaapiDecoder && doVaVppTranspose));
             var swpInW = swapWAndH ? inH : inW;
             var swpInH = swapWAndH ? inW : inH;
@@ -4771,7 +4771,7 @@ namespace MediaBrowser.Controller.MediaEncoding
                 // hw transpose
                 if (doVaVppTranspose)
                 {
-                    mainFilters.Add($"transpose_vaapi=dir={tranposeDir}");
+                    mainFilters.Add($"transpose_vaapi=dir={transposeDir}");
                 }
 
                 var outFormat = doTonemap ? (isRext ? "p010" : string.Empty) : "nv12";
@@ -4948,8 +4948,8 @@ namespace MediaBrowser.Controller.MediaEncoding
                     || string.Equals(state.SubtitleStream.Codec, "ssa", StringComparison.OrdinalIgnoreCase));
 
             var rotation = state.VideoStream?.Rotation ?? 0;
-            var tranposeDir = rotation == 0 ? string.Empty : GetVideoTransposeDirection(state);
-            var doVkTranspose = isVaapiDecoder && !string.IsNullOrEmpty(tranposeDir);
+            var transposeDir = rotation == 0 ? string.Empty : GetVideoTransposeDirection(state);
+            var doVkTranspose = isVaapiDecoder && !string.IsNullOrEmpty(transposeDir);
             var swapWAndH = Math.Abs(rotation) == 90 && (isSwDecoder || (isVaapiDecoder && doVkTranspose));
             var swpInW = swapWAndH ? inH : inW;
             var swpInH = swapWAndH ? inW : inH;
@@ -5042,13 +5042,13 @@ namespace MediaBrowser.Controller.MediaEncoding
             // vk transpose
             if (doVkTranspose)
             {
-                if (string.Equals(tranposeDir, "reversal", StringComparison.OrdinalIgnoreCase))
+                if (string.Equals(transposeDir, "reversal", StringComparison.OrdinalIgnoreCase))
                 {
                     mainFilters.Add("flip_vulkan");
                 }
                 else
                 {
-                    mainFilters.Add($"transpose_vulkan=dir={tranposeDir}");
+                    mainFilters.Add($"transpose_vulkan=dir={transposeDir}");
                 }
             }
 
@@ -5416,8 +5416,8 @@ namespace MediaBrowser.Controller.MediaEncoding
             var usingHwSurface = isVtDecoder && (_mediaEncoder.EncoderVersion >= _minFFmpegWorkingVtHwSurface);
 
             var rotation = state.VideoStream?.Rotation ?? 0;
-            var tranposeDir = rotation == 0 ? string.Empty : GetVideoTransposeDirection(state);
-            var doVtTranspose = !string.IsNullOrEmpty(tranposeDir) && _mediaEncoder.SupportsFilter("transpose_vt");
+            var transposeDir = rotation == 0 ? string.Empty : GetVideoTransposeDirection(state);
+            var doVtTranspose = !string.IsNullOrEmpty(transposeDir) && _mediaEncoder.SupportsFilter("transpose_vt");
             var swapWAndH = Math.Abs(rotation) == 90 && doVtTranspose;
             var swpInW = swapWAndH ? inH : inW;
             var swpInH = swapWAndH ? inW : inH;
@@ -5461,7 +5461,7 @@ namespace MediaBrowser.Controller.MediaEncoding
             // hw transpose
             if (doVtTranspose)
             {
-                mainFilters.Add($"transpose_vt=dir={tranposeDir}");
+                mainFilters.Add($"transpose_vt=dir={transposeDir}");
             }
 
             if (doVtTonemap)
@@ -5624,8 +5624,8 @@ namespace MediaBrowser.Controller.MediaEncoding
             var subH = state.SubtitleStream?.Height;
 
             var rotation = state.VideoStream?.Rotation ?? 0;
-            var tranposeDir = rotation == 0 ? string.Empty : GetVideoTransposeDirection(state);
-            var doRkVppTranspose = !string.IsNullOrEmpty(tranposeDir);
+            var transposeDir = rotation == 0 ? string.Empty : GetVideoTransposeDirection(state);
+            var doRkVppTranspose = !string.IsNullOrEmpty(transposeDir);
             var swapWAndH = Math.Abs(rotation) == 90 && (isSwDecoder || (isRkmppDecoder && doRkVppTranspose));
             var swpInW = swapWAndH ? inH : inW;
             var swpInH = swapWAndH ? inW : inH;
@@ -5696,7 +5696,7 @@ namespace MediaBrowser.Controller.MediaEncoding
 
                     if (!string.IsNullOrEmpty(hwScaleFilter) && doRkVppTranspose)
                     {
-                        hwScaleFilter += $":transpose={tranposeDir}";
+                        hwScaleFilter += $":transpose={transposeDir}";
                     }
 
                     // try enabling AFBC to save DDR bandwidth
@@ -6170,7 +6170,7 @@ namespace MediaBrowser.Controller.MediaEncoding
             var ffmpegVersion = _mediaEncoder.EncoderVersion;
 
             // Set the av1 codec explicitly to trigger hw accelerator, otherwise libdav1d will be used.
-            var isAv1 = ffmpegVersion < _minFFmpegImplictHwaccel
+            var isAv1 = ffmpegVersion < _minFFmpegImplicitHwaccel
                 && string.Equals(videoCodec, "av1", StringComparison.OrdinalIgnoreCase);
 
             // Allow profile mismatch if decoding H.264 baseline with d3d11va and vaapi hwaccels.
diff --git a/MediaBrowser.Controller/MediaSegements/IMediaSegmentManager.cs b/MediaBrowser.Controller/MediaSegements/IMediaSegmentManager.cs
deleted file mode 100644
index 672f27eca..000000000
--- a/MediaBrowser.Controller/MediaSegements/IMediaSegmentManager.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Threading;
-using System.Threading.Tasks;
-using Jellyfin.Data.Entities;
-using Jellyfin.Data.Enums;
-using MediaBrowser.Controller.Entities;
-using MediaBrowser.Model.MediaSegments;
-
-namespace MediaBrowser.Controller;
-
-/// <summary>
-/// Defines methods for interacting with media segments.
-/// </summary>
-public interface IMediaSegmentManager
-{
-    /// <summary>
-    /// Uses all segment providers enabled for the <see cref="BaseItem"/>'s library to get the Media Segments.
-    /// </summary>
-    /// <param name="baseItem">The Item to evaluate.</param>
-    /// <param name="overwrite">If set, will remove existing segments and replace it with new ones otherwise will check for existing segments and if found any, stops.</param>
-    /// <param name="cancellationToken">stop request token.</param>
-    /// <returns>A task that indicates the Operation is finished.</returns>
-    Task RunSegmentPluginProviders(BaseItem baseItem, bool overwrite, CancellationToken cancellationToken);
-
-    /// <summary>
-    /// Returns if this item supports media segments.
-    /// </summary>
-    /// <param name="baseItem">The base Item to check.</param>
-    /// <returns>True if supported otherwise false.</returns>
-    bool IsTypeSupported(BaseItem baseItem);
-
-    /// <summary>
-    /// Creates a new Media Segment associated with an Item.
-    /// </summary>
-    /// <param name="mediaSegment">The segment to create.</param>
-    /// <param name="segmentProviderId">The id of the Provider who created this segment.</param>
-    /// <returns>The created Segment entity.</returns>
-    Task<MediaSegmentDto> CreateSegmentAsync(MediaSegmentDto mediaSegment, string segmentProviderId);
-
-    /// <summary>
-    /// Deletes a single media segment.
-    /// </summary>
-    /// <param name="segmentId">The <see cref="MediaSegment.Id"/> to delete.</param>
-    /// <returns>a task.</returns>
-    Task DeleteSegmentAsync(Guid segmentId);
-
-    /// <summary>
-    /// Obtains all segments accociated with the itemId.
-    /// </summary>
-    /// <param name="itemId">The id of the <see cref="BaseItem"/>.</param>
-    /// <param name="typeFilter">filteres all media segments of the given type to be included. If null all types are included.</param>
-    /// <param name="filterByProvider">When set filteres the segments to only return those that which providers are currently enabled on their library.</param>
-    /// <returns>An enumerator of <see cref="MediaSegmentDto"/>'s.</returns>
-    Task<IEnumerable<MediaSegmentDto>> GetSegmentsAsync(Guid itemId, IEnumerable<MediaSegmentType>? typeFilter, bool filterByProvider = true);
-
-    /// <summary>
-    /// Obtains all segments accociated with the itemId.
-    /// </summary>
-    /// <param name="item">The <see cref="BaseItem"/>.</param>
-    /// <param name="typeFilter">filteres all media segments of the given type to be included. If null all types are included.</param>
-    /// <param name="filterByProvider">When set filteres the segments to only return those that which providers are currently enabled on their library.</param>
-    /// <returns>An enumerator of <see cref="MediaSegmentDto"/>'s.</returns>
-    Task<IEnumerable<MediaSegmentDto>> GetSegmentsAsync(BaseItem item, IEnumerable<MediaSegmentType>? typeFilter, bool filterByProvider = true);
-
-    /// <summary>
-    /// Gets information about any media segments stored for the given itemId.
-    /// </summary>
-    /// <param name="itemId">The id of the <see cref="BaseItem"/>.</param>
-    /// <returns>True if there are any segments stored for the item, otherwise false.</returns>
-    /// TODO: this should be async but as the only caller BaseItem.GetVersionInfo isn't async, this is also not. Venson.
-    bool HasSegments(Guid itemId);
-
-    /// <summary>
-    /// Gets a list of all registered Segment Providers and their IDs.
-    /// </summary>
-    /// <param name="item">The media item that should be tested for providers.</param>
-    /// <returns>A list of all providers for the tested item.</returns>
-    IEnumerable<(string Name, string Id)> GetSupportedProviders(BaseItem item);
-}
diff --git a/MediaBrowser.Controller/MediaSegements/IMediaSegmentProvider.cs b/MediaBrowser.Controller/MediaSegements/IMediaSegmentProvider.cs
deleted file mode 100644
index 39bb58bef..000000000
--- a/MediaBrowser.Controller/MediaSegements/IMediaSegmentProvider.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Threading;
-using System.Threading.Tasks;
-using MediaBrowser.Controller.Entities;
-using MediaBrowser.Model;
-using MediaBrowser.Model.MediaSegments;
-
-namespace MediaBrowser.Controller;
-
-/// <summary>
-/// Provides methods for Obtaining the Media Segments from an Item.
-/// </summary>
-public interface IMediaSegmentProvider
-{
-    /// <summary>
-    /// Gets the provider name.
-    /// </summary>
-    string Name { get; }
-
-    /// <summary>
-    /// Enumerates all Media Segments from an Media Item.
-    /// </summary>
-    /// <param name="request">Arguments to enumerate MediaSegments.</param>
-    /// <param name="cancellationToken">Abort token.</param>
-    /// <returns>A list of all MediaSegments found from this provider.</returns>
-    Task<IReadOnlyList<MediaSegmentDto>> GetMediaSegments(MediaSegmentGenerationRequest request, CancellationToken cancellationToken);
-
-    /// <summary>
-    /// Should return support state for the given item.
-    /// </summary>
-    /// <param name="item">The base item to extract segments from.</param>
-    /// <returns>True if item is supported, otherwise false.</returns>
-    ValueTask<bool> Supports(BaseItem item);
-}
diff --git a/MediaBrowser.Controller/MediaSegments/IMediaSegmentManager.cs b/MediaBrowser.Controller/MediaSegments/IMediaSegmentManager.cs
new file mode 100644
index 000000000..570d2bace
--- /dev/null
+++ b/MediaBrowser.Controller/MediaSegments/IMediaSegmentManager.cs
@@ -0,0 +1,80 @@
+using System;
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+using Jellyfin.Data.Entities;
+using Jellyfin.Data.Enums;
+using MediaBrowser.Controller.Entities;
+using MediaBrowser.Model.MediaSegments;
+
+namespace MediaBrowser.Controller;
+
+/// <summary>
+/// Defines methods for interacting with media segments.
+/// </summary>
+public interface IMediaSegmentManager
+{
+    /// <summary>
+    /// Uses all segment providers enabled for the <see cref="BaseItem"/>'s library to get the Media Segments.
+    /// </summary>
+    /// <param name="baseItem">The Item to evaluate.</param>
+    /// <param name="overwrite">If set, will remove existing segments and replace it with new ones otherwise will check for existing segments and if found any, stops.</param>
+    /// <param name="cancellationToken">stop request token.</param>
+    /// <returns>A task that indicates the Operation is finished.</returns>
+    Task RunSegmentPluginProviders(BaseItem baseItem, bool overwrite, CancellationToken cancellationToken);
+
+    /// <summary>
+    /// Returns if this item supports media segments.
+    /// </summary>
+    /// <param name="baseItem">The base Item to check.</param>
+    /// <returns>True if supported otherwise false.</returns>
+    bool IsTypeSupported(BaseItem baseItem);
+
+    /// <summary>
+    /// Creates a new Media Segment associated with an Item.
+    /// </summary>
+    /// <param name="mediaSegment">The segment to create.</param>
+    /// <param name="segmentProviderId">The id of the Provider who created this segment.</param>
+    /// <returns>The created Segment entity.</returns>
+    Task<MediaSegmentDto> CreateSegmentAsync(MediaSegmentDto mediaSegment, string segmentProviderId);
+
+    /// <summary>
+    /// Deletes a single media segment.
+    /// </summary>
+    /// <param name="segmentId">The <see cref="MediaSegment.Id"/> to delete.</param>
+    /// <returns>a task.</returns>
+    Task DeleteSegmentAsync(Guid segmentId);
+
+    /// <summary>
+    /// Obtains all segments associated with the itemId.
+    /// </summary>
+    /// <param name="itemId">The id of the <see cref="BaseItem"/>.</param>
+    /// <param name="typeFilter">filters all media segments of the given type to be included. If null all types are included.</param>
+    /// <param name="filterByProvider">When set filters the segments to only return those that which providers are currently enabled on their library.</param>
+    /// <returns>An enumerator of <see cref="MediaSegmentDto"/>'s.</returns>
+    Task<IEnumerable<MediaSegmentDto>> GetSegmentsAsync(Guid itemId, IEnumerable<MediaSegmentType>? typeFilter, bool filterByProvider = true);
+
+    /// <summary>
+    /// Obtains all segments associated with the itemId.
+    /// </summary>
+    /// <param name="item">The <see cref="BaseItem"/>.</param>
+    /// <param name="typeFilter">filters all media segments of the given type to be included. If null all types are included.</param>
+    /// <param name="filterByProvider">When set filters the segments to only return those that which providers are currently enabled on their library.</param>
+    /// <returns>An enumerator of <see cref="MediaSegmentDto"/>'s.</returns>
+    Task<IEnumerable<MediaSegmentDto>> GetSegmentsAsync(BaseItem item, IEnumerable<MediaSegmentType>? typeFilter, bool filterByProvider = true);
+
+    /// <summary>
+    /// Gets information about any media segments stored for the given itemId.
+    /// </summary>
+    /// <param name="itemId">The id of the <see cref="BaseItem"/>.</param>
+    /// <returns>True if there are any segments stored for the item, otherwise false.</returns>
+    /// TODO: this should be async but as the only caller BaseItem.GetVersionInfo isn't async, this is also not. Venson.
+    bool HasSegments(Guid itemId);
+
+    /// <summary>
+    /// Gets a list of all registered Segment Providers and their IDs.
+    /// </summary>
+    /// <param name="item">The media item that should be tested for providers.</param>
+    /// <returns>A list of all providers for the tested item.</returns>
+    IEnumerable<(string Name, string Id)> GetSupportedProviders(BaseItem item);
+}
diff --git a/MediaBrowser.Controller/MediaSegments/IMediaSegmentProvider.cs b/MediaBrowser.Controller/MediaSegments/IMediaSegmentProvider.cs
new file mode 100644
index 000000000..39bb58bef
--- /dev/null
+++ b/MediaBrowser.Controller/MediaSegments/IMediaSegmentProvider.cs
@@ -0,0 +1,36 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+using MediaBrowser.Controller.Entities;
+using MediaBrowser.Model;
+using MediaBrowser.Model.MediaSegments;
+
+namespace MediaBrowser.Controller;
+
+/// <summary>
+/// Provides methods for Obtaining the Media Segments from an Item.
+/// </summary>
+public interface IMediaSegmentProvider
+{
+    /// <summary>
+    /// Gets the provider name.
+    /// </summary>
+    string Name { get; }
+
+    /// <summary>
+    /// Enumerates all Media Segments from an Media Item.
+    /// </summary>
+    /// <param name="request">Arguments to enumerate MediaSegments.</param>
+    /// <param name="cancellationToken">Abort token.</param>
+    /// <returns>A list of all MediaSegments found from this provider.</returns>
+    Task<IReadOnlyList<MediaSegmentDto>> GetMediaSegments(MediaSegmentGenerationRequest request, CancellationToken cancellationToken);
+
+    /// <summary>
+    /// Should return support state for the given item.
+    /// </summary>
+    /// <param name="item">The base item to extract segments from.</param>
+    /// <returns>True if item is supported, otherwise false.</returns>
+    ValueTask<bool> Supports(BaseItem item);
+}
diff --git a/MediaBrowser.Controller/Net/IWebSocketConnection.cs b/MediaBrowser.Controller/Net/IWebSocketConnection.cs
index bba5a6b85..bdc0f9a10 100644
--- a/MediaBrowser.Controller/Net/IWebSocketConnection.cs
+++ b/MediaBrowser.Controller/Net/IWebSocketConnection.cs
@@ -24,9 +24,9 @@ namespace MediaBrowser.Controller.Net
         DateTime LastActivityDate { get; }
 
         /// <summary>
-        /// Gets or sets the date of last Keeplive received.
+        /// Gets or sets the date of last Keepalive received.
         /// </summary>
-        /// <value>The date of last Keeplive received.</value>
+        /// <value>The date of last Keepalive received.</value>
         DateTime LastKeepAliveDate { get; set; }
 
         /// <summary>
diff --git a/MediaBrowser.Controller/Sorting/IUserBaseItemComparer.cs b/MediaBrowser.Controller/Sorting/IUserBaseItemComparer.cs
index bd47db39a..66a0c5254 100644
--- a/MediaBrowser.Controller/Sorting/IUserBaseItemComparer.cs
+++ b/MediaBrowser.Controller/Sorting/IUserBaseItemComparer.cs
@@ -5,7 +5,7 @@ using MediaBrowser.Controller.Library;
 namespace MediaBrowser.Controller.Sorting
 {
     /// <summary>
-    /// Represents a BaseItem comparer that requires a User to perform it's comparison.
+    /// Represents a BaseItem comparer that requires a User to perform its comparison.
     /// </summary>
     public interface IUserBaseItemComparer : IBaseItemComparer
     {
diff --git a/MediaBrowser.Controller/Streaming/StreamState.cs b/MediaBrowser.Controller/Streaming/StreamState.cs
index b5dbe29ec..195dda5fe 100644
--- a/MediaBrowser.Controller/Streaming/StreamState.cs
+++ b/MediaBrowser.Controller/Streaming/StreamState.cs
@@ -51,7 +51,7 @@ public class StreamState : EncodingJobInfo, IDisposable
     public VideoRequestDto? VideoRequest => Request as VideoRequestDto;
 
     /// <summary>
-    /// Gets or sets the direct stream provicer.
+    /// Gets or sets the direct stream provider.
     /// </summary>
     /// <remarks>
     /// Deprecated.
diff --git a/MediaBrowser.LocalMetadata/Images/LocalImageProvider.cs b/MediaBrowser.LocalMetadata/Images/LocalImageProvider.cs
index 9aa9c3548..0bb341da1 100644
--- a/MediaBrowser.LocalMetadata/Images/LocalImageProvider.cs
+++ b/MediaBrowser.LocalMetadata/Images/LocalImageProvider.cs
@@ -320,7 +320,7 @@ namespace MediaBrowser.LocalMetadata.Images
                 {
                     AddImage(files, images, name + "-fanart", ImageType.Backdrop, imagePrefix);
 
-                    // Support without the prefix if it's in it's own folder
+                    // Support without the prefix if it's in its own folder
                     if (!isInMixedFolder)
                     {
                         AddImage(files, images, name + "-fanart", ImageType.Backdrop);
diff --git a/MediaBrowser.LocalMetadata/Parsers/BoxSetXmlParser.cs b/MediaBrowser.LocalMetadata/Parsers/BoxSetXmlParser.cs
index 952ed3aac..00634de5b 100644
--- a/MediaBrowser.LocalMetadata/Parsers/BoxSetXmlParser.cs
+++ b/MediaBrowser.LocalMetadata/Parsers/BoxSetXmlParser.cs
@@ -15,7 +15,7 @@ namespace MediaBrowser.LocalMetadata.Parsers
         /// <summary>
         /// Initializes a new instance of the <see cref="BoxSetXmlParser"/> class.
         /// </summary>
-        /// <param name="logger">Instance of the <see cref="ILogger{BoxSetXmlParset}"/> interface.</param>
+        /// <param name="logger">Instance of the <see cref="ILogger{BoxSetXmlParser}"/> interface.</param>
         /// <param name="providerManager">Instance of the <see cref="IProviderManager"/> interface.</param>
         public BoxSetXmlParser(ILogger<BoxSetXmlParser> logger, IProviderManager providerManager)
             : base(logger, providerManager)
diff --git a/MediaBrowser.MediaEncoding/BdInfo/BdInfoDirectoryInfo.cs b/MediaBrowser.MediaEncoding/BdInfo/BdInfoDirectoryInfo.cs
index fca17d4c0..9b7e90b7a 100644
--- a/MediaBrowser.MediaEncoding/BdInfo/BdInfoDirectoryInfo.cs
+++ b/MediaBrowser.MediaEncoding/BdInfo/BdInfoDirectoryInfo.cs
@@ -84,7 +84,7 @@ public class BdInfoDirectoryInfo : IDirectoryInfo
     /// Gets the files matching a pattern.
     /// </summary>
     /// <param name="searchPattern">The search pattern.</param>
-    /// <returns>All files of the directory matchign the search pattern.</returns>
+    /// <returns>All files of the directory matching the search pattern.</returns>
     public IFileInfo[] GetFiles(string searchPattern)
     {
         return _fileSystem.GetFiles(_impl.FullName, new[] { searchPattern }, false, false)
@@ -97,7 +97,7 @@ public class BdInfoDirectoryInfo : IDirectoryInfo
     /// </summary>
     /// <param name="searchPattern">The search pattern.</param>
     /// <param name="searchOption">The search optin.</param>
-    /// <returns>All files of the directory matchign the search pattern and options.</returns>
+    /// <returns>All files of the directory matching the search pattern and options.</returns>
     public IFileInfo[] GetFiles(string searchPattern, SearchOption searchOption)
     {
         return _fileSystem.GetFiles(
diff --git a/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs b/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
index e084bda27..1eef181cb 100644
--- a/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
+++ b/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
@@ -1101,14 +1101,14 @@ namespace MediaBrowser.MediaEncoding.Encoder
 
         private void StopProcesses()
         {
-            List<ProcessWrapper> proceses;
+            List<ProcessWrapper> processes;
             lock (_runningProcessesLock)
             {
-                proceses = _runningProcesses.ToList();
+                processes = _runningProcesses.ToList();
                 _runningProcesses.Clear();
             }
 
-            foreach (var process in proceses)
+            foreach (var process in processes)
             {
                 if (!process.HasExited)
                 {
diff --git a/MediaBrowser.MediaEncoding/Probing/FFProbeHelpers.cs b/MediaBrowser.MediaEncoding/Probing/FFProbeHelpers.cs
index 1b5b5262a..6f51e1a6a 100644
--- a/MediaBrowser.MediaEncoding/Probing/FFProbeHelpers.cs
+++ b/MediaBrowser.MediaEncoding/Probing/FFProbeHelpers.cs
@@ -24,7 +24,7 @@ namespace MediaBrowser.MediaEncoding.Probing
 
             if (result.Streams is not null)
             {
-                // Convert all dictionaries to case insensitive
+                // Convert all dictionaries to case-insensitive
                 foreach (var stream in result.Streams)
                 {
                     if (stream.Tags is not null)
@@ -70,7 +70,7 @@ namespace MediaBrowser.MediaEncoding.Probing
         }
 
         /// <summary>
-        /// Converts a dictionary to case insensitive.
+        /// Converts a dictionary to case-insensitive.
         /// </summary>
         /// <param name="dict">The dict.</param>
         /// <returns>Dictionary{System.StringSystem.String}.</returns>
diff --git a/MediaBrowser.Model/Configuration/ServerConfiguration.cs b/MediaBrowser.Model/Configuration/ServerConfiguration.cs
index 623a901c9..693bf90e7 100644
--- a/MediaBrowser.Model/Configuration/ServerConfiguration.cs
+++ b/MediaBrowser.Model/Configuration/ServerConfiguration.cs
@@ -83,9 +83,9 @@ public class ServerConfiguration : BaseApplicationConfiguration
     public bool QuickConnectAvailable { get; set; } = true;
 
     /// <summary>
-    /// Gets or sets a value indicating whether [enable case sensitive item ids].
+    /// Gets or sets a value indicating whether [enable case-sensitive item ids].
     /// </summary>
-    /// <value><c>true</c> if [enable case sensitive item ids]; otherwise, <c>false</c>.</value>
+    /// <value><c>true</c> if [enable case-sensitive item ids]; otherwise, <c>false</c>.</value>
     public bool EnableCaseSensitiveItemIds { get; set; } = true;
 
     public bool DisableLiveTvChannelUserDataName { get; set; } = true;
@@ -249,7 +249,7 @@ public class ServerConfiguration : BaseApplicationConfiguration
     public bool AllowClientLogUpload { get; set; } = true;
 
     /// <summary>
-    /// Gets or sets the dummy chapter duration in seconds, use 0 (zero) or less to disable generation alltogether.
+    /// Gets or sets the dummy chapter duration in seconds, use 0 (zero) or less to disable generation altogether.
     /// </summary>
     /// <value>The dummy chapters duration.</value>
     public int DummyChapterDuration { get; set; }
diff --git a/MediaBrowser.Model/Dlna/ConditionProcessor.cs b/MediaBrowser.Model/Dlna/ConditionProcessor.cs
index af0787990..1b046f54e 100644
--- a/MediaBrowser.Model/Dlna/ConditionProcessor.cs
+++ b/MediaBrowser.Model/Dlna/ConditionProcessor.cs
@@ -25,8 +25,8 @@ namespace MediaBrowser.Model.Dlna
         /// <param name="videoFramerate">The framerate.</param>
         /// <param name="packetLength">The packet length.</param>
         /// <param name="timestamp">The <see cref="TransportStreamTimestamp"/>.</param>
-        /// <param name="isAnamorphic">A value indicating whether tthe video is anamorphic.</param>
-        /// <param name="isInterlaced">A value indicating whether tthe video is interlaced.</param>
+        /// <param name="isAnamorphic">A value indicating whether the video is anamorphic.</param>
+        /// <param name="isInterlaced">A value indicating whether the video is interlaced.</param>
         /// <param name="refFrames">The reference frames.</param>
         /// <param name="numVideoStreams">The number of video streams.</param>
         /// <param name="numAudioStreams">The number of audio streams.</param>
diff --git a/MediaBrowser.Model/Dlna/DirectPlayProfile.cs b/MediaBrowser.Model/Dlna/DirectPlayProfile.cs
index 438df3441..553ccfc64 100644
--- a/MediaBrowser.Model/Dlna/DirectPlayProfile.cs
+++ b/MediaBrowser.Model/Dlna/DirectPlayProfile.cs
@@ -59,7 +59,7 @@ public class DirectPlayProfile
     /// <returns>True if supported.</returns>
     public bool SupportsAudioCodec(string? codec)
     {
-        // Video profiles can have audio codec restrictions too, therefore incude Video as valid type.
+        // Video profiles can have audio codec restrictions too, therefore include Video as valid type.
         return (Type == DlnaProfileType.Audio || Type == DlnaProfileType.Video) && ContainerHelper.ContainsContainer(AudioCodec, codec);
     }
 }
diff --git a/MediaBrowser.Model/Entities/HardwareAccelerationType.cs b/MediaBrowser.Model/Entities/HardwareAccelerationType.cs
index 198a2e00f..ece18ec3e 100644
--- a/MediaBrowser.Model/Entities/HardwareAccelerationType.cs
+++ b/MediaBrowser.Model/Entities/HardwareAccelerationType.cs
@@ -8,7 +8,7 @@ namespace MediaBrowser.Model.Entities;
 public enum HardwareAccelerationType
 {
     /// <summary>
-    /// Software accelleration.
+    /// Software acceleration.
     /// </summary>
     none = 0,
 
diff --git a/MediaBrowser.Model/Entities/MetadataProvider.cs b/MediaBrowser.Model/Entities/MetadataProvider.cs
index bd8db9941..dcc4ae88c 100644
--- a/MediaBrowser.Model/Entities/MetadataProvider.cs
+++ b/MediaBrowser.Model/Entities/MetadataProvider.cs
@@ -27,7 +27,7 @@ namespace MediaBrowser.Model.Entities
         Tvdb = 4,
 
         /// <summary>
-        /// The tvcom providerd.
+        /// The tvcom provider.
         /// </summary>
         Tvcom = 5,
 
diff --git a/MediaBrowser.Model/Entities/ProviderIdsExtensions.cs b/MediaBrowser.Model/Entities/ProviderIdsExtensions.cs
index 479ec7712..385a86d31 100644
--- a/MediaBrowser.Model/Entities/ProviderIdsExtensions.cs
+++ b/MediaBrowser.Model/Entities/ProviderIdsExtensions.cs
@@ -11,7 +11,7 @@ namespace MediaBrowser.Model.Entities;
 public static class ProviderIdsExtensions
 {
     /// <summary>
-    /// Case insensitive dictionary of <see cref="MetadataProvider"/> string representation.
+    /// Case-insensitive dictionary of <see cref="MetadataProvider"/> string representation.
     /// </summary>
     private static readonly Dictionary<string, string> _metadataProviderEnumDictionary =
         Enum.GetValues<MetadataProvider>()
@@ -107,7 +107,7 @@ public static class ProviderIdsExtensions
     /// <param name="instance">The instance.</param>
     /// <param name="name">The name, this should not contain a '=' character.</param>
     /// <param name="value">The value.</param>
-    /// <remarks>Due to how deserialization from the database works the name can not contain '='.</remarks>
+    /// <remarks>Due to how deserialization from the database works the name cannot contain '='.</remarks>
     /// <returns><c>true</c> if the provider id got set successfully; otherwise, <c>false</c>.</returns>
     public static bool TrySetProviderId(this IHasProviderIds instance, string? name, string? value)
     {
@@ -153,7 +153,7 @@ public static class ProviderIdsExtensions
     /// <param name="instance">The instance.</param>
     /// <param name="name">The name, this should not contain a '=' character.</param>
     /// <param name="value">The value.</param>
-    /// <remarks>Due to how deserialization from the database works the name can not contain '='.</remarks>
+    /// <remarks>Due to how deserialization from the database works the name cannot contain '='.</remarks>
     public static void SetProviderId(this IHasProviderIds instance, string name, string value)
     {
         ArgumentNullException.ThrowIfNull(instance);
diff --git a/MediaBrowser.Model/Globalization/ILocalizationManager.cs b/MediaBrowser.Model/Globalization/ILocalizationManager.cs
index 02a29e7fa..20deaa505 100644
--- a/MediaBrowser.Model/Globalization/ILocalizationManager.cs
+++ b/MediaBrowser.Model/Globalization/ILocalizationManager.cs
@@ -52,7 +52,7 @@ namespace MediaBrowser.Model.Globalization
         /// <summary>
         /// Gets the localization options.
         /// </summary>
-        /// <returns><see cref="IEnumerable{LocalizatonOption}" />.</returns>
+        /// <returns><see cref="IEnumerable{LocalizationOption}" />.</returns>
         IEnumerable<LocalizationOption> GetLocalizationOptions();
 
         /// <summary>
diff --git a/MediaBrowser.Model/IO/IFileSystem.cs b/MediaBrowser.Model/IO/IFileSystem.cs
index 2085328dd..229368d00 100644
--- a/MediaBrowser.Model/IO/IFileSystem.cs
+++ b/MediaBrowser.Model/IO/IFileSystem.cs
@@ -145,7 +145,7 @@ namespace MediaBrowser.Model.IO
         /// Gets the directories.
         /// </summary>
         /// <param name="path">The path.</param>
-        /// <param name="recursive">If set to <c>true</c> also searches in subdirectiories.</param>
+        /// <param name="recursive">If set to <c>true</c> also searches in subdirectories.</param>
         /// <returns>All found directories.</returns>
         IEnumerable<FileSystemMetadata> GetDirectories(string path, bool recursive = false);
 
@@ -153,7 +153,7 @@ namespace MediaBrowser.Model.IO
         /// Gets the files.
         /// </summary>
         /// <param name="path">The path in which to search.</param>
-        /// <param name="recursive">If set to <c>true</c> also searches in subdirectiories.</param>
+        /// <param name="recursive">If set to <c>true</c> also searches in subdirectories.</param>
         /// <returns>All found files.</returns>
         IEnumerable<FileSystemMetadata> GetFiles(string path, bool recursive = false);
 
diff --git a/MediaBrowser.Model/Plugins/PluginStatus.cs b/MediaBrowser.Model/Plugins/PluginStatus.cs
index bd420d7b4..9c7a8f0c2 100644
--- a/MediaBrowser.Model/Plugins/PluginStatus.cs
+++ b/MediaBrowser.Model/Plugins/PluginStatus.cs
@@ -34,7 +34,12 @@ namespace MediaBrowser.Model.Plugins
         Malfunctioned = -3,
 
         /// <summary>
-        /// This plugin has been superceded by another version.
+        /// This plugin has been superseded by another version.
+        /// </summary>
+        Superseded = -4,
+
+        /// <summary>
+        /// [DEPRECATED] See Superseded.
         /// </summary>
         Superceded = -4,
 
diff --git a/MediaBrowser.Model/Session/TranscodingInfo.cs b/MediaBrowser.Model/Session/TranscodingInfo.cs
index ae25267ac..11e83844b 100644
--- a/MediaBrowser.Model/Session/TranscodingInfo.cs
+++ b/MediaBrowser.Model/Session/TranscodingInfo.cs
@@ -5,7 +5,7 @@ using MediaBrowser.Model.Entities;
 namespace MediaBrowser.Model.Session;
 
 /// <summary>
-/// Class holding information on a runnning transcode.
+/// Class holding information on a running transcode.
 /// </summary>
 public class TranscodingInfo
 {
diff --git a/MediaBrowser.Model/System/PublicSystemInfo.cs b/MediaBrowser.Model/System/PublicSystemInfo.cs
index 31a895642..c26cfb667 100644
--- a/MediaBrowser.Model/System/PublicSystemInfo.cs
+++ b/MediaBrowser.Model/System/PublicSystemInfo.cs
@@ -47,7 +47,7 @@ namespace MediaBrowser.Model.System
         /// Gets or sets a value indicating whether the startup wizard is completed.
         /// </summary>
         /// <remarks>
-        /// Nullable for OpenAPI specification only to retain backwards compatibility in apiclients.
+        /// Nullable for OpenAPI specification only to retain backwards compatibility in api clients.
         /// </remarks>
         /// <value>The startup completion status.</value>]
         public bool? StartupWizardCompleted { get; set; }
diff --git a/MediaBrowser.XbmcMetadata/Parsers/BaseNfoParser.cs b/MediaBrowser.XbmcMetadata/Parsers/BaseNfoParser.cs
index 3ad8e1f69..75ad0d58c 100644
--- a/MediaBrowser.XbmcMetadata/Parsers/BaseNfoParser.cs
+++ b/MediaBrowser.XbmcMetadata/Parsers/BaseNfoParser.cs
@@ -73,7 +73,7 @@ namespace MediaBrowser.XbmcMetadata.Parsers
         protected IProviderManager ProviderManager { get; }
 
         /// <summary>
-        /// Gets a value indicating whether URLs after a closing XML tag are supporrted.
+        /// Gets a value indicating whether URLs after a closing XML tag are supported.
         /// </summary>
         protected virtual bool SupportsUrlAfterClosingXmlTag => false;
 
@@ -672,7 +672,7 @@ namespace MediaBrowser.XbmcMetadata.Parsers
                 }
 
                 var fileSystemMetadata = _directoryService.GetFile(val);
-                // non existing file returns null
+                // nonexistent file returns null
                 if (fileSystemMetadata is null || !fileSystemMetadata.Exists)
                 {
                     Logger.LogWarning("Artwork file {Path} specified in nfo file for {ItemName} does not exist.", uri, itemResult.Item.Name);
diff --git a/MediaBrowser.XbmcMetadata/Savers/ArtistNfoSaver.cs b/MediaBrowser.XbmcMetadata/Savers/ArtistNfoSaver.cs
index 4cd676be1..df72ff044 100644
--- a/MediaBrowser.XbmcMetadata/Savers/ArtistNfoSaver.cs
+++ b/MediaBrowser.XbmcMetadata/Savers/ArtistNfoSaver.cs
@@ -13,7 +13,7 @@ using Microsoft.Extensions.Logging;
 namespace MediaBrowser.XbmcMetadata.Savers
 {
     /// <summary>
-    /// Nfo saver for artsist.
+    /// Nfo saver for artist.
     /// </summary>
     public class ArtistNfoSaver : BaseNfoSaver
     {
diff --git a/src/Jellyfin.LiveTv/Listings/SchedulesDirect.cs b/src/Jellyfin.LiveTv/Listings/SchedulesDirect.cs
index c7a57859e..790f60cf0 100644
--- a/src/Jellyfin.LiveTv/Listings/SchedulesDirect.cs
+++ b/src/Jellyfin.LiveTv/Listings/SchedulesDirect.cs
@@ -138,7 +138,7 @@ namespace Jellyfin.LiveTv.Listings
             var programsInfo = new List<ProgramInfo>();
             foreach (ProgramDto schedule in dailySchedules.SelectMany(d => d.Programs))
             {
-                // _logger.LogDebug("Proccesing Schedule for statio ID " + stationID +
+                // _logger.LogDebug("Processing Schedule for station ID " + stationID +
                 //              " which corresponds to channel " + channelNumber + " and program id " +
                 //              schedule.ProgramId + " which says it has images? " +
                 //              programDict[schedule.ProgramId].hasImageArtwork);
diff --git a/src/Jellyfin.LiveTv/Listings/SchedulesDirectDtos/MapDto.cs b/src/Jellyfin.LiveTv/Listings/SchedulesDirectDtos/MapDto.cs
index ea583a1ce..89c4ee5a8 100644
--- a/src/Jellyfin.LiveTv/Listings/SchedulesDirectDtos/MapDto.cs
+++ b/src/Jellyfin.LiveTv/Listings/SchedulesDirectDtos/MapDto.cs
@@ -23,7 +23,7 @@ namespace Jellyfin.LiveTv.Listings.SchedulesDirectDtos
         /// Gets or sets the provider callsign.
         /// </summary>
         [JsonPropertyName("providerCallsign")]
-        public string? ProvderCallsign { get; set; }
+        public string? ProviderCallsign { get; set; }
 
         /// <summary>
         /// Gets or sets the logical channel number.
diff --git a/src/Jellyfin.LiveTv/Listings/SchedulesDirectDtos/ProgramDetailsDto.cs b/src/Jellyfin.LiveTv/Listings/SchedulesDirectDtos/ProgramDetailsDto.cs
index 8c3906f86..7bfc4bc8b 100644
--- a/src/Jellyfin.LiveTv/Listings/SchedulesDirectDtos/ProgramDetailsDto.cs
+++ b/src/Jellyfin.LiveTv/Listings/SchedulesDirectDtos/ProgramDetailsDto.cs
@@ -64,7 +64,7 @@ namespace Jellyfin.LiveTv.Listings.SchedulesDirectDtos
         public IReadOnlyList<MetadataProgramsDto> Metadata { get; set; } = Array.Empty<MetadataProgramsDto>();
 
         /// <summary>
-        /// Gets or sets the list of content raitings.
+        /// Gets or sets the list of content ratings.
         /// </summary>
         [JsonPropertyName("contentRating")]
         public IReadOnlyList<ContentRatingDto> ContentRating { get; set; } = Array.Empty<ContentRatingDto>();
diff --git a/src/Jellyfin.Networking/Manager/NetworkManager.cs b/src/Jellyfin.Networking/Manager/NetworkManager.cs
index b1fc5d406..3f71770b5 100644
--- a/src/Jellyfin.Networking/Manager/NetworkManager.cs
+++ b/src/Jellyfin.Networking/Manager/NetworkManager.cs
@@ -973,7 +973,7 @@ public class NetworkManager : INetworkManager, IDisposable
         bindPreference = string.Empty;
         int? port = null;
 
-        // Only consider subnets including the source IP, prefering specific overrides
+        // Only consider subnets including the source IP, preferring specific overrides
         List<PublishedServerUriOverride> validPublishedServerUrls;
         if (!isInExternalSubnet)
         {
diff --git a/tests/Jellyfin.Extensions.Tests/Json/Converters/JsonCommaDelimitedArrayTests.cs b/tests/Jellyfin.Extensions.Tests/Json/Converters/JsonCommaDelimitedArrayTests.cs
index 9fc015823..d247b8cb1 100644
--- a/tests/Jellyfin.Extensions.Tests/Json/Converters/JsonCommaDelimitedArrayTests.cs
+++ b/tests/Jellyfin.Extensions.Tests/Json/Converters/JsonCommaDelimitedArrayTests.cs
@@ -92,7 +92,7 @@ namespace Jellyfin.Extensions.Tests.Json.Converters
                 Value = [GeneralCommandType.MoveUp, GeneralCommandType.MoveDown]
             };
 
-            var value = JsonSerializer.Deserialize<GenericBodyArrayModel<GeneralCommandType>>(@"{ ""Value"": ""MoveUp,TotallyNotAVallidCommand,MoveDown"" }", _jsonOptions);
+            var value = JsonSerializer.Deserialize<GenericBodyArrayModel<GeneralCommandType>>(@"{ ""Value"": ""MoveUp,TotallyNotAValidCommand,MoveDown"" }", _jsonOptions);
             Assert.Equal(desiredValue.Value, value?.Value);
         }
 
diff --git a/tests/Jellyfin.Extensions.Tests/StringExtensionsTests.cs b/tests/Jellyfin.Extensions.Tests/StringExtensionsTests.cs
index 69d20bd3f..028f12afa 100644
--- a/tests/Jellyfin.Extensions.Tests/StringExtensionsTests.cs
+++ b/tests/Jellyfin.Extensions.Tests/StringExtensionsTests.cs
@@ -6,8 +6,8 @@ namespace Jellyfin.Extensions.Tests
     public class StringExtensionsTests
     {
         [Theory]
-        [InlineData("", "")] // Identity edge-case (no diactritics)
-        [InlineData("Indiana Jones", "Indiana Jones")] // Identity (no diactritics)
+        [InlineData("", "")] // Identity edge-case (no diacritics)
+        [InlineData("Indiana Jones", "Indiana Jones")] // Identity (no diacritics)
         [InlineData("a\ud800b", "ab")] // Invalid UTF-16 char stripping
         [InlineData("åäö", "aao")] // Issue #7484
         [InlineData("Jön", "Jon")] // Issue #7484
@@ -25,8 +25,8 @@ namespace Jellyfin.Extensions.Tests
         }
 
         [Theory]
-        [InlineData("", false)] // Identity edge-case (no diactritics)
-        [InlineData("Indiana Jones", false)] // Identity (no diactritics)
+        [InlineData("", false)] // Identity edge-case (no diacritics)
+        [InlineData("Indiana Jones", false)] // Identity (no diacritics)
         [InlineData("a\ud800b", true)] // Invalid UTF-16 char stripping
         [InlineData("åäö", true)] // Issue #7484
         [InlineData("Jön", true)] // Issue #7484
diff --git a/tests/Jellyfin.LiveTv.Tests/SchedulesDirect/SchedulesDirectDeserializeTests.cs b/tests/Jellyfin.LiveTv.Tests/SchedulesDirect/SchedulesDirectDeserializeTests.cs
index 6975d56d9..59cd42c05 100644
--- a/tests/Jellyfin.LiveTv.Tests/SchedulesDirect/SchedulesDirectDeserializeTests.cs
+++ b/tests/Jellyfin.LiveTv.Tests/SchedulesDirect/SchedulesDirectDeserializeTests.cs
@@ -232,7 +232,7 @@ namespace Jellyfin.LiveTv.Tests.SchedulesDirect
             Assert.Equal(2, channelDto!.Map.Count);
             Assert.Equal("24326", channelDto.Map[0].StationId);
             Assert.Equal("001", channelDto.Map[0].Channel);
-            Assert.Equal("BBC ONE South", channelDto.Map[0].ProvderCallsign);
+            Assert.Equal("BBC ONE South", channelDto.Map[0].ProviderCallsign);
             Assert.Equal("1", channelDto.Map[0].LogicalChannelNumber);
             Assert.Equal("providerCallsign", channelDto.Map[0].MatchType);
         }
diff --git a/tests/Jellyfin.Naming.Tests/TV/TvParserHelpersTest.cs b/tests/Jellyfin.Naming.Tests/TV/TvParserHelpersTest.cs
index 2d4b5b730..5dd004408 100644
--- a/tests/Jellyfin.Naming.Tests/TV/TvParserHelpersTest.cs
+++ b/tests/Jellyfin.Naming.Tests/TV/TvParserHelpersTest.cs
@@ -15,17 +15,17 @@ public class TvParserHelpersTest
     [InlineData("Unreleased", SeriesStatus.Unreleased)]
     public void SeriesStatusParserTest_Valid(string statusString, SeriesStatus? status)
     {
-        var successful = TvParserHelpers.TryParseSeriesStatus(statusString, out var parsered);
+        var successful = TvParserHelpers.TryParseSeriesStatus(statusString, out var parsed);
         Assert.True(successful);
-        Assert.Equal(status, parsered);
+        Assert.Equal(status, parsed);
     }
 
     [Theory]
     [InlineData("XXX")]
     public void SeriesStatusParserTest_InValid(string statusString)
     {
-        var successful = TvParserHelpers.TryParseSeriesStatus(statusString, out var parsered);
+        var successful = TvParserHelpers.TryParseSeriesStatus(statusString, out var parsed);
         Assert.False(successful);
-        Assert.Null(parsered);
+        Assert.Null(parsed);
     }
 }
diff --git a/tests/Jellyfin.Networking.Tests/NetworkParseTests.cs b/tests/Jellyfin.Networking.Tests/NetworkParseTests.cs
index 3b7c43100..4144300da 100644
--- a/tests/Jellyfin.Networking.Tests/NetworkParseTests.cs
+++ b/tests/Jellyfin.Networking.Tests/NetworkParseTests.cs
@@ -238,7 +238,7 @@ namespace Jellyfin.Networking.Tests
         // User on external network, internal binding only - so assumption is a proxy forward, return external override.
         [InlineData("jellyfin.org", "192.168.1.0/24", "eth16", false, "external=http://helloworld.com", "http://helloworld.com")]
 
-        // User on external network, no binding - so result is the 1st external which is overriden.
+        // User on external network, no binding - so result is the 1st external which is overridden.
         [InlineData("jellyfin.org", "192.168.1.0/24", "", false, "external=http://helloworld.com", "http://helloworld.com")]
 
         // User assumed to be internal, no binding - so result is the 1st matching interface.
diff --git a/tests/Jellyfin.Providers.Tests/Omdb/JsonOmdbConverterTests.cs b/tests/Jellyfin.Providers.Tests/Omdb/JsonOmdbConverterTests.cs
index eed9eedc7..3062cb7b4 100644
--- a/tests/Jellyfin.Providers.Tests/Omdb/JsonOmdbConverterTests.cs
+++ b/tests/Jellyfin.Providers.Tests/Omdb/JsonOmdbConverterTests.cs
@@ -31,7 +31,7 @@ namespace Jellyfin.Providers.Tests.Omdb
         [Theory]
         [InlineData("\"N/A\"")]
         [InlineData("null")]
-        public void Deserialization_To_Nullable_Int_Shoud_Be_Null(string input)
+        public void Deserialization_To_Nullable_Int_Should_Be_Null(string input)
         {
             var result = JsonSerializer.Deserialize<int?>(input, _options);
             Assert.Null(result);
@@ -49,7 +49,7 @@ namespace Jellyfin.Providers.Tests.Omdb
         [Theory]
         [InlineData("\"N/A\"")]
         [InlineData("null")]
-        public void Deserialization_To_Nullable_String_Shoud_Be_Null(string input)
+        public void Deserialization_To_Nullable_String_Should_Be_Null(string input)
         {
             var result = JsonSerializer.Deserialize<string?>(input, _options);
             Assert.Null(result);
diff --git a/tests/Jellyfin.Server.Implementations.Tests/Test Data/Updates/manifest.json b/tests/Jellyfin.Server.Implementations.Tests/Test Data/Updates/manifest.json
index 57367ce88..6aa40c1dd 100644
--- a/tests/Jellyfin.Server.Implementations.Tests/Test Data/Updates/manifest.json	
+++ b/tests/Jellyfin.Server.Implementations.Tests/Test Data/Updates/manifest.json	
@@ -540,7 +540,7 @@
     {
         "guid": "022a3003-993f-45f1-8565-87d12af2e12a",
         "name": "InfuseSync",
-        "description": "This plugin will track all media changes while any Infuse clients are offline to decrease sync times when logging back in to your server.",
+        "description": "This plugin will track all media changes while any Infuse clients are offline to decrease sync times when logging back into your server.",
         "overview": "Blazing fast indexing for Infuse",
         "owner": "Firecore LLC",
         "category": "General",
diff --git a/tests/Jellyfin.Server.Integration.Tests/Controllers/DashboardControllerTests.cs b/tests/Jellyfin.Server.Integration.Tests/Controllers/DashboardControllerTests.cs
index 39d449e27..d92dbbd73 100644
--- a/tests/Jellyfin.Server.Integration.Tests/Controllers/DashboardControllerTests.cs
+++ b/tests/Jellyfin.Server.Integration.Tests/Controllers/DashboardControllerTests.cs
@@ -14,7 +14,7 @@ namespace Jellyfin.Server.Integration.Tests.Controllers
     public sealed class DashboardControllerTests : IClassFixture<JellyfinApplicationFactory>
     {
         private readonly JellyfinApplicationFactory _factory;
-        private readonly JsonSerializerOptions _jsonOpions = JsonDefaults.Options;
+        private readonly JsonSerializerOptions _jsonOptions = JsonDefaults.Options;
         private static string? _accessToken;
 
         public DashboardControllerTests(JellyfinApplicationFactory factory)
@@ -65,7 +65,7 @@ namespace Jellyfin.Server.Integration.Tests.Controllers
 
             Assert.Equal(HttpStatusCode.OK, response.StatusCode);
 
-            _ = await response.Content.ReadFromJsonAsync<ConfigurationPageInfo[]>(_jsonOpions);
+            _ = await response.Content.ReadFromJsonAsync<ConfigurationPageInfo[]>(_jsonOptions);
             // TODO: check content
         }
 
@@ -81,7 +81,7 @@ namespace Jellyfin.Server.Integration.Tests.Controllers
             Assert.Equal(MediaTypeNames.Application.Json, response.Content.Headers.ContentType?.MediaType);
             Assert.Equal(Encoding.UTF8.BodyName, response.Content.Headers.ContentType?.CharSet);
 
-            var data = await response.Content.ReadFromJsonAsync<ConfigurationPageInfo[]>(_jsonOpions);
+            var data = await response.Content.ReadFromJsonAsync<ConfigurationPageInfo[]>(_jsonOptions);
             Assert.NotNull(data);
             Assert.Empty(data);
         }
diff --git a/tests/Jellyfin.Server.Integration.Tests/Controllers/ItemsControllerTests.cs b/tests/Jellyfin.Server.Integration.Tests/Controllers/ItemsControllerTests.cs
index 23de2489e..64b9bd8e1 100644
--- a/tests/Jellyfin.Server.Integration.Tests/Controllers/ItemsControllerTests.cs
+++ b/tests/Jellyfin.Server.Integration.Tests/Controllers/ItemsControllerTests.cs
@@ -35,7 +35,7 @@ public sealed class ItemsControllerTests : IClassFixture<JellyfinApplicationFact
     [Theory]
     [InlineData("Users/{0}/Items")]
     [InlineData("Users/{0}/Items/Resume")]
-    public async Task GetUserItems_NonExistentUserId_NotFound(string format)
+    public async Task GetUserItems_NonexistentUserId_NotFound(string format)
     {
         var client = _factory.CreateClient();
         client.DefaultRequestHeaders.AddAuthHeader(_accessToken ??= await AuthHelper.CompleteStartupAsync(client));
diff --git a/tests/Jellyfin.Server.Integration.Tests/Controllers/LibraryControllerTests.cs b/tests/Jellyfin.Server.Integration.Tests/Controllers/LibraryControllerTests.cs
index 06abae14c..6881a9210 100644
--- a/tests/Jellyfin.Server.Integration.Tests/Controllers/LibraryControllerTests.cs
+++ b/tests/Jellyfin.Server.Integration.Tests/Controllers/LibraryControllerTests.cs
@@ -29,7 +29,7 @@ public sealed class LibraryControllerTests : IClassFixture<JellyfinApplicationFa
     [InlineData("Shows/{0}/Similar")]
     [InlineData("Movies/{0}/Similar")]
     [InlineData("Trailers/{0}/Similar")]
-    public async Task Get_NonExistentItemId_NotFound(string format)
+    public async Task Get_NonexistentItemId_NotFound(string format)
     {
         var client = _factory.CreateClient();
         client.DefaultRequestHeaders.AddAuthHeader(_accessToken ??= await AuthHelper.CompleteStartupAsync(client));
@@ -41,7 +41,7 @@ public sealed class LibraryControllerTests : IClassFixture<JellyfinApplicationFa
     [Theory]
     [InlineData("Items/{0}")]
     [InlineData("Items?ids={0}")]
-    public async Task Delete_NonExistentItemId_Unauthorised(string format)
+    public async Task Delete_NonexistentItemId_Unauthorised(string format)
     {
         var client = _factory.CreateClient();
 
@@ -52,7 +52,7 @@ public sealed class LibraryControllerTests : IClassFixture<JellyfinApplicationFa
     [Theory]
     [InlineData("Items/{0}")]
     [InlineData("Items?ids={0}")]
-    public async Task Delete_NonExistentItemId_NotFound(string format)
+    public async Task Delete_NonexistentItemId_NotFound(string format)
     {
         var client = _factory.CreateClient();
         client.DefaultRequestHeaders.AddAuthHeader(_accessToken ??= await AuthHelper.CompleteStartupAsync(client));
diff --git a/tests/Jellyfin.Server.Integration.Tests/Controllers/PlaystateControllerTests.cs b/tests/Jellyfin.Server.Integration.Tests/Controllers/PlaystateControllerTests.cs
index c02eedb20..3b9ed1778 100644
--- a/tests/Jellyfin.Server.Integration.Tests/Controllers/PlaystateControllerTests.cs
+++ b/tests/Jellyfin.Server.Integration.Tests/Controllers/PlaystateControllerTests.cs
@@ -16,7 +16,7 @@ public class PlaystateControllerTests : IClassFixture<JellyfinApplicationFactory
     }
 
     [Fact]
-    public async Task DeleteMarkUnplayedItem_NonExistentUserId_NotFound()
+    public async Task DeleteMarkUnplayedItem_NonexistentUserId_NotFound()
     {
         var client = _factory.CreateClient();
         client.DefaultRequestHeaders.AddAuthHeader(_accessToken ??= await AuthHelper.CompleteStartupAsync(client));
@@ -26,7 +26,7 @@ public class PlaystateControllerTests : IClassFixture<JellyfinApplicationFactory
     }
 
     [Fact]
-    public async Task PostMarkPlayedItem_NonExistentUserId_NotFound()
+    public async Task PostMarkPlayedItem_NonexistentUserId_NotFound()
     {
         var client = _factory.CreateClient();
         client.DefaultRequestHeaders.AddAuthHeader(_accessToken ??= await AuthHelper.CompleteStartupAsync(client));
@@ -36,7 +36,7 @@ public class PlaystateControllerTests : IClassFixture<JellyfinApplicationFactory
     }
 
     [Fact]
-    public async Task DeleteMarkUnplayedItem_NonExistentItemId_NotFound()
+    public async Task DeleteMarkUnplayedItem_NonexistentItemId_NotFound()
     {
         var client = _factory.CreateClient();
         client.DefaultRequestHeaders.AddAuthHeader(_accessToken ??= await AuthHelper.CompleteStartupAsync(client));
@@ -48,7 +48,7 @@ public class PlaystateControllerTests : IClassFixture<JellyfinApplicationFactory
     }
 
     [Fact]
-    public async Task PostMarkPlayedItem_NonExistentItemId_NotFound()
+    public async Task PostMarkPlayedItem_NonexistentItemId_NotFound()
     {
         var client = _factory.CreateClient();
         client.DefaultRequestHeaders.AddAuthHeader(_accessToken ??= await AuthHelper.CompleteStartupAsync(client));
diff --git a/tests/Jellyfin.Server.Integration.Tests/Controllers/UserControllerTests.cs b/tests/Jellyfin.Server.Integration.Tests/Controllers/UserControllerTests.cs
index 4fcacd2ca..16c63ed49 100644
--- a/tests/Jellyfin.Server.Integration.Tests/Controllers/UserControllerTests.cs
+++ b/tests/Jellyfin.Server.Integration.Tests/Controllers/UserControllerTests.cs
@@ -20,7 +20,7 @@ namespace Jellyfin.Server.Integration.Tests.Controllers
         private const string TestUsername = "testUser01";
 
         private readonly JellyfinApplicationFactory _factory;
-        private readonly JsonSerializerOptions _jsonOpions = JsonDefaults.Options;
+        private readonly JsonSerializerOptions _jsonOptions = JsonDefaults.Options;
         private static string? _accessToken;
         private static Guid _testUserId = Guid.Empty;
 
@@ -30,10 +30,10 @@ namespace Jellyfin.Server.Integration.Tests.Controllers
         }
 
         private Task<HttpResponseMessage> CreateUserByName(HttpClient httpClient, CreateUserByName request)
-            => httpClient.PostAsJsonAsync("Users/New", request, _jsonOpions);
+            => httpClient.PostAsJsonAsync("Users/New", request, _jsonOptions);
 
         private Task<HttpResponseMessage> UpdateUserPassword(HttpClient httpClient, Guid userId, UpdateUserPassword request)
-            => httpClient.PostAsJsonAsync("Users/" + userId.ToString("N", CultureInfo.InvariantCulture) + "/Password", request, _jsonOpions);
+            => httpClient.PostAsJsonAsync("Users/" + userId.ToString("N", CultureInfo.InvariantCulture) + "/Password", request, _jsonOptions);
 
         [Fact]
         [Priority(-1)]
@@ -43,7 +43,7 @@ namespace Jellyfin.Server.Integration.Tests.Controllers
 
             using var response = await client.GetAsync("Users/Public");
             Assert.Equal(HttpStatusCode.OK, response.StatusCode);
-            var users = await response.Content.ReadFromJsonAsync<UserDto[]>(_jsonOpions);
+            var users = await response.Content.ReadFromJsonAsync<UserDto[]>(_jsonOptions);
             // User are hidden by default
             Assert.NotNull(users);
             Assert.Empty(users);
@@ -58,7 +58,7 @@ namespace Jellyfin.Server.Integration.Tests.Controllers
 
             using var response = await client.GetAsync("Users");
             Assert.Equal(HttpStatusCode.OK, response.StatusCode);
-            var users = await response.Content.ReadFromJsonAsync<UserDto[]>(_jsonOpions);
+            var users = await response.Content.ReadFromJsonAsync<UserDto[]>(_jsonOptions);
             Assert.NotNull(users);
             Assert.Single(users);
             Assert.False(users![0].HasConfiguredPassword);
@@ -90,7 +90,7 @@ namespace Jellyfin.Server.Integration.Tests.Controllers
 
             using var response = await CreateUserByName(client, createRequest);
             Assert.Equal(HttpStatusCode.OK, response.StatusCode);
-            var user = await response.Content.ReadFromJsonAsync<UserDto>(_jsonOpions);
+            var user = await response.Content.ReadFromJsonAsync<UserDto>(_jsonOptions);
             Assert.Equal(TestUsername, user!.Name);
             Assert.False(user.HasPassword);
             Assert.False(user.HasConfiguredPassword);
@@ -151,7 +151,7 @@ namespace Jellyfin.Server.Integration.Tests.Controllers
             Assert.Equal(HttpStatusCode.NoContent, response.StatusCode);
 
             var users = await JsonSerializer.DeserializeAsync<UserDto[]>(
-                await client.GetStreamAsync("Users"), _jsonOpions);
+                await client.GetStreamAsync("Users"), _jsonOptions);
             var user = users!.First(x => x.Id.Equals(_testUserId));
             Assert.True(user.HasPassword);
             Assert.True(user.HasConfiguredPassword);
@@ -174,7 +174,7 @@ namespace Jellyfin.Server.Integration.Tests.Controllers
             Assert.Equal(HttpStatusCode.NoContent, response.StatusCode);
 
             var users = await JsonSerializer.DeserializeAsync<UserDto[]>(
-                await client.GetStreamAsync("Users"), _jsonOpions);
+                await client.GetStreamAsync("Users"), _jsonOptions);
             var user = users!.First(x => x.Id.Equals(_testUserId));
             Assert.False(user.HasPassword);
             Assert.False(user.HasConfiguredPassword);
diff --git a/tests/Jellyfin.Server.Integration.Tests/Controllers/UserLibraryControllerTests.cs b/tests/Jellyfin.Server.Integration.Tests/Controllers/UserLibraryControllerTests.cs
index 130281c6d..8df86111e 100644
--- a/tests/Jellyfin.Server.Integration.Tests/Controllers/UserLibraryControllerTests.cs
+++ b/tests/Jellyfin.Server.Integration.Tests/Controllers/UserLibraryControllerTests.cs
@@ -23,7 +23,7 @@ public sealed class UserLibraryControllerTests : IClassFixture<JellyfinApplicati
     }
 
     [Fact]
-    public async Task GetRootFolder_NonExistenUserId_NotFound()
+    public async Task GetRootFolder_NonexistentUserId_NotFound()
     {
         var client = _factory.CreateClient();
         client.DefaultRequestHeaders.AddAuthHeader(_accessToken ??= await AuthHelper.CompleteStartupAsync(client));
@@ -47,7 +47,7 @@ public sealed class UserLibraryControllerTests : IClassFixture<JellyfinApplicati
     [InlineData("Users/{0}/Items/{1}/LocalTrailers")]
     [InlineData("Users/{0}/Items/{1}/SpecialFeatures")]
     [InlineData("Users/{0}/Items/{1}/Lyrics")]
-    public async Task GetItem_NonExistenUserId_NotFound(string format)
+    public async Task GetItem_NonexistentUserId_NotFound(string format)
     {
         var client = _factory.CreateClient();
         client.DefaultRequestHeaders.AddAuthHeader(_accessToken ??= await AuthHelper.CompleteStartupAsync(client));
@@ -64,7 +64,7 @@ public sealed class UserLibraryControllerTests : IClassFixture<JellyfinApplicati
     [InlineData("Users/{0}/Items/{1}/LocalTrailers")]
     [InlineData("Users/{0}/Items/{1}/SpecialFeatures")]
     [InlineData("Users/{0}/Items/{1}/Lyrics")]
-    public async Task GetItem_NonExistentItemId_NotFound(string format)
+    public async Task GetItem_NonexistentItemId_NotFound(string format)
     {
         var client = _factory.CreateClient();
         client.DefaultRequestHeaders.AddAuthHeader(_accessToken ??= await AuthHelper.CompleteStartupAsync(client));
diff --git a/tests/Jellyfin.Server.Integration.Tests/Controllers/VideosControllerTests.cs b/tests/Jellyfin.Server.Integration.Tests/Controllers/VideosControllerTests.cs
index 47bec5d79..1916ced12 100644
--- a/tests/Jellyfin.Server.Integration.Tests/Controllers/VideosControllerTests.cs
+++ b/tests/Jellyfin.Server.Integration.Tests/Controllers/VideosControllerTests.cs
@@ -16,7 +16,7 @@ public sealed class VideosControllerTests : IClassFixture<JellyfinApplicationFac
     }
 
     [Fact]
-    public async Task DeleteAlternateSources_NonExistentItemId_NotFound()
+    public async Task DeleteAlternateSources_NonexistentItemId_NotFound()
     {
         var client = _factory.CreateClient();
         client.DefaultRequestHeaders.AddAuthHeader(_accessToken ??= await AuthHelper.CompleteStartupAsync(client));
diff --git a/tests/Jellyfin.XbmcMetadata.Tests/Parsers/EpisodeNfoProviderTests.cs b/tests/Jellyfin.XbmcMetadata.Tests/Parsers/EpisodeNfoProviderTests.cs
index 12d6e1934..f9126ce9b 100644
--- a/tests/Jellyfin.XbmcMetadata.Tests/Parsers/EpisodeNfoProviderTests.cs
+++ b/tests/Jellyfin.XbmcMetadata.Tests/Parsers/EpisodeNfoProviderTests.cs
@@ -85,7 +85,7 @@ namespace Jellyfin.XbmcMetadata.Tests.Parsers
             Assert.Contains("Bryan Fuller", writers.Select(x => x.Name));
             Assert.Contains("Michael Green", writers.Select(x => x.Name));
 
-            // Direcotrs
+            // Directors
             var directors = result.People.Where(x => x.Type == PersonKind.Director).ToArray();
             Assert.Single(directors);
             Assert.Contains("David Slade", directors.Select(x => x.Name));
-- 
cgit v1.2.3


From b37bc9016f8b625de3ec4a1fd2c4aac4b979cd7f Mon Sep 17 00:00:00 2001
From: luzpaz <luzpaz@users.noreply.github.com>
Date: Sun, 26 Jan 2025 11:14:03 -0500
Subject: Fix typos Found via `codespell -q 3 -D ../../dictionary.txt -S
 "./Emby.Server.Implementations/Localization" -L
 allready,childrens,groupe,inh,raisons,re-use,som,supercede,superceded,thirdparty,whoknows`

---
 Jellyfin.Data/Entities/PeopleBaseItemMap.cs                |  2 +-
 MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs    | 14 +++++++-------
 MediaBrowser.MediaEncoding/BdInfo/BdInfoDirectoryInfo.cs   |  2 +-
 MediaBrowser.Model/Entities/MediaStream.cs                 |  2 +-
 .../Json/Converters/JsonDelimitedArrayConverter.cs         |  2 +-
 5 files changed, 11 insertions(+), 11 deletions(-)

(limited to 'MediaBrowser.Controller')

diff --git a/Jellyfin.Data/Entities/PeopleBaseItemMap.cs b/Jellyfin.Data/Entities/PeopleBaseItemMap.cs
index 5ce7300b5..bfaaf8215 100644
--- a/Jellyfin.Data/Entities/PeopleBaseItemMap.cs
+++ b/Jellyfin.Data/Entities/PeopleBaseItemMap.cs
@@ -18,7 +18,7 @@ public class PeopleBaseItemMap
     public int? ListOrder { get; set; }
 
     /// <summary>
-    /// Gets or Sets the Role name the assosiated actor played in the <see cref="BaseItemEntity"/>.
+    /// Gets or Sets the Role name the associated actor played in the <see cref="BaseItemEntity"/>.
     /// </summary>
     public string? Role { get; set; }
 
diff --git a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
index ff2d2345d..8a1bcc191 100644
--- a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
+++ b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
@@ -3608,7 +3608,7 @@ namespace MediaBrowser.Controller.MediaEncoding
                 return GetSwVidFilterChain(state, options, vidEncoder);
             }
 
-            // prefered nvdec/cuvid + cuda filters + nvenc pipeline
+            // preferred nvdec/cuvid + cuda filters + nvenc pipeline
             return GetNvidiaVidFiltersPrefered(state, options, vidDecoder, vidEncoder);
         }
 
@@ -3816,7 +3816,7 @@ namespace MediaBrowser.Controller.MediaEncoding
                 return GetSwVidFilterChain(state, options, vidEncoder);
             }
 
-            // prefered d3d11va + opencl filters + amf pipeline
+            // preferred d3d11va + opencl filters + amf pipeline
             return GetAmdDx11VidFiltersPrefered(state, options, vidDecoder, vidEncoder);
         }
 
@@ -4042,13 +4042,13 @@ namespace MediaBrowser.Controller.MediaEncoding
                 return GetSwVidFilterChain(state, options, vidEncoder);
             }
 
-            // prefered qsv(vaapi) + opencl filters pipeline
+            // preferred qsv(vaapi) + opencl filters pipeline
             if (isIntelVaapiOclSupported)
             {
                 return GetIntelQsvVaapiVidFiltersPrefered(state, options, vidDecoder, vidEncoder);
             }
 
-            // prefered qsv(d3d11) + opencl filters pipeline
+            // preferred qsv(d3d11) + opencl filters pipeline
             if (isIntelDx11OclSupported)
             {
                 return GetIntelQsvDx11VidFiltersPrefered(state, options, vidDecoder, vidEncoder);
@@ -4656,14 +4656,14 @@ namespace MediaBrowser.Controller.MediaEncoding
                 return swFilterChain;
             }
 
-            // prefered vaapi + opencl filters pipeline
+            // preferred vaapi + opencl filters pipeline
             if (_mediaEncoder.IsVaapiDeviceInteliHD)
             {
                 // Intel iHD path, with extra vpp tonemap and overlay support.
                 return GetIntelVaapiFullVidFiltersPrefered(state, options, vidDecoder, vidEncoder);
             }
 
-            // prefered vaapi + vulkan filters pipeline
+            // preferred vaapi + vulkan filters pipeline
             if (_mediaEncoder.IsVaapiDeviceAmd
                 && isVaapiVkSupported
                 && _mediaEncoder.IsVaapiDeviceSupportVulkanDrmInterop
@@ -5576,7 +5576,7 @@ namespace MediaBrowser.Controller.MediaEncoding
                 return GetSwVidFilterChain(state, options, vidEncoder);
             }
 
-            // prefered rkmpp + rkrga + opencl filters pipeline
+            // preferred rkmpp + rkrga + opencl filters pipeline
             if (isRkmppOclSupported)
             {
                 return GetRkmppVidFiltersPrefered(state, options, vidDecoder, vidEncoder);
diff --git a/MediaBrowser.MediaEncoding/BdInfo/BdInfoDirectoryInfo.cs b/MediaBrowser.MediaEncoding/BdInfo/BdInfoDirectoryInfo.cs
index 9b7e90b7a..7c0be5a9f 100644
--- a/MediaBrowser.MediaEncoding/BdInfo/BdInfoDirectoryInfo.cs
+++ b/MediaBrowser.MediaEncoding/BdInfo/BdInfoDirectoryInfo.cs
@@ -96,7 +96,7 @@ public class BdInfoDirectoryInfo : IDirectoryInfo
     /// Gets the files matching a pattern and search options.
     /// </summary>
     /// <param name="searchPattern">The search pattern.</param>
-    /// <param name="searchOption">The search optin.</param>
+    /// <param name="searchOption">The search option.</param>
     /// <returns>All files of the directory matching the search pattern and options.</returns>
     public IFileInfo[] GetFiles(string searchPattern, SearchOption searchOption)
     {
diff --git a/MediaBrowser.Model/Entities/MediaStream.cs b/MediaBrowser.Model/Entities/MediaStream.cs
index 0102f6f70..218a22aa2 100644
--- a/MediaBrowser.Model/Entities/MediaStream.cs
+++ b/MediaBrowser.Model/Entities/MediaStream.cs
@@ -537,7 +537,7 @@ namespace MediaBrowser.Model.Entities
             get
             {
                 // In some cases AverageFrameRate for videos will be read as 1000fps even if it is not.
-                // This is probably due to a library compatability issue.
+                // This is probably due to a library compatibility issue.
                 // See https://github.com/jellyfin/jellyfin/pull/12603#discussion_r1748044018 for more info.
                 return AverageFrameRate < 1000 ? AverageFrameRate : RealFrameRate;
             }
diff --git a/src/Jellyfin.Extensions/Json/Converters/JsonDelimitedArrayConverter.cs b/src/Jellyfin.Extensions/Json/Converters/JsonDelimitedArrayConverter.cs
index c53ef275b..7472f9c66 100644
--- a/src/Jellyfin.Extensions/Json/Converters/JsonDelimitedArrayConverter.cs
+++ b/src/Jellyfin.Extensions/Json/Converters/JsonDelimitedArrayConverter.cs
@@ -52,7 +52,7 @@ namespace Jellyfin.Extensions.Json.Converters
                     }
                     catch (FormatException)
                     {
-                        // Ignore unconvertable inputs
+                        // Ignore unconvertible inputs
                     }
                 }
 
-- 
cgit v1.2.3


From 40da2ccac5935fc3a0d88e9cf8c3fda57d46ab6a Mon Sep 17 00:00:00 2001
From: Josh Soref <2119212+jsoref@users.noreply.github.com>
Date: Tue, 28 Jan 2025 05:27:34 -0500
Subject: Fix spelling (#13444)

* spelling: anamorphic

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: associated

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: channelinfo

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: eagerly

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: enumerable

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: greater than/less than

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: greater

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: lineup

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: logs out

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: names

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: paging

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: playlist

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: sanitized

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

* spelling: saving

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>

---------

Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>
---
 Emby.Naming/TV/SeriesResolver.cs                               |  2 +-
 Jellyfin.Api/Controllers/AudioController.cs                    |  2 +-
 Jellyfin.Api/Helpers/StreamingHelpers.cs                       |  2 +-
 Jellyfin.Data/Entities/BaseItemMetadataField.cs                |  2 +-
 Jellyfin.Data/Entities/BaseItemTrailerType.cs                  |  2 +-
 Jellyfin.Data/Entities/ItemValue.cs                            |  2 +-
 Jellyfin.Server.Implementations/Item/BaseItemRepository.cs     | 10 +++++-----
 MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs        |  2 +-
 MediaBrowser.Controller/Session/ISessionManager.cs             |  2 +-
 MediaBrowser.Controller/Session/SessionInfo.cs                 |  2 +-
 MediaBrowser.LocalMetadata/Savers/BaseXmlSaver.cs              |  2 +-
 MediaBrowser.Model/Dto/SessionInfoDto.cs                       |  2 +-
 MediaBrowser.Providers/MediaInfo/FFProbeVideoInfo.cs           |  2 +-
 src/Jellyfin.Drawing.Skia/SplashscreenBuilder.cs               |  2 +-
 src/Jellyfin.LiveTv/Listings/SchedulesDirectDtos/LineupDto.cs  |  2 +-
 .../Listings/SchedulesDirectDtos/MetadataDto.cs                |  2 +-
 src/Jellyfin.LiveTv/TunerHosts/M3uParser.cs                    |  4 ++--
 17 files changed, 22 insertions(+), 22 deletions(-)

(limited to 'MediaBrowser.Controller')

diff --git a/Emby.Naming/TV/SeriesResolver.cs b/Emby.Naming/TV/SeriesResolver.cs
index d8fa41743..c955b8a0d 100644
--- a/Emby.Naming/TV/SeriesResolver.cs
+++ b/Emby.Naming/TV/SeriesResolver.cs
@@ -12,7 +12,7 @@ namespace Emby.Naming.TV
         /// <summary>
         /// Regex that matches strings of at least 2 characters separated by a dot or underscore.
         /// Used for removing separators between words, i.e turns "The_show" into "The show" while
-        /// preserving namings like "S.H.O.W".
+        /// preserving names like "S.H.O.W".
         /// </summary>
         [GeneratedRegex(@"((?<a>[^\._]{2,})[\._]*)|([\._](?<b>[^\._]{2,}))")]
         private static partial Regex SeriesNameRegex();
diff --git a/Jellyfin.Api/Controllers/AudioController.cs b/Jellyfin.Api/Controllers/AudioController.cs
index a47c60473..272b4034e 100644
--- a/Jellyfin.Api/Controllers/AudioController.cs
+++ b/Jellyfin.Api/Controllers/AudioController.cs
@@ -238,7 +238,7 @@ public class AudioController : BaseJellyfinApiController
     /// <param name="maxVideoBitDepth">Optional. The maximum video bit depth.</param>
     /// <param name="requireAvc">Optional. Whether to require avc.</param>
     /// <param name="deInterlace">Optional. Whether to deinterlace the video.</param>
-    /// <param name="requireNonAnamorphic">Optional. Whether to require a non anamporphic stream.</param>
+    /// <param name="requireNonAnamorphic">Optional. Whether to require a non anamorphic stream.</param>
     /// <param name="transcodingMaxAudioChannels">Optional. The maximum number of audio channels to transcode.</param>
     /// <param name="cpuCoreLimit">Optional. The limit of how many cpu cores to use.</param>
     /// <param name="liveStreamId">The live stream id.</param>
diff --git a/Jellyfin.Api/Helpers/StreamingHelpers.cs b/Jellyfin.Api/Helpers/StreamingHelpers.cs
index 60b8804f7..1923393cb 100644
--- a/Jellyfin.Api/Helpers/StreamingHelpers.cs
+++ b/Jellyfin.Api/Helpers/StreamingHelpers.cs
@@ -210,7 +210,7 @@ public static class StreamingHelpers
                     && state.VideoRequest.VideoBitRate.Value >= state.VideoStream.BitRate.Value)
                 {
                     // Don't downscale the resolution if the width/height/MaxWidth/MaxHeight is not requested,
-                    // and the requested video bitrate is higher than source video bitrate.
+                    // and the requested video bitrate is greater than source video bitrate.
                     if (state.VideoStream.Width.HasValue || state.VideoStream.Height.HasValue)
                     {
                         state.VideoRequest.MaxWidth = state.VideoStream?.Width;
diff --git a/Jellyfin.Data/Entities/BaseItemMetadataField.cs b/Jellyfin.Data/Entities/BaseItemMetadataField.cs
index c9d44c046..27bbfc473 100644
--- a/Jellyfin.Data/Entities/BaseItemMetadataField.cs
+++ b/Jellyfin.Data/Entities/BaseItemMetadataField.cs
@@ -8,7 +8,7 @@ namespace Jellyfin.Data.Entities;
 public class BaseItemMetadataField
 {
     /// <summary>
-    /// Gets or Sets Numerical ID of this enumeratable.
+    /// Gets or Sets Numerical ID of this enumerable.
     /// </summary>
     public required int Id { get; set; }
 
diff --git a/Jellyfin.Data/Entities/BaseItemTrailerType.cs b/Jellyfin.Data/Entities/BaseItemTrailerType.cs
index fb31fc8a4..2bb648138 100644
--- a/Jellyfin.Data/Entities/BaseItemTrailerType.cs
+++ b/Jellyfin.Data/Entities/BaseItemTrailerType.cs
@@ -8,7 +8,7 @@ namespace Jellyfin.Data.Entities;
 public class BaseItemTrailerType
 {
     /// <summary>
-    /// Gets or Sets Numerical ID of this enumeratable.
+    /// Gets or Sets Numerical ID of this enumerable.
     /// </summary>
     public required int Id { get; set; }
 
diff --git a/Jellyfin.Data/Entities/ItemValue.cs b/Jellyfin.Data/Entities/ItemValue.cs
index 7b1048c10..11d8e383e 100644
--- a/Jellyfin.Data/Entities/ItemValue.cs
+++ b/Jellyfin.Data/Entities/ItemValue.cs
@@ -24,7 +24,7 @@ public class ItemValue
     public required string Value { get; set; }
 
     /// <summary>
-    /// Gets or Sets the sanatised Value.
+    /// Gets or Sets the sanitized Value.
     /// </summary>
     public required string CleanValue { get; set; }
 
diff --git a/Jellyfin.Server.Implementations/Item/BaseItemRepository.cs b/Jellyfin.Server.Implementations/Item/BaseItemRepository.cs
index 848f3c822..80604812c 100644
--- a/Jellyfin.Server.Implementations/Item/BaseItemRepository.cs
+++ b/Jellyfin.Server.Implementations/Item/BaseItemRepository.cs
@@ -231,7 +231,7 @@ public sealed class BaseItemRepository
         }
 
         dbQuery = ApplyGroupingFilter(dbQuery, filter);
-        dbQuery = ApplyQueryPageing(dbQuery, filter);
+        dbQuery = ApplyQueryPaging(dbQuery, filter);
 
         result.Items = dbQuery.AsEnumerable().Where(e => e is not null).Select(w => DeserialiseBaseItem(w, filter.SkipDeserialization)).ToArray();
         result.StartIndex = filter.StartIndex ?? 0;
@@ -250,7 +250,7 @@ public sealed class BaseItemRepository
         dbQuery = TranslateQuery(dbQuery, context, filter);
 
         dbQuery = ApplyGroupingFilter(dbQuery, filter);
-        dbQuery = ApplyQueryPageing(dbQuery, filter);
+        dbQuery = ApplyQueryPaging(dbQuery, filter);
 
         return dbQuery.AsEnumerable().Where(e => e is not null).Select(w => DeserialiseBaseItem(w, filter.SkipDeserialization)).ToArray();
     }
@@ -289,7 +289,7 @@ public sealed class BaseItemRepository
         return dbQuery;
     }
 
-    private IQueryable<BaseItemEntity> ApplyQueryPageing(IQueryable<BaseItemEntity> dbQuery, InternalItemsQuery filter)
+    private IQueryable<BaseItemEntity> ApplyQueryPaging(IQueryable<BaseItemEntity> dbQuery, InternalItemsQuery filter)
     {
         if (filter.Limit.HasValue || filter.StartIndex.HasValue)
         {
@@ -314,7 +314,7 @@ public sealed class BaseItemRepository
         dbQuery = TranslateQuery(dbQuery, context, filter);
         dbQuery = ApplyOrder(dbQuery, filter);
         dbQuery = ApplyGroupingFilter(dbQuery, filter);
-        dbQuery = ApplyQueryPageing(dbQuery, filter);
+        dbQuery = ApplyQueryPaging(dbQuery, filter);
         return dbQuery;
     }
 
@@ -357,7 +357,7 @@ public sealed class BaseItemRepository
     {
         ArgumentException.ThrowIfNullOrEmpty(typeName);
 
-        // TODO: this isn't great. Refactor later to be both globally handled by a dedicated service not just an static variable and be loaded eagar.
+        // TODO: this isn't great. Refactor later to be both globally handled by a dedicated service not just an static variable and be loaded eagerly.
         // currently this is done so that plugins may introduce their own type of baseitems as we dont know when we are first called, before or after plugins are loaded
         return _typeMap.GetOrAdd(typeName, k => AppDomain.CurrentDomain.GetAssemblies()
             .Select(a => a.GetType(k))
diff --git a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
index 8a1bcc191..fc3af3a77 100644
--- a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
+++ b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
@@ -2197,7 +2197,7 @@ namespace MediaBrowser.Controller.MediaEncoding
                 var videoFrameRate = videoStream.ReferenceFrameRate;
 
                 // Add a little tolerance to the framerate check because some videos might record a framerate
-                // that is slightly higher than the intended framerate, but the device can still play it correctly.
+                // that is slightly greater than the intended framerate, but the device can still play it correctly.
                 // 0.05 fps tolerance should be safe enough.
                 if (!videoFrameRate.HasValue || videoFrameRate.Value > requestedFramerate.Value + 0.05f)
                 {
diff --git a/MediaBrowser.Controller/Session/ISessionManager.cs b/MediaBrowser.Controller/Session/ISessionManager.cs
index 462a62455..5dd0413b4 100644
--- a/MediaBrowser.Controller/Session/ISessionManager.cs
+++ b/MediaBrowser.Controller/Session/ISessionManager.cs
@@ -324,7 +324,7 @@ namespace MediaBrowser.Controller.Session
         Task<SessionInfo> GetSessionByAuthenticationToken(Device info, string deviceId, string remoteEndpoint, string appVersion);
 
         /// <summary>
-        /// Logouts the specified access token.
+        /// Logs out the specified access token.
         /// </summary>
         /// <param name="accessToken">The access token.</param>
         /// <returns>A <see cref="Task"/> representing the log out process.</returns>
diff --git a/MediaBrowser.Controller/Session/SessionInfo.cs b/MediaBrowser.Controller/Session/SessionInfo.cs
index cbef5d011..96783f607 100644
--- a/MediaBrowser.Controller/Session/SessionInfo.cs
+++ b/MediaBrowser.Controller/Session/SessionInfo.cs
@@ -286,7 +286,7 @@ namespace MediaBrowser.Controller.Session
         /// <summary>
         /// Gets or sets the playlist item id.
         /// </summary>
-        /// <value>The splaylist item id.</value>
+        /// <value>The playlist item id.</value>
         public string PlaylistItemId { get; set; }
 
         /// <summary>
diff --git a/MediaBrowser.LocalMetadata/Savers/BaseXmlSaver.cs b/MediaBrowser.LocalMetadata/Savers/BaseXmlSaver.cs
index ee0d10bea..c25adb774 100644
--- a/MediaBrowser.LocalMetadata/Savers/BaseXmlSaver.cs
+++ b/MediaBrowser.LocalMetadata/Savers/BaseXmlSaver.cs
@@ -96,7 +96,7 @@ namespace MediaBrowser.LocalMetadata.Savers
             var directory = Path.GetDirectoryName(path) ?? throw new InvalidDataException($"Provided path ({path}) is not valid.");
             Directory.CreateDirectory(directory);
 
-            // On Windows, savint the file will fail if the file is hidden or readonly
+            // On Windows, saving the file will fail if the file is hidden or readonly
             FileSystem.SetAttributes(path, false, false);
 
             var fileStreamOptions = new FileStreamOptions()
diff --git a/MediaBrowser.Model/Dto/SessionInfoDto.cs b/MediaBrowser.Model/Dto/SessionInfoDto.cs
index 2496c933a..d727cd874 100644
--- a/MediaBrowser.Model/Dto/SessionInfoDto.cs
+++ b/MediaBrowser.Model/Dto/SessionInfoDto.cs
@@ -163,7 +163,7 @@ public class SessionInfoDto
     /// <summary>
     /// Gets or sets the playlist item id.
     /// </summary>
-    /// <value>The splaylist item id.</value>
+    /// <value>The playlist item id.</value>
     public string? PlaylistItemId { get; set; }
 
     /// <summary>
diff --git a/MediaBrowser.Providers/MediaInfo/FFProbeVideoInfo.cs b/MediaBrowser.Providers/MediaInfo/FFProbeVideoInfo.cs
index 301555eef..cc27490b4 100644
--- a/MediaBrowser.Providers/MediaInfo/FFProbeVideoInfo.cs
+++ b/MediaBrowser.Providers/MediaInfo/FFProbeVideoInfo.cs
@@ -634,7 +634,7 @@ namespace MediaBrowser.Providers.MediaInfo
         {
             var runtime = video.RunTimeTicks.GetValueOrDefault();
 
-            // Only process files with a runtime higher than 0 and lower than 12h. The latter are likely corrupted.
+            // Only process files with a runtime greater than 0 and less than 12h. The latter are likely corrupted.
             if (runtime < 0 || runtime > TimeSpan.FromHours(12).Ticks)
             {
                 throw new ArgumentException(
diff --git a/src/Jellyfin.Drawing.Skia/SplashscreenBuilder.cs b/src/Jellyfin.Drawing.Skia/SplashscreenBuilder.cs
index 7af77758b..03733d4f8 100644
--- a/src/Jellyfin.Drawing.Skia/SplashscreenBuilder.cs
+++ b/src/Jellyfin.Drawing.Skia/SplashscreenBuilder.cs
@@ -12,7 +12,7 @@ public class SplashscreenBuilder
 {
     private const int FinalWidth = 1920;
     private const int FinalHeight = 1080;
-    // generated collage resolution should be higher than the final resolution
+    // generated collage resolution should be greater than the final resolution
     private const int WallWidth = FinalWidth * 3;
     private const int WallHeight = FinalHeight * 2;
     private const int Rows = 6;
diff --git a/src/Jellyfin.LiveTv/Listings/SchedulesDirectDtos/LineupDto.cs b/src/Jellyfin.LiveTv/Listings/SchedulesDirectDtos/LineupDto.cs
index 856b7a89b..79bcbe649 100644
--- a/src/Jellyfin.LiveTv/Listings/SchedulesDirectDtos/LineupDto.cs
+++ b/src/Jellyfin.LiveTv/Listings/SchedulesDirectDtos/LineupDto.cs
@@ -8,7 +8,7 @@ namespace Jellyfin.LiveTv.Listings.SchedulesDirectDtos
     public class LineupDto
     {
         /// <summary>
-        /// Gets or sets the linup.
+        /// Gets or sets the lineup.
         /// </summary>
         [JsonPropertyName("lineup")]
         public string? Lineup { get; set; }
diff --git a/src/Jellyfin.LiveTv/Listings/SchedulesDirectDtos/MetadataDto.cs b/src/Jellyfin.LiveTv/Listings/SchedulesDirectDtos/MetadataDto.cs
index cafc8e273..7998a7a92 100644
--- a/src/Jellyfin.LiveTv/Listings/SchedulesDirectDtos/MetadataDto.cs
+++ b/src/Jellyfin.LiveTv/Listings/SchedulesDirectDtos/MetadataDto.cs
@@ -8,7 +8,7 @@ namespace Jellyfin.LiveTv.Listings.SchedulesDirectDtos
     public class MetadataDto
     {
         /// <summary>
-        /// Gets or sets the linup.
+        /// Gets or sets the lineup.
         /// </summary>
         [JsonPropertyName("lineup")]
         public string? Lineup { get; set; }
diff --git a/src/Jellyfin.LiveTv/TunerHosts/M3uParser.cs b/src/Jellyfin.LiveTv/TunerHosts/M3uParser.cs
index c8d678e2f..e3afe1513 100644
--- a/src/Jellyfin.LiveTv/TunerHosts/M3uParser.cs
+++ b/src/Jellyfin.LiveTv/TunerHosts/M3uParser.cs
@@ -93,7 +93,7 @@ namespace Jellyfin.LiveTv.TunerHosts
                 }
                 else if (!string.IsNullOrWhiteSpace(extInf) && !trimmedLine.StartsWith('#'))
                 {
-                    var channel = GetChannelnfo(extInf, tunerHostId, trimmedLine);
+                    var channel = GetChannelInfo(extInf, tunerHostId, trimmedLine);
                     channel.Id = channelIdPrefix + trimmedLine.GetMD5().ToString("N", CultureInfo.InvariantCulture);
 
                     channel.Path = trimmedLine;
@@ -106,7 +106,7 @@ namespace Jellyfin.LiveTv.TunerHosts
             return channels;
         }
 
-        private ChannelInfo GetChannelnfo(string extInf, string tunerHostId, string mediaUrl)
+        private ChannelInfo GetChannelInfo(string extInf, string tunerHostId, string mediaUrl)
         {
             var channel = new ChannelInfo()
             {
-- 
cgit v1.2.3


From 6fda268892871a977f8f18d198bc5f30d1b9b7ff Mon Sep 17 00:00:00 2001
From: luzpaz <luzpaz@users.noreply.github.com>
Date: Wed, 29 Jan 2025 10:56:25 -0500
Subject: Merge pull request #13453 from luzpaz/extentions-typo

Fix source typo
---
 MediaBrowser.Controller/Entities/Audio/IHasAlbumArtist.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'MediaBrowser.Controller')

diff --git a/MediaBrowser.Controller/Entities/Audio/IHasAlbumArtist.cs b/MediaBrowser.Controller/Entities/Audio/IHasAlbumArtist.cs
index 1625c748a..b085398c5 100644
--- a/MediaBrowser.Controller/Entities/Audio/IHasAlbumArtist.cs
+++ b/MediaBrowser.Controller/Entities/Audio/IHasAlbumArtist.cs
@@ -22,7 +22,7 @@ namespace MediaBrowser.Controller.Entities.Audio
         IReadOnlyList<string> Artists { get; set; }
     }
 
-    public static class Extentions
+    public static class Extensions
     {
         public static IEnumerable<string> GetAllArtists<T>(this T item)
             where T : IHasArtist, IHasAlbumArtist
-- 
cgit v1.2.3


From bc1419728ff0f1226d1ac347a676e975b1c459ee Mon Sep 17 00:00:00 2001
From: nyanmisaka <nst799610810@gmail.com>
Date: Mon, 3 Feb 2025 16:55:53 -0500
Subject: Backport pull request #13151 from jellyfin/release-10.10.z

Always do tone-mapping for HDR transcoding when software pipeline is used

Original-merge: b31f1696f2cad1ebf37ad33af82161d52c9ca9e9

Merged-by: Bond-009 <bond.009@outlook.com>

Backported-by: Bond_009 <bond.009@outlook.com>
---
 MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs | 1 -
 1 file changed, 1 deletion(-)

(limited to 'MediaBrowser.Controller')

diff --git a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
index fc3af3a77..982572aae 100644
--- a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
+++ b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
@@ -309,7 +309,6 @@ namespace MediaBrowser.Controller.MediaEncoding
         private bool IsSwTonemapAvailable(EncodingJobInfo state, EncodingOptions options)
         {
             if (state.VideoStream is null
-                || !options.EnableTonemapping
                 || GetVideoColorBitDepth(state) < 10
                 || !_mediaEncoder.SupportsFilter("tonemapx"))
             {
-- 
cgit v1.2.3


From 4595625f19d864954141bd5d9d2ddf8faa1a1ee7 Mon Sep 17 00:00:00 2001
From: gnattu <gnattu@users.noreply.github.com>
Date: Mon, 3 Feb 2025 16:59:03 -0500
Subject: Backport pull request #13262 from jellyfin/release-10.10.z

Don't use custom params on ultrafast x265 preset

Original-merge: 86160cd99c3134f2ca62e5fc9fac60d9ef702fb0

Merged-by: Bond-009 <bond.009@outlook.com>

Backported-by: Bond_009 <bond.009@outlook.com>
---
 MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'MediaBrowser.Controller')

diff --git a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
index 982572aae..db0954368 100644
--- a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
+++ b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
@@ -2060,7 +2060,13 @@ namespace MediaBrowser.Controller.MediaEncoding
                 // libx265 only accept level option in -x265-params.
                 // level option may cause libx265 to fail.
                 // libx265 cannot adjust the given level, just throw an error.
-                param += " -x265-params:0 subme=3:merange=25:rc-lookahead=10:me=star:ctu=32:max-tu-size=32:min-cu-size=16:rskip=2:rskip-edge-threshold=2:no-sao=1:no-strong-intra-smoothing=1:no-scenecut=1:no-open-gop=1:no-info=1";
+                param += " -x265-params:0 no-scenecut=1:no-open-gop=1:no-info=1";
+
+                if (encodingOptions.EncoderPreset < EncoderPreset.ultrafast)
+                {
+                    // The following params are slower than the ultrafast preset, don't use when ultrafast is selected.
+                    param += ":subme=3:merange=25:rc-lookahead=10:me=star:ctu=32:max-tu-size=32:min-cu-size=16:rskip=2:rskip-edge-threshold=2:no-sao=1:no-strong-intra-smoothing=1";
+                }
             }
 
             if (string.Equals(videoEncoder, "libsvtav1", StringComparison.OrdinalIgnoreCase)
-- 
cgit v1.2.3


From e79fc6b851ea851a79668195e573b5a05e55a63d Mon Sep 17 00:00:00 2001
From: Shadowghost <Shadowghost@users.noreply.github.com>
Date: Mon, 3 Feb 2025 16:59:04 -0500
Subject: Backport pull request #13288 from jellyfin/release-10.10.z

Fix DTS in HLS

Original-merge: cea0c9594220778658c30acf640108c26191706e

Merged-by: crobibero <cody@robibe.ro>

Backported-by: Bond_009 <bond.009@outlook.com>
---
 MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs | 2 +-
 MediaBrowser.Model/Dlna/StreamBuilder.cs                | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'MediaBrowser.Controller')

diff --git a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
index db0954368..72ac26beb 100644
--- a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
+++ b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
@@ -7069,7 +7069,7 @@ namespace MediaBrowser.Controller.MediaEncoding
             {
                 // DTS and TrueHD are not supported by HLS
                 // Keep them in the supported codecs list, but shift them to the end of the list so that if transcoding happens, another codec is used
-                shiftAudioCodecs.Add("dca");
+                shiftAudioCodecs.Add("dts");
                 shiftAudioCodecs.Add("truehd");
             }
             else
diff --git a/MediaBrowser.Model/Dlna/StreamBuilder.cs b/MediaBrowser.Model/Dlna/StreamBuilder.cs
index e87638a13..97262fbac 100644
--- a/MediaBrowser.Model/Dlna/StreamBuilder.cs
+++ b/MediaBrowser.Model/Dlna/StreamBuilder.cs
@@ -30,7 +30,7 @@ namespace MediaBrowser.Model.Dlna
         private readonly ITranscoderSupport _transcoderSupport;
         private static readonly string[] _supportedHlsVideoCodecs = ["h264", "hevc", "vp9", "av1"];
         private static readonly string[] _supportedHlsAudioCodecsTs = ["aac", "ac3", "eac3", "mp3"];
-        private static readonly string[] _supportedHlsAudioCodecsMp4 = ["aac", "ac3", "eac3", "mp3", "alac", "flac", "opus", "dca", "truehd"];
+        private static readonly string[] _supportedHlsAudioCodecsMp4 = ["aac", "ac3", "eac3", "mp3", "alac", "flac", "opus", "dts", "truehd"];
 
         /// <summary>
         /// Initializes a new instance of the <see cref="StreamBuilder"/> class.
-- 
cgit v1.2.3


From d52ab30ae970523f3b812d79a2f5afeb7f0a439a Mon Sep 17 00:00:00 2001
From: gnattu <gnattu@users.noreply.github.com>
Date: Mon, 3 Feb 2025 16:59:05 -0500
Subject: Backport pull request #13313 from jellyfin/release-10.10.z

Use nv15 as intermediate format for 2-pass rkrga scaling

Original-merge: 5c6317f68d6e255189ceb64e49500afd046e3a50

Merged-by: crobibero <cody@robibe.ro>

Backported-by: Bond_009 <bond.009@outlook.com>
---
 MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'MediaBrowser.Controller')

diff --git a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
index 72ac26beb..a9e419df4 100644
--- a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
+++ b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
@@ -5695,7 +5695,11 @@ namespace MediaBrowser.Controller.MediaEncoding
                     if (!string.IsNullOrEmpty(doScaling)
                         && !IsScaleRatioSupported(inW, inH, reqW, reqH, reqMaxW, reqMaxH, 8.0f))
                     {
-                        var hwScaleFilterFirstPass = $"scale_rkrga=w=iw/7.9:h=ih/7.9:format={outFormat}:afbc=1";
+                        // Vendor provided BSP kernel has an RGA driver bug that causes the output to be corrupted for P010 format.
+                        // Use NV15 instead of P010 to avoid the issue.
+                        // SDR inputs are using BGRA formats already which is not affected.
+                        var intermediateFormat = string.Equals(outFormat, "p010", StringComparison.OrdinalIgnoreCase) ? "nv15" : outFormat;
+                        var hwScaleFilterFirstPass = $"scale_rkrga=w=iw/7.9:h=ih/7.9:format={intermediateFormat}:force_divisible_by=4:afbc=1";
                         mainFilters.Add(hwScaleFilterFirstPass);
                     }
 
-- 
cgit v1.2.3