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

2026-05-03 23:36:38 +01:00 · 2026-02-15 10:14:41 +01:00
parent f5c9a4a476 1311f66f72
commit 340bcafd3d
17 changed files with 157 additions and 84 deletions
--- a/.config/dotnet-tools.json
+++ b/.config/dotnet-tools.json
@@ -3,7 +3,7 @@
  "isRoot": true,
  "tools": {
    "dotnet-ef": {
-      "version": "10.0.2",
+      "version": "10.0.3",
      "commands": [
        "dotnet-ef"
      ]
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -1,17 +1,31 @@
 {
    "name": "Development Jellyfin Server",
-    "image": "mcr.microsoft.com/devcontainers/dotnet:9.0-bookworm",
+    "image": "mcr.microsoft.com/devcontainers/dotnet:10.0-noble",
    "service": "app",
    "workspaceFolder": "/workspaces/${localWorkspaceFolderBasename}",
    // restores nuget packages, installs the dotnet workloads and installs the dev https certificate
    "postStartCommand": "sudo dotnet restore; sudo dotnet workload update; sudo dotnet dev-certs https --trust; sudo bash \"./.devcontainer/install-ffmpeg.sh\"",
-    // reads the extensions list and installs them
-    "postAttachCommand": "cat .vscode/extensions.json | jq -r .recommendations[] | xargs -n 1 code --install-extension",
+    // The previous way of installing extensions via the vs command dont work on selfhosted devcontainers
+    "customizations": {
+        "vscode": {
+            "extensions": [
+                "ms-dotnettools.csharp",
+                "editorconfig.editorconfig",
+                "github.vscode-github-actions",
+                "ms-dotnettools.vscode-dotnet-runtime",
+                "ms-dotnettools.csdevkit",
+                "alexcvzz.vscode-sqlite",
+                "streetsidesoftware.code-spell-checker",
+                "eamodio.gitlens",
+                "redhat.vscode-xml"
+            ]
+        }
+    },
    "features": {
        "ghcr.io/devcontainers/features/dotnet:2": {
            "version": "none",
-            "dotnetRuntimeVersions": "9.0",
-            "aspNetCoreRuntimeVersions": "9.0"
+            "dotnetRuntimeVersions": "10.0",
+            "aspNetCoreRuntimeVersions": "10.0"
        },
        "ghcr.io/devcontainers-extra/features/apt-packages:1": {
            "preserve_apt_list": false,
--- a/.github/workflows/ci-codeql-analysis.yml
+++ b/.github/workflows/ci-codeql-analysis.yml
@@ -28,13 +28,13 @@ jobs:
        dotnet-version: '10.0.x'

    - name: Initialize CodeQL
-      uses: github/codeql-action/init@b20883b0cd1f46c72ae0ba6d1090936928f9fa30 # v4.32.0
+      uses: github/codeql-action/init@9e907b5e64f6b83e7804b09294d44122997950d6 # v4.32.3
      with:
        languages: ${{ matrix.language }}
        queries: +security-extended

    - name: Autobuild
-      uses: github/codeql-action/autobuild@b20883b0cd1f46c72ae0ba6d1090936928f9fa30 # v4.32.0
+      uses: github/codeql-action/autobuild@9e907b5e64f6b83e7804b09294d44122997950d6 # v4.32.3

    - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@b20883b0cd1f46c72ae0ba6d1090936928f9fa30 # v4.32.0
+      uses: github/codeql-action/analyze@9e907b5e64f6b83e7804b09294d44122997950d6 # v4.32.3
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@@ -287,3 +287,4 @@
 - [Martin Reuter](https://github.com/reuterma24)
 - [Michael McElroy](https://github.com/mcmcelro)
 - [Soumyadip Auddy](https://github.com/SoumyadipAuddy)
+ - [DerMaddis](https://github.com/dermaddis)
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -4,7 +4,7 @@
  </PropertyGroup>
  <!-- Run "dotnet list package (dash,dash)outdated" to see the latest versions of each package.-->
  <ItemGroup Label="Package Dependencies">
-    <PackageVersion Include="AsyncKeyedLock" Version="8.0.0" />
+    <PackageVersion Include="AsyncKeyedLock" Version="8.0.2" />
    <PackageVersion Include="AutoFixture.AutoMoq" Version="4.18.1" />
    <PackageVersion Include="AutoFixture.Xunit2" Version="4.18.1" />
    <PackageVersion Include="AutoFixture" Version="4.18.1" />
@@ -26,27 +26,27 @@
    <PackageVersion Include="libse" Version="4.0.12" />
    <PackageVersion Include="LrcParser" Version="2025.623.0" />
    <PackageVersion Include="MetaBrainz.MusicBrainz" Version="8.0.1" />
-    <PackageVersion Include="Microsoft.AspNetCore.Authorization" Version="10.0.2" />
-    <PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="10.0.2" />
+    <PackageVersion Include="Microsoft.AspNetCore.Authorization" Version="10.0.3" />
+    <PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="10.0.3" />
    <PackageVersion Include="Microsoft.CodeAnalysis.BannedApiAnalyzers" Version="4.14.0" />
    <PackageVersion Include="Microsoft.CodeAnalysis.Common" Version="5.0.0" />
    <PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="5.0.0" />
    <PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="3.11.0" />
-    <PackageVersion Include="Microsoft.Data.Sqlite" Version="10.0.2" />
-    <PackageVersion Include="Microsoft.EntityFrameworkCore.Design" Version="10.0.2" />
-    <PackageVersion Include="Microsoft.EntityFrameworkCore.Relational" Version="10.0.2" />
-    <PackageVersion Include="Microsoft.EntityFrameworkCore.Sqlite" Version="10.0.2" />
-    <PackageVersion Include="Microsoft.EntityFrameworkCore.Tools" Version="10.0.2" />
-    <PackageVersion Include="Microsoft.Extensions.Caching.Abstractions" Version="10.0.2" />
-    <PackageVersion Include="Microsoft.Extensions.Caching.Memory" Version="10.0.2" />
-    <PackageVersion Include="Microsoft.Extensions.Configuration.Abstractions" Version="10.0.2" />
-    <PackageVersion Include="Microsoft.Extensions.Configuration.Binder" Version="10.0.2" />
-    <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="10.0.2" />
-    <PackageVersion Include="Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore" Version="10.0.2" />
-    <PackageVersion Include="Microsoft.Extensions.Hosting.Abstractions" Version="10.0.2" />
-    <PackageVersion Include="Microsoft.Extensions.Http" Version="10.0.2" />
-    <PackageVersion Include="Microsoft.Extensions.Logging" Version="10.0.2" />
-    <PackageVersion Include="Microsoft.Extensions.Options" Version="10.0.2" />
+    <PackageVersion Include="Microsoft.Data.Sqlite" Version="10.0.3" />
+    <PackageVersion Include="Microsoft.EntityFrameworkCore.Design" Version="10.0.3" />
+    <PackageVersion Include="Microsoft.EntityFrameworkCore.Relational" Version="10.0.3" />
+    <PackageVersion Include="Microsoft.EntityFrameworkCore.Sqlite" Version="10.0.3" />
+    <PackageVersion Include="Microsoft.EntityFrameworkCore.Tools" Version="10.0.3" />
+    <PackageVersion Include="Microsoft.Extensions.Caching.Abstractions" Version="10.0.3" />
+    <PackageVersion Include="Microsoft.Extensions.Caching.Memory" Version="10.0.3" />
+    <PackageVersion Include="Microsoft.Extensions.Configuration.Abstractions" Version="10.0.3" />
+    <PackageVersion Include="Microsoft.Extensions.Configuration.Binder" Version="10.0.3" />
+    <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="10.0.3" />
+    <PackageVersion Include="Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore" Version="10.0.3" />
+    <PackageVersion Include="Microsoft.Extensions.Hosting.Abstractions" Version="10.0.3" />
+    <PackageVersion Include="Microsoft.Extensions.Http" Version="10.0.3" />
+    <PackageVersion Include="Microsoft.Extensions.Logging" Version="10.0.3" />
+    <PackageVersion Include="Microsoft.Extensions.Options" Version="10.0.3" />
    <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" />
@@ -74,12 +74,12 @@
    <PackageVersion Include="SkiaSharp.NativeAssets.Linux" Version="[3.116.1]" />
    <PackageVersion Include="SmartAnalyzers.MultithreadingAnalyzer" Version="1.1.31" />
    <PackageVersion Include="StyleCop.Analyzers" Version="1.2.0-beta.556" />
-    <PackageVersion Include="Svg.Skia" Version="3.2.1" />
+    <PackageVersion Include="Svg.Skia" Version="3.4.1" />
    <PackageVersion Include="Swashbuckle.AspNetCore.ReDoc" Version="6.9.0" />
    <PackageVersion Include="Swashbuckle.AspNetCore" Version="7.3.2" />
-    <PackageVersion Include="System.Text.Json" Version="10.0.2" />
+    <PackageVersion Include="System.Text.Json" Version="10.0.3" />
    <PackageVersion Include="TagLibSharp" Version="2.3.0" />
-    <PackageVersion Include="z440.atl.core" Version="7.10.0" />
+    <PackageVersion Include="z440.atl.core" Version="7.11.0" />
    <PackageVersion Include="TMDbLib" Version="2.3.0" />
    <PackageVersion Include="UTF.Unknown" Version="2.6.0" />
    <PackageVersion Include="Xunit.Priority" Version="1.1.6" />
--- a/Emby.Server.Implementations/Images/BaseDynamicImageProvider.cs
+++ b/Emby.Server.Implementations/Images/BaseDynamicImageProvider.cs
@@ -267,22 +267,24 @@ namespace Emby.Server.Implementations.Images
        {
            var image = item.GetImageInfo(type, 0);

-            if (image is not null)
+            if (image is null)
            {
-                if (!image.IsLocalFile)
-                {
-                    return false;
-                }
+                return GetItemsWithImages(item).Count is not 0;
+            }

-                if (!FileSystem.ContainsSubPath(item.GetInternalMetadataPath(), image.Path))
-                {
-                    return false;
-                }
+            if (!image.IsLocalFile)
+            {
+                return false;
+            }

-                if (!HasChangedByDate(item, image))
-                {
-                    return false;
-                }
+            if (!FileSystem.ContainsSubPath(item.GetInternalMetadataPath(), image.Path))
+            {
+                return false;
+            }
+
+            if (!HasChangedByDate(item, image))
+            {
+                return false;
            }

            return true;
--- a/Emby.Server.Implementations/Localization/Core/be.json
+++ b/Emby.Server.Implementations/Localization/Core/be.json
@@ -3,7 +3,7 @@
    "Playlists": "Плэй-лісты",
    "Latest": "Апошняе",
    "LabelIpAddressValue": "IP-адрас: {0}",
-    "ItemAddedWithName": "{0} даданы ў бібліятэку",
+    "ItemAddedWithName": "{0} дададзены ў бібліятэку",
    "MessageApplicationUpdated": "Сервер Jellyfin абноўлены",
    "NotificationOptionApplicationUpdateInstalled": "Абнаўленне праграмы ўсталявана",
    "PluginInstalledWithName": "{0} быў усталяваны",
@@ -14,7 +14,7 @@
    "Channels": "Каналы",
    "ChapterNameValue": "Раздзел {0}",
    "Collections": "Калекцыі",
-    "Default": "Па змаўчанні",
+    "Default": "Прадвызначана",
    "FailedLoginAttemptWithUserName": "Няўдалая спроба ўваходу з {0}",
    "Folders": "Папкі",
    "Favorites": "Абранае",
@@ -81,8 +81,8 @@
    "NotificationOptionInstallationFailed": "Збой усталёўкі",
    "NewVersionIsAvailable": "Новая версія сервера Jellyfin даступная для cпампоўкі.",
    "NotificationOptionCameraImageUploaded": "Выява камеры запампавана",
-    "NotificationOptionAudioPlaybackStopped": "Прайграванне аўдыё спынена",
-    "NotificationOptionAudioPlayback": "Прайграванне аўдыё пачалося",
+    "NotificationOptionAudioPlaybackStopped": "Прайграванне аўдыя спынена",
+    "NotificationOptionAudioPlayback": "Прайграванне аўдыя пачалося",
    "NotificationOptionNewLibraryContent": "Дададзены новы кантэнт",
    "NotificationOptionPluginError": "Збой плагіна",
    "NotificationOptionPluginUninstalled": "Плагін выдалены",
--- a/Emby.Server.Implementations/Localization/Core/ca.json
+++ b/Emby.Server.Implementations/Localization/Core/ca.json
@@ -104,7 +104,7 @@
    "TaskCleanLogsDescription": "Esborra els registres que tinguin més de {0} dies.",
    "TaskCleanLogs": "Neteja dels registres",
    "TaskRefreshLibraryDescription": "Escaneja les mediateques, a la cerca de fitxers nous i refresca les metadades.",
-    "TaskRefreshLibrary": "Escaneig de les mediateques",
+    "TaskRefreshLibrary": "Escaneja la mediateca",
    "TaskRefreshChapterImagesDescription": "Creació de les miniatures dels vídeos que tinguin capítols.",
    "TaskRefreshChapterImages": "Extracció de les imatges dels capítols",
    "TaskCleanCacheDescription": "Eliminació de la memòria cau no necessària per al servidor.",
--- a/Emby.Server.Implementations/Localization/Core/it.json
+++ b/Emby.Server.Implementations/Localization/Core/it.json
@@ -3,7 +3,7 @@
    "AppDeviceValues": "App: {0}, Dispositivo: {1}",
    "Application": "Applicazione",
    "Artists": "Artisti",
-    "AuthenticationSucceededWithUserName": "{0} autenticato con successo",
+    "AuthenticationSucceededWithUserName": "{0} autenticato correttamente",
    "Books": "Libri",
    "CameraImageUploadedFrom": "È stata caricata una nuova fotografia da {0}",
    "Channels": "Canali",
@@ -11,36 +11,36 @@
    "Collections": "Collezioni",
    "DeviceOfflineWithName": "{0} si è disconnesso",
    "DeviceOnlineWithName": "{0} è connesso",
-    "FailedLoginAttemptWithUserName": "Tentativo di accesso fallito da {0}",
+    "FailedLoginAttemptWithUserName": "Tentativo di accesso non riuscito da {0}",
    "Favorites": "Preferiti",
    "Folders": "Cartelle",
    "Genres": "Generi",
    "HeaderAlbumArtists": "Artisti dell'album",
    "HeaderContinueWatching": "Continua a guardare",
-    "HeaderFavoriteAlbums": "Album Preferiti",
-    "HeaderFavoriteArtists": "Artisti Preferiti",
-    "HeaderFavoriteEpisodes": "Episodi Preferiti",
-    "HeaderFavoriteShows": "Serie TV Preferite",
-    "HeaderFavoriteSongs": "Brani Preferiti",
+    "HeaderFavoriteAlbums": "Album preferiti",
+    "HeaderFavoriteArtists": "Artisti preferiti",
+    "HeaderFavoriteEpisodes": "Episodi preferiti",
+    "HeaderFavoriteShows": "Serie TV preferite",
+    "HeaderFavoriteSongs": "Brani preferiti",
    "HeaderLiveTV": "Diretta TV",
    "HeaderNextUp": "Prossimo",
-    "HeaderRecordingGroups": "Gruppi di Registrazione",
-    "HomeVideos": "Video Personali",
+    "HeaderRecordingGroups": "Gruppi di registrazione",
+    "HomeVideos": "Video personali",
    "Inherit": "Eredita",
    "ItemAddedWithName": "{0} è stato aggiunto alla libreria",
    "ItemRemovedWithName": "{0} è stato rimosso dalla libreria",
    "LabelIpAddressValue": "Indirizzo IP: {0}",
    "LabelRunningTimeValue": "Durata: {0}",
    "Latest": "Novità",
-    "MessageApplicationUpdated": "Il Server Jellyfin è stato aggiornato",
+    "MessageApplicationUpdated": "Jellyfin Server è stato aggiornato",
    "MessageApplicationUpdatedTo": "Jellyfin Server è stato aggiornato a {0}",
    "MessageNamedServerConfigurationUpdatedWithValue": "La sezione {0} della configurazione server è stata aggiornata",
    "MessageServerConfigurationUpdated": "La configurazione del server è stata aggiornata",
    "MixedContent": "Contenuto misto",
    "Movies": "Film",
    "Music": "Musica",
-    "MusicVideos": "Video Musicali",
-    "NameInstallFailed": "{0} installazione fallita",
+    "MusicVideos": "Video musicali",
+    "NameInstallFailed": "{0} installazione non riuscita",
    "NameSeasonNumber": "Stagione {0}",
    "NameSeasonUnknown": "Stagione sconosciuta",
    "NewVersionIsAvailable": "Una nuova versione di Jellyfin Server è disponibile per il download.",
@@ -49,37 +49,37 @@
    "NotificationOptionAudioPlayback": "La riproduzione audio è iniziata",
    "NotificationOptionAudioPlaybackStopped": "La riproduzione audio è stata interrotta",
    "NotificationOptionCameraImageUploaded": "Immagine fotocamera caricata",
-    "NotificationOptionInstallationFailed": "Installazione fallita",
+    "NotificationOptionInstallationFailed": "Installazione non riuscita",
    "NotificationOptionNewLibraryContent": "Nuovo contenuto aggiunto",
    "NotificationOptionPluginError": "Errore del plugin",
    "NotificationOptionPluginInstalled": "Plugin installato",
    "NotificationOptionPluginUninstalled": "Plugin disinstallato",
    "NotificationOptionPluginUpdateInstalled": "Aggiornamento plugin installato",
    "NotificationOptionServerRestartRequired": "Riavvio del server necessario",
-    "NotificationOptionTaskFailed": "Operazione pianificata fallita",
+    "NotificationOptionTaskFailed": "Operazione pianificata non riuscita",
    "NotificationOptionUserLockedOut": "Utente bloccato",
    "NotificationOptionVideoPlayback": "Riproduzione video iniziata",
    "NotificationOptionVideoPlaybackStopped": "Riproduzione video interrotta",
    "Photos": "Foto",
-    "Playlists": "Playlist",
+    "Playlists": "Scalette",
    "Plugin": "Plugin",
-    "PluginInstalledWithName": "{0} è stato Installato",
+    "PluginInstalledWithName": "{0} è stato installato",
    "PluginUninstalledWithName": "{0} è stato disinstallato",
    "PluginUpdatedWithName": "{0} è stato aggiornato",
    "ProviderValue": "Provider: {0}",
-    "ScheduledTaskFailedWithName": "{0} fallito",
+    "ScheduledTaskFailedWithName": "{0} non riuscito",
    "ScheduledTaskStartedWithName": "{0} avviato",
    "ServerNameNeedsToBeRestarted": "{0} deve essere riavviato",
    "Shows": "Serie TV",
    "Songs": "Brani",
-    "StartupEmbyServerIsLoading": "Jellyfin server si sta avviando. Per favore riprova più tardi.",
+    "StartupEmbyServerIsLoading": "Jellyfin Server si sta avviando. Riprova più tardi.",
    "SubtitleDownloadFailureFromForItem": "Impossibile scaricare i sottotitoli da {0} per {1}",
    "Sync": "Sincronizza",
    "System": "Sistema",
    "TvShows": "Serie TV",
    "User": "Utente",
    "UserCreatedWithName": "L'utente {0} è stato creato",
-    "UserDeletedWithName": "L'utente {0} è stato rimosso",
+    "UserDeletedWithName": "L'utente {0} è stato eliminato",
    "UserDownloadingItemWithValues": "{0} sta scaricando {1}",
    "UserLockedOutWithName": "L'utente {0} è stato bloccato",
    "UserOfflineFromDevice": "{0} si è disconnesso da {1}",
@@ -114,20 +114,20 @@
    "TasksLibraryCategory": "Libreria",
    "TasksMaintenanceCategory": "Manutenzione",
    "TaskCleanActivityLog": "Attività di Registro Completate",
-    "TaskCleanActivityLogDescription": "Elimina le voci del registro delle attività più vecchie dell’età configurata.",
-    "Undefined": "Non Definito",
+    "TaskCleanActivityLogDescription": "Elimina le voci del registro delle attività più vecchie dell'età configurata.",
+    "Undefined": "Non specificato",
    "Forced": "Forzato",
    "Default": "Predefinito",
    "TaskOptimizeDatabaseDescription": "Compatta database e tronca spazi liberi. Eseguire questa azione dopo la scansione o dopo aver fatto altre modifiche inerenti il database potrebbe aumentarne le prestazioni.",
    "TaskOptimizeDatabase": "Ottimizza database",
    "TaskKeyframeExtractor": "Estrattore di Keyframe",
-    "TaskKeyframeExtractorDescription": "Estrae i keyframe dai video per creare migliori playlist HLS. Questa procedura potrebbe richiedere molto tempo.",
+    "TaskKeyframeExtractorDescription": "Estrae i keyframe dai video per creare migliori scalette HLS. Questa procedura potrebbe richiedere molto tempo.",
    "External": "Esterno",
-    "HearingImpaired": "Non Udenti",
+    "HearingImpaired": "Non udenti",
    "TaskRefreshTrickplayImages": "Genera immagini Trickplay",
    "TaskRefreshTrickplayImagesDescription": "Crea anteprime trickplay per i video nelle librerie abilitate.",
-    "TaskCleanCollectionsAndPlaylists": "Ripulire le collezioni e le playlist",
-    "TaskCleanCollectionsAndPlaylistsDescription": "Rimuove gli elementi dalle collezioni e dalle playlist che non esistono più.",
+    "TaskCleanCollectionsAndPlaylists": "Ripulisci le collezioni e le scalette",
+    "TaskCleanCollectionsAndPlaylistsDescription": "Rimuove gli elementi dalle collezioni e dalle scalette che non esistono più.",
    "TaskAudioNormalization": "Normalizzazione dell'audio",
    "TaskAudioNormalizationDescription": "Scansiona i file alla ricerca dei dati per la normalizzazione dell'audio.",
    "TaskDownloadMissingLyricsDescription": "Scarica testi per le canzoni",
--- a/Emby.Server.Implementations/Playlists/PlaylistManager.cs
+++ b/Emby.Server.Implementations/Playlists/PlaylistManager.cs
@@ -198,17 +198,22 @@ namespace Emby.Server.Implementations.Playlists
            return Playlist.GetPlaylistItems(items, user, options);
        }

-        public Task AddItemToPlaylistAsync(Guid playlistId, IReadOnlyCollection<Guid> itemIds, Guid userId)
+        public Task AddItemToPlaylistAsync(Guid playlistId, IReadOnlyCollection<Guid> itemIds, int? position, Guid userId)
        {
            var user = userId.IsEmpty() ? null : _userManager.GetUserById(userId);

-            return AddToPlaylistInternal(playlistId, itemIds, user, new DtoOptions(false)
-            {
-                EnableImages = true
-            });
+            return AddToPlaylistInternal(
+                playlistId,
+                itemIds,
+                user,
+                new DtoOptions(false)
+                {
+                    EnableImages = true
+                },
+                position);
        }

-        private async Task AddToPlaylistInternal(Guid playlistId, IReadOnlyCollection<Guid> newItemIds, User user, DtoOptions options)
+        private async Task AddToPlaylistInternal(Guid playlistId, IReadOnlyCollection<Guid> newItemIds, User user, DtoOptions options, int? position = null)
        {
            // Retrieve the existing playlist
            var playlist = _libraryManager.GetItemById(playlistId) as Playlist
@@ -243,7 +248,30 @@ namespace Emby.Server.Implementations.Playlists
            }

            // Update the playlist in the repository
-            playlist.LinkedChildren = [.. playlist.LinkedChildren, .. childrenToAdd];
+            if (position.HasValue)
+            {
+                if (position.Value <= 0)
+                {
+                    playlist.LinkedChildren = [.. childrenToAdd, .. playlist.LinkedChildren];
+                }
+                else if (position.Value >= playlist.LinkedChildren.Length)
+                {
+                    playlist.LinkedChildren = [.. playlist.LinkedChildren, .. childrenToAdd];
+                }
+                else
+                {
+                    playlist.LinkedChildren = [
+                        .. playlist.LinkedChildren[0..position.Value],
+                        .. childrenToAdd,
+                        .. playlist.LinkedChildren[position.Value..playlist.LinkedChildren.Length]
+                    ];
+                }
+            }
+            else
+            {
+                playlist.LinkedChildren = [.. playlist.LinkedChildren, .. childrenToAdd];
+            }
+
            playlist.DateLastMediaAdded = DateTime.UtcNow;

            await UpdatePlaylistInternal(playlist).ConfigureAwait(false);
--- a/Jellyfin.Api/Controllers/PlaylistsController.cs
+++ b/Jellyfin.Api/Controllers/PlaylistsController.cs
@@ -359,6 +359,7 @@ public class PlaylistsController : BaseJellyfinApiController
    /// </summary>
    /// <param name="playlistId">The playlist id.</param>
    /// <param name="ids">Item id, comma delimited.</param>
+    /// <param name="position">Optional. 0-based index where to place the items or at the end if <c>null</c>.</param>
    /// <param name="userId">The userId.</param>
    /// <response code="204">Items added to playlist.</response>
    /// <response code="403">Access forbidden.</response>
@@ -371,6 +372,7 @@ public class PlaylistsController : BaseJellyfinApiController
    public async Task<ActionResult> AddItemToPlaylist(
        [FromRoute, Required] Guid playlistId,
        [FromQuery, ModelBinder(typeof(CommaDelimitedCollectionModelBinder))] Guid[] ids,
+        [FromQuery] int? position,
        [FromQuery] Guid? userId)
    {
        userId = RequestHelpers.GetUserId(User, userId);
@@ -388,7 +390,7 @@ public class PlaylistsController : BaseJellyfinApiController
            return Forbid();
        }

-        await _playlistManager.AddItemToPlaylistAsync(playlistId, ids, userId.Value).ConfigureAwait(false);
+        await _playlistManager.AddItemToPlaylistAsync(playlistId, ids, position, userId.Value).ConfigureAwait(false);
        return NoContent();
    }

--- a/Jellyfin.Server/Migrations/Routines/MigrateLibraryDb.cs
+++ b/Jellyfin.Server/Migrations/Routines/MigrateLibraryDb.cs
@@ -1163,7 +1163,9 @@ internal class MigrateLibraryDb : IDatabaseMigrationRoutine
                Item = null!,
                ProviderId = e[0],
                ProviderValue = string.Join('|', e.Skip(1))
-            }).ToArray();
+            })
+            .DistinctBy(e => e.ProviderId)
+            .ToArray();
        }

        if (reader.TryGetString(index++, out var imageInfos))
--- a/MediaBrowser.Controller/Entities/Folder.cs
+++ b/MediaBrowser.Controller/Entities/Folder.cs
@@ -456,6 +456,7 @@ namespace MediaBrowser.Controller.Entities
                // That's all the new and changed ones - now see if any have been removed and need cleanup
                var itemsRemoved = currentChildren.Values.Except(validChildren).ToList();
                var shouldRemove = !IsRoot || allowRemoveRoot;
+                var actuallyRemoved = new List<BaseItem>();
                // If it's an AggregateFolder, don't remove
                if (shouldRemove && itemsRemoved.Count > 0)
                {
@@ -497,6 +498,7 @@ namespace MediaBrowser.Controller.Entities
                        {
                            Logger.LogDebug("Removed item: {Path}", item.Path);

+                            actuallyRemoved.Add(item);
                            item.SetParent(null);
                            LibraryManager.DeleteItem(item, new DeleteOptions { DeleteFileLocation = false }, this, false);
                        }
@@ -507,6 +509,20 @@ namespace MediaBrowser.Controller.Entities
                {
                    LibraryManager.CreateItems(newItems, this, cancellationToken);
                }
+
+                // After removing items, reattach any detached user data to remaining children
+                // that share the same user data keys (eg. same episode replaced with a new file).
+                if (actuallyRemoved.Count > 0)
+                {
+                    var removedKeys = actuallyRemoved.SelectMany(i => i.GetUserDataKeys()).ToHashSet();
+                    foreach (var child in validChildren)
+                    {
+                        if (child.GetUserDataKeys().Any(removedKeys.Contains))
+                        {
+                            await child.ReattachUserDataAsync(cancellationToken).ConfigureAwait(false);
+                        }
+                    }
+                }
            }
            else
            {
--- a/MediaBrowser.Controller/Playlists/IPlaylistManager.cs
+++ b/MediaBrowser.Controller/Playlists/IPlaylistManager.cs
@@ -61,9 +61,10 @@ namespace MediaBrowser.Controller.Playlists
        /// </summary>
        /// <param name="playlistId">The playlist identifier.</param>
        /// <param name="itemIds">The item ids.</param>
+        /// <param name="position">Optional. 0-based index where to place the items or at the end if null.</param>
        /// <param name="userId">The user identifier.</param>
        /// <returns>Task.</returns>
-        Task AddItemToPlaylistAsync(Guid playlistId, IReadOnlyCollection<Guid> itemIds, Guid userId);
+        Task AddItemToPlaylistAsync(Guid playlistId, IReadOnlyCollection<Guid> itemIds, int? position, Guid userId);

        /// <summary>
        /// Removes from playlist.
--- a/MediaBrowser.MediaEncoding/Probing/ProbeResultNormalizer.cs
+++ b/MediaBrowser.MediaEncoding/Probing/ProbeResultNormalizer.cs
@@ -83,6 +83,7 @@ namespace MediaBrowser.MediaEncoding.Probing
            "Smith/Kotzen",
            "We;Na",
            "LSR/CITY",
+            "Kairon; IRSE!",
        };

        /// <summary>
--- a/MediaBrowser.Providers/Plugins/Tmdb/TV/TmdbSeriesProvider.cs
+++ b/MediaBrowser.Providers/Plugins/Tmdb/TV/TmdbSeriesProvider.cs
@@ -141,6 +141,7 @@ namespace MediaBrowser.Providers.Plugins.Tmdb.TV
            }

            remoteResult.PremiereDate = series.FirstAirDate?.ToUniversalTime();
+            remoteResult.ProductionYear = series.FirstAirDate?.Year;

            return remoteResult;
        }
@@ -157,6 +158,7 @@ namespace MediaBrowser.Providers.Plugins.Tmdb.TV

            remoteResult.SetProviderId(MetadataProvider.Tmdb, series.Id.ToString(CultureInfo.InvariantCulture));
            remoteResult.PremiereDate = series.FirstAirDate?.ToUniversalTime();
+            remoteResult.ProductionYear = series.FirstAirDate?.Year;

            return remoteResult;
        }
@@ -279,6 +281,7 @@ namespace MediaBrowser.Providers.Plugins.Tmdb.TV

            series.EndDate = seriesResult.LastAirDate;
            series.PremiereDate = seriesResult.FirstAirDate;
+            series.ProductionYear = seriesResult.FirstAirDate?.Year;

            var ids = seriesResult.ExternalIds;
            if (ids is not null)
--- a/MediaBrowser.Providers/Plugins/Tmdb/TmdbClientManager.cs
+++ b/MediaBrowser.Providers/Plugins/Tmdb/TmdbClientManager.cs
@@ -518,7 +518,10 @@ namespace MediaBrowser.Providers.Plugins.Tmdb
                return null;
            }

-            return _tmDbClient.GetImageUrl(size, path, true).ToString();
+            // Use "original" as default size if size is null or empty to prevent malformed URLs
+            var imageSize = string.IsNullOrEmpty(size) ? "original" : size;
+
+            return _tmDbClient.GetImageUrl(imageSize, path, true).ToString();
        }

        /// <summary>