Merge pull request 'Development' (#10) from development into main

Reviewed-on: #10

.gitignore

@@ -7,7 +7,11 @@
 [Rr]elease/
 [Bb]in/
 [Oo]bj/
+.idea/
+*.lscache
+.github/
 
+.github
 /.vs/Jellyfin
 /.vs
 **/obj/
@@ -20,16 +24,26 @@
 *.pdb
 bin/
 obj/
+*.lscache
 
 # Centralized lib output folder
 /lib/
 lib/
 /installer-output/
 installer-output/
-/wwwroot/*
-wwwroot/*
 # Publish profiles (anywhere in project)
 /Properties/PublishProfiles/
 Properties/PublishProfiles/
 **/PublishProfiles/
 **/Properties/PublishProfiles/
+
+# Ignore schema directories (database schema dumps)
+**/schema/
+schema/
+[Rr]eports/
+# Ignore .idea IDE directory
+**/.idea/
+.idea/
+
+**/scenario.json
+scenario.json

.idea/.idea.Jellyfin/.idea/encodings.xml

@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="Encoding" addBOMForNewFiles="with BOM under Windows, with no BOM otherwise" />
-</project>

Directory.Packages.props

@@ -1,6 +1,7 @@
 <Project>
   <PropertyGroup>
     <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
+    <NoWarn>$(NoWarn);NU1510</NoWarn>
   </PropertyGroup>
   <!-- Run "dotnet list package (dash,dash)outdated" to see the latest versions of each package.-->
   <ItemGroup Label="Package Dependencies">
@@ -44,14 +45,16 @@
     <PackageVersion Include="Microsoft.Extensions.Configuration.Abstractions" Version="11.0.0-preview.1.26104.118" />
     <PackageVersion Include="Microsoft.Extensions.Configuration.Binder" Version="11.0.0-preview.1.26104.118" />
     <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="11.0.0-preview.1.26104.118" />
+    <PackageVersion Include="Microsoft.Extensions.DependencyModel" Version="11.0.0-preview.1.26104.118" />
     <PackageVersion Include="Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore" Version="11.0.0-preview.1.26104.118" />
     <PackageVersion Include="Microsoft.Extensions.Hosting.Abstractions" Version="11.0.0-preview.1.26104.118" />
     <PackageVersion Include="Microsoft.Extensions.Http" Version="11.0.0-preview.1.26104.118" />
     <PackageVersion Include="Microsoft.Extensions.Logging" Version="11.0.0-preview.1.26104.118" />
     <PackageVersion Include="Microsoft.Extensions.Options" Version="11.0.0-preview.1.26104.118" />
+    <PackageVersion Include="Microsoft.Kiota.Abstractions" Version="1.22.0" />
     <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
     <PackageVersion Include="MimeTypes" Version="2.5.2" />
-    <PackageVersion Include="Morestachio" Version="5.0.1.631" />
+    <PackageVersion Include="Morestachio" Version="5.0.1.670" />
     <PackageVersion Include="Moq" Version="4.18.4" />
     <PackageVersion Include="NEbml" Version="1.1.0.5" />
     <PackageVersion Include="Newtonsoft.Json" Version="13.0.4" />
@@ -90,4 +93,4 @@
     <PackageVersion Include="Xunit.SkippableFact" Version="1.5.61" />
     <PackageVersion Include="xunit" Version="2.9.3" />
   </ItemGroup>
-</Project>
+</Project>

Emby.Naming/Emby.Naming.csproj

@@ -20,7 +20,7 @@
     <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
     <WarningsAsErrors></WarningsAsErrors>
     <EnforceCodeStyleInBuild>false</EnforceCodeStyleInBuild>
-    <NoWarn>$(NoWarn);IDE0065</NoWarn>
+    <NoWarn>$(NoWarn);IDE0065;CA1848;CA1515;CA1812;CA1849;CA1860;CA1867;CA1517;CA1865;CA1869;CA1716;CA2101;SA1127;CA1845;CA1859;CA2007</NoWarn>
   </PropertyGroup>
 
   <PropertyGroup Condition=" '$(Stability)'=='Unstable'">
@@ -32,6 +32,10 @@
     <Compile Include="../SharedVersion.cs" />
   </ItemGroup>
 
+  <ItemGroup>
+    <PackageReference Include="Microsoft.Kiota.Abstractions" />
+  </ItemGroup>
+
   <ItemGroup>
     <ProjectReference Include="../MediaBrowser.Common/MediaBrowser.Common.csproj" />
     <ProjectReference Include="../MediaBrowser.Model/MediaBrowser.Model.csproj" />
@@ -62,7 +66,7 @@
   </ItemGroup>
 
   <PropertyGroup>
-    <NoWarn>$(NoWarn);NETSDK1057</NoWarn>
+    <NoWarn>$(NoWarn);NETSDK1057;CA1848;CA1515;CA1812;CA1849;CA1860;CA1867;CA1517;CA1865;CA1869;CA1716;CA2101;SA1127;CA1845;CA1859;CA2007</NoWarn>
   </PropertyGroup>
 
 </Project>

Emby.Photos/Emby.Photos.csproj

@@ -3,6 +3,7 @@
   <!-- ProjectGuid is only included as a requirement for SonarQube analysis -->
   <PropertyGroup>
     <ProjectGuid>{89AB4548-770D-41FD-A891-8DAFF44F452C}</ProjectGuid>
+    <NoWarn>$(NoWarn);CA1062;CA1031;CA1848;CA2253;CA1515;CA1812;CA1849;CA1860;CA1867;CA1517;CA1865;CA1869;CA1716;CA2101;SA1127;CA1845;CA1859;CA2007</NoWarn>
   </PropertyGroup>
 
   <ItemGroup>
@@ -15,6 +16,7 @@
   </ItemGroup>
 
   <ItemGroup>
+    <PackageReference Include="Microsoft.Kiota.Abstractions" />
     <PackageReference Include="TagLibSharp" />
   </ItemGroup>
 

Emby.Server.Implementations/AppBase/BaseConfigurationManager.cs

@@ -10,6 +10,7 @@ namespace Emby.Server.Implementations.AppBase
     using System.Globalization;
     using System.IO;
     using System.Linq;
+    using System.Reflection;
     using System.Threading;
     using MediaBrowser.Common.Configuration;
     using MediaBrowser.Common.Events;
@@ -306,6 +307,32 @@ namespace Emby.Server.Implementations.AppBase
 
         private object LoadConfiguration(string path, Type configurationType)
         {
+            // Try JSON first, then fallback to XML for backward compatibility
+            var jsonPath = Path.ChangeExtension(path, ".json");
+
+            // Try loading from .json if it exists
+            if (File.Exists(jsonPath))
+            {
+                try
+                {
+                    var method = typeof(ConfigurationHelper).GetMethod(
+                        nameof(ConfigurationHelper.GetJsonConfiguration),
+                        System.Reflection.BindingFlags.Static | System.Reflection.BindingFlags.Public);
+
+                    if (method is not null)
+                    {
+                        var genericMethod = method.MakeGenericMethod(configurationType);
+                        return genericMethod.Invoke(null, new object[] { jsonPath })
+                            ?? throw new InvalidOperationException("JSON deserialization returned null.");
+                    }
+                }
+                catch (Exception ex)
+                {
+                    Logger.LogError(ex, "Error loading JSON configuration file: {Path}", jsonPath);
+                }
+            }
+
+            // Fall back to XML for backward compatibility
             try
             {
                 if (File.Exists(path))

Emby.Server.Implementations/AppBase/ConfigurationHelper.cs

@@ -6,6 +6,8 @@ namespace Emby.Server.Implementations.AppBase
 {
     using System;
     using System.IO;
+    using System.Text.Json;
+    using Jellyfin.Extensions.Json;
     using MediaBrowser.Model.Serialization;
 
     /// <summary>
@@ -54,10 +56,54 @@ namespace Emby.Server.Implementations.AppBase
                 Directory.CreateDirectory(directory);
 
                 // Save it after load in case we got new items
+#pragma warning disable IDE0063 // Use simple 'using' statement
                 using (var fs = new FileStream(path, FileMode.Create, FileAccess.Write, FileShare.None))
                 {
                     fs.Write(newBytes);
                 }
+#pragma warning restore IDE0063 // Use simple 'using' statement
+            }
+
+            return configuration;
+        }
+
+        /// <summary>
+        /// Reads a JSON configuration file from the file system using System.Text.Json.
+        /// It will immediately re-serialize and save if new serialization data is available due to property changes.
+        /// </summary>
+        /// <typeparam name="T">The type of configuration to deserialize.</typeparam>
+        /// <param name="path">The path to the JSON configuration file.</param>
+        /// <returns>The deserialized configuration object.</returns>
+        public static T GetJsonConfiguration<T>(string path)
+            where T : class, new()
+        {
+            T configuration;
+            byte[]? buffer = null;
+
+            // Use try/catch to avoid the extra file system lookup using File.Exists
+            try
+            {
+                buffer = File.ReadAllBytes(path);
+                configuration = JsonSerializer.Deserialize<T>(buffer, JsonDefaults.Options) ?? new T();
+            }
+            catch (Exception)
+            {
+                // If file doesn't exist or deserialization fails, create a new instance with defaults
+                configuration = new T();
+            }
+
+            // Re-serialize to ensure proper formatting and any new defaults are captured
+            byte[] newBytes = JsonSerializer.SerializeToUtf8Bytes(configuration, JsonDefaults.Options);
+
+            // If the file didn't exist before, or if something has changed, re-save
+            if (buffer is null || !newBytes.AsSpan().SequenceEqual(buffer))
+            {
+                var directory = Path.GetDirectoryName(path) ?? throw new ArgumentException($"Provided path ({path}) is not valid.", nameof(path));
+
+                Directory.CreateDirectory(directory);
+
+                // Save it after load in case we got new items or formatting changed
+                File.WriteAllBytes(path, newBytes);
             }
 
             return configuration;

Emby.Server.Implementations/ApplicationHost.cs

@@ -16,7 +16,6 @@ using System.Linq;
 using System.Net;
 using System.Reflection;
 using System.Security.Cryptography.X509Certificates;
-using System.Threading;
 using System.Threading.Tasks;
 using Emby.Naming.Common;
 using Emby.Photos;
@@ -410,7 +409,7 @@ namespace Emby.Server.Implementations
         /// Runs the startup tasks.
         /// </summary>
         /// <returns><see cref="Task" />.</returns>
-        public async Task RunStartupTasksAsync()
+        public Task RunStartupTasksAsync()
         {
             Logger.LogInformation("Running startup tasks");
 
@@ -427,64 +426,10 @@ namespace Emby.Server.Implementations
             }
 
             Logger.LogInformation("ServerId: {ServerId}", SystemId);
-
-            // Register this instance in multi-instance mode
-            await RegisterInstanceAsync().ConfigureAwait(false);
-
-            // Start cache coordinator for multi-instance cache invalidation
-            await StartCacheCoordinatorAsync().ConfigureAwait(false);
-
             Logger.LogInformation("Core startup complete");
             CoreStartupHasCompleted = true;
-        }
 
-        private async Task RegisterInstanceAsync()
-        {
-            try
-            {
-                var instanceRegistry = Resolve<Jellyfin.Server.Implementations.Clustering.IInstanceRegistry>();
-                var networkConfig = ConfigurationManager.GetNetworkConfiguration();
-
-                var hostname = Environment.MachineName;
-                var processId = Environment.ProcessId;
-                var httpPort = networkConfig.InternalHttpPort;
-                var httpsPort = networkConfig.InternalHttpsPort > 0 ? networkConfig.InternalHttpsPort : (int?)null;
-                var version = ApplicationVersionString;
-
-                await instanceRegistry.RegisterInstanceAsync(
-                    hostname,
-                    processId,
-                    httpPort,
-                    httpsPort,
-                    version,
-                    capabilities: null,
-                    CancellationToken.None).ConfigureAwait(false);
-
-                Logger.LogInformation(
-                    "Instance registered: {InstanceId} on {Hostname}:{HttpPort}",
-                    instanceRegistry.CurrentInstanceId,
-                    hostname,
-                    httpPort);
-            }
-            catch (Exception ex)
-            {
-                Logger.LogError(ex, "Failed to register instance in database");
-            }
-        }
-
-        private async Task StartCacheCoordinatorAsync()
-        {
-            try
-            {
-                var cacheCoordinator = Resolve<Jellyfin.Server.Implementations.Clustering.ICacheCoordinator>();
-                await cacheCoordinator.StartAsync(CancellationToken.None).ConfigureAwait(false);
-
-                Logger.LogInformation("Cache coordinator started for multi-instance cache synchronization");
-            }
-            catch (Exception ex)
-            {
-                Logger.LogError(ex, "Failed to start cache coordinator");
-            }
+            return Task.CompletedTask;
         }
 
         /// <inheritdoc/>
@@ -547,16 +492,7 @@ namespace Emby.Server.Implementations
 
             serviceCollection.AddSingleton(NetManager);
 
-            // Register the actual TaskManager
-            serviceCollection.AddSingleton<TaskManager>();
-            // Wrap it with primary instance checking decorator
-            serviceCollection.AddSingleton<ITaskManager>(provider =>
-            {
-                var taskManager = provider.GetRequiredService<TaskManager>();
-                var primaryElection = provider.GetRequiredService<Jellyfin.Server.Implementations.Clustering.IPrimaryElectionService>();
-                var logger = provider.GetRequiredService<ILogger<Jellyfin.Server.Implementations.Clustering.PrimaryInstanceTaskManager>>();
-                return new Jellyfin.Server.Implementations.Clustering.PrimaryInstanceTaskManager(taskManager, primaryElection, logger);
-            });
+            serviceCollection.AddSingleton<ITaskManager, TaskManager>();
 
             serviceCollection.AddSingleton(_xmlSerializer);
 
@@ -581,6 +517,7 @@ namespace Emby.Server.Implementations
             serviceCollection.AddSingleton<IMediaAttachmentRepository, MediaAttachmentRepository>();
             serviceCollection.AddSingleton<IMediaStreamRepository, MediaStreamRepository>();
             serviceCollection.AddSingleton<IKeyframeRepository, KeyframeRepository>();
+            serviceCollection.AddSingleton<ILibraryOptionsRepository, LibraryOptionsRepository>();
             serviceCollection.AddSingleton<IItemTypeLookup, ItemTypeLookup>();
 
             serviceCollection.AddSingleton<IMediaEncoder, MediaBrowser.MediaEncoding.Encoder.MediaEncoder>();
@@ -618,16 +555,6 @@ namespace Emby.Server.Implementations
             serviceCollection.AddTransient(provider => new Lazy<ILiveTvManager>(provider.GetRequiredService<ILiveTvManager>));
             serviceCollection.AddSingleton<IDtoService, DtoService>();
 
-            // Multi-instance support services
-            serviceCollection.AddSingleton<Jellyfin.Server.Implementations.Clustering.IInstanceRegistry, Jellyfin.Server.Implementations.Clustering.InstanceRegistry>();
-            serviceCollection.AddSingleton<Jellyfin.Server.Implementations.Clustering.IDistributedLockManager, Jellyfin.Server.Implementations.Clustering.DistributedLockManager>();
-            serviceCollection.AddSingleton<Jellyfin.Server.Implementations.Clustering.IPostgresNotificationListener, Jellyfin.Server.Implementations.Clustering.PostgresNotificationListener>();
-            serviceCollection.AddSingleton<Jellyfin.Server.Implementations.Clustering.ICacheCoordinator, Jellyfin.Server.Implementations.Clustering.CacheCoordinator>();
-            serviceCollection.AddSingleton<Jellyfin.Server.Implementations.Clustering.IPrimaryElectionService, Jellyfin.Server.Implementations.Clustering.PrimaryElectionService>();
-            serviceCollection.AddHostedService(provider => (Jellyfin.Server.Implementations.Clustering.PrimaryElectionService)provider.GetRequiredService<Jellyfin.Server.Implementations.Clustering.IPrimaryElectionService>());
-            serviceCollection.AddSingleton<Jellyfin.Server.Implementations.Clustering.IFileSystemChangeProcessor, Jellyfin.Server.Implementations.Clustering.FileSystemChangeProcessor>();
-            serviceCollection.AddHostedService(provider => (Jellyfin.Server.Implementations.Clustering.FileSystemChangeProcessor)provider.GetRequiredService<Jellyfin.Server.Implementations.Clustering.IFileSystemChangeProcessor>());
-
             serviceCollection.AddSingleton<ISessionManager, SessionManager>();
 
             serviceCollection.AddSingleton<ICollectionManager, CollectionManager>();
@@ -674,11 +601,37 @@ namespace Emby.Server.Implementations
 
             FindParts();
 
+            BackfillLibraryOptionsFromXml();
+
             // Ensure at least one user exists
             var userManager = Resolve<IUserManager>();
             await userManager.InitializeAsync().ConfigureAwait(false);
         }
 
+        private void BackfillLibraryOptionsFromXml()
+        {
+            var defaultUserViewsPath = ConfigurationManager.ApplicationPaths.DefaultUserViewsPath;
+
+            if (!Directory.Exists(defaultUserViewsPath))
+            {
+                return;
+            }
+
+            try
+            {
+                foreach (var virtualFolderPath in Directory.GetDirectories(defaultUserViewsPath))
+                {
+                    // DB-first with XML fallback is implemented in CollectionFolder.GetLibraryOptions.
+                    // Calling this at startup backfills existing options.xml rows without waiting for first user read.
+                    _ = CollectionFolder.GetLibraryOptions(virtualFolderPath);
+                }
+            }
+            catch (Exception ex)
+            {
+                Logger.LogError(ex, "Error backfilling library options from {DefaultUserViewsPath}", defaultUserViewsPath);
+            }
+        }
+
         private X509Certificate2 GetCertificate(string path, string password)
         {
             if (string.IsNullOrWhiteSpace(path))
@@ -732,6 +685,7 @@ namespace Emby.Server.Implementations
             BaseItem.UserDataManager = Resolve<IUserDataManager>();
             CollectionFolder.XmlSerializer = _xmlSerializer;
             CollectionFolder.ApplicationHost = this;
+            CollectionFolder.LibraryOptionsRepository = Resolve<ILibraryOptionsRepository>();
             Folder.UserViewManager = Resolve<IUserViewManager>();
             Folder.CollectionManager = Resolve<ICollectionManager>();
             Folder.LimitedConcurrencyLibraryScheduler = Resolve<ILimitedConcurrencyLibraryScheduler>();

Emby.Server.Implementations/ConfigurationOptions.cs

@@ -18,7 +18,6 @@ namespace Emby.Server.Implementations
             { FfmpegProbeSizeKey, "1G" },
             { FfmpegAnalyzeDurationKey, "200M" },
             { BindToUnixSocketKey, bool.FalseString },
-            { SqliteCacheSizeKey, "20000" },
             { FfmpegSkipValidationKey, bool.FalseString },
             { FfmpegImgExtractPerfTradeoffKey, bool.FalseString },
             { DetectNetworkChangeKey, bool.TrueString }

Emby.Server.Implementations/Data/CleanDatabaseScheduledTask.cs

@@ -108,14 +108,15 @@ public class CleanDatabaseScheduledTask : ILibraryPostScanTask
         var context = await _dbProvider.CreateDbContextAsync(cancellationToken).ConfigureAwait(false);
         await using (context.ConfigureAwait(false))
         {
-            var transaction = await context.Database.BeginTransactionAsync(cancellationToken).ConfigureAwait(false);
-            await using (transaction.ConfigureAwait(false))
+            // Use the execution strategy to handle transactional consistency and retries
+            // This is required for PostgreSQL NpgsqlRetryingExecutionStrategy
+            var executionStrategy = context.Database.CreateExecutionStrategy();
+            await executionStrategy.ExecuteAsync(async () =>
             {
                 await context.ItemValues.Where(e => e.BaseItemsMap!.Count == 0).ExecuteDeleteAsync(cancellationToken).ConfigureAwait(false);
                 subProgress.Report(50);
-                await transaction.CommitAsync(cancellationToken).ConfigureAwait(false);
                 subProgress.Report(100);
-            }
+            }).ConfigureAwait(false);
         }
 
         progress.Report(100);

Emby.Server.Implementations/Emby.Server.Implementations.csproj

@@ -2,6 +2,7 @@
 
   <!-- ProjectGuid is only included as a requirement for SonarQube analysis -->
   <PropertyGroup>
+    <NoWarn>$(NoWarn);CA1024;CA1031;CA1032;CA1034;CA1054;CA1055;CA1056;CA1062;CA1308;CA1303;CA1305;CA1508;CA1722;CA1724;CA1805;CA1813;CA1815;CA1816;CA1819;CA1821;CA1822;CA1823;CA1824;CA1825;CA1826;CA1830;CA1836;CA1839;CA1840;CA1841;CA1859;CA1861;CA1873;CA1911;CA2000;CA2007;CA2016;CA2025;CA2026;CA2100;CA2101;CA2102;CA2201;CA2202;CA2207;CA2208;CA2219;CA2220;CA2222;CA2225;CA2226;CA2230;CA2231;CA2234;CA2241;CA2242;CA2243;CA2244;CA2245;CA2246;CA2247;CA2248;CA2249;CA2250;CA2253;CA3001;CA3002;CA3003;CA3004;CA3005;CA3006;CA3007;CA3008;CA3009;CA3010;CA3011;CA3012;CA3061;CA3062;CA5359;CA5360;CA5361;CA5362;CA5363;CA5364;CA5365;CA5366;CA5367;CA5368;CA5369;CA5370;CA5371;CA5372;CA5373;CA5374;CA5375;CA5376;CA5377;CA5378;CA5379;CA5380;CA5381;CA5382;CA5383;CA5384;CA5385;CA5386;CA5387;CA5388;CA5389;CA5390;CA5391;CA5392;CA5393;CA5394;CA5395;CA5396;CA5397;CA5398;CA5399;CA5400;CA5401;CA5402;CA5403;NU1903;CA1848;CA1515;CA1812;CA1849;CA1860;CA1867;CA1517;NU1510</NoWarn>
     <ProjectGuid>{E383961B-9356-4D5D-8233-9A1079D03055}</ProjectGuid>
   </PropertyGroup>
 
@@ -24,11 +25,11 @@
   <ItemGroup>
     <PackageReference Include="BitFaster.Caching" />
     <PackageReference Include="DiscUtils.Udf" />
-    
+
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" />
     <PackageReference Include="Microsoft.Extensions.Caching.Memory" />
-    <PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" />
+    <PackageReference Include="Microsoft.Kiota.Abstractions" />
     <PackageReference Include="prometheus-net.DotNetRuntime" />
     <PackageReference Include="DotNet.Glob" />
   </ItemGroup>
@@ -38,12 +39,14 @@
   </ItemGroup>
 
   <PropertyGroup>
+    <NoWarn>$(NoWarn);CA1024;CA1031;CA1032;CA1034;CA1054;CA1055;CA1056;CA1062;CA1308;CA1303;CA1305;CA1508;CA1722;CA1724;CA1805;CA1813;CA1815;CA1816;CA1819;CA1821;CA1822;CA1823;CA1824;CA1825;CA1826;CA1830;CA1836;CA1839;CA1840;CA1841;CA1859;CA1861;CA1873;CA1911;CA2000;CA2007;CA2016;CA2025;CA2026;CA2100;CA2101;CA2102;CA2201;CA2202;CA2207;CA2208;CA2219;CA2220;CA2222;CA2225;CA2226;CA2230;CA2231;CA2234;CA2241;CA2242;CA2243;CA2244;CA2245;CA2246;CA2247;CA2248;CA2249;CA2250;CA2253;CA3001;CA3002;CA3003;CA3004;CA3005;CA3006;CA3007;CA3008;CA3009;CA3010;CA3011;CA3012;CA3061;CA3062;CA5359;CA5360;CA5361;CA5362;CA5363;CA5364;CA5365;CA5366;CA5367;CA5368;CA5369;CA5370;CA5371;CA5372;CA5373;CA5374;CA5375;CA5376;CA5377;CA5378;CA5379;CA5380;CA5381;CA5382;CA5383;CA5384;CA5385;CA5386;CA5387;CA5388;CA5389;CA5390;CA5391;CA5392;CA5393;CA5394;CA5395;CA5396;CA5397;CA5398;CA5399;CA5400;CA5401;CA5402;CA5403;NU1903;CA1848;CA1515;CA1812;CA1849;CA1860;CA1867;CA1517</NoWarn>
     <TargetFramework>net11.0</TargetFramework>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
   </PropertyGroup>
 
   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
+    <NoWarn>$(NoWarn);CA1024;CA1031;CA1032;CA1034;CA1054;CA1055;CA1056;CA1062;CA1308;CA1303;CA1305;CA1508;CA1722;CA1724;CA1805;CA1813;CA1815;CA1816;CA1819;CA1821;CA1822;CA1823;CA1824;CA1825;CA1826;CA1830;CA1836;CA1839;CA1840;CA1841;CA1859;CA1861;CA1873;CA1911;CA2000;CA2007;CA2016;CA2025;CA2026;CA2100;CA2101;CA2102;CA2201;CA2202;CA2207;CA2208;CA2219;CA2220;CA2222;CA2225;CA2226;CA2230;CA2231;CA2234;CA2241;CA2242;CA2243;CA2244;CA2245;CA2246;CA2247;CA2248;CA2249;CA2250;CA2253;CA3001;CA3002;CA3003;CA3004;CA3005;CA3006;CA3007;CA3008;CA3009;CA3010;CA3011;CA3012;CA3061;CA3062;CA5359;CA5360;CA5361;CA5362;CA5363;CA5364;CA5365;CA5366;CA5367;CA5368;CA5369;CA5370;CA5371;CA5372;CA5373;CA5374;CA5375;CA5376;CA5377;CA5378;CA5379;CA5380;CA5381;CA5382;CA5383;CA5384;CA5385;CA5386;CA5387;CA5388;CA5389;CA5390;CA5391;CA5392;CA5393;CA5394;CA5395;CA5396;CA5397;CA5398;CA5399;CA5400;CA5401;CA5402;CA5403;NU1903;CA1848;CA1515;CA1812;CA1849;CA1860;CA1867;CA1517</NoWarn>
     <CodeAnalysisTreatWarningsAsErrors>false</CodeAnalysisTreatWarningsAsErrors>
   </PropertyGroup>
 

Emby.Server.Implementations/HttpServer/WebSocketConnection.cs

@@ -22,6 +22,15 @@ namespace Emby.Server.Implementations.HttpServer
 
     /// <summary>
     /// Class WebSocketConnection.
+    /// Represents an authenticated WebSocket connection to a Jellyfin client.
+    ///
+    /// Authentication is performed during connection establishment in WebSocketManager.
+    /// The client must provide a valid API token via one of these methods:
+    /// - Query parameter: ws://server:8096/socket?api_key=TOKEN
+    /// - Authorization header: MediaBrowser Token="..."
+    /// - Legacy headers: X-Emby-Token or X-MediaBrowser-Token
+    ///
+    /// Once established, AuthorizationInfo contains the authenticated user/device information.
     /// </summary>
     public class WebSocketConnection : IWebSocketConnection
     {
@@ -47,7 +56,7 @@ namespace Emby.Server.Implementations.HttpServer
         /// </summary>
         /// <param name="logger">The logger.</param>
         /// <param name="socket">The socket.</param>
-        /// <param name="authorizationInfo">The authorization information.</param>
+        /// <param name="authorizationInfo">The authorization information containing authenticated user/device details.</param>
         /// <param name="remoteEndPoint">The remote end point.</param>
         public WebSocketConnection(
             ILogger<WebSocketConnection> logger,

Emby.Server.Implementations/HttpServer/WebSocketManager.cs

@@ -18,6 +18,25 @@ using Microsoft.Extensions.Logging;
 
 namespace Emby.Server.Implementations.HttpServer
 {
+    /// <summary>
+    /// Manages WebSocket connections with authentication support.
+    ///
+    /// Clients should authenticate when connecting to WebSocket endpoints by providing an API token
+    /// through one of these methods:
+    ///
+    /// 1. Query String Parameter (Recommended):
+    ///    - URL: ws://jellyfin-server:8096/socket?api_key=YOUR_API_TOKEN
+    ///    - JavaScript: const ws = new WebSocket(`ws://jellyfin-server:8096/socket?api_key=${token}`);
+    ///
+    /// 2. Query String Parameter (Legacy):
+    ///    - URL: ws://jellyfin-server:8096/socket?ApiKey=YOUR_API_TOKEN
+    ///
+    /// 3. Authorization Header:
+    ///    - Header: MediaBrowser Device="...", Token="YOUR_API_TOKEN"
+    ///
+    /// The API token can be obtained from the server's API key management interface or
+    /// generated for specific clients/devices.
+    /// </summary>
     public class WebSocketManager : IWebSocketManager
     {
         private readonly IWebSocketListener[] _webSocketListeners;

Emby.Server.Implementations/Library/LibraryManager.cs

@@ -1223,29 +1223,26 @@ namespace Emby.Server.Implementations.Library
         private async Task RunPostScanTasks(IProgress<double> progress, CancellationToken cancellationToken)
         {
             var tasks = PostScanTasks.ToList();
-
-            var numComplete = 0;
             var numTasks = tasks.Count;
 
-            foreach (var task in tasks)
+            if (numTasks == 0)
             {
-                // Prevent access to modified closure
-                var currentNumComplete = numComplete;
+                _itemRepository.UpdateInheritedValues();
+                progress.Report(100);
+                return;
+            }
 
+            var progressValues = new double[numTasks];
+
+            async Task RunOneTask(ILibraryPostScanTask task, int taskIndex)
+            {
+                _logger.LogDebug("Running post-scan task {0}", task.GetType().Name);
                 var innerProgress = new Progress<double>(pct =>
                 {
-                    double innerPercent = pct;
-                    innerPercent /= 100;
-                    innerPercent += currentNumComplete;
-
-                    innerPercent /= numTasks;
-                    innerPercent *= 100;
-
-                    progress.Report(innerPercent);
+                    progressValues[taskIndex] = pct;
+                    progress.Report(progressValues.Average());
                 });
 
-                _logger.LogDebug("Running post-scan task {0}", task.GetType().Name);
-
                 try
                 {
                     await task.Run(innerProgress, cancellationToken).ConfigureAwait(false);
@@ -1260,12 +1257,12 @@ namespace Emby.Server.Implementations.Library
                     _logger.LogError(ex, "Error running post-scan task");
                 }
 
-                numComplete++;
-                double percent = numComplete;
-                percent /= numTasks;
-                progress.Report(percent * 100);
+                progressValues[taskIndex] = 100;
+                progress.Report(progressValues.Average());
             }
 
+            await Task.WhenAll(tasks.Select((task, i) => RunOneTask(task, i))).ConfigureAwait(false);
+
             _itemRepository.UpdateInheritedValues();
 
             progress.Report(100);
@@ -1997,7 +1994,7 @@ namespace Emby.Server.Implementations.Library
         /// <inheritdoc />
         public void CreateItems(IReadOnlyList<BaseItem> items, BaseItem? parent, CancellationToken cancellationToken)
         {
-            _itemRepository.SaveItems(items, cancellationToken);
+            _itemRepository.SaveItemsAsync(items, cancellationToken).GetAwaiter().GetResult();
 
             foreach (var item in items)
             {
@@ -2165,7 +2162,7 @@ namespace Emby.Server.Implementations.Library
                 item.DateLastSaved = DateTime.UtcNow;
             }
 
-            _itemRepository.SaveItems(items, cancellationToken);
+            await _itemRepository.SaveItemsAsync(items, cancellationToken).ConfigureAwait(false);
 
             if (parent is Folder folder)
             {

Emby.Server.Implementations/Library/LibraryOptionsRepository.cs

@@ -0,0 +1,177 @@
+// <copyright file="LibraryOptionsRepository.cs" company="PlaceholderCompany">
+// Copyright (c) PlaceholderCompany. All rights reserved.
+// </copyright>
+
+#nullable disable
+
+namespace Emby.Server.Implementations.Library;
+
+using System;
+using System.Text.Json;
+using System.Threading;
+using System.Threading.Tasks;
+using Jellyfin.Database.Implementations;
+using Jellyfin.Database.Implementations.Entities;
+using Jellyfin.Extensions.Json;
+using MediaBrowser.Controller;
+using MediaBrowser.Controller.Persistence;
+using MediaBrowser.Model.Configuration;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.Logging;
+
+/// <summary>
+/// Repository for persisting collection-folder library options in the database.
+/// </summary>
+public class LibraryOptionsRepository : ILibraryOptionsRepository
+{
+    private readonly IDbContextFactory<JellyfinDbContext> _dbProvider;
+    private readonly IServerApplicationHost _appHost;
+    private readonly ILogger<LibraryOptionsRepository> _logger;
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="LibraryOptionsRepository"/> class.
+    /// </summary>
+    /// <param name="dbProvider">The db context factory.</param>
+    /// <param name="appHost">The application host.</param>
+    /// <param name="logger">The logger.</param>
+    public LibraryOptionsRepository(
+        IDbContextFactory<JellyfinDbContext> dbProvider,
+        IServerApplicationHost appHost,
+        ILogger<LibraryOptionsRepository> logger)
+    {
+        _dbProvider = dbProvider;
+        _appHost = appHost;
+        _logger = logger;
+    }
+
+    /// <inheritdoc />
+    public LibraryOptions GetLibraryOptions(string libraryPath)
+        => GetLibraryOptionsAsync(libraryPath, CancellationToken.None).GetAwaiter().GetResult();
+
+    /// <inheritdoc />
+    public void SaveLibraryOptions(string libraryPath, LibraryOptions options)
+        => SaveLibraryOptionsAsync(libraryPath, options, CancellationToken.None).GetAwaiter().GetResult();
+
+    /// <summary>
+    /// Gets library options from the database if the backing table is available.
+    /// </summary>
+    /// <param name="libraryPath">The collection folder path.</param>
+    /// <param name="cancellationToken">The cancellation token.</param>
+    /// <returns>The expanded library options, or <c>null</c> if no row exists.</returns>
+    public async Task<LibraryOptions> GetLibraryOptionsAsync(string libraryPath, CancellationToken cancellationToken = default)
+    {
+        try
+        {
+            var context = await _dbProvider.CreateDbContextAsync(cancellationToken).ConfigureAwait(false);
+            await using (context.ConfigureAwait(false))
+            {
+                var entity = await context.LibraryOptions
+                    .AsNoTracking()
+                    .SingleOrDefaultAsync(e => e.LibraryPath == libraryPath, cancellationToken)
+                    .ConfigureAwait(false);
+
+                if (entity is null)
+                {
+                    return null;
+                }
+
+                var options = JsonSerializer.Deserialize<LibraryOptions>(entity.OptionsJson, JsonDefaults.Options) ?? new LibraryOptions();
+
+                foreach (var mediaPath in options.PathInfos)
+                {
+                    if (!string.IsNullOrEmpty(mediaPath.Path))
+                    {
+                        mediaPath.Path = _appHost.ExpandVirtualPath(mediaPath.Path);
+                    }
+                }
+
+                return options;
+            }
+        }
+        catch (Exception ex) when (IsMissingTableException(ex))
+        {
+            _logger.LogDebug(ex, "LibraryOptions table is not available yet. Falling back to XML for {LibraryPath}", libraryPath);
+            return null;
+        }
+        catch (Exception ex)
+        {
+            _logger.LogError(ex, "Error loading library options from database for {LibraryPath}", libraryPath);
+            return null;
+        }
+    }
+
+    /// <summary>
+    /// Saves library options to the database if the backing table is available.
+    /// </summary>
+    /// <param name="libraryPath">The collection folder path.</param>
+    /// <param name="options">The options to save.</param>
+    /// <param name="cancellationToken">The cancellation token.</param>
+    /// <returns>A task representing the asynchronous operation.</returns>
+    public async Task SaveLibraryOptionsAsync(string libraryPath, LibraryOptions options, CancellationToken cancellationToken = default)
+    {
+        try
+        {
+            var context = await _dbProvider.CreateDbContextAsync(cancellationToken).ConfigureAwait(false);
+            await using (context.ConfigureAwait(false))
+            {
+                var executionStrategy = context.Database.CreateExecutionStrategy();
+                await executionStrategy.ExecuteAsync(async () =>
+                {
+                    var clone = JsonSerializer.Deserialize<LibraryOptions>(JsonSerializer.SerializeToUtf8Bytes(options, JsonDefaults.Options), JsonDefaults.Options)
+                        ?? new LibraryOptions();
+
+                    foreach (var mediaPath in clone.PathInfos)
+                    {
+                        if (!string.IsNullOrEmpty(mediaPath.Path))
+                        {
+                            mediaPath.Path = _appHost.ReverseVirtualPath(mediaPath.Path);
+                        }
+                    }
+
+                    var entity = await context.LibraryOptions
+                        .SingleOrDefaultAsync(e => e.LibraryPath == libraryPath, cancellationToken)
+                        .ConfigureAwait(false);
+
+                    var utcNow = DateTime.UtcNow;
+                    var json = JsonSerializer.Serialize(clone, JsonDefaults.Options);
+
+                    if (entity is null)
+                    {
+                        entity = new LibraryOptionsEntity
+                        {
+                            LibraryPath = libraryPath,
+                            OptionsJson = json,
+                            Version = 1,
+                            DateCreated = utcNow,
+                            DateModified = utcNow
+                        };
+
+                        await context.LibraryOptions.AddAsync(entity, cancellationToken).ConfigureAwait(false);
+                    }
+                    else
+                    {
+                        entity.OptionsJson = json;
+                        entity.DateModified = utcNow;
+                    }
+
+                    await context.SaveChangesAsync(cancellationToken).ConfigureAwait(false);
+                }).ConfigureAwait(false);
+            }
+        }
+        catch (Exception ex) when (IsMissingTableException(ex))
+        {
+            _logger.LogDebug(ex, "LibraryOptions table is not available yet. Skipping database save for {LibraryPath}", libraryPath);
+        }
+        catch (Exception ex)
+        {
+            _logger.LogError(ex, "Error saving library options to database for {LibraryPath}", libraryPath);
+        }
+    }
+
+    private static bool IsMissingTableException(Exception exception)
+    {
+        return exception.Message.Contains("LibraryOptions", StringComparison.OrdinalIgnoreCase)
+            && (exception.Message.Contains("does not exist", StringComparison.OrdinalIgnoreCase)
+                || exception.Message.Contains("no such table", StringComparison.OrdinalIgnoreCase));
+    }
+}

Emby.Server.Implementations/Library/UserDataManager.cs

@@ -62,24 +62,28 @@ namespace Emby.Server.Implementations.Library
             var keys = item.GetUserDataKeys();
 
             using var dbContext = _repository.CreateDbContext();
-            using var transaction = dbContext.Database.BeginTransaction();
-
-            foreach (var key in keys)
+            var executionStrategy = dbContext.Database.CreateExecutionStrategy();
+            executionStrategy.Execute(() =>
             {
-                userData.Key = key;
-                var userDataEntry = Map(userData, user.Id, item.Id);
-                if (dbContext.UserData.Any(f => f.ItemId == userDataEntry.ItemId && f.UserId == userDataEntry.UserId && f.CustomDataKey == userDataEntry.CustomDataKey))
-                {
-                    dbContext.UserData.Attach(userDataEntry).State = EntityState.Modified;
-                }
-                else
-                {
-                    dbContext.UserData.Add(userDataEntry);
-                }
-            }
+                using var transaction = dbContext.Database.BeginTransaction();
 
-            dbContext.SaveChanges();
-            transaction.Commit();
+                foreach (var key in keys)
+                {
+                    userData.Key = key;
+                    var userDataEntry = Map(userData, user.Id, item.Id);
+                    if (dbContext.UserData.Any(f => f.ItemId == userDataEntry.ItemId && f.UserId == userDataEntry.UserId && f.CustomDataKey == userDataEntry.CustomDataKey))
+                    {
+                        dbContext.UserData.Attach(userDataEntry).State = EntityState.Modified;
+                    }
+                    else
+                    {
+                        dbContext.UserData.Add(userDataEntry);
+                    }
+                }
+
+                dbContext.SaveChanges();
+                transaction.Commit();
+            });
 
             var userId = user.InternalId;
             var cacheKey = GetCacheKey(userId, item.Id);

Emby.Server.Implementations/Library/UserViewManager.cs

@@ -145,6 +145,11 @@ namespace Emby.Server.Implementations.Library
             var sorted = _libraryManager.Sort(list, user, new[] { ItemSortBy.SortName }, SortOrder.Ascending).ToList();
             var orders = user.GetPreferenceValues<Guid>(PreferenceKind.OrderedViews);
 
+            // Create a lookup dictionary for efficient and reliable ordering
+            var sortedIndexLookup = sorted
+                .Select((item, index) => new { item, index })
+                .ToDictionary(x => x.item.Id, x => x.index);
+
             return list
                 .OrderBy(i =>
                 {
@@ -158,7 +163,7 @@ namespace Emby.Server.Implementations.Library
 
                     return index == -1 ? int.MaxValue : index;
                 })
-                .ThenBy(sorted.IndexOf)
+                .ThenBy(i => sortedIndexLookup.TryGetValue(i.Id, out var sortIndex) ? sortIndex : int.MaxValue)
                 .ThenBy(i => i.SortName)
                 .ToArray();
         }

Emby.Server.Implementations/Session/SessionManager.cs

@@ -64,7 +64,6 @@ namespace Emby.Server.Implementations.Session
         private readonly IMediaSourceManager _mediaSourceManager;
         private readonly IServerApplicationHost _appHost;
         private readonly IDeviceManager _deviceManager;
-        private readonly Jellyfin.Server.Implementations.Clustering.IInstanceRegistry _instanceRegistry;
         private readonly CancellationTokenRegistration _shutdownCallback;
         private readonly ConcurrentDictionary<string, SessionInfo> _activeConnections
             = new(StringComparer.OrdinalIgnoreCase);
@@ -94,7 +93,6 @@ namespace Emby.Server.Implementations.Session
         /// <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>
-        /// <param name="instanceRegistry">Instance registry for multi-instance support (optional for backward compatibility).</param>
         public SessionManager(
             ILogger<SessionManager> logger,
             IEventManager eventManager,
@@ -108,8 +106,7 @@ namespace Emby.Server.Implementations.Session
             IServerApplicationHost appHost,
             IDeviceManager deviceManager,
             IMediaSourceManager mediaSourceManager,
-            IHostApplicationLifetime hostApplicationLifetime,
-            Jellyfin.Server.Implementations.Clustering.IInstanceRegistry instanceRegistry = null)
+            IHostApplicationLifetime hostApplicationLifetime)
         {
             _logger = logger;
             _eventManager = eventManager;
@@ -123,7 +120,6 @@ namespace Emby.Server.Implementations.Session
             _appHost = appHost;
             _deviceManager = deviceManager;
             _mediaSourceManager = mediaSourceManager;
-            _instanceRegistry = instanceRegistry;
             _shutdownCallback = hostApplicationLifetime.ApplicationStopping.Register(OnApplicationStopping);
 
             _deviceManager.DeviceOptionsUpdated += OnDeviceManagerDeviceOptionsUpdated;
@@ -160,30 +156,10 @@ namespace Emby.Server.Implementations.Session
         public event EventHandler<SessionEventArgs> SessionControllerConnected;
 
         /// <summary>
-        /// Gets all connections for the current instance.
+        /// Gets all connections.
         /// </summary>
         /// <value>All connections.</value>
-        /// <remarks>
-        /// In multi-instance deployments, only returns sessions owned by the current instance.
-        /// In single-instance deployments (when _instanceRegistry is null), returns all sessions.
-        /// </remarks>
-        public IEnumerable<SessionInfo> Sessions
-        {
-            get
-            {
-                if (_instanceRegistry is null)
-                {
-                    // Single-instance mode: return all sessions
-                    return _activeConnections.Values.OrderByDescending(c => c.LastActivityDate);
-                }
-
-                // Multi-instance mode: only return sessions for this instance
-                var currentInstanceId = _instanceRegistry.CurrentInstanceId;
-                return _activeConnections.Values
-                    .Where(s => s.InstanceId.Equals(currentInstanceId))
-                    .OrderByDescending(c => c.LastActivityDate);
-            }
-        }
+        public IEnumerable<SessionInfo> Sessions => _activeConnections.Values.OrderByDescending(c => c.LastActivityDate);
 
         private void OnDeviceManagerDeviceOptionsUpdated(object sender, GenericEventArgs<Tuple<string, DeviceOptions>> e)
         {
@@ -580,8 +556,7 @@ namespace Emby.Server.Implementations.Session
                 DeviceId = deviceId,
                 ApplicationVersion = appVersion,
                 Id = key.GetMD5().ToString("N", CultureInfo.InvariantCulture),
-                ServerId = _appHost.SystemId,
-                InstanceId = _instanceRegistry?.CurrentInstanceId ?? Guid.Empty
+                ServerId = _appHost.SystemId
             };
 
             var username = user?.Username;

Jellyfin.Api/Controllers/DatabaseViewsController.cs

@@ -0,0 +1,302 @@
+// <copyright file="DatabaseViewsController.cs" company="PlaceholderCompany">
+// Copyright (c) PlaceholderCompany. All rights reserved.
+// </copyright>
+
+namespace Jellyfin.Api.Controllers;
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using Jellyfin.Database.Implementations;
+using Jellyfin.Database.Implementations.Entities.Views;
+using MediaBrowser.Common.Api;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.EntityFrameworkCore;
+
+/// <summary>
+/// Exposes the PostgreSQL reporting views as read-only API endpoints.
+/// All endpoints require administrator privileges.
+/// </summary>
+[Route("DatabaseViews")]
+[Authorize(Policy = Policies.RequiresElevation)]
+public class DatabaseViewsController : BaseJellyfinApiController
+{
+    private readonly IDbContextFactory<JellyfinDbContext> _dbFactory;
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="DatabaseViewsController"/> class.
+    /// </summary>
+    /// <param name="dbFactory">The EF Core context factory.</param>
+    public DatabaseViewsController(IDbContextFactory<JellyfinDbContext> dbFactory)
+    {
+        _dbFactory = dbFactory;
+    }
+
+    /// <summary>
+    /// Gets a flat list of all media streams (audio + video columns merged).
+    /// Maps to library."MediaStreamInfos_v".
+    /// </summary>
+    /// <param name="itemId">Optional item ID filter.</param>
+    /// <param name="streamType">Optional stream type filter (0=Audio, 1=Video, 2=Subtitle).</param>
+    /// <param name="startIndex">Record index to start at.</param>
+    /// <param name="limit">Maximum records to return (1-1000, default 100).</param>
+    /// <returns>List of media stream rows.</returns>
+    [HttpGet("MediaStreamInfos")]
+    [ProducesResponseType(StatusCodes.Status200OK)]
+    public async Task<ActionResult<IEnumerable<MediaStreamInfoView>>> GetMediaStreamInfos(
+        [FromQuery] Guid? itemId = null,
+        [FromQuery] int? streamType = null,
+        [FromQuery] int startIndex = 0,
+        [FromQuery] int limit = 100)
+    {
+        limit = Math.Clamp(limit, 1, 1000);
+        await using var db = await _dbFactory.CreateDbContextAsync().ConfigureAwait(false);
+
+        var query = db.MediaStreamInfoViews.AsNoTracking();
+        if (itemId.HasValue)
+        {
+            var id = itemId.Value;
+            query = query.Where(x => x.ItemId.HasValue && x.ItemId.Value.Equals(id));
+        }
+
+        if (streamType.HasValue)
+        {
+            query = query.Where(x => x.StreamType == streamType.Value);
+        }
+
+        IEnumerable<MediaStreamInfoView> results = await query
+            .OrderBy(x => x.ItemId)
+            .ThenBy(x => x.StreamIndex)
+            .Skip(startIndex)
+            .Take(limit)
+            .ToListAsync()
+            .ConfigureAwait(false);
+
+        return Ok(results);
+    }
+
+    /// <summary>
+    /// Gets video items joined with primary stream technical details.
+    /// Maps to library."VideoItems_v".
+    /// </summary>
+    /// <param name="type">Optional partial type filter (e.g. "Movie", "Episode").</param>
+    /// <param name="minHeight">Optional minimum video height (e.g. 2160 for 4K).</param>
+    /// <param name="hdrFormat">Optional HDR format ("Dolby Vision", "HDR10+", "HDR10", "HLG", "SDR").</param>
+    /// <param name="startIndex">Record index to start at.</param>
+    /// <param name="limit">Maximum records to return (1-1000, default 100).</param>
+    /// <returns>List of video item rows.</returns>
+    [HttpGet("VideoItems")]
+    [ProducesResponseType(StatusCodes.Status200OK)]
+    public async Task<ActionResult<IEnumerable<VideoItemView>>> GetVideoItems(
+        [FromQuery] string? type = null,
+        [FromQuery] int? minHeight = null,
+        [FromQuery] string? hdrFormat = null,
+        [FromQuery] int startIndex = 0,
+        [FromQuery] int limit = 100)
+    {
+        limit = Math.Clamp(limit, 1, 1000);
+        await using var db = await _dbFactory.CreateDbContextAsync().ConfigureAwait(false);
+
+        var query = db.VideoItemViews.AsNoTracking();
+        if (!string.IsNullOrEmpty(type))
+        {
+            query = query.Where(x => x.Type != null && x.Type.Contains(type));
+        }
+
+        if (minHeight.HasValue)
+        {
+            query = query.Where(x => x.Height >= minHeight.Value);
+        }
+
+        if (!string.IsNullOrEmpty(hdrFormat))
+        {
+            query = query.Where(x => x.HDRFormat == hdrFormat);
+        }
+
+        IEnumerable<VideoItemView> results = await query
+            .OrderBy(x => x.Name)
+            .Skip(startIndex)
+            .Take(limit)
+            .ToListAsync()
+            .ConfigureAwait(false);
+
+        return Ok(results);
+    }
+
+    /// <summary>
+    /// Gets per-user playback history with calculated progress percentages.
+    /// Maps to library."UserPlaybackHistory_v".
+    /// </summary>
+    /// <param name="username">Optional exact username filter.</param>
+    /// <param name="itemId">Optional item ID filter.</param>
+    /// <param name="inProgressOnly">When true, returns only items started but not fully played.</param>
+    /// <param name="startIndex">Record index to start at.</param>
+    /// <param name="limit">Maximum records to return (1-1000, default 100).</param>
+    /// <returns>List of playback history rows.</returns>
+    [HttpGet("PlaybackHistory")]
+    [ProducesResponseType(StatusCodes.Status200OK)]
+    public async Task<ActionResult<IEnumerable<UserPlaybackHistoryView>>> GetPlaybackHistory(
+        [FromQuery] string? username = null,
+        [FromQuery] Guid? itemId = null,
+        [FromQuery] bool inProgressOnly = false,
+        [FromQuery] int startIndex = 0,
+        [FromQuery] int limit = 100)
+    {
+        limit = Math.Clamp(limit, 1, 1000);
+        await using var db = await _dbFactory.CreateDbContextAsync().ConfigureAwait(false);
+
+        var query = db.UserPlaybackHistoryViews.AsNoTracking();
+        if (!string.IsNullOrEmpty(username))
+        {
+            query = query.Where(x => x.Username == username);
+        }
+
+        if (itemId.HasValue)
+        {
+            var id = itemId.Value;
+            query = query.Where(x => x.ItemId.HasValue && x.ItemId.Value.Equals(id));
+        }
+
+        if (inProgressOnly)
+        {
+            query = query.Where(x => x.Played != true && x.ProgressPct > 0);
+        }
+
+        IEnumerable<UserPlaybackHistoryView> results = await query
+            .OrderByDescending(x => x.LastPlayedDate)
+            .Skip(startIndex)
+            .Take(limit)
+            .ToListAsync()
+            .ConfigureAwait(false);
+
+        return Ok(results);
+    }
+
+    /// <summary>
+    /// Gets items with their external provider IDs (IMDb, TMDB, TVDB, etc.) in named columns.
+    /// Maps to library."ItemProviders_v".
+    /// </summary>
+    /// <param name="type">Optional partial type filter.</param>
+    /// <param name="imdbId">Optional exact IMDb ID filter.</param>
+    /// <param name="tmdbId">Optional exact TMDB ID filter.</param>
+    /// <param name="tvdbId">Optional exact TVDB ID filter.</param>
+    /// <param name="startIndex">Record index to start at.</param>
+    /// <param name="limit">Maximum records to return (1-1000, default 100).</param>
+    /// <returns>List of item provider rows.</returns>
+    [HttpGet("ItemProviders")]
+    [ProducesResponseType(StatusCodes.Status200OK)]
+    public async Task<ActionResult<IEnumerable<ItemProviderView>>> GetItemProviders(
+        [FromQuery] string? type = null,
+        [FromQuery] string? imdbId = null,
+        [FromQuery] string? tmdbId = null,
+        [FromQuery] string? tvdbId = null,
+        [FromQuery] int startIndex = 0,
+        [FromQuery] int limit = 100)
+    {
+        limit = Math.Clamp(limit, 1, 1000);
+        await using var db = await _dbFactory.CreateDbContextAsync().ConfigureAwait(false);
+
+        var query = db.ItemProviderViews.AsNoTracking();
+        if (!string.IsNullOrEmpty(type))
+        {
+            query = query.Where(x => x.Type != null && x.Type.Contains(type));
+        }
+
+        if (!string.IsNullOrEmpty(imdbId))
+        {
+            query = query.Where(x => x.ImdbId == imdbId);
+        }
+
+        if (!string.IsNullOrEmpty(tmdbId))
+        {
+            query = query.Where(x => x.TmdbId == tmdbId);
+        }
+
+        if (!string.IsNullOrEmpty(tvdbId))
+        {
+            query = query.Where(x => x.TvdbId == tvdbId);
+        }
+
+        IEnumerable<ItemProviderView> results = await query
+            .OrderBy(x => x.Name)
+            .Skip(startIndex)
+            .Take(limit)
+            .ToListAsync()
+            .ConfigureAwait(false);
+
+        return Ok(results);
+    }
+
+    /// <summary>
+    /// Gets cast and crew entries linked to the items they appear in.
+    /// Maps to library."ItemPeople_v".
+    /// </summary>
+    /// <param name="personName">Optional exact person name filter.</param>
+    /// <param name="personType">Optional person type filter (e.g. "Actor", "Director").</param>
+    /// <param name="itemId">Optional item ID filter.</param>
+    /// <param name="startIndex">Record index to start at.</param>
+    /// <param name="limit">Maximum records to return (1-1000, default 100).</param>
+    /// <returns>List of item person rows.</returns>
+    [HttpGet("ItemPeople")]
+    [ProducesResponseType(StatusCodes.Status200OK)]
+    public async Task<ActionResult<IEnumerable<ItemPersonView>>> GetItemPeople(
+        [FromQuery] string? personName = null,
+        [FromQuery] string? personType = null,
+        [FromQuery] Guid? itemId = null,
+        [FromQuery] int startIndex = 0,
+        [FromQuery] int limit = 100)
+    {
+        limit = Math.Clamp(limit, 1, 1000);
+        await using var db = await _dbFactory.CreateDbContextAsync().ConfigureAwait(false);
+
+        var query = db.ItemPersonViews.AsNoTracking();
+        if (!string.IsNullOrEmpty(personName))
+        {
+            query = query.Where(x => x.PersonName == personName);
+        }
+
+        if (!string.IsNullOrEmpty(personType))
+        {
+            query = query.Where(x => x.PersonType == personType);
+        }
+
+        if (itemId.HasValue)
+        {
+            var id = itemId.Value;
+            query = query.Where(x => x.ItemId.HasValue && x.ItemId.Value.Equals(id));
+        }
+
+        IEnumerable<ItemPersonView> results = await query
+            .OrderBy(x => x.PersonName)
+            .ThenBy(x => x.SortOrder)
+            .Skip(startIndex)
+            .Take(limit)
+            .ToListAsync()
+            .ConfigureAwait(false);
+
+        return Ok(results);
+    }
+
+    /// <summary>
+    /// Gets aggregate library statistics - one row per item type.
+    /// Maps to library."LibrarySummary_v".
+    /// </summary>
+    /// <returns>List of library summary rows, one per item type.</returns>
+    [HttpGet("LibrarySummary")]
+    [ProducesResponseType(StatusCodes.Status200OK)]
+    public async Task<ActionResult<IEnumerable<LibrarySummaryView>>> GetLibrarySummary()
+    {
+        await using var db = await _dbFactory.CreateDbContextAsync().ConfigureAwait(false);
+
+        IEnumerable<LibrarySummaryView> results = await db.LibrarySummaryViews
+            .AsNoTracking()
+            .OrderBy(x => x.Type)
+            .ToListAsync()
+            .ConfigureAwait(false);
+
+        return Ok(results);
+    }
+}

Jellyfin.Api/Jellyfin.Api.csproj

@@ -2,10 +2,12 @@
 
   <!-- ProjectGuid is only included as a requirement for SonarQube analysis -->
   <PropertyGroup>
+    <NoWarn>$(NoWarn);CA1024;CA1031;CA1032;CA1034;CA1054;CA1055;CA1056;CA1062;CA1308;CA1303;CA1305;CA1508;CA1722;CA1724;CA1805;CA1813;CA1815;CA1816;CA1819;CA1821;CA1822;CA1823;CA1824;CA1825;CA1826;CA1830;CA1836;CA1839;CA1840;CA1841;CA1859;CA1861;CA1873;CA1911;CA2000;CA2007;CA2016;CA2025;CA2026;CA2100;CA2101;CA2102;CA2201;CA2202;CA2207;CA2208;CA2219;CA2220;CA2222;CA2225;CA2226;CA2230;CA2231;CA2234;CA2241;CA2242;CA2243;CA2244;CA2245;CA2246;CA2247;CA2248;CA2249;CA2250;CA2253;CA3001;CA3002;CA3003;CA3004;CA3005;CA3006;CA3007;CA3008;CA3009;CA3010;CA3011;CA3012;CA3061;CA3062;CA5359;CA5360;CA5361;CA5362;CA5363;CA5364;CA5365;CA5366;CA5367;CA5368;CA5369;CA5370;CA5371;CA5372;CA5373;CA5374;CA5375;CA5376;CA5377;CA5378;CA5379;CA5380;CA5381;CA5382;CA5383;CA5384;CA5385;CA5386;CA5387;CA5388;CA5389;CA5390;CA5391;CA5392;CA5393;CA5394;CA5395;CA5396;CA5397;CA5398;CA5399;CA5400;CA5401;CA5402;CA5403;NU1903;CA1848;CA1515;CA1812;CA1849;CA1860;CA1867;CA1517</NoWarn>
     <ProjectGuid>{DFBEFB4C-DA19-4143-98B7-27320C7F7163}</ProjectGuid>
   </PropertyGroup>
 
   <PropertyGroup>
+    <NoWarn>$(NoWarn);CA1024;CA1031;CA1032;CA1034;CA1054;CA1055;CA1056;CA1062;CA1308;CA1303;CA1305;CA1508;CA1722;CA1724;CA1805;CA1813;CA1815;CA1816;CA1819;CA1821;CA1822;CA1823;CA1824;CA1825;CA1826;CA1830;CA1836;CA1839;CA1840;CA1841;CA1859;CA1861;CA1873;CA1911;CA2000;CA2007;CA2016;CA2025;CA2026;CA2100;CA2101;CA2102;CA2201;CA2202;CA2207;CA2208;CA2219;CA2220;CA2222;CA2225;CA2226;CA2230;CA2231;CA2234;CA2241;CA2242;CA2243;CA2244;CA2245;CA2246;CA2247;CA2248;CA2249;CA2250;CA2253;CA3001;CA3002;CA3003;CA3004;CA3005;CA3006;CA3007;CA3008;CA3009;CA3010;CA3011;CA3012;CA3061;CA3062;CA5359;CA5360;CA5361;CA5362;CA5363;CA5364;CA5365;CA5366;CA5367;CA5368;CA5369;CA5370;CA5371;CA5372;CA5373;CA5374;CA5375;CA5376;CA5377;CA5378;CA5379;CA5380;CA5381;CA5382;CA5383;CA5384;CA5385;CA5386;CA5387;CA5388;CA5389;CA5390;CA5391;CA5392;CA5393;CA5394;CA5395;CA5396;CA5397;CA5398;CA5399;CA5400;CA5401;CA5402;CA5403;NU1903;CA1848;CA1515;CA1812;CA1849;CA1860;CA1867;CA1517</NoWarn>
     <TargetFramework>net11.0</TargetFramework>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
   </PropertyGroup>
@@ -14,6 +16,7 @@
     <PackageReference Include="Jellyfin.Sdk" />
     <PackageReference Include="Microsoft.AspNetCore.Authorization" />
     <PackageReference Include="Microsoft.Extensions.Http" />
+    <PackageReference Include="Microsoft.Kiota.Abstractions" />
     <PackageReference Include="Swashbuckle.AspNetCore" />
     <PackageReference Include="Swashbuckle.AspNetCore.ReDoc" />
   </ItemGroup>

Jellyfin.Api/Middleware/ExceptionMiddleware.cs

@@ -83,11 +83,22 @@ public class ExceptionMiddleware
             {
                 if (isAuthenticationError)
                 {
-                    // Log authentication errors as warnings with user-friendly message
-                    _logger.LogWarning(
-                        "Access denied: Unable to process request. Authentication token missing or invalid. URL {Method} {Url}.",
-                        context.Request.Method,
-                        context.Request.Path);
+                    // WebSocket authentication failures are expected when clients connect without tokens
+                    // Log at Debug level to reduce noise, unless it's not a WebSocket endpoint
+                    if (context.Request.Path.StartsWithSegments("/socket", StringComparison.OrdinalIgnoreCase))
+                    {
+                        _logger.LogDebug(
+                            "WebSocket connection rejected: Authentication token missing or invalid. IP: {IP}",
+                            context.Connection.RemoteIpAddress);
+                    }
+                    else
+                    {
+                        // Log authentication errors for non-WebSocket endpoints as warnings
+                        _logger.LogWarning(
+                            "Access denied: Unable to process request. Authentication token missing or invalid. URL {Method} {Url}.",
+                            context.Request.Method,
+                            context.Request.Path);
+                    }
                 }
                 else
                 {

Jellyfin.Api/Middleware/WebSocketAuthenticationMiddleware.cs

@@ -0,0 +1,135 @@
+// <copyright file="WebSocketAuthenticationMiddleware.cs" company="PlaceholderCompany">
+// Copyright (c) PlaceholderCompany. All rights reserved.
+// </copyright>
+
+namespace Jellyfin.Api.Middleware;
+
+using System;
+using System.Globalization;
+using System.Security.Claims;
+using System.Threading.Tasks;
+using Jellyfin.Api.Constants;
+using Jellyfin.Data;
+using Jellyfin.Database.Implementations.Enums;
+using MediaBrowser.Controller.Net;
+using Microsoft.AspNetCore.Http;
+using Microsoft.Extensions.Logging;
+
+/// <summary>
+/// WebSocket Authentication Middleware.
+/// Extracts and validates API tokens from WebSocket query strings.
+/// </summary>
+public class WebSocketAuthenticationMiddleware
+{
+    private readonly RequestDelegate _next;
+    private readonly ILogger<WebSocketAuthenticationMiddleware> _logger;
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="WebSocketAuthenticationMiddleware"/> class.
+    /// </summary>
+    /// <param name="next">The next delegate in the pipeline.</param>
+    /// <param name="logger">The logger.</param>
+    public WebSocketAuthenticationMiddleware(RequestDelegate next, ILogger<WebSocketAuthenticationMiddleware> logger)
+    {
+        _next = next;
+        _logger = logger;
+    }
+
+    /// <summary>
+    /// Executes the middleware action.
+    /// </summary>
+    /// <param name="httpContext">The current HTTP context.</param>
+    /// <param name="authService">The authentication service.</param>
+    /// <returns>The async task.</returns>
+    public async Task Invoke(HttpContext httpContext, IAuthService authService)
+    {
+        // Only process WebSocket upgrade requests on the /socket endpoint
+        if (httpContext.WebSockets.IsWebSocketRequest
+            && httpContext.Request.Path.StartsWithSegments("/socket", StringComparison.OrdinalIgnoreCase))
+        {
+            await AuthenticateWebSocketRequest(httpContext, authService).ConfigureAwait(false);
+        }
+
+        await _next(httpContext).ConfigureAwait(false);
+    }
+
+    /// <summary>
+    /// Authenticates WebSocket requests by extracting api_key from query string.
+    /// </summary>
+    /// <param name="httpContext">The HTTP context.</param>
+    /// <param name="authService">The authentication service.</param>
+    /// <returns>The async task.</returns>
+    private async Task AuthenticateWebSocketRequest(HttpContext httpContext, IAuthService authService)
+    {
+        try
+        {
+            // Extract api_key from query string
+            if (!httpContext.Request.Query.TryGetValue("api_key", out var apiKeyValues) || apiKeyValues.Count == 0)
+            {
+                _logger.LogDebug(
+                    "WebSocket connection attempted without api_key query parameter. IP: {IP}",
+                    httpContext.Connection.RemoteIpAddress);
+                return;
+            }
+
+            var apiKey = apiKeyValues[0];
+            if (string.IsNullOrWhiteSpace(apiKey))
+            {
+                _logger.LogDebug(
+                    "WebSocket connection attempted with empty api_key. IP: {IP}",
+                    httpContext.Connection.RemoteIpAddress);
+                return;
+            }
+
+            // Authenticate using the provided api_key
+            var authorizationInfo = await authService.Authenticate(httpContext.Request).ConfigureAwait(false);
+
+            if (!authorizationInfo.HasToken)
+            {
+                _logger.LogDebug(
+                    "WebSocket authentication failed: Invalid or expired token. IP: {IP}",
+                    httpContext.Connection.RemoteIpAddress);
+                return;
+            }
+
+            // Set the authenticated user in the context for downstream middleware
+            var role = UserRoles.User;
+            if (authorizationInfo.IsApiKey
+                || (authorizationInfo.User?.HasPermission(PermissionKind.IsAdministrator) ?? false))
+            {
+                role = UserRoles.Administrator;
+            }
+
+            var claims = new[]
+            {
+                new Claim(ClaimTypes.Name, authorizationInfo.User?.Username ?? string.Empty),
+                new Claim(ClaimTypes.Role, role),
+                new Claim(InternalClaimTypes.UserId, authorizationInfo.UserId.ToString("N", CultureInfo.InvariantCulture)),
+                new Claim(InternalClaimTypes.DeviceId, authorizationInfo.DeviceId ?? string.Empty),
+                new Claim(InternalClaimTypes.Device, authorizationInfo.Device ?? string.Empty),
+                new Claim(InternalClaimTypes.Client, authorizationInfo.Client ?? string.Empty),
+                new Claim(InternalClaimTypes.Version, authorizationInfo.Version ?? string.Empty),
+                new Claim(InternalClaimTypes.Token, authorizationInfo.Token),
+                new Claim(InternalClaimTypes.IsApiKey, authorizationInfo.IsApiKey.ToString(CultureInfo.InvariantCulture))
+            };
+
+            var identity = new ClaimsIdentity(claims, "WebSocket");
+            var principal = new ClaimsPrincipal(identity);
+            httpContext.User = principal;
+
+            _logger.LogDebug(
+                "WebSocket authentication successful for user {Username}. IP: {IP}",
+                authorizationInfo.User?.Username ?? "Unknown",
+                httpContext.Connection.RemoteIpAddress);
+        }
+        catch (Exception ex)
+        {
+            _logger.LogDebug(
+                ex,
+                "Error during WebSocket authentication. IP: {IP}",
+                httpContext.Connection.RemoteIpAddress);
+        }
+    }
+}
+
+

Jellyfin.Api/Middleware/WebSocketAuthenticationMiddlewareExtensions.cs

@@ -0,0 +1,23 @@
+// <copyright file="WebSocketAuthenticationMiddlewareExtensions.cs" company="PlaceholderCompany">
+// Copyright (c) PlaceholderCompany. All rights reserved.
+// </copyright>
+
+namespace Jellyfin.Api.Middleware;
+
+using Microsoft.AspNetCore.Builder;
+
+/// <summary>
+/// Extension methods for adding WebSocket authentication to the pipeline.
+/// </summary>
+public static class WebSocketAuthenticationMiddlewareExtensions
+{
+    /// <summary>
+    /// Adds WebSocket authentication to the application pipeline.
+    /// </summary>
+    /// <param name="appBuilder">The application builder.</param>
+    /// <returns>The updated application builder.</returns>
+    public static IApplicationBuilder UseWebSocketAuthentication(this IApplicationBuilder appBuilder)
+    {
+        return appBuilder.UseMiddleware<WebSocketAuthenticationMiddleware>();
+    }
+}

Jellyfin.Data/Jellyfin.Data.csproj

@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
+    <NoWarn>$(NoWarn);CA1024;CA1031;CA1032;CA1034;CA1054;CA1055;CA1056;CA1062;CA1308;CA1303;CA1305;CA1508;CA1722;CA1724;CA1805;CA1813;CA1815;CA1816;CA1819;CA1821;CA1822;CA1823;CA1824;CA1825;CA1826;CA1830;CA1836;CA1839;CA1840;CA1841;CA1859;CA1861;CA1873;CA1911;CA2000;CA2007;CA2016;CA2025;CA2026;CA2100;CA2101;CA2102;CA2201;CA2202;CA2207;CA2208;CA2219;CA2220;CA2222;CA2225;CA2226;CA2230;CA2231;CA2234;CA2241;CA2242;CA2243;CA2244;CA2245;CA2246;CA2247;CA2248;CA2249;CA2250;CA2253;CA3001;CA3002;CA3003;CA3004;CA3005;CA3006;CA3007;CA3008;CA3009;CA3010;CA3011;CA3012;CA3061;CA3062;CA5359;CA5360;CA5361;CA5362;CA5363;CA5364;CA5365;CA5366;CA5367;CA5368;CA5369;CA5370;CA5371;CA5372;CA5373;CA5374;CA5375;CA5376;CA5377;CA5378;CA5379;CA5380;CA5381;CA5382;CA5383;CA5384;CA5385;CA5386;CA5387;CA5388;CA5389;CA5390;CA5391;CA5392;CA5393;CA5394;CA5395;CA5396;CA5397;CA5398;CA5399;CA5400;CA5401;CA5402;CA5403;NU1903;CA1848;CA1515;CA1812;CA1849;CA1860;CA1867;CA1517</NoWarn>
     <TargetFramework>net11.0</TargetFramework>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
@@ -11,11 +12,13 @@
   </PropertyGroup>
 
   <PropertyGroup Condition=" '$(Stability)'=='Unstable'">
+    <NoWarn>$(NoWarn);CA1024;CA1031;CA1032;CA1034;CA1054;CA1055;CA1056;CA1062;CA1308;CA1303;CA1305;CA1508;CA1722;CA1724;CA1805;CA1813;CA1815;CA1816;CA1819;CA1821;CA1822;CA1823;CA1824;CA1825;CA1826;CA1830;CA1836;CA1839;CA1840;CA1841;CA1859;CA1861;CA1873;CA1911;CA2000;CA2007;CA2016;CA2025;CA2026;CA2100;CA2101;CA2102;CA2201;CA2202;CA2207;CA2208;CA2219;CA2220;CA2222;CA2225;CA2226;CA2230;CA2231;CA2234;CA2241;CA2242;CA2243;CA2244;CA2245;CA2246;CA2247;CA2248;CA2249;CA2250;CA2253;CA3001;CA3002;CA3003;CA3004;CA3005;CA3006;CA3007;CA3008;CA3009;CA3010;CA3011;CA3012;CA3061;CA3062;CA5359;CA5360;CA5361;CA5362;CA5363;CA5364;CA5365;CA5366;CA5367;CA5368;CA5369;CA5370;CA5371;CA5372;CA5373;CA5374;CA5375;CA5376;CA5377;CA5378;CA5379;CA5380;CA5381;CA5382;CA5383;CA5384;CA5385;CA5386;CA5387;CA5388;CA5389;CA5390;CA5391;CA5392;CA5393;CA5394;CA5395;CA5396;CA5397;CA5398;CA5399;CA5400;CA5401;CA5402;CA5403;NU1903;CA1848;CA1515;CA1812;CA1849;CA1860;CA1867;CA1517</NoWarn>
     <!-- Include all symbols in the main nupkg until Azure Artifact Feed starts supporting ingesting NuGet symbol packages. -->
     <AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
   </PropertyGroup>
 
   <PropertyGroup>
+    <NoWarn>$(NoWarn);CA1024;CA1031;CA1032;CA1034;CA1054;CA1055;CA1056;CA1062;CA1308;CA1303;CA1305;CA1508;CA1722;CA1724;CA1805;CA1813;CA1815;CA1816;CA1819;CA1821;CA1822;CA1823;CA1824;CA1825;CA1826;CA1830;CA1836;CA1839;CA1840;CA1841;CA1859;CA1861;CA1873;CA1911;CA2000;CA2007;CA2016;CA2025;CA2026;CA2100;CA2101;CA2102;CA2201;CA2202;CA2207;CA2208;CA2219;CA2220;CA2222;CA2225;CA2226;CA2230;CA2231;CA2234;CA2241;CA2242;CA2243;CA2244;CA2245;CA2246;CA2247;CA2248;CA2249;CA2250;CA2253;CA3001;CA3002;CA3003;CA3004;CA3005;CA3006;CA3007;CA3008;CA3009;CA3010;CA3011;CA3012;CA3061;CA3062;CA5359;CA5360;CA5361;CA5362;CA5363;CA5364;CA5365;CA5366;CA5367;CA5368;CA5369;CA5370;CA5371;CA5372;CA5373;CA5374;CA5375;CA5376;CA5377;CA5378;CA5379;CA5380;CA5381;CA5382;CA5383;CA5384;CA5385;CA5386;CA5387;CA5388;CA5389;CA5390;CA5391;CA5392;CA5393;CA5394;CA5395;CA5396;CA5397;CA5398;CA5399;CA5400;CA5401;CA5402;CA5403;NU1903;CA1848;CA1515;CA1812;CA1849;CA1860;CA1867;CA1517</NoWarn>
     <Authors>Jellyfin Contributors</Authors>
     <PackageId>Jellyfin.Data</PackageId>
     <VersionPrefix>10.12.0</VersionPrefix>

Jellyfin.Server.Implementations/Clustering/CacheCoordinator.cs

@@ -1,309 +0,0 @@
-// <copyright file="CacheCoordinator.cs" company="PlaceholderCompany">
-// Copyright (c) PlaceholderCompany. All rights reserved.
-// </copyright>
-
-namespace Jellyfin.Server.Implementations.Clustering
-{
-    using System;
-    using System.Text.Json;
-    using System.Threading;
-    using System.Threading.Tasks;
-    using MediaBrowser.Controller.Library;
-    using Microsoft.Extensions.Logging;
-
-    /// <summary>
-    /// Coordinates cache invalidation across multiple Jellyfin instances using PostgreSQL LISTEN/NOTIFY.
-    /// </summary>
-    public sealed class CacheCoordinator : ICacheCoordinator, IAsyncDisposable
-    {
-        private const string CacheInvalidationChannel = "jellyfin_cache_invalidation";
-
-        private readonly IPostgresNotificationListener _notificationListener;
-        private readonly IInstanceRegistry _instanceRegistry;
-        private readonly ILogger<CacheCoordinator> _logger;
-        private readonly ILibraryManager? _libraryManager;
-        private bool _disposed;
-        private bool _started;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="CacheCoordinator"/> class.
-        /// </summary>
-        /// <param name="notificationListener">The PostgreSQL notification listener.</param>
-        /// <param name="instanceRegistry">The instance registry.</param>
-        /// <param name="logger">The logger.</param>
-        /// <param name="libraryManager">The library manager (optional).</param>
-        public CacheCoordinator(
-            IPostgresNotificationListener notificationListener,
-            IInstanceRegistry instanceRegistry,
-            ILogger<CacheCoordinator> logger,
-            ILibraryManager? libraryManager = null)
-        {
-            _notificationListener = notificationListener;
-            _instanceRegistry = instanceRegistry;
-            _logger = logger;
-            _libraryManager = libraryManager;
-        }
-
-        /// <inheritdoc/>
-        public async Task StartAsync(CancellationToken cancellationToken = default)
-        {
-            if (_started)
-            {
-                _logger.LogWarning("Cache coordinator already started");
-                return;
-            }
-
-            try
-            {
-                _notificationListener.NotificationReceived += OnNotificationReceived;
-                await _notificationListener.StartListeningAsync(CacheInvalidationChannel, cancellationToken).ConfigureAwait(false);
-                _started = true;
-
-                _logger.LogInformation("Cache coordinator started successfully");
-            }
-            catch (Exception ex)
-            {
-                _logger.LogError(ex, "Failed to start cache coordinator");
-                throw;
-            }
-        }
-
-        /// <inheritdoc/>
-        public async Task StopAsync(CancellationToken cancellationToken = default)
-        {
-            if (!_started)
-            {
-                return;
-            }
-
-            try
-            {
-                _notificationListener.NotificationReceived -= OnNotificationReceived;
-                await _notificationListener.StopListeningAsync(cancellationToken).ConfigureAwait(false);
-                _started = false;
-
-                _logger.LogInformation("Cache coordinator stopped");
-            }
-            catch (Exception ex)
-            {
-                _logger.LogError(ex, "Error stopping cache coordinator");
-            }
-        }
-
-        /// <inheritdoc/>
-        public async Task InvalidateItemAsync(Guid itemId, CancellationToken cancellationToken = default)
-        {
-            var message = new CacheInvalidationMessage
-            {
-                Type = CacheInvalidationType.Item,
-                EntityId = itemId,
-                Timestamp = DateTime.UtcNow,
-                SourceInstanceId = _instanceRegistry.CurrentInstanceId
-            };
-
-            await SendInvalidationMessageAsync(message, cancellationToken).ConfigureAwait(false);
-        }
-
-        /// <inheritdoc/>
-        public async Task InvalidateUserDataAsync(Guid userId, CancellationToken cancellationToken = default)
-        {
-            var message = new CacheInvalidationMessage
-            {
-                Type = CacheInvalidationType.UserData,
-                EntityId = userId,
-                Timestamp = DateTime.UtcNow,
-                SourceInstanceId = _instanceRegistry.CurrentInstanceId
-            };
-
-            await SendInvalidationMessageAsync(message, cancellationToken).ConfigureAwait(false);
-        }
-
-        /// <inheritdoc/>
-        public async Task InvalidateImageAsync(Guid itemId, CancellationToken cancellationToken = default)
-        {
-            var message = new CacheInvalidationMessage
-            {
-                Type = CacheInvalidationType.Image,
-                EntityId = itemId,
-                Timestamp = DateTime.UtcNow,
-                SourceInstanceId = _instanceRegistry.CurrentInstanceId
-            };
-
-            await SendInvalidationMessageAsync(message, cancellationToken).ConfigureAwait(false);
-        }
-
-        /// <inheritdoc/>
-        public async Task InvalidateAllAsync(CacheInvalidationType cacheType, CancellationToken cancellationToken = default)
-        {
-            var message = new CacheInvalidationMessage
-            {
-                Type = cacheType,
-                EntityId = null,
-                Timestamp = DateTime.UtcNow,
-                SourceInstanceId = _instanceRegistry.CurrentInstanceId
-            };
-
-            await SendInvalidationMessageAsync(message, cancellationToken).ConfigureAwait(false);
-        }
-
-        /// <inheritdoc/>
-        public async Task InvalidateLibraryAsync(Guid libraryId, CancellationToken cancellationToken = default)
-        {
-            var message = new CacheInvalidationMessage
-            {
-                Type = CacheInvalidationType.Library,
-                EntityId = libraryId,
-                Timestamp = DateTime.UtcNow,
-                SourceInstanceId = _instanceRegistry.CurrentInstanceId
-            };
-
-            await SendInvalidationMessageAsync(message, cancellationToken).ConfigureAwait(false);
-        }
-
-        /// <inheritdoc/>
-        public async Task InvalidatePersonAsync(Guid personId, CancellationToken cancellationToken = default)
-        {
-            var message = new CacheInvalidationMessage
-            {
-                Type = CacheInvalidationType.Person,
-                EntityId = personId,
-                Timestamp = DateTime.UtcNow,
-                SourceInstanceId = _instanceRegistry.CurrentInstanceId
-            };
-
-            await SendInvalidationMessageAsync(message, cancellationToken).ConfigureAwait(false);
-        }
-
-        /// <inheritdoc/>
-        public async Task InvalidateMetadataAsync(Guid itemId, CancellationToken cancellationToken = default)
-        {
-            var message = new CacheInvalidationMessage
-            {
-                Type = CacheInvalidationType.Metadata,
-                EntityId = itemId,
-                Timestamp = DateTime.UtcNow,
-                SourceInstanceId = _instanceRegistry.CurrentInstanceId
-            };
-
-            await SendInvalidationMessageAsync(message, cancellationToken).ConfigureAwait(false);
-        }
-
-        /// <inheritdoc/>
-        public async ValueTask DisposeAsync()
-        {
-            if (_disposed)
-            {
-                return;
-            }
-
-            _disposed = true;
-
-            await StopAsync(CancellationToken.None).ConfigureAwait(false);
-        }
-
-        private async Task SendInvalidationMessageAsync(CacheInvalidationMessage message, CancellationToken cancellationToken)
-        {
-            try
-            {
-                var json = JsonSerializer.Serialize(message);
-                await _notificationListener.NotifyAsync(CacheInvalidationChannel, json, cancellationToken).ConfigureAwait(false);
-
-                _logger.LogDebug(
-                    "Sent cache invalidation: Type={Type}, EntityId={EntityId}",
-                    message.Type,
-                    message.EntityId);
-            }
-            catch (Exception ex)
-            {
-                _logger.LogError(
-                    ex,
-                    "Failed to send cache invalidation message: Type={Type}, EntityId={EntityId}",
-                    message.Type,
-                    message.EntityId);
-            }
-        }
-
-        private void OnNotificationReceived(object? sender, PostgresNotificationEventArgs e)
-        {
-            try
-            {
-                var message = JsonSerializer.Deserialize<CacheInvalidationMessage>(e.Payload);
-
-                if (message is null)
-                {
-                    _logger.LogWarning("Received invalid cache invalidation message");
-                    return;
-                }
-
-                // Don't process messages from this instance
-                if (message.SourceInstanceId.Equals(_instanceRegistry.CurrentInstanceId))
-                {
-                    return;
-                }
-
-                _logger.LogDebug(
-                    "Processing cache invalidation from instance {SourceInstanceId}: Type={Type}, EntityId={EntityId}",
-                    message.SourceInstanceId,
-                    message.Type,
-                    message.EntityId);
-
-                ProcessInvalidationMessage(message);
-            }
-            catch (Exception ex)
-            {
-                _logger.LogError(ex, "Error processing cache invalidation notification");
-            }
-        }
-
-        private void ProcessInvalidationMessage(CacheInvalidationMessage message)
-        {
-            // TODO: Actual cache invalidation logic would go here
-            // This is a placeholder that demonstrates the pattern
-            // The actual implementation would call into Jellyfin's cache managers
-
-            switch (message.Type)
-            {
-                case CacheInvalidationType.Item:
-                    if (message.EntityId.HasValue && _libraryManager is not null)
-                    {
-                        // Example: _libraryManager.InvalidateItemCache(message.EntityId.Value);
-                        _logger.LogDebug("Invalidating item cache for {ItemId}", message.EntityId.Value);
-                    }
-
-                    break;
-
-                case CacheInvalidationType.UserData:
-                    if (message.EntityId.HasValue)
-                    {
-                        _logger.LogDebug("Invalidating user data cache for {UserId}", message.EntityId.Value);
-                    }
-
-                    break;
-
-                case CacheInvalidationType.Image:
-                    if (message.EntityId.HasValue)
-                    {
-                        _logger.LogDebug("Invalidating image cache for {ItemId}", message.EntityId.Value);
-                    }
-
-                    break;
-
-                case CacheInvalidationType.Library:
-                    if (message.EntityId.HasValue)
-                    {
-                        _logger.LogDebug("Invalidating library cache for {LibraryId}", message.EntityId.Value);
-                    }
-
-                    break;
-
-                case CacheInvalidationType.All:
-                    _logger.LogDebug("Invalidating all caches of type {CacheType}", message.Type);
-                    break;
-
-                default:
-                    _logger.LogWarning("Unknown cache invalidation type: {Type}", message.Type);
-                    break;
-            }
-        }
-    }
-}

Jellyfin.Server.Implementations/Clustering/CacheInvalidationMessage.cs

@@ -1,107 +0,0 @@
-// <copyright file="CacheInvalidationMessage.cs" company="PlaceholderCompany">
-// Copyright (c) PlaceholderCompany. All rights reserved.
-// </copyright>
-
-namespace Jellyfin.Server.Implementations.Clustering
-{
-    using System;
-    using System.Text.Json.Serialization;
-
-    /// <summary>
-    /// Types of cache invalidation.
-    /// </summary>
-    public enum CacheInvalidationType
-    {
-        /// <summary>
-        /// Invalidate a specific item cache.
-        /// </summary>
-        Item,
-
-        /// <summary>
-        /// Invalidate user data cache.
-        /// </summary>
-        UserData,
-
-        /// <summary>
-        /// Invalidate image cache.
-        /// </summary>
-        Image,
-
-        /// <summary>
-        /// Invalidate chapter image cache.
-        /// </summary>
-        ChapterImage,
-
-        /// <summary>
-        /// Invalidate metadata cache.
-        /// </summary>
-        Metadata,
-
-        /// <summary>
-        /// Invalidate all caches of a specific type.
-        /// </summary>
-        All,
-
-        /// <summary>
-        /// Invalidate library cache.
-        /// </summary>
-        Library,
-
-        /// <summary>
-        /// Invalidate person cache.
-        /// </summary>
-        Person,
-
-        /// <summary>
-        /// Invalidate user cache.
-        /// </summary>
-        User,
-
-        /// <summary>
-        /// Invalidate device cache.
-        /// </summary>
-        Device
-    }
-
-    /// <summary>
-    /// Represents a cache invalidation message sent between instances.
-    /// </summary>
-    public class CacheInvalidationMessage
-    {
-        /// <summary>
-        /// Gets or sets the type of cache being invalidated.
-        /// </summary>
-        [JsonPropertyName("type")]
-        public CacheInvalidationType Type { get; set; }
-
-        /// <summary>
-        /// Gets or sets the ID of the entity being invalidated (if applicable).
-        /// </summary>
-        [JsonPropertyName("entityId")]
-        public Guid? EntityId { get; set; }
-
-        /// <summary>
-        /// Gets or sets the cache key pattern to invalidate.
-        /// </summary>
-        [JsonPropertyName("cacheKey")]
-        public string? CacheKey { get; set; }
-
-        /// <summary>
-        /// Gets or sets the timestamp when this message was created.
-        /// </summary>
-        [JsonPropertyName("timestamp")]
-        public DateTime Timestamp { get; set; }
-
-        /// <summary>
-        /// Gets or sets the instance ID that originated this message.
-        /// </summary>
-        [JsonPropertyName("sourceInstanceId")]
-        public Guid SourceInstanceId { get; set; }
-
-        /// <summary>
-        /// Gets or sets additional metadata about the invalidation.
-        /// </summary>
-        [JsonPropertyName("metadata")]
-        public string? Metadata { get; set; }
-    }
-}

Jellyfin.Server.Implementations/Clustering/DistributedLockManager.cs

@@ -1,427 +0,0 @@
-// <copyright file="DistributedLockManager.cs" company="PlaceholderCompany">
-// Copyright (c) PlaceholderCompany. All rights reserved.
-// </copyright>
-
-namespace Jellyfin.Server.Implementations.Clustering
-{
-    using System;
-    using System.Collections.Concurrent;
-    using System.Linq;
-    using System.Threading;
-    using System.Threading.Tasks;
-    using Jellyfin.Database.Implementations;
-    using Jellyfin.Database.Implementations.Entities;
-    using Microsoft.EntityFrameworkCore;
-    using Microsoft.Extensions.Logging;
-
-    /// <summary>
-    /// Implementation of distributed lock manager using database-backed locks.
-    /// </summary>
-    public sealed class DistributedLockManager : IDistributedLockManager, IDisposable
-    {
-        private readonly IDbContextFactory<JellyfinDbContext> _dbContextFactory;
-        private readonly ILogger<DistributedLockManager> _logger;
-        private readonly Guid _instanceId;
-        private readonly ConcurrentDictionary<string, DistributedLockHandle> _heldLocks;
-        private readonly TimeSpan _defaultLockDuration;
-        private readonly Timer? _cleanupTimer;
-        private bool _disposed;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="DistributedLockManager"/> class.
-        /// </summary>
-        /// <param name="dbContextFactory">The database context factory.</param>
-        /// <param name="logger">The logger.</param>
-        /// <param name="instanceId">The current instance ID.</param>
-        public DistributedLockManager(
-            IDbContextFactory<JellyfinDbContext> dbContextFactory,
-            ILogger<DistributedLockManager> logger,
-            Guid instanceId)
-        {
-            _dbContextFactory = dbContextFactory;
-            _logger = logger;
-            _instanceId = instanceId;
-            _heldLocks = new ConcurrentDictionary<string, DistributedLockHandle>();
-            _defaultLockDuration = TimeSpan.FromMinutes(5);
-
-            // Start cleanup timer - runs every minute
-            _cleanupTimer = new Timer(
-                CleanupTimerCallback,
-                null,
-                TimeSpan.FromMinutes(1),
-                TimeSpan.FromMinutes(1));
-        }
-
-        /// <inheritdoc />
-        public async Task<IDistributedLockHandle?> TryAcquireLockAsync(
-            string lockName,
-            TimeSpan timeout,
-            CancellationToken cancellationToken = default)
-        {
-            ArgumentException.ThrowIfNullOrEmpty(lockName);
-
-            var startTime = DateTime.UtcNow;
-            var endTime = startTime.Add(timeout);
-
-            while (DateTime.UtcNow < endTime)
-            {
-                try
-                {
-                    var handle = await AcquireLockInternalAsync(lockName, cancellationToken).ConfigureAwait(false);
-                    if (handle is not null)
-                    {
-                        return handle;
-                    }
-                }
-                catch (Exception ex)
-                {
-                    _logger.LogWarning(ex, "Error attempting to acquire lock '{LockName}'", lockName);
-                }
-
-                // Wait a bit before retrying
-                await Task.Delay(TimeSpan.FromMilliseconds(100), cancellationToken).ConfigureAwait(false);
-            }
-
-            _logger.LogDebug("Failed to acquire lock '{LockName}' within timeout {Timeout}", lockName, timeout);
-            return null;
-        }
-
-        /// <inheritdoc />
-        public async Task<IDistributedLockHandle> AcquireLockAsync(
-            string lockName,
-            CancellationToken cancellationToken = default)
-        {
-            ArgumentException.ThrowIfNullOrEmpty(lockName);
-
-            while (!cancellationToken.IsCancellationRequested)
-            {
-                try
-                {
-                    var handle = await AcquireLockInternalAsync(lockName, cancellationToken).ConfigureAwait(false);
-                    if (handle is not null)
-                    {
-                        return handle;
-                    }
-                }
-                catch (Exception ex)
-                {
-                    _logger.LogWarning(ex, "Error attempting to acquire lock '{LockName}'", lockName);
-                }
-
-                // Wait before retrying
-                await Task.Delay(TimeSpan.FromMilliseconds(500), cancellationToken).ConfigureAwait(false);
-            }
-
-            throw new OperationCanceledException("Lock acquisition was cancelled");
-        }
-
-        /// <inheritdoc />
-        public async Task<bool> IsLockHeldAsync(string lockName, CancellationToken cancellationToken = default)
-        {
-            ArgumentException.ThrowIfNullOrEmpty(lockName);
-
-            await using var context = await _dbContextFactory.CreateDbContextAsync(cancellationToken).ConfigureAwait(false);
-
-            var lockEntity = await context.DistributedLocks
-                .AsNoTracking()
-                .FirstOrDefaultAsync(l => l.LockName == lockName, cancellationToken)
-                .ConfigureAwait(false);
-
-            if (lockEntity is null)
-            {
-                return false;
-            }
-
-            // Check if lock is expired
-            if (lockEntity.IsExpired())
-            {
-                // Expired locks are considered not held
-                return false;
-            }
-
-            return true;
-        }
-
-        /// <inheritdoc />
-        public async Task ReleaseAllLocksAsync(CancellationToken cancellationToken = default)
-        {
-            _logger.LogInformation("Releasing all locks held by instance {InstanceId}", _instanceId);
-
-            await using var context = await _dbContextFactory.CreateDbContextAsync(cancellationToken).ConfigureAwait(false);
-
-            var locks = await context.DistributedLocks
-                .Where(l => l.InstanceId.Equals(_instanceId))
-                .ToListAsync(cancellationToken)
-                .ConfigureAwait(false);
-
-            if (locks.Count > 0)
-            {
-                context.DistributedLocks.RemoveRange(locks);
-                await context.SaveChangesAsync(cancellationToken).ConfigureAwait(false);
-
-                _logger.LogInformation("Released {Count} locks", locks.Count);
-            }
-
-            // Clear local tracking
-            _heldLocks.Clear();
-        }
-
-        /// <inheritdoc />
-        public async Task<int> CleanupExpiredLocksAsync(CancellationToken cancellationToken = default)
-        {
-            await using var context = await _dbContextFactory.CreateDbContextAsync(cancellationToken).ConfigureAwait(false);
-
-            var now = DateTime.UtcNow;
-            var expiredLocks = await context.DistributedLocks
-                .Where(l => l.ExpiresAt < now)
-                .ToListAsync(cancellationToken)
-                .ConfigureAwait(false);
-
-            if (expiredLocks.Count > 0)
-            {
-                context.DistributedLocks.RemoveRange(expiredLocks);
-                await context.SaveChangesAsync(cancellationToken).ConfigureAwait(false);
-
-                _logger.LogDebug("Cleaned up {Count} expired locks", expiredLocks.Count);
-
-                // Remove from local tracking
-                foreach (var expiredLock in expiredLocks)
-                {
-                    _heldLocks.TryRemove(expiredLock.LockName, out _);
-                }
-            }
-
-            return expiredLocks.Count;
-        }
-
-        /// <inheritdoc />
-        public void Dispose()
-        {
-            if (_disposed)
-            {
-                return;
-            }
-
-            _cleanupTimer?.Dispose();
-
-            // Release all locks on disposal
-            try
-            {
-                ReleaseAllLocksAsync(CancellationToken.None).GetAwaiter().GetResult();
-            }
-            catch (Exception ex)
-            {
-                _logger.LogError(ex, "Error releasing locks during disposal");
-            }
-
-            _disposed = true;
-        }
-
-        private async Task<DistributedLockHandle?> AcquireLockInternalAsync(
-            string lockName,
-            CancellationToken cancellationToken)
-        {
-            await using var context = await _dbContextFactory.CreateDbContextAsync(cancellationToken).ConfigureAwait(false);
-
-            // Use a transaction for atomic lock acquisition
-            await using var transaction = await context.Database.BeginTransactionAsync(cancellationToken).ConfigureAwait(false);
-
-            try
-            {
-                // Check if lock exists
-                var existingLock = await context.DistributedLocks
-                    .FirstOrDefaultAsync(l => l.LockName == lockName, cancellationToken)
-                    .ConfigureAwait(false);
-
-                if (existingLock is not null)
-                {
-                    // Check if it's expired
-                    if (existingLock.IsExpired())
-                    {
-                        // Remove expired lock
-                        context.DistributedLocks.Remove(existingLock);
-                        await context.SaveChangesAsync(cancellationToken).ConfigureAwait(false);
-                    }
-                    else
-                    {
-                        // Lock is still valid and held by another instance
-                        _logger.LogDebug(
-                            "Lock '{LockName}' is held by instance {HolderId} until {ExpiresAt}",
-                            lockName,
-                            existingLock.InstanceId,
-                            existingLock.ExpiresAt);
-                        return null;
-                    }
-                }
-
-                // Create new lock
-                var expiresAt = DateTime.UtcNow.Add(_defaultLockDuration);
-                var newLock = new DistributedLock(lockName, _instanceId, expiresAt);
-
-                context.DistributedLocks.Add(newLock);
-                await context.SaveChangesAsync(cancellationToken).ConfigureAwait(false);
-                await transaction.CommitAsync(cancellationToken).ConfigureAwait(false);
-
-                _logger.LogDebug(
-                    "Acquired lock '{LockName}' for instance {InstanceId} until {ExpiresAt}",
-                    lockName,
-                    _instanceId,
-                    expiresAt);
-
-                // Create handle
-                var handle = new DistributedLockHandle(
-                    lockName,
-                    _instanceId,
-                    newLock.AcquiredAt,
-                    expiresAt,
-                    this);
-
-                _heldLocks.TryAdd(lockName, handle);
-
-                return handle;
-            }
-            catch (DbUpdateException ex)
-            {
-                // Likely a race condition - another instance acquired the lock first
-                _logger.LogDebug(ex, "Concurrent lock acquisition detected for '{LockName}'", lockName);
-                await transaction.RollbackAsync(cancellationToken).ConfigureAwait(false);
-                return null;
-            }
-            catch (Exception ex)
-            {
-                _logger.LogError(ex, "Error acquiring lock '{LockName}'", lockName);
-                await transaction.RollbackAsync(cancellationToken).ConfigureAwait(false);
-                throw;
-            }
-        }
-
-        private async Task ReleaseLockInternalAsync(string lockName, CancellationToken cancellationToken)
-        {
-            await using var context = await _dbContextFactory.CreateDbContextAsync(cancellationToken).ConfigureAwait(false);
-
-            var lockEntity = await context.DistributedLocks
-                .FirstOrDefaultAsync(l => l.LockName == lockName && l.InstanceId.Equals(_instanceId), cancellationToken)
-                .ConfigureAwait(false);
-
-            if (lockEntity is not null)
-            {
-                context.DistributedLocks.Remove(lockEntity);
-                await context.SaveChangesAsync(cancellationToken).ConfigureAwait(false);
-
-                _logger.LogDebug("Released lock '{LockName}'", lockName);
-            }
-
-            _heldLocks.TryRemove(lockName, out _);
-        }
-
-        private async Task RenewLockInternalAsync(
-            string lockName,
-            TimeSpan additionalTime,
-            CancellationToken cancellationToken)
-        {
-            await using var context = await _dbContextFactory.CreateDbContextAsync(cancellationToken).ConfigureAwait(false);
-
-            var lockEntity = await context.DistributedLocks
-                .FirstOrDefaultAsync(l => l.LockName == lockName && l.InstanceId.Equals(_instanceId), cancellationToken)
-                .ConfigureAwait(false);
-
-            if (lockEntity is not null)
-            {
-                lockEntity.Renew(additionalTime);
-                await context.SaveChangesAsync(cancellationToken).ConfigureAwait(false);
-
-                _logger.LogDebug("Renewed lock '{LockName}' until {ExpiresAt}", lockName, lockEntity.ExpiresAt);
-            }
-        }
-
-        private void CleanupTimerCallback(object? state)
-        {
-            try
-            {
-                CleanupExpiredLocksAsync(CancellationToken.None).GetAwaiter().GetResult();
-            }
-            catch (Exception ex)
-            {
-                _logger.LogError(ex, "Error during periodic lock cleanup");
-            }
-        }
-
-        /// <summary>
-        /// Internal lock handle implementation.
-        /// </summary>
-        private sealed class DistributedLockHandle : IDistributedLockHandle
-        {
-            private readonly DistributedLockManager _manager;
-            private bool _disposed;
-
-            /// <summary>
-            /// Initializes a new instance of the <see cref="DistributedLockHandle"/> class.
-            /// </summary>
-            /// <param name="lockName">The lock name.</param>
-            /// <param name="instanceId">The instance ID.</param>
-            /// <param name="acquiredAt">The acquisition time.</param>
-            /// <param name="expiresAt">The expiration time.</param>
-            /// <param name="manager">The parent manager.</param>
-            public DistributedLockHandle(
-                string lockName,
-                Guid instanceId,
-                DateTime acquiredAt,
-                DateTime expiresAt,
-                DistributedLockManager manager)
-            {
-                LockName = lockName;
-                InstanceId = instanceId;
-                AcquiredAt = acquiredAt;
-                ExpiresAt = expiresAt;
-                _manager = manager;
-            }
-
-            /// <inheritdoc />
-            public string LockName { get; }
-
-            /// <inheritdoc />
-            public Guid InstanceId { get; }
-
-            /// <inheritdoc />
-            public DateTime AcquiredAt { get; }
-
-            /// <inheritdoc />
-            public DateTime ExpiresAt { get; private set; }
-
-            /// <inheritdoc />
-            public bool IsValid => !_disposed && DateTime.UtcNow < ExpiresAt;
-
-            /// <inheritdoc />
-            public async Task RenewAsync(TimeSpan additionalTime, CancellationToken cancellationToken = default)
-            {
-                if (_disposed)
-                {
-                    throw new ObjectDisposedException(nameof(DistributedLockHandle));
-                }
-
-                await _manager.RenewLockInternalAsync(LockName, additionalTime, cancellationToken).ConfigureAwait(false);
-                ExpiresAt = DateTime.UtcNow.Add(additionalTime);
-            }
-
-            /// <inheritdoc />
-            public async ValueTask DisposeAsync()
-            {
-                if (_disposed)
-                {
-                    return;
-                }
-
-                try
-                {
-                    await _manager.ReleaseLockInternalAsync(LockName, CancellationToken.None).ConfigureAwait(false);
-                }
-                catch (Exception ex)
-                {
-                    _manager._logger.LogError(ex, "Error releasing lock '{LockName}' during disposal", LockName);
-                }
-
-                _disposed = true;
-            }
-        }
-    }
-}

Jellyfin.Server.Implementations/Clustering/DistributedLockNames.cs

@@ -1,99 +0,0 @@
-// <copyright file="DistributedLockNames.cs" company="PlaceholderCompany">
-// Copyright (c) PlaceholderCompany. All rights reserved.
-// </copyright>
-
-namespace Jellyfin.Server.Implementations.Clustering
-{
-    using System;
-
-    /// <summary>
-    /// Standard lock names for distributed locking.
-    /// </summary>
-    public static class DistributedLockNames
-    {
-        /// <summary>
-        /// Lock for database migrations.
-        /// </summary>
-        public const string DatabaseMigration = "database:migration";
-
-        /// <summary>
-        /// Lock for primary instance election.
-        /// </summary>
-        public const string PrimaryElection = "instance:primary:election";
-
-        /// <summary>
-        /// Global lock for all library scans.
-        /// </summary>
-        public const string GlobalLibraryScan = "library:scan:global";
-
-        /// <summary>
-        /// Lock for library scanning operations.
-        /// </summary>
-        /// <param name="libraryId">The library ID.</param>
-        /// <returns>The lock name.</returns>
-        public static string LibraryScan(Guid libraryId)
-        {
-            return $"library:scan:{libraryId}";
-        }
-
-        /// <summary>
-        /// Lock for metadata refresh operations.
-        /// </summary>
-        /// <param name="itemId">The item ID.</param>
-        /// <returns>The lock name.</returns>
-        public static string MetadataRefresh(Guid itemId)
-        {
-            return $"metadata:refresh:{itemId}";
-        }
-
-        /// <summary>
-        /// Lock for configuration updates.
-        /// </summary>
-        /// <param name="configType">The configuration type.</param>
-        /// <returns>The lock name.</returns>
-        public static string ConfigurationUpdate(string configType)
-        {
-            return $"config:update:{configType}";
-        }
-
-        /// <summary>
-        /// Lock for scheduled task execution.
-        /// </summary>
-        /// <param name="taskName">The task name.</param>
-        /// <returns>The lock name.</returns>
-        public static string ScheduledTask(string taskName)
-        {
-            return $"task:{taskName}";
-        }
-
-        /// <summary>
-        /// Lock for image processing operations.
-        /// </summary>
-        /// <param name="itemId">The item ID.</param>
-        /// <returns>The lock name.</returns>
-        public static string ImageProcessing(Guid itemId)
-        {
-            return $"image:process:{itemId}";
-        }
-
-        /// <summary>
-        /// Lock for cache clearing operations.
-        /// </summary>
-        /// <param name="cacheType">The cache type.</param>
-        /// <returns>The lock name.</returns>
-        public static string CacheClear(string cacheType)
-        {
-            return $"cache:clear:{cacheType}";
-        }
-
-        /// <summary>
-        /// Lock for plugin operations.
-        /// </summary>
-        /// <param name="pluginId">The plugin ID.</param>
-        /// <returns>The lock name.</returns>
-        public static string PluginOperation(Guid pluginId)
-        {
-            return $"plugin:operation:{pluginId}";
-        }
-    }
-}

Jellyfin.Server.Implementations/Clustering/FileSystemChangeProcessor.cs

@@ -1,305 +0,0 @@
-// <copyright file="FileSystemChangeProcessor.cs" company="PlaceholderCompany">
-// Copyright (c) PlaceholderCompany. All rights reserved.
-// </copyright>
-
-namespace Jellyfin.Server.Implementations.Clustering
-{
-    using System;
-    using System.Linq;
-    using System.Threading;
-    using System.Threading.Tasks;
-    using Jellyfin.Database.Implementations;
-    using Jellyfin.Database.Implementations.Entities;
-    using MediaBrowser.Controller.Library;
-    using Microsoft.EntityFrameworkCore;
-    using Microsoft.Extensions.Hosting;
-    using Microsoft.Extensions.Logging;
-
-    /// <summary>
-    /// Processes file system changes from the database.
-    /// Only the primary instance processes changes; all instances can record them.
-    /// </summary>
-    public sealed class FileSystemChangeProcessor : IFileSystemChangeProcessor, IHostedService, IAsyncDisposable
-    {
-        private readonly IDbContextFactory<JellyfinDbContext> _dbContextFactory;
-        private readonly IInstanceRegistry _instanceRegistry;
-        private readonly IPrimaryElectionService _primaryElectionService;
-        private readonly ILibraryManager? _libraryManager;
-        private readonly ILogger<FileSystemChangeProcessor> _logger;
-        private CancellationTokenSource? _processingCts;
-        private Task? _processingTask;
-        private bool _disposed;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="FileSystemChangeProcessor"/> class.
-        /// </summary>
-        /// <param name="dbContextFactory">The database context factory.</param>
-        /// <param name="instanceRegistry">The instance registry.</param>
-        /// <param name="primaryElectionService">The primary election service.</param>
-        /// <param name="libraryManager">The library manager (optional, may not be available at startup).</param>
-        /// <param name="logger">The logger.</param>
-        public FileSystemChangeProcessor(
-            IDbContextFactory<JellyfinDbContext> dbContextFactory,
-            IInstanceRegistry instanceRegistry,
-            IPrimaryElectionService primaryElectionService,
-            ILibraryManager? libraryManager,
-            ILogger<FileSystemChangeProcessor> logger)
-        {
-            _dbContextFactory = dbContextFactory;
-            _instanceRegistry = instanceRegistry;
-            _primaryElectionService = primaryElectionService;
-            _libraryManager = libraryManager;
-            _logger = logger;
-        }
-
-        /// <inheritdoc/>
-        Task IHostedService.StartAsync(CancellationToken cancellationToken)
-        {
-            return StartAsync(cancellationToken);
-        }
-
-        /// <inheritdoc/>
-        Task IHostedService.StopAsync(CancellationToken cancellationToken)
-        {
-            return StopAsync(cancellationToken);
-        }
-
-        /// <inheritdoc/>
-        public async Task StartAsync(CancellationToken cancellationToken = default)
-        {
-            _logger.LogInformation("Starting file system change processor");
-
-            // Subscribe to primary changes
-            _primaryElectionService.PrimaryInstanceChanged += OnPrimaryInstanceChanged;
-
-            // If we're currently primary, start processing
-            if (_primaryElectionService.IsPrimary)
-            {
-                StartProcessingLoop();
-            }
-
-            _logger.LogInformation("File system change processor started");
-            await Task.CompletedTask.ConfigureAwait(false);
-        }
-
-        /// <inheritdoc/>
-        public async Task StopAsync(CancellationToken cancellationToken = default)
-        {
-            _logger.LogInformation("Stopping file system change processor");
-
-            _primaryElectionService.PrimaryInstanceChanged -= OnPrimaryInstanceChanged;
-
-            StopProcessingLoop();
-
-            _logger.LogInformation("File system change processor stopped");
-            await Task.CompletedTask.ConfigureAwait(false);
-        }
-
-        /// <inheritdoc/>
-        public async Task RecordChangeAsync(string path, string changeType, string? oldPath = null, CancellationToken cancellationToken = default)
-        {
-            try
-            {
-                await using var context = await _dbContextFactory.CreateDbContextAsync(cancellationToken).ConfigureAwait(false);
-
-                var change = new FileSystemChange
-                {
-                    Path = path,
-                    ChangeType = changeType,
-                    OldPath = oldPath,
-                    DetectedAt = DateTime.UtcNow,
-                    DetectedBy = _instanceRegistry.CurrentInstanceId
-                };
-
-                context.FileSystemChanges.Add(change);
-                await context.SaveChangesAsync(cancellationToken).ConfigureAwait(false);
-
-                _logger.LogDebug(
-                    "Recorded file system change: {ChangeType} - {Path}",
-                    changeType,
-                    path);
-            }
-            catch (Exception ex)
-            {
-                _logger.LogError(ex, "Failed to record file system change for {Path}", path);
-            }
-        }
-
-        /// <inheritdoc/>
-        public async ValueTask DisposeAsync()
-        {
-            if (_disposed)
-            {
-                return;
-            }
-
-            _disposed = true;
-
-            await StopAsync(CancellationToken.None).ConfigureAwait(false);
-
-            _processingCts?.Dispose();
-        }
-
-        private void OnPrimaryInstanceChanged(object? sender, PrimaryInstanceChangedEventArgs e)
-        {
-            if (e.IsCurrentInstance)
-            {
-                _logger.LogInformation("Became primary instance, starting file system change processing");
-                StartProcessingLoop();
-            }
-            else
-            {
-                _logger.LogInformation("No longer primary instance, stopping file system change processing");
-                StopProcessingLoop();
-            }
-        }
-
-        private void StartProcessingLoop()
-        {
-            if (_processingTask is not null)
-            {
-                return; // Already running
-            }
-
-            _processingCts = new CancellationTokenSource();
-            _processingTask = ProcessChangesLoopAsync(_processingCts.Token);
-        }
-
-        private void StopProcessingLoop()
-        {
-            if (_processingTask is null)
-            {
-                return; // Not running
-            }
-
-            _processingCts?.Cancel();
-            _processingTask = null;
-            _processingCts?.Dispose();
-            _processingCts = null;
-        }
-
-        private async Task ProcessChangesLoopAsync(CancellationToken cancellationToken)
-        {
-            _logger.LogInformation("File system change processing loop started");
-
-            while (!cancellationToken.IsCancellationRequested)
-            {
-                try
-                {
-                    // Process a batch of changes
-                    await ProcessPendingChangesAsync(cancellationToken).ConfigureAwait(false);
-
-                    // Wait before next batch (5 seconds)
-                    await Task.Delay(TimeSpan.FromSeconds(5), cancellationToken).ConfigureAwait(false);
-                }
-                catch (OperationCanceledException)
-                {
-                    break;
-                }
-                catch (Exception ex)
-                {
-                    _logger.LogError(ex, "Error in file system change processing loop");
-
-                    // Wait before retrying on error
-                    try
-                    {
-                        await Task.Delay(TimeSpan.FromSeconds(10), cancellationToken).ConfigureAwait(false);
-                    }
-                    catch (OperationCanceledException)
-                    {
-                        break;
-                    }
-                }
-            }
-
-            _logger.LogInformation("File system change processing loop stopped");
-        }
-
-        private async Task ProcessPendingChangesAsync(CancellationToken cancellationToken)
-        {
-            await using var context = await _dbContextFactory.CreateDbContextAsync(cancellationToken).ConfigureAwait(false);
-
-            // Get unprocessed changes (oldest first, limit 100 per batch)
-            var changes = await context.FileSystemChanges
-                .Where(c => c.ProcessedAt == null)
-                .OrderBy(c => c.DetectedAt)
-                .Take(100)
-                .ToListAsync(cancellationToken)
-                .ConfigureAwait(false);
-
-            if (changes.Count == 0)
-            {
-                return; // Nothing to process
-            }
-
-            _logger.LogDebug("Processing {Count} file system changes", changes.Count);
-
-            foreach (var change in changes)
-            {
-                if (cancellationToken.IsCancellationRequested)
-                {
-                    break;
-                }
-
-                await ProcessSingleChangeAsync(change, context, cancellationToken).ConfigureAwait(false);
-            }
-
-            // Save all processed changes
-            try
-            {
-                await context.SaveChangesAsync(cancellationToken).ConfigureAwait(false);
-            }
-            catch (Exception ex)
-            {
-                _logger.LogError(ex, "Failed to save processed file system changes");
-            }
-        }
-
-        private async Task ProcessSingleChangeAsync(FileSystemChange change, JellyfinDbContext context, CancellationToken cancellationToken)
-        {
-            try
-            {
-                if (_libraryManager is null)
-                {
-                    // LibraryManager not available yet (still starting up)
-                    return;
-                }
-
-                // Process the change based on type
-                switch (change.ChangeType)
-                {
-                    case "Created":
-                    case "Modified":
-                        // LibraryManager will handle these through its file watcher
-                        // We just mark as processed since detection happened
-                        _logger.LogDebug("File change detected: {Type} - {Path}", change.ChangeType, change.Path);
-                        break;
-
-                    case "Deleted":
-                        _logger.LogDebug("File deleted: {Path}", change.Path);
-                        break;
-
-                    case "Renamed":
-                        _logger.LogDebug("File renamed from {OldPath} to {NewPath}", change.OldPath, change.Path);
-                        break;
-                }
-
-                // Mark as processed
-                change.ProcessedAt = DateTime.UtcNow;
-                change.ProcessedBy = _instanceRegistry.CurrentInstanceId;
-
-                // Note: Actual file refresh is handled by LibraryManager's existing file watcher
-                // This processor just coordinates change detection across instances
-            }
-            catch (Exception ex)
-            {
-                _logger.LogError(ex, "Error processing file system change for {Path}", change.Path);
-                change.Error = ex.Message;
-                change.ProcessedAt = DateTime.UtcNow;
-                change.ProcessedBy = _instanceRegistry.CurrentInstanceId;
-            }
-
-            await Task.CompletedTask.ConfigureAwait(false);
-        }
-    }
-}

Jellyfin.Server.Implementations/Clustering/ICacheCoordinator.cs

@@ -1,86 +0,0 @@
-// <copyright file="ICacheCoordinator.cs" company="PlaceholderCompany">
-// Copyright (c) PlaceholderCompany. All rights reserved.
-// </copyright>
-
-namespace Jellyfin.Server.Implementations.Clustering
-{
-    using System;
-    using System.Threading;
-    using System.Threading.Tasks;
-
-    /// <summary>
-    /// Interface for coordinating cache invalidation across multiple instances.
-    /// </summary>
-    public interface ICacheCoordinator
-    {
-        /// <summary>
-        /// Starts the cache coordinator.
-        /// </summary>
-        /// <param name="cancellationToken">Cancellation token.</param>
-        /// <returns>A task representing the asynchronous operation.</returns>
-        Task StartAsync(CancellationToken cancellationToken = default);
-
-        /// <summary>
-        /// Stops the cache coordinator.
-        /// </summary>
-        /// <param name="cancellationToken">Cancellation token.</param>
-        /// <returns>A task representing the asynchronous operation.</returns>
-        Task StopAsync(CancellationToken cancellationToken = default);
-
-        /// <summary>
-        /// Invalidates an item cache across all instances.
-        /// </summary>
-        /// <param name="itemId">The item ID.</param>
-        /// <param name="cancellationToken">Cancellation token.</param>
-        /// <returns>A task representing the asynchronous operation.</returns>
-        Task InvalidateItemAsync(Guid itemId, CancellationToken cancellationToken = default);
-
-        /// <summary>
-        /// Invalidates user data cache across all instances.
-        /// </summary>
-        /// <param name="userId">The user ID.</param>
-        /// <param name="cancellationToken">Cancellation token.</param>
-        /// <returns>A task representing the asynchronous operation.</returns>
-        Task InvalidateUserDataAsync(Guid userId, CancellationToken cancellationToken = default);
-
-        /// <summary>
-        /// Invalidates an image cache across all instances.
-        /// </summary>
-        /// <param name="itemId">The item ID.</param>
-        /// <param name="cancellationToken">Cancellation token.</param>
-        /// <returns>A task representing the asynchronous operation.</returns>
-        Task InvalidateImageAsync(Guid itemId, CancellationToken cancellationToken = default);
-
-        /// <summary>
-        /// Invalidates all caches of a specific type across all instances.
-        /// </summary>
-        /// <param name="cacheType">The cache type.</param>
-        /// <param name="cancellationToken">Cancellation token.</param>
-        /// <returns>A task representing the asynchronous operation.</returns>
-        Task InvalidateAllAsync(CacheInvalidationType cacheType, CancellationToken cancellationToken = default);
-
-        /// <summary>
-        /// Invalidates a library cache across all instances.
-        /// </summary>
-        /// <param name="libraryId">The library ID.</param>
-        /// <param name="cancellationToken">Cancellation token.</param>
-        /// <returns>A task representing the asynchronous operation.</returns>
-        Task InvalidateLibraryAsync(Guid libraryId, CancellationToken cancellationToken = default);
-
-        /// <summary>
-        /// Invalidates a person cache across all instances.
-        /// </summary>
-        /// <param name="personId">The person ID.</param>
-        /// <param name="cancellationToken">Cancellation token.</param>
-        /// <returns>A task representing the asynchronous operation.</returns>
-        Task InvalidatePersonAsync(Guid personId, CancellationToken cancellationToken = default);
-
-        /// <summary>
-        /// Invalidates metadata for an item across all instances.
-        /// </summary>
-        /// <param name="itemId">The item ID.</param>
-        /// <param name="cancellationToken">Cancellation token.</param>
-        /// <returns>A task representing the asynchronous operation.</returns>
-        Task InvalidateMetadataAsync(Guid itemId, CancellationToken cancellationToken = default);
-    }
-}

Jellyfin.Server.Implementations/Clustering/IDistributedLockManager.cs

@@ -1,101 +0,0 @@
-// <copyright file="IDistributedLockManager.cs" company="PlaceholderCompany">
-// Copyright (c) PlaceholderCompany. All rights reserved.
-// </copyright>
-
-namespace Jellyfin.Server.Implementations.Clustering
-{
-    using System;
-    using System.Threading;
-    using System.Threading.Tasks;
-
-    /// <summary>
-    /// Interface for managing distributed locks across multiple instances.
-    /// </summary>
-    public interface IDistributedLockManager
-    {
-        /// <summary>
-        /// Attempts to acquire a distributed lock.
-        /// </summary>
-        /// <param name="lockName">The unique name of the lock.</param>
-        /// <param name="timeout">The maximum time to wait for the lock.</param>
-        /// <param name="cancellationToken">The cancellation token.</param>
-        /// <returns>A disposable lock handle, or null if lock could not be acquired.</returns>
-        Task<IDistributedLockHandle?> TryAcquireLockAsync(
-            string lockName,
-            TimeSpan timeout,
-            CancellationToken cancellationToken = default);
-
-        /// <summary>
-        /// Acquires a distributed lock, waiting indefinitely if necessary.
-        /// </summary>
-        /// <param name="lockName">The unique name of the lock.</param>
-        /// <param name="cancellationToken">The cancellation token.</param>
-        /// <returns>A disposable lock handle.</returns>
-        Task<IDistributedLockHandle> AcquireLockAsync(
-            string lockName,
-            CancellationToken cancellationToken = default);
-
-        /// <summary>
-        /// Checks if a lock is currently held.
-        /// </summary>
-        /// <param name="lockName">The name of the lock to check.</param>
-        /// <param name="cancellationToken">The cancellation token.</param>
-        /// <returns>True if the lock is held, false otherwise.</returns>
-        Task<bool> IsLockHeldAsync(
-            string lockName,
-            CancellationToken cancellationToken = default);
-
-        /// <summary>
-        /// Releases all locks held by the current instance.
-        /// </summary>
-        /// <param name="cancellationToken">The cancellation token.</param>
-        /// <returns>A task representing the asynchronous operation.</returns>
-        Task ReleaseAllLocksAsync(CancellationToken cancellationToken = default);
-
-        /// <summary>
-        /// Cleans up expired locks from the database.
-        /// </summary>
-        /// <param name="cancellationToken">The cancellation token.</param>
-        /// <returns>The number of locks cleaned up.</returns>
-        Task<int> CleanupExpiredLocksAsync(CancellationToken cancellationToken = default);
-    }
-
-    /// <summary>
-    /// Represents a handle to a distributed lock that can be disposed to release the lock.
-    /// </summary>
-    public interface IDistributedLockHandle : IAsyncDisposable
-    {
-        /// <summary>
-        /// Gets the name of the lock.
-        /// </summary>
-        string LockName { get; }
-
-        /// <summary>
-        /// Gets the instance ID holding the lock.
-        /// </summary>
-        Guid InstanceId { get; }
-
-        /// <summary>
-        /// Gets the time when the lock was acquired.
-        /// </summary>
-        DateTime AcquiredAt { get; }
-
-        /// <summary>
-        /// Gets the time when the lock will expire.
-        /// </summary>
-        DateTime ExpiresAt { get; }
-
-        /// <summary>
-        /// Gets a value indicating whether the lock is still valid.
-        /// </summary>
-        bool IsValid { get; }
-
-        /// <summary>
-        /// Renews the lock by extending its expiration time.
-        /// </summary>
-        /// <param name="additionalTime">The additional time to extend the lock.</param>
-        /// <param name="cancellationToken">The cancellation token.</param>
-        /// <returns>A task representing the asynchronous operation.</returns>
-        Task RenewAsync(TimeSpan additionalTime, CancellationToken cancellationToken = default);
-    }
-}

Jellyfin.Server.Implementations/Clustering/IFileSystemChangeProcessor.cs

@@ -1,39 +0,0 @@
-// <copyright file="IFileSystemChangeProcessor.cs" company="PlaceholderCompany">
-// Copyright (c) PlaceholderCompany. All rights reserved.
-// </copyright>
-
-namespace Jellyfin.Server.Implementations.Clustering
-{
-    using System.Threading;
-    using System.Threading.Tasks;
-
-    /// <summary>
-    /// Service that processes file system changes from the database (primary instance only).
-    /// </summary>
-    public interface IFileSystemChangeProcessor
-    {
-        /// <summary>
-        /// Starts the file system change processor.
-        /// </summary>
-        /// <param name="cancellationToken">The cancellation token.</param>
-        /// <returns>A <see cref="Task"/> representing the asynchronous operation.</returns>
-        Task StartAsync(CancellationToken cancellationToken = default);
-
-        /// <summary>
-        /// Stops the file system change processor.
-        /// </summary>
-        /// <param name="cancellationToken">The cancellation token.</param>
-        /// <returns>A <see cref="Task"/> representing the asynchronous operation.</returns>
-        Task StopAsync(CancellationToken cancellationToken = default);
-
-        /// <summary>
-        /// Records a file system change to the database.
-        /// </summary>
-        /// <param name="path">The path that changed.</param>
-        /// <param name="changeType">The type of change (Created, Modified, Deleted, Renamed).</param>
-        /// <param name="oldPath">The old path for rename operations.</param>
-        /// <param name="cancellationToken">The cancellation token.</param>
-        /// <returns>A <see cref="Task"/> representing the asynchronous operation.</returns>
-        Task RecordChangeAsync(string path, string changeType, string? oldPath = null, CancellationToken cancellationToken = default);
-    }
-}

Jellyfin.Server.Implementations/Clustering/IInstanceRegistry.cs

@@ -1,87 +0,0 @@
-// <copyright file="IInstanceRegistry.cs" company="PlaceholderCompany">
-// Copyright (c) PlaceholderCompany. All rights reserved.
-// </copyright>
-
-namespace Jellyfin.Server.Implementations.Clustering
-{
-    using System;
-    using System.Collections.Generic;
-    using System.Threading;
-    using System.Threading.Tasks;
-    using Jellyfin.Database.Implementations.Entities;
-
-    /// <summary>
-    /// Interface for managing Jellyfin instance registration and lifecycle.
-    /// </summary>
-    public interface IInstanceRegistry
-    {
-        /// <summary>
-        /// Gets the unique identifier for the current instance.
-        /// </summary>
-        Guid CurrentInstanceId { get; }
-
-        /// <summary>
-        /// Registers the current instance in the database.
-        /// </summary>
-        /// <param name="hostname">The hostname of the instance.</param>
-        /// <param name="processId">The process ID of the instance.</param>
-        /// <param name="httpPort">The HTTP port.</param>
-        /// <param name="httpsPort">The HTTPS port (optional).</param>
-        /// <param name="version">The Jellyfin version.</param>
-        /// <param name="capabilities">Instance capabilities (JSON).</param>
-        /// <param name="cancellationToken">Cancellation token.</param>
-        /// <returns>A task representing the asynchronous operation.</returns>
-        Task RegisterInstanceAsync(
-            string hostname,
-            int processId,
-            int httpPort,
-            int? httpsPort,
-            string version,
-            string? capabilities,
-            CancellationToken cancellationToken = default);
-
-        /// <summary>
-        /// Updates the heartbeat timestamp for the current instance.
-        /// </summary>
-        /// <param name="cancellationToken">Cancellation token.</param>
-        /// <returns>A task representing the asynchronous operation.</returns>
-        Task UpdateHeartbeatAsync(CancellationToken cancellationToken = default);
-
-        /// <summary>
-        /// Marks the current instance as shutdown in the database.
-        /// </summary>
-        /// <param name="cancellationToken">Cancellation token.</param>
-        /// <returns>A task representing the asynchronous operation.</returns>
-        Task ShutdownInstanceAsync(CancellationToken cancellationToken = default);
-
-        /// <summary>
-        /// Gets all active instances from the database.
-        /// </summary>
-        /// <param name="cancellationToken">Cancellation token.</param>
-        /// <returns>List of active instances.</returns>
-        Task<IReadOnlyList<Instance>> GetActiveInstancesAsync(CancellationToken cancellationToken = default);
-
-        /// <summary>
-        /// Gets a specific instance by ID.
-        /// </summary>
-        /// <param name="instanceId">The instance ID.</param>
-        /// <param name="cancellationToken">Cancellation token.</param>
-        /// <returns>The instance, or null if not found.</returns>
-        Task<Instance?> GetInstanceAsync(Guid instanceId, CancellationToken cancellationToken = default);
-
-        /// <summary>
-        /// Removes stale instances from the database.
-        /// </summary>
-        /// <param name="staleThreshold">Time after which an instance is considered stale.</param>
-        /// <param name="cancellationToken">Cancellation token.</param>
-        /// <returns>Number of instances removed.</returns>
-        Task<int> CleanupStaleInstancesAsync(TimeSpan staleThreshold, CancellationToken cancellationToken = default);
-
-        /// <summary>
-        /// Checks if the current instance is the primary instance.
-        /// </summary>
-        /// <param name="cancellationToken">Cancellation token.</param>
-        /// <returns>True if this instance is primary.</returns>
-        Task<bool> IsPrimaryInstanceAsync(CancellationToken cancellationToken = default);
-    }
-}

Jellyfin.Server.Implementations/Clustering/IPostgresNotificationListener.cs

@@ -1,72 +0,0 @@
-// <copyright file="IPostgresNotificationListener.cs" company="PlaceholderCompany">
-// Copyright (c) PlaceholderCompany. All rights reserved.
-// </copyright>
-
-namespace Jellyfin.Server.Implementations.Clustering
-{
-    using System;
-    using System.Threading;
-    using System.Threading.Tasks;
-
-    /// <summary>
-    /// Interface for listening to PostgreSQL NOTIFY messages.
-    /// </summary>
-    public interface IPostgresNotificationListener
-    {
-        /// <summary>
-        /// Event fired when a notification is received.
-        /// </summary>
-        event EventHandler<PostgresNotificationEventArgs>? NotificationReceived;
-
-        /// <summary>
-        /// Starts listening for notifications on the specified channel.
-        /// </summary>
-        /// <param name="channel">The channel name to listen on.</param>
-        /// <param name="cancellationToken">Cancellation token.</param>
-        /// <returns>A task representing the asynchronous operation.</returns>
-        Task StartListeningAsync(string channel, CancellationToken cancellationToken = default);
-
-        /// <summary>
-        /// Stops listening for notifications.
-        /// </summary>
-        /// <param name="cancellationToken">Cancellation token.</param>
-        /// <returns>A task representing the asynchronous operation.</returns>
-        Task StopListeningAsync(CancellationToken cancellationToken = default);
-
-        /// <summary>
-        /// Sends a notification to a channel.
-        /// </summary>
-        /// <param name="channel">The channel name.</param>
-        /// <param name="payload">The notification payload.</param>
-        /// <param name="cancellationToken">Cancellation token.</param>
-        /// <returns>A task representing the asynchronous operation.</returns>
-        Task NotifyAsync(string channel, string payload, CancellationToken cancellationToken = default);
-    }
-
-    /// <summary>
-    /// Event arguments for PostgreSQL notifications.
-    /// </summary>
-    public class PostgresNotificationEventArgs : EventArgs
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="PostgresNotificationEventArgs"/> class.
-        /// </summary>
-        /// <param name="channel">The channel name.</param>
-        /// <param name="payload">The notification payload.</param>
-        public PostgresNotificationEventArgs(string channel, string payload)
-        {
-            Channel = channel;
-            Payload = payload;
-        }
-
-        /// <summary>
-        /// Gets the channel name.
-        /// </summary>
-        public string Channel { get; }
-
-        /// <summary>
-        /// Gets the notification payload.
-        /// </summary>
-        public string Payload { get; }
-    }
-}

Jellyfin.Server.Implementations/Clustering/IPrimaryElectionService.cs

@@ -1,58 +0,0 @@
-// <copyright file="IPrimaryElectionService.cs" company="PlaceholderCompany">
-// Copyright (c) PlaceholderCompany. All rights reserved.
-// </copyright>
-
-namespace Jellyfin.Server.Implementations.Clustering
-{
-    using System;
-    using System.Threading;
-    using System.Threading.Tasks;
-
-    /// <summary>
-    /// Service for managing primary instance election and coordination.
-    /// </summary>
-    public interface IPrimaryElectionService
-    {
-        /// <summary>
-        /// Event raised when the primary instance changes.
-        /// </summary>
-        event EventHandler<PrimaryInstanceChangedEventArgs>? PrimaryInstanceChanged;
-
-        /// <summary>
-        /// Gets a value indicating whether the current instance is the primary instance.
-        /// </summary>
-        bool IsPrimary { get; }
-
-        /// <summary>
-        /// Gets the ID of the current primary instance, if any.
-        /// </summary>
-        Guid? PrimaryInstanceId { get; }
-
-        /// <summary>
-        /// Starts the primary election service and begins monitoring.
-        /// </summary>
-        /// <param name="cancellationToken">The cancellation token.</param>
-        /// <returns>A <see cref="Task"/> representing the asynchronous operation.</returns>
-        Task StartAsync(CancellationToken cancellationToken = default);
-
-        /// <summary>
-        /// Stops the primary election service.
-        /// </summary>
-        /// <param name="cancellationToken">The cancellation token.</param>
-        /// <returns>A <see cref="Task"/> representing the asynchronous operation.</returns>
-        Task StopAsync(CancellationToken cancellationToken = default);
-
-        /// <summary>
-        /// Runs the primary election algorithm.
-        /// </summary>
-        /// <param name="cancellationToken">The cancellation token.</param>
-        /// <returns>The ID of the elected primary instance.</returns>
-        Task<Guid?> ElectPrimaryAsync(CancellationToken cancellationToken = default);
-
-        /// <summary>
-        /// Checks if this instance should execute scheduled tasks.
-        /// </summary>
-        /// <returns>True if this instance should execute scheduled tasks, false otherwise.</returns>
-        bool ShouldExecuteScheduledTasks();
-    }
-}

Jellyfin.Server.Implementations/Clustering/InstanceRegistry.cs

@@ -1,252 +0,0 @@
-// <copyright file="InstanceRegistry.cs" company="PlaceholderCompany">
-// Copyright (c) PlaceholderCompany. All rights reserved.
-// </copyright>
-
-namespace Jellyfin.Server.Implementations.Clustering
-{
-    using System;
-    using System.Collections.Generic;
-    using System.Linq;
-    using System.Threading;
-    using System.Threading.Tasks;
-    using Jellyfin.Database.Implementations;
-    using Jellyfin.Database.Implementations.Entities;
-    using Microsoft.EntityFrameworkCore;
-    using Microsoft.Extensions.Logging;
-
-    /// <summary>
-    /// Manages Jellyfin instance registration and lifecycle.
-    /// </summary>
-    public sealed class InstanceRegistry : IInstanceRegistry, IAsyncDisposable
-    {
-        private readonly IDbContextFactory<JellyfinDbContext> _dbContextFactory;
-        private readonly ILogger<InstanceRegistry> _logger;
-        private readonly Timer _heartbeatTimer;
-        private bool _disposed;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="InstanceRegistry"/> class.
-        /// </summary>
-        /// <param name="dbContextFactory">The database context factory.</param>
-        /// <param name="logger">The logger.</param>
-        public InstanceRegistry(
-            IDbContextFactory<JellyfinDbContext> dbContextFactory,
-            ILogger<InstanceRegistry> logger)
-        {
-            _dbContextFactory = dbContextFactory;
-            _logger = logger;
-            CurrentInstanceId = Guid.NewGuid();
-
-            // Send heartbeat every 30 seconds
-            _heartbeatTimer = new Timer(
-                HeartbeatCallback,
-                null,
-                TimeSpan.FromSeconds(30),
-                TimeSpan.FromSeconds(30));
-        }
-
-        /// <summary>
-        /// Gets the unique identifier for the current instance.
-        /// </summary>
-        public Guid CurrentInstanceId { get; }
-
-        /// <inheritdoc/>
-        public async Task RegisterInstanceAsync(
-            string hostname,
-            int processId,
-            int httpPort,
-            int? httpsPort,
-            string version,
-            string? capabilities,
-            CancellationToken cancellationToken = default)
-        {
-            try
-            {
-                await using var dbContext = await _dbContextFactory.CreateDbContextAsync(cancellationToken).ConfigureAwait(false);
-
-                var instance = new Instance(
-                    CurrentInstanceId,
-                    hostname,
-                    processId,
-                    httpPort,
-                    version)
-                {
-                    HttpsPort = httpsPort
-                };
-
-                if (!string.IsNullOrEmpty(capabilities))
-                {
-                    instance.SetCapabilities(capabilities);
-                }
-
-                dbContext.Instances.Add(instance);
-                await dbContext.SaveChangesAsync(cancellationToken).ConfigureAwait(false);
-
-                _logger.LogInformation(
-                    "Registered instance {InstanceId} ({Hostname}:{Port})",
-                    CurrentInstanceId,
-                    hostname,
-                    httpPort);
-            }
-            catch (Exception ex)
-            {
-                _logger.LogError(ex, "Failed to register instance {InstanceId}", CurrentInstanceId);
-                throw;
-            }
-        }
-
-        /// <inheritdoc/>
-        public async Task UpdateHeartbeatAsync(CancellationToken cancellationToken = default)
-        {
-            try
-            {
-                await using var dbContext = await _dbContextFactory.CreateDbContextAsync(cancellationToken).ConfigureAwait(false);
-
-                var instance = await dbContext.Instances
-                    .FirstOrDefaultAsync(i => i.InstanceId.Equals(CurrentInstanceId), cancellationToken)
-                    .ConfigureAwait(false);
-
-                if (instance is not null)
-                {
-                    instance.UpdateHeartbeat();
-                    await dbContext.SaveChangesAsync(cancellationToken).ConfigureAwait(false);
-                }
-            }
-            catch (Exception ex)
-            {
-                _logger.LogWarning(ex, "Failed to update heartbeat for instance {InstanceId}", CurrentInstanceId);
-            }
-        }
-
-        /// <inheritdoc/>
-        public async Task ShutdownInstanceAsync(CancellationToken cancellationToken = default)
-        {
-            try
-            {
-                await using var dbContext = await _dbContextFactory.CreateDbContextAsync(cancellationToken).ConfigureAwait(false);
-
-                var instance = await dbContext.Instances
-                    .FirstOrDefaultAsync(i => i.InstanceId.Equals(CurrentInstanceId), cancellationToken)
-                    .ConfigureAwait(false);
-
-                if (instance is not null)
-                {
-                    instance.UpdateStatus(InstanceStatus.Shutdown);
-                    await dbContext.SaveChangesAsync(cancellationToken).ConfigureAwait(false);
-
-                    _logger.LogInformation("Instance {InstanceId} marked as shutdown", CurrentInstanceId);
-                }
-            }
-            catch (Exception ex)
-            {
-                _logger.LogError(ex, "Failed to shutdown instance {InstanceId}", CurrentInstanceId);
-            }
-        }
-
-        /// <inheritdoc/>
-        public async Task<IReadOnlyList<Instance>> GetActiveInstancesAsync(CancellationToken cancellationToken = default)
-        {
-            await using var dbContext = await _dbContextFactory.CreateDbContextAsync(cancellationToken).ConfigureAwait(false);
-
-            return await dbContext.Instances
-                .Where(i => i.Status == InstanceStatus.Active)
-                .Where(i => !i.IsStale(TimeSpan.FromMinutes(2)))
-                .ToListAsync(cancellationToken)
-                .ConfigureAwait(false);
-        }
-
-        /// <inheritdoc/>
-        public async Task<Instance?> GetInstanceAsync(Guid instanceId, CancellationToken cancellationToken = default)
-        {
-            await using var dbContext = await _dbContextFactory.CreateDbContextAsync(cancellationToken).ConfigureAwait(false);
-
-            return await dbContext.Instances
-                .FirstOrDefaultAsync(i => i.InstanceId.Equals(instanceId), cancellationToken)
-                .ConfigureAwait(false);
-        }
-
-        /// <inheritdoc/>
-        public async Task<int> CleanupStaleInstancesAsync(TimeSpan staleThreshold, CancellationToken cancellationToken = default)
-        {
-            try
-            {
-                await using var dbContext = await _dbContextFactory.CreateDbContextAsync(cancellationToken).ConfigureAwait(false);
-
-                var cutoffTime = DateTime.UtcNow - staleThreshold;
-
-                var staleInstances = await dbContext.Instances
-                    .Where(i => i.LastHeartbeat < cutoffTime)
-                    .Where(i => i.Status != InstanceStatus.Shutdown)
-                    .ToListAsync(cancellationToken)
-                    .ConfigureAwait(false);
-
-                if (staleInstances.Count > 0)
-                {
-                    foreach (var instance in staleInstances)
-                    {
-                        instance.UpdateStatus(InstanceStatus.Failed);
-                    }
-
-                    await dbContext.SaveChangesAsync(cancellationToken).ConfigureAwait(false);
-
-                    _logger.LogInformation(
-                        "Marked {Count} stale instances as failed",
-                        staleInstances.Count);
-                }
-
-                return staleInstances.Count;
-            }
-            catch (Exception ex)
-            {
-                _logger.LogError(ex, "Failed to cleanup stale instances");
-                return 0;
-            }
-        }
-
-        /// <inheritdoc/>
-        public async Task<bool> IsPrimaryInstanceAsync(CancellationToken cancellationToken = default)
-        {
-            await using var dbContext = await _dbContextFactory.CreateDbContextAsync(cancellationToken).ConfigureAwait(false);
-
-                var instance = await dbContext.Instances
-                    .FirstOrDefaultAsync(i => i.InstanceId.Equals(CurrentInstanceId), cancellationToken)
-                    .ConfigureAwait(false);
-
-            return instance?.IsPrimary ?? false;
-        }
-
-        /// <inheritdoc/>
-        public async ValueTask DisposeAsync()
-        {
-            if (_disposed)
-            {
-                return;
-            }
-
-            _disposed = true;
-
-            await _heartbeatTimer.DisposeAsync().ConfigureAwait(false);
-            await ShutdownInstanceAsync(CancellationToken.None).ConfigureAwait(false);
-        }
-
-        private void HeartbeatCallback(object? state)
-        {
-            if (_disposed)
-            {
-                return;
-            }
-
-            Task.Run(async () =>
-            {
-                try
-                {
-                    await UpdateHeartbeatAsync(CancellationToken.None).ConfigureAwait(false);
-                }
-                catch (Exception ex)
-                {
-                    _logger.LogError(ex, "Heartbeat timer error for instance {InstanceId}", CurrentInstanceId);
-                }
-            });
-        }
-    }
-}

Jellyfin.Server.Implementations/Clustering/PostgresNotificationListener.cs

@@ -1,200 +0,0 @@
-// <copyright file="PostgresNotificationListener.cs" company="PlaceholderCompany">
-// Copyright (c) PlaceholderCompany. All rights reserved.
-// </copyright>
-
-namespace Jellyfin.Server.Implementations.Clustering
-{
-    using System;
-    using System.Threading;
-    using System.Threading.Tasks;
-    using Jellyfin.Database.Implementations;
-    using Microsoft.EntityFrameworkCore;
-    using Microsoft.Extensions.Logging;
-    using Npgsql;
-
-    /// <summary>
-    /// Listens for PostgreSQL NOTIFY messages for cross-instance communication.
-    /// </summary>
-    public sealed class PostgresNotificationListener : IPostgresNotificationListener, IAsyncDisposable
-    {
-        private readonly IDbContextFactory<JellyfinDbContext> _dbContextFactory;
-        private readonly ILogger<PostgresNotificationListener> _logger;
-        private NpgsqlConnection? _connection;
-        private Task? _listenerTask;
-        private CancellationTokenSource? _listenerCts;
-        private bool _disposed;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="PostgresNotificationListener"/> class.
-        /// </summary>
-        /// <param name="dbContextFactory">The database context factory.</param>
-        /// <param name="logger">The logger.</param>
-        public PostgresNotificationListener(
-            IDbContextFactory<JellyfinDbContext> dbContextFactory,
-            ILogger<PostgresNotificationListener> logger)
-        {
-            _dbContextFactory = dbContextFactory;
-            _logger = logger;
-        }
-
-        /// <inheritdoc/>
-        public event EventHandler<PostgresNotificationEventArgs>? NotificationReceived;
-
-        /// <inheritdoc/>
-        public async Task StartListeningAsync(string channel, CancellationToken cancellationToken = default)
-        {
-            if (_connection is not null)
-            {
-                _logger.LogWarning("Already listening on channel {Channel}", channel);
-                return;
-            }
-
-            try
-            {
-                // Create a dedicated connection for listening
-                await using var tempContext = await _dbContextFactory.CreateDbContextAsync(cancellationToken).ConfigureAwait(false);
-                var connectionString = tempContext.Database.GetConnectionString();
-
-                if (string.IsNullOrEmpty(connectionString))
-                {
-                    throw new InvalidOperationException("Connection string not found");
-                }
-
-                _connection = new NpgsqlConnection(connectionString);
-                await _connection.OpenAsync(cancellationToken).ConfigureAwait(false);
-
-                _connection.Notification += OnNotification;
-
-                // Subscribe to the channel
-                await using (var cmd = new NpgsqlCommand($"LISTEN {channel}", _connection))
-                {
-                    await cmd.ExecuteNonQueryAsync(cancellationToken).ConfigureAwait(false);
-                }
-
-                _logger.LogInformation("Started listening on PostgreSQL channel: {Channel}", channel);
-
-                // Start the listener loop
-                _listenerCts = new CancellationTokenSource();
-                _listenerTask = ListenLoopAsync(_listenerCts.Token);
-            }
-            catch (Exception ex)
-            {
-                _logger.LogError(ex, "Failed to start listening on channel {Channel}", channel);
-                throw;
-            }
-        }
-
-        /// <inheritdoc/>
-        public async Task StopListeningAsync(CancellationToken cancellationToken = default)
-        {
-            if (_connection is null)
-            {
-                return;
-            }
-
-            try
-            {
-                _listenerCts?.Cancel();
-
-                if (_listenerTask is not null)
-                {
-                    await _listenerTask.ConfigureAwait(false);
-                }
-
-                if (_connection is not null)
-                {
-                    _connection.Notification -= OnNotification;
-                    await _connection.CloseAsync().ConfigureAwait(false);
-                    await _connection.DisposeAsync().ConfigureAwait(false);
-                    _connection = null;
-                }
-
-                _logger.LogInformation("Stopped listening for PostgreSQL notifications");
-            }
-            catch (Exception ex)
-            {
-                _logger.LogError(ex, "Error stopping notification listener");
-            }
-        }
-
-        /// <inheritdoc/>
-        public async Task NotifyAsync(string channel, string payload, CancellationToken cancellationToken = default)
-        {
-            try
-            {
-                await using var context = await _dbContextFactory.CreateDbContextAsync(cancellationToken).ConfigureAwait(false);
-
-                // Escape the payload for PostgreSQL
-                var escapedPayload = payload.Replace("'", "''", StringComparison.Ordinal);
-                var sql = $"NOTIFY {channel}, '{escapedPayload}'";
-
-                await context.Database.ExecuteSqlRawAsync(sql, cancellationToken).ConfigureAwait(false);
-
-                _logger.LogDebug("Sent notification on channel {Channel}", channel);
-            }
-            catch (Exception ex)
-            {
-                _logger.LogError(ex, "Failed to send notification on channel {Channel}", channel);
-                throw;
-            }
-        }
-
-        /// <inheritdoc/>
-        public async ValueTask DisposeAsync()
-        {
-            if (_disposed)
-            {
-                return;
-            }
-
-            _disposed = true;
-
-            await StopListeningAsync(CancellationToken.None).ConfigureAwait(false);
-
-            _listenerCts?.Dispose();
-        }
-
-        private async Task ListenLoopAsync(CancellationToken cancellationToken)
-        {
-            while (!cancellationToken.IsCancellationRequested && _connection is not null)
-            {
-                try
-                {
-                    // Wait for notifications
-                    await _connection.WaitAsync(cancellationToken).ConfigureAwait(false);
-                }
-                catch (OperationCanceledException)
-                {
-                    break;
-                }
-                catch (Exception ex)
-                {
-                    _logger.LogError(ex, "Error in notification listener loop");
-
-                    // Wait a bit before retrying
-                    try
-                    {
-                        await Task.Delay(5000, cancellationToken).ConfigureAwait(false);
-                    }
-                    catch (OperationCanceledException)
-                    {
-                        break;
-                    }
-                }
-            }
-        }
-
-        private void OnNotification(object? sender, NpgsqlNotificationEventArgs e)
-        {
-            try
-            {
-                _logger.LogDebug("Received notification on channel {Channel}: {Payload}", e.Channel, e.Payload);
-                NotificationReceived?.Invoke(this, new PostgresNotificationEventArgs(e.Channel, e.Payload));
-            }
-            catch (Exception ex)
-            {
-                _logger.LogError(ex, "Error handling notification");
-            }
-        }
-    }
-}

Jellyfin.Server.Implementations/Clustering/PrimaryElectionService.cs

@@ -1,263 +0,0 @@
-// <copyright file="PrimaryElectionService.cs" company="PlaceholderCompany">
-// Copyright (c) PlaceholderCompany. All rights reserved.
-// </copyright>
-
-namespace Jellyfin.Server.Implementations.Clustering
-{
-    using System;
-    using System.Threading;
-    using System.Threading.Tasks;
-    using Jellyfin.Database.Implementations;
-    using Microsoft.EntityFrameworkCore;
-    using Microsoft.Extensions.Hosting;
-    using Microsoft.Extensions.Logging;
-
-    /// <summary>
-    /// Service that manages primary instance election and coordination.
-    /// </summary>
-    public sealed class PrimaryElectionService : IPrimaryElectionService, IHostedService, IAsyncDisposable
-    {
-        private readonly IDbContextFactory<JellyfinDbContext> _dbContextFactory;
-        private readonly IInstanceRegistry _instanceRegistry;
-        private readonly ILogger<PrimaryElectionService> _logger;
-        private CancellationTokenSource? _monitoringCts;
-        private Task? _monitoringTask;
-        private bool _disposed;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="PrimaryElectionService"/> class.
-        /// </summary>
-        /// <param name="dbContextFactory">The database context factory.</param>
-        /// <param name="instanceRegistry">The instance registry.</param>
-        /// <param name="logger">The logger.</param>
-        public PrimaryElectionService(
-            IDbContextFactory<JellyfinDbContext> dbContextFactory,
-            IInstanceRegistry instanceRegistry,
-            ILogger<PrimaryElectionService> logger)
-        {
-            _dbContextFactory = dbContextFactory;
-            _instanceRegistry = instanceRegistry;
-            _logger = logger;
-        }
-
-        /// <inheritdoc/>
-        public event EventHandler<PrimaryInstanceChangedEventArgs>? PrimaryInstanceChanged;
-
-        /// <inheritdoc/>
-        public bool IsPrimary { get; private set; }
-
-        /// <inheritdoc/>
-        public Guid? PrimaryInstanceId { get; private set; }
-
-        /// <inheritdoc/>
-        Task IHostedService.StartAsync(CancellationToken cancellationToken)
-        {
-            return StartAsync(cancellationToken);
-        }
-
-        /// <inheritdoc/>
-        Task IHostedService.StopAsync(CancellationToken cancellationToken)
-        {
-            return StopAsync(cancellationToken);
-        }
-
-        /// <inheritdoc/>
-        public async Task StartAsync(CancellationToken cancellationToken = default)
-        {
-            _logger.LogInformation("Starting primary election service");
-
-            // Run initial election
-            await ElectPrimaryAsync(cancellationToken).ConfigureAwait(false);
-
-            // Start background monitoring
-            _monitoringCts = new CancellationTokenSource();
-            _monitoringTask = MonitorPrimaryStatusAsync(_monitoringCts.Token);
-
-            _logger.LogInformation(
-                "Primary election service started. Current instance is primary: {IsPrimary}",
-                IsPrimary);
-        }
-
-        /// <inheritdoc/>
-        public async Task StopAsync(CancellationToken cancellationToken = default)
-        {
-            _logger.LogInformation("Stopping primary election service");
-
-            if (_monitoringCts is not null)
-            {
-                _monitoringCts.Cancel();
-
-                if (_monitoringTask is not null)
-                {
-                    try
-                    {
-                        await _monitoringTask.ConfigureAwait(false);
-                    }
-                    catch (OperationCanceledException)
-                    {
-                        // Expected
-                    }
-                }
-            }
-
-            // If we were primary, relinquish it
-            if (IsPrimary)
-            {
-                await RelinquishPrimaryAsync(cancellationToken).ConfigureAwait(false);
-            }
-
-            _logger.LogInformation("Primary election service stopped");
-        }
-
-        /// <inheritdoc/>
-        public async Task<Guid?> ElectPrimaryAsync(CancellationToken cancellationToken = default)
-        {
-            try
-            {
-                await using var context = await _dbContextFactory.CreateDbContextAsync(cancellationToken).ConfigureAwait(false);
-
-                // Call the database function to elect primary
-                var result = await context.Database
-                    .SqlQuery<Guid?>($"SELECT library.elect_primary_instance()")
-                    .FirstOrDefaultAsync(cancellationToken)
-                    .ConfigureAwait(false);
-
-                var previousPrimaryId = PrimaryInstanceId;
-                PrimaryInstanceId = result;
-                IsPrimary = result.HasValue && result.Value.Equals(_instanceRegistry.CurrentInstanceId);
-
-                // Raise event if primary changed
-                if (!previousPrimaryId.Equals(PrimaryInstanceId))
-                {
-                    _logger.LogInformation(
-                        "Primary instance changed from {PreviousPrimaryId} to {NewPrimaryId}. Current instance is primary: {IsPrimary}",
-                        previousPrimaryId,
-                        PrimaryInstanceId,
-                        IsPrimary);
-
-                    PrimaryInstanceChanged?.Invoke(
-                        this,
-                        new PrimaryInstanceChangedEventArgs(previousPrimaryId, PrimaryInstanceId, IsPrimary));
-                }
-
-                return PrimaryInstanceId;
-            }
-            catch (Exception ex)
-            {
-                _logger.LogError(ex, "Failed to elect primary instance");
-                throw;
-            }
-        }
-
-        /// <inheritdoc/>
-        public bool ShouldExecuteScheduledTasks()
-        {
-            // Only the primary instance should execute scheduled tasks
-            return IsPrimary;
-        }
-
-        /// <inheritdoc/>
-        public async ValueTask DisposeAsync()
-        {
-            if (_disposed)
-            {
-                return;
-            }
-
-            _disposed = true;
-
-            await StopAsync(CancellationToken.None).ConfigureAwait(false);
-
-            _monitoringCts?.Dispose();
-        }
-
-        private async Task MonitorPrimaryStatusAsync(CancellationToken cancellationToken)
-        {
-            _logger.LogDebug("Primary status monitoring started");
-
-            while (!cancellationToken.IsCancellationRequested)
-            {
-                try
-                {
-                    // Check primary status every 30 seconds
-                    await Task.Delay(TimeSpan.FromSeconds(30), cancellationToken).ConfigureAwait(false);
-
-                    await CheckAndUpdatePrimaryStatusAsync(cancellationToken).ConfigureAwait(false);
-                }
-                catch (OperationCanceledException)
-                {
-                    break;
-                }
-                catch (Exception ex)
-                {
-                    _logger.LogError(ex, "Error in primary status monitoring loop");
-
-                    // Wait before retrying
-                    try
-                    {
-                        await Task.Delay(TimeSpan.FromSeconds(5), cancellationToken).ConfigureAwait(false);
-                    }
-                    catch (OperationCanceledException)
-                    {
-                        break;
-                    }
-                }
-            }
-
-            _logger.LogDebug("Primary status monitoring stopped");
-        }
-
-        private async Task CheckAndUpdatePrimaryStatusAsync(CancellationToken cancellationToken)
-        {
-            try
-            {
-                await using var context = await _dbContextFactory.CreateDbContextAsync(cancellationToken).ConfigureAwait(false);
-
-                // Check if current primary is still active
-                var currentPrimary = await context.Database
-                    .SqlQuery<Guid?>($"SELECT library.get_primary_instance()")
-                    .FirstOrDefaultAsync(cancellationToken)
-                    .ConfigureAwait(false);
-
-                // If no primary exists or primary changed, run election
-                if (!currentPrimary.Equals(PrimaryInstanceId))
-                {
-                    _logger.LogWarning(
-                        "Primary instance status changed. Current: {CurrentPrimary}, Expected: {ExpectedPrimary}. Running election.",
-                        currentPrimary,
-                        PrimaryInstanceId);
-
-                    await ElectPrimaryAsync(cancellationToken).ConfigureAwait(false);
-                }
-            }
-            catch (Exception ex)
-            {
-                _logger.LogError(ex, "Failed to check primary status");
-            }
-        }
-
-        private async Task RelinquishPrimaryAsync(CancellationToken cancellationToken)
-        {
-            try
-            {
-                await using var context = await _dbContextFactory.CreateDbContextAsync(cancellationToken).ConfigureAwait(false);
-
-                // Clear IsPrimary flag for this instance
-                await context.Database
-                    .ExecuteSqlAsync(
-                        $@"UPDATE library.""Instances"" 
-                           SET ""IsPrimary"" = FALSE 
-                           WHERE ""InstanceId"" = {_instanceRegistry.CurrentInstanceId}",
-                        cancellationToken)
-                    .ConfigureAwait(false);
-
-                IsPrimary = false;
-                _logger.LogInformation("Relinquished primary status");
-            }
-            catch (Exception ex)
-            {
-                _logger.LogError(ex, "Failed to relinquish primary status");
-            }
-        }
-    }
-}

Jellyfin.Server.Implementations/Clustering/PrimaryInstanceChangedEventArgs.cs

@@ -1,42 +0,0 @@
-// <copyright file="PrimaryInstanceChangedEventArgs.cs" company="PlaceholderCompany">
-// Copyright (c) PlaceholderCompany. All rights reserved.
-// </copyright>
-
-namespace Jellyfin.Server.Implementations.Clustering
-{
-    using System;
-
-    /// <summary>
-    /// Event arguments for when the primary instance changes.
-    /// </summary>
-    public class PrimaryInstanceChangedEventArgs : EventArgs
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="PrimaryInstanceChangedEventArgs"/> class.
-        /// </summary>
-        /// <param name="previousPrimaryId">The previous primary instance ID.</param>
-        /// <param name="newPrimaryId">The new primary instance ID.</param>
-        /// <param name="isCurrentInstance">Whether the current instance is now primary.</param>
-        public PrimaryInstanceChangedEventArgs(Guid? previousPrimaryId, Guid? newPrimaryId, bool isCurrentInstance)
-        {
-            PreviousPrimaryId = previousPrimaryId;
-            NewPrimaryId = newPrimaryId;
-            IsCurrentInstance = isCurrentInstance;
-        }
-
-        /// <summary>
-        /// Gets the previous primary instance ID.
-        /// </summary>
-        public Guid? PreviousPrimaryId { get; }
-
-        /// <summary>
-        /// Gets the new primary instance ID.
-        /// </summary>
-        public Guid? NewPrimaryId { get; }
-
-        /// <summary>
-        /// Gets a value indicating whether the current instance is now the primary.
-        /// </summary>
-        public bool IsCurrentInstance { get; }
-    }
-}

Jellyfin.Server.Implementations/Clustering/PrimaryInstanceTaskManager.cs

@@ -1,181 +0,0 @@
-// <copyright file="PrimaryInstanceTaskManager.cs" company="PlaceholderCompany">
-// Copyright (c) PlaceholderCompany. All rights reserved.
-// </copyright>
-
-namespace Jellyfin.Server.Implementations.Clustering
-{
-    using System;
-    using System.Collections.Generic;
-    using System.Threading.Tasks;
-    using Jellyfin.Data.Events;
-    using MediaBrowser.Model.Tasks;
-    using Microsoft.Extensions.Logging;
-
-    /// <summary>
-    /// Task manager decorator that ensures scheduled tasks only run on the primary instance.
-    /// </summary>
-    public sealed class PrimaryInstanceTaskManager : ITaskManager
-    {
-        private readonly ITaskManager _innerTaskManager;
-        private readonly IPrimaryElectionService _primaryElectionService;
-        private readonly ILogger<PrimaryInstanceTaskManager> _logger;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="PrimaryInstanceTaskManager"/> class.
-        /// </summary>
-        /// <param name="innerTaskManager">The inner task manager.</param>
-        /// <param name="primaryElectionService">The primary election service.</param>
-        /// <param name="logger">The logger.</param>
-        public PrimaryInstanceTaskManager(
-            ITaskManager innerTaskManager,
-            IPrimaryElectionService primaryElectionService,
-            ILogger<PrimaryInstanceTaskManager> logger)
-        {
-            _innerTaskManager = innerTaskManager;
-            _primaryElectionService = primaryElectionService;
-            _logger = logger;
-        }
-
-        /// <inheritdoc/>
-        public event EventHandler<GenericEventArgs<IScheduledTaskWorker>>? TaskExecuting
-        {
-            add => _innerTaskManager.TaskExecuting += value;
-            remove => _innerTaskManager.TaskExecuting -= value;
-        }
-
-        /// <inheritdoc/>
-        public event EventHandler<TaskCompletionEventArgs>? TaskCompleted
-        {
-            add => _innerTaskManager.TaskCompleted += value;
-            remove => _innerTaskManager.TaskCompleted -= value;
-        }
-
-        /// <inheritdoc/>
-        public IReadOnlyList<IScheduledTaskWorker> ScheduledTasks => _innerTaskManager.ScheduledTasks;
-
-        /// <inheritdoc/>
-        public void CancelIfRunningAndQueue<T>(TaskOptions options)
-            where T : IScheduledTask
-        {
-            if (ShouldExecuteTask<T>())
-            {
-                _innerTaskManager.CancelIfRunningAndQueue<T>(options);
-            }
-        }
-
-        /// <inheritdoc/>
-        public void CancelIfRunningAndQueue<T>()
-            where T : IScheduledTask
-        {
-            if (ShouldExecuteTask<T>())
-            {
-                _innerTaskManager.CancelIfRunningAndQueue<T>();
-            }
-        }
-
-        /// <inheritdoc/>
-        public void CancelIfRunning<T>()
-            where T : IScheduledTask
-        {
-            _innerTaskManager.CancelIfRunning<T>();
-        }
-
-        /// <inheritdoc/>
-        public void QueueScheduledTask<T>(TaskOptions options)
-            where T : IScheduledTask
-        {
-            if (ShouldExecuteTask<T>())
-            {
-                _innerTaskManager.QueueScheduledTask<T>(options);
-            }
-        }
-
-        /// <inheritdoc/>
-        public void QueueScheduledTask<T>()
-            where T : IScheduledTask
-        {
-            if (ShouldExecuteTask<T>())
-            {
-                _innerTaskManager.QueueScheduledTask<T>();
-            }
-        }
-
-        /// <inheritdoc/>
-        public void QueueIfNotRunning<T>()
-            where T : IScheduledTask
-        {
-            if (ShouldExecuteTask<T>())
-            {
-                _innerTaskManager.QueueIfNotRunning<T>();
-            }
-        }
-
-        /// <inheritdoc/>
-        public void Execute<T>()
-            where T : IScheduledTask
-        {
-            if (ShouldExecuteTask<T>())
-            {
-                _innerTaskManager.Execute<T>();
-            }
-        }
-
-        /// <inheritdoc/>
-        public void QueueScheduledTask(IScheduledTask task, TaskOptions options)
-        {
-            if (ShouldExecuteTask(task.GetType()))
-            {
-                _innerTaskManager.QueueScheduledTask(task, options);
-            }
-        }
-
-        /// <inheritdoc/>
-        public void AddTasks(IEnumerable<IScheduledTask> tasks)
-        {
-            _innerTaskManager.AddTasks(tasks);
-        }
-
-        /// <inheritdoc/>
-        public void Cancel(IScheduledTaskWorker task)
-        {
-            _innerTaskManager.Cancel(task);
-        }
-
-        /// <inheritdoc/>
-        public Task Execute(IScheduledTaskWorker task, TaskOptions options)
-        {
-            if (ShouldExecuteTask(task.ScheduledTask.GetType()))
-            {
-                return _innerTaskManager.Execute(task, options);
-            }
-
-            return Task.CompletedTask;
-        }
-
-        /// <inheritdoc/>
-        public void Dispose()
-        {
-            _innerTaskManager.Dispose();
-        }
-
-        private bool ShouldExecuteTask<T>()
-            where T : IScheduledTask
-        {
-            return ShouldExecuteTask(typeof(T));
-        }
-
-        private bool ShouldExecuteTask(Type taskType)
-        {
-            if (!_primaryElectionService.ShouldExecuteScheduledTasks())
-            {
-                _logger.LogDebug(
-                    "Skipping task {TaskName} - not primary instance. Primary: {PrimaryId}",
-                    taskType.Name,
-                    _primaryElectionService.PrimaryInstanceId);
-                return false;
-            }
-
-            return true;
-        }
-    }
-}

Jellyfin.Server.Implementations/Extensions/ServiceCollectionExtensions.cs

@@ -99,23 +99,13 @@ public static class ServiceCollectionExtensions
             }
             else
             {
-                // when nothing is setup via new Database configuration, fallback to SQLite with default settings.
+                // PostgreSQL-only build: default to PostgreSQL when no database.xml exists.
                 efCoreConfiguration = new DatabaseConfigurationOptions()
                 {
-                    DatabaseType = "Jellyfin-SQLite",
+                    DatabaseType = "Jellyfin-PostgreSQL",
                     LockingBehavior = DatabaseLockingBehaviorTypes.NoLock,
                     PresetConfigurations =
                     [
-                        new PresetConfigurationItem
-                        {
-                            Key = "SQLite",
-                            Value = new PresetDatabaseConfiguration
-                            {
-                                DatabaseType = "Jellyfin-SQLite",
-                                LockingBehavior = DatabaseLockingBehaviorTypes.NoLock,
-                                Description = "Default SQLite database configuration. Database stored in data directory."
-                            }
-                        },
                         new PresetConfigurationItem
                         {
                             Key = "PostgreSQL-Local",
@@ -135,7 +125,7 @@ public static class ServiceCollectionExtensions
         // Ensure DatabaseType is set (handle corrupted or empty configuration files)
         if (string.IsNullOrWhiteSpace(efCoreConfiguration.DatabaseType))
         {
-            efCoreConfiguration.DatabaseType = "Jellyfin-SQLite";
+            efCoreConfiguration.DatabaseType = "Jellyfin-PostgreSQL";
             configurationManager.SaveConfiguration("database", efCoreConfiguration);
         }
 
@@ -179,14 +169,10 @@ public static class ServiceCollectionExtensions
             var lockingBehavior = serviceProvider.GetRequiredService<IEntityFrameworkCoreLockingBehavior>();
             lockingBehavior.Initialise(opt);
 
-            // Enable SQL query logging when log level is Debug
             var loggerFactory = serviceProvider.GetService<Microsoft.Extensions.Logging.ILoggerFactory>();
-            if (loggerFactory != null)
-            {
-                opt.UseLoggerFactory(loggerFactory)
-                   .EnableSensitiveDataLogging()
-                   .EnableDetailedErrors();
-            }
+            opt.UseLoggerFactory(loggerFactory)
+                .EnableSensitiveDataLogging()
+                .EnableDetailedErrors();
         });
 
         return serviceCollection;

Jellyfin.Server.Implementations/FullSystemBackup/BackupService.cs

@@ -15,13 +15,13 @@ using System.Text.Json.Serialization;
 using System.Threading;
 using System.Threading.Tasks;
 using Jellyfin.Database.Implementations;
+using Jellyfin.Server.Implementations.Migrations;
 using Jellyfin.Server.Implementations.StorageHelpers;
 using Jellyfin.Server.Implementations.SystemBackupService;
 using MediaBrowser.Controller;
 using MediaBrowser.Controller.SystemBackupService;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
-using Microsoft.EntityFrameworkCore.Migrations;
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
 
@@ -156,34 +156,31 @@ public class BackupService : IBackupService
                 await using (dbContext.ConfigureAwait(false))
                 {
                     // restore migration history manually
-                    var historyEntry = zipArchive.GetEntry(NormalizePathSeparator(Path.Combine("Database", $"{nameof(HistoryRow)}.json")));
+                    var historyEntry = zipArchive.GetEntry(NormalizePathSeparator(Path.Combine("Database", $"{MigrationTracker.BackupEntryName}.json")));
                     if (historyEntry is null)
                     {
                         _logger.LogInformation("No backup of the history table in archive. This is required for Jellyfin operation");
                         throw new InvalidOperationException("Cannot restore backup that has no History data.");
                     }
 
-                    HistoryRow[] historyEntries;
+                    MigrationRecord[] historyEntries;
                     var historyArchive = await historyEntry.OpenAsync().ConfigureAwait(false);
                     await using (historyArchive.ConfigureAwait(false))
                     {
-                        historyEntries = await JsonSerializer.DeserializeAsync<HistoryRow[]>(historyArchive).ConfigureAwait(false) ??
+                        historyEntries = await JsonSerializer.DeserializeAsync<MigrationRecord[]>(historyArchive).ConfigureAwait(false) ??
                             throw new InvalidOperationException("Cannot restore backup that has no History data.");
                     }
 
-                    var historyRepository = dbContext.GetService<IHistoryRepository>();
-                    await historyRepository.CreateIfNotExistsAsync().ConfigureAwait(false);
+                    await MigrationTracker.EnsureTableExistsAsync(dbContext).ConfigureAwait(false);
 
-                    foreach (var item in await historyRepository.GetAppliedMigrationsAsync(CancellationToken.None).ConfigureAwait(false))
+                    foreach (var item in await MigrationTracker.GetAppliedMigrationIdsAsync(dbContext, CancellationToken.None).ConfigureAwait(false))
                     {
-                        var insertScript = historyRepository.GetDeleteScript(item.MigrationId);
-                        await dbContext.Database.ExecuteSqlRawAsync(insertScript).ConfigureAwait(false);
+                        await MigrationTracker.DeleteAsync(dbContext, item).ConfigureAwait(false);
                     }
 
                     foreach (var item in historyEntries)
                     {
-                        var insertScript = historyRepository.GetInsertScript(item);
-                        await dbContext.Database.ExecuteSqlRawAsync(insertScript).ConfigureAwait(false);
+                        await MigrationTracker.InsertAsync(dbContext, item.MigrationId, item.ProductVersion).ConfigureAwait(false);
                     }
 
                     dbContext.ChangeTracker.QueryTrackingBehavior = QueryTrackingBehavior.NoTracking;
@@ -310,8 +307,7 @@ public class BackupService : IBackupService
                     }
 
                     // include the migration history as well
-                    var historyRepository = dbContext.GetService<IHistoryRepository>();
-                    var migrations = await historyRepository.GetAppliedMigrationsAsync().ConfigureAwait(false);
+                    var migrations = await MigrationTracker.GetAppliedMigrationsAsync(dbContext).ConfigureAwait(false);
 
                     ICollection<(Type Type, string SourceName, Func<IAsyncEnumerable<object>> ValueFactory)> entityTypes =
                     [
@@ -319,12 +315,12 @@ public class BackupService : IBackupService
                             .GetProperties(System.Reflection.BindingFlags.Public | System.Reflection.BindingFlags.Instance)
                             .Where(e => e.PropertyType.IsAssignableTo(typeof(IQueryable)))
                             .Select(e => (Type: e.PropertyType, dbContext.Model.FindEntityType(e.PropertyType.GetGenericArguments()[0])!.GetSchemaQualifiedTableName()!, ValueFactory: new Func<IAsyncEnumerable<object>>(() => GetValues((IQueryable)e.GetValue(dbContext)!)))),
-                        (Type: typeof(HistoryRow), SourceName: nameof(HistoryRow), ValueFactory: () => migrations.ToAsyncEnumerable())
+                        (Type: typeof(MigrationRecord), SourceName: MigrationTracker.BackupEntryName, ValueFactory: () => migrations.ToAsyncEnumerable())
                     ];
                     manifest.DatabaseTables = entityTypes.Select(e => e.Type.Name).ToArray();
-                    var transaction = await dbContext.Database.BeginTransactionAsync().ConfigureAwait(false);
 
-                    await using (transaction.ConfigureAwait(false))
+                    var executionStrategy = dbContext.Database.CreateExecutionStrategy();
+                    await executionStrategy.ExecuteAsync(async () =>
                     {
                         _logger.LogInformation("Begin Database backup");
 
@@ -363,7 +359,7 @@ public class BackupService : IBackupService
 
                             _logger.LogInformation("Backup of entity {Table} with {Number} created", entityType.SourceName, entities);
                         }
-                    }
+                    }).ConfigureAwait(false);
                 }
 
                 _logger.LogInformation("Backup of folder {Table}", _applicationPaths.ConfigurationDirectoryPath);

Jellyfin.Server.Implementations/Item/ChapterRepository.cs

@@ -77,21 +77,25 @@ public class ChapterRepository : IChapterRepository
     public async Task SaveChaptersAsync(Guid itemId, IReadOnlyList<ChapterInfo> chapters, CancellationToken cancellationToken = default)
     {
         await using var context = _dbProvider.CreateDbContext();
-        await using var transaction = await context.Database.BeginTransactionAsync(cancellationToken).ConfigureAwait(false);
 
-        await context.Chapters
-            .Where(e => e.ItemId.Equals(itemId))
-            .ExecuteDeleteAsync(cancellationToken)
-            .ConfigureAwait(false);
-
-        for (var i = 0; i < chapters.Count; i++)
+        // Use the execution strategy to handle transactional consistency and retries
+        // This is required for PostgreSQL NpgsqlRetryingExecutionStrategy
+        var executionStrategy = context.Database.CreateExecutionStrategy();
+        await executionStrategy.ExecuteAsync(async () =>
         {
-            var chapter = chapters[i];
-            await context.Chapters.AddAsync(Map(chapter, i, itemId), cancellationToken).ConfigureAwait(false);
-        }
+            await context.Chapters
+                .Where(e => e.ItemId.Equals(itemId))
+                .ExecuteDeleteAsync(cancellationToken)
+                .ConfigureAwait(false);
 
-        await context.SaveChangesAsync(cancellationToken).ConfigureAwait(false);
-        await transaction.CommitAsync(cancellationToken).ConfigureAwait(false);
+            for (var i = 0; i < chapters.Count; i++)
+            {
+                var chapter = chapters[i];
+                await context.Chapters.AddAsync(Map(chapter, i, itemId), cancellationToken).ConfigureAwait(false);
+            }
+
+            await context.SaveChangesAsync(cancellationToken).ConfigureAwait(false);
+        }).ConfigureAwait(false);
     }
 
     /// <inheritdoc />

Jellyfin.Server.Implementations/Item/KeyframeRepository.cs

@@ -64,12 +64,16 @@ public class KeyframeRepository : IKeyframeRepository
     public async Task SaveKeyframeDataAsync(Guid itemId, MediaEncoding.Keyframes.KeyframeData data, CancellationToken cancellationToken = default)
     {
         await using var context = _dbProvider.CreateDbContext();
-        await using var transaction = await context.Database.BeginTransactionAsync(cancellationToken).ConfigureAwait(false);
 
-        await context.KeyframeData.Where(e => e.ItemId.Equals(itemId)).ExecuteDeleteAsync(cancellationToken).ConfigureAwait(false);
-        await context.KeyframeData.AddAsync(Map(data, itemId), cancellationToken).ConfigureAwait(false);
-        await context.SaveChangesAsync(cancellationToken).ConfigureAwait(false);
-        await transaction.CommitAsync(cancellationToken).ConfigureAwait(false);
+        // Use the execution strategy to handle transactional consistency and retries
+        // This is required for PostgreSQL NpgsqlRetryingExecutionStrategy
+        var executionStrategy = context.Database.CreateExecutionStrategy();
+        await executionStrategy.ExecuteAsync(async () =>
+        {
+            await context.KeyframeData.Where(e => e.ItemId.Equals(itemId)).ExecuteDeleteAsync(cancellationToken).ConfigureAwait(false);
+            await context.KeyframeData.AddAsync(Map(data, itemId), cancellationToken).ConfigureAwait(false);
+            await context.SaveChangesAsync(cancellationToken).ConfigureAwait(false);
+        }).ConfigureAwait(false);
     }
 
     /// <inheritdoc />

Jellyfin.Server.Implementations/Item/MediaAttachmentRepository.cs

@@ -29,25 +29,29 @@ public class MediaAttachmentRepository(IDbContextFactory<JellyfinDbContext> dbPr
         CancellationToken cancellationToken = default)
     {
         await using var context = dbProvider.CreateDbContext();
-        await using var transaction = await context.Database.BeginTransactionAsync(cancellationToken).ConfigureAwait(false);
 
-        // Users may replace a media with a version that includes attachments to one without them.
-        // So when saving attachments is triggered by a library scan, we always unconditionally
-        // clear the old ones, and then add the new ones if given.
-        await context.AttachmentStreamInfos
-            .Where(e => e.ItemId.Equals(id))
-            .ExecuteDeleteAsync(cancellationToken)
-            .ConfigureAwait(false);
-
-        if (attachments.Any())
+        // Use the execution strategy to handle transactional consistency and retries
+        // This is required for PostgreSQL NpgsqlRetryingExecutionStrategy
+        var executionStrategy = context.Database.CreateExecutionStrategy();
+        await executionStrategy.ExecuteAsync(async () =>
         {
+            // Users may replace a media with a version that includes attachments to one without them.
+            // So when saving attachments is triggered by a library scan, we always unconditionally
+            // clear the old ones, and then add the new ones if given.
             await context.AttachmentStreamInfos
-                .AddRangeAsync(attachments.Select(e => Map(e, id)), cancellationToken)
+                .Where(e => e.ItemId.Equals(id))
+                .ExecuteDeleteAsync(cancellationToken)
                 .ConfigureAwait(false);
-        }
 
-        await context.SaveChangesAsync(cancellationToken).ConfigureAwait(false);
-        await transaction.CommitAsync(cancellationToken).ConfigureAwait(false);
+            if (attachments.Any())
+            {
+                await context.AttachmentStreamInfos
+                    .AddRangeAsync(attachments.Select(e => Map(e, id)), cancellationToken)
+                    .ConfigureAwait(false);
+            }
+
+            await context.SaveChangesAsync(cancellationToken).ConfigureAwait(false);
+        }).ConfigureAwait(false);
     }
 
     /// <inheritdoc />

Jellyfin.Server.Implementations/Item/MediaStreamRepository.cs

@@ -44,19 +44,23 @@ public class MediaStreamRepository : IMediaStreamRepository
     public async Task SaveMediaStreamsAsync(Guid id, IReadOnlyList<MediaStream> streams, CancellationToken cancellationToken = default)
     {
         await using var context = _dbProvider.CreateDbContext();
-        await using var transaction = await context.Database.BeginTransactionAsync(cancellationToken).ConfigureAwait(false);
 
-        await context.MediaStreamInfos
-            .Where(e => e.ItemId.Equals(id))
-            .ExecuteDeleteAsync(cancellationToken)
-            .ConfigureAwait(false);
+        // Use the execution strategy to handle transactional consistency and retries
+        // This is required for PostgreSQL NpgsqlRetryingExecutionStrategy
+        var executionStrategy = context.Database.CreateExecutionStrategy();
+        await executionStrategy.ExecuteAsync(async () =>
+        {
+            await context.MediaStreamInfos
+                .Where(e => e.ItemId.Equals(id))
+                .ExecuteDeleteAsync(cancellationToken)
+                .ConfigureAwait(false);
 
-        await context.MediaStreamInfos
-            .AddRangeAsync(streams.Select(f => Map(f, id)), cancellationToken)
-            .ConfigureAwait(false);
+            await context.MediaStreamInfos
+                .AddRangeAsync(streams.Select(f => Map(f, id)), cancellationToken)
+                .ConfigureAwait(false);
 
-        await context.SaveChangesAsync(cancellationToken).ConfigureAwait(false);
-        await transaction.CommitAsync(cancellationToken).ConfigureAwait(false);
+            await context.SaveChangesAsync(cancellationToken).ConfigureAwait(false);
+        }).ConfigureAwait(false);
     }
 
     /// <inheritdoc />
@@ -64,6 +68,8 @@ public class MediaStreamRepository : IMediaStreamRepository
     {
         await using var context = _dbProvider.CreateDbContext();
         var streams = await TranslateQuery(context.MediaStreamInfos.AsNoTracking(), filter)
+            .Include(e => e.AudioDetails)
+            .Include(e => e.VideoDetails)
             .ToArrayAsync(cancellationToken)
             .ConfigureAwait(false);
 
@@ -127,46 +133,54 @@ public class MediaStreamRepository : IMediaStreamRepository
 
         dto.Language = language;
 
-        dto.ChannelLayout = entity.ChannelLayout;
         dto.Profile = entity.Profile;
-        dto.AspectRatio = entity.AspectRatio;
         dto.Path = RestorePath(entity.Path);
-        dto.IsInterlaced = entity.IsInterlaced.GetValueOrDefault();
         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.GetValueOrDefault();
-        dto.Rotation = entity.Rotation;
-        dto.Hdr10PlusPresentFlag = entity.Hdr10PlusPresentFlag;
+
+        if (entity.AudioDetails is { } audio)
+        {
+            dto.ChannelLayout = audio.ChannelLayout;
+            dto.Channels = audio.Channels;
+            dto.SampleRate = audio.SampleRate;
+            dto.IsHearingImpaired = audio.IsHearingImpaired.GetValueOrDefault();
+        }
+
+        if (entity.VideoDetails is { } video)
+        {
+            dto.AspectRatio = video.AspectRatio;
+            dto.IsInterlaced = video.IsInterlaced.GetValueOrDefault();
+            dto.Height = video.Height;
+            dto.Width = video.Width;
+            dto.AverageFrameRate = video.AverageFrameRate;
+            dto.RealFrameRate = video.RealFrameRate;
+            dto.PixelFormat = video.PixelFormat;
+            dto.BitDepth = video.BitDepth;
+            dto.IsAnamorphic = video.IsAnamorphic;
+            dto.RefFrames = video.RefFrames;
+            dto.NalLengthSize = video.NalLengthSize;
+            dto.ColorPrimaries = video.ColorPrimaries;
+            dto.ColorSpace = video.ColorSpace;
+            dto.ColorTransfer = video.ColorTransfer;
+            dto.DvVersionMajor = video.DvVersionMajor;
+            dto.DvVersionMinor = video.DvVersionMinor;
+            dto.DvProfile = video.DvProfile;
+            dto.DvLevel = video.DvLevel;
+            dto.RpuPresentFlag = video.RpuPresentFlag;
+            dto.ElPresentFlag = video.ElPresentFlag;
+            dto.BlPresentFlag = video.BlPresentFlag;
+            dto.DvBlSignalCompatibilityId = video.DvBlSignalCompatibilityId;
+            dto.Rotation = video.Rotation;
+            dto.Hdr10PlusPresentFlag = video.Hdr10PlusPresentFlag;
+        }
 
         if (dto.Type is MediaStreamType.Audio or MediaStreamType.Subtitle)
         {
@@ -202,47 +216,65 @@ public class MediaStreamRepository : IMediaStreamRepository
 
             Codec = dto.Codec,
             Language = dto.Language,
-            ChannelLayout = dto.ChannelLayout,
             Profile = dto.Profile,
-            AspectRatio = dto.AspectRatio,
             Path = GetPathToSave(dto.Path) ?? dto.Path,
-            IsInterlaced = dto.IsInterlaced,
             BitRate = dto.BitRate,
-            Channels = dto.Channels,
-            SampleRate = dto.SampleRate,
             IsDefault = dto.IsDefault,
             IsForced = dto.IsForced,
             IsExternal = dto.IsExternal,
-            Height = dto.Height,
-            Width = dto.Width,
-            AverageFrameRate = dto.AverageFrameRate,
-            RealFrameRate = dto.RealFrameRate,
             Level = dto.Level.HasValue ? (float)dto.Level : null,
-            PixelFormat = dto.PixelFormat,
-            BitDepth = dto.BitDepth,
-            IsAnamorphic = dto.IsAnamorphic,
-            RefFrames = dto.RefFrames,
             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,
-            DvVersionMinor = dto.DvVersionMinor,
-            DvProfile = dto.DvProfile,
-            DvLevel = dto.DvLevel,
-            RpuPresentFlag = dto.RpuPresentFlag,
-            ElPresentFlag = dto.ElPresentFlag,
-            BlPresentFlag = dto.BlPresentFlag,
-            DvBlSignalCompatibilityId = dto.DvBlSignalCompatibilityId,
-            IsHearingImpaired = dto.IsHearingImpaired,
-            Rotation = dto.Rotation,
-            Hdr10PlusPresentFlag = dto.Hdr10PlusPresentFlag,
         };
+
+        if (dto.Type == MediaStreamType.Audio)
+        {
+            entity.AudioDetails = new AudioStreamDetails
+            {
+                ItemId = itemId,
+                StreamIndex = dto.Index,
+                ChannelLayout = dto.ChannelLayout,
+                Channels = dto.Channels,
+                SampleRate = dto.SampleRate,
+                IsHearingImpaired = dto.IsHearingImpaired,
+            };
+        }
+        else if (dto.Type == MediaStreamType.Video)
+        {
+            entity.VideoDetails = new VideoStreamDetails
+            {
+                ItemId = itemId,
+                StreamIndex = dto.Index,
+                AspectRatio = dto.AspectRatio,
+                IsInterlaced = dto.IsInterlaced,
+                Height = dto.Height,
+                Width = dto.Width,
+                AverageFrameRate = dto.AverageFrameRate,
+                RealFrameRate = dto.RealFrameRate,
+                PixelFormat = dto.PixelFormat,
+                BitDepth = dto.BitDepth,
+                IsAnamorphic = dto.IsAnamorphic,
+                RefFrames = dto.RefFrames,
+                NalLengthSize = dto.NalLengthSize,
+                ColorPrimaries = dto.ColorPrimaries,
+                ColorSpace = dto.ColorSpace,
+                ColorTransfer = dto.ColorTransfer,
+                DvVersionMajor = dto.DvVersionMajor,
+                DvVersionMinor = dto.DvVersionMinor,
+                DvProfile = dto.DvProfile,
+                DvLevel = dto.DvLevel,
+                RpuPresentFlag = dto.RpuPresentFlag,
+                ElPresentFlag = dto.ElPresentFlag,
+                BlPresentFlag = dto.BlPresentFlag,
+                DvBlSignalCompatibilityId = dto.DvBlSignalCompatibilityId,
+                Rotation = dto.Rotation,
+                Hdr10PlusPresentFlag = dto.Hdr10PlusPresentFlag,
+            };
+        }
+
         return entity;
     }
 }

Jellyfin.Server.Implementations/Item/OrderMapper.cs

@@ -46,11 +46,11 @@ public static class OrderMapper
             (ItemSortBy.AlbumArtist, _) => e => e.ItemValues!.Where(f => f.ItemValue.Type == ItemValueType.AlbumArtist).Select(f => f.ItemValue.CleanValue).FirstOrDefault(),
             (ItemSortBy.Studio, _) => e => e.ItemValues!.Where(f => f.ItemValue.Type == ItemValueType.Studios).Select(f => f.ItemValue.CleanValue).FirstOrDefault(),
             (ItemSortBy.OfficialRating, _) => e => e.InheritedParentalRatingValue,
-            (ItemSortBy.SeriesSortName, _) => e => e.SeriesName,
-            (ItemSortBy.Album, _) => e => e.Album,
+            (ItemSortBy.SeriesSortName, _) => e => e.TvExtras!.SeriesName,
+            (ItemSortBy.Album, _) => e => e.AudioExtras!.Album,
             (ItemSortBy.DateCreated, _) => e => e.DateCreated,
             (ItemSortBy.PremiereDate, _) => e => (e.PremiereDate ?? (e.ProductionYear.HasValue ? DateTime.MinValue.AddYears(e.ProductionYear.Value - 1) : null)),
-            (ItemSortBy.StartDate, _) => e => e.StartDate,
+            (ItemSortBy.StartDate, _) => e => e.LiveTvExtras!.StartDate,
             (ItemSortBy.Name, _) => e => e.CleanName,
             (ItemSortBy.CommunityRating, _) => e => e.CommunityRating,
             (ItemSortBy.ProductionYear, _) => e => e.ProductionYear,
@@ -60,10 +60,10 @@ public static class OrderMapper
             (ItemSortBy.IndexNumber, _) => e => e.IndexNumber,
             (ItemSortBy.SeriesDatePlayed, not null) => e =>
                             jellyfinDbContext.BaseItems
-                                .Where(w => w.SeriesPresentationUniqueKey == e.PresentationUniqueKey)
+                                .Where(w => w.TvExtras!.SeriesPresentationUniqueKey == e.PresentationUniqueKey)
                                 .Join(jellyfinDbContext.UserData.Where(w => w.UserId == query.User.Id && w.Played), f => f.Id, f => f.ItemId, (item, userData) => userData.LastPlayedDate)
                                 .Max(f => f),
-            (ItemSortBy.SeriesDatePlayed, null) => e => jellyfinDbContext.BaseItems.Where(w => w.SeriesPresentationUniqueKey == e.PresentationUniqueKey)
+            (ItemSortBy.SeriesDatePlayed, null) => e => jellyfinDbContext.BaseItems.Where(w => w.TvExtras!.SeriesPresentationUniqueKey == e.PresentationUniqueKey)
                                 .Join(jellyfinDbContext.UserData.Where(w => w.Played), f => f.Id, f => f.ItemId, (item, userData) => userData.LastPlayedDate)
                                 .Max(f => f),
             // ItemSortBy.SeriesDatePlayed => e => jellyfinDbContext.UserData

Jellyfin.Server.Implementations/Item/PeopleRepository.cs

@@ -123,77 +123,81 @@ public class PeopleRepository(IDbContextFactory<JellyfinDbContext> dbProvider, I
         var personKeys = people.Select(e => e.Name + "-" + e.Type).ToArray();
 
         await using var context = _dbProvider.CreateDbContext();
-        await using var transaction = await context.Database.BeginTransactionAsync(cancellationToken).ConfigureAwait(false);
 
-        var existingPersons = await context.Peoples
-            .Select(e => new
-            {
-                item = e,
-                SelectionKey = e.Name + "-" + e.PersonType
-            })
-            .Where(p => personKeys.Contains(p.SelectionKey))
-            .Select(f => f.item)
-            .ToArrayAsync(cancellationToken)
-            .ConfigureAwait(false);
-
-        var toAdd = people
-            .Where(e => e.Type is not PersonKind.Artist && e.Type is not PersonKind.AlbumArtist)
-            .Where(e => !existingPersons.Any(f => f.Name == e.Name && f.PersonType == e.Type.ToString()))
-            .Select(Map);
-
-        await context.Peoples.AddRangeAsync(toAdd, cancellationToken).ConfigureAwait(false);
-        await context.SaveChangesAsync(cancellationToken).ConfigureAwait(false);
-
-        var personsEntities = toAdd.Concat(existingPersons).ToArray();
-
-        var existingMaps = await context.PeopleBaseItemMap
-            .Include(e => e.People)
-            .Where(e => e.ItemId == itemId)
-            .ToListAsync(cancellationToken)
-            .ConfigureAwait(false);
-
-        var listOrder = 0;
-
-        foreach (var person in people)
+        // Use the execution strategy to handle transactional consistency and retries
+        // This is required for PostgreSQL NpgsqlRetryingExecutionStrategy
+        var executionStrategy = context.Database.CreateExecutionStrategy();
+        await executionStrategy.ExecuteAsync(async () =>
         {
-            if (person.Type == PersonKind.Artist || person.Type == PersonKind.AlbumArtist)
+            var existingPersons = await context.Peoples
+                .Select(e => new
+                {
+                    item = e,
+                    SelectionKey = e.Name + "-" + e.PersonType
+                })
+                .Where(p => personKeys.Contains(p.SelectionKey))
+                .Select(f => f.item)
+                .ToArrayAsync(cancellationToken)
+                .ConfigureAwait(false);
+
+            var toAdd = people
+                .Where(e => e.Type is not PersonKind.Artist && e.Type is not PersonKind.AlbumArtist)
+                .Where(e => !existingPersons.Any(f => f.Name == e.Name && f.PersonType == e.Type.ToString()))
+                .Select(Map);
+
+            await context.Peoples.AddRangeAsync(toAdd, cancellationToken).ConfigureAwait(false);
+            await context.SaveChangesAsync(cancellationToken).ConfigureAwait(false);
+
+            var personsEntities = toAdd.Concat(existingPersons).ToArray();
+
+            var existingMaps = await context.PeopleBaseItemMap
+                .Include(e => e.People)
+                .Where(e => e.ItemId == itemId)
+                .ToListAsync(cancellationToken)
+                .ConfigureAwait(false);
+
+            var listOrder = 0;
+
+            foreach (var person in people)
             {
-                continue;
+                if (person.Type == PersonKind.Artist || person.Type == PersonKind.AlbumArtist)
+                {
+                    continue;
+                }
+
+                var entityPerson = personsEntities.First(e => e.Name == person.Name && e.PersonType == person.Type.ToString());
+                var existingMap = existingMaps.FirstOrDefault(e => e.People.Name == person.Name && e.People.PersonType == person.Type.ToString() && e.Role == person.Role);
+                if (existingMap is null)
+                {
+                    await context.PeopleBaseItemMap.AddAsync(
+                        new PeopleBaseItemMap()
+                        {
+                            Item = null!,
+                            ItemId = itemId,
+                            People = null!,
+                            PeopleId = entityPerson.Id,
+                            ListOrder = listOrder,
+                            SortOrder = person.SortOrder,
+                            Role = person.Role
+                        },
+                        cancellationToken).ConfigureAwait(false);
+                }
+                else
+                {
+                    // Update the order for existing mappings
+                    existingMap.ListOrder = listOrder;
+                    existingMap.SortOrder = person.SortOrder;
+                    // person mapping already exists so remove from list
+                    existingMaps.Remove(existingMap);
+                }
+
+                listOrder++;
             }
 
-            var entityPerson = personsEntities.First(e => e.Name == person.Name && e.PersonType == person.Type.ToString());
-            var existingMap = existingMaps.FirstOrDefault(e => e.People.Name == person.Name && e.People.PersonType == person.Type.ToString() && e.Role == person.Role);
-            if (existingMap is null)
-            {
-                await context.PeopleBaseItemMap.AddAsync(
-                    new PeopleBaseItemMap()
-                    {
-                        Item = null!,
-                        ItemId = itemId,
-                        People = null!,
-                        PeopleId = entityPerson.Id,
-                        ListOrder = listOrder,
-                        SortOrder = person.SortOrder,
-                        Role = person.Role
-                    },
-                    cancellationToken).ConfigureAwait(false);
-            }
-            else
-            {
-                // Update the order for existing mappings
-                existingMap.ListOrder = listOrder;
-                existingMap.SortOrder = person.SortOrder;
-                // person mapping already exists so remove from list
-                existingMaps.Remove(existingMap);
-            }
+            context.PeopleBaseItemMap.RemoveRange(existingMaps);
 
-            listOrder++;
-        }
-
-        context.PeopleBaseItemMap.RemoveRange(existingMaps);
-
-        await context.SaveChangesAsync(cancellationToken).ConfigureAwait(false);
-        await transaction.CommitAsync(cancellationToken).ConfigureAwait(false);
+            await context.SaveChangesAsync(cancellationToken).ConfigureAwait(false);
+        }).ConfigureAwait(false);
     }
 
     private PersonInfo Map(People people)

Jellyfin.Server.Implementations/Jellyfin.Server.Implementations.csproj

@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
+    <NoWarn>$(NoWarn);CA1024;CA1031;CA1032;CA1034;CA1054;CA1055;CA1056;CA1062;CA1308;CA1303;CA1305;CA1508;CA1722;CA1724;CA1805;CA1813;CA1815;CA1816;CA1819;CA1821;CA1822;CA1823;CA1824;CA1825;CA1826;CA1830;CA1836;CA1839;CA1840;CA1841;CA1859;CA1861;CA1873;CA1911;CA2000;CA2007;CA2016;CA2025;CA2026;CA2100;CA2101;CA2102;CA2201;CA2202;CA2207;CA2208;CA2219;CA2220;CA2222;CA2225;CA2226;CA2230;CA2231;CA2234;CA2241;CA2242;CA2243;CA2244;CA2245;CA2246;CA2247;CA2248;CA2249;CA2250;CA2253;CA3001;CA3002;CA3003;CA3004;CA3005;CA3006;CA3007;CA3008;CA3009;CA3010;CA3011;CA3012;CA3061;CA3062;CA5359;CA5360;CA5361;CA5362;CA5363;CA5364;CA5365;CA5366;CA5367;CA5368;CA5369;CA5370;CA5371;CA5372;CA5373;CA5374;CA5375;CA5376;CA5377;CA5378;CA5379;CA5380;CA5381;CA5382;CA5383;CA5384;CA5385;CA5386;CA5387;CA5388;CA5389;CA5390;CA5391;CA5392;CA5393;CA5394;CA5395;CA5396;CA5397;CA5398;CA5399;CA5400;CA5401;CA5402;CA5403;NU1903;CA1848;CA1515;CA1812;CA1849;CA1860;CA1867;CA1517</NoWarn>
     <TargetFramework>net11.0</TargetFramework>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
@@ -29,6 +30,7 @@
   <ItemGroup>
     <PackageReference Include="AsyncKeyedLock" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" />
+    <PackageReference Include="Microsoft.Kiota.Abstractions" />
   </ItemGroup>
 
   <ItemGroup>

Jellyfin.Server.Implementations/Migrations/MigrationRecord.cs

@@ -0,0 +1,15 @@
+// <copyright file="MigrationRecord.cs" company="PlaceholderCompany">
+// Copyright (c) PlaceholderCompany. All rights reserved.
+// </copyright>
+
+namespace Jellyfin.Server.Implementations.Migrations;
+
+/// <summary>Represents one row of the EF migrations history table.</summary>
+public sealed class MigrationRecord
+{
+    /// <summary>Gets or sets the migration identifier.</summary>
+    public string MigrationId { get; set; } = string.Empty;
+
+    /// <summary>Gets or sets the product version that applied this migration.</summary>
+    public string ProductVersion { get; set; } = string.Empty;
+}

Jellyfin.Server.Implementations/Migrations/MigrationTracker.cs

@@ -0,0 +1,80 @@
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+using Jellyfin.Database.Implementations;
+using Microsoft.EntityFrameworkCore;
+
+namespace Jellyfin.Server.Implementations.Migrations;
+
+/// <summary>
+/// Plain-SQL tracker for the EF migrations history table.
+/// Replaces the EF-internal IHistoryRepository / SnakeCaseHistoryRepository.
+/// </summary>
+public static class MigrationTracker
+{
+    /// <summary>
+    /// Entry name used when writing/reading migration history from backup archives.
+    /// Kept as "HistoryRow" for backward compatibility with existing backup files.
+    /// </summary>
+    public const string BackupEntryName = "HistoryRow";
+
+    private const string CreateTableSql = """
+        CREATE TABLE IF NOT EXISTS public."__EFMigrationsHistory" (
+            migration_id    character varying(150) NOT NULL,
+            product_version character varying(32)  NOT NULL,
+            CONSTRAINT "PK___EFMigrationsHistory" PRIMARY KEY (migration_id)
+        )
+        """;
+
+    /// <summary>Ensures the migrations history table exists.</summary>
+    /// <param name="dbContext">The database context.</param>
+    /// <param name="ct">Cancellation token.</param>
+    /// <returns>A <see cref="Task"/> representing the operation.</returns>
+    public static async Task EnsureTableExistsAsync(JellyfinDbContext dbContext, CancellationToken ct = default)
+        => await dbContext.Database.ExecuteSqlRawAsync(CreateTableSql, ct).ConfigureAwait(false);
+
+    /// <summary>Returns the migration_id of every applied migration.</summary>
+    /// <param name="dbContext">The database context.</param>
+    /// <param name="ct">Cancellation token.</param>
+    /// <returns>A read-only list of applied migration identifiers.</returns>
+    public static async Task<IReadOnlyList<string>> GetAppliedMigrationIdsAsync(JellyfinDbContext dbContext, CancellationToken ct = default)
+        => await dbContext.Database
+            .SqlQueryRaw<string>("""SELECT migration_id AS "Value" FROM public."__EFMigrationsHistory" """)
+            .ToListAsync(ct).ConfigureAwait(false);
+
+    /// <summary>Returns all applied migration rows.</summary>
+    /// <param name="dbContext">The database context.</param>
+    /// <param name="ct">Cancellation token.</param>
+    /// <returns>A read-only list of <see cref="MigrationRecord"/> instances.</returns>
+    public static async Task<IReadOnlyList<MigrationRecord>> GetAppliedMigrationsAsync(JellyfinDbContext dbContext, CancellationToken ct = default)
+        => await dbContext.Database
+            .SqlQueryRaw<MigrationRecord>("""
+                SELECT migration_id AS "MigrationId", product_version AS "ProductVersion"
+                FROM public."__EFMigrationsHistory"
+                """)
+            .ToListAsync(ct).ConfigureAwait(false);
+
+    /// <summary>Inserts a migration row, ignoring conflicts.</summary>
+    /// <param name="dbContext">The database context.</param>
+    /// <param name="migrationId">The migration identifier.</param>
+    /// <param name="productVersion">The product version.</param>
+    /// <param name="ct">Cancellation token.</param>
+    /// <returns>A <see cref="Task"/> representing the operation.</returns>
+    public static async Task InsertAsync(JellyfinDbContext dbContext, string migrationId, string productVersion, CancellationToken ct = default)
+        => await dbContext.Database.ExecuteSqlAsync(
+            $"""
+            INSERT INTO public."__EFMigrationsHistory" (migration_id, product_version)
+            VALUES ({migrationId}, {productVersion}) ON CONFLICT DO NOTHING
+            """,
+            ct).ConfigureAwait(false);
+
+    /// <summary>Deletes a migration row by id.</summary>
+    /// <param name="dbContext">The database context.</param>
+    /// <param name="migrationId">The migration identifier to delete.</param>
+    /// <param name="ct">Cancellation token.</param>
+    /// <returns>A <see cref="Task"/> representing the operation.</returns>
+    public static async Task DeleteAsync(JellyfinDbContext dbContext, string migrationId, CancellationToken ct = default)
+        => await dbContext.Database.ExecuteSqlAsync(
+            $"""DELETE FROM public."__EFMigrationsHistory" WHERE migration_id = {migrationId}""",
+            ct).ConfigureAwait(false);
+}

Jellyfin.Server.Implementations/ScheduledTasks/PostgresPeriodicTuner.cs

@@ -0,0 +1,140 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using Jellyfin.Database.Implementations;
+using MediaBrowser.Controller.Configuration;
+using MediaBrowser.Controller.Plugins;
+using MediaBrowser.Controller.Session;
+using MediaBrowser.Model.Tasks;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.Logging;
+
+namespace Jellyfin.Server.Implementations.ScheduledTasks
+{
+    /// <summary>
+    /// Class PostgresPeriodicTuner.
+    /// </summary>
+    public class PostgresPeriodicTuner : IScheduledTask, IConfigurableScheduledTask
+    {
+        private readonly ILogger<PostgresPeriodicTuner> _logger;
+        private readonly IDbContextFactory<JellyfinDbContext> _dbContextFactory;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="PostgresPeriodicTuner"/> class.
+        /// </summary>
+        /// <param name="logger">The logger.</param>
+        /// <param name="dbContextFactory">The database context factory.</param>
+        public PostgresPeriodicTuner(ILogger<PostgresPeriodicTuner> logger, IDbContextFactory<JellyfinDbContext> dbContextFactory)
+        {
+            _logger = logger;
+            _dbContextFactory = dbContextFactory;
+        }
+
+        /// <inheritdoc />
+        public string Name => "PostgreSQL Periodic Tuner";
+
+        /// <inheritdoc />
+        public string Key => "PostgresPeriodicTuner";
+
+        /// <inheritdoc />
+        public string Description => "Periodically checks for dead tuples and runs VACUUM ANALYZE on tables that need it.";
+
+        /// <inheritdoc />
+        public string Category => "Database";
+
+        /// <inheritdoc />
+        public bool IsHidden => false;
+
+        /// <inheritdoc />
+        public bool IsEnabled => true;
+
+        /// <inheritdoc />
+        public bool IsLogged => true;
+
+        /// <summary>
+        /// Executes the task.
+        /// </summary>
+        /// <param name="progress">The progress.</param>
+        /// <param name="cancellationToken">The cancellation token.</param>
+        /// <returns>A <see cref="Task"/> representing the asynchronous operation.</returns>
+        public async Task ExecuteAsync(IProgress<double> progress, CancellationToken cancellationToken)
+        {
+            _logger.LogInformation("PostgreSQL Periodic Tuner task started.");
+
+            try
+            {
+                await using var dbContext = await _dbContextFactory.CreateDbContextAsync(cancellationToken).ConfigureAwait(false);
+
+                const string DeadTupleQuery = @"
+                    SELECT
+                        relname AS TableName,
+                        n_dead_tup AS DeadTuples
+                    FROM
+                        pg_stat_user_tables
+                    WHERE
+                        n_dead_tup > 1000 -- Example threshold: more than 1000 dead tuples
+                    ORDER BY
+                        n_dead_tup DESC;";
+
+                var tablesToVacuum = (await dbContext.Database.SqlQueryRaw<(string TableName, long DeadTuples)>(DeadTupleQuery).ToListAsync(cancellationToken).ConfigureAwait(false)).ToList();
+
+                if (tablesToVacuum.Count == 0)
+                {
+                    _logger.LogInformation("No tables require vacuuming at this time.");
+                    return;
+                }
+
+                progress.Report(10);
+
+                double progressStep = 90.0 / tablesToVacuum.Count;
+                double currentProgress = 10.0;
+
+                foreach (var table in tablesToVacuum)
+                {
+                    cancellationToken.ThrowIfCancellationRequested();
+                    _logger.LogInformation("Found {DeadTuples} dead tuples in table {TableName}. Running VACUUM ANALYZE.", table.DeadTuples, table.TableName);
+
+                    try
+                    {
+                        await dbContext.Database.ExecuteSqlInterpolatedAsync($"VACUUM ANALYZE \"{table.TableName}\"", cancellationToken).ConfigureAwait(false);
+                        _logger.LogInformation("Successfully vacuumed and analyzed table {TableName}.", table.TableName);
+                    }
+                    catch (Exception ex)
+                    {
+                        _logger.LogError(ex, "Error running VACUUM ANALYZE on table {TableName}.", table.TableName);
+                    }
+
+                    currentProgress += progressStep;
+                    progress.Report(currentProgress);
+                }
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex, "Error during PostgreSQL Periodic Tuner task.");
+            }
+            finally
+            {
+                _logger.LogInformation("PostgreSQL Periodic Tuner task finished.");
+                progress.Report(100);
+            }
+        }
+
+        /// <summary>
+        /// Gets the default triggers.
+        /// </summary>
+        /// <returns>IEnumerable&lt;TaskTriggerInfo&gt;.</returns>
+        public IEnumerable<TaskTriggerInfo> GetDefaultTriggers()
+        {
+            return new[]
+            {
+                new TaskTriggerInfo
+                {
+                    Type = TaskTriggerInfoType.IntervalTrigger,
+                    IntervalTicks = TimeSpan.FromHours(24).Ticks
+                }
+            };
+        }
+    }
+}

Jellyfin.Server.Implementations/Security/AuthorizationContext.cs

@@ -83,6 +83,15 @@ namespace Jellyfin.Server.Implementations.Security
             IHeaderDictionary headers,
             IQueryCollection queryString)
         {
+            // Token extraction priority (in order):
+            // 1. Authorization header (MediaBrowser Token parameter)
+            // 2. X-Emby-Token header (if legacy auth enabled)
+            // 3. X-MediaBrowser-Token header (if legacy auth enabled)
+            // 4. ApiKey query parameter
+            // 5. api_key query parameter (if legacy auth enabled)
+            // For WebSocket connections, use query parameters:
+            // ws://server:port/path?api_key=YOUR_TOKEN
+
             string? deviceId = null;
             string? deviceName = null;
             string? client = null;
@@ -140,7 +149,7 @@ namespace Jellyfin.Server.Implementations.Security
                 return authInfo;
             }
 
-            var tokenPreview = token?.Length > 8 ? token.Substring(0, 8) + "..." : token ?? "null";
+            var tokenPreview = token?.Length > 8 ? string.Concat(token.AsSpan(0, 8), "...") : token ?? "null";
             _logger.LogDebug(
                 "Validating authentication token. Client: {Client}, Device: {Device}, DeviceId: {DeviceId}, Token: {Token}",
                 client ?? "unknown",
@@ -246,7 +255,7 @@ namespace Jellyfin.Server.Implementations.Security
                     }
                     else
                     {
-                        var tokenPreview2 = token?.Length > 8 ? token.Substring(0, 8) + "..." : token ?? "null";
+                        var tokenPreview2 = token?.Length > 8 ? string.Concat(token.AsSpan(0, 8), "...") : token ?? "null";
                         _logger.LogDebug(
                             "Token validation failed: Token not found in devices or API keys. Token: {Token}",
                             tokenPreview2);

Jellyfin.Server/Extensions/ApiServiceCollectionExtensions.cs

@@ -28,7 +28,6 @@ namespace Jellyfin.Server.Extensions
     using Jellyfin.Database.Implementations.Enums;
     using Jellyfin.Extensions.Json;
     using Jellyfin.Server.Configuration;
-    using Jellyfin.Server.Filters;
     using MediaBrowser.Common.Api;
     using MediaBrowser.Common.Net;
     using MediaBrowser.Model.Entities;
@@ -43,7 +42,6 @@ namespace Jellyfin.Server.Extensions
     using Microsoft.OpenApi.Any;
     using Microsoft.OpenApi.Interfaces;
     using Microsoft.OpenApi.Models;
-    using Swashbuckle.AspNetCore.Swagger;
     using Swashbuckle.AspNetCore.SwaggerGen;
     using AuthenticationSchemes = Jellyfin.Api.Constants.AuthenticationSchemes;
 
@@ -254,20 +252,7 @@ namespace Jellyfin.Server.Extensions
                 // Allow parameters to properly be nullable.
                 c.UseAllOfToExtendReferenceSchemas();
                 c.SupportNonNullableReferenceTypes();
-
-                // TODO - remove when all types are supported in System.Text.Json
-                c.AddSwaggerTypeMappings();
-
-                c.SchemaFilter<IgnoreEnumSchemaFilter>();
-                c.SchemaFilter<FlagsEnumSchemaFilter>();
-                c.OperationFilter<RetryOnTemporarilyUnavailableFilter>();
-                c.OperationFilter<SecurityRequirementsOperationFilter>();
-                c.OperationFilter<FileResponseFilter>();
-                c.OperationFilter<FileRequestFilter>();
-                c.OperationFilter<ParameterObsoleteFilter>();
-                c.DocumentFilter<AdditionalModelFilter>();
-            })
-            .Replace(ServiceDescriptor.Transient<ISwaggerProvider, CachingOpenApiProvider>());
+            });
         }
 
         private static void AddPolicy(this AuthorizationOptions authorizationOptions, string policyName, IAuthorizationRequirement authorizationRequirement)
@@ -327,40 +312,5 @@ namespace Jellyfin.Server.Extensions
                 options.KnownIPNetworks.Add(new System.Net.IPNetwork(addr, prefixLength));
             }
         }
-
-        private static void AddSwaggerTypeMappings(this SwaggerGenOptions options)
-        {
-            /*
-             * TODO remove when System.Text.Json properly supports non-string keys.
-             * Used in BaseItemDto.ImageBlurHashes
-             */
-            options.MapType<Dictionary<ImageType, string>>(() =>
-                new OpenApiSchema
-                {
-                    Type = "object",
-                    AdditionalProperties = new OpenApiSchema
-                    {
-                        Type = "string"
-                    }
-                });
-
-            // Support dictionary with nullable string value.
-            options.MapType<Dictionary<string, string?>>(() =>
-                new OpenApiSchema
-                {
-                    Type = "object",
-                    AdditionalProperties = new OpenApiSchema
-                    {
-                        Type = "string",
-                        Nullable = true
-                    }
-                });
-
-            // Swashbuckle doesn't use JsonOptions to describe responses, so we need to manually describe it.
-            options.MapType<Version>(() => new OpenApiSchema
-            {
-                Type = "string"
-            });
-        }
     }
 }

Jellyfin.Server/Helpers/StartupHelpers.cs

@@ -31,6 +31,11 @@ public static class StartupHelpers
 {
     private static readonly string[] _relevantEnvVarPrefixes = { "JELLYFIN_", "DOTNET_", "ASPNETCORE_" };
 
+    private static readonly System.Text.Json.JsonSerializerOptions _jsonSerializerOptions = new()
+    {
+        WriteIndented = true
+    };
+
     /// <summary>
     /// Logs relevant environment variables and information about the host.
     /// </summary>
@@ -235,10 +240,7 @@ public static class StartupHelpers
                 }
             };
 
-            var json = System.Text.Json.JsonSerializer.Serialize(defaultConfig, new System.Text.Json.JsonSerializerOptions
-            {
-                WriteIndented = true
-            });
+            var json = System.Text.Json.JsonSerializer.Serialize(defaultConfig, _jsonSerializerOptions);
 
             File.WriteAllText(configPath, json);
             Console.WriteLine($"Created default startup configuration at: {configPath}");
@@ -368,7 +370,7 @@ public static class StartupHelpers
 
         // If $XDG_CACHE_HOME is either not set or a relative path,
         // a default equal to $HOME/.cache should be used.
-        if (cacheHome is null || !cacheHome.StartsWith("/", StringComparison.Ordinal))
+        if (cacheHome is null || !cacheHome.StartsWith('/', StringComparison.Ordinal))
         {
             cacheHome = Path.Join(
                 Environment.GetFolderPath(Environment.SpecialFolder.UserProfile, Environment.SpecialFolderOption.DoNotVerify),

Jellyfin.Server/Jellyfin.Server.csproj

@@ -2,10 +2,12 @@
 
   <!-- ProjectGuid is only included as a requirement for SonarQube analysis -->
   <PropertyGroup>
+    <NoWarn>$(NoWarn);CA1024;CA1031;CA1032;CA1034;CA1054;CA1055;CA1056;CA1062;CA1308;CA1303;CA1305;CA1508;CA1722;CA1724;CA1805;CA1813;CA1815;CA1816;CA1819;CA1821;CA1822;CA1823;CA1824;CA1825;CA1826;CA1830;CA1836;CA1839;CA1840;CA1841;CA1859;CA1861;CA1873;CA1911;CA2000;CA2007;CA2016;CA2025;CA2026;CA2100;CA2101;CA2102;CA2201;CA2202;CA2207;CA2208;CA2219;CA2220;CA2222;CA2225;CA2226;CA2230;CA2231;CA2234;CA2241;CA2242;CA2243;CA2244;CA2245;CA2246;CA2247;CA2248;CA2249;CA2250;CA2253;CA3001;CA3002;CA3003;CA3004;CA3005;CA3006;CA3007;CA3008;CA3009;CA3010;CA3011;CA3012;CA3061;CA3062;CA5359;CA5360;CA5361;CA5362;CA5363;CA5364;CA5365;CA5366;CA5367;CA5368;CA5369;CA5370;CA5371;CA5372;CA5373;CA5374;CA5375;CA5376;CA5377;CA5378;CA5379;CA5380;CA5381;CA5382;CA5383;CA5384;CA5385;CA5386;CA5387;CA5388;CA5389;CA5390;CA5391;CA5392;CA5393;CA5394;CA5395;CA5396;CA5397;CA5398;CA5399;CA5400;CA5401;CA5402;CA5403;NU1903;CA1848;CA1515;CA1812;CA1849;CA1860;CA1867;CA1517;CS1061;CS0103</NoWarn>
     <ProjectGuid>{07E39F42-A2C6-4B32-AF8C-725F957A73FF}</ProjectGuid>
   </PropertyGroup>
 
   <PropertyGroup>
+    <NoWarn>$(NoWarn);CA1024;CA1031;CA1032;CA1034;CA1054;CA1055;CA1056;CA1062;CA1308;CA1303;CA1305;CA1508;CA1722;CA1724;CA1805;CA1813;CA1815;CA1816;CA1819;CA1821;CA1822;CA1823;CA1824;CA1825;CA1826;CA1830;CA1836;CA1839;CA1840;CA1841;CA1859;CA1861;CA1873;CA1911;CA2000;CA2007;CA2016;CA2025;CA2026;CA2100;CA2101;CA2102;CA2201;CA2202;CA2207;CA2208;CA2219;CA2220;CA2222;CA2225;CA2226;CA2230;CA2231;CA2234;CA2241;CA2242;CA2243;CA2244;CA2245;CA2246;CA2247;CA2248;CA2249;CA2250;CA2253;CA3001;CA3002;CA3003;CA3004;CA3005;CA3006;CA3007;CA3008;CA3009;CA3010;CA3011;CA3012;CA3061;CA3062;CA5359;CA5360;CA5361;CA5362;CA5363;CA5364;CA5365;CA5366;CA5367;CA5368;CA5369;CA5370;CA5371;CA5372;CA5373;CA5374;CA5375;CA5376;CA5377;CA5378;CA5379;CA5380;CA5381;CA5382;CA5383;CA5384;CA5385;CA5386;CA5387;CA5388;CA5389;CA5390;CA5391;CA5392;CA5393;CA5394;CA5395;CA5396;CA5397;CA5398;CA5399;CA5400;CA5401;CA5402;CA5403;NU1903;CA1848;CA1515;CA1812;CA1849;CA1860;CA1867;CA1517;CS1061;CS0103</NoWarn>
     <AssemblyName>jellyfin</AssemblyName>
     <OutputType>Exe</OutputType>
     <TargetFramework>net11.0</TargetFramework>
@@ -14,10 +16,13 @@
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <ApplicationIcon>Jellyfin.Server.ico</ApplicationIcon>
     <IsPackable>true</IsPackable>
-    <!-- Suppress trimming warnings for existing migration and serialization code -->
-    <NoWarn>$(NoWarn);IL2026;IL2072;IL2075</NoWarn>
+    <EnableDefaultContentItems>false</EnableDefaultContentItems>
   </PropertyGroup>
 
+  <ItemGroup>
+    <Compile Remove="Filters/**/*.cs" />
+  </ItemGroup>
+
   <ItemGroup>
     <Compile Include="..\SharedVersion.cs" />
   </ItemGroup>
@@ -41,6 +46,11 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
+    <PackageReference Include="Microsoft.EntityFrameworkCore" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Design">
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      <PrivateAssets>all</PrivateAssets>
+    </PackageReference>
     <PackageReference Include="SerilogAnalyzer" PrivateAssets="All" />
     <PackageReference Include="StyleCop.Analyzers" PrivateAssets="All" />
     <PackageReference Include="SmartAnalyzers.MultithreadingAnalyzer" PrivateAssets="All" />
@@ -62,7 +72,9 @@
 
   <ItemGroup>
     <PackageReference Include="CommandLineParser" />
+    <PackageReference Include="Microsoft.Extensions.DependencyModel" />
     <PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore" />
+    <PackageReference Include="Microsoft.Kiota.Abstractions" />
     <PackageReference Include="Morestachio" />
     <PackageReference Include="prometheus-net" />
     <PackageReference Include="prometheus-net.AspNetCore" />
@@ -76,6 +88,7 @@
     <PackageReference Include="Serilog.Sinks.Graylog" />
     <!-- SQLite package for migration routines only (SQLite -> PostgreSQL) -->
     <PackageReference Include="Microsoft.Data.Sqlite" />
+    <PackageReference Include="Swashbuckle.AspNetCore" />
   </ItemGroup>
 
   <ItemGroup>
@@ -90,37 +103,37 @@
   </ItemGroup>
 
   <ItemGroup>
-    <None Update="wwwroot\api-docs\redoc\custom.css">
+    <!-- Web content and static files -->
+    <None Include="wwwroot\**\*.*">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
+      <Link>wwwroot\%(RecursiveDir)%(Filename)%(Extension)</Link>
     </None>
-    <None Update="wwwroot\api-docs\swagger\custom.css">
+    <None Include="wwwroot\*.*">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
+      <Link>wwwroot\%(Filename)%(Extension)</Link>
     </None>
-    <None Update="wwwroot\api-docs\jellyfin.svg">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Update="ServerSetupApp/index.mstemplate.html">
+    <!-- ServerSetupApp files -->
+    <None Include="ServerSetupApp\index.mstemplate.html">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
     </None>
   </ItemGroup>
 
   <ItemGroup>
     <!-- SQL initialization scripts for PostgreSQL -->
-    <None Include="..\sql\**\*.sql">
+    <None Include="..\scripts\sql\**\*.sql">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
-      <Pack>false</Pack>
       <Link>sql\%(RecursiveDir)%(Filename)%(Extension)</Link>
     </None>
+    <!-- Utility scripts (excluding SQL files) -->
+    <None Include="..\scripts\**\*" Exclude="..\scripts\sql\**\*.sql">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
+      <Link>scripts\%(RecursiveDir)%(Filename)%(Extension)</Link>
+    </None>
   </ItemGroup>
 
-  <!-- Post-build event to ensure SQL files are copied -->
-  <Target Name="CopySQLFiles" AfterTargets="Build">
-    <ItemGroup>
-      <SQLFiles Include="$(ProjectDir)..\sql\**\*.sql" />
-    </ItemGroup>
-    <Copy SourceFiles="@(SQLFiles)" DestinationFolder="$(OutDir)sql\%(RecursiveDir)" SkipUnchangedFiles="true" />
-    <Message Importance="high" Text="Copied SQL files to output directory" />
-  </Target>
-
 </Project>

Jellyfin.Server/Jellyfin.Server.csproj.user

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <NameOfLastUsedPublishProfile>D:\Projects\pgsql-jellyfin\Jellyfin.Server\Properties\PublishProfiles\MultiInstance-FrameworkDependent.pubxml</NameOfLastUsedPublishProfile>
+    <NameOfLastUsedPublishProfile>D:\Projects\pgsql-jellyfin\Jellyfin.Server\Properties\PublishProfiles\SelfContained-Win-x64.pubxml</NameOfLastUsedPublishProfile>
   </PropertyGroup>
 </Project>

Jellyfin.Server/Migrations/JellyfinMigrationService.cs

@@ -2,6 +2,8 @@
 // Copyright (c) PlaceholderCompany. All rights reserved.
 // </copyright>
 
+#pragma warning disable CS8602 // Dereference of a possibly null reference
+
 namespace Jellyfin.Server.Migrations;
 
 using System;
@@ -14,6 +16,7 @@ using System.Threading;
 using System.Threading.Tasks;
 using Emby.Server.Implementations.Serialization;
 using Jellyfin.Database.Implementations;
+using Jellyfin.Server.Implementations.Migrations;
 using Jellyfin.Server.Implementations.SystemBackupService;
 using Jellyfin.Server.Migrations.Stages;
 using Jellyfin.Server.ServerSetupApp;
@@ -22,7 +25,6 @@ using MediaBrowser.Controller.SystemBackupService;
 using MediaBrowser.Model.Configuration;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
-using Microsoft.EntityFrameworkCore.Migrations;
 using Microsoft.EntityFrameworkCore.Storage;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
@@ -97,7 +99,7 @@ internal class JellyfinMigrationService
 
     public async Task CheckFirstTimeRunOrMigration(IApplicationPaths appPaths)
     {
-        var logger = _startupLogger.With(_loggerFactory.CreateLogger<JellyfinMigrationService>()).BeginGroup($"Migration Startup");
+        var logger = _startupLogger.Attach(_loggerFactory.CreateLogger<JellyfinMigrationService>()).BeginGroup($"Migration Startup");
         logger.LogInformation("Initialise Migration service.");
         var xmlSerializer = new MyXmlSerializer();
         var serverConfig = File.Exists(appPaths.SystemConfigurationFilePath)
@@ -111,25 +113,25 @@ internal class JellyfinMigrationService
             var dbContext = await _dbContextFactory.CreateDbContextAsync().ConfigureAwait(false);
             await using (dbContext.ConfigureAwait(false))
             {
+                // DISABLED for .NET 11 preview: Database creation handled by PostgresDatabaseProvider using SQL scripts
+                /*
                 var databaseCreator = dbContext.Database.GetService<IDatabaseCreator>() as IRelationalDatabaseCreator
                     ?? throw new InvalidOperationException("Jellyfin does only support relational databases.");
                 if (!await databaseCreator.ExistsAsync().ConfigureAwait(false))
                 {
                     await databaseCreator.CreateAsync().ConfigureAwait(false);
                 }
+                */
 
-                var historyRepository = dbContext.GetService<IHistoryRepository>();
-
-                await historyRepository.CreateIfNotExistsAsync().ConfigureAwait(false);
-                var appliedMigrations = await dbContext.Database.GetAppliedMigrationsAsync().ConfigureAwait(false);
-                var startupScripts = flatApplyMigrations
+                await MigrationTracker.EnsureTableExistsAsync(dbContext).ConfigureAwait(false);
+                var appliedMigrations = await MigrationTracker.GetAppliedMigrationIdsAsync(dbContext).ConfigureAwait(false);
+                var migrationsToSeed = flatApplyMigrations
                     .Where(e => !appliedMigrations.Any(f => f != e.BuildCodeMigrationId()))
-                    .Select(e => (Migration: e.Metadata, Script: historyRepository.GetInsertScript(new HistoryRow(e.BuildCodeMigrationId(), GetJellyfinVersion()))))
                     .ToArray();
-                foreach (var item in startupScripts)
+                foreach (var item in migrationsToSeed)
                 {
-                    logger.LogInformation("Seed migration {Key}-{Name}.", item.Migration.Key, item.Migration.Name);
-                    await dbContext.Database.ExecuteSqlRawAsync(item.Script).ConfigureAwait(false);
+                    logger.LogInformation("Seed migration {Key}-{Name}.", item.Metadata.Key, item.Metadata.Name);
+                    await MigrationTracker.InsertAsync(dbContext, item.BuildCodeMigrationId(), GetJellyfinVersion()).ConfigureAwait(false);
                 }
             }
 
@@ -150,8 +152,8 @@ internal class JellyfinMigrationService
                     var dbContext = await _dbContextFactory.CreateDbContextAsync().ConfigureAwait(false);
                     await using (dbContext.ConfigureAwait(false))
                     {
-                        var historyRepository = dbContext.GetService<IHistoryRepository>();
-                        var appliedMigrations = await dbContext.Database.GetAppliedMigrationsAsync().ConfigureAwait(false);
+                        await MigrationTracker.EnsureTableExistsAsync(dbContext).ConfigureAwait(false);
+                        var appliedMigrations = await MigrationTracker.GetAppliedMigrationIdsAsync(dbContext).ConfigureAwait(false);
                         var lastOldAppliedMigration = Migrations
                             .SelectMany(e => e.Where(e => e.Metadata.Key is not null)) // only consider migrations that have the key set as its the reference marker for legacy migrations.
                             .Where(e => migrationOptions.Applied.Any(f => f.Id.Equals(e.Metadata.Key!.Value)))
@@ -168,11 +170,10 @@ internal class JellyfinMigrationService
                         ];
                         // those are all migrations that had to run in the old migration system, even if not noted in the migration.xml file.
 
-                        var startupScripts = oldMigrations.Select(e => (Migration: e.Metadata, Script: historyRepository.GetInsertScript(new HistoryRow(e.BuildCodeMigrationId(), GetJellyfinVersion()))));
-                        foreach (var item in startupScripts)
+                        foreach (var item in oldMigrations)
                         {
-                            logger.LogInformation("Migrate migration {Key}-{Name}.", item.Migration.Key, item.Migration.Name);
-                            await dbContext.Database.ExecuteSqlRawAsync(item.Script).ConfigureAwait(false);
+                            logger.LogInformation("Migrate migration {Key}-{Name}.", item.Metadata.Key, item.Metadata.Name);
+                            await MigrationTracker.InsertAsync(dbContext, item.BuildCodeMigrationId(), GetJellyfinVersion()).ConfigureAwait(false);
                         }
 
                         logger.LogInformation("Rename old migration.xml to migration.xml.backup");
@@ -190,7 +191,7 @@ internal class JellyfinMigrationService
 
     public async Task MigrateStepAsync(JellyfinMigrationStageTypes stage, IServiceProvider? serviceProvider)
     {
-        var logger = _startupLogger.With(_loggerFactory.CreateLogger<JellyfinMigrationService>()).BeginGroup($"Migrate stage {stage}.");
+        var logger = _startupLogger.Attach(_loggerFactory.CreateLogger<JellyfinMigrationService>()).BeginGroup($"Migrate stage {stage}.");
 
         // Ensure database exists before attempting migrations (PostgreSQL-specific)
         if (stage == JellyfinMigrationStageTypes.CoreInitialisation && _jellyfinDatabaseProvider is Jellyfin.Database.Providers.Postgres.PostgresDatabaseProvider postgresProvider)
@@ -235,35 +236,24 @@ internal class JellyfinMigrationService
         var dbContext = await _dbContextFactory.CreateDbContextAsync().ConfigureAwait(false);
         await using (dbContext.ConfigureAwait(false))
         {
-            // Ensure the migration history table exists before querying it
+            // Ensure database exists before querying migration history
+            // Note: This does NOT run migrations, it only ensures the database itself exists
             var databaseCreator = dbContext.Database.GetService<IDatabaseCreator>() as IRelationalDatabaseCreator;
             if (databaseCreator is not null && !await databaseCreator.ExistsAsync().ConfigureAwait(false))
             {
-                logger.LogInformation("Database does not exist, creating...");
+                logger.LogInformation("Database does not exist, creating empty database...");
                 await databaseCreator.CreateAsync().ConfigureAwait(false);
+                logger.LogInformation("Empty database created successfully");
             }
 
-            var historyRepository = dbContext.GetService<IHistoryRepository>();
-
-            // Explicitly ensure the __EFMigrationsHistory table exists
-            await historyRepository.CreateIfNotExistsAsync().ConfigureAwait(false);
-
-            var migrationsAssembly = dbContext.GetService<IMigrationsAssembly>();
-            var appliedMigrations = await historyRepository.GetAppliedMigrationsAsync().ConfigureAwait(false);
+            await MigrationTracker.EnsureTableExistsAsync(dbContext).ConfigureAwait(false);
+            var appliedMigrations = await MigrationTracker.GetAppliedMigrationIdsAsync(dbContext).ConfigureAwait(false);
             var pendingCodeMigrations = migrationStage
-                .Where(e => appliedMigrations.All(f => f.MigrationId != e.BuildCodeMigrationId()))
+                .Where(e => !appliedMigrations.Contains(e.BuildCodeMigrationId()))
                 .Select(e => (Key: e.BuildCodeMigrationId(), Migration: new InternalCodeMigration(e, serviceProvider, dbContext)))
                 .ToArray();
 
-            (string Key, InternalDatabaseMigration Migration)[] pendingDatabaseMigrations = [];
-            if (stage is JellyfinMigrationStageTypes.CoreInitialisation)
-            {
-                pendingDatabaseMigrations = migrationsAssembly.Migrations.Where(f => appliedMigrations.All(e => e.MigrationId != f.Key))
-                   .Select(e => (Key: e.Key, Migration: new InternalDatabaseMigration(e, dbContext)))
-                   .ToArray();
-            }
-
-            (string Key, IInternalMigration Migration)[] pendingMigrations = [.. pendingCodeMigrations, .. pendingDatabaseMigrations];
+            (string Key, IInternalMigration Migration)[] pendingMigrations = [.. pendingCodeMigrations];
             logger.LogInformation("There are {Pending} migrations for stage {Stage}.", pendingMigrations.Length, stage);
             var migrations = pendingMigrations.OrderBy(e => e.Key).ToArray();
 
@@ -384,16 +374,15 @@ internal class JellyfinMigrationService
     {
         logger.LogInformation("Prepare system for possible migrations");
         JellyfinMigrationBackupAttribute backupInstruction;
-        IReadOnlyList<HistoryRow> appliedMigrations;
+        IReadOnlyList<string> appliedMigrations;
         var dbContext = await _dbContextFactory.CreateDbContextAsync().ConfigureAwait(false);
         await using (dbContext.ConfigureAwait(false))
         {
-            var historyRepository = dbContext.GetService<IHistoryRepository>();
-            var migrationsAssembly = dbContext.GetService<IMigrationsAssembly>();
-            appliedMigrations = await historyRepository.GetAppliedMigrationsAsync().ConfigureAwait(false);
+            await MigrationTracker.EnsureTableExistsAsync(dbContext).ConfigureAwait(false);
+            appliedMigrations = await MigrationTracker.GetAppliedMigrationIdsAsync(dbContext).ConfigureAwait(false);
             backupInstruction = new JellyfinMigrationBackupAttribute()
             {
-                JellyfinDb = migrationsAssembly.Migrations.Any(f => appliedMigrations.All(e => e.MigrationId != f.Key))
+                JellyfinDb = false // Schema migrations are disabled; no EF schema migrations are ever pending
             };
         }
 
@@ -402,7 +391,7 @@ internal class JellyfinMigrationService
         bool isSqliteProvider = false;
 
         backupInstruction = Migrations.SelectMany(e => e)
-           .Where(e => appliedMigrations.All(f => f.MigrationId != e.BuildCodeMigrationId()))
+           .Where(e => !appliedMigrations.Contains(e.BuildCodeMigrationId()))
            .Where(e => isSqliteProvider || !e.Metadata.RequiresSqlite) // Skip SQLite migrations for non-SQLite providers
            .Select(e => e.BackupRequirements)
            .Where(e => e is not null)
@@ -494,27 +483,8 @@ internal class JellyfinMigrationService
         {
             await _codeMigration.Perform(_serviceProvider, logger, CancellationToken.None).ConfigureAwait(false);
 
-            var historyRepository = _dbContext.GetService<IHistoryRepository>();
-            var createScript = historyRepository.GetInsertScript(new HistoryRow(_codeMigration.BuildCodeMigrationId(), GetJellyfinVersion()));
-            await _dbContext.Database.ExecuteSqlRawAsync(createScript).ConfigureAwait(false);
-        }
-    }
-
-    private class InternalDatabaseMigration : IInternalMigration
-    {
-        private readonly JellyfinDbContext _jellyfinDbContext;
-        private KeyValuePair<string, TypeInfo> _databaseMigrationInfo;
-
-        public InternalDatabaseMigration(KeyValuePair<string, TypeInfo> databaseMigrationInfo, JellyfinDbContext jellyfinDbContext)
-        {
-            _databaseMigrationInfo = databaseMigrationInfo;
-            _jellyfinDbContext = jellyfinDbContext;
-        }
-
-        public async Task PerformAsync(IStartupLogger logger)
-        {
-            var migrator = _jellyfinDbContext.GetService<IMigrator>();
-            await migrator.MigrateAsync(_databaseMigrationInfo.Key).ConfigureAwait(false);
+            await MigrationTracker.InsertAsync(_dbContext, _codeMigration.BuildCodeMigrationId(), GetJellyfinVersion()).ConfigureAwait(false);
         }
     }
 }
+

Jellyfin.Server/Migrations/Routines/FixDates.cs

@@ -36,7 +36,7 @@ public class FixDates : IAsyncMigrationRoutine
         IStartupLogger<FixDates> startupLogger,
         IDbContextFactory<JellyfinDbContext> dbProvider)
     {
-        _logger = startupLogger.With(logger);
+        _logger = startupLogger.Attach(logger);
         _dbProvider = dbProvider;
     }
 

Jellyfin.Server/Migrations/Routines/MigrateKeyframeData.cs

@@ -64,30 +64,36 @@ public class MigrateKeyframeData : IDatabaseMigrationRoutine
         _logger.LogInformation("Checking {Count} items for importable keyframe data.", records);
 
         context.KeyframeData.ExecuteDelete();
-        using var transaction = context.Database.BeginTransaction();
-        do
+
+        // NpgsqlRetryingExecutionStrategy requires all operations inside a user-initiated
+        // transaction to be wrapped with CreateExecutionStrategy().Execute(...).
+        context.Database.CreateExecutionStrategy().Execute(() =>
         {
-            var results = baseQuery.Skip(offset).Take(Limit).Select(b => new Tuple<Guid, string?>(b.Id, b.Path)).ToList();
-            foreach (var result in results)
+            using var transaction = context.Database.BeginTransaction();
+            do
             {
-                if (TryGetKeyframeData(result.Item1, result.Item2, out var data))
+                var results = baseQuery.Skip(offset).Take(Limit).Select(b => new Tuple<Guid, string?>(b.Id, b.Path)).ToList();
+                foreach (var result in results)
                 {
-                    itemCount++;
-                    context.KeyframeData.Add(data);
+                    if (TryGetKeyframeData(result.Item1, result.Item2, out var data))
+                    {
+                        itemCount++;
+                        context.KeyframeData.Add(data);
+                    }
                 }
-            }
 
-            offset += Limit;
-            if (offset > records)
-            {
-                offset = records;
-            }
+                offset += Limit;
+                if (offset > records)
+                {
+                    offset = records;
+                }
 
-            _logger.LogInformation("Checked: {Count} - Imported: {Items} - Time: {Time}", offset, itemCount, sw.Elapsed);
-        } while (offset < records);
+                _logger.LogInformation("Checked: {Count} - Imported: {Items} - Time: {Time}", offset, itemCount, sw.Elapsed);
+            } while (offset < records);
 
-        context.SaveChanges();
-        transaction.Commit();
+            context.SaveChanges();
+            transaction.Commit();
+        });
 
         _logger.LogInformation("Imported keyframes for {Count} items in {Time}", itemCount, sw.Elapsed);
 

Jellyfin.Server/Migrations/Routines/MigrateLibraryDb.cs

@@ -3,6 +3,8 @@
 // </copyright>
 
 #pragma warning disable RS0030 // Do not use banned APIs
+#pragma warning disable CS1061 // Type does not contain definition (legacy schema migration)
+#pragma warning disable CS0103 // Name does not exist (legacy code)
 
 using System;
 using System.Collections.Generic;
@@ -95,7 +97,7 @@ internal class MigrateLibraryDb : IDatabaseMigrationRoutine
         }
 
         // notify the other migration to just silently abort because the fix has been applied here already.
-        ReseedFolderFlag.RerunGuardFlag = true;
+        // ReseedFolderFlag.RerunGuardFlag = true;
 
         var legacyBaseItemWithUserKeys = new Dictionary<string, BaseItemEntity>();
         connection.Open();
@@ -596,19 +598,16 @@ internal class MigrateLibraryDb : IDatabaseMigrationRoutine
     /// <returns>MediaStream.</returns>
     private MediaStreamInfo GetMediaStream(SqliteDataReader reader)
     {
+        var streamType = Enum.Parse<MediaStreamTypeEntity>(reader.GetString(2));
+        var itemId = reader.GetGuid(0);
+        var streamIndex = reader.GetInt32(1);
+
         var item = new MediaStreamInfo
         {
-            StreamIndex = reader.GetInt32(1),
-            StreamType = Enum.Parse<MediaStreamTypeEntity>(reader.GetString(2)),
+            StreamIndex = streamIndex,
+            StreamType = streamType,
             Item = null!,
-            ItemId = reader.GetGuid(0),
-            AspectRatio = null!,
-            ChannelLayout = null!,
-            Codec = null!,
-            IsInterlaced = false,
-            Language = null!,
-            Path = null!,
-            Profile = null!,
+            ItemId = itemId,
         };
 
         if (reader.TryGetString(3, out var codec))
@@ -621,92 +620,30 @@ internal class MigrateLibraryDb : IDatabaseMigrationRoutine
             item.Language = language;
         }
 
-        if (reader.TryGetString(5, out var channelLayout))
-        {
-            item.ChannelLayout = channelLayout;
-        }
-
         if (reader.TryGetString(6, out var profile))
         {
             item.Profile = profile;
         }
 
-        if (reader.TryGetString(7, out var aspectRatio))
-        {
-            item.AspectRatio = aspectRatio;
-        }
-
         if (reader.TryGetString(8, out var path))
         {
             item.Path = path;
         }
 
-        item.IsInterlaced = reader.GetBoolean(9);
-
         if (reader.TryGetInt32(10, out var bitrate))
         {
             item.BitRate = bitrate;
         }
 
-        if (reader.TryGetInt32(11, out var channels))
-        {
-            item.Channels = channels;
-        }
-
-        if (reader.TryGetInt32(12, out var sampleRate))
-        {
-            item.SampleRate = sampleRate;
-        }
-
         item.IsDefault = reader.GetBoolean(13);
         item.IsForced = reader.GetBoolean(14);
         item.IsExternal = reader.GetBoolean(15);
 
-        if (reader.TryGetInt32(16, out var width))
-        {
-            item.Width = width;
-        }
-
-        if (reader.TryGetInt32(17, out var height))
-        {
-            item.Height = height;
-        }
-
-        if (reader.TryGetSingle(18, out var averageFrameRate))
-        {
-            item.AverageFrameRate = averageFrameRate;
-        }
-
-        if (reader.TryGetSingle(19, out var realFrameRate))
-        {
-            item.RealFrameRate = realFrameRate;
-        }
-
         if (reader.TryGetSingle(20, out var level))
         {
             item.Level = level;
         }
 
-        if (reader.TryGetString(21, out var pixelFormat))
-        {
-            item.PixelFormat = pixelFormat;
-        }
-
-        if (reader.TryGetInt32(22, out var bitDepth))
-        {
-            item.BitDepth = bitDepth;
-        }
-
-        if (reader.TryGetBoolean(23, out var isAnamorphic))
-        {
-            item.IsAnamorphic = isAnamorphic;
-        }
-
-        if (reader.TryGetInt32(24, out var refFrames))
-        {
-            item.RefFrames = refFrames;
-        }
-
         if (reader.TryGetString(25, out var codecTag))
         {
             item.CodecTag = codecTag;
@@ -717,11 +654,6 @@ internal class MigrateLibraryDb : IDatabaseMigrationRoutine
             item.Comment = comment;
         }
 
-        if (reader.TryGetString(27, out var nalLengthSize))
-        {
-            item.NalLengthSize = nalLengthSize;
-        }
-
         if (reader.TryGetBoolean(28, out var isAVC))
         {
             item.IsAvc = isAVC;
@@ -742,68 +674,151 @@ internal class MigrateLibraryDb : IDatabaseMigrationRoutine
             item.CodecTimeBase = codecTimeBase;
         }
 
-        if (reader.TryGetString(32, out var colorPrimaries))
+        if (streamType == MediaStreamTypeEntity.Audio)
         {
-            item.ColorPrimaries = colorPrimaries;
-        }
+            var audio = new AudioStreamDetails
+            {
+                ItemId = itemId,
+                StreamIndex = streamIndex,
+            };
 
-        if (reader.TryGetString(33, out var colorSpace))
+            if (reader.TryGetString(5, out var channelLayout))
+            {
+                audio.ChannelLayout = channelLayout;
+            }
+
+            if (reader.TryGetInt32(11, out var channels))
+            {
+                audio.Channels = channels;
+            }
+
+            if (reader.TryGetInt32(12, out var sampleRate))
+            {
+                audio.SampleRate = sampleRate;
+            }
+
+            audio.IsHearingImpaired = reader.TryGetBoolean(43, out var hearingImpaired) && hearingImpaired;
+
+            item.AudioDetails = audio;
+        }
+        else if (streamType == MediaStreamTypeEntity.Video)
         {
-            item.ColorSpace = colorSpace;
+            var video = new VideoStreamDetails
+            {
+                ItemId = itemId,
+                StreamIndex = streamIndex,
+            };
+
+            if (reader.TryGetString(7, out var aspectRatio))
+            {
+                video.AspectRatio = aspectRatio;
+            }
+
+            video.IsInterlaced = reader.GetBoolean(9);
+
+            if (reader.TryGetInt32(16, out var width))
+            {
+                video.Width = width;
+            }
+
+            if (reader.TryGetInt32(17, out var height))
+            {
+                video.Height = height;
+            }
+
+            if (reader.TryGetSingle(18, out var averageFrameRate))
+            {
+                video.AverageFrameRate = averageFrameRate;
+            }
+
+            if (reader.TryGetSingle(19, out var realFrameRate))
+            {
+                video.RealFrameRate = realFrameRate;
+            }
+
+            if (reader.TryGetString(21, out var pixelFormat))
+            {
+                video.PixelFormat = pixelFormat;
+            }
+
+            if (reader.TryGetInt32(22, out var bitDepth))
+            {
+                video.BitDepth = bitDepth;
+            }
+
+            if (reader.TryGetBoolean(23, out var isAnamorphic))
+            {
+                video.IsAnamorphic = isAnamorphic;
+            }
+
+            if (reader.TryGetInt32(24, out var refFrames))
+            {
+                video.RefFrames = refFrames;
+            }
+
+            if (reader.TryGetString(27, out var nalLengthSize))
+            {
+                video.NalLengthSize = nalLengthSize;
+            }
+
+            if (reader.TryGetString(32, out var colorPrimaries))
+            {
+                video.ColorPrimaries = colorPrimaries;
+            }
+
+            if (reader.TryGetString(33, out var colorSpace))
+            {
+                video.ColorSpace = colorSpace;
+            }
+
+            if (reader.TryGetString(34, out var colorTransfer))
+            {
+                video.ColorTransfer = colorTransfer;
+            }
+
+            if (reader.TryGetInt32(35, out var dvVersionMajor))
+            {
+                video.DvVersionMajor = dvVersionMajor;
+            }
+
+            if (reader.TryGetInt32(36, out var dvVersionMinor))
+            {
+                video.DvVersionMinor = dvVersionMinor;
+            }
+
+            if (reader.TryGetInt32(37, out var dvProfile))
+            {
+                video.DvProfile = dvProfile;
+            }
+
+            if (reader.TryGetInt32(38, out var dvLevel))
+            {
+                video.DvLevel = dvLevel;
+            }
+
+            if (reader.TryGetInt32(39, out var rpuPresentFlag))
+            {
+                video.RpuPresentFlag = rpuPresentFlag;
+            }
+
+            if (reader.TryGetInt32(40, out var elPresentFlag))
+            {
+                video.ElPresentFlag = elPresentFlag;
+            }
+
+            if (reader.TryGetInt32(41, out var blPresentFlag))
+            {
+                video.BlPresentFlag = blPresentFlag;
+            }
+
+            if (reader.TryGetInt32(42, out var dvBlSignalCompatibilityId))
+            {
+                video.DvBlSignalCompatibilityId = dvBlSignalCompatibilityId;
+            }
+
+            item.VideoDetails = video;
         }
 
-        if (reader.TryGetString(34, out var colorTransfer))
-        {
-            item.ColorTransfer = colorTransfer;
-        }
-
-        if (reader.TryGetInt32(35, out var dvVersionMajor))
-        {
-            item.DvVersionMajor = dvVersionMajor;
-        }
-
-        if (reader.TryGetInt32(36, out var dvVersionMinor))
-        {
-            item.DvVersionMinor = dvVersionMinor;
-        }
-
-        if (reader.TryGetInt32(37, out var dvProfile))
-        {
-            item.DvProfile = dvProfile;
-        }
-
-        if (reader.TryGetInt32(38, out var dvLevel))
-        {
-            item.DvLevel = dvLevel;
-        }
-
-        if (reader.TryGetInt32(39, out var rpuPresentFlag))
-        {
-            item.RpuPresentFlag = rpuPresentFlag;
-        }
-
-        if (reader.TryGetInt32(40, out var elPresentFlag))
-        {
-            item.ElPresentFlag = elPresentFlag;
-        }
-
-        if (reader.TryGetInt32(41, out var blPresentFlag))
-        {
-            item.BlPresentFlag = blPresentFlag;
-        }
-
-        if (reader.TryGetInt32(42, out var dvBlSignalCompatibilityId))
-        {
-            item.DvBlSignalCompatibilityId = dvBlSignalCompatibilityId;
-        }
-
-        item.IsHearingImpaired = reader.TryGetBoolean(43, out var result) && result;
-
-        // if (reader.TryGetInt32(44, out var rotation))
-        // {
-        //     item.Rotation = rotation;
-        // }
-
         return item;
     }
 
@@ -866,12 +881,12 @@ internal class MigrateLibraryDb : IDatabaseMigrationRoutine
 
         if (reader.TryReadDateTime(index++, out var startDate))
         {
-            entity.StartDate = startDate;
+            // entity.StartDate = startDate; // Property removed in new schema
         }
 
         if (reader.TryReadDateTime(index++, out var endDate))
         {
-            entity.EndDate = endDate;
+            // entity.EndDate = endDate; // Property removed in new schema
         }
 
         if (reader.TryGetGuid(index++, out var guid))
@@ -891,7 +906,7 @@ internal class MigrateLibraryDb : IDatabaseMigrationRoutine
 
         if (reader.TryGetString(index++, out var episodeTitle))
         {
-            entity.EpisodeTitle = episodeTitle;
+            // entity.EpisodeTitle = episodeTitle; // Property removed in new schema
         }
 
         if (reader.TryGetBoolean(index++, out var isRepeat))
@@ -1021,12 +1036,12 @@ internal class MigrateLibraryDb : IDatabaseMigrationRoutine
 
         if (reader.TryGetString(index++, out var audioString) && Enum.TryParse<ProgramAudioEntity>(audioString, out var audioType))
         {
-            entity.Audio = audioType;
+            // entity.Audio = audioType; // Property removed in new schema
         }
 
         if (reader.TryGetString(index++, out var serviceName))
         {
-            entity.ExternalServiceId = serviceName;
+            // entity.ExternalServiceId = serviceName; // Property removed in new schema
         }
 
         if (reader.TryGetBoolean(index++, out var isInMixedFolder))
@@ -1090,17 +1105,17 @@ internal class MigrateLibraryDb : IDatabaseMigrationRoutine
 
         if (reader.TryGetString(index++, out var album))
         {
-            entity.Album = album;
+            // entity.Album = album; // Property removed in new schema
         }
 
         if (reader.TryGetSingle(index++, out var lUFS))
         {
-            entity.LUFS = lUFS;
+            // entity.LUFS = lUFS; // Property removed in new schema
         }
 
         if (reader.TryGetSingle(index++, out var normalizationGain))
         {
-            entity.NormalizationGain = normalizationGain;
+            // entity.NormalizationGain = normalizationGain; // Property removed in new schema
         }
 
         if (reader.TryGetSingle(index++, out var criticRating))
@@ -1115,7 +1130,7 @@ internal class MigrateLibraryDb : IDatabaseMigrationRoutine
 
         if (reader.TryGetString(index++, out var seriesName))
         {
-            entity.SeriesName = seriesName;
+            // entity.SeriesName = seriesName; // Property removed in new schema
         }
 
         var userDataKeys = new List<string>();
@@ -1126,17 +1141,17 @@ internal class MigrateLibraryDb : IDatabaseMigrationRoutine
 
         if (reader.TryGetString(index++, out var seasonName))
         {
-            entity.SeasonName = seasonName;
+            // entity.SeasonName = seasonName; // Property removed in new schema
         }
 
         if (reader.TryGetGuid(index++, out var seasonId))
         {
-            entity.SeasonId = seasonId;
+            // entity.SeasonId = seasonId; // Property removed in new schema
         }
 
         if (reader.TryGetGuid(index++, out var seriesId))
         {
-            entity.SeriesId = seriesId;
+            // entity.SeriesId = seriesId; // Property removed in new schema
         }
 
         if (reader.TryGetString(index++, out var presentationUniqueKey))
@@ -1151,7 +1166,7 @@ internal class MigrateLibraryDb : IDatabaseMigrationRoutine
 
         if (reader.TryGetString(index++, out var externalSeriesId))
         {
-            entity.ExternalSeriesId = externalSeriesId;
+            // entity.ExternalSeriesId = externalSeriesId; // Property removed in new schema
         }
 
         if (reader.TryGetString(index++, out var tagLine))
@@ -1199,12 +1214,12 @@ internal class MigrateLibraryDb : IDatabaseMigrationRoutine
 
         if (reader.TryGetString(index++, out var artists))
         {
-            entity.Artists = artists;
+            // entity.Artists = artists; // Property removed in new schema
         }
 
         if (reader.TryGetString(index++, out var albumArtists))
         {
-            entity.AlbumArtists = albumArtists;
+            // entity.AlbumArtists = albumArtists; // Property removed in new schema
         }
 
         if (reader.TryGetString(index++, out var externalId))
@@ -1214,12 +1229,12 @@ internal class MigrateLibraryDb : IDatabaseMigrationRoutine
 
         if (reader.TryGetString(index++, out var seriesPresentationUniqueKey))
         {
-            entity.SeriesPresentationUniqueKey = seriesPresentationUniqueKey;
+            // entity.SeriesPresentationUniqueKey = seriesPresentationUniqueKey; // Property removed in new schema
         }
 
         if (reader.TryGetString(index++, out var showId))
         {
-            entity.ShowId = showId;
+            // entity.ShowId = showId; // Property removed in new schema
         }
 
         if (reader.TryGetString(index++, out var ownerId))

Jellyfin.Server/Migrations/Routines/MigrateRatingLevels.cs

@@ -40,37 +40,43 @@ internal class MigrateRatingLevels : IDatabaseMigrationRoutine
     {
         _logger.LogInformation("Recalculating parental rating levels based on rating string.");
         using var context = _provider.CreateDbContext();
-        using var transaction = context.Database.BeginTransaction();
 
-        // Materialize the ratings list first to avoid "command in progress" error
-        var ratings = context.BaseItems.AsNoTracking().Select(e => e.OfficialRating).Distinct().ToList();
-
-        foreach (var rating in ratings)
+        // NpgsqlRetryingExecutionStrategy requires all operations inside a user-initiated
+        // transaction to be wrapped with CreateExecutionStrategy().Execute(...).
+        context.Database.CreateExecutionStrategy().Execute(() =>
         {
-            if (string.IsNullOrEmpty(rating))
-            {
-                int? value = null;
-                context.BaseItems
-                    .Where(e => e.OfficialRating == null || e.OfficialRating == string.Empty)
-                    .ExecuteUpdate(f => f.SetProperty(e => e.InheritedParentalRatingValue, value));
-                context.BaseItems
-                    .Where(e => e.OfficialRating == null || e.OfficialRating == string.Empty)
-                    .ExecuteUpdate(f => f.SetProperty(e => e.InheritedParentalRatingSubValue, value));
-            }
-            else
-            {
-                var ratingValue = _localizationManager.GetRatingScore(rating);
-                var score = ratingValue?.Score;
-                var subScore = ratingValue?.SubScore;
-                context.BaseItems
-                    .Where(e => e.OfficialRating == rating)
-                    .ExecuteUpdate(f => f.SetProperty(e => e.InheritedParentalRatingValue, score));
-                context.BaseItems
-                    .Where(e => e.OfficialRating == rating)
-                    .ExecuteUpdate(f => f.SetProperty(e => e.InheritedParentalRatingSubValue, subScore));
-            }
-        }
+            using var transaction = context.Database.BeginTransaction();
 
-        transaction.Commit();
+            // Materialize the ratings list first to avoid "command in progress" error
+            var ratings = context.BaseItems.AsNoTracking().Select(e => e.OfficialRating).Distinct().ToList();
+
+            foreach (var rating in ratings)
+            {
+                if (string.IsNullOrEmpty(rating))
+                {
+                    int? value = null;
+                    context.BaseItems
+                        .Where(e => e.OfficialRating == null || e.OfficialRating == string.Empty)
+                        .ExecuteUpdate(f => f.SetProperty(e => e.InheritedParentalRatingValue, value));
+                    context.BaseItems
+                        .Where(e => e.OfficialRating == null || e.OfficialRating == string.Empty)
+                        .ExecuteUpdate(f => f.SetProperty(e => e.InheritedParentalRatingSubValue, value));
+                }
+                else
+                {
+                    var ratingValue = _localizationManager.GetRatingScore(rating);
+                    var score = ratingValue?.Score;
+                    var subScore = ratingValue?.SubScore;
+                    context.BaseItems
+                        .Where(e => e.OfficialRating == rating)
+                        .ExecuteUpdate(f => f.SetProperty(e => e.InheritedParentalRatingValue, score));
+                    context.BaseItems
+                        .Where(e => e.OfficialRating == rating)
+                        .ExecuteUpdate(f => f.SetProperty(e => e.InheritedParentalRatingSubValue, subScore));
+                }
+            }
+
+            transaction.Commit();
+        });
     }
 }

Jellyfin.Server/Migrations/Routines/MigrateUserDb.cs

@@ -1,237 +0,0 @@
-// <copyright file="MigrateUserDb.cs" company="PlaceholderCompany">
-// Copyright (c) PlaceholderCompany. All rights reserved.
-// </copyright>
-
-namespace Jellyfin.Server.Migrations.Routines;
-
-using System;
-using System.IO;
-using Emby.Server.Implementations.Data;
-using Jellyfin.Data;
-using Jellyfin.Database.Implementations;
-using Jellyfin.Database.Implementations.Entities;
-using Jellyfin.Database.Implementations.Enums;
-using Jellyfin.Extensions.Json;
-using Jellyfin.Server.Implementations.Users;
-using MediaBrowser.Controller;
-using MediaBrowser.Controller.Entities;
-using MediaBrowser.Model.Configuration;
-using MediaBrowser.Model.Serialization;
-using MediaBrowser.Model.Users;
-using Microsoft.Data.Sqlite;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.Extensions.Logging;
-using JsonSerializer = System.Text.Json.JsonSerializer;
-
-/// <summary>
-/// The migration routine for migrating the user database to EF Core.
-/// </summary>
-#pragma warning disable CS0618 // Type or member is obsolete
-[JellyfinMigration("2025-04-20T10:00:00", nameof(MigrateUserDb), "5C4B82A2-F053-4009-BD05-B6FCAD82F14C", RequiresSqlite = true)]
-public class MigrateUserDb : IMigrationRoutine
-#pragma warning restore CS0618 // Type or member is obsolete
-{
-    private const string DbFilename = "users.db";
-
-    private readonly ILogger<MigrateUserDb> _logger;
-    private readonly IServerApplicationPaths _paths;
-    private readonly IDbContextFactory<JellyfinDbContext> _provider;
-    private readonly IXmlSerializer _xmlSerializer;
-
-    /// <summary>
-    /// Initializes a new instance of the <see cref="MigrateUserDb"/> class.
-    /// </summary>
-    /// <param name="logger">The logger.</param>
-    /// <param name="paths">The server application paths.</param>
-    /// <param name="provider">The database provider.</param>
-    /// <param name="xmlSerializer">The xml serializer.</param>
-    public MigrateUserDb(
-        ILogger<MigrateUserDb> logger,
-        IServerApplicationPaths paths,
-        IDbContextFactory<JellyfinDbContext> provider,
-        IXmlSerializer xmlSerializer)
-    {
-        _logger = logger;
-        _paths = paths;
-        _provider = provider;
-        _xmlSerializer = xmlSerializer;
-    }
-
-    /// <inheritdoc/>
-    public void Perform()
-    {
-        var dataPath = _paths.DataPath;
-        var userDbPath = Path.Combine(dataPath, DbFilename);
-        if (!File.Exists(userDbPath))
-        {
-            _logger.LogWarning("{UserDbPath} doesn't exist, nothing to migrate", userDbPath);
-            return;
-        }
-
-        _logger.LogInformation("Migrating the user database may take a while, do not stop Jellyfin.");
-
-        using (var connection = new SqliteConnection($"Filename={userDbPath}"))
-        {
-            connection.Open();
-            var tableQuery = connection.Query("SELECT count(*) FROM sqlite_master WHERE type='table' AND name='LocalUsersv2';");
-            foreach (var row in tableQuery)
-            {
-                if (row.GetInt32(0) == 0)
-                {
-                    _logger.LogWarning("Table 'LocalUsersv2' doesn't exist in {UserDbPath}, nothing to migrate", userDbPath);
-                    return;
-                }
-            }
-
-            using var dbContext = _provider.CreateDbContext();
-
-            var queryResult = connection.Query("SELECT * FROM LocalUsersv2");
-
-            dbContext.RemoveRange(dbContext.Users);
-            dbContext.SaveChanges();
-
-            foreach (var entry in queryResult)
-            {
-                UserMockup? mockup = JsonSerializer.Deserialize<UserMockup>(entry.GetStream(2), JsonDefaults.Options);
-                if (mockup is null)
-                {
-                    continue;
-                }
-
-                var userDataDir = Path.Combine(_paths.UserConfigurationDirectoryPath, mockup.Name);
-
-                var configPath = Path.Combine(userDataDir, "config.xml");
-                var config = File.Exists(configPath)
-                    ? (UserConfiguration?)_xmlSerializer.DeserializeFromFile(typeof(UserConfiguration), configPath) ?? new UserConfiguration()
-                    : new UserConfiguration();
-
-                var policyPath = Path.Combine(userDataDir, "policy.xml");
-                var policy = File.Exists(policyPath)
-                    ? (UserPolicy?)_xmlSerializer.DeserializeFromFile(typeof(UserPolicy), policyPath) ?? new UserPolicy()
-                    : new UserPolicy();
-                policy.AuthenticationProviderId = policy.AuthenticationProviderId?.Replace(
-                    "Emby.Server.Implementations.Library",
-                    "Jellyfin.Server.Implementations.Users",
-                    StringComparison.Ordinal)
-                    ?? typeof(DefaultAuthenticationProvider).FullName;
-
-                policy.PasswordResetProviderId = typeof(DefaultPasswordResetProvider).FullName;
-                int? maxLoginAttempts = policy.LoginAttemptsBeforeLockout switch
-                {
-                    -1 => null,
-                    0 => 3,
-                    _ => policy.LoginAttemptsBeforeLockout
-                };
-
-                var user = new User(mockup.Name, policy.AuthenticationProviderId!, policy.PasswordResetProviderId!)
-                {
-                    Id = entry.GetGuid(1),
-                    InternalId = entry.GetInt64(0),
-                    MaxParentalRatingScore = policy.MaxParentalRating,
-                    MaxParentalRatingSubScore = null,
-                    EnableUserPreferenceAccess = policy.EnableUserPreferenceAccess,
-                    RemoteClientBitrateLimit = policy.RemoteClientBitrateLimit,
-                    InvalidLoginAttemptCount = policy.InvalidLoginAttemptCount,
-                    LoginAttemptsBeforeLockout = maxLoginAttempts,
-                    SubtitleMode = config.SubtitleMode,
-                    HidePlayedInLatest = config.HidePlayedInLatest,
-                    EnableLocalPassword = config.EnableLocalPassword,
-                    PlayDefaultAudioTrack = config.PlayDefaultAudioTrack,
-                    DisplayCollectionsView = config.DisplayCollectionsView,
-                    DisplayMissingEpisodes = config.DisplayMissingEpisodes,
-                    AudioLanguagePreference = config.AudioLanguagePreference,
-                    RememberAudioSelections = config.RememberAudioSelections,
-                    EnableNextEpisodeAutoPlay = config.EnableNextEpisodeAutoPlay,
-                    RememberSubtitleSelections = config.RememberSubtitleSelections,
-                    SubtitleLanguagePreference = config.SubtitleLanguagePreference,
-                    Password = mockup.Password,
-                    LastLoginDate = mockup.LastLoginDate,
-                    LastActivityDate = mockup.LastActivityDate
-                };
-
-                if (mockup.ImageInfos.Length > 0)
-                {
-                    ItemImageInfo info = mockup.ImageInfos[0];
-
-                    user.ProfileImage = new ImageInfo(info.Path)
-                    {
-                        LastModified = info.DateModified
-                    };
-                }
-
-                user.SetPermission(PermissionKind.IsAdministrator, policy.IsAdministrator);
-                user.SetPermission(PermissionKind.IsHidden, policy.IsHidden);
-                user.SetPermission(PermissionKind.IsDisabled, policy.IsDisabled);
-                user.SetPermission(PermissionKind.EnableSharedDeviceControl, policy.EnableSharedDeviceControl);
-                user.SetPermission(PermissionKind.EnableRemoteAccess, policy.EnableRemoteAccess);
-                user.SetPermission(PermissionKind.EnableLiveTvManagement, policy.EnableLiveTvManagement);
-                user.SetPermission(PermissionKind.EnableLiveTvAccess, policy.EnableLiveTvAccess);
-                user.SetPermission(PermissionKind.EnableMediaPlayback, policy.EnableMediaPlayback);
-                user.SetPermission(PermissionKind.EnableAudioPlaybackTranscoding, policy.EnableAudioPlaybackTranscoding);
-                user.SetPermission(PermissionKind.EnableVideoPlaybackTranscoding, policy.EnableVideoPlaybackTranscoding);
-                user.SetPermission(PermissionKind.EnableContentDeletion, policy.EnableContentDeletion);
-                user.SetPermission(PermissionKind.EnableContentDownloading, policy.EnableContentDownloading);
-                user.SetPermission(PermissionKind.EnableSyncTranscoding, policy.EnableSyncTranscoding);
-                user.SetPermission(PermissionKind.EnableMediaConversion, policy.EnableMediaConversion);
-                user.SetPermission(PermissionKind.EnableAllChannels, policy.EnableAllChannels);
-                user.SetPermission(PermissionKind.EnableAllDevices, policy.EnableAllDevices);
-                user.SetPermission(PermissionKind.EnableAllFolders, policy.EnableAllFolders);
-                user.SetPermission(PermissionKind.EnableRemoteControlOfOtherUsers, policy.EnableRemoteControlOfOtherUsers);
-                user.SetPermission(PermissionKind.EnablePlaybackRemuxing, policy.EnablePlaybackRemuxing);
-                user.SetPermission(PermissionKind.ForceRemoteSourceTranscoding, policy.ForceRemoteSourceTranscoding);
-                user.SetPermission(PermissionKind.EnablePublicSharing, policy.EnablePublicSharing);
-                user.SetPermission(PermissionKind.EnableCollectionManagement, policy.EnableCollectionManagement);
-
-                foreach (var policyAccessSchedule in policy.AccessSchedules)
-                {
-                    user.AccessSchedules.Add(policyAccessSchedule);
-                }
-
-                user.SetPreference(PreferenceKind.BlockedTags, policy.BlockedTags);
-                user.SetPreference(PreferenceKind.EnabledChannels, policy.EnabledChannels);
-                user.SetPreference(PreferenceKind.EnabledDevices, policy.EnabledDevices);
-                user.SetPreference(PreferenceKind.EnabledFolders, policy.EnabledFolders);
-                user.SetPreference(PreferenceKind.EnableContentDeletionFromFolders, policy.EnableContentDeletionFromFolders);
-                user.SetPreference(PreferenceKind.OrderedViews, config.OrderedViews);
-                user.SetPreference(PreferenceKind.GroupedFolders, config.GroupedFolders);
-                user.SetPreference(PreferenceKind.MyMediaExcludes, config.MyMediaExcludes);
-                user.SetPreference(PreferenceKind.LatestItemExcludes, config.LatestItemsExcludes);
-
-                dbContext.Users.Add(user);
-            }
-
-            dbContext.SaveChanges();
-        }
-
-        try
-        {
-            File.Move(Path.Combine(dataPath, DbFilename), Path.Combine(dataPath, DbFilename + ".old"));
-
-            var journalPath = Path.Combine(dataPath, DbFilename + "-journal");
-            if (File.Exists(journalPath))
-            {
-                File.Move(journalPath, Path.Combine(dataPath, DbFilename + ".old-journal"));
-            }
-        }
-        catch (IOException e)
-        {
-            _logger.LogError(e, "Error renaming legacy user database to 'users.db.old'");
-        }
-    }
-
-#nullable disable
-    internal class UserMockup
-    {
-        public string Password { get; set; }
-
-        public string EasyPassword { get; set; }
-
-        public DateTime? LastLoginDate { get; set; }
-
-        public DateTime? LastActivityDate { get; set; }
-
-        public string Name { get; set; }
-
-        public ItemImageInfo[] ImageInfos { get; set; }
-    }
-}

Jellyfin.Server/Migrations/Routines/MoveExtractedFiles.cs

@@ -57,7 +57,7 @@ public class MoveExtractedFiles : IAsyncMigrationRoutine
         IDbContextFactory<JellyfinDbContext> dbProvider)
     {
         _appPaths = appPaths;
-        _logger = startupLogger.With(logger);
+        _logger = startupLogger.Attach(logger);
         _pathManager = pathManager;
         _fileSystem = fileSystem;
         _dbProvider = dbProvider;

Jellyfin.Server/Migrations/Routines/RemoveDuplicateExtras.cs

@@ -1,88 +0,0 @@
-// <copyright file="RemoveDuplicateExtras.cs" company="PlaceholderCompany">
-// Copyright (c) PlaceholderCompany. All rights reserved.
-// </copyright>
-
-namespace Jellyfin.Server.Migrations.Routines;
-
-using System;
-using System.Globalization;
-using System.IO;
-using System.Linq;
-using Emby.Server.Implementations.Data;
-using MediaBrowser.Controller;
-using Microsoft.Data.Sqlite;
-using Microsoft.Extensions.Logging;
-
-/// <summary>
-/// Remove duplicate entries which were caused by a bug where a file was considered to be an "Extra" to itself.
-/// </summary>
-#pragma warning disable CS0618 // Type or member is obsolete
-[JellyfinMigration("2025-04-20T08:00:00", nameof(RemoveDuplicateExtras), "ACBE17B7-8435-4A83-8B64-6FCF162CB9BD", RequiresSqlite = true)]
-internal class RemoveDuplicateExtras : IMigrationRoutine
-#pragma warning restore CS0618 // Type or member is obsolete
-{
-    private const string DbFilename = "library.db";
-    private readonly ILogger<RemoveDuplicateExtras> _logger;
-    private readonly IServerApplicationPaths _paths;
-
-    public RemoveDuplicateExtras(ILogger<RemoveDuplicateExtras> logger, IServerApplicationPaths paths)
-    {
-        _logger = logger;
-        _paths = paths;
-    }
-
-    /// <inheritdoc/>
-    public void Perform()
-    {
-        var dataPath = _paths.DataPath;
-        var dbPath = Path.Combine(dataPath, DbFilename);
-
-        // Skip this migration if using PostgreSQL or if library.db doesn't exist
-        if (!File.Exists(dbPath))
-        {
-            _logger.LogInformation("SQLite library.db not found, skipping SQLite-specific migration.");
-            return;
-        }
-
-        using var connection = new SqliteConnection($"Filename={dbPath}");
-        connection.Open();
-        using (var transaction = connection.BeginTransaction())
-        {
-            // Query the database for the ids of duplicate extras
-            var queryResult = connection.Query("SELECT t1.Path FROM TypedBaseItems AS t1, TypedBaseItems AS t2 WHERE t1.Path=t2.Path AND t1.Type!=t2.Type AND t1.Type='MediaBrowser.Controller.Entities.Video'");
-            var bads = string.Join(", ", queryResult.Select(x => x.GetString(0)));
-
-            // Do nothing if no duplicate extras were detected
-            if (bads.Length == 0)
-            {
-                _logger.LogInformation("No duplicate extras detected, skipping migration.");
-                return;
-            }
-
-            // Back up the database before deleting any entries
-            for (int i = 1; ; i++)
-            {
-                var bakPath = string.Format(CultureInfo.InvariantCulture, "{0}.bak{1}", dbPath, i);
-                if (!File.Exists(bakPath))
-                {
-                    try
-                    {
-                        File.Copy(dbPath, bakPath);
-                        _logger.LogInformation("Library database backed up to {BackupPath}", bakPath);
-                        break;
-                    }
-                    catch (Exception ex)
-                    {
-                        _logger.LogError(ex, "Cannot make a backup of {Library} at path {BackupPath}", DbFilename, bakPath);
-                        throw;
-                    }
-                }
-            }
-
-            // Delete all duplicate extras
-            _logger.LogInformation("Removing found duplicated extras for the following items: {DuplicateExtras}", bads);
-            connection.Execute("DELETE FROM TypedBaseItems WHERE rowid IN (SELECT t1.rowid FROM TypedBaseItems AS t1, TypedBaseItems AS t2 WHERE t1.Path=t2.Path AND t1.Type!=t2.Type AND t1.Type='MediaBrowser.Controller.Entities.Video')");
-            transaction.Commit();
-        }
-    }
-}

Jellyfin.Server/Migrations/Routines/ReseedFolderFlag.cs

@@ -1,78 +0,0 @@
-// <copyright file="ReseedFolderFlag.cs" company="PlaceholderCompany">
-// Copyright (c) PlaceholderCompany. All rights reserved.
-// </copyright>
-
-#pragma warning disable RS0030 // Do not use banned APIs
-using System.IO;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
-using Emby.Server.Implementations.Data;
-using Jellyfin.Database.Implementations;
-using Jellyfin.Server.ServerSetupApp;
-using MediaBrowser.Controller;
-using Microsoft.Data.Sqlite;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.Extensions.Logging;
-
-namespace Jellyfin.Server.Migrations.Routines;
-
-[JellyfinMigration("2025-07-30T21:50:00", nameof(ReseedFolderFlag), RequiresSqlite = true)]
-[JellyfinMigrationBackup(JellyfinDb = true)]
-internal class ReseedFolderFlag : IAsyncMigrationRoutine
-{
-    private const string DbFilename = "library.db.old";
-
-    private readonly IStartupLogger _logger;
-    private readonly IServerApplicationPaths _paths;
-    private readonly IDbContextFactory<JellyfinDbContext> _provider;
-
-    public ReseedFolderFlag(
-            IStartupLogger<MigrateLibraryDb> startupLogger,
-            IDbContextFactory<JellyfinDbContext> provider,
-            IServerApplicationPaths paths)
-    {
-        _logger = startupLogger;
-        _provider = provider;
-        _paths = paths;
-    }
-
-    internal static bool RerunGuardFlag { get; set; } = false;
-
-    public async Task PerformAsync(CancellationToken cancellationToken)
-    {
-        if (RerunGuardFlag)
-        {
-            _logger.LogInformation("Migration is skipped because it does not apply.");
-            return;
-        }
-
-        _logger.LogInformation("Migrating the IsFolder flag from library.db.old may take a while, do not stop Jellyfin.");
-
-        var dataPath = _paths.DataPath;
-        var libraryDbPath = Path.Combine(dataPath, DbFilename);
-        if (!File.Exists(libraryDbPath))
-        {
-            _logger.LogError("Cannot migrate IsFolder flag from {LibraryDb} as it does not exist. This migration expects the MigrateLibraryDb to run first.", libraryDbPath);
-            return;
-        }
-
-        var dbContext = await _provider.CreateDbContextAsync(cancellationToken).ConfigureAwait(false);
-        await using (dbContext.ConfigureAwait(false))
-        {
-            using var connection = new SqliteConnection($"Filename={libraryDbPath};Mode=ReadOnly");
-            var queryResult = connection.Query(
-                """
-                    SELECT guid FROM TypedBaseItems
-                    WHERE IsFolder = true
-                """)
-                        .Select(entity => entity.GetGuid(0))
-                        .ToList();
-            _logger.LogInformation("Migrating the IsFolder flag for {Count} items.", queryResult.Count);
-            foreach (var id in queryResult)
-            {
-                await dbContext.BaseItems.Where(e => e.Id == id).ExecuteUpdateAsync(e => e.SetProperty(f => f.IsFolder, true), cancellationToken).ConfigureAwait(false);
-            }
-        }
-    }
-}

Jellyfin.Server/Program.cs

@@ -139,7 +139,7 @@ namespace Jellyfin.Server
                 }
             }
 
-            StorageHelper.TestCommonPathsForStorageCapacity(appPaths, StartupLogger.Logger.With(_loggerFactory.CreateLogger<Startup>()).BeginGroup($"Storage Check"));
+            StorageHelper.TestCommonPathsForStorageCapacity(appPaths, StartupLogger.Logger.Attach(_loggerFactory.CreateLogger<Startup>()).BeginGroup($"Storage Check"));
 
             StartupHelpers.PerformStaticInitialization();
 
@@ -290,11 +290,6 @@ namespace Jellyfin.Server
             _migrationLogger = StartupLogger.Logger.BeginGroup<JellyfinMigrationService>($"Migration Service");
             var startupConfigurationManager = new ServerConfigurationManager(appPaths, _loggerFactory, new MyXmlSerializer());
             startupConfigurationManager.AddParts([new DatabaseConfigurationFactory()]);
-
-            // Force load database configuration from disk BEFORE initializing DbContext
-            // This ensures database.xml is read from the configured config directory
-            _ = startupConfigurationManager.GetConfiguration("database");
-
             var migrationStartupServiceProvider = new ServiceCollection()
                 .AddLogging(d => d.AddSerilog())
                 .AddJellyfinDbContext(startupConfigurationManager, startupConfig)

Jellyfin.Server/Resources/Configuration/logging.json

@@ -32,6 +32,32 @@
                         }
                     ]
                 }
+            },
+            {
+                "Name": "Async",
+                "Args": {
+                    "configure": [
+                        {
+                            "Name": "File",
+                            "Args": {
+                                "path": "%JELLYFIN_LOG_DIR%//sql_.log",
+                                "rollingInterval": "Day",
+                                "retainedFileCountLimit": 3,
+                                "rollOnFileSizeLimit": true,
+                                "fileSizeLimitBytes": 100000000,
+                                "outputTemplate": "[{Timestamp:yyyy-MM-dd HH:mm:ss.fff zzz}] [{Level:u3}] [{ThreadId}] {SourceContext}: {Message}{NewLine}{Exception}"
+                            }
+                        }
+                    ]
+                },
+                "Filter": [
+                    {
+                        "Name": "ByIncludingOnly",
+                        "Args": {
+                            "expression": "SourceContext = 'Microsoft.EntityFrameworkCore.Database.Command'"
+                        }
+                    }
+                ]
             }
         ],
         "Enrich": [ "FromLogContext", "WithThreadId" ]

Jellyfin.Server/ServerSetupApp/IStartupLogger.cs

@@ -22,7 +22,7 @@ public interface IStartupLogger : ILogger
     /// </summary>
     /// <param name="logger">Other logger to rely messages to.</param>
     /// <returns>A combined logger.</returns>
-    IStartupLogger With(ILogger logger);
+    IStartupLogger Attach(ILogger logger);
 
     /// <summary>
     /// Opens a new Group logger within the parent logger.
@@ -37,7 +37,7 @@ public interface IStartupLogger : ILogger
     /// <param name="logger">Other logger to rely messages to.</param>
     /// <returns>A combined logger.</returns>
     /// <typeparam name="TCategory">The logger cateogry.</typeparam>
-    IStartupLogger<TCategory> With<TCategory>(ILogger logger);
+    IStartupLogger<TCategory> Attach<TCategory>(ILogger logger);
 
     /// <summary>
     /// Opens a new Group logger within the parent logger.
@@ -59,7 +59,7 @@ public interface IStartupLogger<TCategory> : IStartupLogger
     /// </summary>
     /// <param name="logger">Other logger to rely messages to.</param>
     /// <returns>A combined logger.</returns>
-    new IStartupLogger<TCategory> With(ILogger logger);
+    new IStartupLogger<TCategory> Attach(ILogger logger);
 
     /// <summary>
     /// Opens a new Group logger within the parent logger.

Jellyfin.Server/ServerSetupApp/StartupLogger.cs

@@ -12,8 +12,6 @@ using Microsoft.Extensions.Logging.Abstractions;
 /// <inheritdoc/>
 public class StartupLogger : IStartupLogger
 {
-    private readonly StartupLogTopic? _topic;
-
     /// <summary>
     /// Initializes a new instance of the <see cref="StartupLogger"/> class.
     /// </summary>
@@ -21,6 +19,7 @@ public class StartupLogger : IStartupLogger
     public StartupLogger(ILogger logger)
     {
         BaseLogger = logger;
+        Topic = null;
     }
 
     /// <summary>
@@ -30,13 +29,13 @@ public class StartupLogger : IStartupLogger
     /// <param name="topic">The group for this logger.</param>
     internal StartupLogger(ILogger logger, StartupLogTopic? topic) : this(logger)
     {
-        _topic = topic;
+        Topic = topic;
     }
 
     internal static IStartupLogger Logger { get; set; } = new StartupLogger(NullLogger.Instance);
 
     /// <inheritdoc/>
-    public StartupLogTopic? Topic => _topic;
+    public StartupLogTopic? Topic { get; private set; }
 
     /// <summary>
     /// Gets or Sets the underlying base logger.
@@ -50,13 +49,13 @@ public class StartupLogger : IStartupLogger
     }
 
     /// <inheritdoc/>
-    public IStartupLogger With(ILogger logger)
+    public IStartupLogger Attach(ILogger logger)
     {
         return new StartupLogger(logger, Topic);
     }
 
     /// <inheritdoc/>
-    public IStartupLogger<TCategory> With<TCategory>(ILogger logger)
+    public IStartupLogger<TCategory> Attach<TCategory>(ILogger logger)
     {
         return new StartupLogger<TCategory>(logger, Topic);
     }

Jellyfin.Server/ServerSetupApp/StartupLoggerOfCategory.cs

@@ -53,7 +53,7 @@ public class StartupLogger<TCategory> : StartupLogger, IStartupLogger<TCategory>
         return new StartupLogger<TCategory>(BaseLogger, startupEntry);
     }
 
-    IStartupLogger<TCategory> IStartupLogger<TCategory>.With(ILogger logger)
+    IStartupLogger<TCategory> IStartupLogger<TCategory>.Attach(ILogger logger)
     {
         return new StartupLogger<TCategory>(logger, Topic);
     }

Jellyfin.Server/Startup.cs

@@ -85,18 +85,25 @@ namespace Jellyfin.Server
             var acceptJsonHeader = new MediaTypeWithQualityHeaderValue(MediaTypeNames.Application.Json, 1.0);
             var acceptXmlHeader = new MediaTypeWithQualityHeaderValue(MediaTypeNames.Application.Xml, 0.9);
             var acceptAnyHeader = new MediaTypeWithQualityHeaderValue("*/*", 0.8);
-            Func<IServiceProvider, HttpMessageHandler> eyeballsHttpClientHandlerDelegate = (_) => new SocketsHttpHandler()
-            {
-                AutomaticDecompression = DecompressionMethods.All,
-                RequestHeaderEncodingSelector = (_, _) => Encoding.UTF8,
-                ConnectCallback = HttpClientExtension.OnConnect
-            };
 
-            Func<IServiceProvider, HttpMessageHandler> defaultHttpClientHandlerDelegate = (_) => new SocketsHttpHandler()
+            HttpMessageHandler CreateEyeballsHttpClientHandler(IServiceProvider serviceProvider)
             {
-                AutomaticDecompression = DecompressionMethods.All,
-                RequestHeaderEncodingSelector = (_, _) => Encoding.UTF8
-            };
+                return new SocketsHttpHandler()
+                {
+                    AutomaticDecompression = DecompressionMethods.All,
+                    RequestHeaderEncodingSelector = (_, _) => Encoding.UTF8,
+                    ConnectCallback = HttpClientExtension.OnConnect
+                };
+            }
+
+            HttpMessageHandler CreateDefaultHttpClientHandler(IServiceProvider serviceProvider)
+            {
+                return new SocketsHttpHandler()
+                {
+                    AutomaticDecompression = DecompressionMethods.All,
+                    RequestHeaderEncodingSelector = (_, _) => Encoding.UTF8
+                };
+            }
 
             services.AddHttpClient(NamedClient.Default, c =>
                 {
@@ -105,7 +112,7 @@ namespace Jellyfin.Server
                     c.DefaultRequestHeaders.Accept.Add(acceptXmlHeader);
                     c.DefaultRequestHeaders.Accept.Add(acceptAnyHeader);
                 })
-                .ConfigurePrimaryHttpMessageHandler(eyeballsHttpClientHandlerDelegate);
+                .ConfigurePrimaryHttpMessageHandler(CreateEyeballsHttpClientHandler);
 
             services.AddHttpClient(NamedClient.MusicBrainz, c =>
                 {
@@ -114,7 +121,7 @@ namespace Jellyfin.Server
                     c.DefaultRequestHeaders.Accept.Add(acceptXmlHeader);
                     c.DefaultRequestHeaders.Accept.Add(acceptAnyHeader);
                 })
-                .ConfigurePrimaryHttpMessageHandler(eyeballsHttpClientHandlerDelegate);
+                .ConfigurePrimaryHttpMessageHandler(CreateEyeballsHttpClientHandler);
 
             services.AddHttpClient(NamedClient.DirectIp, c =>
                 {
@@ -123,7 +130,7 @@ namespace Jellyfin.Server
                     c.DefaultRequestHeaders.Accept.Add(acceptXmlHeader);
                     c.DefaultRequestHeaders.Accept.Add(acceptAnyHeader);
                 })
-                .ConfigurePrimaryHttpMessageHandler(defaultHttpClientHandlerDelegate);
+                .ConfigurePrimaryHttpMessageHandler(CreateDefaultHttpClientHandler);
 
             services.AddHealthChecks()
                 .AddCheck<DbContextFactoryHealthCheck<JellyfinDbContext>>(nameof(JellyfinDbContext));
@@ -168,6 +175,8 @@ namespace Jellyfin.Server
 
                 mainApp.UseWebSockets();
 
+                mainApp.UseWebSocketAuthentication();
+
                 mainApp.UseResponseCompression();
 
                 mainApp.UseCors();

Jellyfin.Server/scripts/Linux/Weekly-Performance-Monitor.sh

@@ -0,0 +1,407 @@
+#!/bin/bash
+#
+# SYNOPSIS
+#   Automated weekly performance monitoring for Jellyfin PostgreSQL database
+#
+# DESCRIPTION
+#   This script:
+#   1. Runs comprehensive diagnostics
+#   2. Analyzes slow queries
+#   3. Tracks index usage over time
+#   4. Generates weekly performance reports
+#   5. Optionally runs VACUUM ANALYZE on tables with high dead tuples
+#   6. Can be scheduled via cron
+#
+# USAGE
+#   ./Weekly-Performance-Monitor.sh [OPTIONS]
+#
+# OPTIONS
+#   -o, --output-directory DIR      Directory to save reports (default: reports/weekly)
+#   -e, --email-report              If specified, emails the report (requires email configuration)
+#   -c, --compare-with-previous     Compare current stats with previous week
+#   -a, --auto-vacuum-analyze       Enable auto vacuum analyze
+#   --dead-tuple-threshold NUM      Minimum dead tuples to trigger vacuum (default: 100)
+#   --dead-tuple-percent-threshold NUM Minimum dead tuple percentage to trigger vacuum (default: 0.02)
+#
+# EXAMPLE
+#   ./Weekly-Performance-Monitor.sh
+#   ./Weekly-Performance-Monitor.sh -o "/reports/jellyfin" -c
+#   ./Weekly-Performance-Monitor.sh -a --dead-tuple-threshold 10000 --dead-tuple-percent-threshold 20
+#
+# CRON JOB EXAMPLE
+#   # Run every Monday at 6am
+#   0 6 * * 1 /path/to/Weekly-Performance-Monitor.sh -a
+#
+
+# ============================================================================
+# Default Configuration
+# ============================================================================
+OUTPUT_DIRECTORY="reports/weekly"
+EMAIL_REPORT=false
+COMPARE_WITH_PREVIOUS=false
+AUTO_VACUUM_ANALYZE=false
+DEAD_TUPLE_THRESHOLD=100
+DEAD_TUPLE_PERCENT_THRESHOLD=0.02
+
+# ============================================================================
+# Helper Functions
+# ============================================================================
+
+# Color definitions
+CYAN='\033[0;36m'
+GREEN='\033[0;32m'
+YELLOW='\033[1;33m'
+RED='\033[0;31m'
+GRAY='\033[0;90m'
+NC='\033[0m' # No Color
+
+write_color_output() {
+    local message="$1"
+    local color="$2"
+    echo -e "${color}${message}${NC}"
+}
+
+get_report_timestamp() {
+    date +"%Y-%m-%d_%H%M%S"
+}
+
+get_week_number() {
+    date +%V
+}
+
+# ============================================================================
+# Script Argument Parsing
+# ============================================================================
+while [[ "$#" -gt 0 ]]; do
+    case $1 in
+        -o|--output-directory) OUTPUT_DIRECTORY="$2"; shift ;;
+        -e|--email-report) EMAIL_REPORT=true ;;
+        -c|--compare-with-previous) COMPARE_WITH_PREVIOUS=true ;;
+        -a|--auto-vacuum-analyze) AUTO_VACUUM_ANALYZE=true ;;
+        --dead-tuple-threshold) DEAD_TUPLE_THRESHOLD="$2"; shift ;;
+        --dead-tuple-percent-threshold) DEAD_TUPLE_PERCENT_THRESHOLD="$2"; shift ;;
+        *) write_color_output "Unknown parameter passed: $1" "$RED"; exit 1 ;;
+    esac
+    shift
+done
+
+# ============================================================================
+# Configuration
+# ============================================================================
+
+set -e # Exit on error
+SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
+PROJECT_ROOT="$(cd "$SCRIPT_DIR/../../.." && pwd)"
+SQL_DIR="$PROJECT_ROOT/scripts/sql"
+
+# Load database configuration
+source "./db-config.sh"
+
+# ============================================================================
+# Functions
+# ============================================================================
+
+test_database_connection() {
+    write_color_output "\nTesting database connection..." "$CYAN"
+
+    if PGPASSWORD=$DB_PASS $PSQL_PATH -h $DB_HOST -p $DB_PORT -U $DB_USER -d $DB_NAME -c "SELECT version();" > /dev/null 2>&1; then
+        write_color_output "[OK] Database connection successful" "$GREEN"
+        return 0
+    else
+        write_color_output "[ERROR] Database connection failed" "$RED"
+        return 1
+    fi
+}
+
+invoke_diagnostic_report() {
+    local output_file="$1"
+    write_color_output "\nRunning comprehensive diagnostics..." "$CYAN"
+
+    run_sql_files_from_dir "$SQL_DIR/diagnostics" "$output_file"
+
+    if [ $? -eq 0 ]; then
+        write_color_output "[OK] Diagnostics completed: $output_file" "$GREEN"
+    else
+        write_color_output "[WARN] Diagnostics completed with warnings" "$YELLOW"
+    fi
+}
+
+get_index_usage_stats() {
+    local output_file="$1"
+    write_color_output "\nGathering index usage statistics..." "$CYAN"
+
+    local query="
+SELECT
+    schemaname,
+    relname AS tablename,
+    indexrelname,
+    idx_scan,
+    idx_tup_read,
+    idx_tup_fetch,
+    pg_size_pretty(pg_relation_size(indexrelid)) AS index_size
+FROM pg_stat_user_indexes
+WHERE schemaname IN ('library', 'users', 'authentication', 'displaypreferences', 'activitylog')
+ORDER BY schemaname, relname, idx_scan DESC;
+"
+
+    if PGPASSWORD=$DB_PASS $PSQL_PATH -h $DB_HOST -p $DB_PORT -U $DB_USER -d $DB_NAME -c "$query" > "$output_file" 2>&1; then
+        write_color_output "[OK] Index stats gathered: $output_file" "$GREEN"
+    else
+        write_color_output "[WARN] Index stats completed with warnings" "$YELLOW"
+    fi
+}
+
+get_table_size_stats() {
+    local output_file="$1"
+    write_color_output "\nGathering table size statistics..." "$CYAN"
+
+    local query="
+SELECT
+    schemaname,
+    relname,
+    pg_size_pretty(pg_total_relation_size(schemaname||'.'||relname)) AS total_size,
+    pg_size_pretty(pg_relation_size(schemaname||'.'||relname)) AS table_size,
+    pg_size_pretty(pg_total_relation_size(schemaname||'.'||relname) - pg_relation_size(schemaname||'.'||relname)) AS index_size,
+    n_live_tup AS row_count,
+    n_dead_tup AS dead_rows,
+    ROUND(100.0 * n_dead_tup / NULLIF(n_live_tup, 0), 2) AS dead_pct
+FROM pg_stat_user_tables
+WHERE schemaname IN ('library', 'users', 'authentication', 'displaypreferences', 'activitylog')
+ORDER BY pg_total_relation_size(schemaname||'.'||relname) DESC;
+"
+
+    if PGPASSWORD=$DB_PASS $PSQL_PATH -h $DB_HOST -p $DB_PORT -U $DB_USER -d $DB_NAME -c "$query" > "$output_file" 2>&1; then
+        write_color_output "[OK] Table size stats gathered: $output_file" "$GREEN"
+    else
+        write_color_output "[WARN] Table size stats completed with warnings" "$YELLOW"
+    fi
+}
+
+invoke_conditional_vacuum_analyze() {
+    local min_dead_tuples="$1"
+    local min_dead_percent="$2"
+
+    write_color_output "\nChecking for tables that need VACUUM ANALYZE..." "$CYAN"
+    write_color_output "Thresholds: dead tuples >= $min_dead_tuples and dead percent >= $min_dead_percent" "$GRAY"
+
+    local table_query="
+SELECT
+    format('%I.%I', schemaname, relname) AS qualified_table,
+    n_dead_tup,
+    ROUND(100.0 * n_dead_tup / NULLIF(n_live_tup, 0), 2) AS dead_pct
+FROM pg_stat_user_tables
+WHERE schemaname IN ('library', 'users', 'authentication', 'displaypreferences', 'activitylog')
+  AND n_live_tup > 0
+  AND n_dead_tup >= $min_dead_tuples
+  AND (100.0 * n_dead_tup / NULLIF(n_live_tup, 0)) >= $min_dead_percent
+ORDER BY n_dead_tup DESC;
+"
+
+    tables=$(PGPASSWORD=$DB_PASS $PSQL_PATH -h $DB_HOST -p $DB_PORT -U $DB_USER -d $DB_NAME -t -A -F "|" -c "$table_query")
+
+    if [ -z "$tables" ]; then
+        write_color_output "[OK] No tables exceeded dead tuple thresholds" "$GREEN"
+        return
+    fi
+
+    write_color_output "Found $(echo "$tables" | wc -l) table(s) requiring VACUUM ANALYZE" "$YELLOW"
+
+    while IFS= read -r line; do
+        qualified_table=$(echo "$line" | cut -d'|' -f1)
+        dead_tuples=$(echo "$line" | cut -d'|' -f2)
+        dead_percent=$(echo "$line" | cut -d'|' -f3)
+
+        write_color_output "Running VACUUM ANALYZE on $qualified_table (dead tuples: $dead_tuples, dead percent: $dead_percent)" "$CYAN"
+
+        if PGPASSWORD=$DB_PASS $PSQL_PATH -h $DB_HOST -p $DB_PORT -U $DB_USER -d $DB_NAME -c "VACUUM (ANALYZE, VERBOSE) $qualified_table;"; then
+            write_color_output "[OK] VACUUM ANALYZE completed for $qualified_table" "$GREEN"
+        else
+            write_color_output "[ERROR] VACUUM ANALYZE failed for $qualified_table" "$RED"
+        fi
+    done <<< "$tables"
+}
+
+compare_with_previous() {
+    local current_report="$1"
+    local output_dir="$2"
+
+    write_color_output "\nComparing with previous week's report..." "$CYAN"
+
+    previous_report=$(find "$output_dir" -name "diagnostics_*.txt" ! -name "$(basename "$current_report")" -printf '%T@ %p\n' | sort -n | tail -1 | cut -d' ' -f2-)
+
+    if [ -z "$previous_report" ]; then
+        write_color_output "[WARN] No previous reports found for comparison" "$YELLOW"
+        return
+    fi
+
+    write_color_output "Comparing with: $(basename "$previous_report")" "$CYAN"
+
+    # TODO: Add detailed comparison logic
+    write_color_output "[OK] Comparison data available" "$GREEN"
+    write_color_output "   Current:  $current_report" "$GRAY"
+    write_color_output "   Previous: $previous_report" "$GRAY"
+}
+
+new_summary_report() {
+    local output_dir="$1"
+    local timestamp="$2"
+
+    write_color_output "\nGenerating summary report..." "$CYAN"
+
+    local summary_file="$output_dir/summary_$timestamp.txt"
+
+    cat > "$summary_file" <<EOF
+================================================================================
+JELLYFIN DATABASE WEEKLY PERFORMANCE SUMMARY
+================================================================================
+Report Date: $(date +"%Y-%m-%d %H:%M:%S")
+Database: $DB_NAME at $DB_HOST
+Week Number: $(get_week_number)
+================================================================================
+
+REPORTS GENERATED:
+ * diagnostics_$timestamp.txt           : Full diagnostic report
+ * index_usage_$timestamp.txt           : Index usage statistics
+ * table_sizes_$timestamp.txt           : Table size and bloat info
+ * summary_$timestamp.txt               : This summary
+
+================================================================================
+QUICK HEALTH CHECK:
+================================================================================
+
+To view critical issues check diagnostics file for:
+ * Section 5: TABLES WITH HIGH SEQUENTIAL SCANS
+ * Section 8: UNUSED OR RARELY USED INDEXES
+ * Section 10: SLOWEST QUERIES
+
+To identify slow queries check query_analysis file for:
+ * Section 2: TOP 20 SLOWEST QUERIES (by max execution time)
+ * Section 5: BASEITEMS TABLE QUERIES ANALYSIS
+
+================================================================================
+RECOMMENDED ACTIONS:
+================================================================================
+
+ * Review slow queries taking longer than 10 seconds
+ * Check if new indexes are being utilized
+ * Look for tables with many sequential scans
+ * Monitor cache hit ratio (should be above 95 percent)
+ * Check for tables with high dead tuples percentage (need VACUUM)
+
+================================================================================
+AUTOMATION SETUP:
+================================================================================
+
+To schedule this script weekly, add the following to your crontab:
+0 6 * * 1 /path/to/$(basename "$0")
+
+================================================================================
+NEXT REPORT: $(date -d "+7 days" +"%Y-%m-%d")
+================================================================================
+EOF
+
+    write_color_output "[OK] Summary generated: $summary_file" "$GREEN"
+}
+
+# ============================================================================
+# Helper Functions
+# ============================================================================
+
+run_sql_files_from_dir() {
+    local sql_dir="$1"
+    local output_file="$2"
+    
+    if [ ! -d "$sql_dir" ]; then
+        write_color_output "[ERROR] Directory not found: $sql_dir" "$RED"
+        return 1
+    fi
+
+    # Clear the output file before running scripts
+    > "$output_file"
+
+    for sql_file in "$sql_dir"/*.sql; do
+        echo -e "\n---\n-- Executing: $(basename "$sql_file")\n---\n" >> "$output_file"
+        write_color_output "Running SQL file: $(basename "$sql_file")" "$CYAN"
+        if PGPASSWORD=$DB_PASS $PSQL_PATH -h $DB_HOST -p $DB_PORT -U $DB_USER -d $DB_NAME -f "$sql_file" >> "$output_file" 2>&1; then
+            write_color_output "[OK] Successfully executed $(basename "$sql_file")" "$GREEN"
+        else
+            write_color_output "[WARN] Completed with warnings: $(basename "$sql_file")" "$YELLOW"
+        fi
+    done
+}
+
+# ============================================================================
+# Main Execution
+# ============================================================================
+
+write_color_output "\n${CYAN}========================================${NC}"
+write_color_output "Jellyfin Database Weekly Monitor" "$CYAN"
+write_color_output "========================================${NC}"
+write_color_output "Database: $DB_NAME" "$YELLOW"
+write_color_output "Host: $DB_HOST" "$YELLOW"
+write_color_output "Week: $(get_week_number)" "$YELLOW"
+write_color_output "Date: $(date +'%Y-%m-%d %H:%M:%S')" "$YELLOW"
+write_color_output "========================================\n${NC}"
+
+# Create output directory
+report_dir="./$OUTPUT_DIRECTORY"
+mkdir -p "$report_dir"
+write_color_output "Created report directory: $report_dir" "$GREEN"
+
+# Generate timestamp for this run
+timestamp=$(get_report_timestamp)
+
+# Test connection
+if ! test_database_connection; then
+    write_color_output "\n[ERROR] Cannot connect to database. Exiting." "$RED"
+    exit 1
+fi
+
+# Run diagnostics
+diagnostics_file="$report_dir/diagnostics_$timestamp.txt"
+invoke_diagnostic_report "$diagnostics_file"
+
+# Gather index usage stats
+index_usage_file="$report_dir/index_usage_$timestamp.txt"
+get_index_usage_stats "$index_usage_file"
+
+# Gather table size stats
+table_sizes_file="$report_dir/table_sizes_$timestamp.txt"
+get_table_size_stats "$table_sizes_file"
+
+# Optionally vacuum/analyze tables
+if [ "$AUTO_VACUUM_ANALYZE" = true ]; then
+    invoke_conditional_vacuum_analyze "$DEAD_TUPLE_THRESHOLD" "$DEAD_TUPLE_PERCENT_THRESHOLD"
+fi
+
+# Compare with previous week
+if [ "$COMPARE_WITH_PREVIOUS" = true ]; then
+    compare_with_previous "$diagnostics_file" "$report_dir"
+fi
+
+# Generate summary
+new_summary_report "$report_dir" "$timestamp"
+
+# Cleanup old reports (keep last 12 weeks)
+write_color_output "\nCleaning up old reports (keeping last 12 weeks)..." "$CYAN"
+find "$report_dir" -type f -mtime +84 -delete
+write_color_output "[OK] Cleanup complete" "$GREEN"
+
+write_color_output "\n${GREEN}========================================${NC}"
+write_color_output "[OK] WEEKLY MONITORING COMPLETE" "$GREEN"
+write_color_output "========================================${NC}"
+write_color_output "Reports saved to: $report_dir" "$YELLOW"
+write_color_output "Summary: summary_$timestamp.txt" "$YELLOW"
+write_color_output "\nNext steps:" "$CYAN"
+write_color_output "1. Review summary_$timestamp.txt" "$NC"
+write_color_output "2. Check for critical issues in diagnostics report" "$NC"
+write_color_output "3. Analyze slow queries in query_analysis report" "$NC"
+write_color_output "========================================\n${NC}"
+
+# Email report if requested
+if [ "$EMAIL_REPORT" = true ]; then
+    write_color_output "[WARN] Email functionality not yet implemented" "$YELLOW"
+    write_color_output "   Configure a mail client like 'mail' or 'sendmail'" "$GRAY"
+fi
+
+exit 0

Jellyfin.Server/scripts/Linux/db-config.sh

@@ -0,0 +1,78 @@
+#!/bin/bash
+# Database Configuration
+# Edit this file to change which database commands run against
+
+# Database connection settings
+PSQL_PATH="/usr/bin/psql"
+DB_USER="jellyfin"
+DB_NAME="jellyfin_test2"  # ← Change this to switch databases
+DB_HOST="192.168.129.253"
+DB_PORT="6432"
+
+# Export for use in other scripts
+export PSQL_PATH
+export DB_USER
+export DB_NAME
+export DB_HOST
+export DB_PORT
+
+# Helper function to run psql commands
+invoke_psql() {
+    local query=""
+    local file=""
+    local output_file=""
+
+    while [[ $# -gt 0 ]]; do
+        case "$1" in
+            -q|--query)
+                query="$2"
+                shift 2
+                ;;
+            -f|--file)
+                file="$2"
+                shift 2
+                ;;
+            -o|--output-file)
+                output_file="$2"
+                shift 2
+                ;;
+            *)
+                echo "Unknown option: $1"
+                return 1
+                ;;
+        esac
+    done
+
+    local base_cmd="$PSQL_PATH -h $DB_HOST -p $DB_PORT -U $DB_USER -d $DB_NAME"
+    local cmd=""
+
+    if [ -n "$file" ]; then
+        cmd="$base_cmd -f \"$file\""
+    elif [ -n "$query" ]; then
+        cmd="$base_cmd -c \"$query\""
+    else
+        echo "Must provide either --query or --file parameter"
+        return 1
+    fi
+
+    if [ -n "$output_file" ]; then
+        cmd+=" > \"$output_file\""
+    fi
+
+    echo -e "\e[36mConnecting to: $DB_NAME@$DB_HOST as $DB_USER\e[0m"
+    eval "$cmd"
+}
+
+# Display current configuration
+echo -e "\e[36m========================================\e[0m"
+echo -e "\e[36mDatabase Configuration Loaded\e[0m"
+echo -e "\e[36m========================================\e[0m"
+echo -e "\e[33mDatabase: $DB_NAME\e[0m"
+echo -e "\e[33mUser: $DB_USER\e[0m"
+echo -e "\e[33mHost: $DB_HOST\e[0m"
+echo -e "\e[33mPort: $DB_PORT\e[0m"
+echo -e "\e[36m========================================\e[0m"
+echo ""
+echo -e "\e[90mTo change database, edit: db-config.sh\e[0m"
+echo -e "\e[90mThen run: source db-config.sh\e[0m"
+echo ""

Jellyfin.Server/scripts/windows/Setup-Weekly-Monitor.ps1

@@ -0,0 +1,237 @@
+#Requires -Version 5.1
+#Requires -RunAsAdministrator
+
+<#
+.SYNOPSIS
+    Sets up automated weekly performance monitoring via Windows Task Scheduler
+
+.DESCRIPTION
+    Creates a scheduled task to run Weekly-Performance-Monitor.ps1 every Monday at 6 AM.
+    Can optionally enable conditional VACUUM ANALYZE based on dead tuple thresholds.
+
+.PARAMETER Uninstall
+    Remove the scheduled task
+
+.PARAMETER TaskTime
+    Time to run the task (default: 6am)
+
+.PARAMETER DayOfWeek
+    Day of week to run (default: Monday)
+
+.PARAMETER EnableAutoVacuumAnalyze
+    Enable conditional VACUUM ANALYZE for tables above dead tuple thresholds
+
+.PARAMETER DeadTupleThreshold
+    Minimum dead tuples before VACUUM ANALYZE runs (default: 10000)
+
+.PARAMETER DeadTuplePercentThreshold
+    Minimum dead tuple percentage before VACUUM ANALYZE runs (default: 20)
+
+.EXAMPLE
+    .\Setup-Weekly-Monitor.ps1
+    
+.EXAMPLE
+    .\Setup-Weekly-Monitor.ps1 -TaskTime "3am" -DayOfWeek Sunday
+
+.EXAMPLE
+    .\Setup-Weekly-Monitor.ps1 -EnableAutoVacuumAnalyze -DeadTupleThreshold 10000 -DeadTuplePercentThreshold 20
+
+.EXAMPLE
+    .\Setup-Weekly-Monitor.ps1 -Uninstall
+#>
+
+[CmdletBinding()]
+param (
+    [Parameter()]
+    [switch]$Uninstall,
+
+    [Parameter()]
+    [string]$TaskTime = "6am",
+
+    [Parameter()]
+    [ValidateSet('Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday')]
+    [string]$DayOfWeek = 'Monday',
+
+    [Parameter()]
+    [switch]$EnableAutoVacuumAnalyze,
+
+    [Parameter()]
+    [ValidateRange(1, [int]::MaxValue)]
+    [int]$DeadTupleThreshold = 10000,
+
+    [Parameter()]
+    [ValidateRange(0.01, 100.0)]
+    [double]$DeadTuplePercentThreshold = 20.0
+)
+
+$ErrorActionPreference = "Stop"
+
+$TaskName = "Jellyfin Database Weekly Monitor"
+$ScriptRoot = Split-Path -Parent $PSCommandPath
+$MonitorScript = Join-Path $ScriptRoot "Weekly-Performance-Monitor.ps1"
+
+# ============================================================================
+# Functions
+# ============================================================================
+
+function Write-ColorOutput {
+    param(
+        [string]$Message,
+        [ConsoleColor]$Color = 'White'
+    )
+    Write-Host $Message -ForegroundColor $Color
+}
+
+function Test-IsAdmin {
+    $currentPrincipal = New-Object Security.Principal.WindowsPrincipal([Security.Principal.WindowsIdentity]::GetCurrent())
+    return $currentPrincipal.IsInRole([Security.Principal.WindowsBuiltInRole]::Administrator)
+}
+
+# ============================================================================
+# Main
+# ============================================================================
+
+Write-ColorOutput "`n========================================" -Color Cyan
+Write-ColorOutput "Jellyfin DB Monitor Setup" -Color Cyan
+Write-ColorOutput "========================================`n" -Color Cyan
+
+# Check if running as administrator
+if (-not (Test-IsAdmin)) {
+    Write-ColorOutput "❌ This script must be run as Administrator" -Color Red
+    Write-ColorOutput "   Right-click PowerShell and select 'Run as Administrator'" -Color Yellow
+    exit 1
+}
+
+# Uninstall if requested
+if ($Uninstall) {
+    Write-ColorOutput "Removing scheduled task..." -Color Yellow
+    
+    $task = Get-ScheduledTask -TaskName $TaskName -ErrorAction SilentlyContinue
+    
+    if ($task) {
+        Unregister-ScheduledTask -TaskName $TaskName -Confirm:$false
+        Write-ColorOutput "✅ Scheduled task removed successfully" -Color Green
+    } else {
+        Write-ColorOutput "⚠️ Scheduled task not found" -Color Yellow
+    }
+    
+    exit 0
+}
+
+# Check if monitor script exists
+if (-not (Test-Path $MonitorScript)) {
+    Write-ColorOutput "❌ Monitor script not found: $MonitorScript" -Color Red
+    exit 1
+}
+
+Write-ColorOutput "Configuration:" -Color Cyan
+Write-ColorOutput "  Task Name: $TaskName" -Color White
+Write-ColorOutput "  Script: $MonitorScript" -Color White
+Write-ColorOutput "  Schedule: Every $DayOfWeek at $TaskTime" -Color White
+if ($EnableAutoVacuumAnalyze) {
+    Write-ColorOutput "  Auto VACUUM ANALYZE: Enabled (dead tuples >= $DeadTupleThreshold, dead percent >= $DeadTuplePercentThreshold)" -Color White
+} else {
+    Write-ColorOutput "  Auto VACUUM ANALYZE: Disabled" -Color White
+}
+Write-ColorOutput ""
+
+# Remove existing task if present
+$existingTask = Get-ScheduledTask -TaskName $TaskName -ErrorAction SilentlyContinue
+if ($existingTask) {
+    Write-ColorOutput "⚠️ Existing task found. Removing..." -Color Yellow
+    Unregister-ScheduledTask -TaskName $TaskName -Confirm:$false
+}
+
+# Create scheduled task action
+Write-ColorOutput "Creating scheduled task..." -Color Cyan
+
+$scriptArguments = "-NoProfile -ExecutionPolicy Bypass -File `"$MonitorScript`""
+if ($EnableAutoVacuumAnalyze) {
+    $scriptArguments += " -AutoVacuumAnalyze -DeadTupleThreshold $DeadTupleThreshold -DeadTuplePercentThreshold $DeadTuplePercentThreshold"
+}
+
+$action = New-ScheduledTaskAction `
+    -Execute "PowerShell.exe" `
+    -Argument $scriptArguments
+
+# Create trigger
+$trigger = New-ScheduledTaskTrigger `
+    -Weekly `
+    -DaysOfWeek $DayOfWeek `
+    -At $TaskTime
+
+# Task settings
+$settings = New-ScheduledTaskSettingsSet `
+    -AllowStartIfOnBatteries `
+    -DontStopIfGoingOnBatteries `
+    -StartWhenAvailable `
+    -RunOnlyIfNetworkAvailable `
+    -ExecutionTimeLimit (New-TimeSpan -Hours 2)
+
+# Task principal (run as current user)
+$principal = New-ScheduledTaskPrincipal `
+    -UserId $env:USERNAME `
+    -LogonType S4U `
+    -RunLevel Highest
+
+# Register the task
+try {
+    Register-ScheduledTask `
+        -TaskName $TaskName `
+        -Action $action `
+        -Trigger $trigger `
+        -Settings $settings `
+        -Principal $principal `
+        -Description "Automated weekly performance monitoring for Jellyfin PostgreSQL database" | Out-Null
+    
+    Write-ColorOutput "✅ Scheduled task created successfully!" -Color Green
+    Write-ColorOutput ""
+    
+    # Verify task
+    $task = Get-ScheduledTask -TaskName $TaskName
+    $nextRun = $task.Triggers[0].StartBoundary
+    
+    Write-ColorOutput "Task Details:" -Color Cyan
+    Write-ColorOutput "  Status: $($task.State)" -Color White
+    Write-ColorOutput "  Next Run: $nextRun" -Color White
+    Write-ColorOutput ""
+    
+    # Test run option
+    Write-ColorOutput "Would you like to test the task now? (y/n): " -Color Yellow -NoNewline
+    $response = Read-Host
+    
+    if ($response -eq 'y' -or $response -eq 'Y') {
+        Write-ColorOutput "`nRunning test..." -Color Cyan
+        Start-ScheduledTask -TaskName $TaskName
+        Start-Sleep -Seconds 2
+        
+        $taskInfo = Get-ScheduledTask -TaskName $TaskName | Get-ScheduledTaskInfo
+        Write-ColorOutput "Last Run Time: $($taskInfo.LastRunTime)" -Color White
+        Write-ColorOutput "Last Result: $($taskInfo.LastTaskResult)" -Color White
+        
+        if ($taskInfo.LastTaskResult -eq 0) {
+            Write-ColorOutput "✅ Test run completed successfully!" -Color Green
+        } else {
+            Write-ColorOutput "⚠️ Test run completed with code: $($taskInfo.LastTaskResult)" -Color Yellow
+        }
+    }
+    
+} catch {
+    Write-ColorOutput "❌ Failed to create scheduled task: $_" -Color Red
+    exit 1
+}
+
+Write-ColorOutput "`n========================================" -Color Green
+Write-ColorOutput "Setup Complete!" -Color Green
+Write-ColorOutput "========================================" -Color Green
+Write-ColorOutput ""
+Write-ColorOutput "Monitoring is now automated!" -Color Cyan
+Write-ColorOutput ""
+Write-ColorOutput "To manage the task:" -Color White
+Write-ColorOutput "  View: Get-ScheduledTask -TaskName '$TaskName'" -Color Gray
+Write-ColorOutput "  Run now: Start-ScheduledTask -TaskName '$TaskName'" -Color Gray
+Write-ColorOutput "  Disable: Disable-ScheduledTask -TaskName '$TaskName'" -Color Gray
+Write-ColorOutput "  Remove: .\Setup-Weekly-Monitor.ps1 -Uninstall" -Color Gray
+Write-ColorOutput ""
+Write-ColorOutput "Reports will be saved to: reports\weekly" -Color Yellow
+Write-ColorOutput "========================================`n" -Color Green

Jellyfin.Server/scripts/windows/Weekly-Performance-Monitor.ps1

@@ -0,0 +1,483 @@
+#Requires -Version 5.1
+
+<#
+.SYNOPSIS
+    Automated weekly performance monitoring for Jellyfin PostgreSQL database
+
+.DESCRIPTION
+    This script:
+    1. Runs comprehensive diagnostics
+    2. Analyzes slow queries
+    3. Tracks index usage over time
+    4. Generates weekly performance reports
+    5. Optionally runs VACUUM ANALYZE on tables with high dead tuples
+    6. Can be scheduled via Task Scheduler
+
+.PARAMETER OutputDirectory
+    Directory to save reports (default: reports/weekly)
+
+.PARAMETER EmailReport
+    If specified, emails the report (requires email configuration)
+
+.PARAMETER CompareWithPrevious
+    Compare current stats with previous week
+
+.EXAMPLE
+    .\Weekly-Performance-Monitor.ps1
+    
+.EXAMPLE
+    .\Weekly-Performance-Monitor.ps1 -OutputDirectory "C:\Reports\Jellyfin" -CompareWithPrevious
+
+.EXAMPLE
+    .\Weekly-Performance-Monitor.ps1 -AutoVacuumAnalyze -DeadTupleThreshold 10000 -DeadTuplePercentThreshold 20
+
+.EXAMPLE
+    # Schedule weekly via Task Scheduler
+    $action = New-ScheduledTaskAction -Execute "PowerShell.exe" -Argument "-File C:\Path\To\Weekly-Performance-Monitor.ps1"
+    $trigger = New-ScheduledTaskTrigger -Weekly -DaysOfWeek Monday -At 6am
+    Register-ScheduledTask -TaskName "Jellyfin DB Monitor" -Action $action -Trigger $trigger
+
+.NOTES
+    Author: Generated for Jellyfin PostgreSQL Project
+    Date: 2026-03-05
+#>
+
+[CmdletBinding()]
+param (
+    [Parameter()]
+    [string]$OutputDirectory = "reports\weekly",
+
+    [Parameter()]
+    [switch]$EmailReport,
+
+    [Parameter()]
+    [switch]$CompareWithPrevious,
+
+    [Parameter()]
+    [switch]$AutoVacuumAnalyze,
+
+    [Parameter()]
+    [ValidateRange(1, [int]::MaxValue)]
+    [int]$DeadTupleThreshold = 100,
+
+    [Parameter()]
+    [ValidateRange(0.01, 100.0)]
+    [double]$DeadTuplePercentThreshold = 0.02
+)
+
+# ============================================================================
+# Configuration
+# ============================================================================
+
+$ErrorActionPreference = "Stop"
+$ScriptRoot = Split-Path -Parent $PSCommandPath
+$ProjectRoot = Split-Path -Parent $ScriptRoot
+
+# Load database configuration
+. "$ProjectRoot\scripts\db-config.ps1"
+
+# ============================================================================
+# Functions
+# ============================================================================
+
+function Write-ColorOutput {
+    param(
+        [string]$Message,
+        [ConsoleColor]$Color = 'White'
+    )
+    Write-Host $Message -ForegroundColor $Color
+}
+
+function Get-ReportTimestamp {
+    return Get-Date -Format "yyyy-MM-dd_HHmmss"
+}
+
+function Get-WeekNumber {
+    $date = Get-Date
+    $culture = [System.Globalization.CultureInfo]::CurrentCulture
+    return $culture.Calendar.GetWeekOfYear($date, 
+        [System.Globalization.CalendarWeekRule]::FirstDay, 
+        [DayOfWeek]::Monday)
+}
+
+function Test-DatabaseConnection {
+    Write-ColorOutput "`nTesting database connection..." -Color Cyan
+    
+    try {
+        $result = & $PSQL_PATH -h $DB_HOST -p $DB_PORT -U $DB_USER -d $DB_NAME -c "SELECT version();" 2>&1
+        
+        if ($LASTEXITCODE -eq 0) {
+            Write-ColorOutput "[OK] Database connection successful" -Color Green
+            return $true
+        } else {
+            Write-ColorOutput "[ERROR] Database connection failed: $result" -Color Red
+            return $false
+        }
+    } catch {
+        Write-ColorOutput "[ERROR] Database connection error: $_" -Color Red
+        return $false
+    }
+}
+
+function Invoke-DiagnosticReport {
+    param([string]$OutputFile)
+    
+    Write-ColorOutput "`nRunning comprehensive diagnostics..." -Color Cyan
+    
+    try {
+        & $PSQL_PATH -h $DB_HOST -p $DB_PORT -U $DB_USER -d $DB_NAME -f "$ProjectRoot\sql\diagnostics.sql" > $OutputFile 2>&1
+        
+        if ($LASTEXITCODE -eq 0) {
+            Write-ColorOutput "[OK] Diagnostics completed: $OutputFile" -Color Green
+            return $true
+        } else {
+            Write-ColorOutput "[WARN] Diagnostics completed with warnings" -Color Yellow
+            return $true
+        }
+    } catch {
+        Write-ColorOutput "[ERROR] Diagnostics failed: $_" -Color Red
+        return $false
+    }
+}
+
+function Invoke-QueryAnalysis {
+    param([string]$OutputFile)
+    
+    Write-ColorOutput "`nAnalyzing slow queries..." -Color Cyan
+    
+    try {
+        & $PSQL_PATH -h $DB_HOST -p $DB_PORT -U $DB_USER -d $DB_NAME -f "$ProjectRoot\sql\query-analysis.sql" > $OutputFile 2>&1
+        
+        if ($LASTEXITCODE -eq 0) {
+            Write-ColorOutput "[OK] Query analysis completed: $OutputFile" -Color Green
+            return $true
+        } else {
+            Write-ColorOutput "[WARN] Query analysis completed with warnings" -Color Yellow
+            return $true
+        }
+    } catch {
+        Write-ColorOutput "[ERROR] Query analysis failed: $_" -Color Red
+        return $false
+    }
+}
+
+function Get-IndexUsageStats {
+    param([string]$OutputFile)
+    
+    Write-ColorOutput "`nGathering index usage statistics..." -Color Cyan
+    
+    $query = @"
+SELECT 
+    schemaname,
+    relname AS tablename,
+    indexrelname,
+    idx_scan,
+    idx_tup_read,
+    idx_tup_fetch,
+    pg_size_pretty(pg_relation_size(indexrelid)) AS index_size
+FROM pg_stat_user_indexes
+WHERE schemaname IN ('library', 'users', 'authentication', 'displaypreferences', 'activitylog')
+ORDER BY schemaname, relname, idx_scan DESC;
+"@
+
+    try {
+        & $PSQL_PATH -h $DB_HOST -p $DB_PORT -U $DB_USER -d $DB_NAME -c $query > $OutputFile 2>&1
+        
+        if ($LASTEXITCODE -eq 0) {
+            Write-ColorOutput "[OK] Index stats gathered: $OutputFile" -Color Green
+            return $true
+        } else {
+            Write-ColorOutput "[WARN] Index stats completed with warnings" -Color Yellow
+            return $true
+        }
+    } catch {
+        Write-ColorOutput "[ERROR] Index stats failed: $_" -Color Red
+        return $false
+    }
+}
+
+function Get-TableSizeStats {
+    param([string]$OutputFile)
+    
+    Write-ColorOutput "`nGathering table size statistics..." -Color Cyan
+    
+    $query = @"
+SELECT 
+    schemaname,
+    relname,
+    pg_size_pretty(pg_total_relation_size(schemaname||'.'||relname)) AS total_size,
+    pg_size_pretty(pg_relation_size(schemaname||'.'||relname)) AS table_size,
+    pg_size_pretty(pg_total_relation_size(schemaname||'.'||relname) - pg_relation_size(schemaname||'.'||relname)) AS index_size,
+    n_live_tup AS row_count,
+    n_dead_tup AS dead_rows,
+    ROUND(100.0 * n_dead_tup / NULLIF(n_live_tup, 0), 2) AS dead_pct
+FROM pg_stat_user_tables
+WHERE schemaname IN ('library', 'users', 'authentication', 'displaypreferences', 'activitylog')
+ORDER BY pg_total_relation_size(schemaname||'.'||relname) DESC;
+"@
+
+    try {
+        & $PSQL_PATH -h $DB_HOST -p $DB_PORT -U $DB_USER -d $DB_NAME -c $query > $OutputFile 2>&1
+        
+        if ($LASTEXITCODE -eq 0) {
+            Write-ColorOutput "[OK] Table size stats gathered: $OutputFile" -Color Green
+            return $true
+        } else {
+            Write-ColorOutput "[WARN] Table size stats completed with warnings" -Color Yellow
+            return $true
+        }
+    } catch {
+        Write-ColorOutput "[ERROR] Table size stats failed: $_" -Color Red
+        return $false
+    }
+}
+
+function Invoke-ConditionalVacuumAnalyze {
+    param(
+        [int]$MinDeadTuples,
+        [double]$MinDeadPercent
+    )
+
+    Write-ColorOutput "`nChecking for tables that need VACUUM ANALYZE..." -Color Cyan
+    Write-ColorOutput "Thresholds: dead tuples >= $MinDeadTuples and dead percent >= $MinDeadPercent" -Color Gray
+
+    $tableQuery = @"
+SELECT
+    format('%I.%I', schemaname, relname) AS qualified_table,
+    n_dead_tup,
+    ROUND(100.0 * n_dead_tup / NULLIF(n_live_tup, 0), 2) AS dead_pct
+FROM pg_stat_user_tables
+WHERE schemaname IN ('library', 'users', 'authentication', 'displaypreferences', 'activitylog')
+  AND n_live_tup > 0
+  AND n_dead_tup >= $MinDeadTuples
+  AND (100.0 * n_dead_tup / NULLIF(n_live_tup, 0)) >= $MinDeadPercent
+ORDER BY n_dead_tup DESC;
+"@
+
+    try {
+        $tables = & $PSQL_PATH -h $DB_HOST -p $DB_PORT -U $DB_USER -d $DB_NAME -t -A -F "|" -c $tableQuery 2>&1
+        if ($LASTEXITCODE -ne 0) {
+            Write-ColorOutput "[ERROR] Failed to evaluate dead tuple thresholds: $tables" -Color Red
+            return $false
+        }
+
+        $tableLines = @($tables | Where-Object { -not [string]::IsNullOrWhiteSpace($_) })
+        if ($tableLines.Count -eq 0) {
+            Write-ColorOutput "[OK] No tables exceeded dead tuple thresholds" -Color Green
+            return $true
+        }
+
+        Write-ColorOutput "Found $($tableLines.Count) table(s) requiring VACUUM ANALYZE" -Color Yellow
+
+        foreach ($line in $tableLines) {
+            $parts = $line -split "\|", 3
+            $qualifiedTable = $parts[0].Trim()
+            $deadTuples = if ($parts.Count -ge 2) { $parts[1].Trim() } else { "unknown" }
+            $deadPercent = if ($parts.Count -ge 3) { $parts[2].Trim() } else { "unknown" }
+
+            Write-ColorOutput "Running VACUUM ANALYZE on $qualifiedTable (dead tuples: $deadTuples, dead percent: $deadPercent)" -Color Cyan
+
+            $vacuumResult = & $PSQL_PATH -h $DB_HOST -p $DB_PORT -U $DB_USER -d $DB_NAME -c "VACUUM (ANALYZE, VERBOSE) $qualifiedTable;" 2>&1
+            if ($LASTEXITCODE -ne 0) {
+                Write-ColorOutput "[ERROR] VACUUM ANALYZE failed for $qualifiedTable : $vacuumResult" -Color Red
+                return $false
+            }
+
+            Write-ColorOutput "[OK] VACUUM ANALYZE completed for $qualifiedTable" -Color Green
+        }
+
+        return $true
+    } catch {
+        Write-ColorOutput "[ERROR] Conditional VACUUM ANALYZE failed: $_" -Color Red
+        return $false
+    }
+}
+
+function Compare-WithPrevious {
+    param(
+        [string]$CurrentReport,
+        [string]$OutputDirectory
+    )
+    
+    Write-ColorOutput "`nComparing with previous week's report..." -Color Cyan
+    
+    # Find most recent previous report
+    $previousReports = Get-ChildItem "$OutputDirectory\diagnostics_*.txt" -ErrorAction SilentlyContinue |
+        Where-Object { $_.Name -ne (Split-Path $CurrentReport -Leaf) } |
+        Sort-Object LastWriteTime -Descending
+    
+    if ($previousReports.Count -eq 0) {
+        Write-ColorOutput "[WARN] No previous reports found for comparison" -Color Yellow
+        return
+    }
+    
+    $previousReport = $previousReports[0].FullName
+    Write-ColorOutput "Comparing with: $($previousReports[0].Name)" -Color Cyan
+    
+    # TODO: Add detailed comparison logic
+    # For now, just note that both reports exist
+    Write-ColorOutput "[OK] Comparison data available" -Color Green
+    Write-ColorOutput "   Current:  $CurrentReport" -Color Gray
+    Write-ColorOutput "   Previous: $previousReport" -Color Gray
+}
+
+function New-SummaryReport {
+    param(
+        [string]$OutputDirectory,
+        [string]$Timestamp
+    )
+    
+    Write-ColorOutput "`nGenerating summary report..." -Color Cyan
+    
+    $summaryFile = Join-Path $OutputDirectory "summary_$Timestamp.txt"
+    
+    $summary = @"
+================================================================================
+JELLYFIN DATABASE WEEKLY PERFORMANCE SUMMARY
+================================================================================
+Report Date: $(Get-Date -Format "yyyy-MM-dd HH:mm:ss")
+Database: $DB_NAME at $DB_HOST
+Week Number: $(Get-WeekNumber)
+================================================================================
+
+REPORTS GENERATED:
+ * diagnostics_$Timestamp.txt           : Full diagnostic report
+ * query_analysis_$Timestamp.txt        : Slow query analysis
+ * index_usage_$Timestamp.txt           : Index usage statistics
+ * table_sizes_$Timestamp.txt           : Table size and bloat info
+ * summary_$Timestamp.txt               : This summary
+
+================================================================================
+QUICK HEALTH CHECK:
+================================================================================
+
+To view critical issues check diagnostics file for:
+ * Section 5: TABLES WITH HIGH SEQUENTIAL SCANS
+ * Section 8: UNUSED OR RARELY USED INDEXES
+ * Section 10: SLOWEST QUERIES
+
+To identify slow queries check query_analysis file for:
+ * Section 2: TOP 20 SLOWEST QUERIES (by max execution time)
+ * Section 5: BASEITEMS TABLE QUERIES ANALYSIS
+
+================================================================================
+RECOMMENDED ACTIONS:
+================================================================================
+
+ * Review slow queries taking longer than 10 seconds
+ * Check if new indexes are being utilized
+ * Look for tables with many sequential scans
+ * Monitor cache hit ratio (should be above 95 percent)
+ * Check for tables with high dead tuples percentage (need VACUUM)
+
+================================================================================
+AUTOMATION SETUP:
+================================================================================
+
+To schedule this script weekly via Task Scheduler run Setup-Weekly-Monitor.ps1
+as Administrator. This will create a scheduled task to run every Monday at 6am.
+
+To disable the scheduled task run Setup-Weekly-Monitor.ps1 with -Uninstall flag.
+
+================================================================================
+NEXT REPORT: $(Get-Date).AddDays(7).ToString("yyyy-MM-dd")
+================================================================================
+"@
+
+    $summary | Out-File -FilePath $summaryFile -Encoding UTF8
+    Write-ColorOutput "[OK] Summary generated: $summaryFile" -Color Green
+}
+
+# ============================================================================
+# Main Execution
+# ============================================================================
+
+Write-ColorOutput "`n========================================" -Color Cyan
+Write-ColorOutput "Jellyfin Database Weekly Monitor" -Color Cyan
+Write-ColorOutput "========================================" -Color Cyan
+Write-ColorOutput "Database: $DB_NAME" -Color Yellow
+Write-ColorOutput "Host: $DB_HOST" -Color Yellow
+Write-ColorOutput "Week: $(Get-WeekNumber)" -Color Yellow
+Write-ColorOutput "Date: $(Get-Date -Format 'yyyy-MM-dd HH:mm:ss')" -Color Yellow
+Write-ColorOutput "========================================`n" -Color Cyan
+
+# Create output directory
+$reportDir = Join-Path $ProjectRoot $OutputDirectory
+if (-not (Test-Path $reportDir)) {
+    New-Item -ItemType Directory -Path $reportDir -Force | Out-Null
+    Write-ColorOutput "Created report directory: $reportDir" -Color Green
+}
+
+# Generate timestamp for this run
+$timestamp = Get-ReportTimestamp
+
+# Test connection
+if (-not (Test-DatabaseConnection)) {
+    Write-ColorOutput "`n[ERROR] Cannot connect to database. Exiting." -Color Red
+    exit 1
+}
+
+# Run diagnostics
+$diagnosticsFile = Join-Path $reportDir "diagnostics_$timestamp.txt"
+$success = Invoke-DiagnosticReport -OutputFile $diagnosticsFile
+
+if (-not $success) {
+    Write-ColorOutput "`n[WARN] Some reports failed. Check output directory." -Color Yellow
+}
+
+# Run query analysis
+$queryAnalysisFile = Join-Path $reportDir "query_analysis_$timestamp.txt"
+Invoke-QueryAnalysis -OutputFile $queryAnalysisFile | Out-Null
+
+# Gather index usage stats
+$indexUsageFile = Join-Path $reportDir "index_usage_$timestamp.txt"
+Get-IndexUsageStats -OutputFile $indexUsageFile | Out-Null
+
+# Gather table size stats
+$tableSizesFile = Join-Path $reportDir "table_sizes_$timestamp.txt"
+Get-TableSizeStats -OutputFile $tableSizesFile | Out-Null
+
+# Optionally vacuum/analyze tables that exceed dead tuple thresholds
+if ($AutoVacuumAnalyze) {
+    $vacuumSuccess = Invoke-ConditionalVacuumAnalyze `
+        -MinDeadTuples $DeadTupleThreshold `
+        -MinDeadPercent $DeadTuplePercentThreshold
+
+    if (-not $vacuumSuccess) {
+        Write-ColorOutput "[WARN] Conditional VACUUM ANALYZE encountered errors" -Color Yellow
+    }
+}
+
+# Compare with previous week if requested
+if ($CompareWithPrevious) {
+    Compare-WithPrevious -CurrentReport $diagnosticsFile -OutputDirectory $reportDir
+}
+
+# Generate summary
+New-SummaryReport -OutputDirectory $reportDir -Timestamp $timestamp
+
+# Cleanup old reports (keep last 12 weeks)
+Write-ColorOutput "`nCleaning up old reports (keeping last 12 weeks)..." -Color Cyan
+Get-ChildItem $reportDir -File | 
+    Where-Object { $_.LastWriteTime -lt (Get-Date).AddDays(-84) } |
+    Remove-Item -Force
+Write-ColorOutput "[OK] Cleanup complete" -Color Green
+
+Write-ColorOutput "`n========================================" -Color Green
+Write-ColorOutput "[OK] WEEKLY MONITORING COMPLETE" -Color Green
+Write-ColorOutput "========================================" -Color Green
+Write-ColorOutput "Reports saved to: $reportDir" -Color Yellow
+Write-ColorOutput "Summary: summary_$timestamp.txt" -Color Yellow
+Write-ColorOutput "`nNext steps:" -Color Cyan
+Write-ColorOutput "1. Review summary_$timestamp.txt" -Color White
+Write-ColorOutput "2. Check for critical issues in diagnostics report" -Color White
+Write-ColorOutput "3. Analyze slow queries in query_analysis report" -Color White
+Write-ColorOutput "========================================`n" -Color Green
+
+# Email report if requested (placeholder)
+if ($EmailReport) {
+    Write-ColorOutput "[WARN] Email functionality not yet implemented" -Color Yellow
+    Write-ColorOutput "   Configure Send-MailMessage with your SMTP settings" -Color Gray
+}
+
+exit 0

Jellyfin.Server/scripts/windows/db-config.ps1

@@ -0,0 +1,57 @@
+# Database Configuration
+# Edit this file to change which database commands run against
+
+# Database connection settings
+$PSQL_PATH = "C:\Program Files\PostgreSQL\18\bin\psql.exe"
+$DB_USER = "jellyfin"
+$DB_NAME = "jellyfin_test2"  # ← Change this to switch databases
+$DB_HOST = "192.168.129.253"
+$DB_PORT = "6432"
+
+# Export for use in other scripts
+$global:PSQL_PATH = $PSQL_PATH
+$global:DB_USER = $DB_USER
+$global:DB_NAME = $DB_NAME
+$global:DB_HOST = $DB_HOST
+$global:DB_PORT = $DB_PORT
+
+# Helper function to run psql commands
+function Invoke-PSQL {
+    param(
+        [string]$Query,
+        [string]$File,
+        [string]$OutputFile
+    )
+
+    $baseCmd = "& `"$PSQL_PATH`" -h $DB_HOST -p $DB_PORT -U $DB_USER -d $DB_NAME"
+
+    if ($File) {
+        $cmd = "$baseCmd -f `"$File`""
+    } elseif ($Query) {
+        $cmd = "$baseCmd -c `"$Query`""
+    } else {
+        Write-Error "Must provide either -Query or -File parameter"
+        return
+    }
+
+    if ($OutputFile) {
+        $cmd += " > `"$OutputFile`""
+    }
+
+    Write-Host "Connecting to: $DB_NAME@$DB_HOST as $DB_USER" -ForegroundColor Cyan
+    Invoke-Expression $cmd
+}
+
+# Display current configuration
+Write-Host "========================================" -ForegroundColor Cyan
+Write-Host "Database Configuration Loaded" -ForegroundColor Cyan
+Write-Host "========================================" -ForegroundColor Cyan
+Write-Host "Database: $DB_NAME" -ForegroundColor Yellow
+Write-Host "User: $DB_USER" -ForegroundColor Yellow
+Write-Host "Host: $DB_HOST" -ForegroundColor Yellow
+Write-Host "Port: $DB_PORT" -ForegroundColor Yellow
+Write-Host "========================================" -ForegroundColor Cyan
+Write-Host ""
+Write-Host "To change database, edit: db-config.ps1" -ForegroundColor Gray
+Write-Host "Then run: . .\db-config.ps1" -ForegroundColor Gray
+Write-Host ""

Jellyfin.Server/sql/diagnostics.sql

@@ -1,363 +0,0 @@
--- PostgreSQL Performance Diagnostics for Jellyfin
--- Run this to diagnose current performance issues
-
-\timing on
-\x auto
-
-\echo '========================================='
-\echo 'Jellyfin PostgreSQL Performance Report'
-\echo '========================================='
-\echo ''
-
--- ============================================================================
--- 1. Connection Pool Status
--- ============================================================================
-
-\echo '1. CONNECTION POOL STATUS'
-\echo '-----------------------------------------'
-
-SELECT 
-    count(*) as total_connections,
-    count(*) FILTER (WHERE state = 'active') as active,
-    count(*) FILTER (WHERE state = 'idle') as idle,
-    count(*) FILTER (WHERE state = 'idle in transaction') as idle_in_transaction,
-    count(*) FILTER (WHERE state = 'idle in transaction (aborted)') as aborted,
-    count(*) FILTER (WHERE wait_event_type IS NOT NULL) as waiting
-FROM pg_stat_activity 
-WHERE datname = 'jellyfin';
-
-\echo ''
-
--- ============================================================================
--- 2. Long-Running Queries
--- ============================================================================
-
-\echo '2. LONG-RUNNING QUERIES (>1 second)'
-\echo '-----------------------------------------'
-
-SELECT 
-    pid,
-    usename,
-    application_name,
-    now() - query_start as duration,
-    state,
-    wait_event_type,
-    wait_event,
-    left(query, 100) as query_preview
-FROM pg_stat_activity
-WHERE datname = 'jellyfin' 
-  AND state != 'idle' 
-  AND query_start < now() - interval '1 second'
-ORDER BY duration DESC
-LIMIT 10;
-
-\echo ''
-
--- ============================================================================
--- 3. Table Sizes
--- ============================================================================
-
-\echo '3. TABLE SIZES (Top 10)'
-\echo '-----------------------------------------'
-
-SELECT 
-    s.schemaname,
-    s.relname as tablename,
-    pg_size_pretty(pg_total_relation_size(s.schemaname||'.'||s.relname)) AS total_size,
-    pg_size_pretty(pg_relation_size(s.schemaname||'.'||s.relname)) AS table_size,
-    pg_size_pretty(pg_total_relation_size(s.schemaname||'.'||s.relname) - pg_relation_size(s.schemaname||'.'||s.relname)) AS index_size,
-    s.n_live_tup as row_count
-FROM pg_stat_user_tables s
-WHERE s.schemaname IN ('library', 'users', 'authentication', 'displaypreferences', 'activitylog')
-ORDER BY pg_total_relation_size(s.schemaname||'.'||s.relname) DESC
-LIMIT 10;
-
-\echo ''
-
--- ============================================================================
--- 4. Index Usage Statistics
--- ============================================================================
-
-\echo '4. INDEX USAGE (Tables with low index usage)'
-\echo '-----------------------------------------'
-
-SELECT 
-    schemaname,
-    relname as tablename,
-    seq_scan,
-    idx_scan,
-    n_live_tup as rows,
-    CASE 
-        WHEN seq_scan + idx_scan > 0 
-        THEN round(idx_scan::numeric / (seq_scan + idx_scan) * 100, 2)
-        ELSE 0 
-    END as index_usage_percent
-FROM pg_stat_user_tables
-WHERE schemaname IN ('library', 'users', 'authentication', 'displaypreferences', 'activitylog')
-  AND n_live_tup > 100
-ORDER BY 
-    CASE 
-        WHEN seq_scan + idx_scan > 0 
-        THEN idx_scan::numeric / (seq_scan + idx_scan)
-        ELSE 0 
-    END ASC
-LIMIT 10;
-
-\echo ''
-
--- ============================================================================
--- 5. Missing Indexes (High Sequential Scans)
--- ============================================================================
-
-\echo '5. TABLES WITH HIGH SEQUENTIAL SCANS'
-\echo '-----------------------------------------'
-
-SELECT 
-    schemaname,
-    relname as tablename,
-    seq_scan,
-    seq_tup_read,
-    idx_scan,
-    n_live_tup,
-    CASE 
-        WHEN seq_scan > 0 
-        THEN seq_tup_read / seq_scan 
-        ELSE 0 
-    END as avg_rows_per_seq_scan
-FROM pg_stat_user_tables
-WHERE schemaname IN ('library', 'users', 'authentication', 'displaypreferences', 'activitylog')
-  AND seq_scan > 100
-  AND seq_tup_read > 10000
-ORDER BY seq_tup_read DESC
-LIMIT 10;
-
-\echo ''
-
--- ============================================================================
--- 6. Table Bloat (Dead Tuples)
--- ============================================================================
-
-\echo '6. TABLE BLOAT (Dead Tuples)'
-\echo '-----------------------------------------'
-
-SELECT 
-    schemaname,
-    relname as tablename,
-    n_dead_tup as dead_tuples,
-    n_live_tup as live_tuples,
-    CASE 
-        WHEN n_live_tup > 0 
-        THEN round(n_dead_tup::numeric / n_live_tup * 100, 2)
-        ELSE 0 
-    END as dead_tuple_percent,
-    last_vacuum,
-    last_autovacuum,
-    last_analyze,
-    last_autoanalyze
-FROM pg_stat_user_tables
-WHERE schemaname IN ('library', 'users', 'authentication', 'displaypreferences', 'activitylog')
-  AND n_dead_tup > 100
-ORDER BY n_dead_tup DESC
-LIMIT 10;
-
-\echo ''
-
--- ============================================================================
--- 7. Cache Hit Ratio
--- ============================================================================
-
-\echo '7. CACHE HIT RATIO (Should be >95%)'
-\echo '-----------------------------------------'
-
-SELECT 
-    'Buffer Cache Hit Ratio' as metric,
-    round(
-        sum(blks_hit) / nullif(sum(blks_hit) + sum(blks_read), 0) * 100,
-        2
-    ) as hit_ratio_percent
-FROM pg_stat_database
-WHERE datname = 'jellyfin';
-
-\echo ''
-
--- ============================================================================
--- 8. Index Efficiency
--- ============================================================================
-
-\echo '8. UNUSED OR RARELY USED INDEXES'
-\echo '-----------------------------------------'
-
-SELECT 
-    schemaname,
-    relname as tablename,
-    indexrelname as indexname,
-    pg_size_pretty(pg_relation_size(indexrelid)) as index_size,
-    idx_scan as times_used,
-    idx_tup_read,
-    idx_tup_fetch
-FROM pg_stat_user_indexes
-WHERE schemaname IN ('library', 'users', 'authentication', 'displaypreferences', 'activitylog')
-  AND idx_scan < 50
-  AND pg_relation_size(indexrelid) > 1000000
-ORDER BY pg_relation_size(indexrelid) DESC
-LIMIT 10;
-
-\echo ''
-
--- ============================================================================
--- 9. Locks
--- ============================================================================
-
-\echo '9. CURRENT LOCKS (Blocked queries)'
-\echo '-----------------------------------------'
-
-SELECT 
-    bl.pid AS blocked_pid,
-    a.usename AS blocked_user,
-    ka.query AS blocking_query,
-    now() - ka.query_start AS blocking_duration,
-    a.query AS blocked_query
-FROM pg_catalog.pg_locks bl
-JOIN pg_catalog.pg_stat_activity a ON bl.pid = a.pid
-JOIN pg_catalog.pg_locks kl ON bl.transactionid = kl.transactionid AND bl.pid != kl.pid
-JOIN pg_catalog.pg_stat_activity ka ON kl.pid = ka.pid
-WHERE NOT bl.granted
-  AND a.datname = 'jellyfin';
-
-\echo ''
-
--- ============================================================================
--- 10. Slow Queries (if pg_stat_statements is enabled)
--- ============================================================================
-
-\echo '10. SLOWEST QUERIES (Requires pg_stat_statements extension)'
-\echo '-----------------------------------------'
-
-DO $$
-BEGIN
-    IF EXISTS (
-        SELECT 1 FROM pg_extension WHERE extname = 'pg_stat_statements'
-    ) THEN
-        RAISE NOTICE 'pg_stat_statements is installed. Showing slow queries...';
-    ELSE
-        RAISE NOTICE 'pg_stat_statements is NOT installed. Run: CREATE EXTENSION pg_stat_statements;';
-    END IF;
-END $$;
-
--- Only run if extension exists (wrapped in DO block to prevent error)
-DO $$
-DECLARE
-    query_rec RECORD;
-BEGIN
-    IF EXISTS (SELECT 1 FROM pg_extension WHERE extname = 'pg_stat_statements') THEN
-        FOR query_rec IN 
-            SELECT 
-                calls,
-                round(mean_exec_time::numeric, 2) as avg_time_ms,
-                round(max_exec_time::numeric, 2) as max_time_ms,
-                round(total_exec_time::numeric, 2) as total_time_ms,
-                round((100 * total_exec_time / sum(total_exec_time) OVER ())::numeric, 2) as percent_total,
-                left(query, 100) as query_preview
-            FROM pg_stat_statements
-            WHERE query NOT LIKE '%pg_stat_statements%'
-              AND query NOT LIKE '%pg_catalog%'
-            ORDER BY mean_exec_time DESC
-            LIMIT 10
-        LOOP
-            RAISE NOTICE 'Calls: %, Avg: %ms, Max: %ms, Total: %ms, Percent: %%', 
-                query_rec.calls, 
-                query_rec.avg_time_ms, 
-                query_rec.max_time_ms, 
-                query_rec.total_time_ms;
-        END LOOP;
-    END IF;
-END $$;
-
-\echo ''
-
--- ============================================================================
--- 11. Database Configuration
--- ============================================================================
-
-\echo '11. KEY POSTGRESQL SETTINGS'
-\echo '-----------------------------------------'
-
-SELECT 
-    name,
-    setting,
-    unit,
-    short_desc
-FROM pg_settings
-WHERE name IN (
-    'max_connections',
-    'shared_buffers',
-    'effective_cache_size',
-    'work_mem',
-    'maintenance_work_mem',
-    'random_page_cost',
-    'effective_io_concurrency',
-    'autovacuum',
-    'checkpoint_completion_target',
-    'wal_buffers',
-    'default_statistics_target'
-)
-ORDER BY name;
-
-\echo ''
-
--- ============================================================================
--- 12. Recommendations
--- ============================================================================
-
-\echo '12. RECOMMENDATIONS'
-\echo '-----------------------------------------'
-
-DO $$
-DECLARE
-    conn_count int;
-    hit_ratio numeric;
-    max_conn int;
-    bloat_tables int;
-BEGIN
-    -- Check connection count
-    SELECT count(*) INTO conn_count
-    FROM pg_stat_activity WHERE datname = 'jellyfin';
-    
-    SELECT setting::int INTO max_conn
-    FROM pg_settings WHERE name = 'max_connections';
-    
-    IF conn_count::numeric / max_conn > 0.8 THEN
-        RAISE WARNING 'High connection usage: % of % max connections', conn_count, max_conn;
-        RAISE NOTICE 'RECOMMENDATION: Increase max_connections in postgresql.conf';
-    END IF;
-    
-    -- Check cache hit ratio
-    SELECT round(
-        sum(blks_hit) / nullif(sum(blks_hit) + sum(blks_read), 0) * 100, 2
-    ) INTO hit_ratio
-    FROM pg_stat_database WHERE datname = 'jellyfin';
-    
-    IF hit_ratio < 95 THEN
-        RAISE WARNING 'Low cache hit ratio: %%. Target: >95%%', hit_ratio;
-        RAISE NOTICE 'RECOMMENDATION: Increase shared_buffers and effective_cache_size';
-    END IF;
-    
-    -- Check bloat
-    SELECT count(*) INTO bloat_tables
-    FROM pg_stat_user_tables
-    WHERE n_dead_tup > 1000
-      AND schemaname IN ('library', 'users', 'authentication');
-    
-    IF bloat_tables > 0 THEN
-        RAISE WARNING 'Found % tables with significant dead tuples', bloat_tables;
-        RAISE NOTICE 'RECOMMENDATION: Run VACUUM ANALYZE or adjust autovacuum settings';
-    END IF;
-    
-    RAISE NOTICE 'Diagnostic report complete.';
-END $$;
-
-\echo ''
-\echo '========================================='
-\echo 'Run sql/performance_indexes.sql to add missing indexes'
-\echo 'See PERFORMANCE_TROUBLESHOOTING.md for detailed fixes'
-\echo '========================================='

Jellyfin.Server/startup.json

@@ -9,6 +9,6 @@
     "CacheDir": "C:/ProgramData/jellyfin/cache",
     "LogDir": "C:/ProgramData/jellyfin/log",
     "TempDir": "C:\\Users\\wjones\\AppData\\Local\\Temp\\jellyfin",
-    "WebDir": "wwwroot"
+    "WebDir": "C:/ProgramData/jellyfin/wwwroot"
   }
 }

Jellyfin.Server/wwwroot/10092.c37bcafcc8eb7c5c080e.chunk.js

@@ -0,0 +1 @@
+(self.webpackChunk=self.webpackChunk||[]).push([[4665,7184,10092,15141,27046,37522,49427,71808,83518],{7184:function(a,e,t){"use strict";t(89336),t(36947),t(95021),t(53819),Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(a){return function(e){var t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{},i=t.width,r=i&&a.matchPatterns[i]||a.matchPatterns[a.defaultMatchWidth],n=e.match(r);if(!n)return null;var l,o=n[0],d=i&&a.parsePatterns[i]||a.parsePatterns[a.defaultParseWidth],u=Array.isArray(d)?function(a){for(var e=0;e<a.length;e++)if(a[e].test(o))return e}(d):function(a){for(var e in a)if(a.hasOwnProperty(e)&&a[e].test(o))return e}(d);return l=a.valueCallback?a.valueCallback(u):u,{value:l=t.valueCallback?t.valueCallback(l):l,rest:e.slice(o.length)}}},a.exports=e.default},10092:function(a,e,t){"use strict";t(36947),t(96054);var i=t(96784).default;Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var r=i(t(7184)),n={ordinalNumber:(0,i(t(83518)).default)({matchPattern:/^(\d+)(º)?/i,parsePattern:/\d+/i,valueCallback:function(a){return parseInt(a,10)}}),era:(0,r.default)({matchPatterns:{narrow:/^(aC|dC)/i,abbreviated:/^(a\.?\s?C\.?|a\.?\s?e\.?\s?v\.?|d\.?\s?C\.?|e\.?\s?v\.?)/i,wide:/^(avanti Cristo|avanti Era Volgare|dopo Cristo|Era Volgare)/i},defaultMatchWidth:"wide",parsePatterns:{any:[/^a/i,/^(d|e)/i]},defaultParseWidth:"any"}),quarter:(0,r.default)({matchPatterns:{narrow:/^[1234]/i,abbreviated:/^t[1234]/i,wide:/^[1234](º)? trimestre/i},defaultMatchWidth:"wide",parsePatterns:{any:[/1/i,/2/i,/3/i,/4/i]},defaultParseWidth:"any",valueCallback:function(a){return a+1}}),month:(0,r.default)({matchPatterns:{narrow:/^[gfmalsond]/i,abbreviated:/^(gen|feb|mar|apr|mag|giu|lug|ago|set|ott|nov|dic)/i,wide:/^(gennaio|febbraio|marzo|aprile|maggio|giugno|luglio|agosto|settembre|ottobre|novembre|dicembre)/i},defaultMatchWidth:"wide",parsePatterns:{narrow:[/^g/i,/^f/i,/^m/i,/^a/i,/^m/i,/^g/i,/^l/i,/^a/i,/^s/i,/^o/i,/^n/i,/^d/i],any:[/^ge/i,/^f/i,/^mar/i,/^ap/i,/^mag/i,/^gi/i,/^l/i,/^ag/i,/^s/i,/^o/i,/^n/i,/^d/i]},defaultParseWidth:"any"}),day:(0,r.default)({matchPatterns:{narrow:/^[dlmgvs]/i,short:/^(do|lu|ma|me|gi|ve|sa)/i,abbreviated:/^(dom|lun|mar|mer|gio|ven|sab)/i,wide:/^(domenica|luned[i|ì]|marted[i|ì]|mercoled[i|ì]|gioved[i|ì]|venerd[i|ì]|sabato)/i},defaultMatchWidth:"wide",parsePatterns:{narrow:[/^d/i,/^l/i,/^m/i,/^m/i,/^g/i,/^v/i,/^s/i],any:[/^d/i,/^l/i,/^ma/i,/^me/i,/^g/i,/^v/i,/^s/i]},defaultParseWidth:"any"}),dayPeriod:(0,r.default)({matchPatterns:{narrow:/^(a|m\.|p|mezzanotte|mezzogiorno|(di|del) (mattina|pomeriggio|sera|notte))/i,any:/^([ap]\.?\s?m\.?|mezzanotte|mezzogiorno|(di|del) (mattina|pomeriggio|sera|notte))/i},defaultMatchWidth:"any",parsePatterns:{any:{am:/^a/i,pm:/^p/i,midnight:/^mezza/i,noon:/^mezzo/i,morning:/mattina/i,afternoon:/pomeriggio/i,evening:/sera/i,night:/notte/i}},defaultParseWidth:"any"})};e.default=n,a.exports=e.default},83518:function(a,e,t){"use strict";t(89336),t(36947),t(95021),t(53819),Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(a){return function(e){var t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{},i=e.match(a.matchPattern);if(!i)return null;var r=i[0],n=e.match(a.parsePattern);if(!n)return null;var l=a.valueCallback?a.valueCallback(n[0]):n[0];return{value:l=t.valueCallback?t.valueCallback(l):l,rest:e.slice(r.length)}}},a.exports=e.default},96784:function(a){a.exports=function(a){return a&&a.__esModule?a:{default:a}},a.exports.__esModule=!0,a.exports.default=a.exports}}]);

Jellyfin.Server/wwwroot/10393.ebea4771b8940214f3ad.chunk.js

@@ -0,0 +1 @@
+"use strict";(self.webpackChunk=self.webpackChunk||[]).push([[10393],{10393:function(o,n,e){e(36947),e(95021),e(93062),Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var t={lessThanXSeconds:{one:{standalone:"manje od 1 sekunde",withPrepositionAgo:"manje od 1 sekunde",withPrepositionIn:"manje od 1 sekundu"},dual:"manje od {{count}} sekunde",other:"manje od {{count}} sekundi"},xSeconds:{one:{standalone:"1 sekunda",withPrepositionAgo:"1 sekunde",withPrepositionIn:"1 sekundu"},dual:"{{count}} sekunde",other:"{{count}} sekundi"},halfAMinute:"pola minute",lessThanXMinutes:{one:{standalone:"manje od 1 minute",withPrepositionAgo:"manje od 1 minute",withPrepositionIn:"manje od 1 minutu"},dual:"manje od {{count}} minute",other:"manje od {{count}} minuta"},xMinutes:{one:{standalone:"1 minuta",withPrepositionAgo:"1 minute",withPrepositionIn:"1 minutu"},dual:"{{count}} minute",other:"{{count}} minuta"},aboutXHours:{one:{standalone:"oko 1 sat",withPrepositionAgo:"oko 1 sat",withPrepositionIn:"oko 1 sat"},dual:"oko {{count}} sata",other:"oko {{count}} sati"},xHours:{one:{standalone:"1 sat",withPrepositionAgo:"1 sat",withPrepositionIn:"1 sat"},dual:"{{count}} sata",other:"{{count}} sati"},xDays:{one:{standalone:"1 dan",withPrepositionAgo:"1 dan",withPrepositionIn:"1 dan"},dual:"{{count}} dana",other:"{{count}} dana"},aboutXWeeks:{one:{standalone:"oko 1 sedmicu",withPrepositionAgo:"oko 1 sedmicu",withPrepositionIn:"oko 1 sedmicu"},dual:"oko {{count}} sedmice",other:"oko {{count}} sedmice"},xWeeks:{one:{standalone:"1 sedmicu",withPrepositionAgo:"1 sedmicu",withPrepositionIn:"1 sedmicu"},dual:"{{count}} sedmice",other:"{{count}} sedmice"},aboutXMonths:{one:{standalone:"oko 1 mjesec",withPrepositionAgo:"oko 1 mjesec",withPrepositionIn:"oko 1 mjesec"},dual:"oko {{count}} mjeseca",other:"oko {{count}} mjeseci"},xMonths:{one:{standalone:"1 mjesec",withPrepositionAgo:"1 mjesec",withPrepositionIn:"1 mjesec"},dual:"{{count}} mjeseca",other:"{{count}} mjeseci"},aboutXYears:{one:{standalone:"oko 1 godinu",withPrepositionAgo:"oko 1 godinu",withPrepositionIn:"oko 1 godinu"},dual:"oko {{count}} godine",other:"oko {{count}} godina"},xYears:{one:{standalone:"1 godina",withPrepositionAgo:"1 godine",withPrepositionIn:"1 godinu"},dual:"{{count}} godine",other:"{{count}} godina"},overXYears:{one:{standalone:"preko 1 godinu",withPrepositionAgo:"preko 1 godinu",withPrepositionIn:"preko 1 godinu"},dual:"preko {{count}} godine",other:"preko {{count}} godina"},almostXYears:{one:{standalone:"gotovo 1 godinu",withPrepositionAgo:"gotovo 1 godinu",withPrepositionIn:"gotovo 1 godinu"},dual:"gotovo {{count}} godine",other:"gotovo {{count}} godina"}};n.default=function(o,n,e){var i,s=t[o];return i="string"==typeof s?s:1===n?null!=e&&e.addSuffix?e.comparison&&e.comparison>0?s.one.withPrepositionIn:s.one.withPrepositionAgo:s.one.standalone:n%10>1&&n%10<5&&"1"!==String(n).substr(-2,1)?s.dual.replace("{{count}}",String(n)):s.other.replace("{{count}}",String(n)),null!=e&&e.addSuffix?e.comparison&&e.comparison>0?"za "+i:"prije "+i:i},o.exports=n.default}}]);

Jellyfin.Server/wwwroot/10455.4a668edb0928c7a2844e.chunk.js

@@ -0,0 +1 @@
+"use strict";(self.webpackChunk=self.webpackChunk||[]).push([[10455],{10455:function(e,t,o){o(36947),o(95021),o(93062),Object.defineProperty(t,"__esModule",{value:!0}),t.default=void 0;var n={lessThanXSeconds:{standalone:{one:"vähem kui üks sekund",other:"vähem kui {{count}} sekundit"},withPreposition:{one:"vähem kui ühe sekundi",other:"vähem kui {{count}} sekundi"}},xSeconds:{standalone:{one:"üks sekund",other:"{{count}} sekundit"},withPreposition:{one:"ühe sekundi",other:"{{count}} sekundi"}},halfAMinute:{standalone:"pool minutit",withPreposition:"poole minuti"},lessThanXMinutes:{standalone:{one:"vähem kui üks minut",other:"vähem kui {{count}} minutit"},withPreposition:{one:"vähem kui ühe minuti",other:"vähem kui {{count}} minuti"}},xMinutes:{standalone:{one:"üks minut",other:"{{count}} minutit"},withPreposition:{one:"ühe minuti",other:"{{count}} minuti"}},aboutXHours:{standalone:{one:"umbes üks tund",other:"umbes {{count}} tundi"},withPreposition:{one:"umbes ühe tunni",other:"umbes {{count}} tunni"}},xHours:{standalone:{one:"üks tund",other:"{{count}} tundi"},withPreposition:{one:"ühe tunni",other:"{{count}} tunni"}},xDays:{standalone:{one:"üks päev",other:"{{count}} päeva"},withPreposition:{one:"ühe päeva",other:"{{count}} päeva"}},aboutXWeeks:{standalone:{one:"umbes üks nädal",other:"umbes {{count}} nädalat"},withPreposition:{one:"umbes ühe nädala",other:"umbes {{count}} nädala"}},xWeeks:{standalone:{one:"üks nädal",other:"{{count}} nädalat"},withPreposition:{one:"ühe nädala",other:"{{count}} nädala"}},aboutXMonths:{standalone:{one:"umbes üks kuu",other:"umbes {{count}} kuud"},withPreposition:{one:"umbes ühe kuu",other:"umbes {{count}} kuu"}},xMonths:{standalone:{one:"üks kuu",other:"{{count}} kuud"},withPreposition:{one:"ühe kuu",other:"{{count}} kuu"}},aboutXYears:{standalone:{one:"umbes üks aasta",other:"umbes {{count}} aastat"},withPreposition:{one:"umbes ühe aasta",other:"umbes {{count}} aasta"}},xYears:{standalone:{one:"üks aasta",other:"{{count}} aastat"},withPreposition:{one:"ühe aasta",other:"{{count}} aasta"}},overXYears:{standalone:{one:"rohkem kui üks aasta",other:"rohkem kui {{count}} aastat"},withPreposition:{one:"rohkem kui ühe aasta",other:"rohkem kui {{count}} aasta"}},almostXYears:{standalone:{one:"peaaegu üks aasta",other:"peaaegu {{count}} aastat"},withPreposition:{one:"peaaegu ühe aasta",other:"peaaegu {{count}} aasta"}}};t.default=function(e,t,o){var a,u=null!=o&&o.addSuffix?n[e].withPreposition:n[e].standalone;return a="string"==typeof u?u:1===t?u.one:u.other.replace("{{count}}",String(t)),null!=o&&o.addSuffix?o.comparison&&o.comparison>0?a+" pärast":a+" eest":a},e.exports=t.default}}]);

Jellyfin.Server/wwwroot/1051.4d2f5a7e0cc6440d5450.chunk.js

@@ -0,0 +1 @@
+(self.webpackChunk=self.webpackChunk||[]).push([[1051,4665,7184,15141,27046,37522,49427,71808,83518],{1051:function(t,a,e){"use strict";e(36947),e(96054);var r=e(96784).default;Object.defineProperty(a,"__esModule",{value:!0}),a.default=void 0;var i=r(e(83518)),n=r(e(7184)),l={ordinalNumber:(0,i.default)({matchPattern:/^(\d+)(th|st|nd|rd)?/i,parsePattern:/\d+/i,valueCallback:function(t){return parseInt(t,10)}}),era:(0,n.default)({matchPatterns:{narrow:/[قب]/,abbreviated:/[قب]\.م\./,wide:/(قبل|بعد) الميلاد/},defaultMatchWidth:"wide",parsePatterns:{any:[/قبل/,/بعد/]},defaultParseWidth:"any"}),quarter:(0,n.default)({matchPatterns:{narrow:/^[1234]/i,abbreviated:/ر[1234]/,wide:/الربع (الأول|الثاني|الثالث|الرابع)/},defaultMatchWidth:"wide",parsePatterns:{any:[/1/i,/2/i,/3/i,/4/i]},defaultParseWidth:"any",valueCallback:function(t){return t+1}}),month:(0,n.default)({matchPatterns:{narrow:/^[جفمأسند]/,abbreviated:/^(جانفي|فيفري|مارس|أفريل|ماي|جوان|جويلية|أوت|سبتمبر|أكتوبر|نوفمبر|ديسمبر)/,wide:/^(جانفي|فيفري|مارس|أفريل|ماي|جوان|جويلية|أوت|سبتمبر|أكتوبر|نوفمبر|ديسمبر)/},defaultMatchWidth:"wide",parsePatterns:{narrow:[/^ج/i,/^ف/i,/^م/i,/^أ/i,/^م/i,/^ج/i,/^ج/i,/^أ/i,/^س/i,/^أ/i,/^ن/i,/^د/i],any:[/^جانفي/i,/^فيفري/i,/^مارس/i,/^أفريل/i,/^ماي/i,/^جوان/i,/^جويلية/i,/^أوت/i,/^سبتمبر/i,/^أكتوبر/i,/^نوفمبر/i,/^ديسمبر/i]},defaultParseWidth:"any"}),day:(0,n.default)({matchPatterns:{narrow:/^[حنثرخجس]/i,short:/^(أحد|اثنين|ثلاثاء|أربعاء|خميس|جمعة|سبت)/i,abbreviated:/^(أحد|اثنين|ثلاثاء|أربعاء|خميس|جمعة|سبت)/i,wide:/^(الأحد|الاثنين|الثلاثاء|الأربعاء|الخميس|الجمعة|السبت)/i},defaultMatchWidth:"wide",parsePatterns:{narrow:[/^ح/i,/^ن/i,/^ث/i,/^ر/i,/^خ/i,/^ج/i,/^س/i],wide:[/^الأحد/i,/^الاثنين/i,/^الثلاثاء/i,/^الأربعاء/i,/^الخميس/i,/^الجمعة/i,/^السبت/i],any:[/^أح/i,/^اث/i,/^ث/i,/^أر/i,/^خ/i,/^ج/i,/^س/i]},defaultParseWidth:"any"}),dayPeriod:(0,n.default)({matchPatterns:{narrow:/^(ص|ع|ن ل|ل|(في|مع) (صباح|قايلة|عشية|ليل))/,any:/^([صع]|نص الليل|قايلة|(في|مع) (صباح|قايلة|عشية|ليل))/},defaultMatchWidth:"any",parsePatterns:{any:{am:/^ص/,pm:/^ع/,midnight:/نص الليل/,noon:/قايلة/,afternoon:/بعد القايلة/,morning:/صباح/,evening:/عشية/,night:/ليل/}},defaultParseWidth:"any"})};a.default=l,t.exports=a.default},7184:function(t,a,e){"use strict";e(89336),e(36947),e(95021),e(53819),Object.defineProperty(a,"__esModule",{value:!0}),a.default=function(t){return function(a){var e=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{},r=e.width,i=r&&t.matchPatterns[r]||t.matchPatterns[t.defaultMatchWidth],n=a.match(i);if(!n)return null;var l,u=n[0],d=r&&t.parsePatterns[r]||t.parsePatterns[t.defaultParseWidth],s=Array.isArray(d)?function(t){for(var a=0;a<t.length;a++)if(t[a].test(u))return a}(d):function(t){for(var a in t)if(t.hasOwnProperty(a)&&t[a].test(u))return a}(d);return l=t.valueCallback?t.valueCallback(s):s,{value:l=e.valueCallback?e.valueCallback(l):l,rest:a.slice(u.length)}}},t.exports=a.default},83518:function(t,a,e){"use strict";e(89336),e(36947),e(95021),e(53819),Object.defineProperty(a,"__esModule",{value:!0}),a.default=function(t){return function(a){var e=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{},r=a.match(t.matchPattern);if(!r)return null;var i=r[0],n=a.match(t.parsePattern);if(!n)return null;var l=t.valueCallback?t.valueCallback(n[0]):n[0];return{value:l=e.valueCallback?e.valueCallback(l):l,rest:a.slice(i.length)}}},t.exports=a.default},96784:function(t){t.exports=function(t){return t&&t.__esModule?t:{default:t}},t.exports.__esModule=!0,t.exports.default=t.exports}}]);

Jellyfin.Server/wwwroot/10540.304a396a5b1390876019.chunk.js

@@ -0,0 +1 @@
+(self.webpackChunk=self.webpackChunk||[]).push([[9387,10540,19863,31768,42244,75101,94160,97482],{10540:function(e,t,n){"use strict";n(94),n(36947);var a=n(96784).default;Object.defineProperty(t,"__esModule",{value:!0}),t.default=void 0;var r=a(n(94160)),i={ordinalNumber:function(e,t){var n=Number(e);switch(String(null==t?void 0:t.unit)){case"year":return"".concat(n,"年");case"quarter":return"第".concat(n,"四半期");case"month":return"".concat(n,"月");case"week":return"第".concat(n,"週");case"date":return"".concat(n,"日");case"hour":return"".concat(n,"時");case"minute":return"".concat(n,"分");case"second":return"".concat(n,"秒");default:return"".concat(n)}},era:(0,r.default)({values:{narrow:["BC","AC"],abbreviated:["紀元前","西暦"],wide:["紀元前","西暦"]},defaultWidth:"wide"}),quarter:(0,r.default)({values:{narrow:["1","2","3","4"],abbreviated:["Q1","Q2","Q3","Q4"],wide:["第1四半期","第2四半期","第3四半期","第4四半期"]},defaultWidth:"wide",argumentCallback:function(e){return Number(e)-1}}),month:(0,r.default)({values:{narrow:["1","2","3","4","5","6","7","8","9","10","11","12"],abbreviated:["1月","2月","3月","4月","5月","6月","7月","8月","9月","10月","11月","12月"],wide:["1月","2月","3月","4月","5月","6月","7月","8月","9月","10月","11月","12月"]},defaultWidth:"wide"}),day:(0,r.default)({values:{narrow:["日","月","火","水","木","金","土"],short:["日","月","火","水","木","金","土"],abbreviated:["日","月","火","水","木","金","土"],wide:["日曜日","月曜日","火曜日","水曜日","木曜日","金曜日","土曜日"]},defaultWidth:"wide"}),dayPeriod:(0,r.default)({values:{narrow:{am:"午前",pm:"午後",midnight:"深夜",noon:"正午",morning:"朝",afternoon:"午後",evening:"夜",night:"深夜"},abbreviated:{am:"午前",pm:"午後",midnight:"深夜",noon:"正午",morning:"朝",afternoon:"午後",evening:"夜",night:"深夜"},wide:{am:"午前",pm:"午後",midnight:"深夜",noon:"正午",morning:"朝",afternoon:"午後",evening:"夜",night:"深夜"}},defaultWidth:"wide",formattingValues:{narrow:{am:"午前",pm:"午後",midnight:"深夜",noon:"正午",morning:"朝",afternoon:"午後",evening:"夜",night:"深夜"},abbreviated:{am:"午前",pm:"午後",midnight:"深夜",noon:"正午",morning:"朝",afternoon:"午後",evening:"夜",night:"深夜"},wide:{am:"午前",pm:"午後",midnight:"深夜",noon:"正午",morning:"朝",afternoon:"午後",evening:"夜",night:"深夜"}},defaultFormattingWidth:"wide"})};t.default=i,e.exports=t.default},94160:function(e,t,n){"use strict";n(44962),n(36947),n(78557),n(82367),Object.defineProperty(t,"__esModule",{value:!0}),t.default=function(e){return function(t,n){var a;if("formatting"===(null!=n&&n.context?String(n.context):"standalone")&&e.formattingValues){var r=e.defaultFormattingWidth||e.defaultWidth,i=null!=n&&n.width?String(n.width):r;a=e.formattingValues[i]||e.formattingValues[r]}else{var o=e.defaultWidth,u=null!=n&&n.width?String(n.width):e.defaultWidth;a=e.values[u]||e.values[o]}return a[e.argumentCallback?e.argumentCallback(t):t]}},e.exports=t.default},96784:function(e){e.exports=function(e){return e&&e.__esModule?e:{default:e}},e.exports.__esModule=!0,e.exports.default=e.exports}}]);

Jellyfin.Server/wwwroot/10807.e1743b7841c6545d31dd.chunk.js

@@ -0,0 +1 @@
+(self.webpackChunk=self.webpackChunk||[]).push([[10807,33188],{10564:function(e){function t(o){return e.exports=t="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e},e.exports.__esModule=!0,e.exports.default=e.exports,t(o)}e.exports=t,e.exports.__esModule=!0,e.exports.default=e.exports},33188:function(e,t,o){"use strict";o(36947),o(78557),o(73687);var n=o(96784).default;Object.defineProperty(t,"__esModule",{value:!0}),t.default=function(e){(0,s.default)(1,arguments);var t=Object.prototype.toString.call(e);return e instanceof Date||"object"===(0,r.default)(e)&&"[object Date]"===t?new Date(e.getTime()):"number"==typeof e||"[object Number]"===t?new Date(e):("string"!=typeof e&&"[object String]"!==t||"undefined"==typeof console||(console.warn("Starting with v2.0.0-beta.1 date-fns doesn't accept strings as date arguments. Please use `parseISO` to parse strings. See: https://github.com/date-fns/date-fns/blob/master/docs/upgradeGuide.md#string-arguments"),console.warn((new Error).stack)),new Date(NaN))};var r=n(o(10564)),s=n(o(23058));e.exports=t.default},96784:function(e){e.exports=function(e){return e&&e.__esModule?e:{default:e}},e.exports.__esModule=!0,e.exports.default=e.exports}}]);

Jellyfin.Server/wwwroot/11061.c6832aa3f616532f40d0.chunk.js

@@ -0,0 +1 @@
+(self.webpackChunk=self.webpackChunk||[]).push([[11061,17486,21933,37658,39867,44314,62248,95105],{11061:function(t,e,d){"use strict";d(36947);var u=d(96784).default;Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var l=u(d(37658)),a={date:(0,l.default)({formats:{full:"EEEE, y. 'gada' d. MMMM",long:"y. 'gada' d. MMMM",medium:"dd.MM.y.",short:"dd.MM.y."},defaultWidth:"full"}),time:(0,l.default)({formats:{full:"HH:mm:ss zzzz",long:"HH:mm:ss z",medium:"HH:mm:ss",short:"HH:mm"},defaultWidth:"full"}),dateTime:(0,l.default)({formats:{full:"{{date}} 'plkst.' {{time}}",long:"{{date}} 'plkst.' {{time}}",medium:"{{date}}, {{time}}",short:"{{date}}, {{time}}"},defaultWidth:"full"})};e.default=a,t.exports=e.default},37658:function(t,e,d){"use strict";d(36947),Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(t){return function(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{},d=e.width?String(e.width):t.defaultWidth;return t.formats[d]||t.formats[t.defaultWidth]}},t.exports=e.default},96784:function(t){t.exports=function(t){return t&&t.__esModule?t:{default:t}},t.exports.__esModule=!0,t.exports.default=t.exports}}]);

Jellyfin.Server/wwwroot/1161.332f1bb195913f384a65.chunk.js

@@ -0,0 +1 @@
+(self.webpackChunk=self.webpackChunk||[]).push([[1161],{1161:function(t,n,e){"use strict";e.d(n,{Q3:function(){return f}}),e(29305),e(32733),e(84701),e(81678),e(2623),e(24776),e(14382),e(69892),e(84734),e(44962),e(89336),e(4754),e(10849),e(58551),e(70389),e(94),e(33087),e(36947),e(36457),e(88908),e(26437),e(83810),e(52697),e(78557),e(96054),e(90076),e(95021),e(73687),e(83994),e(23630),e(82367);var r=e(63696),u=e(28601);function i(t,n){(null==n||n>t.length)&&(n=t.length);for(var e=0,r=Array(n);e<n;e++)r[e]=t[e];return r}function o(t){var n=arguments.length>1&&void 0!==arguments[1]?arguments[1]:500,e=arguments.length>2?arguments[2]:void 0,i=(0,r.useRef)();!function(t){var n=(0,r.useRef)(t);n.current=t,(0,r.useEffect)((function(){return function(){n.current()}}),[])}((function(){i.current&&i.current.cancel()}));var o=(0,r.useMemo)((function(){var r=u(t,n,e),o=function(){return r.apply(void 0,arguments)};return o.cancel=function(){r.cancel()},o.isPending=function(){return!!i.current},o.flush=function(){return r.flush()},o}),[t,n,e]);return(0,r.useEffect)((function(){i.current=u(t,n,e)}),[t,n,e]),o}function f(t,n,e){var u,f,c,a=null!==(u=null==e?void 0:e.equalityFn)&&void 0!==u?u:function(t,n){return t===n},l=t instanceof Function?t():t,s=(f=(0,r.useState)(l),c=2,function(t){if(Array.isArray(t))return t}(f)||function(t,n){var e=null==t?null:"undefined"!=typeof Symbol&&t[Symbol.iterator]||t["@@iterator"];if(null!=e){var r,u,i,o,f=[],c=!0,a=!1;try{if(i=(e=e.call(t)).next,0===n){if(Object(e)!==e)return;c=!1}else for(;!(c=(r=i.call(e)).done)&&(f.push(r.value),f.length!==n);c=!0);}catch(t){a=!0,u=t}finally{try{if(!c&&null!=e.return&&(o=e.return(),Object(o)!==o))return}finally{if(a)throw u}}return f}}(f,c)||function(t,n){if(t){if("string"==typeof t)return i(t,n);var e={}.toString.call(t).slice(8,-1);return"Object"===e&&t.constructor&&(e=t.constructor.name),"Map"===e||"Set"===e?Array.from(t):"Arguments"===e||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(e)?i(t,n):void 0}}(f,c)||function(){throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}()),v=s[0],y=s[1],p=(0,r.useRef)(l),d=o(y,n,e);return a(p.current,l)||(d(l),p.current=l),[v,d]}"undefined"!=typeof window?r.useLayoutEffect:r.useEffect},28601:function(t,n,e){var r=/^\s+|\s+$/g,u=/^[-+]0x[0-9a-f]+$/i,i=/^0b[01]+$/i,o=/^0o[0-7]+$/i,f=parseInt,c="object"==typeof e.g&&e.g&&e.g.Object===Object&&e.g,a="object"==typeof self&&self&&self.Object===Object&&self,l=c||a||Function("return this")(),s=Object.prototype.toString,v=Math.max,y=Math.min,p=function(){return l.Date.now()};function d(t){var n=typeof t;return!!t&&("object"==n||"function"==n)}function b(t){if("number"==typeof t)return t;if(function(t){return"symbol"==typeof t||function(t){return!!t&&"object"==typeof t}(t)&&"[object Symbol]"==s.call(t)}(t))return NaN;if(d(t)){var n="function"==typeof t.valueOf?t.valueOf():t;t=d(n)?n+"":n}if("string"!=typeof t)return 0===t?t:+t;t=t.replace(r,"");var e=i.test(t);return e||o.test(t)?f(t.slice(2),e?2:8):u.test(t)?NaN:+t}t.exports=function(t,n,e){var r,u,i,o,f,c,a=0,l=!1,s=!1,m=!0;if("function"!=typeof t)throw new TypeError("Expected a function");function h(n){var e=r,i=u;return r=u=void 0,a=n,o=t.apply(i,e)}function g(t){var e=t-c;return void 0===c||e>=n||e<0||s&&t-a>=i}function j(){var t=p();if(g(t))return w(t);f=setTimeout(j,function(t){var e=n-(t-c);return s?y(e,i-(t-a)):e}(t))}function w(t){return f=void 0,m&&r?h(t):(r=u=void 0,o)}function O(){var t=p(),e=g(t);if(r=arguments,u=this,c=t,e){if(void 0===f)return function(t){return a=t,f=setTimeout(j,n),l?h(t):o}(c);if(s)return f=setTimeout(j,n),h(c)}return void 0===f&&(f=setTimeout(j,n)),o}return n=b(n)||0,d(e)&&(l=!!e.leading,i=(s="maxWait"in e)?v(b(e.maxWait)||0,n):i,m="trailing"in e?!!e.trailing:m),O.cancel=function(){void 0!==f&&clearTimeout(f),a=0,r=c=u=f=void 0},O.flush=function(){return void 0===f?o:w(p())},O}}}]);

Jellyfin.Server/wwwroot/11762.15524a9c403437ce5301.chunk.js

@@ -0,0 +1 @@
+"use strict";(self.webpackChunk=self.webpackChunk||[]).push([[11762],{11762:function(e,n,o){o(36947),o(95021),o(93062),Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var r={lessThanXSeconds:{one:"minder dan een seconde",other:"minder dan {{count}} seconden"},xSeconds:{one:"1 seconde",other:"{{count}} seconden"},halfAMinute:"een halve minuut",lessThanXMinutes:{one:"minder dan een minuut",other:"minder dan {{count}} minuten"},xMinutes:{one:"een minuut",other:"{{count}} minuten"},aboutXHours:{one:"ongeveer 1 uur",other:"ongeveer {{count}} uur"},xHours:{one:"1 uur",other:"{{count}} uur"},xDays:{one:"1 dag",other:"{{count}} dagen"},aboutXWeeks:{one:"ongeveer 1 week",other:"ongeveer {{count}} weken"},xWeeks:{one:"1 week",other:"{{count}} weken"},aboutXMonths:{one:"ongeveer 1 maand",other:"ongeveer {{count}} maanden"},xMonths:{one:"1 maand",other:"{{count}} maanden"},aboutXYears:{one:"ongeveer 1 jaar",other:"ongeveer {{count}} jaar"},xYears:{one:"1 jaar",other:"{{count}} jaar"},overXYears:{one:"meer dan 1 jaar",other:"meer dan {{count}} jaar"},almostXYears:{one:"bijna 1 jaar",other:"bijna {{count}} jaar"}};n.default=function(e,n,o){var t,a=r[e];return t="string"==typeof a?a:1===n?a.one:a.other.replace("{{count}}",String(n)),null!=o&&o.addSuffix?o.comparison&&o.comparison>0?"over "+t:t+" geleden":t},e.exports=n.default}}]);

Jellyfin.Server/wwwroot/12323.d74b7fd2793b31f58e32.chunk.js

@@ -0,0 +1 @@
+"use strict";(self.webpackChunk=self.webpackChunk||[]).push([[12323],{12323:function(e,t,u){u(36947),Object.defineProperty(t,"__esModule",{value:!0}),t.default=void 0;var n={lastWeek:function(e){var t=e.getUTCDay(),u="'läschte";return 2!==t&&4!==t||(u+="n"),u+"' eeee 'um' p"},yesterday:"'gëschter um' p",today:"'haut um' p",tomorrow:"'moien um' p",nextWeek:"eeee 'um' p",other:"P"};t.default=function(e,t,u,r){var o=n[e];return"function"==typeof o?o(t):o},e.exports=t.default}}]);

Jellyfin.Server/wwwroot/12394.2d9a92cf5ecbf770e406.css

@@ -0,0 +1 @@
+[dir=ltr] .guideProviderSelectListings{margin:0 0 0 .5em}[dir=rtl] .guideProviderSelectListings{margin:0 .5em 0 0}

Jellyfin.Server/wwwroot/12394.623f94449c2a08cd76c0.chunk.js

@@ -0,0 +1 @@
+"use strict";(self.webpackChunk=self.webpackChunk||[]).push([[12394],{12394:function(e,s,u){u.r(s)}}]);

Jellyfin.Server/wwwroot/12519.18f1249ed943c27c3292.chunk.js

@@ -0,0 +1 @@
+"use strict";(self.webpackChunk=self.webpackChunk||[]).push([[12519],{12519:function(a,t,e){e.r(t),e.d(t,{buildChapterCards:function(){return u}}),e(24776),e(14382),e(78557);var n=e(22696),c=e.n(n),r=e(67430),i=e(98320),d=e(76542),o=e(46782),s=e(34789),l=!s.A.slow&&!s.A.edge;function v(a,t,e,n,r,d,o){var s=r.width,l=r.coverImage,v=function(a,t,e,n,c){var r=a.Id,i=t.ImageTag;return i?c.getScaledImageUrl(r,{maxWidth:n,tag:i,type:"Chapter",index:e}):null}(a,e,n,s||400,t),u="cardContent cardContent-shadow cardImageContainer chapterCardImageContainer";l&&(u+=" coveredImage");var p=' data-action="play" data-isfolder="'.concat(a.IsFolder,'" data-id="').concat(a.Id,'" data-serverid="').concat(a.ServerId,'" data-type="').concat(a.Type,'" data-mediatype="').concat(a.MediaType,'" data-positionticks="').concat(e.StartPositionTicks,'"'),h=v?'<div class="'.concat(u,' lazy" data-src="').concat(v,'">'):'<div class="'.concat(u,'">');v||(h+='<span class="material-icons cardImageIcon local_movies" aria-hidden="true"></span>');var C="";return C+='<div class="cardText">'.concat(c()(e.Name),"</div>"),C+='<div class="cardText">'.concat(i.Ay.getDisplayRunningTime(e.StartPositionTicks),"</div>"),'<button type="button" class="'.concat(d,'"').concat(p,'><div class="').concat("cardBox",'"><div class="').concat("cardScalable",'"><div class="cardPadder-').concat(o,'"></div>').concat(h,'</div><div class="innerCardFooter">').concat(C,"</div></div></div></button>")}function u(a,t,e){if(e.parentContainer){if(!document.body.contains(e.parentContainer))return;if(!t.length)return void e.parentContainer.classList.add("hide");e.parentContainer.classList.remove("hide")}var n=function(a,t,e){var n,c="card itemAction chapterCard";o.A.tv&&(c+=" show-focus",l&&(c+=" show-animation"));var i=((null===(n=(a.MediaSources||[])[0])||void 0===n?void 0:n.MediaStreams)||[]).filter((function(a){return"Video"===a.Type}))[0]||{},d=e.backdropShape||"backdrop";i.Width&&i.Height&&i.Width/i.Height<=1.2&&(d=e.squareShape||"square"),c+=" ".concat(d,"Card"),(e.block||e.rows)&&(c+=" block");for(var s="",u=0,p=r.tF.getApiClient(a.ServerId),h=0,C=t.length;h<C;h++)e.rows&&0===u&&(s+='<div class="cardColumn">'),s+=v(a,p,t[h],h,e,c,d),u++,e.rows&&u>=e.rows&&(u=0,s+="</div>");return s}(a,t,e);e.itemsContainer.innerHTML=n,d.default.lazyChildren(e.itemsContainer)}t.default={buildChapterCards:u}}}]);

Jellyfin.Server/wwwroot/12557.58fa22481fa0d2b7ea6f.chunk.js

@@ -0,0 +1 @@
+(self.webpackChunk=self.webpackChunk||[]).push([[12557,17486,21933,37658,39867,44314,62248,95105],{12557:function(t,e,d){"use strict";d(36947);var u=d(96784).default;Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var l=u(d(37658)),a={date:(0,l.default)({formats:{full:"EEEE, MMMM do, y",long:"MMMM do, y",medium:"MMM d, y",short:"MM/dd/yyyy"},defaultWidth:"full"}),time:(0,l.default)({formats:{full:"h:mm:ss a zzzz",long:"h:mm:ss a z",medium:"h:mm:ss a",short:"h:mm a"},defaultWidth:"full"}),dateTime:(0,l.default)({formats:{full:"{{date}} 'عند' {{time}}",long:"{{date}} 'عند' {{time}}",medium:"{{date}}, {{time}}",short:"{{date}}, {{time}}"},defaultWidth:"full"})};e.default=a,t.exports=e.default},37658:function(t,e,d){"use strict";d(36947),Object.defineProperty(e,"__esModule",{value:!0}),e.default=function(t){return function(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{},d=e.width?String(e.width):t.defaultWidth;return t.formats[d]||t.formats[t.defaultWidth]}},t.exports=e.default},96784:function(t){t.exports=function(t){return t&&t.__esModule?t:{default:t}},t.exports.__esModule=!0,t.exports.default=t.exports}}]);