Bump version to 10.9.0

.config/dotnet-tools.json

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

.github/ISSUE_TEMPLATE/issue report.yml

@@ -38,11 +38,10 @@ body:
       label: Jellyfin Version
       description: What version of Jellyfin are you running?
       options:
-        - 10.9.0
         - 10.8.13
-        - 10.8.12 or older (please specify)
+        - 10.8.12
-        - Weekly unstable (please specify)
+        - 10.8.11 or older (please specify)
-        - Master branch
+        - Unstable (master branch)
     validations:
       required: true
   - type: input

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

@@ -20,18 +20,18 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
+      uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
     - name: Setup .NET
       uses: actions/setup-dotnet@4d6c8fcf3c8f7a60068d26b594648e99df24cee3 # v4.0.0
       with:
         dotnet-version: '8.0.x'
 
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@f079b8493333aace61c81488f8bd40919487bd9f # v3.25.7
+      uses: github/codeql-action/init@d39d31e687223d841ef683f52467bd88e9b21c14 # v3.25.3
       with:
         languages: ${{ matrix.language }}
         queries: +security-extended
     - name: Autobuild
-      uses: github/codeql-action/autobuild@f079b8493333aace61c81488f8bd40919487bd9f # v3.25.7
+      uses: github/codeql-action/autobuild@d39d31e687223d841ef683f52467bd88e9b21c14 # v3.25.3
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@f079b8493333aace61c81488f8bd40919487bd9f # v3.25.7
+      uses: github/codeql-action/analyze@d39d31e687223d841ef683f52467bd88e9b21c14 # v3.25.3

.github/workflows/ci-openapi.yml

@@ -3,8 +3,6 @@ on:
   push:
     branches:
       - master
-    tags:
-      - 'v*'
   pull_request_target:
 
 permissions: {}
@@ -16,7 +14,7 @@ jobs:
     permissions: read-all
     steps:
       - name: Checkout repository
-        uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
+        uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
         with:
           ref: ${{ github.event.pull_request.head.sha }}
           repository: ${{ github.event.pull_request.head.repo.full_name }}
@@ -41,7 +39,7 @@ jobs:
     permissions: read-all
     steps:
       - name: Checkout repository
-        uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
+        uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
         with:
           ref: ${{ github.event.pull_request.head.sha }}
           repository: ${{ github.event.pull_request.head.repo.full_name }}
@@ -101,24 +99,11 @@ jobs:
       - id: read-diff
         name: Read openapi-diff output
         run: |
-          # Read and fix markdown
           body=$(cat openapi-changes.md)
-          # Write to workflow summary
+          body="${body//'%'/'%25'}"
-          echo "$body" >> $GITHUB_STEP_SUMMARY
+          body="${body//$'\n'/'%0A'}"
-          # Set ApiChanged var
+          body="${body//$'\r'/'%0D'}"
-          if [ "$body" != '' ]; then
+          echo ::set-output name=body::$body
-            echo "ApiChanged=1" >> "$GITHUB_OUTPUT"
-          else
-            echo "ApiChanged=0" >> "$GITHUB_OUTPUT"
-          fi
-          # Add header/footer for diff comment
-          echo '<!--openapi-diff-workflow-comment-->' > openapi-changes-reply.md
-          echo "<details>" >> openapi-changes-reply.md
-          echo "<summary>Changes in OpenAPI specification found. Expand to see details.</summary>" >> openapi-changes-reply.md
-          echo "" >> openapi-changes-reply.md
-          echo "$body" >> openapi-changes-reply.md
-          echo "" >> openapi-changes-reply.md
-          echo "</details>" >> openapi-changes-reply.md
       - name: Find difference comment
         uses: peter-evans/find-comment@3eae4d37986fb5a8592848f6a574fdf654e61f9e # v3.1.0
         id: find-comment
@@ -128,15 +113,22 @@ jobs:
           body-includes: openapi-diff-workflow-comment
       - name: Reply or edit difference comment (changed)
         uses: peter-evans/create-or-update-comment@71345be0265236311c031f5c7866368bd1eff043 # v4.0.0
-        if: ${{ steps.read-diff.outputs.ApiChanged == '1' }}
+        if: ${{ steps.read-diff.outputs.body != '' }}
         with:
           issue-number: ${{ github.event.pull_request.number }}
           comment-id: ${{ steps.find-comment.outputs.comment-id }}
           edit-mode: replace
-          body-path: openapi-changes-reply.md
+          body: |
+            <!--openapi-diff-workflow-comment-->
+            <details>
+            <summary>Changes in OpenAPI specification found. Expand to see details.</summary>
+
+            ${{ steps.read-diff.outputs.body }}
+
+            </details>
       - name: Edit difference comment (unchanged)
         uses: peter-evans/create-or-update-comment@71345be0265236311c031f5c7866368bd1eff043 # v4.0.0
-        if: ${{ steps.read-diff.outputs.ApiChanged == '0' && steps.find-comment.outputs.comment-id != '' }}
+        if: ${{ steps.read-diff.outputs.body == '' && steps.find-comment.outputs.comment-id != '' }}
         with:
           issue-number: ${{ github.event.pull_request.number }}
           comment-id: ${{ steps.find-comment.outputs.comment-id }}
@@ -146,9 +138,11 @@ jobs:
 
             No changes to OpenAPI specification found. See history of this comment for previous changes.
 
-  publish-unstable:
+  publish:
     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_target' && 
+      contains(github.repository_owner, 'jellyfin')
     runs-on: ubuntu-latest
     needs:
       - openapi-head
@@ -207,65 +201,3 @@ jobs:
                 sudo ln -s unstable/${LAST_SPEC} ${TGT_DIR}/jellyfin-openapi-unstable_previous.json
             fi
             ) 200>/run/workflows/openapi-unstable.lock
-
-  publish-stable:
-    name: OpenAPI - Publish Stable Spec
-    if: ${{ startsWith(github.ref, 'refs/tags/v') && contains(github.repository_owner, 'jellyfin') }}
-    runs-on: ubuntu-latest
-    needs:
-      - openapi-head
-    steps:
-      - name: Set version number
-        id: version
-        run: |-
-          echo "JELLYFIN_VERSION=${GITHUB_REF#refs/tags/v}" >> $GITHUB_ENV
-      - name: Download openapi-head
-        uses: actions/download-artifact@65a9edc5881444af0b9093a5e628f2fe47ea3b2e # v4.1.7
-        with:
-          name: openapi-head
-          path: openapi-head
-      - name: Upload openapi.json (stable) to repository server
-        uses: appleboy/scp-action@917f8b81dfc1ccd331fef9e2d61bdc6c8be94634 # v0.1.7
-        with:
-          host: "${{ secrets.REPO_HOST }}"
-          username: "${{ secrets.REPO_USER }}"
-          key: "${{ secrets.REPO_KEY }}"
-          source: openapi-head/openapi.json
-          strip_components: 1
-          target: "/srv/incoming/openapi/stable/jellyfin-openapi-${{ env.JELLYFIN_VERSION }}"
-      - name: Move openapi.json (stable) into place
-        uses: appleboy/ssh-action@029f5b4aeeeb58fdfe1410a5d17f967dacf36262 # v1.0.3
-        with:
-          host: "${{ secrets.REPO_HOST }}"
-          username: "${{ secrets.REPO_USER }}"
-          key: "${{ secrets.REPO_KEY }}"
-          debug: false
-          script_stop: false
-          script: |
-            if ! test -d /run/workflows; then
-                sudo mkdir -p /run/workflows
-                sudo chown ${{ secrets.REPO_USER }} /run/workflows
-            fi
-            (
-            flock -x -w 300 200 || exit 1
-            TGT_DIR="/srv/repository/main/openapi"
-            LAST_SPEC="$( ls -lt ${TGT_DIR}/stable/ | grep 'jellyfin-openapi' | head -1 | awk '{ print $NF }' )"
-            # If new and previous spec don't differ (diff retcode 0), remove incoming and finish
-            if diff /srv/incoming/openapi/stable/jellyfin-openapi-${{ env.JELLYFIN_VERSION }}/openapi.json ${TGT_DIR}/stable/${LAST_SPEC} &>/dev/null; then
-                rm -r /srv/incoming/openapi/stable/jellyfin-openapi-${{ env.JELLYFIN_VERSION }}
-                exit 0
-            fi
-            # Move new spec into place
-            sudo mv /srv/incoming/openapi/stable/jellyfin-openapi-${{ env.JELLYFIN_VERSION }}/openapi.json ${TGT_DIR}/stable/jellyfin-openapi-${{ env.JELLYFIN_VERSION }}.json
-            # Delete previous jellyfin-openapi-stable_previous.json
-            sudo rm ${TGT_DIR}/jellyfin-openapi-stable_previous.json
-            # Move current jellyfin-openapi-stable.json symlink to jellyfin-openapi-stable_previous.json
-            sudo mv ${TGT_DIR}/jellyfin-openapi-stable.json ${TGT_DIR}/jellyfin-openapi-stable_previous.json
-            # Create new jellyfin-openapi-stable.json symlink
-            sudo ln -s stable/jellyfin-openapi-${{ env.JELLYFIN_VERSION }}.json ${TGT_DIR}/jellyfin-openapi-stable.json
-            # Check that the previous openapi stable spec link is correct
-            if [[ "$( readlink ${TGT_DIR}/jellyfin-openapi-stable_previous.json )" != "stable/${LAST_SPEC}" ]]; then
-                sudo rm ${TGT_DIR}/jellyfin-openapi-stable_previous.json
-                sudo ln -s stable/${LAST_SPEC} ${TGT_DIR}/jellyfin-openapi-stable_previous.json
-            fi
-            ) 200>/run/workflows/openapi-stable.lock

.github/workflows/ci-tests.yml

@@ -19,7 +19,7 @@ jobs:
 
     runs-on: "${{ matrix.os }}"
     steps:
-      - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
+      - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
 
       - uses: actions/setup-dotnet@4d6c8fcf3c8f7a60068d26b594648e99df24cee3 # v4.0.0
         with:
@@ -34,7 +34,7 @@ jobs:
           --verbosity minimal
 
       - name: Merge code coverage results
-        uses: danielpalme/ReportGenerator-GitHub-Action@fa728091745cdd279fddda1e0e80fb29265d0977 # 5.3.5
+        uses: danielpalme/ReportGenerator-GitHub-Action@2a2d60ea1c7e811f54684179af6ac1ae8c1ce69a # 5.2.5
         with:
           reports: "**/coverage.cobertura.xml"
           targetdir: "merged/"

.github/workflows/commands.yml

@@ -24,7 +24,7 @@ jobs:
           reactions: '+1'
 
       - name: Checkout the latest code
-        uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
+        uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
         with:
           token: ${{ secrets.JF_BOT_TOKEN }}
           fetch-depth: 0
@@ -51,7 +51,7 @@ jobs:
           reactions: eyes
 
       - name: Checkout the latest code
-        uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
+        uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
         with:
           token: ${{ secrets.JF_BOT_TOKEN }}
           fetch-depth: 0
@@ -128,7 +128,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: pull in script
-        uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
+        uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
         with:
           repository: jellyfin/jellyfin-triage-script
       - name: install python

.github/workflows/issue-template-check.yml

@@ -10,7 +10,7 @@ jobs:
       issues: write
     steps:
       - name: pull in script
-        uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
+        uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
         with:
           repository: jellyfin/jellyfin-triage-script
       - name: install python

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

@@ -15,7 +15,7 @@ jobs:
     if: ${{ github.repository == 'jellyfin/jellyfin' }}
     steps:
       - name: Apply label
-        uses: eps1lon/actions-label-merge-conflict@1b1b1fcde06a9b3d089f3464c96417961dde1168 # v3.0.2
+        uses: eps1lon/actions-label-merge-conflict@e62d7a53ff8be8b97684bffb6cfbbf3fc1115e2e # v3.0.0
         if: ${{ github.event_name == 'push' || github.event_name == 'pull_request_target'}}
         with:
           dirtyLabel: 'merge conflict'

.github/workflows/release-bump-version.yaml

@@ -33,7 +33,7 @@ jobs:
           yq-version: v4.9.8
 
       - name: Checkout Repository
-        uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
+        uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
         with:
           ref: ${{ env.TAG_BRANCH }}
 
@@ -66,7 +66,7 @@ jobs:
       NEXT_VERSION: ${{ github.event.inputs.NEXT_VERSION }}
     steps:
       - name: Checkout Repository
-        uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
+        uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
         with:
           ref: ${{ env.TAG_BRANCH }}
 

CONTRIBUTORS.md

@@ -183,7 +183,6 @@
  - [btopherjohnson](https://github.com/btopherjohnson)
  - [GeorgeH005](https://github.com/GeorgeH005)
  - [Vedant](https://github.com/viktory36/)
- - [NotSaifA](https://github.com/NotSaifA)
 
 # Emby Contributors
 
@@ -256,4 +255,3 @@
  - [JPUC1143](https://github.com/Jpuc1143/)
  - [0x25CBFC4F](https://github.com/0x25CBFC4F)
  - [Robert Lützner](https://github.com/rluetzner)
- - [Nathan McCrina](https://github.com/nfmccrina)

Directory.Packages.props

@@ -16,7 +16,7 @@
     <PackageVersion Include="Diacritics" Version="3.3.29" />
     <PackageVersion Include="DiscUtils.Udf" Version="0.16.13" />
     <PackageVersion Include="DotNet.Glob" Version="3.1.3" />
-    <PackageVersion Include="EFCoreSecondLevelCacheInterceptor" Version="4.5.0" />
+    <PackageVersion Include="EFCoreSecondLevelCacheInterceptor" Version="4.4.3" />
     <PackageVersion Include="FsCheck.Xunit" Version="2.16.6" />
     <PackageVersion Include="HarfBuzzSharp.NativeAssets.Linux" Version="7.3.0.2" />
     <PackageVersion Include="ICU4N.Transliterator" Version="60.1.0-alpha.356" />
@@ -25,14 +25,15 @@
     <PackageVersion Include="libse" Version="4.0.5" />
     <PackageVersion Include="LrcParser" Version="2023.524.0" />
     <PackageVersion Include="MetaBrainz.MusicBrainz" Version="6.1.0" />
-    <PackageVersion Include="Microsoft.AspNetCore.Authorization" Version="8.0.6" />
+    <PackageVersion Include="Microsoft.AspNetCore.Authorization" Version="8.0.4" />
-    <PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="8.0.6" />
+    <PackageVersion Include="Microsoft.AspNetCore.HttpOverrides" Version="2.2.0" />
+    <PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="8.0.4" />
     <PackageVersion Include="Microsoft.CodeAnalysis.BannedApiAnalyzers" Version="3.3.4" />
-    <PackageVersion Include="Microsoft.Data.Sqlite" Version="8.0.6" />
+    <PackageVersion Include="Microsoft.Data.Sqlite" Version="8.0.4" />
-    <PackageVersion Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.6" />
+    <PackageVersion Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.4" />
-    <PackageVersion Include="Microsoft.EntityFrameworkCore.Relational" Version="8.0.6" />
+    <PackageVersion Include="Microsoft.EntityFrameworkCore.Relational" Version="8.0.4" />
-    <PackageVersion Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.6" />
+    <PackageVersion Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.4" />
-    <PackageVersion Include="Microsoft.EntityFrameworkCore.Tools" Version="8.0.6" />
+    <PackageVersion Include="Microsoft.EntityFrameworkCore.Tools" Version="8.0.4" />
     <PackageVersion Include="Microsoft.Extensions.Caching.Abstractions" Version="8.0.0" />
     <PackageVersion Include="Microsoft.Extensions.Caching.Memory" Version="8.0.0" />
     <PackageVersion Include="Microsoft.Extensions.Configuration.Abstractions" Version="8.0.0" />
@@ -41,14 +42,14 @@
     <PackageVersion Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0" />
     <PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.1" />
     <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
-    <PackageVersion Include="Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore" Version="8.0.6" />
+    <PackageVersion Include="Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore" Version="8.0.4" />
-    <PackageVersion Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="8.0.6" />
+    <PackageVersion Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="8.0.4" />
     <PackageVersion Include="Microsoft.Extensions.Hosting.Abstractions" Version="8.0.0" />
     <PackageVersion Include="Microsoft.Extensions.Http" Version="8.0.0" />
     <PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.1" />
     <PackageVersion Include="Microsoft.Extensions.Logging" Version="8.0.0" />
     <PackageVersion Include="Microsoft.Extensions.Options" Version="8.0.2" />
-    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
+    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
     <PackageVersion Include="MimeTypes" Version="2.4.0" />
     <PackageVersion Include="Mono.Nat" Version="3.0.4" />
     <PackageVersion Include="Moq" Version="4.18.4" />

Emby.Naming/Emby.Naming.csproj

@@ -36,7 +36,7 @@
   <PropertyGroup>
     <Authors>Jellyfin Contributors</Authors>
     <PackageId>Jellyfin.Naming</PackageId>
-    <VersionPrefix>10.10.0</VersionPrefix>
+    <VersionPrefix>10.9.0</VersionPrefix>
     <RepositoryUrl>https://github.com/jellyfin/jellyfin</RepositoryUrl>
     <PackageLicenseExpression>GPL-3.0-only</PackageLicenseExpression>
   </PropertyGroup>

Emby.Naming/TV/TvParserHelpers.cs

@@ -1,44 +0,0 @@
-using System;
-using System.Linq;
-using MediaBrowser.Model.Entities;
-
-namespace Emby.Naming.TV;
-
-/// <summary>
-/// Helper class for TV metadata parsing.
-/// </summary>
-public static class TvParserHelpers
-{
-    private static readonly string[] _continuingState = ["Pilot", "Returning Series", "Returning"];
-    private static readonly string[] _endedState = ["Cancelled", "Canceled"];
-
-    /// <summary>
-    /// Tries to parse a string into <see cref="SeriesStatus"/>.
-    /// </summary>
-    /// <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)
-    {
-        if (Enum.TryParse(status, true, out SeriesStatus seriesStatus))
-        {
-            enumValue = seriesStatus;
-            return true;
-        }
-
-        if (_continuingState.Contains(status, StringComparer.OrdinalIgnoreCase))
-        {
-            enumValue = SeriesStatus.Continuing;
-            return true;
-        }
-
-        if (_endedState.Contains(status, StringComparer.OrdinalIgnoreCase))
-        {
-            enumValue = SeriesStatus.Ended;
-            return true;
-        }
-
-        enumValue = null;
-        return false;
-    }
-}

Emby.Server.Implementations/ApplicationHost.cs

@@ -422,7 +422,7 @@ namespace Emby.Server.Implementations
             // Initialize runtime stat collection
             if (ConfigurationManager.Configuration.EnableMetrics)
             {
-                _disposableParts.Add(DotNetRuntimeStatsBuilder.Default().StartCollecting());
+                DotNetRuntimeStatsBuilder.Default().StartCollecting();
             }
 
             var networkConfiguration = ConfigurationManager.GetNetworkConfiguration();

Emby.Server.Implementations/ConfigurationOptions.cs

@@ -19,8 +19,7 @@ namespace Emby.Server.Implementations
             { FfmpegAnalyzeDurationKey, "200M" },
             { PlaylistsAllowDuplicatesKey, bool.FalseString },
             { BindToUnixSocketKey, bool.FalseString },
-            { SqliteCacheSizeKey, "20000" },
+            { SqliteCacheSizeKey, "20000" }
-            { SqliteDisableSecondLevelCacheKey, bool.FalseString }
         };
     }
 }

Emby.Server.Implementations/Data/SqliteItemRepository.cs

@@ -1298,15 +1298,16 @@ namespace Emby.Server.Implementations.Data
                 && type != typeof(Book)
                 && type != typeof(LiveTvProgram)
                 && type != typeof(AudioBook)
+                && type != typeof(Audio)
                 && type != typeof(MusicAlbum);
         }
 
         private BaseItem GetItem(SqliteDataReader reader, InternalItemsQuery query)
         {
-            return GetItem(reader, query, HasProgramAttributes(query), HasEpisodeAttributes(query), HasServiceName(query), HasStartDate(query), HasTrailerTypes(query), HasArtistFields(query), HasSeriesFields(query), false);
+            return GetItem(reader, query, HasProgramAttributes(query), HasEpisodeAttributes(query), HasServiceName(query), HasStartDate(query), HasTrailerTypes(query), HasArtistFields(query), HasSeriesFields(query));
         }
 
-        private BaseItem GetItem(SqliteDataReader reader, InternalItemsQuery query, bool enableProgramAttributes, bool hasEpisodeAttributes, bool hasServiceName, bool queryHasStartDate, bool hasTrailerTypes, bool hasArtistFields, bool hasSeriesFields, bool skipDeserialization)
+        private BaseItem GetItem(SqliteDataReader reader, InternalItemsQuery query, bool enableProgramAttributes, bool hasEpisodeAttributes, bool hasServiceName, bool queryHasStartDate, bool hasTrailerTypes, bool hasArtistFields, bool hasSeriesFields)
         {
             var typeString = reader.GetString(0);
 
@@ -1319,7 +1320,7 @@ namespace Emby.Server.Implementations.Data
 
             BaseItem item = null;
 
-            if (TypeRequiresDeserialization(type) && !skipDeserialization)
+            if (TypeRequiresDeserialization(type))
             {
                 try
                 {
@@ -2322,7 +2323,7 @@ namespace Emby.Server.Implementations.Data
 
                 columns.Add(builder.ToString());
 
-                query.ExcludeItemIds = [.. query.ExcludeItemIds, item.Id, .. item.ExtraIds];
+                query.ExcludeItemIds = [..query.ExcludeItemIds, item.Id, ..item.ExtraIds];
                 query.ExcludeProviderIds = item.ProviderIds;
             }
 
@@ -2561,7 +2562,7 @@ namespace Emby.Server.Implementations.Data
 
                 foreach (var row in statement.ExecuteQuery())
                 {
-                    var item = GetItem(row, query, hasProgramAttributes, hasEpisodeAttributes, hasServiceName, hasStartDate, hasTrailerTypes, hasArtistFields, hasSeriesFields, query.SkipDeserialization);
+                    var item = GetItem(row, query, hasProgramAttributes, hasEpisodeAttributes, hasServiceName, hasStartDate, hasTrailerTypes, hasArtistFields, hasSeriesFields);
                     if (item is not null)
                     {
                         items.Add(item);
@@ -2773,7 +2774,7 @@ namespace Emby.Server.Implementations.Data
 
                     foreach (var row in statement.ExecuteQuery())
                     {
-                        var item = GetItem(row, query, hasProgramAttributes, hasEpisodeAttributes, hasServiceName, hasStartDate, hasTrailerTypes, hasArtistFields, hasSeriesFields, false);
+                        var item = GetItem(row, query, hasProgramAttributes, hasEpisodeAttributes, hasServiceName, hasStartDate, hasTrailerTypes, hasArtistFields, hasSeriesFields);
                         if (item is not null)
                         {
                             list.Add(item);
@@ -2830,7 +2831,7 @@ namespace Emby.Server.Implementations.Data
                     prepend.Add((ItemSortBy.Random, SortOrder.Ascending));
                 }
 
-                orderBy = query.OrderBy = [.. prepend, .. orderBy];
+                orderBy = query.OrderBy = [..prepend, ..orderBy];
             }
             else if (orderBy.Count == 0)
             {
@@ -5020,7 +5021,7 @@ AND Type = @InternalPersonType)");
 
                         foreach (var row in statement.ExecuteQuery())
                         {
-                            var item = GetItem(row, query, hasProgramAttributes, hasEpisodeAttributes, hasServiceName, hasStartDate, hasTrailerTypes, hasArtistFields, hasSeriesFields, false);
+                            var item = GetItem(row, query, hasProgramAttributes, hasEpisodeAttributes, hasServiceName, hasStartDate, hasTrailerTypes, hasArtistFields, hasSeriesFields);
                             if (item is not null)
                             {
                                 var countStartColumn = columns.Count - 1;
@@ -5143,7 +5144,7 @@ AND Type = @InternalPersonType)");
             list.AddRange(inheritedTags.Select(i => (6, i)));
 
             // Remove all invalid values.
-            list.RemoveAll(i => string.IsNullOrWhiteSpace(i.Item2));
+            list.RemoveAll(i => string.IsNullOrEmpty(i.Item2));
 
             return list;
         }
@@ -5201,6 +5202,12 @@ AND Type = @InternalPersonType)");
 
                         var itemValue = currentValueInfo.Value;
 
+                        // Don't save if invalid
+                        if (string.IsNullOrWhiteSpace(itemValue))
+                        {
+                            continue;
+                        }
+
                         statement.TryBind("@Type" + index, currentValueInfo.MagicNumber);
                         statement.TryBind("@Value" + index, itemValue);
                         statement.TryBind("@CleanValue" + index, GetCleanValue(itemValue));
@@ -5221,20 +5228,19 @@ AND Type = @InternalPersonType)");
                 throw new ArgumentNullException(nameof(itemId));
             }
 
+            ArgumentNullException.ThrowIfNull(people);
+
             CheckDisposed();
 
             using var connection = GetConnection();
             using var transaction = connection.BeginTransaction();
-            // Delete all existing people first
+            // First delete chapters
             using var command = connection.CreateCommand();
             command.CommandText = "delete from People where ItemId=@ItemId";
             command.TryBind("@ItemId", itemId);
             command.ExecuteNonQuery();
 
-            if (people is not null)
+            InsertPeople(itemId, people, connection);
-            {
-                InsertPeople(itemId, people, connection);
-            }
 
             transaction.Commit();
         }

Emby.Server.Implementations/IO/ManagedFileSystem.cs

@@ -80,14 +80,12 @@ namespace Emby.Server.Implementations.IO
         public virtual string MakeAbsolutePath(string folderPath, string filePath)
         {
             // path is actually a stream
-            if (string.IsNullOrWhiteSpace(filePath))
+            if (string.IsNullOrWhiteSpace(filePath) || filePath.Contains("://", StringComparison.Ordinal))
             {
                 return filePath;
             }
 
-            var isAbsolutePath = Path.IsPathRooted(filePath) && (!OperatingSystem.IsWindows() || filePath[0] != '\\');
+            if (filePath.Length > 3 && filePath[1] == ':' && filePath[2] == '/')
-
-            if (isAbsolutePath)
             {
                 // absolute local path
                 return filePath;
@@ -99,10 +97,17 @@ namespace Emby.Server.Implementations.IO
                 return filePath;
             }
 
+            var firstChar = filePath[0];
+            if (firstChar == '/')
+            {
+                // for this we don't really know
+                return filePath;
+            }
+
             var filePathSpan = filePath.AsSpan();
 
-            // relative path on windows
+            // relative path
-            if (filePath[0] == '\\')
+            if (firstChar == '\\')
             {
                 filePathSpan = filePathSpan.Slice(1);
             }

Emby.Server.Implementations/Images/BaseFolderImageProvider.cs

@@ -11,6 +11,7 @@ using MediaBrowser.Controller.Library;
 using MediaBrowser.Controller.Providers;
 using MediaBrowser.Model.Entities;
 using MediaBrowser.Model.IO;
+using MediaBrowser.Model.Querying;
 
 namespace Emby.Server.Implementations.Images
 {
@@ -32,12 +33,12 @@ namespace Emby.Server.Implementations.Images
                 Parent = item,
                 Recursive = true,
                 DtoOptions = new DtoOptions(true),
-                ImageTypes = [ImageType.Primary],
+                ImageTypes = new ImageType[] { ImageType.Primary },
-                OrderBy =
+                OrderBy = new (ItemSortBy, SortOrder)[]
-                [
+                {
                     (ItemSortBy.IsFolder, SortOrder.Ascending),
                     (ItemSortBy.SortName, SortOrder.Ascending)
-                ],
+                },
                 Limit = 1
             });
         }

Emby.Server.Implementations/Images/MusicAlbumImageProvider.cs

@@ -1,10 +1,7 @@
 #pragma warning disable CS1591
 
-using System.Collections.Generic;
-using System.Linq;
 using MediaBrowser.Common.Configuration;
 using MediaBrowser.Controller.Drawing;
-using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Entities.Audio;
 using MediaBrowser.Controller.Library;
 using MediaBrowser.Controller.Providers;
@@ -18,13 +15,5 @@ namespace Emby.Server.Implementations.Images
             : base(fileSystem, providerManager, applicationPaths, imageProcessor, libraryManager)
         {
         }
-
-        protected override IReadOnlyList<BaseItem> GetItemsWithImages(BaseItem item)
-        {
-            var items = base.GetItemsWithImages(item);
-
-            // Ignore any folders because they can have generated collages
-            return items.Where(i => i is not Folder).ToList();
-        }
     }
 }

Emby.Server.Implementations/Library/LibraryManager.cs

@@ -2812,10 +2812,8 @@ namespace Emby.Server.Implementations.Library
             }
 
             _itemRepository.UpdatePeople(item.Id, people);
-            if (people is not null)
+
-            {
+            await SavePeopleMetadataAsync(people, cancellationToken).ConfigureAwait(false);
-                await SavePeopleMetadataAsync(people, cancellationToken).ConfigureAwait(false);
-            }
         }
 
         public async Task<ItemImageInfo> ConvertImageToLocal(BaseItem item, ItemImageInfo image, int imageIndex, bool removeOnFailure)

Emby.Server.Implementations/Library/Resolvers/Audio/MusicArtistResolver.cs

@@ -3,7 +3,6 @@
 using System;
 using System.Linq;
 using System.Threading.Tasks;
-using Emby.Naming.Audio;
 using Emby.Naming.Common;
 using Jellyfin.Data.Enums;
 using MediaBrowser.Controller.Entities.Audio;
@@ -86,7 +85,6 @@ namespace Emby.Server.Implementations.Library.Resolvers.Audio
             }
 
             var albumResolver = new MusicAlbumResolver(_logger, _namingOptions, _directoryService);
-            var albumParser = new AlbumParser(_namingOptions);
 
             var directories = args.FileSystemChildren.Where(i => i.IsDirectory);
 
@@ -102,12 +100,6 @@ namespace Emby.Server.Implementations.Library.Resolvers.Audio
                     }
                 }
 
-                // If the folder is a multi-disc folder, then it is not an artist folder
-                if (albumParser.IsMultiPart(fileSystemInfo.FullName))
-                {
-                    return;
-                }
-
                 // If we contain a music album assume we are an artist folder
                 if (albumResolver.IsMusicAlbum(fileSystemInfo.FullName, _directoryService))
                 {

Emby.Server.Implementations/Library/Resolvers/TV/SeasonResolver.cs

@@ -54,8 +54,7 @@ namespace Emby.Server.Implementations.Library.Resolvers.TV
                 {
                     IndexNumber = seasonParserResult.SeasonNumber,
                     SeriesId = series.Id,
-                    SeriesName = series.Name,
+                    SeriesName = series.Name
-                    Path = seasonParserResult.IsSeasonFolder ? path : args.Parent.Path
                 };
 
                 if (!season.IndexNumber.HasValue || !seasonParserResult.IsSeasonFolder)
@@ -79,16 +78,27 @@ namespace Emby.Server.Implementations.Library.Resolvers.TV
                     }
                 }
 
-                if (season.IndexNumber.HasValue && string.IsNullOrEmpty(season.Name))
+                if (season.IndexNumber.HasValue)
                 {
                     var seasonNumber = season.IndexNumber.Value;
-                    season.Name = seasonNumber == 0 ?
+                    if (string.IsNullOrEmpty(season.Name))
-                        args.LibraryOptions.SeasonZeroDisplayName :
+                    {
-                        string.Format(
+                        var seasonNames = series.SeasonNames;
-                            CultureInfo.InvariantCulture,
+                        if (seasonNames.TryGetValue(seasonNumber, out var seasonName))
-                            _localization.GetLocalizedString("NameSeasonNumber"),
+                        {
-                            seasonNumber,
+                            season.Name = seasonName;
-                            args.LibraryOptions.PreferredMetadataLanguage);
+                        }
+                        else
+                        {
+                            season.Name = seasonNumber == 0 ?
+                                args.LibraryOptions.SeasonZeroDisplayName :
+                                string.Format(
+                                    CultureInfo.InvariantCulture,
+                                    _localization.GetLocalizedString("NameSeasonNumber"),
+                                    seasonNumber,
+                                    args.LibraryOptions.PreferredMetadataLanguage);
+                        }
+                    }
                 }
 
                 return season;

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

@@ -1,3 +1 @@
-{
+{}
-    "Albums": "аальбомқәа"
-}

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

@@ -127,7 +127,5 @@
     "TaskRefreshTrickplayImages": "Стварыце выявы Trickplay",
     "TaskRefreshTrickplayImagesDescription": "Стварае прагляд відэаролікаў для Trickplay у падключаных бібліятэках.",
     "TaskCleanCollectionsAndPlaylists": "Ачысціце калекцыі і спісы прайгравання",
-    "TaskCleanCollectionsAndPlaylistsDescription": "Выдаляе элементы з калекцый і спісаў прайгравання, якія больш не існуюць.",
+    "TaskCleanCollectionsAndPlaylistsDescription": "Выдаляе элементы з калекцый і спісаў прайгравання, якія больш не існуюць."
-    "TaskAudioNormalizationDescription": "Сканіруе файлы на прадмет нармалізацыі гуку.",
-    "TaskAudioNormalization": "Нармалізацыя гуку"
 }

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

@@ -22,7 +22,7 @@
     "HeaderFavoriteEpisodes": "Oblíbené epizody",
     "HeaderFavoriteShows": "Oblíbené seriály",
     "HeaderFavoriteSongs": "Oblíbená hudba",
-    "HeaderLiveTV": "TV vysílání",
+    "HeaderLiveTV": "Živý přenos",
     "HeaderNextUp": "Další díly",
     "HeaderRecordingGroups": "Skupiny nahrávek",
     "HomeVideos": "Domácí videa",

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

@@ -17,7 +17,7 @@
     "Genres": "Genrer",
     "HeaderAlbumArtists": "Albumkunstnere",
     "HeaderContinueWatching": "Fortsæt afspilning",
-    "HeaderFavoriteAlbums": "Favoritalbum",
+    "HeaderFavoriteAlbums": "Favoritalbummer",
     "HeaderFavoriteArtists": "Favoritkunstnere",
     "HeaderFavoriteEpisodes": "Yndlingsafsnit",
     "HeaderFavoriteShows": "Yndlingsserier",
@@ -87,21 +87,21 @@
     "UserOnlineFromDevice": "{0} er online fra {1}",
     "UserPasswordChangedWithName": "Adgangskode er ændret for brugeren {0}",
     "UserPolicyUpdatedWithName": "Brugerpolitikken er blevet opdateret for {0}",
-    "UserStartedPlayingItemWithValues": "{0} har påbegyndt afspilning af {1} på {2}",
+    "UserStartedPlayingItemWithValues": "{0} har påbegyndt afspilning af {1}",
     "UserStoppedPlayingItemWithValues": "{0} har afsluttet afspilning af {1} på {2}",
     "ValueHasBeenAddedToLibrary": "{0} er blevet tilføjet til dit mediebibliotek",
     "ValueSpecialEpisodeName": "Special - {0}",
     "VersionNumber": "Version {0}",
     "TaskDownloadMissingSubtitlesDescription": "Søger på internettet efter manglende undertekster baseret på metadata-konfigurationen.",
     "TaskDownloadMissingSubtitles": "Hent manglende undertekster",
-    "TaskUpdatePluginsDescription": "Henter og installerer opdateringer for plugins, som er konfigurerede til at blive opdateret automatisk.",
+    "TaskUpdatePluginsDescription": "Henter og installerer opdateringer for plugins, som er indstillet til at blive opdateret automatisk.",
     "TaskUpdatePlugins": "Opdater Plugins",
     "TaskCleanLogsDescription": "Sletter log-filer som er mere end {0} dage gamle.",
     "TaskCleanLogs": "Ryd Log-mappe",
     "TaskRefreshLibraryDescription": "Scanner dit mediebibliotek for nye filer og opdateret metadata.",
     "TaskRefreshLibrary": "Scan Mediebibliotek",
     "TaskCleanCacheDescription": "Sletter cache-filer som systemet ikke længere bruger.",
-    "TaskCleanCache": "Ryd cache-mappe",
+    "TaskCleanCache": "Ryd Cache-mappe",
     "TasksChannelsCategory": "Internetkanaler",
     "TasksApplicationCategory": "Applikation",
     "TasksLibraryCategory": "Bibliotek",
@@ -128,7 +128,5 @@
     "TaskRefreshTrickplayImages": "Generér Trickplay Billeder",
     "TaskRefreshTrickplayImagesDescription": "Laver trickplay forhåndsvisninger for videoer i aktiverede biblioteker.",
     "TaskCleanCollectionsAndPlaylists": "Ryd op i samlinger og afspilningslister",
-    "TaskCleanCollectionsAndPlaylistsDescription": "Fjerner elementer fra samlinger og afspilningslister der ikke eksisterer længere.",
+    "TaskCleanCollectionsAndPlaylistsDescription": "Fjerner enheder fra samlinger og afspilningslister der ikke eksisterer længere."
-    "TaskAudioNormalizationDescription": "Skanner filer for data vedrørende audio-normalisering.",
-    "TaskAudioNormalization": "Audio-normalisering"
 }

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

@@ -126,9 +126,5 @@
     "External": "Εξωτερικό",
     "HearingImpaired": "Με προβλήματα ακοής",
     "TaskRefreshTrickplayImages": "Δημιουργήστε εικόνες Trickplay",
-    "TaskRefreshTrickplayImagesDescription": "Δημιουργεί προεπισκοπήσεις trickplay για βίντεο σε ενεργοποιημένες βιβλιοθήκες.",
+    "TaskRefreshTrickplayImagesDescription": "Δημιουργεί προεπισκοπήσεις trickplay για βίντεο σε ενεργοποιημένες βιβλιοθήκες."
-    "TaskAudioNormalization": "Ομοιομορφία ήχου",
-    "TaskAudioNormalizationDescription": "Ανίχνευση αρχείων για δεδομένα ομοιομορφίας ήχου.",
-    "TaskCleanCollectionsAndPlaylists": "Καθαρισμός συλλογών και λιστών αναπαραγωγής",
-    "TaskCleanCollectionsAndPlaylistsDescription": "Αφαιρούνται στοιχεία από τις συλλογές και τις λίστες αναπαραγωγής που δεν υπάρχουν πλέον."
 }

Emby.Server.Implementations/Localization/Core/en-US.json

@@ -13,7 +13,7 @@
     "DeviceOfflineWithName": "{0} has disconnected",
     "DeviceOnlineWithName": "{0} is connected",
     "External": "External",
-    "FailedLoginAttemptWithUserName": "Failed login attempt from {0}",
+    "FailedLoginAttemptWithUserName": "Failed login try from {0}",
     "Favorites": "Favorites",
     "Folders": "Folders",
     "Forced": "Forced",

Emby.Server.Implementations/Localization/Core/es-MX.json

@@ -11,7 +11,7 @@
     "Collections": "Colecciones",
     "DeviceOfflineWithName": "{0} se ha desconectado",
     "DeviceOnlineWithName": "{0} está conectado",
-    "FailedLoginAttemptWithUserName": "Intento fallido de inicio de sesión de {0}",
+    "FailedLoginAttemptWithUserName": "Intento fallido de inicio de sesión desde {0}",
     "Favorites": "Favoritos",
     "Folders": "Carpetas",
     "Genres": "Géneros",
@@ -124,11 +124,5 @@
     "TaskKeyframeExtractorDescription": "Extrae los cuadros clave de los archivos de vídeo para crear listas HLS más precisas. Esta tarea puede tardar un buen rato.",
     "TaskKeyframeExtractor": "Extractor de Cuadros Clave",
     "External": "Externo",
-    "HearingImpaired": "Discapacidad Auditiva",
+    "HearingImpaired": "Discapacidad Auditiva"
-    "TaskRefreshTrickplayImagesDescription": "Crea previsualizaciones para la barra de reproducción en las bibliotecas habilitadas.",
-    "TaskRefreshTrickplayImages": "Generar imágenes de la barra de reproducción",
-    "TaskAudioNormalization": "Normalización de audio",
-    "TaskAudioNormalizationDescription": "Analiza los archivos para normalizar el audio.",
-    "TaskCleanCollectionsAndPlaylists": "Limpieza de colecciones y listas de reproducción",
-    "TaskCleanCollectionsAndPlaylistsDescription": "Quita elementos que ya no existen de colecciones y listas de reproducción."
 }

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

@@ -11,7 +11,7 @@
     "Collections": "Colecciones",
     "DeviceOfflineWithName": "{0} se ha desconectado",
     "DeviceOnlineWithName": "{0} está conectado",
-    "FailedLoginAttemptWithUserName": "Intento fallido de inicio de sesión de {0}",
+    "FailedLoginAttemptWithUserName": "Error al intentar iniciar sesión desde {0}",
     "Favorites": "Favoritos",
     "Folders": "Carpetas",
     "Genres": "Géneros",

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

@@ -12,118 +12,14 @@
     "Application": "Aplicación",
     "AppDeviceValues": "App: {0}, Dispositivo: {1}",
     "HeaderContinueWatching": "Continuar Viendo",
-    "HeaderAlbumArtists": "Artistas del álbum",
+    "HeaderAlbumArtists": "Artistas del Álbum",
     "Genres": "Géneros",
     "Folders": "Carpetas",
     "Favorites": "Favoritos",
-    "FailedLoginAttemptWithUserName": "Intento de inicio de sesión fallido desde {0}",
+    "FailedLoginAttemptWithUserName": "Intento de inicio de sesión fallido de {0}",
     "HeaderFavoriteSongs": "Canciones Favoritas",
     "HeaderFavoriteEpisodes": "Episodios Favoritos",
     "HeaderFavoriteArtists": "Artistas Favoritos",
     "External": "Externo",
-    "Default": "Predeterminado",
+    "Default": "Predeterminado"
-    "Movies": "Películas",
-    "MessageNamedServerConfigurationUpdatedWithValue": "La sección {0} de la configuración ha sido actualizada",
-    "MixedContent": "Contenido mixto",
-    "Music": "Música",
-    "NotificationOptionCameraImageUploaded": "Imagen de la cámara subida",
-    "NotificationOptionServerRestartRequired": "Se necesita reiniciar el servidor",
-    "NotificationOptionVideoPlayback": "Reproducción de video iniciada",
-    "Sync": "Sincronizar",
-    "Shows": "Series",
-    "UserDownloadingItemWithValues": "{0} está descargando {1}",
-    "UserOfflineFromDevice": "{0} se ha desconectado desde {1}",
-    "UserOnlineFromDevice": "{0} está en línea desde {1}",
-    "TasksChannelsCategory": "Canales de Internet",
-    "TaskRefreshChannelsDescription": "Actualiza la información de canales de Internet.",
-    "TaskDownloadMissingSubtitles": "Descargar subtítulos faltantes",
-    "TaskOptimizeDatabaseDescription": "Compacta la base de datos y libera espacio. Ejecutar esta tarea después de escanear la biblioteca o hacer otros cambios que impliquen modificaciones en la base de datos puede mejorar el rendimiento.",
-    "TaskKeyframeExtractorDescription": "Extrae Fotogramas Clave de los archivos de vídeo para crear Listas de Reproducción HLS más precisas. Esta tarea puede durar mucho tiempo.",
-    "TaskAudioNormalization": "Normalización de audio",
-    "TaskAudioNormalizationDescription": "Escanear archivos para la normalización de data.",
-    "TaskCleanCollectionsAndPlaylists": "Limpiar colecciones y listas de reproducción",
-    "TaskCleanCollectionsAndPlaylistsDescription": "Remover elementos de colecciones y listas de reproducción que no existen.",
-    "TvShows": "Series de TV",
-    "UserStartedPlayingItemWithValues": "{0} está reproduciendo {1} en {2}",
-    "TaskRefreshChannels": "Actualizar canales",
-    "Photos": "Fotos",
-    "HeaderFavoriteShows": "Programas favoritos",
-    "TaskCleanActivityLog": "Limpiar registro de actividades",
-    "UserPasswordChangedWithName": "Se ha cambiado la contraseña para el usuario {0}",
-    "System": "Sistema",
-    "User": "Usuario",
-    "Forced": "Forzado",
-    "PluginInstalledWithName": "{0} ha sido instalado",
-    "HeaderFavoriteAlbums": "Álbumes favoritos",
-    "TaskUpdatePlugins": "Actualizar Plugins",
-    "Latest": "Recientes",
-    "UserStoppedPlayingItemWithValues": "{0} ha terminado de reproducir {1} en {2}",
-    "Songs": "Canciones",
-    "NotificationOptionPluginError": "Falla de plugin",
-    "ScheduledTaskStartedWithName": "{0} iniciado",
-    "TasksApplicationCategory": "Aplicación",
-    "UserDeletedWithName": "El usuario {0} ha sido eliminado",
-    "TaskRefreshChapterImages": "Extraer imágenes de los capítulos",
-    "TaskUpdatePluginsDescription": "Descarga e instala actualizaciones para plugins que están configurados para actualizarse automáticamente.",
-    "TaskRefreshPeopleDescription": "Actualiza metadatos de actores y directores en tu biblioteca de medios.",
-    "NotificationOptionUserLockedOut": "Usuario bloqueado",
-    "TaskCleanTranscodeDescription": "Elimina archivos transcodificados que tengan más de un día.",
-    "TaskCleanTranscode": "Limpiar el directorio de transcodificaciones",
-    "NotificationOptionPluginUpdateInstalled": "Actualización de plugin instalada",
-    "NotificationOptionAudioPlaybackStopped": "Reproducción de audio detenida",
-    "TasksLibraryCategory": "Biblioteca",
-    "NotificationOptionPluginInstalled": "Plugin instalado",
-    "UserPolicyUpdatedWithName": "La política de usuario ha sido actualizada para {0}",
-    "VersionNumber": "Versión {0}",
-    "HeaderNextUp": "A continuación",
-    "ValueHasBeenAddedToLibrary": "{0} se ha añadido a tu biblioteca",
-    "LabelIpAddressValue": "Dirección IP: {0}",
-    "NameSeasonNumber": "Temporada {0}",
-    "NotificationOptionNewLibraryContent": "Nuevo contenido agregado",
-    "Plugin": "Plugin",
-    "NotificationOptionAudioPlayback": "Reproducción de audio iniciada",
-    "NotificationOptionTaskFailed": "Falló la tarea programada",
-    "LabelRunningTimeValue": "Tiempo en ejecución: {0}",
-    "SubtitleDownloadFailureFromForItem": "Falló la descarga de subtítulos desde {0} para {1}",
-    "TaskRefreshLibrary": "Escanear biblioteca de medios",
-    "ServerNameNeedsToBeRestarted": "{0} debe ser reiniciado",
-    "TasksMaintenanceCategory": "Mantenimiento",
-    "ProviderValue": "Proveedor: {0}",
-    "UserCreatedWithName": "El usuario {0} ha sido creado",
-    "PluginUninstalledWithName": "{0} ha sido desinstalado",
-    "ValueSpecialEpisodeName": "Especial - {0}",
-    "ScheduledTaskFailedWithName": "{0} falló",
-    "TaskCleanLogs": "Limpiar directorio de registros",
-    "NameInstallFailed": "Falló la instalación de {0}",
-    "UserLockedOutWithName": "El usuario {0} ha sido bloqueado",
-    "TaskRefreshLibraryDescription": "Escanea tu biblioteca de medios para encontrar archivos nuevos y actualizar los metadatos.",
-    "StartupEmbyServerIsLoading": "El servidor Jellyfin está cargando. Por favor, intente de nuevo en un momento.",
-    "Playlists": "Listas de reproducción",
-    "TaskDownloadMissingSubtitlesDescription": "Busca subtítulos faltantes en Internet basándose en la configuración de metadatos.",
-    "MessageServerConfigurationUpdated": "Se ha actualizado la configuración del servidor",
-    "TaskRefreshPeople": "Actualizar personas",
-    "NotificationOptionVideoPlaybackStopped": "Reproducción de video detenida",
-    "HeaderLiveTV": "TV en vivo",
-    "NameSeasonUnknown": "Temporada desconocida",
-    "NotificationOptionInstallationFailed": "Fallo de instalación",
-    "NotificationOptionPluginUninstalled": "Plugin desinstalado",
-    "TaskCleanCache": "Limpiar directorio caché",
-    "TaskRefreshChapterImagesDescription": "Crea miniaturas para videos que tienen capítulos.",
-    "Inherit": "Heredar",
-    "HeaderRecordingGroups": "Grupos de grabación",
-    "ItemAddedWithName": "{0} fue agregado a la biblioteca",
-    "TaskOptimizeDatabase": "Optimizar base de datos",
-    "TaskKeyframeExtractor": "Extractor de Fotogramas Clave",
-    "HearingImpaired": "Discapacidad auditiva",
-    "HomeVideos": "Videos caseros",
-    "ItemRemovedWithName": "{0} fue removido de la biblioteca",
-    "MessageApplicationUpdated": "El servidor Jellyfin ha sido actualizado",
-    "MessageApplicationUpdatedTo": "El servidor Jellyfin ha sido actualizado a {0}",
-    "MusicVideos": "Videos musicales",
-    "NewVersionIsAvailable": "Una nueva versión de Jellyfin está disponible para descargar.",
-    "PluginUpdatedWithName": "{0} ha sido actualizado",
-    "Undefined": "Sin definir",
-    "TaskCleanActivityLogDescription": "Elimina las entradas del registro de actividad anteriores al periodo configurado.",
-    "TaskCleanCacheDescription": "Elimina archivos caché que ya no son necesarios para el sistema.",
-    "TaskCleanLogsDescription": "Elimina archivos de registro con más de {0} días de antigüedad."
 }

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

@@ -125,7 +125,5 @@
     "TaskKeyframeExtractorDescription": "Eraldab videofailidest võtmekaadreid, et luua täpsemaid HLS-i esitusloendeid. See ülesanne võib kesta pikka aega.",
     "TaskKeyframeExtractor": "Võtmekaadri ekstraktor",
     "TaskRefreshTrickplayImages": "Loo eelvaate pildid",
-    "TaskRefreshTrickplayImagesDescription": "Loob eelvaated videotele, kus lubatud.",
+    "TaskRefreshTrickplayImagesDescription": "Loob eelvaated videotele, kus lubatud."
-    "TaskAudioNormalization": "Heli Normaliseerimine",
-    "TaskAudioNormalizationDescription": "Skaneerib faile heli normaliseerimise andmete jaoks."
 }

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

@@ -127,7 +127,5 @@
     "TaskRefreshTrickplayImages": "Luo Trickplay-kuvat",
     "TaskRefreshTrickplayImagesDescription": "Luo Trickplay-esikatselut käytössä olevien kirjastojen videoista.",
     "TaskCleanCollectionsAndPlaylistsDescription": "Poistaa kohteet kokoelmista ja soittolistoista joita ei ole enää olemassa.",
-    "TaskCleanCollectionsAndPlaylists": "Puhdista kokoelmat ja soittolistat",
+    "TaskCleanCollectionsAndPlaylists": "Puhdista kokoelmat ja soittolistat"
-    "TaskAudioNormalization": "Äänenvoimakkuuden normalisointi",
-    "TaskAudioNormalizationDescription": "Etsii tiedostoista äänenvoimakkuuden normalisointitietoja."
 }

Emby.Server.Implementations/Localization/Core/fr-CA.json

@@ -11,7 +11,7 @@
     "Collections": "Collections",
     "DeviceOfflineWithName": "{0} s'est déconnecté",
     "DeviceOnlineWithName": "{0} est connecté",
-    "FailedLoginAttemptWithUserName": "Tentative de connexion échouée par {0}",
+    "FailedLoginAttemptWithUserName": "Tentative de connexion échoué par {0}",
     "Favorites": "Favoris",
     "Folders": "Dossiers",
     "Genres": "Genres",
@@ -39,7 +39,7 @@
     "MixedContent": "Contenu mixte",
     "Movies": "Films",
     "Music": "Musique",
-    "MusicVideos": "Vidéoclips",
+    "MusicVideos": "Vidéos musicales",
     "NameInstallFailed": "échec d'installation de {0}",
     "NameSeasonNumber": "Saison {0}",
     "NameSeasonUnknown": "Saison Inconnue",
@@ -128,7 +128,5 @@
     "TaskRefreshTrickplayImages": "Générer des images Trickplay",
     "TaskRefreshTrickplayImagesDescription": "Crée des aperçus Trickplay pour les vidéos dans les médiathèques activées.",
     "TaskCleanCollectionsAndPlaylists": "Nettoyer les collections et les listes de lecture",
-    "TaskCleanCollectionsAndPlaylistsDescription": "Supprime les éléments des collections et des listes de lecture qui n'existent plus.",
+    "TaskCleanCollectionsAndPlaylistsDescription": "Supprimer les liens inexistants des collections et des listes de lecture"
-    "TaskAudioNormalization": "Normalisation audio",
-    "TaskAudioNormalizationDescription": "Analyse les fichiers à la recherche de données de normalisation audio."
 }

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

@@ -126,9 +126,5 @@
     "External": "חיצוני",
     "HearingImpaired": "לקוי שמיעה",
     "TaskRefreshTrickplayImages": "יצירת תמונות המחשה",
-    "TaskRefreshTrickplayImagesDescription": "יוצר תמונות המחשה לסרטונים שפעילים בספריות.",
+    "TaskRefreshTrickplayImagesDescription": "יוצר תמונות המחשה לסרטונים שפעילים בספריות."
-    "TaskAudioNormalization": "נרמול שמע",
-    "TaskCleanCollectionsAndPlaylistsDescription": "מנקה פריטים לא קיימים מאוספים ורשימות השמעה.",
-    "TaskAudioNormalizationDescription": "מחפש קבצי נורמליזציה של שמע.",
-    "TaskCleanCollectionsAndPlaylists": "מנקה אוספים ורשימות השמעה"
 }

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

@@ -81,7 +81,7 @@
     "Movies": "Film",
     "MessageServerConfigurationUpdated": "Konfigurasi server telah diperbarui",
     "MessageNamedServerConfigurationUpdatedWithValue": "Bagian konfigurasi server {0} telah diperbarui",
-    "FailedLoginAttemptWithUserName": "Gagal upaya login dari {0}",
+    "FailedLoginAttemptWithUserName": "Gagal melakukan login dari {0}",
     "CameraImageUploadedFrom": "Sebuah gambar kamera baru telah diunggah dari {0}",
     "DeviceOfflineWithName": "{0} telah terputus",
     "DeviceOnlineWithName": "{0} telah terhubung",
@@ -125,9 +125,5 @@
     "External": "Luar",
     "HearingImpaired": "Gangguan Pendengaran",
     "TaskRefreshTrickplayImages": "Hasilkan Gambar Trickplay",
-    "TaskRefreshTrickplayImagesDescription": "Buat pratinjau trickplay untuk video di perpustakaan yang diaktifkan.",
+    "TaskRefreshTrickplayImagesDescription": "Buat pratinjau trickplay untuk video di perpustakaan yang diaktifkan."
-    "TaskAudioNormalizationDescription": "Pindai file untuk data normalisasi audio.",
-    "TaskAudioNormalization": "Normalisasi Audio",
-    "TaskCleanCollectionsAndPlaylists": "Bersihkan koleksi dan daftar putar",
-    "TaskCleanCollectionsAndPlaylistsDescription": "Menghapus item dari koleksi dan daftar putar yang sudah tidak ada."
 }

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

@@ -83,7 +83,7 @@
     "UserDeletedWithName": "L'utente {0} è stato rimosso",
     "UserDownloadingItemWithValues": "{0} sta scaricando {1}",
     "UserLockedOutWithName": "L'utente {0} è stato bloccato",
-    "UserOfflineFromDevice": "{0} si è disconnesso da {1}",
+    "UserOfflineFromDevice": "{0} si è disconnesso su {1}",
     "UserOnlineFromDevice": "{0} è online su {1}",
     "UserPasswordChangedWithName": "La password è stata cambiata per l'utente {0}",
     "UserPolicyUpdatedWithName": "La policy dell'utente è stata aggiornata per {0}",

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

@@ -11,7 +11,7 @@
     "Collections": "Collecties",
     "DeviceOfflineWithName": "Verbinding met {0} is verbroken",
     "DeviceOnlineWithName": "{0} is verbonden",
-    "FailedLoginAttemptWithUserName": "Mislukte aanmeldpoging van {0}",
+    "FailedLoginAttemptWithUserName": "Mislukte inlogpoging van {0}",
     "Favorites": "Favorieten",
     "Folders": "Mappen",
     "Genres": "Genres",
@@ -124,7 +124,7 @@
     "TaskKeyframeExtractorDescription": "Haalt keyframes uit videobestanden om preciezere HLS-afspeellijsten te maken. Deze taak kan lang duren.",
     "TaskKeyframeExtractor": "Keyframes uitpakken",
     "External": "Extern",
-    "HearingImpaired": "Slechthorenden",
+    "HearingImpaired": "Slechthorend",
     "TaskRefreshTrickplayImages": "Trickplay-afbeeldingen genereren",
     "TaskRefreshTrickplayImagesDescription": "Creëert trickplay-voorvertoningen voor video's in bibliotheken waarvoor dit is ingeschakeld.",
     "TaskCleanCollectionsAndPlaylists": "Collecties en afspeellijsten opruimen",

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

@@ -118,6 +118,5 @@
     "Undefined": "Udefinert",
     "Forced": "Tvungen",
     "Default": "Standard",
-    "External": "Ekstern",
+    "External": "Ekstern"
-    "HearingImpaired": "Nedsett høyrsel"
 }

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

@@ -11,7 +11,7 @@
     "Collections": "Kolekcje",
     "DeviceOfflineWithName": "{0} został rozłączony",
     "DeviceOnlineWithName": "{0} połączył się",
-    "FailedLoginAttemptWithUserName": "Nieudana próba logowania przez {0}",
+    "FailedLoginAttemptWithUserName": "Próba logowania przez {0} zakończona niepowodzeniem",
     "Favorites": "Ulubione",
     "Folders": "Foldery",
     "Genres": "Gatunki",
@@ -98,8 +98,8 @@
     "TaskRefreshChannels": "Odśwież kanały",
     "TaskCleanTranscodeDescription": "Usuwa transkodowane pliki starsze niż 1 dzień.",
     "TaskCleanTranscode": "Wyczyść folder transkodowania",
-    "TaskUpdatePluginsDescription": "Pobiera i instaluje aktualizacje wtyczek, które są skonfigurowane do automatycznej aktualizacji.",
+    "TaskUpdatePluginsDescription": "Pobiera i instaluje aktualizacje dla pluginów, które są skonfigurowane do automatycznej aktualizacji.",
-    "TaskUpdatePlugins": "Aktualizuj wtyczki",
+    "TaskUpdatePlugins": "Aktualizuj pluginy",
     "TaskRefreshPeopleDescription": "Odświeża metadane o aktorów i reżyserów w Twojej bibliotece mediów.",
     "TaskRefreshPeople": "Odśwież obsadę",
     "TaskCleanLogsDescription": "Kasuje pliki logów starsze niż {0} dni.",

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

@@ -130,5 +130,5 @@
     "TaskCleanCollectionsAndPlaylists": "Limpe coleções e playlists",
     "TaskCleanCollectionsAndPlaylistsDescription": "Remove itens de coleções e playlists que não existem mais.",
     "TaskAudioNormalization": "Normalização de áudio",
-    "TaskAudioNormalizationDescription": "Examina os ficheiros em busca de dados de normalização de áudio."
+    "TaskAudioNormalizationDescription": "Verifica arquivos em busca de dados de normalização de áudio."
 }

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

@@ -11,7 +11,7 @@
     "Collections": "Коллекции",
     "DeviceOfflineWithName": "{0} - отключено",
     "DeviceOnlineWithName": "{0} - подключено",
-    "FailedLoginAttemptWithUserName": "Неудачная попытка входа с {0}",
+    "FailedLoginAttemptWithUserName": "{0} - попытка входа неудачна",
     "Favorites": "Избранное",
     "Folders": "Папки",
     "Genres": "Жанры",
@@ -128,7 +128,5 @@
     "TaskRefreshTrickplayImages": "Сгенерировать изображения для Trickplay",
     "TaskRefreshTrickplayImagesDescription": "Создает предпросмотры для Trickplay для видео в библиотеках, где эта функция включена.",
     "TaskCleanCollectionsAndPlaylists": "Очистка коллекций и списков воспроизведения",
-    "TaskCleanCollectionsAndPlaylistsDescription": "Удаляет элементы из коллекций и списков воспроизведения, которые больше не существуют.",
+    "TaskCleanCollectionsAndPlaylistsDescription": "Удаляет элементы из коллекций и списков воспроизведения, которые больше не существуют."
-    "TaskAudioNormalization": "Нормализация звука",
-    "TaskAudioNormalizationDescription": "Сканирует файлы на наличие данных о нормализации звука."
 }

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

@@ -127,8 +127,5 @@
     "HearingImpaired": "Hörselskadad",
     "TaskRefreshTrickplayImages": "Generera Trickplay-bilder",
     "TaskRefreshTrickplayImagesDescription": "Skapar trickplay-förhandsvisningar för videor i aktiverade bibliotek.",
-    "TaskCleanCollectionsAndPlaylists": "Rensa upp samlingar och spellistor",
+    "TaskCleanCollectionsAndPlaylists": "Rensa samlingar och spellistor"
-    "TaskAudioNormalization": "Ljudnormalisering",
-    "TaskCleanCollectionsAndPlaylistsDescription": "Tar bort objekt från samlingar och spellistor som inte längre finns.",
-    "TaskAudioNormalizationDescription": "Skannar filer för ljudnormaliseringsdata."
 }

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

@@ -125,9 +125,5 @@
     "External": "வெளி",
     "HearingImpaired": "செவித்திறன் குறைபாடுடையவர்",
     "TaskRefreshTrickplayImages": "முன்னோட்ட படங்களை உருவாக்கு",
-    "TaskRefreshTrickplayImagesDescription": "செயல்பாட்டில் உள்ள தொகுப்புகளுக்கு முன்னோட்ட படங்களை உருவாக்கும்.",
+    "TaskRefreshTrickplayImagesDescription": "செயல்பாட்டில் உள்ள தொகுப்புகளுக்கு முன்னோட்ட படங்களை உருவாக்கும்."
-    "TaskCleanCollectionsAndPlaylists": "சேகரிப்புகள் மற்றும் பிளேலிஸ்ட்களை சுத்தம் செய்யவும்",
-    "TaskCleanCollectionsAndPlaylistsDescription": "சேகரிப்புகள் மற்றும் பிளேலிஸ்ட்களில் இருந்து உருப்படிகளை நீக்குகிறது.",
-    "TaskAudioNormalization": "ஆடியோ இயல்பாக்கம்",
-    "TaskAudioNormalizationDescription": "ஆடியோ இயல்பாக்குதல் தரவுக்காக கோப்புகளை ஸ்கேன் செய்கிறது."
 }

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

@@ -11,7 +11,7 @@
     "Collections": "Koleksiyonlar",
     "DeviceOfflineWithName": "{0} bağlantısı kesildi",
     "DeviceOnlineWithName": "{0} bağlı",
-    "FailedLoginAttemptWithUserName": "{0} kullanıcısının başarısız oturum açma girişimi",
+    "FailedLoginAttemptWithUserName": "{0} kullanıcısının giriş denemesi başarısız oldu",
     "Favorites": "Favoriler",
     "Folders": "Klasörler",
     "Genres": "Türler",

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

@@ -103,7 +103,7 @@
     "HeaderFavoriteEpisodes": "Tập Phim Yêu Thích",
     "HeaderFavoriteArtists": "Nghệ Sĩ Yêu Thích",
     "HeaderFavoriteAlbums": "Album Ưa Thích",
-    "FailedLoginAttemptWithUserName": "Nỗ lực đăng nhập không thành công từ {0}",
+    "FailedLoginAttemptWithUserName": "Đăng nhập không thành công thử từ {0}",
     "DeviceOnlineWithName": "{0} đã kết nối",
     "DeviceOfflineWithName": "{0} đã ngắt kết nối",
     "ChapterNameValue": "Phân Cảnh {0}",
@@ -127,7 +127,5 @@
     "TaskRefreshTrickplayImages": "Tạo Ảnh Xem Trước Trickplay",
     "TaskRefreshTrickplayImagesDescription": "Tạo bản xem trước trịckplay cho video trong thư viện đã bật.",
     "TaskCleanCollectionsAndPlaylists": "Dọn dẹp bộ sưu tập và danh sách phát",
-    "TaskCleanCollectionsAndPlaylistsDescription": "Xóa các mục khỏi bộ sưu tập và danh sách phát không còn tồn tại.",
+    "TaskCleanCollectionsAndPlaylistsDescription": "Xóa các mục khỏi bộ sưu tập và danh sách phát không còn tồn tại."
-    "TaskAudioNormalization": "Chuẩn Hóa Âm Thanh",
-    "TaskAudioNormalizationDescription": "Quét tập tin để tìm dữ liệu chuẩn hóa âm thanh."
 }

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

@@ -11,7 +11,7 @@
     "Collections": "合集",
     "DeviceOfflineWithName": "{0} 已断开",
     "DeviceOnlineWithName": "{0} 已连接",
-    "FailedLoginAttemptWithUserName": "来自 {0} 的登录尝试失败",
+    "FailedLoginAttemptWithUserName": "从 {0} 尝试登录失败",
     "Favorites": "我的最爱",
     "Folders": "文件夹",
     "Genres": "类型",

Emby.Server.Implementations/Localization/LocalizationManager.cs

@@ -321,11 +321,7 @@ namespace Emby.Server.Implementations.Localization
             // Try splitting by : to handle "Germany: FSK-18"
             if (rating.Contains(':', StringComparison.OrdinalIgnoreCase))
             {
-                var ratingLevelRightPart = rating.AsSpan().RightPart(':');
+                return GetRatingLevel(rating.AsSpan().RightPart(':').ToString());
-                if (ratingLevelRightPart.Length != 0)
-                {
-                    return GetRatingLevel(ratingLevelRightPart.ToString());
-                }
             }
 
             // Handle prefix country code to handle "DE-18"
@@ -336,12 +332,8 @@ namespace Emby.Server.Implementations.Localization
                 // Extract culture from country prefix
                 var culture = FindLanguageInfo(ratingSpan.LeftPart('-').ToString());
 
-                var ratingLevelRightPart = ratingSpan.RightPart('-');
+                // Check rating system of culture
-                if (ratingLevelRightPart.Length != 0)
+                return GetRatingLevel(ratingSpan.RightPart('-').ToString(), culture?.TwoLetterISOLanguageName);
-                {
-                    // Check rating system of culture
-                    return GetRatingLevel(ratingLevelRightPart.ToString(), culture?.TwoLetterISOLanguageName);
-                }
             }
 
             return null;

Emby.Server.Implementations/ScheduledTasks/Tasks/AudioNormalizationTask.cs

@@ -8,7 +8,6 @@ using System.Text.RegularExpressions;
 using System.Threading;
 using System.Threading.Tasks;
 using Jellyfin.Data.Enums;
-using Jellyfin.Extensions;
 using MediaBrowser.Common.Configuration;
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Entities.Audio;
@@ -70,7 +69,7 @@ public partial class AudioNormalizationTask : IScheduledTask
     /// <inheritdoc />
     public string Key => "AudioNormalization";
 
-    [GeneratedRegex(@"^\s+I:\s+(.*?)\s+LUFS")]
+    [GeneratedRegex(@"I:\s+(.*?)\s+LUFS")]
     private static partial Regex LUFSRegex();
 
     /// <inheritdoc />
@@ -180,17 +179,16 @@ public partial class AudioNormalizationTask : IScheduledTask
             }
 
             using var reader = process.StandardError;
-            await foreach (var line in reader.ReadAllLinesAsync(cancellationToken))
+            var output = await reader.ReadToEndAsync(cancellationToken).ConfigureAwait(false);
-            {
+            cancellationToken.ThrowIfCancellationRequested();
-                Match match = LUFSRegex().Match(line);
+            MatchCollection split = LUFSRegex().Matches(output);
 
-                if (match.Success)
+            if (split.Count != 0)
-                {
+            {
-                    return float.Parse(match.Groups[1].ValueSpan, CultureInfo.InvariantCulture.NumberFormat);
+                return float.Parse(split[0].Groups[1].ValueSpan, CultureInfo.InvariantCulture.NumberFormat);
-                }
             }
 
-            _logger.LogError("Failed to find LUFS value in output");
+            _logger.LogError("Failed to find LUFS value in output:\n{Output}", output);
             return null;
         }
     }

Emby.Server.Implementations/Session/SessionManager.cs

@@ -1202,8 +1202,7 @@ namespace Emby.Server.Implementations.Session
                             new DtoOptions(false)
                             {
                                 EnableImages = false
-                            },
+                            })
-                            user.DisplayMissingEpisodes)
                         .Where(i => !i.IsVirtualItem)
                         .SkipWhile(i => !i.Id.Equals(episode.Id))
                         .ToList();

Jellyfin.Api/Auth/FirstTimeSetupPolicy/FirstTimeSetupHandler.cs

@@ -1,6 +1,5 @@
 using System.Threading.Tasks;
 using Jellyfin.Api.Constants;
-using Jellyfin.Api.Extensions;
 using MediaBrowser.Common.Configuration;
 using Microsoft.AspNetCore.Authorization;
 
@@ -25,31 +24,20 @@ namespace Jellyfin.Api.Auth.FirstTimeSetupPolicy
         /// <inheritdoc />
         protected override Task HandleRequirementAsync(AuthorizationHandlerContext context, FirstTimeSetupRequirement requirement)
         {
-            // Succeed if the startup wizard / first time setup is not complete
             if (!_configurationManager.CommonConfiguration.IsStartupWizardCompleted)
             {
                 context.Succeed(requirement);
             }
-
+            else if (requirement.RequireAdmin && !context.User.IsInRole(UserRoles.Administrator))
-            // Succeed if user is admin
-            else if (context.User.IsInRole(UserRoles.Administrator))
-            {
-                context.Succeed(requirement);
-            }
-
-            // Fail if admin is required and user is not admin
-            else if (requirement.RequireAdmin)
             {
                 context.Fail();
             }
-
+            else
-            // Succeed if admin is not required and user is not guest
-            else if (context.User.IsInRole(UserRoles.User))
             {
+                // Any user-specific checks are handled in the DefaultAuthorizationHandler.
                 context.Succeed(requirement);
             }
 
-            // Any user-specific checks are handled in the DefaultAuthorizationHandler.
             return Task.CompletedTask;
         }
     }

Jellyfin.Api/Controllers/ItemUpdateController.cs

@@ -290,35 +290,17 @@ public class ItemUpdateController : BaseJellyfinApiController
         {
             foreach (var season in rseries.Children.OfType<Season>())
             {
-                if (!season.LockedFields.Contains(MetadataField.OfficialRating))
+                season.OfficialRating = request.OfficialRating;
-                {
-                    season.OfficialRating = request.OfficialRating;
-                }
-
                 season.CustomRating = request.CustomRating;
-
+                season.Tags = season.Tags.Concat(addedTags).Except(removedTags).Distinct().ToArray();
-                if (!season.LockedFields.Contains(MetadataField.Tags))
-                {
-                    season.Tags = season.Tags.Concat(addedTags).Except(removedTags).Distinct().ToArray();
-                }
-
                 season.OnMetadataChanged();
                 await season.UpdateToRepositoryAsync(ItemUpdateType.MetadataEdit, CancellationToken.None).ConfigureAwait(false);
 
                 foreach (var ep in season.Children.OfType<Episode>())
                 {
-                    if (!ep.LockedFields.Contains(MetadataField.OfficialRating))
+                    ep.OfficialRating = request.OfficialRating;
-                    {
-                        ep.OfficialRating = request.OfficialRating;
-                    }
-
                     ep.CustomRating = request.CustomRating;
-
+                    ep.Tags = ep.Tags.Concat(addedTags).Except(removedTags).Distinct().ToArray();
-                    if (!ep.LockedFields.Contains(MetadataField.Tags))
-                    {
-                        ep.Tags = ep.Tags.Concat(addedTags).Except(removedTags).Distinct().ToArray();
-                    }
-
                     ep.OnMetadataChanged();
                     await ep.UpdateToRepositoryAsync(ItemUpdateType.MetadataEdit, CancellationToken.None).ConfigureAwait(false);
                 }
@@ -328,18 +310,9 @@ public class ItemUpdateController : BaseJellyfinApiController
         {
             foreach (var ep in season.Children.OfType<Episode>())
             {
-                if (!ep.LockedFields.Contains(MetadataField.OfficialRating))
+                ep.OfficialRating = request.OfficialRating;
-                {
-                    ep.OfficialRating = request.OfficialRating;
-                }
-
                 ep.CustomRating = request.CustomRating;
-
+                ep.Tags = ep.Tags.Concat(addedTags).Except(removedTags).Distinct().ToArray();
-                if (!ep.LockedFields.Contains(MetadataField.Tags))
-                {
-                    ep.Tags = ep.Tags.Concat(addedTags).Except(removedTags).Distinct().ToArray();
-                }
-
                 ep.OnMetadataChanged();
                 await ep.UpdateToRepositoryAsync(ItemUpdateType.MetadataEdit, CancellationToken.None).ConfigureAwait(false);
             }
@@ -348,18 +321,9 @@ public class ItemUpdateController : BaseJellyfinApiController
         {
             foreach (BaseItem track in album.Children)
             {
-                if (!track.LockedFields.Contains(MetadataField.OfficialRating))
+                track.OfficialRating = request.OfficialRating;
-                {
-                    track.OfficialRating = request.OfficialRating;
-                }
-
                 track.CustomRating = request.CustomRating;
-
+                track.Tags = track.Tags.Concat(addedTags).Except(removedTags).Distinct().ToArray();
-                if (!track.LockedFields.Contains(MetadataField.Tags))
-                {
-                    track.Tags = track.Tags.Concat(addedTags).Except(removedTags).Distinct().ToArray();
-                }
-
                 track.OnMetadataChanged();
                 await track.UpdateToRepositoryAsync(ItemUpdateType.MetadataEdit, CancellationToken.None).ConfigureAwait(false);
             }

Jellyfin.Api/Controllers/LibraryStructureController.cs

@@ -319,7 +319,7 @@ public class LibraryStructureController : BaseJellyfinApiController
     public ActionResult UpdateLibraryOptions(
         [FromBody] UpdateLibraryOptionsDto request)
     {
-        var item = _libraryManager.GetItemById<CollectionFolder>(request.Id);
+        var item = _libraryManager.GetItemById<CollectionFolder>(request.Id, User.GetUserId());
         if (item is null)
         {
             return NotFound();

Jellyfin.Api/Controllers/TvShowsController.cs

@@ -231,7 +231,6 @@ public class TvShowsController : BaseJellyfinApiController
         var dtoOptions = new DtoOptions { Fields = fields }
             .AddClientFields(User)
             .AddAdditionalDtoOptions(enableImages, enableUserData, imageTypeLimit, enableImageTypes);
-        var shouldIncludeMissingEpisodes = (user is not null && user.DisplayMissingEpisodes) || User.GetIsApiKey();
 
         if (seasonId.HasValue) // Season id was supplied. Get episodes by season id.
         {
@@ -241,7 +240,7 @@ public class TvShowsController : BaseJellyfinApiController
                 return NotFound("No season exists with Id " + seasonId);
             }
 
-            episodes = seasonItem.GetEpisodes(user, dtoOptions, shouldIncludeMissingEpisodes);
+            episodes = seasonItem.GetEpisodes(user, dtoOptions);
         }
         else if (season.HasValue) // Season number was supplied. Get episodes by season number
         {
@@ -257,7 +256,7 @@ public class TvShowsController : BaseJellyfinApiController
 
             episodes = seasonItem is null ?
                 new List<BaseItem>()
-                : ((Season)seasonItem).GetEpisodes(user, dtoOptions, shouldIncludeMissingEpisodes);
+                : ((Season)seasonItem).GetEpisodes(user, dtoOptions);
         }
         else // No season number or season id was supplied. Returning all episodes.
         {
@@ -266,7 +265,7 @@ public class TvShowsController : BaseJellyfinApiController
                 return NotFound("Series not found");
             }
 
-            episodes = series.GetEpisodes(user, dtoOptions, shouldIncludeMissingEpisodes).ToList();
+            episodes = series.GetEpisodes(user, dtoOptions).ToList();
         }
 
         // Filter after the fact in case the ui doesn't want them

Jellyfin.Api/Helpers/RequestHelpers.cs

@@ -120,12 +120,7 @@ public static class RequestHelpers
     internal static async Task<SessionInfo> GetSession(ISessionManager sessionManager, IUserManager userManager, HttpContext httpContext, Guid? userId = null)
     {
         userId ??= httpContext.User.GetUserId();
-        User? user = null;
+        var user = userManager.GetUserById(userId.Value);
-        if (!userId.IsNullOrEmpty())
-        {
-            user = userManager.GetUserById(userId.Value);
-        }
-
         var session = await sessionManager.LogSessionActivity(
             httpContext.User.GetClient(),
             httpContext.User.GetVersion(),

Jellyfin.Api/Helpers/StreamingHelpers.cs

@@ -142,20 +142,6 @@ public static class StreamingHelpers
         }
         else
         {
-            // Enforce more restrictive transcoding profile for LiveTV due to compatability reasons
-            // Cap the MaxStreamingBitrate to 30Mbps, because we are unable to reliably probe source bitrate,
-            // which will cause the client to request extremely high bitrate that may fail the player/encoder
-            streamingRequest.VideoBitRate = streamingRequest.VideoBitRate > 30000000 ? 30000000 : streamingRequest.VideoBitRate;
-
-            if (streamingRequest.SegmentContainer is not null)
-            {
-                // Remove all fmp4 transcoding profiles, because it causes playback error and/or A/V sync issues
-                // Notably: Some channels won't play on FireFox and LG webOS
-                // Some channels from HDHomerun will experience A/V sync issues
-                streamingRequest.SegmentContainer = "ts";
-                streamingRequest.VideoCodec = "h264";
-            }
-
             var liveStreamInfo = await mediaSourceManager.GetLiveStreamWithDirectStreamProvider(streamingRequest.LiveStreamId, cancellationToken).ConfigureAwait(false);
             mediaSource = liveStreamInfo.Item1;
             state.DirectStreamProvider = liveStreamInfo.Item2;

Jellyfin.Data/Jellyfin.Data.csproj

@@ -18,7 +18,7 @@
   <PropertyGroup>
     <Authors>Jellyfin Contributors</Authors>
     <PackageId>Jellyfin.Data</PackageId>
-    <VersionPrefix>10.10.0</VersionPrefix>
+    <VersionPrefix>10.9.0</VersionPrefix>
     <RepositoryUrl>https://github.com/jellyfin/jellyfin</RepositoryUrl>
     <PackageLicenseExpression>GPL-3.0-only</PackageLicenseExpression>
   </PropertyGroup>

Jellyfin.Server.Implementations/Devices/DeviceManager.cs

@@ -179,7 +179,7 @@ namespace Jellyfin.Server.Implementations.Devices
                     .SelectMany(d => dbContext.DeviceOptions.Where(o => o.DeviceId == d.DeviceId).DefaultIfEmpty(), (d, o) => new { Device = d, Options = o })
                     .AsAsyncEnumerable();
 
-                if (!userId.IsNullOrEmpty())
+                if (userId.HasValue)
                 {
                     var user = _userManager.GetUserById(userId.Value);
                     if (user is null)

Jellyfin.Server.Implementations/Extensions/ServiceCollectionExtensions.cs

@@ -16,28 +16,21 @@ public static class ServiceCollectionExtensions
     /// Adds the <see cref="IDbContextFactory{TContext}"/> interface to the service collection with second level caching enabled.
     /// </summary>
     /// <param name="serviceCollection">An instance of the <see cref="IServiceCollection"/> interface.</param>
-    /// <param name="disableSecondLevelCache">Whether second level cache disabled..</param>
     /// <returns>The updated service collection.</returns>
-    public static IServiceCollection AddJellyfinDbContext(this IServiceCollection serviceCollection, bool disableSecondLevelCache)
+    public static IServiceCollection AddJellyfinDbContext(this IServiceCollection serviceCollection)
     {
-        if (!disableSecondLevelCache)
+        serviceCollection.AddEFSecondLevelCache(options =>
-        {
+            options.UseMemoryCacheProvider()
-            serviceCollection.AddEFSecondLevelCache(options =>
+                .CacheAllQueries(CacheExpirationMode.Sliding, TimeSpan.FromMinutes(10))
-                options.UseMemoryCacheProvider()
+                .UseCacheKeyPrefix("EF_")
-                    .CacheAllQueries(CacheExpirationMode.Sliding, TimeSpan.FromMinutes(10))
+                // Don't cache null values. Remove this optional setting if it's not necessary.
-                    .UseCacheKeyPrefix("EF_")
+                .SkipCachingResults(result => result.Value is null or EFTableRows { RowsCount: 0 }));
-                    // Don't cache null values. Remove this optional setting if it's not necessary.
-                    .SkipCachingResults(result => result.Value is null or EFTableRows { RowsCount: 0 }));
-        }
 
         serviceCollection.AddPooledDbContextFactory<JellyfinDbContext>((serviceProvider, opt) =>
         {
             var applicationPaths = serviceProvider.GetRequiredService<IApplicationPaths>();
-            var dbOpt = opt.UseSqlite($"Filename={Path.Combine(applicationPaths.DataPath, "jellyfin.db")}");
+            opt.UseSqlite($"Filename={Path.Combine(applicationPaths.DataPath, "jellyfin.db")}")
-            if (!disableSecondLevelCache)
+                .AddInterceptors(serviceProvider.GetRequiredService<SecondLevelCacheInterceptor>());
-            {
-                dbOpt.AddInterceptors(serviceProvider.GetRequiredService<SecondLevelCacheInterceptor>());
-            }
         });
 
         return serviceCollection;

Jellyfin.Server.Implementations/Trickplay/TrickplayManager.cs

@@ -81,12 +81,6 @@ public class TrickplayManager : ITrickplayManager
         _logger.LogDebug("Trickplay refresh for {ItemId} (replace existing: {Replace})", video.Id, replace);
 
         var options = _config.Configuration.TrickplayOptions;
-        if (options.Interval < 1000)
-        {
-            _logger.LogWarning("Trickplay image interval {Interval} is too small, reset to the minimum valid value of 1000", options.Interval);
-            options.Interval = 1000;
-        }
-
         foreach (var width in options.WidthResolutions)
         {
             cancellationToken.ThrowIfCancellationRequested();
@@ -127,13 +121,6 @@ public class TrickplayManager : ITrickplayManager
                     return;
                 }
 
-                var mediaPath = mediaSource.Path;
-                if (!File.Exists(mediaPath))
-                {
-                    _logger.LogWarning("Media not found at {Path} for item {ItemID}", mediaPath, video.Id);
-                    return;
-                }
-
                 // The width has to be even, otherwise a lot of filters will not be able to sample it
                 var actualWidth = 2 * (width / 2);
 
@@ -152,6 +139,7 @@ public class TrickplayManager : ITrickplayManager
                     return;
                 }
 
+                var mediaPath = mediaSource.Path;
                 var mediaStream = mediaSource.VideoStream;
                 var container = mediaSource.Container;
 
@@ -273,7 +261,7 @@ public class TrickplayManager : ITrickplayManager
             }
 
             // Update bitrate
-            var bitrate = (int)Math.Ceiling(new FileInfo(tilePath).Length * 8m / trickplayInfo.TileWidth / trickplayInfo.TileHeight / (trickplayInfo.Interval / 1000m));
+            var bitrate = (int)Math.Ceiling((decimal)new FileInfo(tilePath).Length * 8 / trickplayInfo.TileWidth / trickplayInfo.TileHeight / (trickplayInfo.Interval / 1000));
             trickplayInfo.Bandwidth = Math.Max(trickplayInfo.Bandwidth, bitrate);
         }
 

Jellyfin.Server.Implementations/Users/UserManager.cs

@@ -1,7 +1,7 @@
 #pragma warning disable CA1307
+#pragma warning disable CA1309 // Use ordinal string comparison - EF can't translate this
 
 using System;
-using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
@@ -47,8 +47,6 @@ namespace Jellyfin.Server.Implementations.Users
         private readonly DefaultPasswordResetProvider _defaultPasswordResetProvider;
         private readonly IServerConfigurationManager _serverConfigurationManager;
 
-        private readonly IDictionary<Guid, User> _users;
-
         /// <summary>
         /// Initializes a new instance of the <see cref="UserManager"/> class.
         /// </summary>
@@ -86,29 +84,30 @@ namespace Jellyfin.Server.Implementations.Users
             _invalidAuthProvider = _authenticationProviders.OfType<InvalidAuthProvider>().First();
             _defaultAuthenticationProvider = _authenticationProviders.OfType<DefaultAuthenticationProvider>().First();
             _defaultPasswordResetProvider = _passwordResetProviders.OfType<DefaultPasswordResetProvider>().First();
-
-            _users = new ConcurrentDictionary<Guid, User>();
-            using var dbContext = _dbProvider.CreateDbContext();
-            foreach (var user in dbContext.Users
-                .AsSplitQuery()
-                .Include(user => user.Permissions)
-                .Include(user => user.Preferences)
-                .Include(user => user.AccessSchedules)
-                .Include(user => user.ProfileImage)
-                .AsEnumerable())
-            {
-                _users.Add(user.Id, user);
-            }
         }
 
         /// <inheritdoc/>
         public event EventHandler<GenericEventArgs<User>>? OnUserUpdated;
 
         /// <inheritdoc/>
-        public IEnumerable<User> Users => _users.Values;
+        public IEnumerable<User> Users
+        {
+            get
+            {
+                using var dbContext = _dbProvider.CreateDbContext();
+                return GetUsersInternal(dbContext).ToList();
+            }
+        }
 
         /// <inheritdoc/>
-        public IEnumerable<Guid> UsersIds => _users.Keys;
+        public IEnumerable<Guid> UsersIds
+        {
+            get
+            {
+                using var dbContext = _dbProvider.CreateDbContext();
+                return dbContext.Users.Select(u => u.Id).ToList();
+            }
+        }
 
         // This is some regex that matches only on unicode "word" characters, as well as -, _ and @
         // In theory this will cut out most if not all 'control' characters which should help minimize any weirdness
@@ -124,8 +123,8 @@ namespace Jellyfin.Server.Implementations.Users
                 throw new ArgumentException("Guid can't be empty", nameof(id));
             }
 
-            _users.TryGetValue(id, out var user);
+            using var dbContext = _dbProvider.CreateDbContext();
-            return user;
+            return GetUsersInternal(dbContext).FirstOrDefault(u => u.Id.Equals(id));
         }
 
         /// <inheritdoc/>
@@ -136,7 +135,9 @@ namespace Jellyfin.Server.Implementations.Users
                 throw new ArgumentException("Invalid username", nameof(name));
             }
 
-            return _users.Values.FirstOrDefault(u => string.Equals(u.Username, name, StringComparison.OrdinalIgnoreCase));
+            using var dbContext = _dbProvider.CreateDbContext();
+            return GetUsersInternal(dbContext)
+                .FirstOrDefault(u => string.Equals(u.Username, name));
         }
 
         /// <inheritdoc/>
@@ -201,8 +202,6 @@ namespace Jellyfin.Server.Implementations.Users
             user.AddDefaultPermissions();
             user.AddDefaultPreferences();
 
-            _users.Add(user.Id, user);
-
             return user;
         }
 
@@ -237,40 +236,46 @@ namespace Jellyfin.Server.Implementations.Users
         /// <inheritdoc/>
         public async Task DeleteUserAsync(Guid userId)
         {
-            if (!_users.TryGetValue(userId, out var user))
-            {
-                throw new ResourceNotFoundException(nameof(userId));
-            }
-
-            if (_users.Count == 1)
-            {
-                throw new InvalidOperationException(string.Format(
-                    CultureInfo.InvariantCulture,
-                    "The user '{0}' cannot be deleted because there must be at least one user in the system.",
-                    user.Username));
-            }
-
-            if (user.HasPermission(PermissionKind.IsAdministrator)
-                && Users.Count(i => i.HasPermission(PermissionKind.IsAdministrator)) == 1)
-            {
-                throw new ArgumentException(
-                    string.Format(
-                        CultureInfo.InvariantCulture,
-                        "The user '{0}' cannot be deleted because there must be at least one admin user in the system.",
-                        user.Username),
-                    nameof(userId));
-            }
-
             var dbContext = await _dbProvider.CreateDbContextAsync().ConfigureAwait(false);
+
             await using (dbContext.ConfigureAwait(false))
             {
+                var user = await dbContext.Users
+                    .AsSingleQuery()
+                    .Include(u => u.Permissions)
+                    .FirstOrDefaultAsync(u => u.Id.Equals(userId))
+                    .ConfigureAwait(false);
+                if (user is null)
+                {
+                    throw new ResourceNotFoundException(nameof(userId));
+                }
+
+                if (await dbContext.Users.CountAsync().ConfigureAwait(false) == 1)
+                {
+                    throw new InvalidOperationException(string.Format(
+                        CultureInfo.InvariantCulture,
+                        "The user '{0}' cannot be deleted because there must be at least one user in the system.",
+                        user.Username));
+                }
+
+                if (user.HasPermission(PermissionKind.IsAdministrator)
+                    && await dbContext.Users
+                        .CountAsync(u => u.Permissions.Any(p => p.Kind == PermissionKind.IsAdministrator && p.Value))
+                        .ConfigureAwait(false) == 1)
+                {
+                    throw new ArgumentException(
+                        string.Format(
+                            CultureInfo.InvariantCulture,
+                            "The user '{0}' cannot be deleted because there must be at least one admin user in the system.",
+                            user.Username),
+                        nameof(userId));
+                }
+
                 dbContext.Users.Remove(user);
                 await dbContext.SaveChangesAsync().ConfigureAwait(false);
+
+                await _eventManager.PublishAsync(new UserDeletedEventArgs(user)).ConfigureAwait(false);
             }
-
-            _users.Remove(userId);
-
-            await _eventManager.PublishAsync(new UserDeletedEventArgs(user)).ConfigureAwait(false);
         }
 
         /// <inheritdoc/>
@@ -537,23 +542,23 @@ namespace Jellyfin.Server.Implementations.Users
         /// <inheritdoc />
         public async Task InitializeAsync()
         {
-            // TODO: Refactor the startup wizard so that it doesn't require a user to already exist.
-            if (_users.Any())
-            {
-                return;
-            }
-
-            var defaultName = Environment.UserName;
-            if (string.IsNullOrWhiteSpace(defaultName) || !ValidUsernameRegex().IsMatch(defaultName))
-            {
-                defaultName = "MyJellyfinUser";
-            }
-
-            _logger.LogWarning("No users, creating one with username {UserName}", defaultName);
-
             var dbContext = await _dbProvider.CreateDbContextAsync().ConfigureAwait(false);
             await using (dbContext.ConfigureAwait(false))
             {
+                // TODO: Refactor the startup wizard so that it doesn't require a user to already exist.
+                if (await dbContext.Users.AnyAsync().ConfigureAwait(false))
+                {
+                    return;
+                }
+
+                var defaultName = Environment.UserName;
+                if (string.IsNullOrWhiteSpace(defaultName) || !ValidUsernameRegex().IsMatch(defaultName))
+                {
+                    defaultName = "MyJellyfinUser";
+                }
+
+                _logger.LogWarning("No users, creating one with username {UserName}", defaultName);
+
                 var newUser = await CreateUserInternalAsync(defaultName, dbContext).ConfigureAwait(false);
                 newUser.SetPermission(PermissionKind.IsAdministrator, true);
                 newUser.SetPermission(PermissionKind.EnableContentDeletion, true);
@@ -600,12 +605,9 @@ namespace Jellyfin.Server.Implementations.Users
             var dbContext = await _dbProvider.CreateDbContextAsync().ConfigureAwait(false);
             await using (dbContext.ConfigureAwait(false))
             {
-                var user = dbContext.Users
+                var user = await GetUsersInternal(dbContext)
-                               .Include(u => u.Permissions)
+                    .FirstOrDefaultAsync(u => u.Id.Equals(userId))
-                               .Include(u => u.Preferences)
+                    .ConfigureAwait(false)
-                               .Include(u => u.AccessSchedules)
-                               .Include(u => u.ProfileImage)
-                               .FirstOrDefault(u => u.Id.Equals(userId))
                            ?? throw new ArgumentException("No user exists with given Id!");
 
                 user.SubtitleMode = config.SubtitleMode;
@@ -633,7 +635,6 @@ namespace Jellyfin.Server.Implementations.Users
                 user.SetPreference(PreferenceKind.LatestItemExcludes, config.LatestItemsExcludes);
 
                 dbContext.Update(user);
-                _users[user.Id] = user;
                 await dbContext.SaveChangesAsync().ConfigureAwait(false);
             }
         }
@@ -644,12 +645,9 @@ namespace Jellyfin.Server.Implementations.Users
             var dbContext = await _dbProvider.CreateDbContextAsync().ConfigureAwait(false);
             await using (dbContext.ConfigureAwait(false))
             {
-                var user = dbContext.Users
+                var user = await GetUsersInternal(dbContext)
-                               .Include(u => u.Permissions)
+                    .FirstOrDefaultAsync(u => u.Id.Equals(userId))
-                               .Include(u => u.Preferences)
+                    .ConfigureAwait(false)
-                               .Include(u => u.AccessSchedules)
-                               .Include(u => u.ProfileImage)
-                               .FirstOrDefault(u => u.Id.Equals(userId))
                            ?? throw new ArgumentException("No user exists with given Id!");
 
                 // The default number of login attempts is 3, but for some god forsaken reason it's sent to the server as "0"
@@ -710,7 +708,6 @@ namespace Jellyfin.Server.Implementations.Users
                 user.SetPreference(PreferenceKind.EnableContentDeletionFromFolders, policy.EnableContentDeletionFromFolders);
 
                 dbContext.Update(user);
-                _users[user.Id] = user;
                 await dbContext.SaveChangesAsync().ConfigureAwait(false);
             }
         }
@@ -731,7 +728,6 @@ namespace Jellyfin.Server.Implementations.Users
             }
 
             user.ProfileImage = null;
-            _users[user.Id] = user;
         }
 
         internal static void ThrowIfInvalidUsername(string name)
@@ -878,8 +874,15 @@ namespace Jellyfin.Server.Implementations.Users
         private async Task UpdateUserInternalAsync(JellyfinDbContext dbContext, User user)
         {
             dbContext.Users.Update(user);
-            _users[user.Id] = user;
             await dbContext.SaveChangesAsync().ConfigureAwait(false);
         }
+
+        private IQueryable<User> GetUsersInternal(JellyfinDbContext dbContext)
+            => dbContext.Users
+                .AsSplitQuery()
+                .Include(user => user.Permissions)
+                .Include(user => user.Preferences)
+                .Include(user => user.AccessSchedules)
+                .Include(user => user.ProfileImage);
     }
 }

Jellyfin.Server/Extensions/WebHostBuilderExtensions.cs

@@ -35,18 +35,17 @@ public static class WebHostBuilderExtensions
         return builder
             .UseKestrel((builderContext, options) =>
             {
-                var addresses = appHost.NetManager.GetAllBindInterfaces(false);
+                var addresses = appHost.NetManager.GetAllBindInterfaces(true);
 
                 bool flagged = false;
                 foreach (var netAdd in addresses)
                 {
-                    var address = netAdd.Address;
+                    logger.LogInformation("Kestrel is listening on {Address}", IPAddress.IPv6Any.Equals(netAdd.Address) ? "All IPv6 addresses" : netAdd.Address);
-                    logger.LogInformation("Kestrel is listening on {Address}", address.Equals(IPAddress.IPv6Any) ? "all interfaces" : address);
                     options.Listen(netAdd.Address, appHost.HttpPort);
                     if (appHost.ListenWithHttps)
                     {
                         options.Listen(
-                            address,
+                            netAdd.Address,
                             appHost.HttpsPort,
                             listenOptions => listenOptions.UseHttps(appHost.Certificate));
                     }
@@ -55,7 +54,7 @@ public static class WebHostBuilderExtensions
                         try
                         {
                             options.Listen(
-                                address,
+                                netAdd.Address,
                                 appHost.HttpsPort,
                                 listenOptions => listenOptions.UseHttps());
                         }
@@ -85,6 +84,6 @@ public static class WebHostBuilderExtensions
                     logger.LogInformation("Kestrel listening to unix socket {SocketPath}", socketPath);
                 }
             })
-            .UseStartup(_ => new Startup(appHost, startupConfig));
+            .UseStartup(_ => new Startup(appHost));
     }
 }

Jellyfin.Server/Migrations/MigrationRunner.cs

@@ -44,8 +44,7 @@ namespace Jellyfin.Server.Migrations
             typeof(Routines.FixPlaylistOwner),
             typeof(Routines.MigrateRatingLevels),
             typeof(Routines.AddDefaultCastReceivers),
-            typeof(Routines.UpdateDefaultPluginRepository),
+            typeof(Routines.UpdateDefaultPluginRepository)
-            typeof(Routines.FixAudioData),
         };
 
         /// <summary>

Jellyfin.Server/Migrations/Routines/FixAudioData.cs

@@ -1,104 +0,0 @@
-using System;
-using System.Globalization;
-using System.IO;
-using System.Linq;
-using System.Threading;
-using Jellyfin.Data.Enums;
-using MediaBrowser.Controller;
-using MediaBrowser.Controller.Entities;
-using MediaBrowser.Controller.Entities.Audio;
-using MediaBrowser.Controller.Persistence;
-using MediaBrowser.Model.Entities;
-using Microsoft.Extensions.Logging;
-
-namespace Jellyfin.Server.Migrations.Routines
-{
-    /// <summary>
-    /// Fixes the data column of audio types to be deserializable.
-    /// </summary>
-    internal class FixAudioData : IMigrationRoutine
-    {
-        private const string DbFilename = "library.db";
-        private readonly ILogger<FixAudioData> _logger;
-        private readonly IServerApplicationPaths _applicationPaths;
-        private readonly IItemRepository _itemRepository;
-
-        public FixAudioData(
-            IServerApplicationPaths applicationPaths,
-            ILoggerFactory loggerFactory,
-            IItemRepository itemRepository)
-        {
-            _applicationPaths = applicationPaths;
-            _itemRepository = itemRepository;
-            _logger = loggerFactory.CreateLogger<FixAudioData>();
-        }
-
-        /// <inheritdoc/>
-        public Guid Id => Guid.Parse("{CF6FABC2-9FBE-4933-84A5-FFE52EF22A58}");
-
-        /// <inheritdoc/>
-        public string Name => "FixAudioData";
-
-        /// <inheritdoc/>
-        public bool PerformOnNewInstall => false;
-
-        /// <inheritdoc/>
-        public void Perform()
-        {
-            var dbPath = Path.Combine(_applicationPaths.DataPath, DbFilename);
-
-            // Back up the database before modifying any entries
-            for (int i = 1; ; i++)
-            {
-                var bakPath = string.Format(CultureInfo.InvariantCulture, "{0}.bak{1}", dbPath, i);
-                if (!File.Exists(bakPath))
-                {
-                    try
-                    {
-                        File.Copy(dbPath, bakPath);
-                        _logger.LogInformation("Library database backed up to {BackupPath}", bakPath);
-                        break;
-                    }
-                    catch (Exception ex)
-                    {
-                        _logger.LogError(ex, "Cannot make a backup of {Library} at path {BackupPath}", DbFilename, bakPath);
-                        throw;
-                    }
-                }
-            }
-
-            _logger.LogInformation("Backfilling audio lyrics data to database.");
-            var startIndex = 0;
-            var records = _itemRepository.GetCount(new InternalItemsQuery
-            {
-                IncludeItemTypes = [BaseItemKind.Audio],
-            });
-
-            while (startIndex < records)
-            {
-                var results = _itemRepository.GetItemList(new InternalItemsQuery
-                {
-                    IncludeItemTypes = [BaseItemKind.Audio],
-                    StartIndex = startIndex,
-                    Limit = 100,
-                    SkipDeserialization = true
-                })
-                .Cast<Audio>()
-                .ToList();
-
-                foreach (var audio in results)
-                {
-                    var lyricMediaStreams = audio.GetMediaStreams().Where(s => s.Type == MediaStreamType.Lyric).Select(s => s.Path).ToList();
-                    if (lyricMediaStreams.Count > 0)
-                    {
-                        audio.HasLyrics = true;
-                        audio.LyricFiles = lyricMediaStreams;
-                    }
-                }
-
-                _itemRepository.SaveItems(results, CancellationToken.None);
-                startIndex += 100;
-            }
-        }
-    }
-}

Jellyfin.Server/Migrations/Routines/MigrateUserDb.cs

@@ -67,7 +67,7 @@ namespace Jellyfin.Server.Migrations.Routines
             using (var connection = new SqliteConnection($"Filename={Path.Combine(dataPath, DbFilename)}"))
             {
                 connection.Open();
-                using var dbContext = _provider.CreateDbContext();
+                var dbContext = _provider.CreateDbContext();
 
                 var queryResult = connection.Query("SELECT * FROM LocalUsersv2");
 

Jellyfin.Server/Program.cs

@@ -185,7 +185,6 @@ namespace Jellyfin.Server
             }
             catch (Exception ex)
             {
-                _restartOnShutdown = false;
                 _logger.LogCritical(ex, "Error while starting server");
             }
             finally

Jellyfin.Server/Startup.cs

@@ -40,18 +40,15 @@ namespace Jellyfin.Server
     {
         private readonly CoreAppHost _serverApplicationHost;
         private readonly IServerConfigurationManager _serverConfigurationManager;
-        private readonly IConfiguration _startupConfig;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="Startup" /> class.
         /// </summary>
         /// <param name="appHost">The server application host.</param>
-        /// <param name="startupConfig">The server startupConfig.</param>
+        public Startup(CoreAppHost appHost)
-        public Startup(CoreAppHost appHost, IConfiguration startupConfig)
         {
             _serverApplicationHost = appHost;
             _serverConfigurationManager = appHost.ConfigurationManager;
-            _startupConfig = startupConfig;
         }
 
         /// <summary>
@@ -70,7 +67,7 @@ namespace Jellyfin.Server
             // TODO remove once this is fixed upstream https://github.com/dotnet/aspnetcore/issues/34371
             services.AddSingleton<IActionResultExecutor<PhysicalFileResult>, SymlinkFollowingPhysicalFileResultExecutor>();
             services.AddJellyfinApi(_serverApplicationHost.GetApiPluginAssemblies(), _serverConfigurationManager.GetNetworkConfiguration());
-            services.AddJellyfinDbContext(_startupConfig.GetSqliteSecondLevelCacheDisabled());
+            services.AddJellyfinDbContext();
             services.AddJellyfinApiSwagger();
 
             // configure custom legacy authentication

MediaBrowser.Common/MediaBrowser.Common.csproj

@@ -8,7 +8,7 @@
   <PropertyGroup>
     <Authors>Jellyfin Contributors</Authors>
     <PackageId>Jellyfin.Common</PackageId>
-    <VersionPrefix>10.10.0</VersionPrefix>
+    <VersionPrefix>10.9.0</VersionPrefix>
     <RepositoryUrl>https://github.com/jellyfin/jellyfin</RepositoryUrl>
     <PackageLicenseExpression>GPL-3.0-only</PackageLicenseExpression>
   </PropertyGroup>

MediaBrowser.Common/Net/NetworkConstants.cs

@@ -58,11 +58,6 @@ public static class NetworkConstants
     /// </summary>
     public static readonly IPNetwork IPv4RFC1918PrivateClassC = new IPNetwork(IPAddress.Parse("192.168.0.0"), 16);
 
-    /// <summary>
-    /// IPv4 Link-Local as defined in RFC 3927.
-    /// </summary>
-    public static readonly IPNetwork IPv4RFC3927LinkLocal = new IPNetwork(IPAddress.Parse("169.254.0.0"), 16);
-
     /// <summary>
     /// IPv6 loopback as defined in RFC 4291.
     /// </summary>

MediaBrowser.Controller/Entities/Audio/MusicAlbum.cs

@@ -169,7 +169,8 @@ namespace MediaBrowser.Controller.Entities.Audio
 
             var childUpdateType = ItemUpdateType.None;
 
-            foreach (var item in items)
+            // Refresh songs only and not m3u files in album folder
+            foreach (var item in items.OfType<Audio>())
             {
                 cancellationToken.ThrowIfCancellationRequested();
 

MediaBrowser.Controller/Entities/BaseItem.cs

@@ -751,6 +751,9 @@ namespace MediaBrowser.Controller.Entities
         [JsonIgnore]
         public virtual bool SupportsAncestors => true;
 
+        [JsonIgnore]
+        public virtual bool StopRefreshIfLocalMetadataFound => true;
+
         [JsonIgnore]
         protected virtual bool SupportsOwnedItems => !ParentId.IsEmpty() && IsFileProtocol;
 

MediaBrowser.Controller/Entities/Folder.cs

@@ -594,7 +594,7 @@ namespace MediaBrowser.Controller.Entities
             }
 
             var fanoutConcurrency = ConfigurationManager.Configuration.LibraryScanFanoutConcurrency;
-            var parallelism = fanoutConcurrency > 0 ? fanoutConcurrency : Environment.ProcessorCount;
+            var parallelism = fanoutConcurrency > 0 ? fanoutConcurrency : 2 * Environment.ProcessorCount;
 
             var actionBlock = new ActionBlock<int>(
                 async i =>

MediaBrowser.Controller/Entities/InternalItemsQuery.cs

@@ -51,7 +51,6 @@ namespace MediaBrowser.Controller.Entities
             TrailerTypes = Array.Empty<TrailerType>();
             VideoTypes = Array.Empty<VideoType>();
             Years = Array.Empty<int>();
-            SkipDeserialization = false;
         }
 
         public InternalItemsQuery(User? user)
@@ -359,8 +358,6 @@ namespace MediaBrowser.Controller.Entities
 
         public string? SeriesTimerId { get; set; }
 
-        public bool SkipDeserialization { get; set; }
-
         public void SetUser(User user)
         {
             MaxParentalRating = user.MaxParentalAgeRating;

MediaBrowser.Controller/Entities/Movies/Movie.cs

@@ -45,6 +45,9 @@ namespace MediaBrowser.Controller.Entities.Movies
             set => TmdbCollectionName = value;
         }
 
+        [JsonIgnore]
+        public override bool StopRefreshIfLocalMetadataFound => false;
+
         public override double GetDefaultPrimaryImageAspectRatio()
         {
             // hack for tv plugins

MediaBrowser.Controller/Entities/TV/Season.cs

@@ -159,7 +159,7 @@ namespace MediaBrowser.Controller.Entities.TV
 
             Func<BaseItem, bool> filter = i => UserViewBuilder.Filter(i, user, query, UserDataManager, LibraryManager);
 
-            var items = GetEpisodes(user, query.DtoOptions, true).Where(filter);
+            var items = GetEpisodes(user, query.DtoOptions).Where(filter);
 
             return PostFilterAndSort(items, query, false);
         }
@@ -169,31 +169,30 @@ namespace MediaBrowser.Controller.Entities.TV
         /// </summary>
         /// <param name="user">The user.</param>
         /// <param name="options">The options to use.</param>
-        /// <param name="shouldIncludeMissingEpisodes">If missing episodes should be included.</param>
         /// <returns>Set of episodes.</returns>
-        public List<BaseItem> GetEpisodes(User user, DtoOptions options, bool shouldIncludeMissingEpisodes)
+        public List<BaseItem> GetEpisodes(User user, DtoOptions options)
         {
-            return GetEpisodes(Series, user, options, shouldIncludeMissingEpisodes);
+            return GetEpisodes(Series, user, options);
         }
 
-        public List<BaseItem> GetEpisodes(Series series, User user, DtoOptions options, bool shouldIncludeMissingEpisodes)
+        public List<BaseItem> GetEpisodes(Series series, User user, DtoOptions options)
         {
-            return GetEpisodes(series, user, null, options, shouldIncludeMissingEpisodes);
+            return GetEpisodes(series, user, null, options);
         }
 
-        public List<BaseItem> GetEpisodes(Series series, User user, IEnumerable<Episode> allSeriesEpisodes, DtoOptions options, bool shouldIncludeMissingEpisodes)
+        public List<BaseItem> GetEpisodes(Series series, User user, IEnumerable<Episode> allSeriesEpisodes, DtoOptions options)
         {
-            return series.GetSeasonEpisodes(this, user, allSeriesEpisodes, options, shouldIncludeMissingEpisodes);
+            return series.GetSeasonEpisodes(this, user, allSeriesEpisodes, options);
         }
 
         public List<BaseItem> GetEpisodes()
         {
-            return Series.GetSeasonEpisodes(this, null, null, new DtoOptions(true), true);
+            return Series.GetSeasonEpisodes(this, null, null, new DtoOptions(true));
         }
 
         public override List<BaseItem> GetChildren(User user, bool includeLinkedChildren, InternalItemsQuery query)
         {
-            return GetEpisodes(user, new DtoOptions(true), true);
+            return GetEpisodes(user, new DtoOptions(true));
         }
 
         protected override bool GetBlockUnratedValue(User user)

MediaBrowser.Controller/Entities/TV/Series.cs

@@ -28,12 +28,16 @@ namespace MediaBrowser.Controller.Entities.TV
         public Series()
         {
             AirDays = Array.Empty<DayOfWeek>();
+            SeasonNames = new Dictionary<int, string>();
         }
 
         public DayOfWeek[] AirDays { get; set; }
 
         public string AirTime { get; set; }
 
+        [JsonIgnore]
+        public Dictionary<int, string> SeasonNames { get; set; }
+
         [JsonIgnore]
         public override bool SupportsAddingToPlaylist => true;
 
@@ -69,6 +73,9 @@ namespace MediaBrowser.Controller.Entities.TV
         /// <value>The status.</value>
         public SeriesStatus? Status { get; set; }
 
+        [JsonIgnore]
+        public override bool StopRefreshIfLocalMetadataFound => false;
+
         public override double GetDefaultPrimaryImageAspectRatio()
         {
             double value = 2;
@@ -250,7 +257,7 @@ namespace MediaBrowser.Controller.Entities.TV
             return LibraryManager.GetItemsResult(query);
         }
 
-        public IEnumerable<BaseItem> GetEpisodes(User user, DtoOptions options, bool shouldIncludeMissingEpisodes)
+        public IEnumerable<BaseItem> GetEpisodes(User user, DtoOptions options)
         {
             var seriesKey = GetUniqueSeriesKey(this);
 
@@ -260,10 +267,10 @@ namespace MediaBrowser.Controller.Entities.TV
                 SeriesPresentationUniqueKey = seriesKey,
                 IncludeItemTypes = new[] { BaseItemKind.Episode, BaseItemKind.Season },
                 OrderBy = new[] { (ItemSortBy.SortName, SortOrder.Ascending) },
-                DtoOptions = options,
+                DtoOptions = options
             };
 
-            if (!shouldIncludeMissingEpisodes)
+            if (user is null || !user.DisplayMissingEpisodes)
             {
                 query.IsMissing = false;
             }
@@ -273,7 +280,7 @@ namespace MediaBrowser.Controller.Entities.TV
             var allSeriesEpisodes = allItems.OfType<Episode>().ToList();
 
             var allEpisodes = allItems.OfType<Season>()
-                .SelectMany(i => i.GetEpisodes(this, user, allSeriesEpisodes, options, shouldIncludeMissingEpisodes))
+                .SelectMany(i => i.GetEpisodes(this, user, allSeriesEpisodes, options))
                 .Reverse();
 
             // Specials could appear twice based on above - once in season 0, once in the aired season
@@ -285,7 +292,8 @@ namespace MediaBrowser.Controller.Entities.TV
 
         public async Task RefreshAllMetadata(MetadataRefreshOptions refreshOptions, IProgress<double> progress, CancellationToken cancellationToken)
         {
-            // Refresh bottom up, seasons and episodes first, then the series
+            // Refresh bottom up, children first, then the boxset
+            // By then hopefully the  movies within will have Tmdb collection values
             var items = GetRecursiveChildren();
 
             var totalItems = items.Count;
@@ -348,7 +356,7 @@ namespace MediaBrowser.Controller.Entities.TV
             await ProviderManager.RefreshSingleItem(this, refreshOptions, cancellationToken).ConfigureAwait(false);
         }
 
-        public List<BaseItem> GetSeasonEpisodes(Season parentSeason, User user, DtoOptions options, bool shouldIncludeMissingEpisodes)
+        public List<BaseItem> GetSeasonEpisodes(Season parentSeason, User user, DtoOptions options)
         {
             var queryFromSeries = ConfigurationManager.Configuration.DisplaySpecialsWithinSeasons;
 
@@ -365,22 +373,24 @@ namespace MediaBrowser.Controller.Entities.TV
                 OrderBy = new[] { (ItemSortBy.SortName, SortOrder.Ascending) },
                 DtoOptions = options
             };
-
+            if (user is not null)
-            if (!shouldIncludeMissingEpisodes)
             {
-                query.IsMissing = false;
+                if (!user.DisplayMissingEpisodes)
+                {
+                    query.IsMissing = false;
+                }
             }
 
             var allItems = LibraryManager.GetItemList(query);
 
-            return GetSeasonEpisodes(parentSeason, user, allItems, options, shouldIncludeMissingEpisodes);
+            return GetSeasonEpisodes(parentSeason, user, allItems, options);
         }
 
-        public List<BaseItem> GetSeasonEpisodes(Season parentSeason, User user, IEnumerable<BaseItem> allSeriesEpisodes, DtoOptions options, bool shouldIncludeMissingEpisodes)
+        public List<BaseItem> GetSeasonEpisodes(Season parentSeason, User user, IEnumerable<BaseItem> allSeriesEpisodes, DtoOptions options)
         {
             if (allSeriesEpisodes is null)
             {
-                return GetSeasonEpisodes(parentSeason, user, options, shouldIncludeMissingEpisodes);
+                return GetSeasonEpisodes(parentSeason, user, options);
             }
 
             var episodes = FilterEpisodesBySeason(allSeriesEpisodes, parentSeason, ConfigurationManager.Configuration.DisplaySpecialsWithinSeasons);

MediaBrowser.Controller/Entities/Trailer.cs

@@ -23,6 +23,9 @@ namespace MediaBrowser.Controller.Entities
             TrailerTypes = Array.Empty<TrailerType>();
         }
 
+        [JsonIgnore]
+        public override bool StopRefreshIfLocalMetadataFound => false;
+
         public TrailerType[] TrailerTypes { get; set; }
 
         public override double GetDefaultPrimaryImageAspectRatio()

MediaBrowser.Controller/Extensions/ConfigurationExtensions.cs

@@ -64,11 +64,6 @@ namespace MediaBrowser.Controller.Extensions
         /// </summary>
         public const string SqliteCacheSizeKey = "sqlite:cacheSize";
 
-        /// <summary>
-        /// Disable second level cache of sqlite.
-        /// </summary>
-        public const string SqliteDisableSecondLevelCacheKey = "sqlite:disableSecondLevelCache";
-
         /// <summary>
         /// Gets a value indicating whether the application should host static web content from the <see cref="IConfiguration"/>.
         /// </summary>
@@ -133,15 +128,5 @@ namespace MediaBrowser.Controller.Extensions
         /// <returns>The sqlite cache size.</returns>
         public static int? GetSqliteCacheSize(this IConfiguration configuration)
             => configuration.GetValue<int?>(SqliteCacheSizeKey);
-
-        /// <summary>
-        /// Gets whether second level cache disabled from the <see cref="IConfiguration" />.
-        /// </summary>
-        /// <param name="configuration">The configuration to read the setting from.</param>
-        /// <returns>Whether second level cache disabled.</returns>
-        public static bool GetSqliteSecondLevelCacheDisabled(this IConfiguration configuration)
-        {
-            return configuration.GetValue<bool>(SqliteDisableSecondLevelCacheKey);
-        }
     }
 }

MediaBrowser.Controller/MediaBrowser.Controller.csproj

@@ -8,7 +8,7 @@
   <PropertyGroup>
     <Authors>Jellyfin Contributors</Authors>
     <PackageId>Jellyfin.Controller</PackageId>
-    <VersionPrefix>10.10.0</VersionPrefix>
+    <VersionPrefix>10.9.0</VersionPrefix>
     <RepositoryUrl>https://github.com/jellyfin/jellyfin</RepositoryUrl>
     <PackageLicenseExpression>GPL-3.0-only</PackageLicenseExpression>
   </PropertyGroup>

MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs

@@ -55,7 +55,6 @@ namespace MediaBrowser.Controller.MediaEncoding
         private readonly Version _minKerneli915Hang = new Version(5, 18);
         private readonly Version _maxKerneli915Hang = new Version(6, 1, 3);
         private readonly Version _minFixedKernel60i915Hang = new Version(6, 0, 18);
-        private readonly Version _minKernelVersionAmdVkFmtModifier = new Version(5, 15);
 
         private readonly Version _minFFmpegImplictHwaccel = new Version(6, 0);
         private readonly Version _minFFmpegHwaUnsafeOutput = new Version(6, 0);
@@ -681,6 +680,16 @@ namespace MediaBrowser.Controller.MediaEncoding
             return -1;
         }
 
+        public string GetInputPathArgument(EncodingJobInfo state)
+        {
+            return state.MediaSource.VideoType switch
+            {
+                VideoType.Dvd => _mediaEncoder.GetInputArgument(_mediaEncoder.GetPrimaryPlaylistVobFiles(state.MediaPath, null).ToList(), state.MediaSource),
+                VideoType.BluRay => _mediaEncoder.GetInputArgument(_mediaEncoder.GetPrimaryPlaylistM2tsFiles(state.MediaPath).ToList(), state.MediaSource),
+                _ => _mediaEncoder.GetInputArgument(state.MediaPath, state.MediaSource)
+            };
+        }
+
         /// <summary>
         /// Gets the audio encoder.
         /// </summary>
@@ -996,8 +1005,7 @@ namespace MediaBrowser.Controller.MediaEncoding
                     Environment.SetEnvironmentVariable("AMD_DEBUG", "noefc");
 
                     if (IsVulkanFullSupported()
-                        && _mediaEncoder.IsVaapiDeviceSupportVulkanDrmInterop
+                        && _mediaEncoder.IsVaapiDeviceSupportVulkanDrmInterop)
-                        && Environment.OSVersion.Version >= _minKernelVersionAmdVkFmtModifier)
                     {
                         args.Append(GetDrmDeviceArgs(options.VaapiDevice, DrmAlias));
                         args.Append(GetVaapiDeviceArgs(null, null, null, DrmAlias, VaapiAlias));
@@ -1189,14 +1197,13 @@ namespace MediaBrowser.Controller.MediaEncoding
             {
                 var tmpConcatPath = Path.Join(_configurationManager.GetTranscodePath(), state.MediaSource.Id + ".concat");
                 _mediaEncoder.GenerateConcatConfig(state.MediaSource, tmpConcatPath);
-                arg.Append(" -f concat -safe 0 -i \"")
+                arg.Append(" -f concat -safe 0 -i ")
-                    .Append(tmpConcatPath)
+                    .Append(tmpConcatPath);
-                    .Append("\" ");
             }
             else
             {
                 arg.Append(" -i ")
-                    .Append(_mediaEncoder.GetInputPathArgument(state));
+                    .Append(GetInputPathArgument(state));
             }
 
             // sub2video for external graphical subtitles
@@ -2076,18 +2083,6 @@ namespace MediaBrowser.Controller.MediaEncoding
                 profile = "constrained_high";
             }
 
-            if (string.Equals(videoEncoder, "h264_videotoolbox", StringComparison.OrdinalIgnoreCase)
-                && profile.Contains("constrainedbaseline", StringComparison.OrdinalIgnoreCase))
-            {
-                profile = "constrained_baseline";
-            }
-
-            if (string.Equals(videoEncoder, "h264_videotoolbox", StringComparison.OrdinalIgnoreCase)
-                && profile.Contains("constrainedhigh", StringComparison.OrdinalIgnoreCase))
-            {
-                profile = "constrained_high";
-            }
-
             if (!string.IsNullOrEmpty(profile))
             {
                 // Currently there's no profile option in av1_nvenc encoder
@@ -2321,11 +2316,7 @@ namespace MediaBrowser.Controller.MediaEncoding
             if (request.VideoBitRate.HasValue
                 && (!videoStream.BitRate.HasValue || videoStream.BitRate.Value > request.VideoBitRate.Value))
             {
-                // For LiveTV that has no bitrate, let's try copy if other conditions are met
+                return false;
-                if (string.IsNullOrWhiteSpace(request.LiveStreamId) || videoStream.BitRate.HasValue)
-                {
-                    return false;
-                }
             }
 
             var maxBitDepth = state.GetRequestedVideoBitDepth(videoStream.Codec);
@@ -2638,14 +2629,10 @@ namespace MediaBrowser.Controller.MediaEncoding
                 && state.AudioStream.Channels.HasValue
                 && state.AudioStream.Channels.Value == 6)
             {
-                if (!encodingOptions.DownMixAudioBoost.Equals(1))
-                {
-                    filters.Add("volume=" + encodingOptions.DownMixAudioBoost.ToString(CultureInfo.InvariantCulture));
-                }
-
                 switch (encodingOptions.DownMixStereoAlgorithm)
                 {
                     case DownMixStereoAlgorithms.Dave750:
+                        filters.Add("volume=4.25");
                         filters.Add("pan=stereo|c0=0.5*c2+0.707*c0+0.707*c4+0.5*c3|c1=0.5*c2+0.707*c1+0.707*c5+0.5*c3");
                         break;
                     case DownMixStereoAlgorithms.NightmodeDialogue:
@@ -2653,6 +2640,11 @@ namespace MediaBrowser.Controller.MediaEncoding
                         break;
                     case DownMixStereoAlgorithms.None:
                     default:
+                        if (!encodingOptions.DownMixAudioBoost.Equals(1))
+                        {
+                            filters.Add("volume=" + encodingOptions.DownMixAudioBoost.ToString(CultureInfo.InvariantCulture));
+                        }
+
                         break;
                 }
             }
@@ -2779,13 +2771,7 @@ namespace MediaBrowser.Controller.MediaEncoding
 
             if (time > 0)
             {
-                // For direct streaming/remuxing, we seek at the exact position of the keyframe
+                seekParam += string.Format(CultureInfo.InvariantCulture, "-ss {0}", _mediaEncoder.GetTimeParameter(time));
-                // However, ffmpeg will seek to previous keyframe when the exact time is the input
-                // Workaround this by adding 0.5s offset to the seeking time to get the exact keyframe on most videos.
-                // This will help subtitle syncing.
-                var isHlsRemuxing = state.IsVideoRequest && state.TranscodingType is TranscodingJobType.Hls && IsCopyCodec(state.OutputVideoCodec);
-                var seekTick = isHlsRemuxing ? time + 5000000L : time;
-                seekParam += string.Format(CultureInfo.InvariantCulture, "-ss {0}", _mediaEncoder.GetTimeParameter(seekTick));
 
                 if (state.IsVideoRequest)
                 {
@@ -3169,9 +3155,7 @@ namespace MediaBrowser.Controller.MediaEncoding
             int? requestedMaxHeight)
         {
             var isV4l2 = string.Equals(videoEncoder, "h264_v4l2m2m", StringComparison.OrdinalIgnoreCase);
-            var isMjpeg = videoEncoder is not null && videoEncoder.Contains("mjpeg", StringComparison.OrdinalIgnoreCase);
             var scaleVal = isV4l2 ? 64 : 2;
-            var targetAr = isMjpeg ? "(a*sar)" : "a"; // manually calculate AR when using mjpeg encoder
 
             // If fixed dimensions were supplied
             if (requestedWidth.HasValue && requestedHeight.HasValue)
@@ -3200,11 +3184,10 @@ namespace MediaBrowser.Controller.MediaEncoding
 
                 return string.Format(
                     CultureInfo.InvariantCulture,
-                    @"scale=trunc(min(max(iw\,ih*{3})\,min({0}\,{1}*{3}))/{2})*{2}:trunc(min(max(iw/{3}\,ih)\,min({0}/{3}\,{1}))/2)*2",
+                    @"scale=trunc(min(max(iw\,ih*a)\,min({0}\,{1}*a))/{2})*{2}:trunc(min(max(iw/a\,ih)\,min({0}/a\,{1}))/2)*2",
                     maxWidthParam,
                     maxHeightParam,
-                    scaleVal,
+                    scaleVal);
-                    targetAr);
             }
 
             // If a fixed width was requested
@@ -3220,9 +3203,8 @@ namespace MediaBrowser.Controller.MediaEncoding
 
                 return string.Format(
                     CultureInfo.InvariantCulture,
-                    "scale={0}:trunc(ow/{1}/2)*2",
+                    "scale={0}:trunc(ow/a/2)*2",
-                    widthParam,
+                    widthParam);
-                    targetAr);
             }
 
             // If a fixed height was requested
@@ -3232,10 +3214,9 @@ namespace MediaBrowser.Controller.MediaEncoding
 
                 return string.Format(
                     CultureInfo.InvariantCulture,
-                    "scale=trunc(oh*{2}/{1})*{1}:{0}",
+                    "scale=trunc(oh*a/{1})*{1}:{0}",
                     heightParam,
-                    scaleVal,
+                    scaleVal);
-                    targetAr);
             }
 
             // If a max width was requested
@@ -3245,10 +3226,9 @@ namespace MediaBrowser.Controller.MediaEncoding
 
                 return string.Format(
                     CultureInfo.InvariantCulture,
-                    @"scale=trunc(min(max(iw\,ih*{2})\,{0})/{1})*{1}:trunc(ow/{2}/2)*2",
+                    @"scale=trunc(min(max(iw\,ih*a)\,{0})/{1})*{1}:trunc(ow/a/2)*2",
                     maxWidthParam,
-                    scaleVal,
+                    scaleVal);
-                    targetAr);
             }
 
             // If a max height was requested
@@ -3258,10 +3238,9 @@ namespace MediaBrowser.Controller.MediaEncoding
 
                 return string.Format(
                     CultureInfo.InvariantCulture,
-                    @"scale=trunc(oh*{2}/{1})*{1}:min(max(iw/{2}\,ih)\,{0})",
+                    @"scale=trunc(oh*a/{1})*{1}:min(max(iw/a\,ih)\,{0})",
                     maxHeightParam,
-                    scaleVal,
+                    scaleVal);
-                    targetAr);
             }
 
             return string.Empty;
@@ -4306,7 +4285,6 @@ namespace MediaBrowser.Controller.MediaEncoding
                 {
                     // map from qsv to vaapi.
                     mainFilters.Add("hwmap=derive_device=vaapi");
-                    mainFilters.Add("format=vaapi");
                 }
 
                 var tonemapFilter = GetHwTonemapFilter(options, "vaapi", "nv12");
@@ -4316,7 +4294,6 @@ namespace MediaBrowser.Controller.MediaEncoding
                 {
                     // map from vaapi to qsv.
                     mainFilters.Add("hwmap=derive_device=qsv");
-                    mainFilters.Add("format=qsv");
                 }
             }
 
@@ -4491,8 +4468,7 @@ namespace MediaBrowser.Controller.MediaEncoding
             // prefered vaapi + vulkan filters pipeline
             if (_mediaEncoder.IsVaapiDeviceAmd
                 && isVaapiVkSupported
-                && _mediaEncoder.IsVaapiDeviceSupportVulkanDrmInterop
+                && _mediaEncoder.IsVaapiDeviceSupportVulkanDrmInterop)
-                && Environment.OSVersion.Version >= _minKernelVersionAmdVkFmtModifier)
             {
                 // AMD radeonsi path(targeting Polaris/gfx8+), with extra vulkan tonemap and overlay support.
                 return GetAmdVaapiFullVidFiltersPrefered(state, options, vidDecoder, vidEncoder);

MediaBrowser.Controller/MediaEncoding/IMediaEncoder.cs

@@ -245,21 +245,6 @@ namespace MediaBrowser.Controller.MediaEncoding
         /// <returns>A playlist.</returns>
         IReadOnlyList<string> GetPrimaryPlaylistM2tsFiles(string path);
 
-        /// <summary>
-        /// Gets the input path argument from <see cref="EncodingJobInfo"/>.
-        /// </summary>
-        /// <param name="state">The <see cref="EncodingJobInfo"/>.</param>
-        /// <returns>The input path argument.</returns>
-        string GetInputPathArgument(EncodingJobInfo state);
-
-        /// <summary>
-        /// Gets the input path argument.
-        /// </summary>
-        /// <param name="path">The item path.</param>
-        /// <param name="mediaSource">The <see cref="MediaSourceInfo"/>.</param>
-        /// <returns>The input path argument.</returns>
-        string GetInputPathArgument(string path, MediaSourceInfo mediaSource);
-
         /// <summary>
         /// Generates a FFmpeg concat config for the source.
         /// </summary>

MediaBrowser.Controller/Providers/ItemInfo.cs

@@ -11,8 +11,6 @@ namespace MediaBrowser.Controller.Providers
         public ItemInfo(BaseItem item)
         {
             Path = item.Path;
-            ParentId = item.ParentId;
-            IndexNumber = item.IndexNumber;
             ContainingFolderPath = item.ContainingFolderPath;
             IsInMixedFolder = item.IsInMixedFolder;
 
@@ -29,10 +27,6 @@ namespace MediaBrowser.Controller.Providers
 
         public string Path { get; set; }
 
-        public Guid ParentId { get; set; }
-
-        public int? IndexNumber { get; set; }
-
         public string ContainingFolderPath { get; set; }
 
         public VideoType VideoType { get; set; }

MediaBrowser.MediaEncoding/Attachments/AttachmentExtractor.cs

@@ -89,28 +89,15 @@ namespace MediaBrowser.MediaEncoding.Attachments
             string outputPath,
             CancellationToken cancellationToken)
         {
-            var shouldExtractOneByOne = mediaSource.MediaAttachments.Any(a => a.FileName.Contains('/', StringComparison.OrdinalIgnoreCase) || a.FileName.Contains('\\', StringComparison.OrdinalIgnoreCase));
+            using (await _semaphoreLocks.LockAsync(outputPath, cancellationToken).ConfigureAwait(false))
-            if (shouldExtractOneByOne)
             {
-                var attachmentIndexes = mediaSource.MediaAttachments.Select(a => a.Index);
+                if (!Directory.Exists(outputPath))
-                foreach (var i in attachmentIndexes)
                 {
-                    var newName = Path.Join(outputPath, i.ToString(CultureInfo.InvariantCulture));
+                    await ExtractAllAttachmentsInternal(
-                    await ExtractAttachment(inputFile, mediaSource, i, newName, cancellationToken).ConfigureAwait(false);
+                        _mediaEncoder.GetInputArgument(inputFile, mediaSource),
-                }
+                        outputPath,
-            }
+                        false,
-            else
+                        cancellationToken).ConfigureAwait(false);
-            {
-                using (await _semaphoreLocks.LockAsync(outputPath, cancellationToken).ConfigureAwait(false))
-                {
-                    if (!Directory.Exists(outputPath))
-                    {
-                        await ExtractAllAttachmentsInternal(
-                            _mediaEncoder.GetInputArgument(inputFile, mediaSource),
-                            outputPath,
-                            false,
-                            cancellationToken).ConfigureAwait(false);
-                    }
                 }
             }
         }

MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs

@@ -30,8 +30,10 @@ using MediaBrowser.Model.Entities;
 using MediaBrowser.Model.Globalization;
 using MediaBrowser.Model.IO;
 using MediaBrowser.Model.MediaInfo;
+using Microsoft.AspNetCore.Components.Forms;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.Logging;
+using static Nikse.SubtitleEdit.Core.Common.IfoParser;
 
 namespace MediaBrowser.MediaEncoding.Encoder
 {
@@ -456,9 +458,9 @@ namespace MediaBrowser.MediaEncoding.Encoder
                 extraArgs += " -probesize " + ffmpegProbeSize;
             }
 
-            if (request.MediaSource.RequiredHttpHeaders.TryGetValue("User-Agent", out var userAgent))
+            if (request.MediaSource.RequiredHttpHeaders.TryGetValue("user_agent", out var userAgent))
             {
-                extraArgs += $" -user_agent \"{userAgent}\"";
+                extraArgs += " -user_agent " + userAgent;
             }
 
             if (request.MediaSource.Protocol == MediaProtocol.Rtsp)
@@ -619,7 +621,7 @@ namespace MediaBrowser.MediaEncoding.Encoder
             ImageFormat? targetFormat,
             CancellationToken cancellationToken)
         {
-            var inputArgument = GetInputPathArgument(inputFile, mediaSource);
+            var inputArgument = GetInputArgument(inputFile, mediaSource);
 
             if (!isAudio)
             {
@@ -822,22 +824,6 @@ namespace MediaBrowser.MediaEncoding.Encoder
                 options.EnableTonemapping = false;
             }
 
-            if (imageStream.Width is not null && imageStream.Height is not null && !string.IsNullOrEmpty(imageStream.AspectRatio))
-            {
-                // For hardware trickplay encoders, we need to re-calculate the size because they used fixed scale dimensions
-                var darParts = imageStream.AspectRatio.Split(':');
-                var (wa, ha) = (double.Parse(darParts[0], CultureInfo.InvariantCulture), double.Parse(darParts[1], CultureInfo.InvariantCulture));
-                // When dimension / DAR does not equal to 1:1, then the frames are most likely stored stretched.
-                // Note: this might be incorrect for 3D videos as the SAR stored might be per eye instead of per video, but we really can do little about it.
-                var shouldResetHeight = Math.Abs((imageStream.Width.Value * ha) - (imageStream.Height.Value * wa)) > .05;
-                if (shouldResetHeight)
-                {
-                    // SAR = DAR * Height / Width
-                    // RealHeight = Height / SAR = Height / (DAR * Height / Width) = Width / DAR
-                    imageStream.Height = Convert.ToInt32(imageStream.Width.Value * ha / wa);
-                }
-            }
-
             var baseRequest = new BaseEncodingJobOptions { MaxWidth = maxWidth, MaxFramerate = (float)(1.0 / interval.TotalSeconds) };
             var jobState = new EncodingJobInfo(TranscodingJobType.Progressive)
             {
@@ -885,15 +871,6 @@ namespace MediaBrowser.MediaEncoding.Encoder
                 throw new InvalidOperationException("Empty or invalid input argument.");
             }
 
-            float? encoderQuality = qualityScale;
-            if (vidEncoder.Contains("vaapi", StringComparison.OrdinalIgnoreCase))
-            {
-                // vaapi's mjpeg encoder uses jpeg quality divided by QP2LAMBDA (118) as input, instead of ffmpeg defined qscale
-                // ffmpeg qscale is a value from 1-31, with 1 being best quality and 31 being worst
-                // jpeg quality is a value from 0-100, with 0 being worst quality and 100 being best
-                encoderQuality = (100 - ((qualityScale - 1) * (100 / 30))) / 118;
-            }
-
             // Output arguments
             var targetDirectory = Path.Combine(_configurationManager.ApplicationPaths.TempDirectory, Guid.NewGuid().ToString("N"));
             Directory.CreateDirectory(targetDirectory);
@@ -907,7 +884,7 @@ namespace MediaBrowser.MediaEncoding.Encoder
                 filterParam,
                 outputThreads.GetValueOrDefault(_threads),
                 vidEncoder,
-                qualityScale.HasValue ? "-qscale:v " + encoderQuality.Value.ToString(CultureInfo.InvariantCulture) + " " : string.Empty,
+                qualityScale.HasValue ? "-qscale:v " + qualityScale.Value.ToString(CultureInfo.InvariantCulture) + " " : string.Empty,
                 "image2",
                 outputPath);
 
@@ -959,7 +936,7 @@ namespace MediaBrowser.MediaEncoding.Encoder
                     var timeoutMs = _configurationManager.Configuration.ImageExtractionTimeoutMs;
                     timeoutMs = timeoutMs <= 0 ? DefaultHdrImageExtractionTimeout : timeoutMs;
 
-                    while (isResponsive && !cancellationToken.IsCancellationRequested)
+                    while (isResponsive)
                     {
                         try
                         {
@@ -973,6 +950,8 @@ namespace MediaBrowser.MediaEncoding.Encoder
                             // We don't actually expect the process to be finished in one timeout span, just that one image has been generated.
                         }
 
+                        cancellationToken.ThrowIfCancellationRequested();
+
                         var jpegCount = _fileSystem.GetFilePaths(targetDirectory).Count();
 
                         isResponsive = jpegCount > lastCount;
@@ -981,12 +960,7 @@ namespace MediaBrowser.MediaEncoding.Encoder
 
                     if (!ranToCompletion)
                     {
-                        if (!isResponsive)
+                        _logger.LogInformation("Stopping trickplay extraction due to process inactivity.");
-                        {
-                            _logger.LogInformation("Trickplay process unresponsive.");
-                        }
-
-                        _logger.LogInformation("Stopping trickplay extraction.");
                         StopProcess(processWrapper, 1000);
                     }
                 }
@@ -1154,29 +1128,16 @@ namespace MediaBrowser.MediaEncoding.Encoder
             var validPlaybackFiles = _blurayExaminer.GetDiscInfo(path).Files;
 
             // Get all files from the BDMV/STREAMING directory
+            var directoryFiles = _fileSystem.GetFiles(Path.Join(path, "BDMV", "STREAM"));
+
             // Only return playable local .m2ts files
-            return validPlaybackFiles
+            return directoryFiles
-                .Select(f => _fileSystem.GetFileInfo(Path.Join(path, "BDMV", "STREAM", f)))
+                .Where(f => validPlaybackFiles.Contains(f.Name, StringComparer.OrdinalIgnoreCase))
-                .Where(f => f.Exists)
                 .Select(f => f.FullName)
+                .Order()
                 .ToList();
         }
 
-        /// <inheritdoc />
-        public string GetInputPathArgument(EncodingJobInfo state)
-            => GetInputPathArgument(state.MediaPath, state.MediaSource);
-
-        /// <inheritdoc />
-        public string GetInputPathArgument(string path, MediaSourceInfo mediaSource)
-        {
-            return mediaSource.VideoType switch
-            {
-                VideoType.Dvd => GetInputArgument(GetPrimaryPlaylistVobFiles(path, null).ToList(), mediaSource),
-                VideoType.BluRay => GetInputArgument(GetPrimaryPlaylistM2tsFiles(path).ToList(), mediaSource),
-                _ => GetInputArgument(path, mediaSource)
-            };
-        }
-
         /// <inheritdoc />
         public void GenerateConcatConfig(MediaSourceInfo source, string concatFilePath)
         {

MediaBrowser.Model/Entities/MediaStream.cs

@@ -267,14 +267,14 @@ namespace MediaBrowser.Model.Entities
                             attributes.Add(StringHelper.FirstToUpper(fullLanguage ?? Language));
                         }
 
-                        if (!string.IsNullOrEmpty(Profile) && !string.Equals(Profile, "lc", StringComparison.OrdinalIgnoreCase))
+                        if (!string.IsNullOrEmpty(Codec) && !string.Equals(Codec, "dca", StringComparison.OrdinalIgnoreCase) && !string.Equals(Codec, "dts", StringComparison.OrdinalIgnoreCase))
-                        {
-                            attributes.Add(Profile);
-                        }
-                        else if (!string.IsNullOrEmpty(Codec))
                         {
                             attributes.Add(AudioCodec.GetFriendlyName(Codec));
                         }
+                        else if (!string.IsNullOrEmpty(Profile) && !string.Equals(Profile, "lc", StringComparison.OrdinalIgnoreCase))
+                        {
+                            attributes.Add(Profile);
+                        }
 
                         if (!string.IsNullOrEmpty(ChannelLayout))
                         {

MediaBrowser.Model/MediaBrowser.Model.csproj

@@ -8,7 +8,7 @@
   <PropertyGroup>
     <Authors>Jellyfin Contributors</Authors>
     <PackageId>Jellyfin.Model</PackageId>
-    <VersionPrefix>10.10.0</VersionPrefix>
+    <VersionPrefix>10.9.0</VersionPrefix>
     <RepositoryUrl>https://github.com/jellyfin/jellyfin</RepositoryUrl>
     <PackageLicenseExpression>GPL-3.0-only</PackageLicenseExpression>
   </PropertyGroup>
@@ -33,10 +33,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <FrameworkReference Include="Microsoft.AspNetCore.App" />
+    <PackageReference Include="Microsoft.AspNetCore.HttpOverrides" />
-  </ItemGroup>
-  
-  <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" />
     <PackageReference Include="MimeTypes">
       <PrivateAssets>all</PrivateAssets>

MediaBrowser.Model/Search/SearchHint.cs

@@ -43,7 +43,7 @@ namespace MediaBrowser.Model.Search
         /// Gets or sets the matched term.
         /// </summary>
         /// <value>The matched term.</value>
-        public string? MatchedTerm { get; set; }
+        public string MatchedTerm { get; set; }
 
         /// <summary>
         /// Gets or sets the index number.

MediaBrowser.Providers/Manager/MetadataService.cs

@@ -8,6 +8,7 @@ using System.Linq;
 using System.Net.Http;
 using System.Threading;
 using System.Threading.Tasks;
+using Jellyfin.Data.Enums;
 using Jellyfin.Extensions;
 using MediaBrowser.Controller.Configuration;
 using MediaBrowser.Controller.Entities;
@@ -121,8 +122,7 @@ namespace MediaBrowser.Providers.Manager
 
             var metadataResult = new MetadataResult<TItemType>
             {
-                Item = itemOfType,
+                Item = itemOfType
-                People = LibraryManager.GetPeople(item)
             };
 
             bool hasRefreshedMetadata = true;
@@ -165,7 +165,7 @@ namespace MediaBrowser.Providers.Manager
             }
 
             // Next run remote image providers, but only if local image providers didn't throw an exception
-            if (!localImagesFailed && refreshOptions.ImageRefreshMode > MetadataRefreshMode.ValidationOnly)
+            if (!localImagesFailed && refreshOptions.ImageRefreshMode != MetadataRefreshMode.ValidationOnly)
             {
                 var providers = GetNonLocalImageProviders(item, allImageProviders, refreshOptions).ToList();
 
@@ -243,7 +243,7 @@ namespace MediaBrowser.Providers.Manager
 
         protected async Task SaveItemAsync(MetadataResult<TItemType> result, ItemUpdateType reason, CancellationToken cancellationToken)
         {
-            if (result.Item.SupportsPeople)
+            if (result.Item.SupportsPeople && result.People is not null)
             {
                 var baseItem = result.Item;
 
@@ -399,8 +399,7 @@ namespace MediaBrowser.Providers.Manager
 
                 foreach (var child in children)
                 {
-                    // Exclude any folders and virtual items since they are only placeholders
+                    if (!child.IsFolder)
-                    if (!child.IsFolder && !child.IsVirtualItem)
                     {
                         var childDateCreated = child.DateCreated;
                         if (childDateCreated > dateLastMediaAdded)
@@ -656,19 +655,26 @@ namespace MediaBrowser.Providers.Manager
                 await RunCustomProvider(provider, item, logName, options, refreshResult, cancellationToken).ConfigureAwait(false);
             }
 
-            if (item.IsLocked)
-            {
-                return refreshResult;
-            }
-
             var temp = new MetadataResult<TItemType>
             {
                 Item = CreateNew()
             };
             temp.Item.Path = item.Path;
-            temp.Item.Id = item.Id;
 
+            // If replacing all metadata, run internet providers first
+            if (options.ReplaceAllMetadata)
+            {
+                var remoteResult = await ExecuteRemoteProviders(temp, logName, id, providers.OfType<IRemoteMetadataProvider<TItemType, TIdType>>(), cancellationToken)
+                    .ConfigureAwait(false);
+
+                refreshResult.UpdateType |= remoteResult.UpdateType;
+                refreshResult.ErrorMessage = remoteResult.ErrorMessage;
+                refreshResult.Failures += remoteResult.Failures;
+            }
+
+            var hasLocalMetadata = false;
             var foundImageTypes = new List<ImageType>();
+
             foreach (var provider in providers.OfType<ILocalMetadataProvider<TItemType>>())
             {
                 var providerName = provider.GetType().Name;
@@ -714,9 +720,15 @@ namespace MediaBrowser.Providers.Manager
                             refreshResult.UpdateType |= ItemUpdateType.ImageUpdate;
                         }
 
-                        MergeData(localItem, temp, Array.Empty<MetadataField>(), false, true);
+                        MergeData(localItem, temp, Array.Empty<MetadataField>(), options.ReplaceAllMetadata, true);
                         refreshResult.UpdateType |= ItemUpdateType.MetadataImport;
 
+                        // Only one local provider allowed per item
+                        if (item.IsLocked || localItem.Item.IsLocked || IsFullLocalMetadata(localItem.Item))
+                        {
+                            hasLocalMetadata = true;
+                        }
+
                         break;
                     }
 
@@ -735,10 +747,10 @@ namespace MediaBrowser.Providers.Manager
                 }
             }
 
-            var isLocalLocked = temp.Item.IsLocked;
+            // Local metadata is king - if any is found don't run remote providers
-            if (!isLocalLocked && (options.ReplaceAllMetadata || options.MetadataRefreshMode > MetadataRefreshMode.ValidationOnly))
+            if (!options.ReplaceAllMetadata && (!hasLocalMetadata || options.MetadataRefreshMode == MetadataRefreshMode.FullRefresh || !item.StopRefreshIfLocalMetadataFound))
             {
-                var remoteResult = await ExecuteRemoteProviders(temp, logName, false, id, providers.OfType<IRemoteMetadataProvider<TItemType, TIdType>>(), cancellationToken)
+                var remoteResult = await ExecuteRemoteProviders(temp, logName, id, providers.OfType<IRemoteMetadataProvider<TItemType, TIdType>>(), cancellationToken)
                     .ConfigureAwait(false);
 
                 refreshResult.UpdateType |= remoteResult.UpdateType;
@@ -750,20 +762,19 @@ namespace MediaBrowser.Providers.Manager
             {
                 if (refreshResult.UpdateType > ItemUpdateType.None)
                 {
-                    if (!options.RemoveOldMetadata)
+                    if (hasLocalMetadata)
-                    {
-                        // Add existing metadata to provider result if it does not exist there
-                        MergeData(metadata, temp, Array.Empty<MetadataField>(), false, false);
-                    }
-
-                    if (isLocalLocked)
                     {
                         MergeData(temp, metadata, item.LockedFields, true, true);
                     }
                     else
                     {
-                        var shouldReplace = options.MetadataRefreshMode > MetadataRefreshMode.ValidationOnly || options.ReplaceAllMetadata;
+                        if (!options.RemoveOldMetadata)
-                        MergeData(temp, metadata, item.LockedFields, shouldReplace, false);
+                        {
+                            MergeData(metadata, temp, Array.Empty<MetadataField>(), false, false);
+                        }
+
+                        // Will always replace all metadata when Scan for new and updated files is used. Else, follow the options.
+                        MergeData(temp, metadata, item.LockedFields, options.MetadataRefreshMode == MetadataRefreshMode.Default || options.ReplaceAllMetadata, false);
                     }
                 }
             }
@@ -776,6 +787,16 @@ namespace MediaBrowser.Providers.Manager
             return refreshResult;
         }
 
+        protected virtual bool IsFullLocalMetadata(TItemType item)
+        {
+            if (string.IsNullOrWhiteSpace(item.Name))
+            {
+                return false;
+            }
+
+            return true;
+        }
+
         private async Task RunCustomProvider(ICustomMetadataProvider<TItemType> provider, TItemType item, string logName, MetadataRefreshOptions options, RefreshResult refreshResult, CancellationToken cancellationToken)
         {
             Logger.LogDebug("Running {Provider} for {Item}", provider.GetType().Name, logName);
@@ -800,7 +821,7 @@ namespace MediaBrowser.Providers.Manager
             return new TItemType();
         }
 
-        private async Task<RefreshResult> ExecuteRemoteProviders(MetadataResult<TItemType> temp, string logName, bool replaceData, TIdType id, IEnumerable<IRemoteMetadataProvider<TItemType, TIdType>> providers, CancellationToken cancellationToken)
+        private async Task<RefreshResult> ExecuteRemoteProviders(MetadataResult<TItemType> temp, string logName, TIdType id, IEnumerable<IRemoteMetadataProvider<TItemType, TIdType>> providers, CancellationToken cancellationToken)
         {
             var refreshResult = new RefreshResult();
 
@@ -825,7 +846,7 @@ namespace MediaBrowser.Providers.Manager
                     {
                         result.Provider = provider.Name;
 
-                        MergeData(result, temp, Array.Empty<MetadataField>(), replaceData, false);
+                        MergeData(result, temp, Array.Empty<MetadataField>(), false, false);
                         MergeNewData(temp.Item, id);
 
                         refreshResult.UpdateType |= ItemUpdateType.MetadataDownload;
@@ -928,7 +949,11 @@ namespace MediaBrowser.Providers.Manager
 
             if (replaceData || string.IsNullOrEmpty(target.OriginalTitle))
             {
-                target.OriginalTitle = source.OriginalTitle;
+                // Safeguard against incoming data having an empty name
+                if (!string.IsNullOrWhiteSpace(source.OriginalTitle))
+                {
+                    target.OriginalTitle = source.OriginalTitle;
+                }
             }
 
             if (replaceData || !target.CommunityRating.HasValue)
@@ -991,7 +1016,7 @@ namespace MediaBrowser.Providers.Manager
                 {
                     targetResult.People = sourceResult.People;
                 }
-                else if (sourceResult.People is not null && sourceResult.People.Count >= 0)
+                else if (targetResult.People is not null && sourceResult.People is not null)
                 {
                     MergePeople(sourceResult.People, targetResult.People);
                 }
@@ -1024,10 +1049,6 @@ namespace MediaBrowser.Providers.Manager
                 {
                     target.Studios = source.Studios;
                 }
-                else
-                {
-                    target.Studios = target.Studios.Concat(source.Studios).Distinct().ToArray();
-                }
             }
 
             if (!lockedFields.Contains(MetadataField.Tags))
@@ -1036,10 +1057,6 @@ namespace MediaBrowser.Providers.Manager
                 {
                     target.Tags = source.Tags;
                 }
-                else
-                {
-                    target.Tags = target.Tags.Concat(source.Tags).Distinct().ToArray();
-                }
             }
 
             if (!lockedFields.Contains(MetadataField.ProductionLocations))
@@ -1048,10 +1065,6 @@ namespace MediaBrowser.Providers.Manager
                 {
                     target.ProductionLocations = source.ProductionLocations;
                 }
-                else
-                {
-                    target.Tags = target.ProductionLocations.Concat(source.ProductionLocations).Distinct().ToArray();
-                }
             }
 
             foreach (var id in source.ProviderIds)
@@ -1069,28 +1082,17 @@ namespace MediaBrowser.Providers.Manager
                 }
             }
 
-            if (replaceData || !target.CriticRating.HasValue)
-            {
-                target.CriticRating = source.CriticRating;
-            }
-
-            if (replaceData || target.RemoteTrailers.Count == 0)
-            {
-                target.RemoteTrailers = source.RemoteTrailers;
-            }
-            else
-            {
-                target.RemoteTrailers = target.RemoteTrailers.Concat(source.RemoteTrailers).Distinct().ToArray();
-            }
-
             MergeAlbumArtist(source, target, replaceData);
+            MergeCriticRating(source, target, replaceData);
+            MergeTrailers(source, target, replaceData);
             MergeVideoInfo(source, target, replaceData);
             MergeDisplayOrder(source, target, replaceData);
 
             if (replaceData || string.IsNullOrEmpty(target.ForcedSortName))
             {
                 var forcedSortName = source.ForcedSortName;
-                if (!string.IsNullOrEmpty(forcedSortName))
+
+                if (!string.IsNullOrWhiteSpace(forcedSortName))
                 {
                     target.ForcedSortName = forcedSortName;
                 }
@@ -1098,44 +1100,22 @@ namespace MediaBrowser.Providers.Manager
 
             if (mergeMetadataSettings)
             {
-                if (replaceData || !target.IsLocked)
+                target.LockedFields = source.LockedFields;
-                {
+                target.IsLocked = source.IsLocked;
-                    target.IsLocked = target.IsLocked || source.IsLocked;
-                }
-
-                if (target.LockedFields.Length == 0)
-                {
-                    target.LockedFields = source.LockedFields;
-                }
-                else
-                {
-                    target.LockedFields = target.LockedFields.Concat(source.LockedFields).Distinct().ToArray();
-                }
 
+                // Grab the value if it's there, but if not then don't overwrite with the default
                 if (source.DateCreated != default)
                 {
                     target.DateCreated = source.DateCreated;
                 }
 
-                if (replaceData || string.IsNullOrEmpty(target.PreferredMetadataCountryCode))
+                target.PreferredMetadataCountryCode = source.PreferredMetadataCountryCode;
-                {
+                target.PreferredMetadataLanguage = source.PreferredMetadataLanguage;
-                    target.PreferredMetadataCountryCode = source.PreferredMetadataCountryCode;
-                }
-
-                if (replaceData || string.IsNullOrEmpty(target.PreferredMetadataLanguage))
-                {
-                    target.PreferredMetadataLanguage = source.PreferredMetadataLanguage;
-                }
             }
         }
 
         private static void MergePeople(List<PersonInfo> source, List<PersonInfo> target)
         {
-            if (target is null)
-            {
-                target = new List<PersonInfo>();
-            }
-
             foreach (var person in target)
             {
                 var normalizedName = person.Name.RemoveDiacritics();
@@ -1164,6 +1144,7 @@ namespace MediaBrowser.Providers.Manager
                 if (replaceData || string.IsNullOrEmpty(targetHasDisplayOrder.DisplayOrder))
                 {
                     var displayOrder = sourceHasDisplayOrder.DisplayOrder;
+
                     if (!string.IsNullOrWhiteSpace(displayOrder))
                     {
                         targetHasDisplayOrder.DisplayOrder = displayOrder;
@@ -1181,10 +1162,22 @@ namespace MediaBrowser.Providers.Manager
                 {
                     targetHasAlbumArtist.AlbumArtists = sourceHasAlbumArtist.AlbumArtists;
                 }
-                else if (sourceHasAlbumArtist.AlbumArtists.Count >= 0)
+            }
-                {
+        }
-                    targetHasAlbumArtist.AlbumArtists = targetHasAlbumArtist.AlbumArtists.Concat(sourceHasAlbumArtist.AlbumArtists).Distinct().ToArray();
+
-                }
+        private static void MergeCriticRating(BaseItem source, BaseItem target, bool replaceData)
+        {
+            if (replaceData || !target.CriticRating.HasValue)
+            {
+                target.CriticRating = source.CriticRating;
+            }
+        }
+
+        private static void MergeTrailers(BaseItem source, BaseItem target, bool replaceData)
+        {
+            if (replaceData || target.RemoteTrailers.Count == 0)
+            {
+                target.RemoteTrailers = source.RemoteTrailers;
             }
         }
 
@@ -1192,7 +1185,7 @@ namespace MediaBrowser.Providers.Manager
         {
             if (source is Video sourceCast && target is Video targetCast)
             {
-                if (replaceData || !targetCast.Video3DFormat.HasValue)
+                if (replaceData || targetCast.Video3DFormat is null)
                 {
                     targetCast.Video3DFormat = sourceCast.Video3DFormat;
                 }

MediaBrowser.Providers/MediaInfo/AudioFileProber.cs

@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Globalization;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
@@ -16,7 +15,6 @@ using MediaBrowser.Model.Dlna;
 using MediaBrowser.Model.Dto;
 using MediaBrowser.Model.Entities;
 using MediaBrowser.Model.MediaInfo;
-using Microsoft.Extensions.Logging;
 using TagLib;
 
 namespace MediaBrowser.Providers.MediaInfo
@@ -29,7 +27,6 @@ namespace MediaBrowser.Providers.MediaInfo
         private readonly IMediaEncoder _mediaEncoder;
         private readonly IItemRepository _itemRepo;
         private readonly ILibraryManager _libraryManager;
-        private readonly ILogger<AudioFileProber> _logger;
         private readonly IMediaSourceManager _mediaSourceManager;
         private readonly LyricResolver _lyricResolver;
         private readonly ILyricManager _lyricManager;
@@ -37,7 +34,6 @@ namespace MediaBrowser.Providers.MediaInfo
         /// <summary>
         /// Initializes a new instance of the <see cref="AudioFileProber"/> class.
         /// </summary>
-        /// <param name="logger">Instance of the <see cref="ILogger"/> interface.</param>
         /// <param name="mediaSourceManager">Instance of the <see cref="IMediaSourceManager"/> interface.</param>
         /// <param name="mediaEncoder">Instance of the <see cref="IMediaEncoder"/> interface.</param>
         /// <param name="itemRepo">Instance of the <see cref="IItemRepository"/> interface.</param>
@@ -45,7 +41,6 @@ namespace MediaBrowser.Providers.MediaInfo
         /// <param name="lyricResolver">Instance of the <see cref="LyricResolver"/> interface.</param>
         /// <param name="lyricManager">Instance of the <see cref="ILyricManager"/> interface.</param>
         public AudioFileProber(
-            ILogger<AudioFileProber> logger,
             IMediaSourceManager mediaSourceManager,
             IMediaEncoder mediaEncoder,
             IItemRepository itemRepo,
@@ -56,7 +51,6 @@ namespace MediaBrowser.Providers.MediaInfo
             _mediaEncoder = mediaEncoder;
             _itemRepo = itemRepo;
             _libraryManager = libraryManager;
-            _logger = logger;
             _mediaSourceManager = mediaSourceManager;
             _lyricResolver = lyricResolver;
             _lyricManager = lyricManager;
@@ -152,212 +146,191 @@ namespace MediaBrowser.Providers.MediaInfo
         /// <param name="tryExtractEmbeddedLyrics">Whether to extract embedded lyrics to lrc file. </param>
         private async Task FetchDataFromTags(Audio audio, Model.MediaInfo.MediaInfo mediaInfo, MetadataRefreshOptions options, bool tryExtractEmbeddedLyrics)
         {
+            using var file = TagLib.File.Create(audio.Path);
+            var tagTypes = file.TagTypesOnDisk;
             Tag? tags = null;
-            try
-            {
-                using var file = TagLib.File.Create(audio.Path);
-                var tagTypes = file.TagTypesOnDisk;
 
-                if (tagTypes.HasFlag(TagTypes.Id3v2))
+            if (tagTypes.HasFlag(TagTypes.Id3v2))
-                {
-                    tags = file.GetTag(TagTypes.Id3v2);
-                }
-                else if (tagTypes.HasFlag(TagTypes.Ape))
-                {
-                    tags = file.GetTag(TagTypes.Ape);
-                }
-                else if (tagTypes.HasFlag(TagTypes.FlacMetadata))
-                {
-                    tags = file.GetTag(TagTypes.FlacMetadata);
-                }
-                else if (tagTypes.HasFlag(TagTypes.Apple))
-                {
-                    tags = file.GetTag(TagTypes.Apple);
-                }
-                else if (tagTypes.HasFlag(TagTypes.Xiph))
-                {
-                    tags = file.GetTag(TagTypes.Xiph);
-                }
-                else if (tagTypes.HasFlag(TagTypes.AudibleMetadata))
-                {
-                    tags = file.GetTag(TagTypes.AudibleMetadata);
-                }
-                else if (tagTypes.HasFlag(TagTypes.Id3v1))
-                {
-                    tags = file.GetTag(TagTypes.Id3v1);
-                }
-            }
-            catch (Exception e)
             {
-                _logger.LogWarning(e, "TagLib-Sharp does not support this audio");
+                tags = file.GetTag(TagTypes.Id3v2);
+            }
+            else if (tagTypes.HasFlag(TagTypes.Ape))
+            {
+                tags = file.GetTag(TagTypes.Ape);
+            }
+            else if (tagTypes.HasFlag(TagTypes.FlacMetadata))
+            {
+                tags = file.GetTag(TagTypes.FlacMetadata);
+            }
+            else if (tagTypes.HasFlag(TagTypes.Apple))
+            {
+                tags = file.GetTag(TagTypes.Apple);
+            }
+            else if (tagTypes.HasFlag(TagTypes.Xiph))
+            {
+                tags = file.GetTag(TagTypes.Xiph);
+            }
+            else if (tagTypes.HasFlag(TagTypes.AudibleMetadata))
+            {
+                tags = file.GetTag(TagTypes.AudibleMetadata);
+            }
+            else if (tagTypes.HasFlag(TagTypes.Id3v1))
+            {
+                tags = file.GetTag(TagTypes.Id3v1);
             }
 
-            tags ??= new TagLib.Id3v2.Tag();
+            if (tags is not null)
-            tags.AlbumArtists ??= mediaInfo.AlbumArtists;
-            tags.Album ??= mediaInfo.Album;
-            tags.Title ??= mediaInfo.Name;
-            tags.Year = tags.Year == 0U ? Convert.ToUInt32(mediaInfo.ProductionYear, CultureInfo.InvariantCulture) : tags.Year;
-            tags.Performers ??= mediaInfo.Artists;
-            tags.Genres ??= mediaInfo.Genres;
-            tags.Track = tags.Track == 0U ? Convert.ToUInt32(mediaInfo.IndexNumber, CultureInfo.InvariantCulture) : tags.Track;
-            tags.Disc = tags.Disc == 0U ? Convert.ToUInt32(mediaInfo.ParentIndexNumber, CultureInfo.InvariantCulture) : tags.Disc;
-
-            if (audio.SupportsPeople && !audio.LockedFields.Contains(MetadataField.Cast))
             {
-                var people = new List<PersonInfo>();
+                if (audio.SupportsPeople && !audio.LockedFields.Contains(MetadataField.Cast))
-                var albumArtists = tags.AlbumArtists;
-                foreach (var albumArtist in albumArtists)
                 {
-                    if (!string.IsNullOrEmpty(albumArtist))
+                    var people = new List<PersonInfo>();
+                    var albumArtists = tags.AlbumArtists;
+                    foreach (var albumArtist in albumArtists)
                     {
-                        PeopleHelper.AddPerson(people, new PersonInfo
+                        if (!string.IsNullOrEmpty(albumArtist))
                         {
-                            Name = albumArtist,
+                            PeopleHelper.AddPerson(people, new PersonInfo
-                            Type = PersonKind.AlbumArtist
+                            {
-                        });
+                                Name = albumArtist,
+                                Type = PersonKind.AlbumArtist
+                            });
+                        }
+                    }
+
+                    var performers = tags.Performers;
+                    foreach (var performer in performers)
+                    {
+                        if (!string.IsNullOrEmpty(performer))
+                        {
+                            PeopleHelper.AddPerson(people, new PersonInfo
+                            {
+                                Name = performer,
+                                Type = PersonKind.Artist
+                            });
+                        }
+                    }
+
+                    foreach (var composer in tags.Composers)
+                    {
+                        if (!string.IsNullOrEmpty(composer))
+                        {
+                            PeopleHelper.AddPerson(people, new PersonInfo
+                            {
+                                Name = composer,
+                                Type = PersonKind.Composer
+                            });
+                        }
+                    }
+
+                    _libraryManager.UpdatePeople(audio, people);
+
+                    if (options.ReplaceAllMetadata && performers.Length != 0)
+                    {
+                        audio.Artists = performers;
+                    }
+                    else if (!options.ReplaceAllMetadata
+                             && (audio.Artists is null || audio.Artists.Count == 0))
+                    {
+                        audio.Artists = performers;
+                    }
+
+                    if (albumArtists.Length == 0)
+                    {
+                        // Album artists not provided, fall back to performers (artists).
+                        albumArtists = performers;
+                    }
+
+                    if (options.ReplaceAllMetadata && albumArtists.Length != 0)
+                    {
+                        audio.AlbumArtists = albumArtists;
+                    }
+                    else if (!options.ReplaceAllMetadata
+                             && (audio.AlbumArtists is null || audio.AlbumArtists.Count == 0))
+                    {
+                        audio.AlbumArtists = albumArtists;
                     }
                 }
 
-                var performers = tags.Performers;
+                if (!audio.LockedFields.Contains(MetadataField.Name) && !string.IsNullOrEmpty(tags.Title))
-                foreach (var performer in performers)
                 {
-                    if (!string.IsNullOrEmpty(performer))
+                    audio.Name = tags.Title;
-                    {
-                        PeopleHelper.AddPerson(people, new PersonInfo
-                        {
-                            Name = performer,
-                            Type = PersonKind.Artist
-                        });
-                    }
                 }
 
-                foreach (var composer in tags.Composers)
+                if (options.ReplaceAllMetadata)
                 {
-                    if (!string.IsNullOrEmpty(composer))
+                    audio.Album = tags.Album;
-                    {
+                    audio.IndexNumber = Convert.ToInt32(tags.Track);
-                        PeopleHelper.AddPerson(people, new PersonInfo
+                    audio.ParentIndexNumber = Convert.ToInt32(tags.Disc);
-                        {
+                }
-                            Name = composer,
+                else
-                            Type = PersonKind.Composer
+                {
-                        });
+                    audio.Album ??= tags.Album;
-                    }
+                    audio.IndexNumber ??= Convert.ToInt32(tags.Track);
+                    audio.ParentIndexNumber ??= Convert.ToInt32(tags.Disc);
                 }
 
-                _libraryManager.UpdatePeople(audio, people);
+                if (tags.Year != 0)
-
-                if (options.ReplaceAllMetadata && performers.Length != 0)
                 {
-                    audio.Artists = performers;
+                    var year = Convert.ToInt32(tags.Year);
-                }
+                    audio.ProductionYear = year;
-                else if (!options.ReplaceAllMetadata
-                         && (audio.Artists is null || audio.Artists.Count == 0))
-                {
-                    audio.Artists = performers;
-                }
 
-                if (albumArtists.Length == 0)
+                    if (!audio.PremiereDate.HasValue)
-                {
-                    // Album artists not provided, fall back to performers (artists).
-                    albumArtists = performers;
-                }
-
-                if (options.ReplaceAllMetadata && albumArtists.Length != 0)
-                {
-                    audio.AlbumArtists = albumArtists;
-                }
-                else if (!options.ReplaceAllMetadata
-                         && (audio.AlbumArtists is null || audio.AlbumArtists.Count == 0))
-                {
-                    audio.AlbumArtists = albumArtists;
-                }
-            }
-
-            if (!audio.LockedFields.Contains(MetadataField.Name) && !string.IsNullOrEmpty(tags.Title))
-            {
-                audio.Name = tags.Title;
-            }
-
-            if (options.ReplaceAllMetadata)
-            {
-                audio.Album = tags.Album;
-                audio.IndexNumber = Convert.ToInt32(tags.Track);
-                audio.ParentIndexNumber = Convert.ToInt32(tags.Disc);
-            }
-            else
-            {
-                audio.Album ??= tags.Album;
-                audio.IndexNumber ??= Convert.ToInt32(tags.Track);
-                audio.ParentIndexNumber ??= Convert.ToInt32(tags.Disc);
-            }
-
-            if (tags.Year != 0)
-            {
-                var year = Convert.ToInt32(tags.Year);
-                audio.ProductionYear = year;
-
-                if (!audio.PremiereDate.HasValue)
-                {
-                    try
                     {
                         audio.PremiereDate = new DateTime(year, 01, 01);
                     }
-                    catch (ArgumentOutOfRangeException ex)
+                }
+
+                if (!audio.LockedFields.Contains(MetadataField.Genres))
+                {
+                    audio.Genres = options.ReplaceAllMetadata || audio.Genres == null || audio.Genres.Length == 0
+                        ? tags.Genres.Distinct(StringComparer.OrdinalIgnoreCase).ToArray()
+                        : audio.Genres;
+                }
+
+                if (!double.IsNaN(tags.ReplayGainTrackGain))
+                {
+                    audio.NormalizationGain = (float)tags.ReplayGainTrackGain;
+                }
+
+                if (options.ReplaceAllMetadata || !audio.TryGetProviderId(MetadataProvider.MusicBrainzArtist, out _))
+                {
+                    audio.SetProviderId(MetadataProvider.MusicBrainzArtist, tags.MusicBrainzArtistId);
+                }
+
+                if (options.ReplaceAllMetadata || !audio.TryGetProviderId(MetadataProvider.MusicBrainzAlbumArtist, out _))
+                {
+                    audio.SetProviderId(MetadataProvider.MusicBrainzAlbumArtist, tags.MusicBrainzReleaseArtistId);
+                }
+
+                if (options.ReplaceAllMetadata || !audio.TryGetProviderId(MetadataProvider.MusicBrainzAlbum, out _))
+                {
+                    audio.SetProviderId(MetadataProvider.MusicBrainzAlbum, tags.MusicBrainzReleaseId);
+                }
+
+                if (options.ReplaceAllMetadata || !audio.TryGetProviderId(MetadataProvider.MusicBrainzReleaseGroup, out _))
+                {
+                    audio.SetProviderId(MetadataProvider.MusicBrainzReleaseGroup, tags.MusicBrainzReleaseGroupId);
+                }
+
+                if (options.ReplaceAllMetadata || !audio.TryGetProviderId(MetadataProvider.MusicBrainzTrack, out _))
+                {
+                    // Fallback to ffprobe as TagLib incorrectly provides recording MBID in `tags.MusicBrainzTrackId`.
+                    // See https://github.com/mono/taglib-sharp/issues/304
+                    var trackMbId = mediaInfo.GetProviderId(MetadataProvider.MusicBrainzTrack);
+                    if (trackMbId is not null)
                     {
-                        _logger.LogError(ex, "Error parsing YEAR tag in {File}. '{TagValue}' is an invalid year", audio.Path, tags.Year);
+                        audio.SetProviderId(MetadataProvider.MusicBrainzTrack, trackMbId);
                     }
                 }
-            }
 
-            if (!audio.LockedFields.Contains(MetadataField.Genres))
+                // Save extracted lyrics if they exist,
-            {
+                // and if the audio doesn't yet have lyrics.
-                audio.Genres = options.ReplaceAllMetadata || audio.Genres == null || audio.Genres.Length == 0
+                if (!string.IsNullOrWhiteSpace(tags.Lyrics)
-                    ? tags.Genres.Distinct(StringComparer.OrdinalIgnoreCase).ToArray()
+                    && tryExtractEmbeddedLyrics)
-                    : audio.Genres;
-            }
-
-            if (!double.IsNaN(tags.ReplayGainTrackGain))
-            {
-                audio.NormalizationGain = (float)tags.ReplayGainTrackGain;
-            }
-
-            if (options.ReplaceAllMetadata || !audio.TryGetProviderId(MetadataProvider.MusicBrainzArtist, out _))
-            {
-                audio.SetProviderId(MetadataProvider.MusicBrainzArtist, tags.MusicBrainzArtistId);
-            }
-
-            if (options.ReplaceAllMetadata || !audio.TryGetProviderId(MetadataProvider.MusicBrainzAlbumArtist, out _))
-            {
-                audio.SetProviderId(MetadataProvider.MusicBrainzAlbumArtist, tags.MusicBrainzReleaseArtistId);
-            }
-
-            if (options.ReplaceAllMetadata || !audio.TryGetProviderId(MetadataProvider.MusicBrainzAlbum, out _))
-            {
-                audio.SetProviderId(MetadataProvider.MusicBrainzAlbum, tags.MusicBrainzReleaseId);
-            }
-
-            if (options.ReplaceAllMetadata || !audio.TryGetProviderId(MetadataProvider.MusicBrainzReleaseGroup, out _))
-            {
-                audio.SetProviderId(MetadataProvider.MusicBrainzReleaseGroup, tags.MusicBrainzReleaseGroupId);
-            }
-
-            if (options.ReplaceAllMetadata || !audio.TryGetProviderId(MetadataProvider.MusicBrainzTrack, out _))
-            {
-                // Fallback to ffprobe as TagLib incorrectly provides recording MBID in `tags.MusicBrainzTrackId`.
-                // See https://github.com/mono/taglib-sharp/issues/304
-                var trackMbId = mediaInfo.GetProviderId(MetadataProvider.MusicBrainzTrack);
-                if (trackMbId is not null)
                 {
-                    audio.SetProviderId(MetadataProvider.MusicBrainzTrack, trackMbId);
+                    await _lyricManager.SaveLyricAsync(audio, "lrc", tags.Lyrics).ConfigureAwait(false);
                 }
             }
-
-            // Save extracted lyrics if they exist,
-            // and if the audio doesn't yet have lyrics.
-            if (!string.IsNullOrWhiteSpace(tags.Lyrics)
-                && tryExtractEmbeddedLyrics)
-            {
-                await _lyricManager.SaveLyricAsync(audio, "lrc", tags.Lyrics).ConfigureAwait(false);
-            }
         }
 
         private void AddExternalLyrics(

MediaBrowser.Providers/MediaInfo/ProbeProvider.cs

@@ -1,7 +1,6 @@
 #nullable disable
 
 using System;
-using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Threading;
@@ -104,7 +103,6 @@ namespace MediaBrowser.Providers.MediaInfo
                 _subtitleResolver);
 
             _audioProber = new AudioFileProber(
-                loggerFactory.CreateLogger<AudioFileProber>(),
                 mediaSourceManager,
                 mediaEncoder,
                 itemRepo,
@@ -142,15 +140,19 @@ namespace MediaBrowser.Providers.MediaInfo
                 && item.SupportsLocalMetadata
                 && !video.IsPlaceHolder)
             {
-                var externalFiles = new HashSet<string>(_subtitleResolver.GetExternalFiles(video, directoryService, false).Select(info => info.Path), StringComparer.OrdinalIgnoreCase);
+                if (!video.SubtitleFiles.SequenceEqual(
-                if (!new HashSet<string>(video.SubtitleFiles, StringComparer.Ordinal).SetEquals(externalFiles))
+                        _subtitleResolver.GetExternalFiles(video, directoryService, false)
+                            .Select(info => info.Path).ToList(),
+                        StringComparer.Ordinal))
                 {
                     _logger.LogDebug("Refreshing {ItemPath} due to external subtitles change.", item.Path);
                     return true;
                 }
 
-                externalFiles = new HashSet<string>(_audioResolver.GetExternalFiles(video, directoryService, false).Select(info => info.Path), StringComparer.OrdinalIgnoreCase);
+                if (!video.AudioFiles.SequenceEqual(
-                if (!new HashSet<string>(video.AudioFiles, StringComparer.Ordinal).SetEquals(externalFiles))
+                        _audioResolver.GetExternalFiles(video, directoryService, false)
+                            .Select(info => info.Path).ToList(),
+                        StringComparer.Ordinal))
                 {
                     _logger.LogDebug("Refreshing {ItemPath} due to external audio change.", item.Path);
                     return true;
@@ -158,14 +160,14 @@ namespace MediaBrowser.Providers.MediaInfo
             }
 
             if (item is Audio audio
-                && item.SupportsLocalMetadata)
+                && item.SupportsLocalMetadata
+                && !audio.LyricFiles.SequenceEqual(
+                    _lyricResolver.GetExternalFiles(audio, directoryService, false)
+                        .Select(info => info.Path).ToList(),
+                    StringComparer.Ordinal))
             {
-                var externalFiles = new HashSet<string>(_lyricResolver.GetExternalFiles(audio, directoryService, false).Select(info => info.Path), StringComparer.OrdinalIgnoreCase);
+                _logger.LogDebug("Refreshing {ItemPath} due to external lyrics change.", item.Path);
-                if (!new HashSet<string>(audio.LyricFiles, StringComparer.Ordinal).SetEquals(externalFiles))
+                return true;
-                {
-                    _logger.LogDebug("Refreshing {ItemPath} due to external lyrics change.", item.Path);
-                    return true;
-                }
             }
 
             return false;

MediaBrowser.Providers/Movies/MovieMetadataService.cs

@@ -23,6 +23,22 @@ namespace MediaBrowser.Providers.Movies
         {
         }
 
+        /// <inheritdoc />
+        protected override bool IsFullLocalMetadata(Movie item)
+        {
+            if (string.IsNullOrWhiteSpace(item.Overview))
+            {
+                return false;
+            }
+
+            if (!item.ProductionYear.HasValue)
+            {
+                return false;
+            }
+
+            return base.IsFullLocalMetadata(item);
+        }
+
         /// <inheritdoc />
         protected override void MergeData(MetadataResult<Movie> source, MetadataResult<Movie> target, MetadataField[] lockedFields, bool replaceData, bool mergeMetadataSettings)
         {

MediaBrowser.Providers/Movies/TrailerMetadataService.cs

@@ -1,6 +1,5 @@
 #pragma warning disable CS1591
 
-using System.Linq;
 using MediaBrowser.Controller.Configuration;
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Library;
@@ -24,6 +23,22 @@ namespace MediaBrowser.Providers.Movies
         {
         }
 
+        /// <inheritdoc />
+        protected override bool IsFullLocalMetadata(Trailer item)
+        {
+            if (string.IsNullOrWhiteSpace(item.Overview))
+            {
+                return false;
+            }
+
+            if (!item.ProductionYear.HasValue)
+            {
+                return false;
+            }
+
+            return base.IsFullLocalMetadata(item);
+        }
+
         /// <inheritdoc />
         protected override void MergeData(MetadataResult<Trailer> source, MetadataResult<Trailer> target, MetadataField[] lockedFields, bool replaceData, bool mergeMetadataSettings)
         {
@@ -33,10 +48,6 @@ namespace MediaBrowser.Providers.Movies
             {
                 target.Item.TrailerTypes = source.Item.TrailerTypes;
             }
-            else
-            {
-                target.Item.TrailerTypes = target.Item.TrailerTypes.Concat(source.Item.TrailerTypes).Distinct().ToArray();
-            }
         }
     }
 }

MediaBrowser.Providers/Music/AlbumMetadataService.cs

@@ -225,10 +225,6 @@ namespace MediaBrowser.Providers.Music
             {
                 targetItem.Artists = sourceItem.Artists;
             }
-            else
-            {
-                targetItem.Artists = targetItem.Artists.Concat(sourceItem.Artists).Distinct().ToArray();
-            }
 
             if (replaceData || string.IsNullOrEmpty(targetItem.GetProviderId(MetadataProvider.MusicBrainzAlbumArtist)))
             {

MediaBrowser.Providers/Music/AudioMetadataService.cs

@@ -1,5 +1,4 @@
 using System;
-using System.Linq;
 using MediaBrowser.Controller.Configuration;
 using MediaBrowser.Controller.Entities.Audio;
 using MediaBrowser.Controller.Library;
@@ -61,10 +60,6 @@ namespace MediaBrowser.Providers.Music
             {
                 targetItem.Artists = sourceItem.Artists;
             }
-            else
-            {
-                targetItem.Artists = targetItem.Artists.Concat(sourceItem.Artists).Distinct().ToArray();
-            }
 
             if (replaceData || string.IsNullOrEmpty(targetItem.Album))
             {

MediaBrowser.Providers/Music/MusicVideoMetadataService.cs

@@ -1,6 +1,5 @@
 #pragma warning disable CS1591
 
-using System.Linq;
 using MediaBrowser.Controller.Configuration;
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Library;
@@ -46,10 +45,6 @@ namespace MediaBrowser.Providers.Music
             {
                 targetItem.Artists = sourceItem.Artists;
             }
-            else
-            {
-                targetItem.Artists = targetItem.Artists.Concat(sourceItem.Artists).Distinct().ToArray();
-            }
         }
     }
 }

MediaBrowser.Providers/Playlists/PlaylistItemsProvider.cs

@@ -8,13 +8,11 @@ using System.IO;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
-using Jellyfin.Data.Enums;
 using Jellyfin.Extensions;
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Library;
 using MediaBrowser.Controller.Playlists;
 using MediaBrowser.Controller.Providers;
-using MediaBrowser.Model.IO;
 using Microsoft.Extensions.Logging;
 using PlaylistsNET.Content;
 
@@ -26,16 +24,11 @@ namespace MediaBrowser.Providers.Playlists
         IPreRefreshProvider,
         IHasItemChangeMonitor
     {
-        private readonly IFileSystem _fileSystem;
-        private readonly ILibraryManager _libraryManager;
         private readonly ILogger<PlaylistItemsProvider> _logger;
-        private readonly CollectionType[] _ignoredCollections = [CollectionType.livetv, CollectionType.boxsets, CollectionType.playlists];
 
-        public PlaylistItemsProvider(ILogger<PlaylistItemsProvider> logger, ILibraryManager libraryManager, IFileSystem fileSystem)
+        public PlaylistItemsProvider(ILogger<PlaylistItemsProvider> logger)
         {
             _logger = logger;
-            _libraryManager = libraryManager;
-            _fileSystem = fileSystem;
         }
 
         public string Name => "Playlist Reader";
@@ -61,122 +54,114 @@ namespace MediaBrowser.Providers.Playlists
 
             item.LinkedChildren = items;
 
-            return Task.FromResult(ItemUpdateType.MetadataImport);
+            return Task.FromResult(ItemUpdateType.None);
         }
 
         private IEnumerable<LinkedChild> GetItems(string path, string extension)
         {
-            var libraryRoots = _libraryManager.GetUserRootFolder().Children
-                                .OfType<CollectionFolder>()
-                                .Where(f => f.CollectionType.HasValue && !_ignoredCollections.Contains(f.CollectionType.Value))
-                                .SelectMany(f => f.PhysicalLocations)
-                                .Distinct(StringComparer.OrdinalIgnoreCase)
-                                .ToList();
-
             using (var stream = File.OpenRead(path))
             {
                 if (string.Equals(".wpl", extension, StringComparison.OrdinalIgnoreCase))
                 {
-                    return GetWplItems(stream, path, libraryRoots);
+                    return GetWplItems(stream, path);
                 }
 
                 if (string.Equals(".zpl", extension, StringComparison.OrdinalIgnoreCase))
                 {
-                    return GetZplItems(stream, path, libraryRoots);
+                    return GetZplItems(stream, path);
                 }
 
                 if (string.Equals(".m3u", extension, StringComparison.OrdinalIgnoreCase))
                 {
-                    return GetM3uItems(stream, path, libraryRoots);
+                    return GetM3uItems(stream, path);
                 }
 
                 if (string.Equals(".m3u8", extension, StringComparison.OrdinalIgnoreCase))
                 {
-                    return GetM3uItems(stream, path, libraryRoots);
+                    return GetM3u8Items(stream, path);
                 }
 
                 if (string.Equals(".pls", extension, StringComparison.OrdinalIgnoreCase))
                 {
-                    return GetPlsItems(stream, path, libraryRoots);
+                    return GetPlsItems(stream, path);
                 }
             }
 
             return Enumerable.Empty<LinkedChild>();
         }
 
-        private IEnumerable<LinkedChild> GetPlsItems(Stream stream, string playlistPath, List<string> libraryRoots)
+        private IEnumerable<LinkedChild> GetPlsItems(Stream stream, string path)
         {
             var content = new PlsContent();
             var playlist = content.GetFromStream(stream);
 
-            return playlist.PlaylistEntries
+            return playlist.PlaylistEntries.Select(i => new LinkedChild
-                    .Select(i => GetLinkedChild(i.Path, playlistPath, libraryRoots))
+            {
-                    .Where(i => i is not null);
+                Path = GetPlaylistItemPath(i.Path, path),
+                Type = LinkedChildType.Manual
+            });
         }
 
-        private IEnumerable<LinkedChild> GetM3uItems(Stream stream, string playlistPath, List<string> libraryRoots)
+        private IEnumerable<LinkedChild> GetM3u8Items(Stream stream, string path)
         {
             var content = new M3uContent();
             var playlist = content.GetFromStream(stream);
 
-            return playlist.PlaylistEntries
+            return playlist.PlaylistEntries.Select(i => new LinkedChild
-                    .Select(i => GetLinkedChild(i.Path, playlistPath, libraryRoots))
+            {
-                    .Where(i => i is not null);
+                Path = GetPlaylistItemPath(i.Path, path),
+                Type = LinkedChildType.Manual
+            });
         }
 
-        private IEnumerable<LinkedChild> GetZplItems(Stream stream, string playlistPath, List<string> libraryRoots)
+        private IEnumerable<LinkedChild> GetM3uItems(Stream stream, string path)
+        {
+            var content = new M3uContent();
+            var playlist = content.GetFromStream(stream);
+
+            return playlist.PlaylistEntries.Select(i => new LinkedChild
+            {
+                Path = GetPlaylistItemPath(i.Path, path),
+                Type = LinkedChildType.Manual
+            });
+        }
+
+        private IEnumerable<LinkedChild> GetZplItems(Stream stream, string path)
         {
             var content = new ZplContent();
             var playlist = content.GetFromStream(stream);
 
-            return playlist.PlaylistEntries
+            return playlist.PlaylistEntries.Select(i => new LinkedChild
-                    .Select(i => GetLinkedChild(i.Path, playlistPath, libraryRoots))
+            {
-                    .Where(i => i is not null);
+                Path = GetPlaylistItemPath(i.Path, path),
+                Type = LinkedChildType.Manual
+            });
         }
 
-        private IEnumerable<LinkedChild> GetWplItems(Stream stream, string playlistPath, List<string> libraryRoots)
+        private IEnumerable<LinkedChild> GetWplItems(Stream stream, string path)
         {
             var content = new WplContent();
             var playlist = content.GetFromStream(stream);
 
-            return playlist.PlaylistEntries
+            return playlist.PlaylistEntries.Select(i => new LinkedChild
-                    .Select(i => GetLinkedChild(i.Path, playlistPath, libraryRoots))
+            {
-                    .Where(i => i is not null);
+                Path = GetPlaylistItemPath(i.Path, path),
+                Type = LinkedChildType.Manual
+            });
         }
 
-        private LinkedChild GetLinkedChild(string itemPath, string playlistPath, List<string> libraryRoots)
+        private string GetPlaylistItemPath(string itemPath, string containingPlaylistFolder)
         {
-            if (TryGetPlaylistItemPath(itemPath, playlistPath, libraryRoots, out var parsedPath))
+            if (!File.Exists(itemPath))
             {
-                return new LinkedChild
+                var path = Path.Combine(Path.GetDirectoryName(containingPlaylistFolder), itemPath);
+                if (File.Exists(path))
                 {
-                    Path = parsedPath,
+                    return path;
-                    Type = LinkedChildType.Manual
-                };
-            }
-
-            return null;
-        }
-
-        private bool TryGetPlaylistItemPath(string itemPath, string playlistPath, List<string> libraryPaths, out string path)
-        {
-            path = null;
-            string pathToCheck = _fileSystem.MakeAbsolutePath(Path.GetDirectoryName(playlistPath), itemPath);
-            if (!File.Exists(pathToCheck))
-            {
-                return false;
-            }
-
-            foreach (var libraryPath in libraryPaths)
-            {
-                if (pathToCheck.StartsWith(libraryPath, StringComparison.OrdinalIgnoreCase))
-                {
-                    path = pathToCheck;
-                    return true;
                 }
             }
 
-            return false;
+            return itemPath;
         }
 
         public bool HasChanged(BaseItem item, IDirectoryService directoryService)

MediaBrowser.Providers/Playlists/PlaylistMetadataService.cs

@@ -1,7 +1,6 @@
 #pragma warning disable CS1591
 
 using System.Collections.Generic;
-using System.Linq;
 using MediaBrowser.Controller.Configuration;
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Library;
@@ -50,24 +49,8 @@ namespace MediaBrowser.Providers.Playlists
             if (mergeMetadataSettings)
             {
                 targetItem.PlaylistMediaType = sourceItem.PlaylistMediaType;
-
+                targetItem.LinkedChildren = sourceItem.LinkedChildren;
-                if (replaceData || targetItem.LinkedChildren.Length == 0)
+                targetItem.Shares = sourceItem.Shares;
-                {
-                    targetItem.LinkedChildren = sourceItem.LinkedChildren;
-                }
-                else
-                {
-                    targetItem.LinkedChildren = sourceItem.LinkedChildren.Concat(targetItem.LinkedChildren).Distinct().ToArray();
-                }
-
-                if (replaceData || targetItem.Shares.Count == 0)
-                {
-                    targetItem.Shares = sourceItem.Shares;
-                }
-                else
-                {
-                    targetItem.Shares = sourceItem.Shares.Concat(targetItem.Shares).DistinctBy(s => s.UserId).ToArray();
-                }
             }
         }
     }

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

@@ -278,12 +278,17 @@ namespace MediaBrowser.Providers.Plugins.Tmdb.TV
 
             series.RunTimeTicks = seriesResult.EpisodeRunTime.Select(i => TimeSpan.FromMinutes(i).Ticks).FirstOrDefault();
 
-            if (Emby.Naming.TV.TvParserHelpers.TryParseSeriesStatus(seriesResult.Status, out var seriesStatus))
+            if (string.Equals(seriesResult.Status, "Ended", StringComparison.OrdinalIgnoreCase)
+                || string.Equals(seriesResult.Status, "Canceled", StringComparison.OrdinalIgnoreCase))
             {
-                series.Status = seriesStatus;
+                series.Status = SeriesStatus.Ended;
+                series.EndDate = seriesResult.LastAirDate;
+            }
+            else
+            {
+                series.Status = SeriesStatus.Continuing;
             }
 
-            series.EndDate = seriesResult.LastAirDate;
             series.PremiereDate = seriesResult.FirstAirDate;
 
             var ids = seriesResult.ExternalIds;

MediaBrowser.Providers/TV/SeriesMetadataService.cs

@@ -62,7 +62,23 @@ namespace MediaBrowser.Providers.TV
 
             RemoveObsoleteEpisodes(item);
             RemoveObsoleteSeasons(item);
-            await CreateSeasonsAsync(item, cancellationToken).ConfigureAwait(false);
+            await UpdateAndCreateSeasonsAsync(item, cancellationToken).ConfigureAwait(false);
+        }
+
+        /// <inheritdoc />
+        protected override bool IsFullLocalMetadata(Series item)
+        {
+            if (string.IsNullOrWhiteSpace(item.Overview))
+            {
+                return false;
+            }
+
+            if (!item.ProductionYear.HasValue)
+            {
+                return false;
+            }
+
+            return base.IsFullLocalMetadata(item);
         }
 
         /// <inheritdoc />
@@ -72,6 +88,20 @@ namespace MediaBrowser.Providers.TV
 
             var sourceItem = source.Item;
             var targetItem = target.Item;
+            var sourceSeasonNames = sourceItem.SeasonNames;
+            var targetSeasonNames = targetItem.SeasonNames;
+
+            if (replaceData || targetSeasonNames.Count == 0)
+            {
+                targetItem.SeasonNames = sourceSeasonNames;
+            }
+            else if (targetSeasonNames.Count != sourceSeasonNames.Count || !sourceSeasonNames.Keys.All(targetSeasonNames.ContainsKey))
+            {
+                foreach (var (number, name) in sourceSeasonNames)
+                {
+                    targetSeasonNames.TryAdd(number, name);
+                }
+            }
 
             if (replaceData || string.IsNullOrEmpty(targetItem.AirTime))
             {
@@ -128,7 +158,7 @@ namespace MediaBrowser.Providers.TV
 
         private void RemoveObsoleteEpisodes(Series series)
         {
-            var episodes = series.GetEpisodes(null, new DtoOptions(), true).OfType<Episode>().ToList();
+            var episodes = series.GetEpisodes(null, new DtoOptions()).OfType<Episode>().ToList();
             var numberOfEpisodes = episodes.Count;
             // TODO: O(n^2), but can it be done faster without overcomplicating it?
             for (var i = 0; i < numberOfEpisodes; i++)
@@ -184,12 +214,14 @@ namespace MediaBrowser.Providers.TV
         /// <summary>
         /// Creates seasons for all episodes if they don't exist.
         /// If no season number can be determined, a dummy season will be created.
+        /// Updates seasons names.
         /// </summary>
         /// <param name="series">The series.</param>
         /// <param name="cancellationToken">The cancellation token.</param>
         /// <returns>The async task.</returns>
-        private async Task CreateSeasonsAsync(Series series, CancellationToken cancellationToken)
+        private async Task UpdateAndCreateSeasonsAsync(Series series, CancellationToken cancellationToken)
         {
+            var seasonNames = series.SeasonNames;
             var seriesChildren = series.GetRecursiveChildren(i => i is Episode || i is Season);
             var seasons = seriesChildren.OfType<Season>().ToList();
             var uniqueSeasonNumbers = seriesChildren
@@ -201,12 +233,23 @@ namespace MediaBrowser.Providers.TV
             foreach (var seasonNumber in uniqueSeasonNumbers)
             {
                 // Null season numbers will have a 'dummy' season created because seasons are always required.
-                if (!seasons.Any(i => i.IndexNumber == seasonNumber))
+                var existingSeason = seasons.FirstOrDefault(i => i.IndexNumber == seasonNumber);
+
+                if (!seasonNumber.HasValue || !seasonNames.TryGetValue(seasonNumber.Value, out var seasonName))
+                {
+                    seasonName = GetValidSeasonNameForSeries(series, null, seasonNumber);
+                }
+
+                if (existingSeason is null)
                 {
-                    var seasonName = GetValidSeasonNameForSeries(series, null, seasonNumber);
                     var season = await CreateSeasonAsync(series, seasonName, seasonNumber, cancellationToken).ConfigureAwait(false);
                     series.AddChild(season);
                 }
+                else if (!string.Equals(existingSeason.Name, seasonName, StringComparison.Ordinal))
+                {
+                    existingSeason.Name = seasonName;
+                    await existingSeason.UpdateToRepositoryAsync(ItemUpdateType.MetadataEdit, cancellationToken).ConfigureAwait(false);
+                }
             }
         }
 

MediaBrowser.Providers/Trickplay/TrickplayProvider.cs

@@ -101,7 +101,7 @@ public class TrickplayProvider : ICustomMetadataProvider<Episode>,
         bool? enableDuringScan = libraryOptions?.ExtractTrickplayImagesDuringLibraryScan;
         bool replace = options.ReplaceAllImages;
 
-        if (!enableDuringScan.GetValueOrDefault(false))
+        if (options.IsAutomated && !enableDuringScan.GetValueOrDefault(false))
         {
             return ItemUpdateType.None;
         }