Allow tmdb as an alias for the tmdbid provider id

Translation: Jellyfin/Jellyfin
Translate-URL: https://translate.jellyfin.org/projects/jellyfin/jellyfin-core/sv/

.config/dotnet-tools.json

@@ -3,7 +3,7 @@
   "isRoot": true,
   "tools": {
     "dotnet-ef": {
-      "version": "10.0.2",
+      "version": "10.0.5",
       "commands": [
         "dotnet-ef"
       ]

.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,

.github/workflows/ci-codeql-analysis.yml

@@ -23,18 +23,18 @@ jobs:
       uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
 
     - name: Setup .NET
-      uses: actions/setup-dotnet@baa11fbfe1d6520db94683bd5c7a3818018e4309 # v5.1.0
+      uses: actions/setup-dotnet@c2fa09f4bde5ebb9d1777cf28262a3eb3db3ced7 # v5.2.0
       with:
         dotnet-version: '10.0.x'
 
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@b20883b0cd1f46c72ae0ba6d1090936928f9fa30 # v4.32.0
+      uses: github/codeql-action/init@b1bff81932f5cdfc8695c7752dcee935dcd061c8 # v4.33.0
       with:
         languages: ${{ matrix.language }}
         queries: +security-extended
 
     - name: Autobuild
-      uses: github/codeql-action/autobuild@b20883b0cd1f46c72ae0ba6d1090936928f9fa30 # v4.32.0
+      uses: github/codeql-action/autobuild@b1bff81932f5cdfc8695c7752dcee935dcd061c8 # v4.33.0
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@b20883b0cd1f46c72ae0ba6d1090936928f9fa30 # v4.32.0
+      uses: github/codeql-action/analyze@b1bff81932f5cdfc8695c7752dcee935dcd061c8 # v4.33.0

.github/workflows/ci-compat.yml

@@ -1,6 +1,6 @@
 name: ABI Compatibility
 on:
-  pull_request_target:
+  pull_request:
 
 permissions: {}
 
@@ -17,7 +17,7 @@ jobs:
           repository: ${{ github.event.pull_request.head.repo.full_name }}
 
       - name: Setup .NET
-        uses: actions/setup-dotnet@baa11fbfe1d6520db94683bd5c7a3818018e4309 # v5.1.0
+        uses: actions/setup-dotnet@c2fa09f4bde5ebb9d1777cf28262a3eb3db3ced7 # v5.2.0
         with:
           dotnet-version: '10.0.x'
 
@@ -26,7 +26,7 @@ jobs:
           dotnet build Jellyfin.Server -o ./out
 
       - name: Upload Head
-        uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
+        uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
         with:
           name: abi-head
           retention-days: 14
@@ -47,7 +47,7 @@ jobs:
           fetch-depth: 0
 
       - name: Setup .NET
-        uses: actions/setup-dotnet@baa11fbfe1d6520db94683bd5c7a3818018e4309 # v5.1.0
+        uses: actions/setup-dotnet@c2fa09f4bde5ebb9d1777cf28262a3eb3db3ced7 # v5.2.0
         with:
           dotnet-version: '10.0.x'
 
@@ -65,7 +65,7 @@ jobs:
           dotnet build Jellyfin.Server -o ./out
 
       - name: Upload Head
-        uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
+        uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
         with:
           name: abi-base
           retention-days: 14
@@ -77,7 +77,7 @@ jobs:
       pull-requests: write  #  to create or update comment (peter-evans/create-or-update-comment)
 
     name: ABI - Difference
-    if: ${{ github.event_name == 'pull_request_target' }}
+    if: ${{ github.event_name == 'pull_request' }}
     runs-on: ubuntu-latest
     needs:
       - abi-head
@@ -85,13 +85,13 @@ jobs:
 
     steps:
       - name: Download abi-head
-        uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7.0.0
+        uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
         with:
           name: abi-head
           path: abi-head
 
       - name: Download abi-base
-        uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7.0.0
+        uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
         with:
           name: abi-base
           path: abi-base

.github/workflows/ci-openapi.yml

@@ -5,7 +5,7 @@ on:
       - master
     tags:
       - 'v*'
-  pull_request_target:
+  pull_request:
 
 permissions: {}
 
@@ -22,14 +22,14 @@ jobs:
           repository: ${{ github.event.pull_request.head.repo.full_name }}
 
       - name: Setup .NET
-        uses: actions/setup-dotnet@baa11fbfe1d6520db94683bd5c7a3818018e4309 # v5.1.0
+        uses: actions/setup-dotnet@c2fa09f4bde5ebb9d1777cf28262a3eb3db3ced7 # v5.2.0
         with:
           dotnet-version: '10.0.x'
       - name: Generate openapi.json
         run: dotnet test tests/Jellyfin.Server.Integration.Tests/Jellyfin.Server.Integration.Tests.csproj -c Release --filter "Jellyfin.Server.Integration.Tests.OpenApiSpecTests"
 
       - name: Upload openapi.json
-        uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
+        uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
         with:
           name: openapi-head
           retention-days: 14
@@ -59,14 +59,14 @@ jobs:
           git checkout --progress --force $ANCESTOR_REF
 
       - name: Setup .NET
-        uses: actions/setup-dotnet@baa11fbfe1d6520db94683bd5c7a3818018e4309 # v5.1.0
+        uses: actions/setup-dotnet@c2fa09f4bde5ebb9d1777cf28262a3eb3db3ced7 # v5.2.0
         with:
           dotnet-version: '10.0.x'
       - name: Generate openapi.json
         run: dotnet test tests/Jellyfin.Server.Integration.Tests/Jellyfin.Server.Integration.Tests.csproj -c Release --filter "Jellyfin.Server.Integration.Tests.OpenApiSpecTests"
 
       - name: Upload openapi.json
-        uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
+        uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
         with:
           name: openapi-base
           retention-days: 14
@@ -78,20 +78,20 @@ jobs:
       pull-requests: write
 
     name: OpenAPI - Difference
-    if: ${{ github.event_name == 'pull_request_target' }}
+    if: ${{ github.event_name == 'pull_request' }}
     runs-on: ubuntu-latest
     needs:
       - openapi-head
       - openapi-base
     steps:
       - name: Download openapi-head
-        uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7.0.0
+        uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
         with:
           name: openapi-head
           path: openapi-head
 
       - name: Download openapi-base
-        uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7.0.0
+        uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
         with:
           name: openapi-base
           path: openapi-base
@@ -109,7 +109,7 @@ jobs:
 
   publish-unstable:
     name: OpenAPI - Publish Unstable Spec
-    if: ${{ github.event_name != 'pull_request_target' && !startsWith(github.ref, 'refs/tags/v') && contains(github.repository_owner, 'jellyfin') }}
+    if: ${{ github.event_name != 'pull_request' && !startsWith(github.ref, 'refs/tags/v') && contains(github.repository_owner, 'jellyfin') }}
     runs-on: ubuntu-latest
     needs:
       - openapi-head
@@ -119,7 +119,7 @@ jobs:
         run: |-
           echo "JELLYFIN_VERSION=$(date +'%Y%m%d%H%M%S')" >> $GITHUB_ENV
       - name: Download openapi-head
-        uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7.0.0
+        uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
         with:
           name: openapi-head
           path: openapi-head
@@ -180,7 +180,7 @@ jobs:
         run: |-
           echo "JELLYFIN_VERSION=${GITHUB_REF#refs/tags/v}" >> $GITHUB_ENV
       - name: Download openapi-head
-        uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7.0.0
+        uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
         with:
           name: openapi-head
           path: openapi-head

.github/workflows/ci-tests.yml

@@ -22,7 +22,7 @@ jobs:
     steps:
       - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
 
-      - uses: actions/setup-dotnet@baa11fbfe1d6520db94683bd5c7a3818018e4309 # v5.1.0
+      - uses: actions/setup-dotnet@c2fa09f4bde5ebb9d1777cf28262a3eb3db3ced7 # v5.2.0
         with:
           dotnet-version: ${{ env.SDK_VERSION }}
 
@@ -35,7 +35,7 @@ jobs:
           --verbosity minimal
 
       - name: Merge code coverage results
-        uses: danielpalme/ReportGenerator-GitHub-Action@ee0ae774f6d3afedcbd1683c1ab21b83670bdf8e # v5.5.1
+        uses: danielpalme/ReportGenerator-GitHub-Action@cf6fe1b38ed5becc89ffe056c1f240825993be5b # v5.5.4
         with:
           reports: "**/coverage.cobertura.xml"
           targetdir: "merged/"

.github/workflows/commands.yml

@@ -4,7 +4,7 @@ on:
     types:
       - created
       - edited
-  pull_request_target:
+  pull_request:
     types:
       - labeled
       - synchronize

.github/workflows/issue-stale.yml

@@ -16,7 +16,7 @@ jobs:
     runs-on: ubuntu-latest
     if: ${{ contains(github.repository, 'jellyfin/') }}
     steps:
-      - uses: actions/stale@997185467fa4f803885201cee163a9f38240193d # v10.1.1
+      - uses: actions/stale@b5d41d4e1d5dceea10e7104786b73624c18a190f # v10.2.0
         with:
           repo-token: ${{ secrets.JF_BOT_TOKEN }}
           ascending: true

.github/workflows/project-automation.yml

@@ -4,7 +4,7 @@ on:
   push:
     branches:
       - master
-  pull_request_target:
+  pull_request:
   issue_comment:
 
 permissions: {}

.github/workflows/pull-request-conflict.yml

@@ -4,7 +4,7 @@ on:
   push:
     branches:
       - master
-  pull_request_target:
+  pull_request:
   issue_comment:
 
 permissions: {}
@@ -16,7 +16,7 @@ jobs:
     steps:
       - name: Apply label
         uses: eps1lon/actions-label-merge-conflict@1df065ebe6e3310545d4f4c4e862e43bdca146f0 # v3.0.3
-        if: ${{ github.event_name == 'push' || github.event_name == 'pull_request_target'}}
+        if: ${{ github.event_name == 'push' || github.event_name == 'pull_request'}}
         with:
           dirtyLabel: 'merge conflict'
           commentOnDirty: 'This pull request has merge conflicts. Please resolve the conflicts so the PR can be successfully reviewed and merged.'

.github/workflows/pull-request-stale.yaml

@@ -15,7 +15,7 @@ jobs:
     runs-on: ubuntu-latest
     if: ${{ contains(github.repository, 'jellyfin/') }}
     steps:
-      - uses: actions/stale@997185467fa4f803885201cee163a9f38240193d # v10.1.1
+      - uses: actions/stale@b5d41d4e1d5dceea10e7104786b73624c18a190f # v10.2.0
         with:
           repo-token: ${{ secrets.JF_BOT_TOKEN }}
           ascending: true

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)

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" />
@@ -13,7 +13,7 @@
     <PackageVersion Include="BlurHashSharp.SkiaSharp" Version="1.4.0-pre.1" />
     <PackageVersion Include="BlurHashSharp" Version="1.4.0-pre.1" />
     <PackageVersion Include="CommandLineParser" Version="2.9.1" />
-    <PackageVersion Include="coverlet.collector" Version="6.0.4" />
+    <PackageVersion Include="coverlet.collector" Version="8.0.1" />
     <PackageVersion Include="Diacritics" Version="4.1.4" />
     <PackageVersion Include="DiscUtils.Udf" Version="0.16.13" />
     <PackageVersion Include="DotNet.Glob" Version="3.1.3" />
@@ -26,28 +26,28 @@
     <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.5" />
+    <PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="10.0.5" />
     <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.NET.Test.Sdk" Version="18.0.1" />
+    <PackageVersion Include="Microsoft.CodeAnalysis.Common" Version="5.3.0" />
+    <PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="5.3.0" />
+    <PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="5.3.0" />
+    <PackageVersion Include="Microsoft.Data.Sqlite" Version="10.0.5" />
+    <PackageVersion Include="Microsoft.EntityFrameworkCore.Design" Version="10.0.5" />
+    <PackageVersion Include="Microsoft.EntityFrameworkCore.Relational" Version="10.0.5" />
+    <PackageVersion Include="Microsoft.EntityFrameworkCore.Sqlite" Version="10.0.5" />
+    <PackageVersion Include="Microsoft.EntityFrameworkCore.Tools" Version="10.0.5" />
+    <PackageVersion Include="Microsoft.Extensions.Caching.Abstractions" Version="10.0.5" />
+    <PackageVersion Include="Microsoft.Extensions.Caching.Memory" Version="10.0.5" />
+    <PackageVersion Include="Microsoft.Extensions.Configuration.Abstractions" Version="10.0.5" />
+    <PackageVersion Include="Microsoft.Extensions.Configuration.Binder" Version="10.0.5" />
+    <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="10.0.5" />
+    <PackageVersion Include="Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore" Version="10.0.5" />
+    <PackageVersion Include="Microsoft.Extensions.Hosting.Abstractions" Version="10.0.5" />
+    <PackageVersion Include="Microsoft.Extensions.Http" Version="10.0.5" />
+    <PackageVersion Include="Microsoft.Extensions.Logging" Version="10.0.5" />
+    <PackageVersion Include="Microsoft.Extensions.Options" Version="10.0.5" />
+    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.3.0" />
     <PackageVersion Include="MimeTypes" Version="2.5.2" />
     <PackageVersion Include="Morestachio" Version="5.0.1.631" />
     <PackageVersion Include="Moq" Version="4.18.4" />
@@ -57,7 +57,7 @@
     <PackageVersion Include="prometheus-net.AspNetCore" Version="8.2.1" />
     <PackageVersion Include="prometheus-net.DotNetRuntime" Version="4.4.1" />
     <PackageVersion Include="prometheus-net" Version="8.2.1" />
-    <PackageVersion Include="Polly" Version="8.6.5" />
+    <PackageVersion Include="Polly" Version="8.6.6" />
     <PackageVersion Include="Serilog.AspNetCore" Version="10.0.0" />
     <PackageVersion Include="Serilog.Enrichers.Thread" Version="4.0.0" />
     <PackageVersion Include="Serilog.Expressions" Version="5.0.0" />
@@ -74,13 +74,13 @@
     <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="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="Svg.Skia" Version="3.4.1" />
+    <PackageVersion Include="Swashbuckle.AspNetCore.ReDoc" Version="10.1.5" />
+    <PackageVersion Include="Swashbuckle.AspNetCore" Version="10.1.5" />
+    <PackageVersion Include="System.Text.Json" Version="10.0.5" />
     <PackageVersion Include="TagLibSharp" Version="2.3.0" />
-    <PackageVersion Include="z440.atl.core" Version="7.10.0" />
-    <PackageVersion Include="TMDbLib" Version="2.3.0" />
+    <PackageVersion Include="z440.atl.core" Version="7.11.0" />
+    <PackageVersion Include="TMDbLib" Version="3.0.0" />
     <PackageVersion Include="UTF.Unknown" Version="2.6.0" />
     <PackageVersion Include="Xunit.Priority" Version="1.1.6" />
     <PackageVersion Include="xunit.runner.visualstudio" Version="2.8.2" />

Emby.Naming/Common/NamingOptions.cs

@@ -225,6 +225,7 @@ namespace Emby.Naming.Common
                 ".afc",
                 ".amf",
                 ".aif",
+                ".aifc",
                 ".aiff",
                 ".alac",
                 ".amr",

Emby.Naming/TV/TvParserHelpers.cs

@@ -18,7 +18,7 @@ public static class TvParserHelpers
     /// <param name="status">The status string.</param>
     /// <param name="enumValue">The <see cref="SeriesStatus"/>.</param>
     /// <returns>Returns true if parsing was successful.</returns>
-    public static bool TryParseSeriesStatus(string status, out SeriesStatus? enumValue)
+    public static bool TryParseSeriesStatus(string? status, out SeriesStatus? enumValue)
     {
         if (Enum.TryParse(status, true, out SeriesStatus seriesStatus))
         {

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;

Emby.Server.Implementations/Images/CollectionFolderImageProvider.cs

@@ -40,7 +40,7 @@ namespace Emby.Server.Implementations.Images
                     includeItemTypes = new[] { BaseItemKind.Series };
                     break;
                 case CollectionType.music:
-                    includeItemTypes = new[] { BaseItemKind.MusicAlbum };
+                    includeItemTypes = new[] { BaseItemKind.MusicArtist };  // Music albums usually don't have dedicated backdrops, so use artist instead
                     break;
                 case CollectionType.musicvideos:
                     includeItemTypes = new[] { BaseItemKind.MusicVideo };

Emby.Server.Implementations/Library/LibraryManager.cs

@@ -2289,7 +2289,7 @@ namespace Emby.Server.Implementations.Library
 
             if (item is null)
             {
-                return new List<Folder>();
+                return [];
             }
 
             return GetCollectionFoldersInternal(item, allUserRootChildren);

Emby.Server.Implementations/Library/PathExtensions.cs

@@ -37,15 +37,25 @@ namespace Emby.Server.Implementations.Library
             while (attributeIndex > -1 && attributeIndex < maxIndex)
             {
                 var attributeEnd = attributeIndex + attribute.Length;
-                if (attributeIndex > 0
-                    && str[attributeIndex - 1] == '['
-                    && (str[attributeEnd] == '=' || str[attributeEnd] == '-'))
+                if (attributeIndex > 0)
                 {
-                    var closingIndex = str[attributeEnd..].IndexOf(']');
-                    // Must be at least 1 character before the closing bracket.
-                    if (closingIndex > 1)
+                    var attributeOpener = str[attributeIndex - 1];
+                    var attributeCloser = attributeOpener switch
                     {
-                        return str[(attributeEnd + 1)..(attributeEnd + closingIndex)].Trim().ToString();
+                        '[' => ']',
+                        '(' => ')',
+                        '{' => '}',
+                         _ => '\0'
+                    };
+                    if (attributeCloser != '\0' && (str[attributeEnd] == '=' || str[attributeEnd] == '-'))
+                    {
+                        var closingIndex = str[attributeEnd..].IndexOf(attributeCloser);
+
+                        // Must be at least 1 character before the closing bracket.
+                        if (closingIndex > 1)
+                        {
+                            return str[(attributeEnd + 1)..(attributeEnd + closingIndex)].Trim().ToString();
+                        }
                     }
                 }
 
@@ -60,6 +70,12 @@ namespace Emby.Server.Implementations.Library
                 return match ? imdbId.ToString() : null;
             }
 
+            // Allow tmdb as an alias for tmdbid
+            if (attribute.Equals("tmdbid", StringComparison.OrdinalIgnoreCase))
+            {
+                return str.GetAttributeValue("tmdb");
+            }
+
             return null;
         }
 

Emby.Server.Implementations/Localization/Core/af.json

@@ -135,5 +135,7 @@
     "TaskExtractMediaSegments": "Media Segment Skandeer",
     "TaskExtractMediaSegmentsDescription": "Onttrek of verkry mediasegmente van MediaSegment-geaktiveerde inproppe.",
     "TaskMoveTrickplayImages": "Migreer Trickplay Beeldligging",
-    "TaskMoveTrickplayImagesDescription": "Skuif ontstaande trickplay lêers volgens die biblioteekinstellings."
+    "TaskMoveTrickplayImagesDescription": "Skuif ontstaande trickplay lêers volgens die biblioteekinstellings.",
+    "CleanupUserDataTask": "Gebruikers data skoon maak taak",
+    "CleanupUserDataTaskDescription": "Maak alle gebruikers data (kykstatus, gunstelingstatus, ens.) skoon van media wat nie meer vir ten minste 90 dae teenwoordig is nie."
 }

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": "Плагін выдалены",
@@ -123,10 +123,10 @@
     "TaskCleanTranscodeDescription": "Выдаляе перакадзіраваныя файлы, старэйшыя за адзін дзень.",
     "TaskRefreshChannels": "Абнавіць каналы",
     "TaskDownloadMissingSubtitles": "Спампаваць адсутныя субцітры",
-    "TaskKeyframeExtractorDescription": "Выдае ключавыя кадры з відэафайлаў для стварэння больш дакладных плэй-лістоў HLS. Гэта задача можа працягнуцца шмат часу.",
+    "TaskKeyframeExtractorDescription": "Выдае ключавыя кадры з відэафайлаў для стварэння больш дакладных плэй-лістоў HLS. Гэта задача можа выконвацца доўга.",
     "TaskRefreshTrickplayImages": "Стварыць выявы Trickplay",
     "TaskRefreshTrickplayImagesDescription": "Стварае перадпрагляды відэаролікаў для Trickplay у падключаных бібліятэках.",
-    "TaskCleanCollectionsAndPlaylists": "Ачысціце калекцыі і плэй-лісты",
+    "TaskCleanCollectionsAndPlaylists": "Ачысціць калекцыі і плэй-лісты",
     "TaskCleanCollectionsAndPlaylistsDescription": "Выдаляе элементы з калекцый і плэй-лістоў, якія больш не існуюць.",
     "TaskAudioNormalizationDescription": "Скануе файлы на прадмет нармалізацыі гуку.",
     "TaskAudioNormalization": "Нармалізацыя гуку",

Emby.Server.Implementations/Localization/Core/bg-BG.json

@@ -15,7 +15,7 @@
     "Favorites": "Любими",
     "Folders": "Папки",
     "Genres": "Жанрове",
-    "HeaderAlbumArtists": "Изпълнители на албуми",
+    "HeaderAlbumArtists": "Изпълнители на албума",
     "HeaderContinueWatching": "Продължаване на гледането",
     "HeaderFavoriteAlbums": "Любими албуми",
     "HeaderFavoriteArtists": "Любими изпълнители",

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.",

Emby.Server.Implementations/Localization/Core/he_IL.json

@@ -1 +1,27 @@
-{}
+{
+    "Books": "ספרים",
+    "NameSeasonNumber": "עונה {0}",
+    "Channels": "ערוצים",
+    "Movies": "סרטים",
+    "Music": "מוזיקה",
+    "Collections": "אוספים",
+    "Albums": "אלבומים",
+    "Application": "אפליקציה",
+    "Artists": "אמנים",
+    "ChapterNameValue": "פרק {0}",
+    "External": "חיצונית",
+    "Favorites": "מועדפים",
+    "Folders": "תיקיות",
+    "Genres": "ז'אנרים",
+    "HeaderAlbumArtists": "אמני אלבומים",
+    "HeaderContinueWatching": "להמשיך לצפות",
+    "HeaderFavoriteAlbums": "אלבומים אהובים",
+    "HeaderFavoriteArtists": "אמנים אהובים",
+    "HeaderFavoriteEpisodes": "פרקים אהובים",
+    "HeaderFavoriteShows": "תוכניות אהובות",
+    "HeaderFavoriteSongs": "שירים אהובים",
+    "HeaderLiveTV": "טלוויזיה בשידור חי",
+    "HeaderNextUp": "הבא",
+    "HearingImpaired": "ללקויי שמיעה",
+    "HomeVideos": "סרטונים ביתיים"
+}

Emby.Server.Implementations/Localization/Core/hr.json

@@ -8,7 +8,7 @@
     "CameraImageUploadedFrom": "Nova fotografija sa kamere je učitana iz {0}",
     "Channels": "Kanali",
     "ChapterNameValue": "Poglavlje {0}",
-    "Collections": "Kolekcije",
+    "Collections": "Zbirke",
     "DeviceOfflineWithName": "{0} je prekinuo vezu",
     "DeviceOnlineWithName": "{0} je povezan",
     "FailedLoginAttemptWithUserName": "Neuspješan pokušaj prijave od {0}",
@@ -70,7 +70,7 @@
     "ScheduledTaskFailedWithName": "{0} neuspjelo",
     "ScheduledTaskStartedWithName": "{0} pokrenuto",
     "ServerNameNeedsToBeRestarted": "{0} treba ponovno pokrenuti",
-    "Shows": "Serije",
+    "Shows": "Emisije",
     "Songs": "Pjesme",
     "StartupEmbyServerIsLoading": "Jellyfin server se učitava. Pokušajte ponovo uskoro.",
     "SubtitleDownloadFailureFromForItem": "Prijevod nije uspješno preuzet od {0} za {1}",

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",

Emby.Server.Implementations/Localization/Core/ja.json

@@ -43,32 +43,32 @@
     "NameInstallFailed": "{0}のインストールに失敗しました",
     "NameSeasonNumber": "シーズン {0}",
     "NameSeasonUnknown": "シーズン不明",
-    "NewVersionIsAvailable": "新しいバージョンの Jellyfin Server がダウンロード可能です。",
+    "NewVersionIsAvailable": "新しいバージョンの Jellyfin Server がダウンロードできます。",
     "NotificationOptionApplicationUpdateAvailable": "アプリケーションの更新があります",
     "NotificationOptionApplicationUpdateInstalled": "アプリケーションは最新です",
     "NotificationOptionAudioPlayback": "オーディオの再生を開始",
-    "NotificationOptionAudioPlaybackStopped": "オーディオの再生をストップしました",
+    "NotificationOptionAudioPlaybackStopped": "オーディオの再生を停止",
     "NotificationOptionCameraImageUploaded": "カメライメージがアップロードされました",
     "NotificationOptionInstallationFailed": "インストール失敗",
     "NotificationOptionNewLibraryContent": "新しいコンテンツを追加しました",
     "NotificationOptionPluginError": "プラグインに障害が発生しました",
-    "NotificationOptionPluginInstalled": "プラグインがインストールされました",
-    "NotificationOptionPluginUninstalled": "プラグインがアンインストールされました",
+    "NotificationOptionPluginInstalled": "プラグインをインストールしました",
+    "NotificationOptionPluginUninstalled": "プラグインをアンインストールしました",
     "NotificationOptionPluginUpdateInstalled": "プラグインのアップデートをインストールしました",
     "NotificationOptionServerRestartRequired": "サーバーを再起動してください",
     "NotificationOptionTaskFailed": "スケジュールされていたタスクの失敗",
     "NotificationOptionUserLockedOut": "ユーザーはロックされています",
-    "NotificationOptionVideoPlayback": "ビデオの再生を開始しました",
-    "NotificationOptionVideoPlaybackStopped": "ビデオを停止しました",
+    "NotificationOptionVideoPlayback": "ビデオの再生を開始",
+    "NotificationOptionVideoPlaybackStopped": "ビデオの再生を停止",
     "Photos": "フォト",
     "Playlists": "プレイリスト",
     "Plugin": "プラグイン",
-    "PluginInstalledWithName": "{0} がインストールされました",
-    "PluginUninstalledWithName": "{0} がアンインストールされました",
-    "PluginUpdatedWithName": "{0} が更新されました",
+    "PluginInstalledWithName": "{0} をインストールしました",
+    "PluginUninstalledWithName": "{0} をアンインストールしました",
+    "PluginUpdatedWithName": "{0} を更新しました",
     "ProviderValue": "プロバイダ: {0}",
     "ScheduledTaskFailedWithName": "{0} が失敗しました",
-    "ScheduledTaskStartedWithName": "{0} が開始されました",
+    "ScheduledTaskStartedWithName": "{0} を開始",
     "ServerNameNeedsToBeRestarted": "{0} を再起動してください",
     "Shows": "番組",
     "Songs": "曲",

Emby.Server.Implementations/Localization/Core/pt-PT.json

@@ -124,8 +124,8 @@
     "TaskKeyframeExtractor": "Extrator de Quadros-chave",
     "External": "Externo",
     "HearingImpaired": "Surdo",
-    "TaskRefreshTrickplayImages": "Gerar Imagens de Trickplay",
-    "TaskRefreshTrickplayImagesDescription": "Cria ficheiros de trickplay para vídeos nas bibliotecas ativas.",
+    "TaskRefreshTrickplayImages": "Gerar imagens de trickplay",
+    "TaskRefreshTrickplayImagesDescription": "Cria pré-visualizações de trickplay para vídeos nas bibliotecas ativadas.",
     "TaskCleanCollectionsAndPlaylistsDescription": "Remove itens de coleções e listas de reprodução que já não existem.",
     "TaskCleanCollectionsAndPlaylists": "Limpar coleções e listas de reprodução",
     "TaskAudioNormalizationDescription": "Analisa os ficheiros para obter dados de normalização de áudio.",

Emby.Server.Implementations/Localization/Core/pt.json

@@ -124,8 +124,8 @@
     "HearingImpaired": "Problemas auditivos",
     "TaskKeyframeExtractor": "Extrator de quadro-chave",
     "TaskKeyframeExtractorDescription": "Retira frames chave do video para criar listas HLS precisas. Esta tarefa pode correr durante algum tempo.",
-    "TaskRefreshTrickplayImages": "Gerar miniaturas de vídeo",
-    "TaskRefreshTrickplayImagesDescription": "Cria miniaturas de vídeo para vídeos nas bibliotecas definidas.",
+    "TaskRefreshTrickplayImages": "Gerar imagens de trickplay",
+    "TaskRefreshTrickplayImagesDescription": "Cria pré-visualizações de trickplay para vídeos nas bibliotecas ativadas.",
     "TaskCleanCollectionsAndPlaylistsDescription": "Remove itens de coleções e listas de reprodução que já não existem.",
     "TaskCleanCollectionsAndPlaylists": "Limpar coleções e listas de reprodução",
     "TaskAudioNormalizationDescription": "Analisa os ficheiros para obter dados de normalização de áudio.",

Emby.Server.Implementations/Localization/Core/sv.json

@@ -76,7 +76,7 @@
     "SubtitleDownloadFailureFromForItem": "Undertexter kunde inte laddas ner från {0} till {1}",
     "Sync": "Synk",
     "System": "System",
-    "TvShows": "TV-serier",
+    "TvShows": "Tv-serier",
     "User": "Användare",
     "UserCreatedWithName": "Användaren {0} har skapats",
     "UserDeletedWithName": "Användaren {0} har tagits bort",

Emby.Server.Implementations/Localization/Core/zh-HK.json

@@ -1,17 +1,17 @@
 {
     "Albums": "專輯",
-    "AppDeviceValues": "程式：{0}，設備：{1}",
+    "AppDeviceValues": "程式：{0}，裝置：{1}",
     "Application": "應用程式",
     "Artists": "藝人",
     "AuthenticationSucceededWithUserName": "成功授權 {0}",
     "Books": "書籍",
-    "CameraImageUploadedFrom": "{0} 成功上傳一張新照片",
+    "CameraImageUploadedFrom": "{0} 已經成功上傳咗一張新相",
     "Channels": "頻道",
     "ChapterNameValue": "第 {0} 章",
     "Collections": "系列",
     "DeviceOfflineWithName": "{0} 已中斷連接",
     "DeviceOnlineWithName": "{0} 已連接",
-    "FailedLoginAttemptWithUserName": "{0} 登入失敗",
+    "FailedLoginAttemptWithUserName": "來自 {0} 嘅登入嘗試失敗咗",
     "Favorites": "我的最愛",
     "Folders": "資料夾",
     "Genres": "風格",
@@ -27,15 +27,15 @@
     "HeaderRecordingGroups": "錄製組",
     "HomeVideos": "家庭影片",
     "Inherit": "繼承",
-    "ItemAddedWithName": "{0} 已被加入至媒體庫",
-    "ItemRemovedWithName": "{0} 已從媒體庫移除",
+    "ItemAddedWithName": "{0} 經已加咗入媒體庫",
+    "ItemRemovedWithName": "{0} 經已由媒體庫移除咗",
     "LabelIpAddressValue": "IP 地址：{0}",
     "LabelRunningTimeValue": "運作時間：{0}",
     "Latest": "最新",
-    "MessageApplicationUpdated": "Jellyfin 已被更新",
-    "MessageApplicationUpdatedTo": "Jellyfin 已被更新至 {0}",
-    "MessageNamedServerConfigurationUpdatedWithValue": "伺服器設定 {0} 已被更新",
-    "MessageServerConfigurationUpdated": "已更新伺服器設定",
+    "MessageApplicationUpdated": "Jellyfin 經已更新咗",
+    "MessageApplicationUpdatedTo": "Jellyfin 已經更新到 {0} 版本",
+    "MessageNamedServerConfigurationUpdatedWithValue": "伺服器設定「{0}」已經更新咗",
+    "MessageServerConfigurationUpdated": "伺服器設定經已更新咗",
     "MixedContent": "混合內容",
     "Movies": "電影",
     "Music": "音樂",
@@ -43,7 +43,7 @@
     "NameInstallFailed": "{0} 安裝失敗",
     "NameSeasonNumber": "第 {0} 季",
     "NameSeasonUnknown": "未知的季度",
-    "NewVersionIsAvailable": "有新版本的 Jellyfin 可供下載。",
+    "NewVersionIsAvailable": "有新版本嘅 Jellyfin 可以下載。",
     "NotificationOptionApplicationUpdateAvailable": "有可用的更新",
     "NotificationOptionApplicationUpdateInstalled": "完成更新應用程式",
     "NotificationOptionAudioPlayback": "播放音訊",
@@ -69,46 +69,46 @@
     "ProviderValue": "提供者：{0}",
     "ScheduledTaskFailedWithName": "{0} 執行失敗",
     "ScheduledTaskStartedWithName": "開始執行 {0}",
-    "ServerNameNeedsToBeRestarted": "{0} 需要重啟",
+    "ServerNameNeedsToBeRestarted": "{0} 需要重新啟動",
     "Shows": "節目",
     "Songs": "歌曲",
-    "StartupEmbyServerIsLoading": "正在載入 Jellyfin，請稍後再試。",
-    "SubtitleDownloadFailureFromForItem": "無法從 {0} 下載 {1} 的字幕",
+    "StartupEmbyServerIsLoading": "Jellyfin 伺服器載入緊，請稍後再試。",
+    "SubtitleDownloadFailureFromForItem": "經 {0} 下載 {1} 嘅字幕失敗咗",
     "Sync": "同步",
     "System": "系統",
     "TvShows": "電視節目",
     "User": "用戶",
-    "UserCreatedWithName": "建立新用戶 {0}",
-    "UserDeletedWithName": "用戶 {0} 已被移除",
-    "UserDownloadingItemWithValues": "{0} 正在下載 {1}",
-    "UserLockedOutWithName": "用戶 {0} 已被封鎖",
-    "UserOfflineFromDevice": "{0} 終止了 {1} 的連接",
-    "UserOnlineFromDevice": "{0} 從 {1} 連線",
-    "UserPasswordChangedWithName": "{0} 的密碼已被更改",
-    "UserPolicyUpdatedWithName": "使用條款已更新為 {0}",
-    "UserStartedPlayingItemWithValues": "{0} 在 {2} 上播放 {1}",
-    "UserStoppedPlayingItemWithValues": "{0} 停止在 {2} 上播放 {1}",
-    "ValueHasBeenAddedToLibrary": "{0} 已被加入至你的媒體庫",
+    "UserCreatedWithName": "經已建立咗新用戶 {0}",
+    "UserDeletedWithName": "用戶 {0} 已經被刪除",
+    "UserDownloadingItemWithValues": "{0} 下載緊 {1}",
+    "UserLockedOutWithName": "用戶 {0} 經已被鎖定",
+    "UserOfflineFromDevice": "{0} 經已由 {1} 斷開咗連線",
+    "UserOnlineFromDevice": "{0} 正喺 {1} 連線",
+    "UserPasswordChangedWithName": "用戶 {0} 嘅密碼已經更改咗",
+    "UserPolicyUpdatedWithName": "用戶 {0} 嘅權限已經更新咗",
+    "UserStartedPlayingItemWithValues": "{0} 正喺 {2} 播緊 {1}",
+    "UserStoppedPlayingItemWithValues": "{0} 已經喺 {2} 停止播放 {1}",
+    "ValueHasBeenAddedToLibrary": "{0} 已經成功加入咗你嘅媒體庫",
     "ValueSpecialEpisodeName": "特典 - {0}",
     "VersionNumber": "版本 {0}",
     "TaskDownloadMissingSubtitles": "下載欠缺字幕",
     "TaskUpdatePlugins": "更新插件",
     "TasksApplicationCategory": "應用程式",
-    "TaskRefreshLibraryDescription": "掃描媒體庫以加入新增的檔案及重新載入元數據。",
+    "TaskRefreshLibraryDescription": "掃描媒體庫嚟搵新檔案，同時重新載入元數據。",
     "TasksMaintenanceCategory": "維護",
-    "TaskDownloadMissingSubtitlesDescription": "根據元數據中的設定，在網上搜尋欠缺的字幕。",
-    "TaskRefreshChannelsDescription": "重新載入網絡頻道的資訊。",
+    "TaskDownloadMissingSubtitlesDescription": "根據元數據設定，喺網上幫你搵返啲欠缺嘅字幕。",
+    "TaskRefreshChannelsDescription": "重新整理網上頻道嘅資訊。",
     "TaskRefreshChannels": "重新載入頻道",
-    "TaskCleanTranscodeDescription": "刪除超過一天的轉碼檔案。",
+    "TaskCleanTranscodeDescription": "自動刪除超過一日嘅轉碼檔案。",
     "TaskCleanTranscode": "清理轉碼檔資料夾",
-    "TaskUpdatePluginsDescription": "下載並更新能夠被自動更新的插件。",
-    "TaskRefreshPeopleDescription": "更新你的媒體中有關的演員和導演的元數據。",
-    "TaskCleanLogsDescription": "刪除超過{0}天的紀錄檔。",
+    "TaskUpdatePluginsDescription": "自動幫嗰啲設咗要自動更新嘅插件進行下載同安裝。",
+    "TaskRefreshPeopleDescription": "更新媒體庫入面演員同導演嘅元數據。",
+    "TaskCleanLogsDescription": "自動刪除超過 {0} 日嘅紀錄檔。",
     "TaskCleanLogs": "清理紀錄檔資料夾",
     "TaskRefreshLibrary": "掃描媒體庫",
-    "TaskRefreshChapterImagesDescription": "為帶有章節的影片建立縮圖。",
+    "TaskRefreshChapterImagesDescription": "幫有章節嘅影片整返啲章節縮圖。",
     "TaskRefreshChapterImages": "提取章節圖像",
-    "TaskCleanCacheDescription": "刪除系統不再需要的緩存文件。",
+    "TaskCleanCacheDescription": "刪除系統已經唔再需要嘅緩存檔案。",
     "TaskCleanCache": "清理緩存資料夾",
     "TasksChannelsCategory": "網絡頻道",
     "TasksLibraryCategory": "媒體庫",
@@ -117,25 +117,25 @@
     "Undefined": "未定義",
     "Forced": "強制",
     "Default": "預設",
-    "TaskOptimizeDatabaseDescription": "壓縮數據庫及釋放可用空間。完成任何會修改數據庫的工作（例如掃描媒體庫）後，執行此工作或可提升伺服器速度。",
+    "TaskOptimizeDatabaseDescription": "壓縮數據庫並釋放剩餘空間。喺掃描媒體庫或者做咗一啲會修改數據庫嘅操作之後行呢個任務，或者可以提升效能。",
     "TaskOptimizeDatabase": "最佳化數據庫",
-    "TaskCleanActivityLogDescription": "刪除早於設定時間的活動記錄。",
-    "TaskKeyframeExtractorDescription": "提取關鍵影格（Keyframe）以建立更準確的 HLS playlist。此工作可能需要使用較長時間來完成。",
+    "TaskCleanActivityLogDescription": "刪除超過設定日期嘅活動記錄。",
+    "TaskKeyframeExtractorDescription": "提取關鍵影格（Keyframe）嚟建立更準確嘅 HLS 播放列表。呢個任務可能要行好耐。",
     "TaskKeyframeExtractor": "關鍵影格提取器",
     "External": "外部",
     "HearingImpaired": "聽力障礙",
     "TaskRefreshTrickplayImages": "建立 Trickplay 圖像",
-    "TaskRefreshTrickplayImagesDescription": "為已啟用 Trickplay 的媒體庫內的影片建立 Trickplay 預覽圖。",
+    "TaskRefreshTrickplayImagesDescription": "為已啟用功能嘅媒體庫影片製作快轉預覽圖。",
     "TaskExtractMediaSegments": "掃描媒體分段資訊",
-    "TaskExtractMediaSegmentsDescription": "從允許MediaSegment 功能的插件中獲取媒體片段。",
+    "TaskExtractMediaSegmentsDescription": "從支援 MediaSegment 功能嘅插件入面提取媒體片段。",
     "TaskDownloadMissingLyrics": "下載欠缺歌詞",
-    "TaskDownloadMissingLyricsDescription": "下載歌詞",
-    "TaskCleanCollectionsAndPlaylists": "整理媒體與播放清單",
+    "TaskDownloadMissingLyricsDescription": "幫啲歌下載歌詞",
+    "TaskCleanCollectionsAndPlaylists": "清理媒體系列（Collections）同埋播放清單",
     "TaskAudioNormalization": "音訊同等化",
-    "TaskAudioNormalizationDescription": "掃描檔案裏的音訊同等化資料。",
-    "TaskCleanCollectionsAndPlaylistsDescription": "從資料庫及播放清單中移除已不存在的項目。",
-    "TaskMoveTrickplayImagesDescription": "根據媒體庫設定移動現有的 Trickplay 檔案。",
-    "TaskMoveTrickplayImages": "轉移 Trickplay 影像位置",
-    "CleanupUserDataTask": "用戶資料清理工作",
-    "CleanupUserDataTaskDescription": "從用戶數據中清除已經被刪除超過 90 日的媒體相關資料。"
+    "TaskAudioNormalizationDescription": "掃描檔案入面嘅音訊標准化（Audio Normalization）數據。",
+    "TaskCleanCollectionsAndPlaylistsDescription": "自動清理資料庫同播放清單入面已經唔存在嘅項目。",
+    "TaskMoveTrickplayImagesDescription": "根據媒體庫設定，將現有嘅 Trickplay（快轉預覽）檔案搬去對應位置。",
+    "TaskMoveTrickplayImages": "搬移快轉預覽圖嘅位置",
+    "CleanupUserDataTask": "清理用戶資料嘅任務",
+    "CleanupUserDataTaskDescription": "從用戶數據入面清除嗰啲已經被刪除咗超過 90 日嘅媒體相關資料。"
 }

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);

Emby.Server.Implementations/Sorting/OfficialRatingComparer.cs

@@ -41,8 +41,8 @@ public class OfficialRatingComparer : IBaseItemComparer
         ArgumentNullException.ThrowIfNull(y);
         var zeroRating = new ParentalRatingScore(0, 0);
 
-        var ratingX = string.IsNullOrEmpty(x.OfficialRating) ? zeroRating : _localizationManager.GetRatingScore(x.OfficialRating) ?? zeroRating;
-        var ratingY = string.IsNullOrEmpty(y.OfficialRating) ? zeroRating : _localizationManager.GetRatingScore(y.OfficialRating) ?? zeroRating;
+        var ratingX = string.IsNullOrEmpty(x.OfficialRating) ? zeroRating : _localizationManager.GetRatingScore(x.OfficialRating, x.GetPreferredMetadataCountryCode()) ?? zeroRating;
+        var ratingY = string.IsNullOrEmpty(y.OfficialRating) ? zeroRating : _localizationManager.GetRatingScore(y.OfficialRating, y.GetPreferredMetadataCountryCode()) ?? zeroRating;
         var scoreCompare = ratingX.Score.CompareTo(ratingY.Score);
         if (scoreCompare is 0)
         {

Jellyfin.Api/Controllers/ArtistsController.cs

@@ -187,39 +187,7 @@ public class ArtistsController : BaseJellyfinApiController
             }).Where(i => i is not null).Select(i => i!.Id).ToArray();
         }
 
-        foreach (var filter in filters)
-        {
-            switch (filter)
-            {
-                case ItemFilter.Dislikes:
-                    query.IsLiked = false;
-                    break;
-                case ItemFilter.IsFavorite:
-                    query.IsFavorite = true;
-                    break;
-                case ItemFilter.IsFavoriteOrLikes:
-                    query.IsFavoriteOrLiked = true;
-                    break;
-                case ItemFilter.IsFolder:
-                    query.IsFolder = true;
-                    break;
-                case ItemFilter.IsNotFolder:
-                    query.IsFolder = false;
-                    break;
-                case ItemFilter.IsPlayed:
-                    query.IsPlayed = true;
-                    break;
-                case ItemFilter.IsResumable:
-                    query.IsResumable = true;
-                    break;
-                case ItemFilter.IsUnplayed:
-                    query.IsPlayed = false;
-                    break;
-                case ItemFilter.Likes:
-                    query.IsLiked = true;
-                    break;
-            }
-        }
+        query.ApplyFilters(filters);
 
         var result = _libraryManager.GetArtists(query);
 
@@ -390,39 +358,7 @@ public class ArtistsController : BaseJellyfinApiController
             }).Where(i => i is not null).Select(i => i!.Id).ToArray();
         }
 
-        foreach (var filter in filters)
-        {
-            switch (filter)
-            {
-                case ItemFilter.Dislikes:
-                    query.IsLiked = false;
-                    break;
-                case ItemFilter.IsFavorite:
-                    query.IsFavorite = true;
-                    break;
-                case ItemFilter.IsFavoriteOrLikes:
-                    query.IsFavoriteOrLiked = true;
-                    break;
-                case ItemFilter.IsFolder:
-                    query.IsFolder = true;
-                    break;
-                case ItemFilter.IsNotFolder:
-                    query.IsFolder = false;
-                    break;
-                case ItemFilter.IsPlayed:
-                    query.IsPlayed = true;
-                    break;
-                case ItemFilter.IsResumable:
-                    query.IsResumable = true;
-                    break;
-                case ItemFilter.IsUnplayed:
-                    query.IsPlayed = false;
-                    break;
-                case ItemFilter.Likes:
-                    query.IsLiked = true;
-                    break;
-            }
-        }
+        query.ApplyFilters(filters);
 
         var result = _libraryManager.GetAlbumArtists(query);
 

Jellyfin.Api/Controllers/ChannelsController.cs

@@ -136,45 +136,13 @@ public class ChannelsController : BaseJellyfinApiController
         {
             Limit = limit,
             StartIndex = startIndex,
-            ChannelIds = new[] { channelId },
+            ChannelIds = [channelId],
             ParentId = folderId ?? Guid.Empty,
             OrderBy = RequestHelpers.GetOrderBy(sortBy, sortOrder),
             DtoOptions = new DtoOptions { Fields = fields }
         };
 
-        foreach (var filter in filters)
-        {
-            switch (filter)
-            {
-                case ItemFilter.IsFolder:
-                    query.IsFolder = true;
-                    break;
-                case ItemFilter.IsNotFolder:
-                    query.IsFolder = false;
-                    break;
-                case ItemFilter.IsUnplayed:
-                    query.IsPlayed = false;
-                    break;
-                case ItemFilter.IsPlayed:
-                    query.IsPlayed = true;
-                    break;
-                case ItemFilter.IsFavorite:
-                    query.IsFavorite = true;
-                    break;
-                case ItemFilter.IsResumable:
-                    query.IsResumable = true;
-                    break;
-                case ItemFilter.Likes:
-                    query.IsLiked = true;
-                    break;
-                case ItemFilter.Dislikes:
-                    query.IsLiked = false;
-                    break;
-                case ItemFilter.IsFavoriteOrLikes:
-                    query.IsFavoriteOrLiked = true;
-                    break;
-            }
-        }
+        query.ApplyFilters(filters);
 
         return await _channelManager.GetChannelItems(query, CancellationToken.None).ConfigureAwait(false);
     }
@@ -215,39 +183,7 @@ public class ChannelsController : BaseJellyfinApiController
             DtoOptions = new DtoOptions { Fields = fields }
         };
 
-        foreach (var filter in filters)
-        {
-            switch (filter)
-            {
-                case ItemFilter.IsFolder:
-                    query.IsFolder = true;
-                    break;
-                case ItemFilter.IsNotFolder:
-                    query.IsFolder = false;
-                    break;
-                case ItemFilter.IsUnplayed:
-                    query.IsPlayed = false;
-                    break;
-                case ItemFilter.IsPlayed:
-                    query.IsPlayed = true;
-                    break;
-                case ItemFilter.IsFavorite:
-                    query.IsFavorite = true;
-                    break;
-                case ItemFilter.IsResumable:
-                    query.IsResumable = true;
-                    break;
-                case ItemFilter.Likes:
-                    query.IsLiked = true;
-                    break;
-                case ItemFilter.Dislikes:
-                    query.IsLiked = false;
-                    break;
-                case ItemFilter.IsFavoriteOrLikes:
-                    query.IsFavoriteOrLiked = true;
-                    break;
-            }
-        }
+        query.ApplyFilters(filters);
 
         return await _channelManager.GetLatestChannelItems(query, CancellationToken.None).ConfigureAwait(false);
     }

Jellyfin.Api/Controllers/DisplayPreferencesController.cs

@@ -191,9 +191,17 @@ public class DisplayPreferencesController : BaseJellyfinApiController
 
         foreach (var key in displayPreferences.CustomPrefs.Keys.Where(key => key.StartsWith("landing-", StringComparison.OrdinalIgnoreCase)))
         {
-            if (!Enum.TryParse<ViewType>(displayPreferences.CustomPrefs[key], true, out _))
+            var viewType = displayPreferences.CustomPrefs[key];
+
+            if (string.IsNullOrEmpty(viewType))
             {
-                _logger.LogError("Invalid ViewType: {LandingScreenOption}", displayPreferences.CustomPrefs[key]);
+                displayPreferences.CustomPrefs.Remove(key);
+                continue;
+            }
+
+            if (!Enum.TryParse<ViewType>(viewType, true, out _))
+            {
+                _logger.LogError("Invalid ViewType: {LandingScreenOption}", viewType);
                 displayPreferences.CustomPrefs.Remove(key);
             }
         }

Jellyfin.Api/Controllers/DynamicHlsController.cs

@@ -1403,8 +1403,8 @@ public class DynamicHlsController : BaseJellyfinApiController
         double fps = state.TargetFramerate ?? 0.0f;
         int segmentLength = state.SegmentLength * 1000;
 
-        // If framerate is fractional (i.e. 23.976), we need to slightly adjust segment length
-        if (Math.Abs(fps - Math.Floor(fps + 0.001f)) > 0.001)
+        // If video is transcoded and framerate is fractional (i.e. 23.976), we need to slightly adjust segment length
+        if (!EncodingHelper.IsCopyCodec(state.OutputVideoCodec) && Math.Abs(fps - Math.Floor(fps + 0.001f)) > 0.001)
         {
             double nearestIntFramerate = Math.Ceiling(fps);
             segmentLength = (int)Math.Ceiling(segmentLength * (nearestIntFramerate / fps));

Jellyfin.Api/Controllers/ItemUpdateController.cs

@@ -249,7 +249,7 @@ public class ItemUpdateController : BaseJellyfinApiController
         item.IndexNumber = request.IndexNumber;
         item.ParentIndexNumber = request.ParentIndexNumber;
         item.Overview = request.Overview;
-        item.Genres = request.Genres;
+        item.Genres = request.Genres.Distinct(StringComparer.OrdinalIgnoreCase).ToArray();
 
         if (item is Episode episode)
         {
@@ -270,7 +270,7 @@ public class ItemUpdateController : BaseJellyfinApiController
 
         if (request.Studios is not null)
         {
-            item.Studios = Array.ConvertAll(request.Studios, x => x.Name);
+            item.Studios = Array.ConvertAll(request.Studios, x => x.Name).Distinct(StringComparer.OrdinalIgnoreCase).ToArray();
         }
 
         if (request.DateCreated.HasValue)
@@ -287,7 +287,7 @@ public class ItemUpdateController : BaseJellyfinApiController
         item.CustomRating = request.CustomRating;
 
         var currentTags = item.Tags;
-        var newTags = request.Tags;
+        var newTags = request.Tags.Distinct(StringComparer.OrdinalIgnoreCase).ToArray();
         var removedTags = currentTags.Except(newTags).ToList();
         var addedTags = newTags.Except(currentTags).ToList();
         item.Tags = newTags;
@@ -373,7 +373,7 @@ public class ItemUpdateController : BaseJellyfinApiController
 
         if (request.ProductionLocations is not null)
         {
-            item.ProductionLocations = request.ProductionLocations;
+            item.ProductionLocations = request.ProductionLocations.Distinct(StringComparer.OrdinalIgnoreCase).ToArray();
         }
 
         item.PreferredMetadataCountryCode = request.PreferredMetadataCountryCode;
@@ -421,7 +421,7 @@ public class ItemUpdateController : BaseJellyfinApiController
         {
             if (item is IHasAlbumArtist hasAlbumArtists)
             {
-                hasAlbumArtists.AlbumArtists = Array.ConvertAll(request.AlbumArtists, i => i.Name.Trim());
+                hasAlbumArtists.AlbumArtists = Array.ConvertAll(request.AlbumArtists, i => i.Name.Trim()).Distinct(StringComparer.OrdinalIgnoreCase).ToArray();
             }
         }
 
@@ -429,7 +429,7 @@ public class ItemUpdateController : BaseJellyfinApiController
         {
             if (item is IHasArtist hasArtists)
             {
-                hasArtists.Artists = Array.ConvertAll(request.ArtistItems, i => i.Name.Trim());
+                hasArtists.Artists = Array.ConvertAll(request.ArtistItems, i => i.Name.Trim()).Distinct(StringComparer.OrdinalIgnoreCase).ToArray();
             }
         }
 

Jellyfin.Api/Controllers/ItemsController.cs

@@ -386,39 +386,7 @@ public class ItemsController : BaseJellyfinApiController
                 query.CollapseBoxSetItems = false;
             }
 
-            foreach (var filter in filters)
-            {
-                switch (filter)
-                {
-                    case ItemFilter.Dislikes:
-                        query.IsLiked = false;
-                        break;
-                    case ItemFilter.IsFavorite:
-                        query.IsFavorite = true;
-                        break;
-                    case ItemFilter.IsFavoriteOrLikes:
-                        query.IsFavoriteOrLiked = true;
-                        break;
-                    case ItemFilter.IsFolder:
-                        query.IsFolder = true;
-                        break;
-                    case ItemFilter.IsNotFolder:
-                        query.IsFolder = false;
-                        break;
-                    case ItemFilter.IsPlayed:
-                        query.IsPlayed = true;
-                        break;
-                    case ItemFilter.IsResumable:
-                        query.IsResumable = true;
-                        break;
-                    case ItemFilter.IsUnplayed:
-                        query.IsPlayed = false;
-                        break;
-                    case ItemFilter.Likes:
-                        query.IsLiked = true;
-                        break;
-                }
-            }
+            query.ApplyFilters(filters);
 
             // Filter by Series Status
             if (seriesStatus.Length != 0)

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();
     }
 

Jellyfin.Api/Controllers/QuickConnectController.cs

@@ -52,6 +52,7 @@ public class QuickConnectController : BaseJellyfinApiController
     /// <returns>A <see cref="QuickConnectResult"/> with a secret and code for future use or an error message.</returns>
     [HttpPost("Initiate")]
     [ProducesResponseType(StatusCodes.Status200OK)]
+    [ProducesResponseType(StatusCodes.Status401Unauthorized)]
     public async Task<ActionResult<QuickConnectResult>> InitiateQuickConnect()
     {
         try

Jellyfin.Api/Helpers/StreamingHelpers.cs

@@ -268,7 +268,7 @@ public static class StreamingHelpers
         Dictionary<string, string?> streamOptions = new Dictionary<string, string?>();
         foreach (var param in queryString)
         {
-            if (char.IsLower(param.Key[0]))
+            if (param.Key.Length > 0 && char.IsLower(param.Key[0]))
             {
                 // This was probably not parsed initially and should be a StreamOptions
                 // or the generated URL should correctly serialize it

Jellyfin.Server.Implementations/Item/BaseItemRepository.cs

@@ -683,14 +683,15 @@ public sealed class BaseItemRepository
             .SelectMany(f => f.Values)
             .Distinct()
             .ToArray();
+
+        var types = allListedItemValues.Select(e => e.MagicNumber).Distinct().ToArray();
+        var values = allListedItemValues.Select(e => e.Value).Distinct().ToArray();
+        var allListedItemValuesSet = allListedItemValues.ToHashSet();
+
         var existingValues = context.ItemValues
-            .Select(e => new
-            {
-                item = e,
-                Key = e.Type + "+" + e.Value
-            })
-            .Where(f => allListedItemValues.Select(e => $"{(int)e.MagicNumber}+{e.Value}").Contains(f.Key))
-            .Select(e => e.item)
+            .Where(e => types.Contains(e.Type) && values.Contains(e.Value))
+            .AsEnumerable()
+            .Where(e => allListedItemValuesSet.Contains((e.Type, e.Value)))
             .ToArray();
         var missingItemValues = allListedItemValues.Except(existingValues.Select(f => (MagicNumber: f.Type, f.Value))).Select(f => new ItemValue()
         {
@@ -1050,7 +1051,7 @@ public sealed class BaseItemRepository
         entity.TotalBitrate = dto.TotalBitrate;
         entity.ExternalId = dto.ExternalId;
         entity.Size = dto.Size;
-        entity.Genres = string.Join('|', dto.Genres);
+        entity.Genres = string.Join('|', dto.Genres.Distinct(StringComparer.OrdinalIgnoreCase));
         entity.DateCreated = dto.DateCreated == DateTime.MinValue ? null : dto.DateCreated;
         entity.DateModified = dto.DateModified == DateTime.MinValue ? null : dto.DateModified;
         entity.ChannelId = dto.ChannelId;
@@ -1077,9 +1078,9 @@ public sealed class BaseItemRepository
         }
 
         entity.ExtraIds = dto.ExtraIds is not null ? string.Join('|', dto.ExtraIds) : null;
-        entity.ProductionLocations = dto.ProductionLocations is not null ? string.Join('|', dto.ProductionLocations.Where(p => !string.IsNullOrWhiteSpace(p))) : null;
-        entity.Studios = dto.Studios is not null ? string.Join('|', dto.Studios) : null;
-        entity.Tags = dto.Tags is not null ? string.Join('|', dto.Tags) : null;
+        entity.ProductionLocations = dto.ProductionLocations is not null ? string.Join('|', dto.ProductionLocations.Where(p => !string.IsNullOrWhiteSpace(p)).Distinct(StringComparer.OrdinalIgnoreCase)) : null;
+        entity.Studios = dto.Studios is not null ? string.Join('|', dto.Studios.Distinct(StringComparer.OrdinalIgnoreCase)) : null;
+        entity.Tags = dto.Tags is not null ? string.Join('|', dto.Tags.Distinct(StringComparer.OrdinalIgnoreCase)) : null;
         entity.LockedFields = dto.LockedFields is not null ? dto.LockedFields
             .Select(e => new BaseItemMetadataField()
             {
@@ -1122,12 +1123,12 @@ public sealed class BaseItemRepository
 
         if (dto is IHasArtist hasArtists)
         {
-            entity.Artists = hasArtists.Artists is not null ? string.Join('|', hasArtists.Artists) : null;
+            entity.Artists = hasArtists.Artists is not null ? string.Join('|', hasArtists.Artists.Distinct(StringComparer.OrdinalIgnoreCase)) : null;
         }
 
         if (dto is IHasAlbumArtist hasAlbumArtists)
         {
-            entity.AlbumArtists = hasAlbumArtists.AlbumArtists is not null ? string.Join('|', hasAlbumArtists.AlbumArtists) : null;
+            entity.AlbumArtists = hasAlbumArtists.AlbumArtists is not null ? string.Join('|', hasAlbumArtists.AlbumArtists.Distinct(StringComparer.OrdinalIgnoreCase)) : null;
         }
 
         if (dto is LiveTvProgram program)

Jellyfin.Server.Implementations/Item/PeopleRepository.cs

@@ -74,9 +74,10 @@ public class PeopleRepository(IDbContextFactory<JellyfinDbContext> dbProvider, I
     /// <inheritdoc />
     public void UpdatePeople(Guid itemId, IReadOnlyList<PersonInfo> people)
     {
-        foreach (var item in people.Where(e => e.Role is null))
+        foreach (var person in people)
         {
-            item.Role = string.Empty;
+            person.Name = person.Name.Trim();
+            person.Role = person.Role?.Trim() ?? string.Empty;
         }
 
         // multiple metadata providers can provide the _same_ person

Jellyfin.Server/Extensions/ApiApplicationBuilderExtensions.cs

@@ -3,7 +3,7 @@ using Jellyfin.Api.Middleware;
 using MediaBrowser.Common.Net;
 using MediaBrowser.Controller.Configuration;
 using Microsoft.AspNetCore.Builder;
-using Microsoft.OpenApi.Models;
+using Microsoft.OpenApi;
 
 namespace Jellyfin.Server.Extensions
 {

Jellyfin.Server/Extensions/ApiServiceCollectionExtensions.cs

@@ -1,11 +1,11 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
-using System.Linq;
 using System.Net;
 using System.Net.Sockets;
 using System.Reflection;
 using System.Security.Claims;
+using System.Text.Json.Nodes;
 using Emby.Server.Implementations;
 using Jellyfin.Api.Auth;
 using Jellyfin.Api.Auth.AnonymousLanAccessPolicy;
@@ -26,7 +26,6 @@ using Jellyfin.Server.Filters;
 using MediaBrowser.Common.Api;
 using MediaBrowser.Common.Net;
 using MediaBrowser.Model.Entities;
-using MediaBrowser.Model.Session;
 using Microsoft.AspNetCore.Authentication;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Builder;
@@ -34,9 +33,7 @@ using Microsoft.AspNetCore.Cors.Infrastructure;
 using Microsoft.AspNetCore.HttpOverrides;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.DependencyInjection.Extensions;
-using Microsoft.OpenApi.Any;
-using Microsoft.OpenApi.Interfaces;
-using Microsoft.OpenApi.Models;
+using Microsoft.OpenApi;
 using Swashbuckle.AspNetCore.Swagger;
 using Swashbuckle.AspNetCore.SwaggerGen;
 using AuthenticationSchemes = Jellyfin.Api.Constants.AuthenticationSchemes;
@@ -208,7 +205,7 @@ namespace Jellyfin.Server.Extensions
                     {
                         {
                             "x-jellyfin-version",
-                            new OpenApiString(version)
+                            new JsonNodeExtension(JsonValue.Create(version))
                         }
                     }
                 });
@@ -262,6 +259,7 @@ namespace Jellyfin.Server.Extensions
                 c.OperationFilter<FileRequestFilter>();
                 c.OperationFilter<ParameterObsoleteFilter>();
                 c.DocumentFilter<AdditionalModelFilter>();
+                c.DocumentFilter<SecuritySchemeReferenceFixupFilter>();
             })
             .Replace(ServiceDescriptor.Transient<ISwaggerProvider, CachingOpenApiProvider>());
         }
@@ -333,10 +331,10 @@ namespace Jellyfin.Server.Extensions
             options.MapType<Dictionary<ImageType, string>>(() =>
                 new OpenApiSchema
                 {
-                    Type = "object",
+                    Type = JsonSchemaType.Object,
                     AdditionalProperties = new OpenApiSchema
                     {
-                        Type = "string"
+                        Type = JsonSchemaType.String
                     }
                 });
 
@@ -344,18 +342,17 @@ namespace Jellyfin.Server.Extensions
             options.MapType<Dictionary<string, string?>>(() =>
                 new OpenApiSchema
                 {
-                    Type = "object",
+                    Type = JsonSchemaType.Object,
                     AdditionalProperties = new OpenApiSchema
                     {
-                        Type = "string",
-                        Nullable = true
+                        Type = JsonSchemaType.String | JsonSchemaType.Null
                     }
                 });
 
             // Swashbuckle doesn't use JsonOptions to describe responses, so we need to manually describe it.
             options.MapType<Version>(() => new OpenApiSchema
             {
-                Type = "string"
+                Type = JsonSchemaType.String
             });
         }
     }

Jellyfin.Server/Filters/AdditionalModelFilter.cs

@@ -3,18 +3,17 @@ using System.Collections.Generic;
 using System.ComponentModel;
 using System.Linq;
 using System.Reflection;
+using System.Text.Json.Nodes;
 using Jellyfin.Extensions;
 using Jellyfin.Server.Migrations;
 using MediaBrowser.Common.Plugins;
 using MediaBrowser.Controller.Configuration;
 using MediaBrowser.Controller.Net;
 using MediaBrowser.Controller.Net.WebSocketMessages;
-using MediaBrowser.Controller.Net.WebSocketMessages.Outbound;
 using MediaBrowser.Model.ApiClient;
 using MediaBrowser.Model.Session;
 using MediaBrowser.Model.SyncPlay;
-using Microsoft.OpenApi.Any;
-using Microsoft.OpenApi.Models;
+using Microsoft.OpenApi;
 using Swashbuckle.AspNetCore.SwaggerGen;
 
 namespace Jellyfin.Server.Filters
@@ -25,7 +24,7 @@ namespace Jellyfin.Server.Filters
     public class AdditionalModelFilter : IDocumentFilter
     {
         // Array of options that should not be visible in the api spec.
-        private static readonly Type[] _ignoredConfigurations = { typeof(MigrationOptions), typeof(MediaBrowser.Model.Branding.BrandingOptions) };
+        private static readonly Type[] _ignoredConfigurations = [typeof(MigrationOptions), typeof(MediaBrowser.Model.Branding.BrandingOptions)];
         private readonly IServerConfigurationManager _serverConfigurationManager;
 
         /// <summary>
@@ -48,8 +47,8 @@ namespace Jellyfin.Server.Filters
                             && t != typeof(WebSocketMessageInfo))
                 .ToList();
 
-            var inboundWebSocketSchemas = new List<OpenApiSchema>();
-            var inboundWebSocketDiscriminators = new Dictionary<string, string>();
+            var inboundWebSocketSchemas = new List<IOpenApiSchema>();
+            var inboundWebSocketDiscriminators = new Dictionary<string, OpenApiSchemaReference>();
             foreach (var type in webSocketTypes.Where(t => typeof(IInboundWebSocketMessage).IsAssignableFrom(t)))
             {
                 var messageType = (SessionMessageType?)type.GetProperty(nameof(WebSocketMessage.MessageType))?.GetCustomAttribute<DefaultValueAttribute>()?.Value;
@@ -60,18 +59,16 @@ namespace Jellyfin.Server.Filters
 
                 var schema = context.SchemaGenerator.GenerateSchema(type, context.SchemaRepository);
                 inboundWebSocketSchemas.Add(schema);
-                inboundWebSocketDiscriminators[messageType.ToString()!] = schema.Reference.ReferenceV3;
+                if (schema is OpenApiSchemaReference schemaRef)
+                {
+                    inboundWebSocketDiscriminators[messageType.ToString()!] = schemaRef;
+                }
             }
 
             var inboundWebSocketMessageSchema = new OpenApiSchema
             {
-                Type = "object",
+                Type = JsonSchemaType.Object,
                 Description = "Represents the list of possible inbound websocket types",
-                Reference = new OpenApiReference
-                {
-                    Id = nameof(InboundWebSocketMessage),
-                    Type = ReferenceType.Schema
-                },
                 OneOf = inboundWebSocketSchemas,
                 Discriminator = new OpenApiDiscriminator
                 {
@@ -82,8 +79,8 @@ namespace Jellyfin.Server.Filters
 
             context.SchemaRepository.AddDefinition(nameof(InboundWebSocketMessage), inboundWebSocketMessageSchema);
 
-            var outboundWebSocketSchemas = new List<OpenApiSchema>();
-            var outboundWebSocketDiscriminators = new Dictionary<string, string>();
+            var outboundWebSocketSchemas = new List<IOpenApiSchema>();
+            var outboundWebSocketDiscriminators = new Dictionary<string, OpenApiSchemaReference>();
             foreach (var type in webSocketTypes.Where(t => typeof(IOutboundWebSocketMessage).IsAssignableFrom(t)))
             {
                 var messageType = (SessionMessageType?)type.GetProperty(nameof(WebSocketMessage.MessageType))?.GetCustomAttribute<DefaultValueAttribute>()?.Value;
@@ -94,58 +91,55 @@ namespace Jellyfin.Server.Filters
 
                 var schema = context.SchemaGenerator.GenerateSchema(type, context.SchemaRepository);
                 outboundWebSocketSchemas.Add(schema);
-                outboundWebSocketDiscriminators.Add(messageType.ToString()!, schema.Reference.ReferenceV3);
+                if (schema is OpenApiSchemaReference schemaRef)
+                {
+                    outboundWebSocketDiscriminators.Add(messageType.ToString()!, schemaRef);
+                }
             }
 
             // Add custom "SyncPlayGroupUpdateMessage" schema because Swashbuckle cannot generate it for us
             var syncPlayGroupUpdateMessageSchema = new OpenApiSchema
             {
-                Type = "object",
+                Type = JsonSchemaType.Object,
                 Description = "Untyped sync play command.",
-                Properties = new Dictionary<string, OpenApiSchema>
+                Properties = new Dictionary<string, IOpenApiSchema>
                 {
                     {
                         "Data", new OpenApiSchema
                         {
-                            AllOf =
-                            [
-                                new OpenApiSchema { Reference = new OpenApiReference { Type = ReferenceType.Schema, Id = nameof(GroupUpdate<object>) } }
-                            ],
+                            AllOf = new List<IOpenApiSchema>
+                            {
+                                new OpenApiSchemaReference(nameof(GroupUpdate<object>), null, null)
+                            },
                             Description = "Group update data",
-                            Nullable = false,
                         }
                     },
-                    { "MessageId", new OpenApiSchema { Type = "string", Format = "uuid", Description = "Gets or sets the message id." } },
+                    { "MessageId", new OpenApiSchema { Type = JsonSchemaType.String, Format = "uuid", Description = "Gets or sets the message id." } },
                     {
                         "MessageType", new OpenApiSchema
                         {
-                            Enum = Enum.GetValues<SessionMessageType>().Select(type => new OpenApiString(type.ToString())).ToList<IOpenApiAny>(),
-                            AllOf =
-                            [
-                                new OpenApiSchema { Reference = new OpenApiReference { Type = ReferenceType.Schema, Id = nameof(SessionMessageType) } }
-                            ],
+                            Enum = Enum.GetValues<SessionMessageType>().Select(type => (JsonNode)JsonValue.Create(type.ToString())!).ToList(),
+                            AllOf = new List<IOpenApiSchema>
+                            {
+                                new OpenApiSchemaReference(nameof(SessionMessageType), null, null)
+                            },
                             Description = "The different kinds of messages that are used in the WebSocket api.",
-                            Default = new OpenApiString(nameof(SessionMessageType.SyncPlayGroupUpdate)),
+                            Default = JsonValue.Create(nameof(SessionMessageType.SyncPlayGroupUpdate)),
                             ReadOnly = true
                         }
                     },
                 },
                 AdditionalPropertiesAllowed = false,
-                Reference = new OpenApiReference { Type = ReferenceType.Schema, Id = "SyncPlayGroupUpdateMessage" }
             };
             context.SchemaRepository.AddDefinition("SyncPlayGroupUpdateMessage", syncPlayGroupUpdateMessageSchema);
-            outboundWebSocketSchemas.Add(syncPlayGroupUpdateMessageSchema);
-            outboundWebSocketDiscriminators[nameof(SessionMessageType.SyncPlayGroupUpdate)] = syncPlayGroupUpdateMessageSchema.Reference.ReferenceV3;
+            var syncPlayRef = new OpenApiSchemaReference("SyncPlayGroupUpdateMessage", null, null);
+            outboundWebSocketSchemas.Add(syncPlayRef);
+            outboundWebSocketDiscriminators[nameof(SessionMessageType.SyncPlayGroupUpdate)] = syncPlayRef;
 
             var outboundWebSocketMessageSchema = new OpenApiSchema
             {
-                Type = "object",
+                Type = JsonSchemaType.Object,
                 Description = "Represents the list of possible outbound websocket types",
-                Reference = new OpenApiReference
-                {
-                    Id = nameof(OutboundWebSocketMessage),
-                    Type = ReferenceType.Schema
-                },
                 OneOf = outboundWebSocketSchemas,
                 Discriminator = new OpenApiDiscriminator
                 {
@@ -159,17 +153,12 @@ namespace Jellyfin.Server.Filters
                 nameof(WebSocketMessage),
                 new OpenApiSchema
                 {
-                    Type = "object",
+                    Type = JsonSchemaType.Object,
                     Description = "Represents the possible websocket types",
-                    Reference = new OpenApiReference
+                    OneOf = new List<IOpenApiSchema>
                     {
-                        Id = nameof(WebSocketMessage),
-                        Type = ReferenceType.Schema
-                    },
-                    OneOf = new[]
-                    {
-                        inboundWebSocketMessageSchema,
-                        outboundWebSocketMessageSchema
+                        new OpenApiSchemaReference(nameof(InboundWebSocketMessage), null, null),
+                        new OpenApiSchemaReference(nameof(OutboundWebSocketMessage), null, null)
                     }
                 });
 
@@ -180,8 +169,8 @@ namespace Jellyfin.Server.Filters
                             && t.BaseType.GetGenericTypeDefinition() == typeof(GroupUpdate<>))
                 .ToList();
 
-            var groupUpdateSchemas = new List<OpenApiSchema>();
-            var groupUpdateDiscriminators = new Dictionary<string, string>();
+            var groupUpdateSchemas = new List<IOpenApiSchema>();
+            var groupUpdateDiscriminators = new Dictionary<string, OpenApiSchemaReference>();
             foreach (var type in groupUpdateTypes)
             {
                 var groupUpdateType = (GroupUpdateType?)type.GetProperty(nameof(GroupUpdate<object>.Type))?.GetCustomAttribute<DefaultValueAttribute>()?.Value;
@@ -192,18 +181,16 @@ namespace Jellyfin.Server.Filters
 
                 var schema = context.SchemaGenerator.GenerateSchema(type, context.SchemaRepository);
                 groupUpdateSchemas.Add(schema);
-                groupUpdateDiscriminators[groupUpdateType.ToString()!] = schema.Reference.ReferenceV3;
+                if (schema is OpenApiSchemaReference schemaRef)
+                {
+                    groupUpdateDiscriminators[groupUpdateType.ToString()!] = schemaRef;
+                }
             }
 
             var groupUpdateSchema = new OpenApiSchema
             {
-                Type = "object",
+                Type = JsonSchemaType.Object,
                 Description = "Represents the list of possible group update types",
-                Reference = new OpenApiReference
-                {
-                    Id = nameof(GroupUpdate<object>),
-                    Type = ReferenceType.Schema
-                },
                 OneOf = groupUpdateSchemas,
                 Discriminator = new OpenApiDiscriminator
                 {

Jellyfin.Server/Filters/CachingOpenApiProvider.cs

@@ -4,7 +4,7 @@ using Microsoft.AspNetCore.Mvc.ApiExplorer;
 using Microsoft.Extensions.Caching.Memory;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
-using Microsoft.OpenApi.Models;
+using Microsoft.OpenApi;
 using Swashbuckle.AspNetCore.Swagger;
 using Swashbuckle.AspNetCore.SwaggerGen;
 
@@ -48,7 +48,7 @@ internal sealed class CachingOpenApiProvider : ISwaggerProvider
     }
 
     /// <inheritdoc />
-    public OpenApiDocument GetSwagger(string documentName, string? host = null, string? basePath = null)
+    public OpenApiDocument GetSwagger(string documentName, string host, string basePath)
     {
         if (_memoryCache.TryGetValue(CacheKey, out OpenApiDocument? openApiDocument) && openApiDocument is not null)
         {

Jellyfin.Server/Filters/FileRequestFilter.cs

@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 using Jellyfin.Api.Attributes;
-using Microsoft.OpenApi.Models;
+using Microsoft.OpenApi;
 using Swashbuckle.AspNetCore.SwaggerGen;
 
 namespace Jellyfin.Server.Filters
@@ -28,10 +28,11 @@ namespace Jellyfin.Server.Filters
             {
                 Schema = new OpenApiSchema
                 {
-                    Type = "string",
+                    Type = JsonSchemaType.String,
                     Format = "binary"
                 }
             };
+            body.Content ??= new System.Collections.Generic.Dictionary<string, OpenApiMediaType>();
             foreach (var contentType in contentTypes)
             {
                 body.Content.Add(contentType, mediaType);

Jellyfin.Server/Filters/FileResponseFilter.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Linq;
 using Jellyfin.Api.Attributes;
-using Microsoft.OpenApi.Models;
+using Microsoft.OpenApi;
 using Swashbuckle.AspNetCore.SwaggerGen;
 
 namespace Jellyfin.Server.Filters
@@ -14,7 +14,7 @@ namespace Jellyfin.Server.Filters
         {
             Schema = new OpenApiSchema
             {
-                Type = "string",
+                Type = JsonSchemaType.String,
                 Format = "binary"
             }
         };
@@ -22,6 +22,11 @@ namespace Jellyfin.Server.Filters
         /// <inheritdoc />
         public void Apply(OpenApiOperation operation, OperationFilterContext context)
         {
+            if (operation.Responses is null)
+            {
+                return;
+            }
+
             foreach (var attribute in context.ApiDescription.ActionDescriptor.EndpointMetadata)
             {
                 if (attribute is ProducesFileAttribute producesFileAttribute)
@@ -31,7 +36,7 @@ namespace Jellyfin.Server.Filters
                         .FirstOrDefault(o => o.Key.Equals(SuccessCode, StringComparison.Ordinal));
 
                     // Operation doesn't have a response.
-                    if (response.Value is null)
+                    if (response.Value?.Content is null)
                     {
                         continue;
                     }

Jellyfin.Server/Filters/FlagsEnumSchemaFilter.cs

@@ -1,5 +1,5 @@
 using System;
-using Microsoft.OpenApi.Models;
+using Microsoft.OpenApi;
 using Swashbuckle.AspNetCore.SwaggerGen;
 
 namespace Jellyfin.Server.Filters;
@@ -15,7 +15,7 @@ namespace Jellyfin.Server.Filters;
 public class FlagsEnumSchemaFilter : ISchemaFilter
 {
     /// <inheritdoc />
-    public void Apply(OpenApiSchema schema, SchemaFilterContext context)
+    public void Apply(IOpenApiSchema schema, SchemaFilterContext context)
     {
         var type = context.Type.IsEnum ? context.Type : Nullable.GetUnderlyingType(context.Type);
         if (type is null || !type.IsEnum)
@@ -29,11 +29,16 @@ public class FlagsEnumSchemaFilter : ISchemaFilter
             return;
         }
 
+        if (schema is not OpenApiSchema concreteSchema)
+        {
+            return;
+        }
+
         if (context.MemberInfo is null)
         {
             // Processing the enum definition itself - ensure it's type "string" not "integer"
-            schema.Type = "string";
-            schema.Format = null;
+            concreteSchema.Type = JsonSchemaType.String;
+            concreteSchema.Format = null;
         }
         else
         {
@@ -43,11 +48,11 @@ public class FlagsEnumSchemaFilter : ISchemaFilter
 
             // Flags enums should be represented as arrays referencing the enum schema
             // since multiple values can be combined
-            schema.Type = "array";
-            schema.Format = null;
-            schema.Enum = null;
-            schema.AllOf = null;
-            schema.Items = enumSchema;
+            concreteSchema.Type = JsonSchemaType.Array;
+            concreteSchema.Format = null;
+            concreteSchema.Enum = null;
+            concreteSchema.AllOf = null;
+            concreteSchema.Items = enumSchema;
         }
     }
 }

Jellyfin.Server/Filters/IgnoreEnumSchemaFilter.cs

@@ -2,9 +2,9 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
+using System.Text.Json.Nodes;
 using Jellyfin.Data.Attributes;
-using Microsoft.OpenApi.Any;
-using Microsoft.OpenApi.Models;
+using Microsoft.OpenApi;
 using Swashbuckle.AspNetCore.SwaggerGen;
 
 namespace Jellyfin.Server.Filters;
@@ -15,7 +15,7 @@ namespace Jellyfin.Server.Filters;
 public class IgnoreEnumSchemaFilter : ISchemaFilter
 {
     /// <inheritdoc />
-    public void Apply(OpenApiSchema schema, SchemaFilterContext context)
+    public void Apply(IOpenApiSchema schema, SchemaFilterContext context)
     {
         if (context.Type.IsEnum || (Nullable.GetUnderlyingType(context.Type)?.IsEnum ?? false))
         {
@@ -25,18 +25,23 @@ public class IgnoreEnumSchemaFilter : ISchemaFilter
                 return;
             }
 
-            var enumOpenApiStrings = new List<IOpenApiAny>();
+            if (schema is not OpenApiSchema concreteSchema)
+            {
+                return;
+            }
+
+            var enumOpenApiNodes = new List<JsonNode>();
 
             foreach (var enumName in Enum.GetNames(type))
             {
                 var member = type.GetMember(enumName)[0];
                 if (!member.GetCustomAttributes<OpenApiIgnoreEnumAttribute>().Any())
                 {
-                    enumOpenApiStrings.Add(new OpenApiString(enumName));
+                    enumOpenApiNodes.Add(JsonValue.Create(enumName)!);
                 }
             }
 
-            schema.Enum = enumOpenApiStrings;
+            concreteSchema.Enum = enumOpenApiNodes;
         }
     }
 }

Jellyfin.Server/Filters/ParameterObsoleteFilter.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Linq;
 using Jellyfin.Api.Attributes;
-using Microsoft.OpenApi.Models;
+using Microsoft.OpenApi;
 using Swashbuckle.AspNetCore.SwaggerGen;
 
 namespace Jellyfin.Server.Filters
@@ -21,11 +21,17 @@ namespace Jellyfin.Server.Filters
                     .OfType<ParameterObsoleteAttribute>()
                     .Any())
                 {
+                    if (operation.Parameters is null)
+                    {
+                        continue;
+                    }
+
                     foreach (var parameter in operation.Parameters)
                     {
-                        if (parameter.Name.Equals(parameterDescription.Name, StringComparison.Ordinal))
+                        if (parameter is OpenApiParameter concreteParam
+                            && string.Equals(concreteParam.Name, parameterDescription.Name, StringComparison.Ordinal))
                         {
-                            parameter.Deprecated = true;
+                            concreteParam.Deprecated = true;
                             break;
                         }
                     }

Jellyfin.Server/Filters/RetryOnTemporarilyUnavailableFilter.cs

@@ -1,5 +1,5 @@
 using System.Collections.Generic;
-using Microsoft.OpenApi.Models;
+using Microsoft.OpenApi;
 using Swashbuckle.AspNetCore.SwaggerGen;
 
 namespace Jellyfin.Server.Filters;
@@ -8,12 +8,12 @@ internal class RetryOnTemporarilyUnavailableFilter : IOperationFilter
 {
     public void Apply(OpenApiOperation operation, OperationFilterContext context)
     {
-        operation.Responses.TryAdd(
+        operation.Responses?.TryAdd(
             "503",
             new OpenApiResponse
             {
                 Description = "The server is currently starting or is temporarily not available.",
-                Headers = new Dictionary<string, OpenApiHeader>
+                Headers = new Dictionary<string, IOpenApiHeader>
                 {
                     {
                         "Retry-After", new OpenApiHeader
@@ -23,7 +23,7 @@ internal class RetryOnTemporarilyUnavailableFilter : IOperationFilter
                             Description = "A hint for when to retry the operation in full seconds.",
                             Schema = new OpenApiSchema
                             {
-                                Type = "integer",
+                                Type = JsonSchemaType.Integer,
                                 Format = "int32"
                             }
                         }
@@ -36,7 +36,7 @@ internal class RetryOnTemporarilyUnavailableFilter : IOperationFilter
                             Description = "A short plain-text reason why the server is not available.",
                             Schema = new OpenApiSchema
                             {
-                                Type = "string",
+                                Type = JsonSchemaType.String,
                                 Format = "text"
                             }
                         }

Jellyfin.Server/Filters/SecurityRequirementsOperationFilter.cs

@@ -5,7 +5,7 @@ using Jellyfin.Api.Auth.DefaultAuthorizationPolicy;
 using Jellyfin.Api.Constants;
 using Jellyfin.Extensions;
 using Microsoft.AspNetCore.Authorization;
-using Microsoft.OpenApi.Models;
+using Microsoft.OpenApi;
 using Swashbuckle.AspNetCore.SwaggerGen;
 
 namespace Jellyfin.Server.Filters;
@@ -66,17 +66,10 @@ public class SecurityRequirementsOperationFilter : IOperationFilter
             return;
         }
 
-        operation.Responses.TryAdd("401", new OpenApiResponse { Description = "Unauthorized" });
-        operation.Responses.TryAdd("403", new OpenApiResponse { Description = "Forbidden" });
+        operation.Responses?.TryAdd("401", new OpenApiResponse { Description = "Unauthorized" });
+        operation.Responses?.TryAdd("403", new OpenApiResponse { Description = "Forbidden" });
 
-        var scheme = new OpenApiSecurityScheme
-        {
-            Reference = new OpenApiReference
-            {
-                Type = ReferenceType.SecurityScheme,
-                Id = AuthenticationSchemes.CustomAuthentication
-            },
-        };
+        var scheme = new OpenApiSecuritySchemeReference(AuthenticationSchemes.CustomAuthentication, null, null);
 
         // Add DefaultAuthorization scope to any endpoint that has a policy with a requirement that is a subset of DefaultAuthorization.
         if (!requiredScopes.Contains(DefaultAuthPolicy.AsSpan(), StringComparison.Ordinal))

Jellyfin.Server/Filters/SecuritySchemeReferenceFixupFilter.cs

@@ -0,0 +1,56 @@
+using Microsoft.OpenApi;
+using Swashbuckle.AspNetCore.SwaggerGen;
+
+namespace Jellyfin.Server.Filters;
+
+/// <summary>
+/// Document filter that fixes security scheme references after document generation.
+/// </summary>
+/// <remarks>
+/// In Microsoft.OpenApi v2, <see cref="OpenApiSecuritySchemeReference"/> requires a resolved
+/// <c>Target</c> to serialize correctly. References created without a host document (as in
+/// operation filters) serialize as empty objects. This filter re-creates all security scheme
+/// references with the document context so they resolve properly during serialization.
+/// </remarks>
+internal class SecuritySchemeReferenceFixupFilter : IDocumentFilter
+{
+    /// <inheritdoc />
+    public void Apply(OpenApiDocument swaggerDoc, DocumentFilterContext context)
+    {
+        swaggerDoc.RegisterComponents();
+
+        if (swaggerDoc.Paths is null)
+        {
+            return;
+        }
+
+        foreach (var pathItem in swaggerDoc.Paths.Values)
+        {
+            if (pathItem.Operations is null)
+            {
+                continue;
+            }
+
+            foreach (var operation in pathItem.Operations.Values)
+            {
+                if (operation.Security is null)
+                {
+                    continue;
+                }
+
+                for (int i = 0; i < operation.Security.Count; i++)
+                {
+                    var oldReq = operation.Security[i];
+                    var newReq = new OpenApiSecurityRequirement();
+                    foreach (var kvp in oldReq)
+                    {
+                        var fixedRef = new OpenApiSecuritySchemeReference(kvp.Key.Reference.Id!, swaggerDoc);
+                        newReq[fixedRef] = kvp.Value;
+                    }
+
+                    operation.Security[i] = newReq;
+                }
+            }
+        }
+    }
+}

Jellyfin.Server/Migrations/Routines/FixLibrarySubtitleDownloadLanguages.cs

@@ -0,0 +1,106 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using Jellyfin.Server.ServerSetupApp;
+using MediaBrowser.Controller.Entities;
+using MediaBrowser.Controller.Library;
+using MediaBrowser.Model.Globalization;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.Logging;
+
+namespace Jellyfin.Server.Migrations.Routines;
+
+/// <summary>
+/// Migration to fix broken library subtitle download languages.
+/// </summary>
+[JellyfinMigration("2026-02-06T20:00:00", nameof(FixLibrarySubtitleDownloadLanguages))]
+internal class FixLibrarySubtitleDownloadLanguages : IAsyncMigrationRoutine
+{
+    private readonly ILocalizationManager _localizationManager;
+    private readonly ILibraryManager _libraryManager;
+    private readonly ILogger _logger;
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="FixLibrarySubtitleDownloadLanguages"/> class.
+    /// </summary>
+    /// <param name="localizationManager">The Localization manager.</param>
+    /// <param name="startupLogger">The startup logger for Startup UI integration.</param>
+    /// <param name="libraryManager">The Library manager.</param>
+    /// <param name="logger">The logger.</param>
+    public FixLibrarySubtitleDownloadLanguages(
+        ILocalizationManager localizationManager,
+        IStartupLogger<FixLibrarySubtitleDownloadLanguages> startupLogger,
+        ILibraryManager libraryManager,
+        ILogger<FixLibrarySubtitleDownloadLanguages> logger)
+    {
+        _localizationManager = localizationManager;
+        _libraryManager = libraryManager;
+        _logger = startupLogger.With(logger);
+    }
+
+    /// <inheritdoc />
+    public Task PerformAsync(CancellationToken cancellationToken)
+    {
+        _logger.LogInformation("Starting to fix library subtitle download languages.");
+
+        var virtualFolders = _libraryManager.GetVirtualFolders(false);
+
+        foreach (var virtualFolder in virtualFolders)
+        {
+            var options = virtualFolder.LibraryOptions;
+            if (options.SubtitleDownloadLanguages is null || options.SubtitleDownloadLanguages.Length == 0)
+            {
+                continue;
+            }
+
+            // Some virtual folders don't have a proper item id.
+            if (!Guid.TryParse(virtualFolder.ItemId, out var folderId))
+            {
+                continue;
+            }
+
+            var collectionFolder = _libraryManager.GetItemById<CollectionFolder>(folderId);
+            if (collectionFolder is null)
+            {
+                _logger.LogWarning("Could not find collection folder for virtual folder '{LibraryName}' with id '{FolderId}'. Skipping.", virtualFolder.Name, folderId);
+                continue;
+            }
+
+            var fixedLanguages = new List<string>();
+
+            foreach (var language in options.SubtitleDownloadLanguages)
+            {
+                var foundLanguage = _localizationManager.FindLanguageInfo(language)?.ThreeLetterISOLanguageName;
+                if (foundLanguage is not null)
+                {
+                    // Converted ISO 639-2/B to T (ger to deu)
+                    if (!string.Equals(foundLanguage, language, StringComparison.OrdinalIgnoreCase))
+                    {
+                        _logger.LogInformation("Converted '{Language}' to '{ResolvedLanguage}' in library '{LibraryName}'.", language, foundLanguage, virtualFolder.Name);
+                    }
+
+                    if (fixedLanguages.Contains(foundLanguage, StringComparer.OrdinalIgnoreCase))
+                    {
+                        _logger.LogInformation("Language '{Language}' already exists for library '{LibraryName}'. Skipping duplicate.", foundLanguage, virtualFolder.Name);
+                        continue;
+                    }
+
+                    fixedLanguages.Add(foundLanguage);
+                }
+                else
+                {
+                    _logger.LogInformation("Could not resolve language '{Language}' in library '{LibraryName}'. Skipping.", language, virtualFolder.Name);
+                }
+            }
+
+            options.SubtitleDownloadLanguages = [.. fixedLanguages];
+            collectionFolder.UpdateLibraryOptions(options);
+        }
+
+        _logger.LogInformation("Library subtitle download languages fixed.");
+
+        return Task.CompletedTask;
+    }
+}

Jellyfin.Server/Migrations/Routines/MigrateLibraryDb.cs

@@ -464,6 +464,16 @@ internal class MigrateLibraryDb : IDatabaseMigrationRoutine
 
         SqliteConnection.ClearAllPools();
 
+        using (var checkpointConnection = new SqliteConnection($"Filename={libraryDbPath}"))
+        {
+            checkpointConnection.Open();
+            using var cmd = checkpointConnection.CreateCommand();
+            cmd.CommandText = "PRAGMA wal_checkpoint(TRUNCATE);";
+            cmd.ExecuteNonQuery();
+        }
+
+        SqliteConnection.ClearAllPools();
+
         _logger.LogInformation("Move {0} to {1}.", libraryDbPath, libraryDbPath + ".old");
         File.Move(libraryDbPath, libraryDbPath + ".old", true);
     }
@@ -1163,7 +1173,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))

MediaBrowser.Controller/Entities/BaseItem.cs

@@ -22,7 +22,6 @@ using MediaBrowser.Controller.Channels;
 using MediaBrowser.Controller.Chapters;
 using MediaBrowser.Controller.Configuration;
 using MediaBrowser.Controller.Dto;
-using MediaBrowser.Controller.Entities.Audio;
 using MediaBrowser.Controller.Entities.TV;
 using MediaBrowser.Controller.IO;
 using MediaBrowser.Controller.Library;
@@ -1605,7 +1604,7 @@ namespace MediaBrowser.Controller.Entities
                 return !GetBlockUnratedValue(user);
             }
 
-            var ratingScore = LocalizationManager.GetRatingScore(rating);
+            var ratingScore = LocalizationManager.GetRatingScore(rating, GetPreferredMetadataCountryCode());
 
             // Could not determine rating level
             if (ratingScore is null)
@@ -1647,7 +1646,7 @@ namespace MediaBrowser.Controller.Entities
                 return null;
             }
 
-            return LocalizationManager.GetRatingScore(rating);
+            return LocalizationManager.GetRatingScore(rating, GetPreferredMetadataCountryCode());
         }
 
         public List<string> GetInheritedTags()
@@ -2129,17 +2128,6 @@ namespace MediaBrowser.Controller.Entities
                 };
             }
 
-            // Music albums usually don't have dedicated backdrops, so return one from the artist instead
-            if (GetType() == typeof(MusicAlbum) && imageType == ImageType.Backdrop)
-            {
-                var artist = FindParent<MusicArtist>();
-
-                if (artist is not null)
-                {
-                    return artist.GetImages(imageType).ElementAtOrDefault(imageIndex);
-                }
-            }
-
             return GetImages(imageType)
                 .ElementAtOrDefault(imageIndex);
         }
@@ -2621,7 +2609,7 @@ namespace MediaBrowser.Controller.Entities
                 .Select(i => i.OfficialRating)
                 .Where(i => !string.IsNullOrEmpty(i))
                 .Distinct(StringComparer.OrdinalIgnoreCase)
-                .Select(rating => (rating, LocalizationManager.GetRatingScore(rating)))
+                .Select(rating => (rating, LocalizationManager.GetRatingScore(rating, GetPreferredMetadataCountryCode())))
                 .OrderBy(i => i.Item2 is null ? 1001 : i.Item2.Score)
                 .ThenBy(i => i.Item2 is null ? 1001 : i.Item2.SubScore)
                 .Select(i => i.rating);

MediaBrowser.Controller/Entities/Folder.cs

@@ -452,6 +452,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)
                 {
@@ -467,6 +468,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);
                         }
@@ -477,6 +479,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
             {

MediaBrowser.Controller/Entities/InternalItemsQuery.cs

@@ -10,6 +10,7 @@ using Jellyfin.Database.Implementations.Entities;
 using Jellyfin.Database.Implementations.Enums;
 using MediaBrowser.Controller.Dto;
 using MediaBrowser.Model.Entities;
+using MediaBrowser.Model.Querying;
 
 namespace MediaBrowser.Controller.Entities
 {
@@ -388,5 +389,75 @@ namespace MediaBrowser.Controller.Entities
 
             User = user;
         }
+
+        public void ApplyFilters(ItemFilter[] filters)
+        {
+            static void ThrowConflictingFilters()
+                => throw new ArgumentException("Conflicting filters", nameof(filters));
+
+            foreach (var filter in filters)
+            {
+                switch (filter)
+                {
+                    case ItemFilter.IsFolder:
+                        if (filters.Contains(ItemFilter.IsNotFolder))
+                        {
+                            ThrowConflictingFilters();
+                        }
+
+                        IsFolder = true;
+                        break;
+                    case ItemFilter.IsNotFolder:
+                        if (filters.Contains(ItemFilter.IsFolder))
+                        {
+                            ThrowConflictingFilters();
+                        }
+
+                        IsFolder = false;
+                        break;
+                    case ItemFilter.IsUnplayed:
+                        if (filters.Contains(ItemFilter.IsPlayed))
+                        {
+                            ThrowConflictingFilters();
+                        }
+
+                        IsPlayed = false;
+                        break;
+                    case ItemFilter.IsPlayed:
+                        if (filters.Contains(ItemFilter.IsUnplayed))
+                        {
+                            ThrowConflictingFilters();
+                        }
+
+                        IsPlayed = true;
+                        break;
+                    case ItemFilter.IsFavorite:
+                        IsFavorite = true;
+                        break;
+                    case ItemFilter.IsResumable:
+                        IsResumable = true;
+                        break;
+                    case ItemFilter.Likes:
+                        if (filters.Contains(ItemFilter.Dislikes))
+                        {
+                            ThrowConflictingFilters();
+                        }
+
+                        IsLiked = true;
+                        break;
+                    case ItemFilter.Dislikes:
+                        if (filters.Contains(ItemFilter.Likes))
+                        {
+                            ThrowConflictingFilters();
+                        }
+
+                        IsLiked = false;
+                        break;
+                    case ItemFilter.IsFavoriteOrLikes:
+                        IsFavoriteOrLiked = true;
+                        break;
+                }
+            }
+        }
     }
 }

MediaBrowser.Controller/Entities/TV/Season.cs

@@ -201,12 +201,17 @@ namespace MediaBrowser.Controller.Entities.TV
 
         public List<BaseItem> GetEpisodes(Series series, User user, IEnumerable<Episode> allSeriesEpisodes, DtoOptions options, bool shouldIncludeMissingEpisodes)
         {
+            if (series is null)
+            {
+                return [];
+            }
+
             return series.GetSeasonEpisodes(this, user, allSeriesEpisodes, options, shouldIncludeMissingEpisodes);
         }
 
         public List<BaseItem> GetEpisodes()
         {
-            return Series.GetSeasonEpisodes(this, null, null, new DtoOptions(true), true);
+            return GetEpisodes(Series, null, null, new DtoOptions(true), true);
         }
 
         public override List<BaseItem> GetChildren(User user, bool includeLinkedChildren, InternalItemsQuery query)

MediaBrowser.Controller/Entities/TV/Series.cs

@@ -451,7 +451,7 @@ namespace MediaBrowser.Controller.Entities.TV
 
                 if (!currentSeasonNumber.HasValue && !seasonNumber.HasValue && parentSeason.LocationType == LocationType.Virtual)
                 {
-                    return true;
+                    return episodeItem.Season is null or { LocationType: LocationType.Virtual };
                 }
 
                 var season = episodeItem.Season;

MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs

@@ -1267,6 +1267,20 @@ namespace MediaBrowser.Controller.MediaEncoding
                     }
                 }
 
+                // Use analyzeduration also for subtitle streams to improve resolution detection  with streams inside MKS files
+                var analyzeDurationArgument = GetFfmpegAnalyzeDurationArg(state);
+                if (!string.IsNullOrEmpty(analyzeDurationArgument))
+                {
+                    arg.Append(' ').Append(analyzeDurationArgument);
+                }
+
+                // Apply probesize, too, if configured
+                var ffmpegProbeSizeArgument = GetFfmpegProbesizeArg();
+                if (!string.IsNullOrEmpty(ffmpegProbeSizeArgument))
+                {
+                    arg.Append(' ').Append(ffmpegProbeSizeArgument);
+                }
+
                 // Also seek the external subtitles stream.
                 var seekSubParam = GetFastSeekCommandLineParameter(state, options, segmentContainer);
                 if (!string.IsNullOrEmpty(seekSubParam))
@@ -7123,9 +7137,8 @@ namespace MediaBrowser.Controller.MediaEncoding
             }
         }
 
-        public string GetInputModifier(EncodingJobInfo state, EncodingOptions encodingOptions, string segmentContainer)
+        private string GetFfmpegAnalyzeDurationArg(EncodingJobInfo state)
         {
-            var inputModifier = string.Empty;
             var analyzeDurationArgument = string.Empty;
 
             // Apply -analyzeduration as per the environment variable,
@@ -7141,6 +7154,26 @@ namespace MediaBrowser.Controller.MediaEncoding
                 analyzeDurationArgument = "-analyzeduration " + ffmpegAnalyzeDuration;
             }
 
+            return analyzeDurationArgument;
+        }
+
+        private string GetFfmpegProbesizeArg()
+        {
+            var ffmpegProbeSize = _config.GetFFmpegProbeSize();
+
+            if (!string.IsNullOrEmpty(ffmpegProbeSize))
+            {
+                return $"-probesize {ffmpegProbeSize}";
+            }
+
+            return string.Empty;
+        }
+
+        public string GetInputModifier(EncodingJobInfo state, EncodingOptions encodingOptions, string segmentContainer)
+        {
+            var inputModifier = string.Empty;
+            var analyzeDurationArgument = GetFfmpegAnalyzeDurationArg(state);
+
             if (!string.IsNullOrEmpty(analyzeDurationArgument))
             {
                 inputModifier += " " + analyzeDurationArgument;
@@ -7149,11 +7182,11 @@ namespace MediaBrowser.Controller.MediaEncoding
             inputModifier = inputModifier.Trim();
 
             // Apply -probesize if configured
-            var ffmpegProbeSize = _config.GetFFmpegProbeSize();
+            var ffmpegProbeSizeArgument = GetFfmpegProbesizeArg();
 
-            if (!string.IsNullOrEmpty(ffmpegProbeSize))
+            if (!string.IsNullOrEmpty(ffmpegProbeSizeArgument))
             {
-                inputModifier += $" -probesize {ffmpegProbeSize}";
+                inputModifier += " " + ffmpegProbeSizeArgument;
             }
 
             var userAgentParam = GetUserAgentParam(state);

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.

MediaBrowser.MediaEncoding/Encoder/EncoderValidator.cs

@@ -693,7 +693,7 @@ namespace MediaBrowser.MediaEncoding.Encoder
         [GeneratedRegex("^\\s\\S{6}\\s(?<codec>[\\w|-]+)\\s+.+$", RegexOptions.Multiline)]
         private static partial Regex CodecRegex();
 
-        [GeneratedRegex("^\\s\\S{3}\\s(?<filter>[\\w|-]+)\\s+.+$", RegexOptions.Multiline)]
+        [GeneratedRegex("^\\s\\S{2,3}\\s(?<filter>[\\w|-]+)\\s+.+$", RegexOptions.Multiline)]
         private static partial Regex FilterRegex();
     }
 }

MediaBrowser.MediaEncoding/Probing/ProbeResultNormalizer.cs

@@ -83,6 +83,7 @@ namespace MediaBrowser.MediaEncoding.Probing
             "Smith/Kotzen",
             "We;Na",
             "LSR/CITY",
+            "Kairon; IRSE!",
         };
 
         /// <summary>
@@ -862,7 +863,7 @@ namespace MediaBrowser.MediaEncoding.Probing
                 {
                     stream.IsAnamorphic = false;
                 }
-                else if (string.Equals(streamInfo.SampleAspectRatio, "1:1", StringComparison.Ordinal))
+                else if (IsNearSquarePixelSar(streamInfo.SampleAspectRatio))
                 {
                     stream.IsAnamorphic = false;
                 }
@@ -1153,6 +1154,34 @@ namespace MediaBrowser.MediaEncoding.Probing
             return Math.Abs(d1 - d2) <= variance;
         }
 
+        /// <summary>
+        /// Determines whether a sample aspect ratio represents square (or near-square) pixels.
+        /// Some encoders produce SARs like 3201:3200 for content that is effectively 1:1,
+        /// which would be falsely classified as anamorphic by an exact string comparison.
+        /// A 1% tolerance safely covers encoder rounding artifacts while preserving detection
+        /// of genuine anamorphic content (closest standard is PAL 4:3 at 16:15 = 6.67% off).
+        /// </summary>
+        /// <param name="sar">The sample aspect ratio string in "N:D" format.</param>
+        /// <returns><c>true</c> if the SAR is within 1% of 1:1; otherwise <c>false</c>.</returns>
+        internal static bool IsNearSquarePixelSar(string sar)
+        {
+            if (string.IsNullOrEmpty(sar))
+            {
+                return false;
+            }
+
+            var parts = sar.Split(':');
+            if (parts.Length == 2
+                && double.TryParse(parts[0], CultureInfo.InvariantCulture, out var num)
+                && double.TryParse(parts[1], CultureInfo.InvariantCulture, out var den)
+                && den > 0)
+            {
+                return IsClose(num / den, 1.0, 0.01);
+            }
+
+            return string.Equals(sar, "1:1", StringComparison.Ordinal);
+        }
+
         /// <summary>
         /// Gets a frame rate from a string value in ffprobe output
         /// This could be a number or in the format of 2997/125.

MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs

@@ -328,7 +328,7 @@ namespace MediaBrowser.MediaEncoding.Subtitles
         {
             using (await _semaphoreLocks.LockAsync(outputPath, cancellationToken).ConfigureAwait(false))
             {
-                if (!File.Exists(outputPath))
+                if (!File.Exists(outputPath) || _fileSystem.GetFileInfo(outputPath).Length == 0)
                 {
                     await ConvertTextSubtitleToSrtInternal(subtitleStream, mediaSource, outputPath, cancellationToken).ConfigureAwait(false);
                 }
@@ -431,9 +431,22 @@ namespace MediaBrowser.MediaEncoding.Subtitles
                     }
                 }
             }
-            else if (!File.Exists(outputPath))
+            else if (!File.Exists(outputPath) || _fileSystem.GetFileInfo(outputPath).Length == 0)
             {
                 failed = true;
+
+                try
+                {
+                    _logger.LogWarning("Deleting converted subtitle due to failure: {Path}", outputPath);
+                    _fileSystem.DeleteFile(outputPath);
+                }
+                catch (FileNotFoundException)
+                {
+                }
+                catch (IOException ex)
+                {
+                    _logger.LogError(ex, "Error deleting converted subtitle {Path}", outputPath);
+                }
             }
 
             if (failed)
@@ -507,7 +520,7 @@ namespace MediaBrowser.MediaEncoding.Subtitles
 
                     var releaser = await _semaphoreLocks.LockAsync(outputPath, cancellationToken).ConfigureAwait(false);
 
-                    if (File.Exists(outputPath))
+                    if (File.Exists(outputPath) && _fileSystem.GetFileInfo(outputPath).Length > 0)
                     {
                         releaser.Dispose();
                         continue;
@@ -722,10 +735,24 @@ namespace MediaBrowser.MediaEncoding.Subtitles
             {
                 foreach (var outputPath in outputPaths)
                 {
-                    if (!File.Exists(outputPath))
+                    if (!File.Exists(outputPath) || _fileSystem.GetFileInfo(outputPath).Length == 0)
                     {
                         _logger.LogError("ffmpeg subtitle extraction failed for {InputPath} to {OutputPath}", inputPath, outputPath);
                         failed = true;
+
+                        try
+                        {
+                            _logger.LogWarning("Deleting extracted subtitle due to failure: {Path}", outputPath);
+                            _fileSystem.DeleteFile(outputPath);
+                        }
+                        catch (FileNotFoundException)
+                        {
+                        }
+                        catch (IOException ex)
+                        {
+                            _logger.LogError(ex, "Error deleting extracted subtitle {Path}", outputPath);
+                        }
+
                         continue;
                     }
 
@@ -764,7 +791,7 @@ namespace MediaBrowser.MediaEncoding.Subtitles
         {
             using (await _semaphoreLocks.LockAsync(outputPath, cancellationToken).ConfigureAwait(false))
             {
-                if (!File.Exists(outputPath))
+                if (!File.Exists(outputPath) || _fileSystem.GetFileInfo(outputPath).Length == 0)
                 {
                     var subtitleStreamIndex = EncodingHelper.FindIndex(mediaSource.MediaStreams, subtitleStream);
 
@@ -867,9 +894,22 @@ namespace MediaBrowser.MediaEncoding.Subtitles
                     _logger.LogError(ex, "Error deleting extracted subtitle {Path}", outputPath);
                 }
             }
-            else if (!File.Exists(outputPath))
+            else if (!File.Exists(outputPath) || _fileSystem.GetFileInfo(outputPath).Length == 0)
             {
                 failed = true;
+
+                try
+                {
+                    _logger.LogWarning("Deleting extracted subtitle due to failure: {Path}", outputPath);
+                    _fileSystem.DeleteFile(outputPath);
+                }
+                catch (FileNotFoundException)
+                {
+                }
+                catch (IOException ex)
+                {
+                    _logger.LogError(ex, "Error deleting extracted subtitle {Path}", outputPath);
+                }
             }
 
             if (failed)

MediaBrowser.Model/Dlna/ConditionProcessor.cs

@@ -324,7 +324,7 @@ namespace MediaBrowser.Model.Dlna
                 return !condition.IsRequired;
             }
 
-            var expected = (TransportStreamTimestamp)Enum.Parse(typeof(TransportStreamTimestamp), condition.Value, true);
+            var expected = Enum.Parse<TransportStreamTimestamp>(condition.Value, true);
 
             switch (condition.Condition)
             {

MediaBrowser.Model/Dlna/StreamBuilder.cs

@@ -2009,7 +2009,7 @@ namespace MediaBrowser.Model.Dlna
                             }
                             else if (condition.Condition == ProfileConditionType.NotEquals)
                             {
-                                item.SetOption(qualifier, "rangetype", string.Join(',', Enum.GetNames(typeof(VideoRangeType)).Except(values)));
+                                item.SetOption(qualifier, "rangetype", string.Join(',', Enum.GetNames<VideoRangeType>().Except(values)));
                             }
                             else if (condition.Condition == ProfileConditionType.EqualsAny)
                             {

MediaBrowser.Model/Dlna/StreamInfo.cs

@@ -895,7 +895,7 @@ public class StreamInfo
 
         if (SubProtocol == MediaStreamProtocol.hls)
         {
-            sb.Append("/master.m3u8?");
+            sb.Append("/master.m3u8");
         }
         else
         {
@@ -906,10 +906,10 @@ public class StreamInfo
                 sb.Append('.');
                 sb.Append(Container);
             }
-
-            sb.Append('?');
         }
 
+        var queryStart = sb.Length;
+
         if (!string.IsNullOrEmpty(DeviceProfileId))
         {
             sb.Append("&DeviceProfileId=");
@@ -1133,6 +1133,12 @@ public class StreamInfo
             sb.Append(query);
         }
 
+        // Replace the first '&' with '?' to form a valid query string.
+        if (sb.Length > queryStart)
+        {
+            sb[queryStart] = '?';
+        }
+
         return sb.ToString();
     }
 

MediaBrowser.Model/Extensions/EnumerableExtensions.cs

@@ -11,7 +11,7 @@ namespace MediaBrowser.Model.Extensions
     public static class EnumerableExtensions
     {
         /// <summary>
-        /// Orders <see cref="RemoteImageInfo"/> by requested language in descending order, prioritizing "en" over other non-matches.
+        /// Orders <see cref="RemoteImageInfo"/> by requested language in descending order, then "en", then no language, over other non-matches.
         /// </summary>
         /// <param name="remoteImageInfos">The remote image infos.</param>
         /// <param name="requestedLanguage">The requested language for the images.</param>
@@ -28,9 +28,9 @@ namespace MediaBrowser.Model.Extensions
                 {
                     // Image priority ordering:
                     //  - Images that match the requested language
-                    //  - Images with no language
                     //  - TODO: Images that match the original language
                     //  - Images in English
+                    //  - Images with no language
                     //  - Images that don't match the requested language
 
                     if (string.Equals(requestedLanguage, i.Language, StringComparison.OrdinalIgnoreCase))
@@ -38,12 +38,12 @@ namespace MediaBrowser.Model.Extensions
                         return 4;
                     }
 
-                    if (string.IsNullOrEmpty(i.Language))
+                    if (string.Equals(i.Language, "en", StringComparison.OrdinalIgnoreCase))
                     {
                         return 3;
                     }
 
-                    if (string.Equals(i.Language, "en", StringComparison.OrdinalIgnoreCase))
+                    if (string.IsNullOrEmpty(i.Language))
                     {
                         return 2;
                     }

MediaBrowser.Model/Providers/RemoteSearchResult.cs

@@ -1,4 +1,3 @@
-#nullable disable
 #pragma warning disable CS1591
 
 using System;
@@ -19,7 +18,7 @@ namespace MediaBrowser.Model.Providers
         /// Gets or sets the name.
         /// </summary>
         /// <value>The name.</value>
-        public string Name { get; set; }
+        public string? Name { get; set; }
 
         /// <summary>
         /// Gets or sets the provider ids.
@@ -41,13 +40,13 @@ namespace MediaBrowser.Model.Providers
 
         public DateTime? PremiereDate { get; set; }
 
-        public string ImageUrl { get; set; }
+        public string? ImageUrl { get; set; }
 
-        public string SearchProviderName { get; set; }
+        public string? SearchProviderName { get; set; }
 
-        public string Overview { get; set; }
+        public string? Overview { get; set; }
 
-        public RemoteSearchResult AlbumArtist { get; set; }
+        public RemoteSearchResult? AlbumArtist { get; set; }
 
         public RemoteSearchResult[] Artists { get; set; }
     }

MediaBrowser.Providers/Plugins/Tmdb/Api/TmdbController.cs

@@ -33,7 +33,7 @@ namespace MediaBrowser.Providers.Plugins.Tmdb.Api
         /// <returns>The image portion of the TMDb client configuration.</returns>
         [HttpGet("ClientConfiguration")]
         [ProducesResponseType(StatusCodes.Status200OK)]
-        public async Task<ConfigImageTypes> TmdbClientConfiguration()
+        public async Task<ConfigImageTypes?> TmdbClientConfiguration()
         {
             return (await _tmdbClientManager.GetClientConfiguration().ConfigureAwait(false)).Images;
         }

MediaBrowser.Providers/Plugins/Tmdb/BoxSets/TmdbBoxSetImageProvider.cs

@@ -75,10 +75,17 @@ namespace MediaBrowser.Providers.Plugins.Tmdb.BoxSets
 
             var posters = collection.Images.Posters;
             var backdrops = collection.Images.Backdrops;
-            var remoteImages = new List<RemoteImageInfo>(posters.Count + backdrops.Count);
+            var remoteImages = new List<RemoteImageInfo>(posters?.Count ?? 0 + backdrops?.Count ?? 0);
 
-            remoteImages.AddRange(_tmdbClientManager.ConvertPostersToRemoteImageInfo(posters, language));
-            remoteImages.AddRange(_tmdbClientManager.ConvertBackdropsToRemoteImageInfo(backdrops, language));
+            if (posters is not null)
+            {
+                remoteImages.AddRange(_tmdbClientManager.ConvertPostersToRemoteImageInfo(posters, language));
+            }
+
+            if (backdrops is not null)
+            {
+                remoteImages.AddRange(_tmdbClientManager.ConvertBackdropsToRemoteImageInfo(backdrops, language));
+            }
 
             return remoteImages;
         }

MediaBrowser.Providers/Plugins/Tmdb/BoxSets/TmdbBoxSetProvider.cs

@@ -67,10 +67,14 @@ namespace MediaBrowser.Providers.Plugins.Tmdb.BoxSets
 
                 result.SetProviderId(MetadataProvider.Tmdb, collection.Id.ToString(CultureInfo.InvariantCulture));
 
-                return new[] { result };
+                return [result];
             }
 
             var collectionSearchResults = await _tmdbClientManager.SearchCollectionAsync(searchInfo.Name, language, searchInfo.MetadataCountryCode, cancellationToken).ConfigureAwait(false);
+            if (collectionSearchResults is null)
+            {
+                return [];
+            }
 
             var collections = new RemoteSearchResult[collectionSearchResults.Count];
             for (var i = 0; i < collectionSearchResults.Count; i++)

MediaBrowser.Providers/Plugins/Tmdb/Movies/TmdbMovieImageProvider.cs

@@ -79,7 +79,7 @@ namespace MediaBrowser.Providers.Plugins.Tmdb.Movies
 
             if (movieTmdbId <= 0)
             {
-                return Enumerable.Empty<RemoteImageInfo>();
+                return [];
             }
 
             // TODO use image languages if All Languages isn't toggled, but there's currently no way to get that value in here
@@ -89,17 +89,28 @@ namespace MediaBrowser.Providers.Plugins.Tmdb.Movies
 
             if (movie?.Images is null)
             {
-                return Enumerable.Empty<RemoteImageInfo>();
+                return [];
             }
 
             var posters = movie.Images.Posters;
             var backdrops = movie.Images.Backdrops;
             var logos = movie.Images.Logos;
-            var remoteImages = new List<RemoteImageInfo>(posters.Count + backdrops.Count + logos.Count);
+            var remoteImages = new List<RemoteImageInfo>(posters?.Count ?? 0 + backdrops?.Count ?? 0 + logos?.Count ?? 0);
 
-            remoteImages.AddRange(_tmdbClientManager.ConvertPostersToRemoteImageInfo(posters, language));
-            remoteImages.AddRange(_tmdbClientManager.ConvertBackdropsToRemoteImageInfo(backdrops, language));
-            remoteImages.AddRange(_tmdbClientManager.ConvertLogosToRemoteImageInfo(logos, language));
+            if (posters is not null)
+            {
+                remoteImages.AddRange(_tmdbClientManager.ConvertPostersToRemoteImageInfo(posters, language));
+            }
+
+            if (backdrops is not null)
+            {
+                remoteImages.AddRange(_tmdbClientManager.ConvertBackdropsToRemoteImageInfo(backdrops, language));
+            }
+
+            if (logos is not null)
+            {
+                remoteImages.AddRange(_tmdbClientManager.ConvertLogosToRemoteImageInfo(logos, language));
+            }
 
             return remoteImages;
         }

MediaBrowser.Providers/Plugins/Tmdb/Movies/TmdbMovieProvider.cs

@@ -15,6 +15,7 @@ using MediaBrowser.Controller.Providers;
 using MediaBrowser.Model.Entities;
 using MediaBrowser.Model.Providers;
 using TMDbLib.Objects.Find;
+using TMDbLib.Objects.General;
 using TMDbLib.Objects.Search;
 
 namespace MediaBrowser.Providers.Plugins.Tmdb.Movies
@@ -84,7 +85,7 @@ namespace MediaBrowser.Providers.Plugins.Tmdb.Movies
                     remoteResult.SetProviderId(MetadataProvider.Tmdb, movie.Id.ToString(CultureInfo.InvariantCulture));
                     remoteResult.TrySetProviderId(MetadataProvider.Imdb, movie.ImdbId);
 
-                    return new[] { remoteResult };
+                    return [remoteResult];
                 }
             }
 
@@ -118,6 +119,11 @@ namespace MediaBrowser.Providers.Plugins.Tmdb.Movies
                     .ConfigureAwait(false);
             }
 
+            if (movieResults is null)
+            {
+                return [];
+            }
+
             var len = movieResults.Count;
             var remoteSearchResults = new RemoteSearchResult[len];
             for (var i = 0; i < len; i++)
@@ -158,7 +164,7 @@ namespace MediaBrowser.Providers.Plugins.Tmdb.Movies
 
                 var searchResults = await _tmdbClientManager.SearchMovieAsync(cleanedName, info.Year ?? parsedName.Year ?? 0, info.MetadataLanguage, info.MetadataCountryCode, cancellationToken).ConfigureAwait(false);
 
-                if (searchResults.Count > 0)
+                if (searchResults?.Count > 0)
                 {
                     tmdbId = searchResults[0].Id.ToString(CultureInfo.InvariantCulture);
                 }
@@ -167,7 +173,7 @@ namespace MediaBrowser.Providers.Plugins.Tmdb.Movies
             if (string.IsNullOrEmpty(tmdbId) && !string.IsNullOrEmpty(imdbId))
             {
                 var movieResultFromImdbId = await _tmdbClientManager.FindByExternalIdAsync(imdbId, FindExternalSource.Imdb, info.MetadataLanguage, info.MetadataCountryCode, cancellationToken).ConfigureAwait(false);
-                if (movieResultFromImdbId?.MovieResults.Count > 0)
+                if (movieResultFromImdbId?.MovieResults?.Count > 0)
                 {
                     tmdbId = movieResultFromImdbId.MovieResults[0].Id.ToString(CultureInfo.InvariantCulture);
                 }
@@ -193,7 +199,7 @@ namespace MediaBrowser.Providers.Plugins.Tmdb.Movies
                 OriginalTitle = movieResult.OriginalTitle,
                 Overview = movieResult.Overview?.Replace("\n\n", "\n", StringComparison.InvariantCulture),
                 Tagline = movieResult.Tagline,
-                ProductionLocations = movieResult.ProductionCountries.Select(pc => pc.Name).ToArray()
+                ProductionLocations = movieResult.ProductionCountries?.Select(pc => pc.Name).ToArray() ?? Array.Empty<string>()
             };
             var metadataResult = new MetadataResult<Movie>
             {
@@ -218,14 +224,14 @@ namespace MediaBrowser.Providers.Plugins.Tmdb.Movies
 
                 var ourRelease = releases.FirstOrDefault(c => string.Equals(c.Iso_3166_1, info.MetadataCountryCode, StringComparison.OrdinalIgnoreCase));
 
-                if (ourRelease is not null)
+                if (ourRelease?.Certification is not null)
                 {
-                    movie.OfficialRating = TmdbUtils.BuildParentalRating(ourRelease.Iso_3166_1, ourRelease.Certification);
+                    movie.OfficialRating = TmdbUtils.BuildParentalRating(info.MetadataCountryCode, ourRelease.Certification);
                 }
                 else
                 {
                     var usRelease = releases.FirstOrDefault(c => string.Equals(c.Iso_3166_1, "US", StringComparison.OrdinalIgnoreCase));
-                    if (usRelease is not null)
+                    if (usRelease?.Certification is not null)
                     {
                         movie.OfficialRating = usRelease.Certification;
                     }
@@ -242,16 +248,23 @@ namespace MediaBrowser.Providers.Plugins.Tmdb.Movies
 
             var genres = movieResult.Genres;
 
-            foreach (var genre in genres.Select(g => g.Name).Trimmed())
+            if (genres is not null)
             {
-                movie.AddGenre(genre);
+                foreach (var genre in genres.Select(g => g.Name).Trimmed())
+                {
+                    movie.AddGenre(genre);
+                }
             }
 
             if (movieResult.Keywords?.Keywords is not null)
             {
-                for (var i = 0; i < movieResult.Keywords.Keywords.Count; i++)
+                foreach (var keyword in movieResult.Keywords.Keywords)
                 {
-                    movie.AddTag(movieResult.Keywords.Keywords[i].Name);
+                    var name = keyword.Name;
+                    if (!string.IsNullOrWhiteSpace(name))
+                    {
+                        movie.AddTag(name);
+                    }
                 }
             }
 

MediaBrowser.Providers/Plugins/Tmdb/People/TmdbPersonProvider.cs

@@ -56,13 +56,17 @@ namespace MediaBrowser.Providers.Plugins.Tmdb.People
                     }
 
                     result.SetProviderId(MetadataProvider.Tmdb, personResult.Id.ToString(CultureInfo.InvariantCulture));
-                    result.TrySetProviderId(MetadataProvider.Imdb, personResult.ExternalIds.ImdbId);
+                    result.TrySetProviderId(MetadataProvider.Imdb, personResult.ExternalIds?.ImdbId);
 
-                    return new[] { result };
+                    return [result];
                 }
             }
 
             var personSearchResult = await _tmdbClientManager.SearchPersonAsync(searchInfo.Name, cancellationToken).ConfigureAwait(false);
+            if (personSearchResult is null)
+            {
+                return [];
+            }
 
             var remoteSearchResults = new RemoteSearchResult[personSearchResult.Count];
             for (var i = 0; i < personSearchResult.Count; i++)
@@ -91,7 +95,7 @@ namespace MediaBrowser.Providers.Plugins.Tmdb.People
             if (personTmdbId <= 0)
             {
                 var personSearchResults = await _tmdbClientManager.SearchPersonAsync(info.Name, cancellationToken).ConfigureAwait(false);
-                if (personSearchResults.Count > 0)
+                if (personSearchResults?.Count > 0)
                 {
                     personTmdbId = personSearchResults[0].Id;
                 }

MediaBrowser.Providers/Plugins/Tmdb/TV/TmdbSeasonProvider.cs

@@ -76,7 +76,7 @@ namespace MediaBrowser.Providers.Plugins.Tmdb.TV
                 result.Item.Name = seasonResult.Name;
             }
 
-            result.Item.TrySetProviderId(MetadataProvider.Tvdb, seasonResult.ExternalIds.TvdbId);
+            result.Item.TrySetProviderId(MetadataProvider.Tvdb, seasonResult.ExternalIds?.TvdbId);
 
             // TODO why was this disabled?
             var credits = seasonResult.Credits;

MediaBrowser.Providers/Plugins/Tmdb/TV/TmdbSeriesImageProvider.cs

@@ -79,11 +79,22 @@ namespace MediaBrowser.Providers.Plugins.Tmdb.TV
             var posters = series.Images.Posters;
             var backdrops = series.Images.Backdrops;
             var logos = series.Images.Logos;
-            var remoteImages = new List<RemoteImageInfo>(posters.Count + backdrops.Count + logos.Count);
+            var remoteImages = new List<RemoteImageInfo>(posters?.Count ?? 0 + backdrops?.Count ?? 0 + logos?.Count ?? 0);
 
-            remoteImages.AddRange(_tmdbClientManager.ConvertPostersToRemoteImageInfo(posters, language));
-            remoteImages.AddRange(_tmdbClientManager.ConvertBackdropsToRemoteImageInfo(backdrops, language));
-            remoteImages.AddRange(_tmdbClientManager.ConvertLogosToRemoteImageInfo(logos, language));
+            if (posters is not null)
+            {
+                remoteImages.AddRange(_tmdbClientManager.ConvertPostersToRemoteImageInfo(posters, language));
+            }
+
+            if (backdrops is not null)
+            {
+                remoteImages.AddRange(_tmdbClientManager.ConvertBackdropsToRemoteImageInfo(backdrops, language));
+            }
+
+            if (logos is not null)
+            {
+                remoteImages.AddRange(_tmdbClientManager.ConvertLogosToRemoteImageInfo(logos, language));
+            }
 
             return remoteImages;
         }

MediaBrowser.Providers/Plugins/Tmdb/TV/TmdbSeriesProvider.cs

@@ -112,6 +112,10 @@ namespace MediaBrowser.Providers.Plugins.Tmdb.TV
 
             var tvSearchResults = await _tmdbClientManager.SearchSeriesAsync(searchInfo.Name, searchInfo.MetadataLanguage, searchInfo.MetadataCountryCode, cancellationToken: cancellationToken)
                 .ConfigureAwait(false);
+            if (tvSearchResults is null)
+            {
+                return [];
+            }
 
             var remoteResults = new RemoteSearchResult[tvSearchResults.Count];
             for (var i = 0; i < tvSearchResults.Count; i++)
@@ -141,6 +145,7 @@ namespace MediaBrowser.Providers.Plugins.Tmdb.TV
             }
 
             remoteResult.PremiereDate = series.FirstAirDate?.ToUniversalTime();
+            remoteResult.ProductionYear = series.FirstAirDate?.Year;
 
             return remoteResult;
         }
@@ -157,6 +162,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;
         }
@@ -174,7 +180,7 @@ namespace MediaBrowser.Providers.Plugins.Tmdb.TV
             if (string.IsNullOrEmpty(tmdbId) && info.TryGetProviderId(MetadataProvider.Imdb, out var imdbId))
             {
                 var searchResult = await _tmdbClientManager.FindByExternalIdAsync(imdbId, FindExternalSource.Imdb, info.MetadataLanguage, info.MetadataCountryCode, cancellationToken).ConfigureAwait(false);
-                if (searchResult?.TvResults.Count > 0)
+                if (searchResult?.TvResults?.Count > 0)
                 {
                     tmdbId = searchResult.TvResults[0].Id.ToString(CultureInfo.InvariantCulture);
                 }
@@ -183,7 +189,7 @@ namespace MediaBrowser.Providers.Plugins.Tmdb.TV
             if (string.IsNullOrEmpty(tmdbId) && info.TryGetProviderId(MetadataProvider.Tvdb, out var tvdbId))
             {
                 var searchResult = await _tmdbClientManager.FindByExternalIdAsync(tvdbId, FindExternalSource.TvDb, info.MetadataLanguage, info.MetadataCountryCode, cancellationToken).ConfigureAwait(false);
-                if (searchResult?.TvResults.Count > 0)
+                if (searchResult?.TvResults?.Count > 0)
                 {
                     tmdbId = searchResult.TvResults[0].Id.ToString(CultureInfo.InvariantCulture);
                 }
@@ -198,7 +204,7 @@ namespace MediaBrowser.Providers.Plugins.Tmdb.TV
                 var cleanedName = TmdbUtils.CleanName(parsedName.Name);
                 var searchResults = await _tmdbClientManager.SearchSeriesAsync(cleanedName, info.MetadataLanguage, info.MetadataCountryCode, info.Year ?? parsedName.Year ?? 0, cancellationToken).ConfigureAwait(false);
 
-                if (searchResults.Count > 0)
+                if (searchResults?.Count > 0)
                 {
                     tmdbId = searchResults[0].Id.ToString(CultureInfo.InvariantCulture);
                 }
@@ -262,15 +268,19 @@ namespace MediaBrowser.Providers.Plugins.Tmdb.TV
 
             if (seriesResult.Keywords?.Results is not null)
             {
-                for (var i = 0; i < seriesResult.Keywords.Results.Count; i++)
+                foreach (var result in seriesResult.Keywords.Results)
                 {
-                    series.AddTag(seriesResult.Keywords.Results[i].Name);
+                    var name = result.Name;
+                    if (!string.IsNullOrWhiteSpace(name))
+                    {
+                        series.AddTag(name);
+                    }
                 }
             }
 
             series.HomePageUrl = seriesResult.Homepage;
 
-            series.RunTimeTicks = seriesResult.EpisodeRunTime.Select(i => TimeSpan.FromMinutes(i).Ticks).FirstOrDefault();
+            series.RunTimeTicks = seriesResult.EpisodeRunTime?.Select(i => TimeSpan.FromMinutes(i).Ticks).FirstOrDefault();
 
             if (Emby.Naming.TV.TvParserHelpers.TryParseSeriesStatus(seriesResult.Status, out var seriesStatus))
             {
@@ -279,6 +289,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)
@@ -288,21 +299,21 @@ namespace MediaBrowser.Providers.Plugins.Tmdb.TV
                 series.TrySetProviderId(MetadataProvider.Tvdb, ids.TvdbId);
             }
 
-            var contentRatings = seriesResult.ContentRatings.Results ?? new List<ContentRating>();
+            var contentRatings = seriesResult.ContentRatings?.Results ?? new List<ContentRating>();
 
             var ourRelease = contentRatings.FirstOrDefault(c => string.Equals(c.Iso_3166_1, preferredCountryCode, StringComparison.OrdinalIgnoreCase));
             var usRelease = contentRatings.FirstOrDefault(c => string.Equals(c.Iso_3166_1, "US", StringComparison.OrdinalIgnoreCase));
             var minimumRelease = contentRatings.FirstOrDefault();
 
-            if (ourRelease is not null)
+            if (ourRelease?.Rating is not null)
             {
-                series.OfficialRating = TmdbUtils.BuildParentalRating(ourRelease.Iso_3166_1, ourRelease.Rating);
+                series.OfficialRating = TmdbUtils.BuildParentalRating(preferredCountryCode, ourRelease.Rating);
             }
-            else if (usRelease is not null)
+            else if (usRelease?.Rating is not null)
             {
                 series.OfficialRating = usRelease.Rating;
             }
-            else if (minimumRelease is not null)
+            else if (minimumRelease?.Rating is not null)
             {
                 series.OfficialRating = minimumRelease.Rating;
             }
@@ -347,7 +358,8 @@ namespace MediaBrowser.Providers.Plugins.Tmdb.TV
                         Role = actor.Character?.Trim() ?? string.Empty,
                         Type = PersonKind.Actor,
                         SortOrder = actor.Order,
-                        ImageUrl = _tmdbClientManager.GetProfileUrl(actor.ProfilePath)
+                        // NOTE: Null values are filtered out above
+                        ImageUrl = _tmdbClientManager.GetProfileUrl(actor.ProfilePath!)
                     };
 
                     if (actor.Id > 0)
@@ -388,7 +400,8 @@ namespace MediaBrowser.Providers.Plugins.Tmdb.TV
                         Name = crewMember.Name.Trim(),
                         Role = crewMember.Job?.Trim() ?? string.Empty,
                         Type = entry.PersonType,
-                        ImageUrl = _tmdbClientManager.GetProfileUrl(crewMember.ProfilePath)
+                        // NOTE: Null values are filtered out above
+                        ImageUrl = _tmdbClientManager.GetProfileUrl(crewMember.ProfilePath!)
                     };
 
                     if (crewMember.Id > 0)

MediaBrowser.Providers/Plugins/Tmdb/TmdbClientManager.cs

@@ -3,7 +3,6 @@ using System.Collections.Generic;
 using System.Globalization;
 using System.Threading;
 using System.Threading.Tasks;
-using Jellyfin.Data.Enums;
 using MediaBrowser.Model.Dto;
 using MediaBrowser.Model.Entities;
 using MediaBrowser.Model.Providers;
@@ -195,7 +194,7 @@ namespace MediaBrowser.Providers.Plugins.Tmdb
             await EnsureClientConfigAsync().ConfigureAwait(false);
 
             var series = await GetSeriesAsync(tvShowId, language, imageLanguages, countryCode, cancellationToken).ConfigureAwait(false);
-            var episodeGroupId = series?.EpisodeGroups.Results.Find(g => g.Type == groupType)?.Id;
+            var episodeGroupId = series?.EpisodeGroups?.Results?.Find(g => g.Type == groupType)?.Id;
 
             if (episodeGroupId is null)
             {
@@ -263,7 +262,7 @@ namespace MediaBrowser.Providers.Plugins.Tmdb
         /// <param name="countryCode">The country code, ISO 3166-1.</param>
         /// <param name="cancellationToken">The cancellation token.</param>
         /// <returns>The TMDb tv episode information or null if not found.</returns>
-        public async Task<TvEpisode?> GetEpisodeAsync(int tvShowId, int seasonNumber, int episodeNumber, string displayOrder, string? language, string? imageLanguages, string? countryCode, CancellationToken cancellationToken)
+        public async Task<TvEpisode?> GetEpisodeAsync(int tvShowId, int seasonNumber, long episodeNumber, string displayOrder, string? language, string? imageLanguages, string? countryCode, CancellationToken cancellationToken)
         {
             var key = $"episode-{tvShowId.ToString(CultureInfo.InvariantCulture)}-s{seasonNumber.ToString(CultureInfo.InvariantCulture)}e{episodeNumber.ToString(CultureInfo.InvariantCulture)}-{displayOrder}-{language}";
             if (_memoryCache.TryGetValue(key, out TvEpisode? episode))
@@ -276,9 +275,9 @@ namespace MediaBrowser.Providers.Plugins.Tmdb
             var group = await GetSeriesGroupAsync(tvShowId, displayOrder, language, imageLanguages, countryCode, cancellationToken).ConfigureAwait(false);
             if (group is not null)
             {
-                var season = group.Groups.Find(s => s.Order == seasonNumber);
+                var season = group.Groups?.Find(s => s.Order == seasonNumber);
                 // Episode order starts at 0
-                var ep = season?.Episodes.Find(e => e.Order == episodeNumber - 1);
+                var ep = season?.Episodes?.Find(e => e.Order == episodeNumber - 1);
                 if (ep is not null)
                 {
                     seasonNumber = ep.SeasonNumber;
@@ -382,7 +381,7 @@ namespace MediaBrowser.Providers.Plugins.Tmdb
         /// <param name="year">The year the tv show first aired.</param>
         /// <param name="cancellationToken">The cancellation token.</param>
         /// <returns>The TMDb tv show information.</returns>
-        public async Task<IReadOnlyList<SearchTv>> SearchSeriesAsync(string name, string language, string? countryCode, int year = 0, CancellationToken cancellationToken = default)
+        public async Task<IReadOnlyList<SearchTv>?> SearchSeriesAsync(string name, string language, string? countryCode, int year = 0, CancellationToken cancellationToken = default)
         {
             var key = $"searchseries-{name}-{year.ToString(CultureInfo.InvariantCulture)}-{language}";
             if (_memoryCache.TryGetValue(key, out SearchContainer<SearchTv>? series) && series is not null)
@@ -396,12 +395,12 @@ namespace MediaBrowser.Providers.Plugins.Tmdb
                 .SearchTvShowAsync(name, TmdbUtils.NormalizeLanguage(language, countryCode), includeAdult: Plugin.Instance.Configuration.IncludeAdult, firstAirDateYear: year, cancellationToken: cancellationToken)
                 .ConfigureAwait(false);
 
-            if (searchResults.Results.Count > 0)
+            if (searchResults?.Results?.Count > 0)
             {
                 _memoryCache.Set(key, searchResults, TimeSpan.FromHours(CacheDurationInHours));
             }
 
-            return searchResults.Results;
+            return searchResults?.Results;
         }
 
         /// <summary>
@@ -410,7 +409,7 @@ namespace MediaBrowser.Providers.Plugins.Tmdb
         /// <param name="name">The name of the person.</param>
         /// <param name="cancellationToken">The cancellation token.</param>
         /// <returns>The TMDb person information.</returns>
-        public async Task<IReadOnlyList<SearchPerson>> SearchPersonAsync(string name, CancellationToken cancellationToken)
+        public async Task<IReadOnlyList<SearchPerson>?> SearchPersonAsync(string name, CancellationToken cancellationToken)
         {
             var key = $"searchperson-{name}";
             if (_memoryCache.TryGetValue(key, out SearchContainer<SearchPerson>? person) && person is not null)
@@ -424,12 +423,12 @@ namespace MediaBrowser.Providers.Plugins.Tmdb
                 .SearchPersonAsync(name, includeAdult: Plugin.Instance.Configuration.IncludeAdult, cancellationToken: cancellationToken)
                 .ConfigureAwait(false);
 
-            if (searchResults.Results.Count > 0)
+            if (searchResults?.Results?.Count > 0)
             {
                 _memoryCache.Set(key, searchResults, TimeSpan.FromHours(CacheDurationInHours));
             }
 
-            return searchResults.Results;
+            return searchResults?.Results;
         }
 
         /// <summary>
@@ -439,7 +438,7 @@ namespace MediaBrowser.Providers.Plugins.Tmdb
         /// <param name="language">The movie's language.</param>
         /// <param name="cancellationToken">The cancellation token.</param>
         /// <returns>The TMDb movie information.</returns>
-        public Task<IReadOnlyList<SearchMovie>> SearchMovieAsync(string name, string language, CancellationToken cancellationToken)
+        public Task<IReadOnlyList<SearchMovie>?> SearchMovieAsync(string name, string language, CancellationToken cancellationToken)
         {
             return SearchMovieAsync(name, 0, language, null, cancellationToken);
         }
@@ -453,7 +452,7 @@ namespace MediaBrowser.Providers.Plugins.Tmdb
         /// <param name="countryCode">The country code, ISO 3166-1.</param>
         /// <param name="cancellationToken">The cancellation token.</param>
         /// <returns>The TMDb movie information.</returns>
-        public async Task<IReadOnlyList<SearchMovie>> SearchMovieAsync(string name, int year, string language, string? countryCode, CancellationToken cancellationToken)
+        public async Task<IReadOnlyList<SearchMovie>?> SearchMovieAsync(string name, int year, string language, string? countryCode, CancellationToken cancellationToken)
         {
             var key = $"moviesearch-{name}-{year.ToString(CultureInfo.InvariantCulture)}-{language}";
             if (_memoryCache.TryGetValue(key, out SearchContainer<SearchMovie>? movies) && movies is not null)
@@ -467,12 +466,12 @@ namespace MediaBrowser.Providers.Plugins.Tmdb
                 .SearchMovieAsync(name, TmdbUtils.NormalizeLanguage(language, countryCode), includeAdult: Plugin.Instance.Configuration.IncludeAdult, year: year, cancellationToken: cancellationToken)
                 .ConfigureAwait(false);
 
-            if (searchResults.Results.Count > 0)
+            if (searchResults?.Results?.Count > 0)
             {
                 _memoryCache.Set(key, searchResults, TimeSpan.FromHours(CacheDurationInHours));
             }
 
-            return searchResults.Results;
+            return searchResults?.Results;
         }
 
         /// <summary>
@@ -483,7 +482,7 @@ namespace MediaBrowser.Providers.Plugins.Tmdb
         /// <param name="countryCode">The country code, ISO 3166-1.</param>
         /// <param name="cancellationToken">The cancellation token.</param>
         /// <returns>The TMDb collection information.</returns>
-        public async Task<IReadOnlyList<SearchCollection>> SearchCollectionAsync(string name, string language, string? countryCode, CancellationToken cancellationToken)
+        public async Task<IReadOnlyList<SearchCollection>?> SearchCollectionAsync(string name, string language, string? countryCode, CancellationToken cancellationToken)
         {
             var key = $"collectionsearch-{name}-{language}";
             if (_memoryCache.TryGetValue(key, out SearchContainer<SearchCollection>? collections) && collections is not null)
@@ -497,12 +496,12 @@ namespace MediaBrowser.Providers.Plugins.Tmdb
                 .SearchCollectionAsync(name, TmdbUtils.NormalizeLanguage(language, countryCode), cancellationToken: cancellationToken)
                 .ConfigureAwait(false);
 
-            if (searchResults.Results.Count > 0)
+            if (searchResults?.Results?.Count > 0)
             {
                 _memoryCache.Set(key, searchResults, TimeSpan.FromHours(CacheDurationInHours));
             }
 
-            return searchResults.Results;
+            return searchResults?.Results;
         }
 
         /// <summary>
@@ -511,14 +510,17 @@ namespace MediaBrowser.Providers.Plugins.Tmdb
         /// <param name="size">The image size to fetch.</param>
         /// <param name="path">The relative URL of the image.</param>
         /// <returns>The absolute URL.</returns>
-        private string? GetUrl(string? size, string path)
+        private string? GetUrl(string? size, string? path)
         {
             if (string.IsNullOrEmpty(path))
             {
                 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>
@@ -526,7 +528,7 @@ namespace MediaBrowser.Providers.Plugins.Tmdb
         /// </summary>
         /// <param name="posterPath">The relative URL of the poster.</param>
         /// <returns>The absolute URL.</returns>
-        public string? GetPosterUrl(string posterPath)
+        public string? GetPosterUrl(string? posterPath)
         {
             return GetUrl(Plugin.Instance.Configuration.PosterSize, posterPath);
         }
@@ -536,7 +538,7 @@ namespace MediaBrowser.Providers.Plugins.Tmdb
         /// </summary>
         /// <param name="actorProfilePath">The relative URL of the profile image.</param>
         /// <returns>The absolute URL.</returns>
-        public string? GetProfileUrl(string actorProfilePath)
+        public string? GetProfileUrl(string? actorProfilePath)
         {
             return GetUrl(Plugin.Instance.Configuration.ProfileSize, actorProfilePath);
         }
@@ -639,30 +641,44 @@ namespace MediaBrowser.Providers.Plugins.Tmdb
         private static void ValidatePreferences(TMDbConfig config)
         {
             var imageConfig = config.Images;
+            if (imageConfig is null)
+            {
+                return;
+            }
 
             var pluginConfig = Plugin.Instance.Configuration;
 
-            if (!imageConfig.PosterSizes.Contains(pluginConfig.PosterSize))
+            if (imageConfig.PosterSizes is not null
+                && pluginConfig.PosterSize is not null
+                && !imageConfig.PosterSizes.Contains(pluginConfig.PosterSize))
             {
                 pluginConfig.PosterSize = imageConfig.PosterSizes[^1];
             }
 
-            if (!imageConfig.BackdropSizes.Contains(pluginConfig.BackdropSize))
+            if (imageConfig.BackdropSizes is not null
+                && pluginConfig.BackdropSize is not null
+                && !imageConfig.BackdropSizes.Contains(pluginConfig.BackdropSize))
             {
                 pluginConfig.BackdropSize = imageConfig.BackdropSizes[^1];
             }
 
-            if (!imageConfig.LogoSizes.Contains(pluginConfig.LogoSize))
+            if (imageConfig.LogoSizes is not null
+                && pluginConfig.LogoSize is not null
+                && !imageConfig.LogoSizes.Contains(pluginConfig.LogoSize))
             {
                 pluginConfig.LogoSize = imageConfig.LogoSizes[^1];
             }
 
-            if (!imageConfig.ProfileSizes.Contains(pluginConfig.ProfileSize))
+            if (imageConfig.ProfileSizes is not null
+                && pluginConfig.ProfileSize is not null
+                && !imageConfig.ProfileSizes.Contains(pluginConfig.ProfileSize))
             {
                 pluginConfig.ProfileSize = imageConfig.ProfileSizes[^1];
             }
 
-            if (!imageConfig.StillSizes.Contains(pluginConfig.StillSize))
+            if (imageConfig.StillSizes is not null
+                && pluginConfig.StillSize is not null
+                && !imageConfig.StillSizes.Contains(pluginConfig.StillSize))
             {
                 pluginConfig.StillSize = imageConfig.StillSizes[^1];
             }

MediaBrowser.Providers/Plugins/Tmdb/TmdbUtils.cs

@@ -69,20 +69,20 @@ namespace MediaBrowser.Providers.Plugins.Tmdb
         /// <returns>The Jellyfin person type.</returns>
         public static PersonKind MapCrewToPersonType(Crew crew)
         {
-            if (crew.Department.Equals("directing", StringComparison.OrdinalIgnoreCase)
-                && crew.Job.Equals("director", StringComparison.OrdinalIgnoreCase))
+            if (string.Equals(crew.Department, "directing", StringComparison.OrdinalIgnoreCase)
+                && string.Equals(crew.Job, "director", StringComparison.OrdinalIgnoreCase))
             {
                 return PersonKind.Director;
             }
 
-            if (crew.Department.Equals("production", StringComparison.OrdinalIgnoreCase)
-                && crew.Job.Equals("producer", StringComparison.OrdinalIgnoreCase))
+            if (string.Equals(crew.Department, "production", StringComparison.OrdinalIgnoreCase)
+                && string.Equals(crew.Job, "producer", StringComparison.OrdinalIgnoreCase))
             {
                 return PersonKind.Producer;
             }
 
-            if (crew.Department.Equals("writing", StringComparison.OrdinalIgnoreCase)
-                && (crew.Job.Equals("writer", StringComparison.OrdinalIgnoreCase) || crew.Job.Equals("screenplay", StringComparison.OrdinalIgnoreCase)))
+            if (string.Equals(crew.Department, "writing", StringComparison.OrdinalIgnoreCase)
+                && (string.Equals(crew.Job, "writer", StringComparison.OrdinalIgnoreCase) || string.Equals(crew.Job, "screenplay", StringComparison.OrdinalIgnoreCase)))
             {
                 return PersonKind.Writer;
             }
@@ -97,9 +97,9 @@ namespace MediaBrowser.Providers.Plugins.Tmdb
         /// <returns>A boolean indicating whether the video is a trailer.</returns>
         public static bool IsTrailerType(Video video)
         {
-            return video.Site.Equals("youtube", StringComparison.OrdinalIgnoreCase)
-                   && (video.Type.Equals("trailer", StringComparison.OrdinalIgnoreCase)
-                       || video.Type.Equals("teaser", StringComparison.OrdinalIgnoreCase));
+            return string.Equals(video.Site, "youtube", StringComparison.OrdinalIgnoreCase)
+                   && (string.Equals(video.Type, "trailer", StringComparison.OrdinalIgnoreCase)
+                       || string.Equals(video.Type, "teaser", StringComparison.OrdinalIgnoreCase));
         }
 
         /// <summary>
@@ -117,14 +117,6 @@ namespace MediaBrowser.Providers.Plugins.Tmdb
                 preferredLanguage = NormalizeLanguage(preferredLanguage, countryCode);
 
                 languages.Add(preferredLanguage);
-
-                if (preferredLanguage.Length == 5) // Like en-US
-                {
-                    // Currently, TMDb supports 2-letter language codes only.
-                    // They are planning to change this in the future, thus we're
-                    // supplying both codes if we're having a 5-letter code.
-                    languages.Add(preferredLanguage.Substring(0, 2));
-                }
             }
 
             languages.Add("null");
@@ -185,10 +177,14 @@ namespace MediaBrowser.Providers.Plugins.Tmdb
         /// <param name="imageLanguage">The image's actual language code.</param>
         /// <param name="requestLanguage">The requested language code.</param>
         /// <returns>The language code.</returns>
-        public static string AdjustImageLanguage(string imageLanguage, string requestLanguage)
+        public static string AdjustImageLanguage(string? imageLanguage, string requestLanguage)
         {
-            if (!string.IsNullOrEmpty(imageLanguage)
-                && !string.IsNullOrEmpty(requestLanguage)
+            if (string.IsNullOrEmpty(imageLanguage))
+            {
+                return string.Empty;
+            }
+
+            if (!string.IsNullOrEmpty(requestLanguage)
                 && requestLanguage.Length > 2
                 && imageLanguage.Length == 2
                 && requestLanguage.StartsWith(imageLanguage, StringComparison.OrdinalIgnoreCase))

MediaBrowser.Providers/TV/SeriesMetadataService.cs

@@ -4,6 +4,7 @@ using System.Globalization;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
+using Jellyfin.Extensions;
 using MediaBrowser.Controller.Configuration;
 using MediaBrowser.Controller.Dto;
 using MediaBrowser.Controller.Entities;
@@ -201,6 +202,26 @@ public class SeriesMetadataService : MetadataService<Series, SeriesInfo>
             false);
     }
 
+    private static bool NeedsVirtualSeason(Episode episode, HashSet<Guid> physicalSeasonIds, HashSet<string> physicalSeasonPaths)
+    {
+        // Episode has a known season number, needs a season
+        if (episode.ParentIndexNumber.HasValue)
+        {
+            return true;
+        }
+
+        // Not yet processed
+        if (episode.SeasonId.IsEmpty())
+        {
+            return false;
+        }
+
+        // Episode has been processed, only needs a virtual season if it isn't
+        // already linked to a known physical season by ID or path
+        return !physicalSeasonIds.Contains(episode.SeasonId)
+            && !physicalSeasonPaths.Contains(System.IO.Path.GetDirectoryName(episode.Path) ?? string.Empty);
+    }
+
     /// <summary>
     /// Creates seasons for all episodes if they don't exist.
     /// If no season number can be determined, a dummy season will be created.
@@ -212,8 +233,20 @@ public class SeriesMetadataService : MetadataService<Series, SeriesInfo>
     {
         var seriesChildren = series.GetRecursiveChildren(i => i is Episode || i is Season);
         var seasons = seriesChildren.OfType<Season>().ToList();
+
+        var physicalSeasonIds = seasons
+            .Where(e => e.LocationType != LocationType.Virtual)
+            .Select(e => e.Id)
+            .ToHashSet();
+
+        var physicalSeasonPathSet = seasons
+            .Where(e => e.LocationType != LocationType.Virtual && !string.IsNullOrEmpty(e.Path))
+            .Select(e => e.Path)
+            .ToHashSet(StringComparer.OrdinalIgnoreCase);
+
         var uniqueSeasonNumbers = seriesChildren
             .OfType<Episode>()
+            .Where(e => NeedsVirtualSeason(e, physicalSeasonIds, physicalSeasonPathSet))
             .Select(e => e.ParentIndexNumber >= 0 ? e.ParentIndexNumber : null)
             .Distinct();
 

README.md

@@ -94,13 +94,12 @@ git clone https://github.com/jellyfin/jellyfin.git
 
 The server is configured to host the static files required for the [web client](https://github.com/jellyfin/jellyfin-web) in addition to serving the backend by default. Before you can run the server, you will need to get a copy of the web client since they are not included in this repository directly.
 
-Note that it is also possible to [host the web client separately](#hosting-the-web-client-separately) from the web server with some additional configuration, in which case you can skip this step.
+Note that it is recommended for development to [host the web client separately](#hosting-the-web-client-separately) from the web server with some additional configuration, in which case you can skip this step.
 
-There are three options to get the files for the web client.
+There are two options to get the files for the web client.
 
-1. Download one of the finished builds from the [Azure DevOps pipeline](https://dev.azure.com/jellyfin-project/jellyfin/_build?definitionId=27). You can download the build for a specific release by looking at the [branches tab](https://dev.azure.com/jellyfin-project/jellyfin/_build?definitionId=27&_a=summary&repositoryFilter=6&view=branches) of the pipelines page.
-2. Build them from source following the instructions on the [jellyfin-web repository](https://github.com/jellyfin/jellyfin-web)
-3. Get the pre-built files from an existing installation of the server. For example, with a Windows server installation the client files are located at `C:\Program Files\Jellyfin\Server\jellyfin-web`
+1. Build them from source following the instructions on the [jellyfin-web repository](https://github.com/jellyfin/jellyfin-web)
+2. Get the pre-built files from an existing installation of the server. For example, with a Windows server installation the client files are located at `C:\Program Files\Jellyfin\Server\jellyfin-web`
 
 ### Running The Server
 
@@ -198,5 +197,5 @@ This project is supported by:
 <br/>
 <a href="https://www.digitalocean.com"><img src="https://opensource.nyc3.cdn.digitaloceanspaces.com/attribution/assets/SVG/DO_Logo_horizontal_blue.svg" height="50px" alt="DigitalOcean"></a>
     &nbsp;
-<a href="https://www.jetbrains.com"><img src="https://gist.githubusercontent.com/anthonylavado/e8b2403deee9581e0b4cb8cd675af7db/raw/fa104b7d73f759d7262794b94569f1b89df41c0b/jetbrains.svg" height="50px" alt="JetBrains logo"></a>
+<a href="https://www.jetbrains.com"><img src="https://gist.githubusercontent.com/anthonylavado/e8b2403deee9581e0b4cb8cd675af7db/raw/199ae22980ef5da64882ec2de3e8e5c03fe535b8/jetbrains.svg" height="50px" alt="JetBrains logo"></a>
 </p>

src/Jellyfin.Drawing/ImageProcessor.cs

@@ -85,7 +85,6 @@ public sealed class ImageProcessor : IImageProcessor, IDisposable
             "jpeg",
             "jpg",
             "png",
-            "aiff",
             "cr2",
             "crw",
             "nef",

src/Jellyfin.Extensions/StringExtensions.cs

@@ -131,7 +131,7 @@ namespace Jellyfin.Extensions
         /// </summary>
         /// <param name="values">The enumerable of strings to trim.</param>
         /// <returns>The enumeration of trimmed strings.</returns>
-        public static IEnumerable<string> Trimmed(this IEnumerable<string> values)
+        public static IEnumerable<string> Trimmed(this IEnumerable<string?> values)
         {
             return values.Select(i => (i ?? string.Empty).Trim());
         }

tests/Jellyfin.Controller.Tests/Entities/InternalItemsQueryTests.cs

@@ -0,0 +1,26 @@
+using System;
+using MediaBrowser.Controller.Entities;
+using MediaBrowser.Model.Querying;
+using Xunit;
+
+namespace Jellyfin.Controller.Tests.Entities;
+
+public class InternalItemsQueryTests
+{
+    public static TheoryData<ItemFilter[]> ApplyFilters_Invalid()
+    {
+        var data = new TheoryData<ItemFilter[]>();
+        data.Add([ItemFilter.IsFolder, ItemFilter.IsNotFolder]);
+        data.Add([ItemFilter.IsPlayed, ItemFilter.IsUnplayed]);
+        data.Add([ItemFilter.Likes, ItemFilter.Dislikes]);
+        return data;
+    }
+
+    [Theory]
+    [MemberData(nameof(ApplyFilters_Invalid))]
+    public void ApplyFilters_Invalid_ThrowsArgumentException(ItemFilter[] filters)
+    {
+        var query = new InternalItemsQuery();
+        Assert.Throws<ArgumentException>(() => query.ApplyFilters(filters));
+    }
+}

tests/Jellyfin.MediaEncoding.Tests/Probing/ProbeResultNormalizerTests.cs

@@ -39,6 +39,23 @@ namespace Jellyfin.MediaEncoding.Tests.Probing
         public void GetFrameRate_Success(string value, float? expected)
             => Assert.Equal(expected, ProbeResultNormalizer.GetFrameRate(value));
 
+        [Theory]
+        [InlineData("1:1", true)]
+        [InlineData("3201:3200", true)]
+        [InlineData("1215:1216", true)]
+        [InlineData("1001:1000", true)]
+        [InlineData("16:15", false)]
+        [InlineData("8:9", false)]
+        [InlineData("32:27", false)]
+        [InlineData("10:11", false)]
+        [InlineData("64:45", false)]
+        [InlineData("4:3", false)]
+        [InlineData("0:1", false)]
+        [InlineData("", false)]
+        [InlineData(null, false)]
+        public void IsNearSquarePixelSar_DetectsCorrectly(string? sar, bool expected)
+            => Assert.Equal(expected, ProbeResultNormalizer.IsNearSquarePixelSar(sar));
+
         [Fact]
         public void GetMediaInfo_MetaData_Success()
         {
@@ -123,6 +140,7 @@ namespace Jellyfin.MediaEncoding.Tests.Probing
             Assert.Equal(358, res.VideoStream.Height);
             Assert.Equal(720, res.VideoStream.Width);
             Assert.Equal("2.40:1", res.VideoStream.AspectRatio);
+            Assert.True(res.VideoStream.IsAnamorphic); // SAR 32:27 — genuinely anamorphic NTSC DVD 16:9
             Assert.Equal("yuv420p", res.VideoStream.PixelFormat);
             Assert.Equal(31d, res.VideoStream.Level);
             Assert.Equal(1, res.VideoStream.RefFrames);

tests/Jellyfin.Model.Tests/Dlna/StreamInfoTests.cs

@@ -216,8 +216,7 @@ public class StreamInfoTests
 
         string legacyUrl = streamInfo.ToUrl_Original(BaseUrl, "123");
 
-        // New version will return and & after the ? due to optional parameters.
-        string newUrl = streamInfo.ToUrl(BaseUrl, "123", null).Replace("?&", "?", StringComparison.OrdinalIgnoreCase);
+        string newUrl = streamInfo.ToUrl(BaseUrl, "123", null);
 
         Assert.Equal(legacyUrl, newUrl, ignoreCase: true);
     }
@@ -234,8 +233,7 @@ public class StreamInfoTests
             FillAllProperties(streamInfo);
             string legacyUrl = streamInfo.ToUrl_Original(BaseUrl, "123");
 
-            // New version will return and & after the ? due to optional parameters.
-            string newUrl = streamInfo.ToUrl(BaseUrl, "123", null).Replace("?&", "?", StringComparison.OrdinalIgnoreCase);
+            string newUrl = streamInfo.ToUrl(BaseUrl, "123", null);
 
             Assert.Equal(legacyUrl, newUrl, ignoreCase: true);
         }

tests/Jellyfin.Model.Tests/Extensions/EnumerableExtensionsTests.cs

@@ -0,0 +1,116 @@
+using System.Linq;
+using MediaBrowser.Model.Extensions;
+using MediaBrowser.Model.Providers;
+using Xunit;
+
+namespace Jellyfin.Model.Tests.Extensions;
+
+public class EnumerableExtensionsTests
+{
+    [Fact]
+    public void OrderByLanguageDescending_PreferredLanguageFirst()
+    {
+        var images = new[]
+        {
+            new RemoteImageInfo { Language = "en", CommunityRating = 5.0, VoteCount = 100 },
+            new RemoteImageInfo { Language = "de", CommunityRating = 9.0, VoteCount = 200 },
+            new RemoteImageInfo { Language = null, CommunityRating = 7.0, VoteCount = 50 },
+            new RemoteImageInfo { Language = "fr", CommunityRating = 8.0, VoteCount = 150 },
+        };
+
+        var result = images.OrderByLanguageDescending("de").ToList();
+
+        Assert.Equal("de", result[0].Language);
+        Assert.Equal("en", result[1].Language);
+        Assert.Null(result[2].Language);
+        Assert.Equal("fr", result[3].Language);
+    }
+
+    [Fact]
+    public void OrderByLanguageDescending_EnglishBeforeNoLanguage()
+    {
+        var images = new[]
+        {
+            new RemoteImageInfo { Language = null, CommunityRating = 9.0, VoteCount = 500 },
+            new RemoteImageInfo { Language = "en", CommunityRating = 3.0, VoteCount = 10 },
+        };
+
+        var result = images.OrderByLanguageDescending("de").ToList();
+
+        // English should come before no-language, even with lower rating
+        Assert.Equal("en", result[0].Language);
+        Assert.Null(result[1].Language);
+    }
+
+    [Fact]
+    public void OrderByLanguageDescending_SameLanguageSortedByRatingThenVoteCount()
+    {
+        var images = new[]
+        {
+            new RemoteImageInfo { Language = "de", CommunityRating = 5.0, VoteCount = 100 },
+            new RemoteImageInfo { Language = "de", CommunityRating = 9.0, VoteCount = 50 },
+            new RemoteImageInfo { Language = "de", CommunityRating = 9.0, VoteCount = 200 },
+        };
+
+        var result = images.OrderByLanguageDescending("de").ToList();
+
+        Assert.Equal(200, result[0].VoteCount);
+        Assert.Equal(50, result[1].VoteCount);
+        Assert.Equal(100, result[2].VoteCount);
+    }
+
+    [Fact]
+    public void OrderByLanguageDescending_NullRequestedLanguage_DefaultsToEnglish()
+    {
+        var images = new[]
+        {
+            new RemoteImageInfo { Language = "fr", CommunityRating = 9.0, VoteCount = 500 },
+            new RemoteImageInfo { Language = "en", CommunityRating = 5.0, VoteCount = 10 },
+        };
+
+        var result = images.OrderByLanguageDescending(null!).ToList();
+
+        // With null requested language, English becomes the preferred language (score 4)
+        Assert.Equal("en", result[0].Language);
+        Assert.Equal("fr", result[1].Language);
+    }
+
+    [Fact]
+    public void OrderByLanguageDescending_EnglishRequested_NoDoubleBoost()
+    {
+        // When requested language IS English, "en" gets score 4 (requested match),
+        // no-language gets score 2, others get score 0
+        var images = new[]
+        {
+            new RemoteImageInfo { Language = null, CommunityRating = 9.0, VoteCount = 500 },
+            new RemoteImageInfo { Language = "en", CommunityRating = 3.0, VoteCount = 10 },
+            new RemoteImageInfo { Language = "fr", CommunityRating = 8.0, VoteCount = 300 },
+        };
+
+        var result = images.OrderByLanguageDescending("en").ToList();
+
+        Assert.Equal("en", result[0].Language);
+        Assert.Null(result[1].Language);
+        Assert.Equal("fr", result[2].Language);
+    }
+
+    [Fact]
+    public void OrderByLanguageDescending_FullPriorityOrder()
+    {
+        var images = new[]
+        {
+            new RemoteImageInfo { Language = "fr", CommunityRating = 9.0, VoteCount = 500 },
+            new RemoteImageInfo { Language = null, CommunityRating = 8.0, VoteCount = 400 },
+            new RemoteImageInfo { Language = "en", CommunityRating = 7.0, VoteCount = 300 },
+            new RemoteImageInfo { Language = "de", CommunityRating = 6.0, VoteCount = 200 },
+        };
+
+        var result = images.OrderByLanguageDescending("de").ToList();
+
+        // Expected order: de (requested) > en > no-language > fr (other)
+        Assert.Equal("de", result[0].Language);
+        Assert.Equal("en", result[1].Language);
+        Assert.Null(result[2].Language);
+        Assert.Equal("fr", result[3].Language);
+    }
+}

tests/Jellyfin.Server.Implementations.Tests/Library/PathExtensionsTests.cs

@@ -11,21 +11,29 @@ namespace Jellyfin.Server.Implementations.Tests.Library
         [InlineData("Superman: Red Son [imdbid=tt10985510]", "imdbid", "tt10985510")]
         [InlineData("Superman: Red Son [imdbid-tt10985510]", "imdbid", "tt10985510")]
         [InlineData("Superman: Red Son - tt10985510", "imdbid", "tt10985510")]
+        [InlineData("Superman: Red Son {imdbid=tt10985510}", "imdbid", "tt10985510")]
+        [InlineData("Superman: Red Son (imdbid-tt10985510)", "imdbid", "tt10985510")]
         [InlineData("Superman: Red Son", "imdbid", null)]
-        [InlineData("Superman: Red Son", "something", null)]
         [InlineData("Superman: Red Son [imdbid1=tt11111111][imdbid=tt10985510]", "imdbid", "tt10985510")]
-        [InlineData("Superman: Red Son [imdbid1-tt11111111][imdbid=tt10985510]", "imdbid", "tt10985510")]
+        [InlineData("Superman: Red Son {imdbid1=tt11111111}(imdbid=tt10985510)", "imdbid", "tt10985510")]
+        [InlineData("Superman: Red Son (imdbid1-tt11111111)[imdbid=tt10985510]", "imdbid", "tt10985510")]
         [InlineData("Superman: Red Son [tmdbid=618355][imdbid=tt10985510]", "imdbid", "tt10985510")]
-        [InlineData("Superman: Red Son [tmdbid-618355][imdbid-tt10985510]", "imdbid", "tt10985510")]
-        [InlineData("Superman: Red Son [tmdbid-618355][imdbid-tt10985510]", "tmdbid", "618355")]
+        [InlineData("Superman: Red Son [tmdbid-618355]{imdbid-tt10985510}", "imdbid", "tt10985510")]
+        [InlineData("Superman: Red Son (tmdbid-618355)[imdbid-tt10985510]", "tmdbid", "618355")]
         [InlineData("Superman: Red Son [providera-id=1]", "providera-id", "1")]
         [InlineData("Superman: Red Son [providerb-id=2]", "providerb-id", "2")]
         [InlineData("Superman: Red Son [providera id=4]", "providera id", "4")]
         [InlineData("Superman: Red Son [providerb id=5]", "providerb id", "5")]
         [InlineData("Superman: Red Son [tmdbid=3]", "tmdbid", "3")]
         [InlineData("Superman: Red Son [tvdbid-6]", "tvdbid", "6")]
+        [InlineData("Superman: Red Son {tmdbid=3}", "tmdbid", "3")]
+        [InlineData("Superman: Red Son (tvdbid-6)", "tvdbid", "6")]
         [InlineData("[tmdbid=618355]", "tmdbid", "618355")]
+        [InlineData("{tmdbid=618355}", "tmdbid", "618355")]
+        [InlineData("(tmdbid=618355)", "tmdbid", "618355")]
         [InlineData("[tmdbid-618355]", "tmdbid", "618355")]
+        [InlineData("{tmdbid-618355)", "tmdbid", null)]
+        [InlineData("[tmdbid-618355}", "tmdbid", null)]
         [InlineData("tmdbid=111111][tmdbid=618355]", "tmdbid", "618355")]
         [InlineData("[tmdbid=618355]tmdbid=111111]", "tmdbid", "618355")]
         [InlineData("tmdbid=618355]", "tmdbid", null)]
@@ -36,6 +44,9 @@ namespace Jellyfin.Server.Implementations.Tests.Library
         [InlineData("[tmdbid=][imdbid=tt10985510]", "tmdbid", null)]
         [InlineData("[tmdbid-][imdbid-tt10985510]", "tmdbid", null)]
         [InlineData("Superman: Red Son [tmdbid-618355][tmdbid=1234567]", "tmdbid", "618355")]
+        [InlineData("{tmdbid=}{imdbid=tt10985510}", "tmdbid", null)]
+        [InlineData("(tmdbid-)(imdbid-tt10985510)", "tmdbid", null)]
+        [InlineData("Superman: Red Son {tmdbid-618355}{tmdbid=1234567}", "tmdbid", "618355")]
         public void GetAttributeValue_ValidArgs_Correct(string input, string attribute, string? expectedResult)
         {
             Assert.Equal(expectedResult, PathExtensions.GetAttributeValue(input, attribute));