Implement caching for OpenAPI document

2025-12-14 13:03:00 +03:00 · 2025-11-30 09:04:40 -07:00
50 changed files with 338 additions and 990 deletions
--- a/.github/ISSUE_TEMPLATE/issue
+++ b/.github/ISSUE_TEMPLATE/issue
@@ -87,7 +87,6 @@ body:
      label: Jellyfin Server version
      description: What version of Jellyfin are you using?
      options:
-        - 10.11.4
        - 10.11.3
        - 10.11.2
        - 10.11.1
@@ -140,14 +139,13 @@ body:
        - **FFmpeg Version**: [e.g. 5.1.2-Jellyfin]
        - **Playback**: [Direct Play, Remux, Direct Stream, Transcode]
        - **Hardware Acceleration**: [e.g. none, VAAPI, NVENC, etc.]
-        - **CPU Model**: [e.g. AMD Ryzen 5 9600X, Intel Core i7-8565U, etc.]
        - **GPU Model**: [e.g. none, UHD630, GTX1050, etc.]
        - **Installed Plugins**: [e.g. none, Fanart, Anime, etc.]
        - **Reverse Proxy**: [e.g. none, nginx, apache, etc.]
        - **Base URL**: [e.g. none, yes: /example]
        - **Networking**: [e.g. Host, Bridge/NAT]
-        - **Jellyfin Data Storage & Filesystem**: [e.g. local SATA SSD - ext4, local HDD - NTFS]
-        - **Media Storage & Filesystem**: [e.g. Local HDD - ext4, SMB Share]
+        - **Jellyfin Data Storage**: [e.g. local SATA SSD, local HDD]
+        - **Media Storage**: [e.g. Local HDD, SMB Share]
        - **External Integrations**: [e.g. Jellystat, Jellyseerr]
      value: |
        - OS:
@@ -158,14 +156,13 @@ body:
        - FFmpeg Version:
        - Playback Method:
        - Hardware Acceleration:
-        - CPU Model:
        - GPU Model:
        - Plugins:
        - Reverse Proxy:
        - Base URL:
        - Networking:
-        - Jellyfin Data Storage & Filesystem:
-        - Media Storage & Filesystem:
+        - Jellyfin Data Storage:
+        - Media Storage:
        - External Integrations:
      render: markdown
    validations:
--- a/.github/workflows/ci-codeql-analysis.yml
+++ b/.github/workflows/ci-codeql-analysis.yml
@@ -20,18 +20,18 @@ jobs:

    steps:
    - name: Checkout repository
-      uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+      uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
    - name: Setup .NET
      uses: actions/setup-dotnet@2016bd2012dba4e32de620c46fe006a3ac9f0602 # v5.0.1
      with:
        dotnet-version: '9.0.x'

    - name: Initialize CodeQL
-      uses: github/codeql-action/init@1b168cd39490f61582a9beae412bb7057a6b2c4e # v4.31.8
+      uses: github/codeql-action/init@fdbfb4d2750291e159f0156def62b853c2798ca2 # v4.31.5
      with:
        languages: ${{ matrix.language }}
        queries: +security-extended
    - name: Autobuild
-      uses: github/codeql-action/autobuild@1b168cd39490f61582a9beae412bb7057a6b2c4e # v4.31.8
+      uses: github/codeql-action/autobuild@fdbfb4d2750291e159f0156def62b853c2798ca2 # v4.31.5
    - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@1b168cd39490f61582a9beae412bb7057a6b2c4e # v4.31.8
+      uses: github/codeql-action/analyze@fdbfb4d2750291e159f0156def62b853c2798ca2 # v4.31.5
--- a/.github/workflows/ci-compat.yml
+++ b/.github/workflows/ci-compat.yml
@@ -11,7 +11,7 @@ jobs:
    permissions: read-all
    steps:
      - name: Checkout repository
-        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
        with:
          ref: ${{ github.event.pull_request.head.sha }}
          repository: ${{ github.event.pull_request.head.repo.full_name }}
@@ -26,7 +26,7 @@ jobs:
          dotnet build Jellyfin.Server -o ./out

      - name: Upload Head
-        uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
+        uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
        with:
          name: abi-head
          retention-days: 14
@@ -40,7 +40,7 @@ jobs:
    permissions: read-all
    steps:
      - name: Checkout repository
-        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
        with:
          ref: ${{ github.event.pull_request.head.sha }}
          repository: ${{ github.event.pull_request.head.repo.full_name }}
@@ -65,7 +65,7 @@ jobs:
          dotnet build Jellyfin.Server -o ./out

      - name: Upload Head
-        uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
+        uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
        with:
          name: abi-base
          retention-days: 14
@@ -85,13 +85,13 @@ jobs:

    steps:
      - name: Download abi-head
-        uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7.0.0
+        uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # v6.0.0
        with:
          name: abi-head
          path: abi-head

      - name: Download abi-base
-        uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7.0.0
+        uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # v6.0.0
        with:
          name: abi-base
          path: abi-base
--- a/.github/workflows/ci-openapi.yml
+++ b/.github/workflows/ci-openapi.yml
@@ -16,7 +16,7 @@ jobs:
    permissions: read-all
    steps:
      - name: Checkout repository
-        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
        with:
          ref: ${{ github.event.pull_request.head.sha }}
          repository: ${{ github.event.pull_request.head.repo.full_name }}
@@ -27,7 +27,7 @@ jobs:
      - name: Generate openapi.json
        run: dotnet test tests/Jellyfin.Server.Integration.Tests/Jellyfin.Server.Integration.Tests.csproj -c Release --filter "Jellyfin.Server.Integration.Tests.OpenApiSpecTests"
      - name: Upload openapi.json
-        uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
+        uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
        with:
          name: openapi-head
          retention-days: 14
@@ -41,7 +41,7 @@ jobs:
    permissions: read-all
    steps:
      - name: Checkout repository
-        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
        with:
          ref: ${{ github.event.pull_request.head.sha }}
          repository: ${{ github.event.pull_request.head.repo.full_name }}
@@ -61,7 +61,7 @@ jobs:
      - name: Generate openapi.json
        run: dotnet test tests/Jellyfin.Server.Integration.Tests/Jellyfin.Server.Integration.Tests.csproj -c Release --filter "Jellyfin.Server.Integration.Tests.OpenApiSpecTests"
      - name: Upload openapi.json
-        uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
+        uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
        with:
          name: openapi-base
          retention-days: 14
@@ -80,12 +80,12 @@ jobs:
      - openapi-base
    steps:
      - name: Download openapi-head
-        uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7.0.0
+        uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # v6.0.0
        with:
          name: openapi-head
          path: openapi-head
      - name: Download openapi-base
-        uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7.0.0
+        uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # v6.0.0
        with:
          name: openapi-base
          path: openapi-base
@@ -158,7 +158,7 @@ jobs:
        run: |-
          echo "JELLYFIN_VERSION=$(date +'%Y%m%d%H%M%S')" >> $GITHUB_ENV
      - name: Download openapi-head
-        uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7.0.0
+        uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # v6.0.0
        with:
          name: openapi-head
          path: openapi-head
@@ -220,7 +220,7 @@ jobs:
        run: |-
          echo "JELLYFIN_VERSION=${GITHUB_REF#refs/tags/v}" >> $GITHUB_ENV
      - name: Download openapi-head
-        uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7.0.0
+        uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # v6.0.0
        with:
          name: openapi-head
          path: openapi-head
--- a/.github/workflows/ci-tests.yml
+++ b/.github/workflows/ci-tests.yml
@@ -20,7 +20,7 @@ jobs:

    runs-on: "${{ matrix.os }}"
    steps:
-      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+      - uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0

      - uses: actions/setup-dotnet@2016bd2012dba4e32de620c46fe006a3ac9f0602 # v5.0.1
        with:
@@ -35,7 +35,7 @@ jobs:
          --verbosity minimal

      - name: Merge code coverage results
-        uses: danielpalme/ReportGenerator-GitHub-Action@ee0ae774f6d3afedcbd1683c1ab21b83670bdf8e # v5.5.1
+        uses: danielpalme/ReportGenerator-GitHub-Action@dcdfb6e704e87df6b2ed0cf123a6c9f69e364869 # v5.5.0
        with:
          reports: "**/coverage.cobertura.xml"
          targetdir: "merged/"
--- a/.github/workflows/commands.yml
+++ b/.github/workflows/commands.yml
@@ -24,7 +24,7 @@ jobs:
          reactions: '+1'

      - name: Checkout the latest code
-        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
        with:
          token: ${{ secrets.JF_BOT_TOKEN }}
          fetch-depth: 0
@@ -40,7 +40,7 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: pull in script
-        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
        with:
          repository: jellyfin/jellyfin-triage-script
      - name: install python
--- a/.github/workflows/issue-stale.yml
+++ b/.github/workflows/issue-stale.yml
@@ -16,7 +16,7 @@ jobs:
    runs-on: ubuntu-latest
    if: ${{ contains(github.repository, 'jellyfin/') }}
    steps:
-      - uses: actions/stale@997185467fa4f803885201cee163a9f38240193d # v10.1.1
+      - uses: actions/stale@5f858e3efba33a5ca4407a664cc011ad407f2008 # v10.1.0
        with:
          repo-token: ${{ secrets.JF_BOT_TOKEN }}
          ascending: true
--- a/.github/workflows/issue-template-check.yml
+++ b/.github/workflows/issue-template-check.yml
@@ -10,7 +10,7 @@ jobs:
      issues: write
    steps:
      - name: pull in script
-        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
        with:
          repository: jellyfin/jellyfin-triage-script
      - name: install python
--- a/.github/workflows/pull-request-stale.yaml
+++ b/.github/workflows/pull-request-stale.yaml
@@ -15,7 +15,7 @@ jobs:
    runs-on: ubuntu-latest
    if: ${{ contains(github.repository, 'jellyfin/') }}
    steps:
-      - uses: actions/stale@997185467fa4f803885201cee163a9f38240193d # v10.1.1
+      - uses: actions/stale@5f858e3efba33a5ca4407a664cc011ad407f2008 # v10.1.0
        with:
          repo-token: ${{ secrets.JF_BOT_TOKEN }}
          ascending: true
--- a/.github/workflows/release-bump-version.yaml
+++ b/.github/workflows/release-bump-version.yaml
@@ -33,7 +33,7 @@ jobs:
          yq-version: v4.9.8

      - name: Checkout Repository
-        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
        with:
          ref: ${{ env.TAG_BRANCH }}

@@ -66,7 +66,7 @@ jobs:
      NEXT_VERSION: ${{ github.event.inputs.NEXT_VERSION }}
    steps:
      - name: Checkout Repository
-        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
        with:
          ref: ${{ env.TAG_BRANCH }}

--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -4,7 +4,7 @@
  </PropertyGroup>
  <!-- Run "dotnet list package (dash,dash)outdated" to see the latest versions of each package.-->
  <ItemGroup Label="Package Dependencies">
-    <PackageVersion Include="AsyncKeyedLock" Version="7.1.8" />
+    <PackageVersion Include="AsyncKeyedLock" Version="7.1.7" />
    <PackageVersion Include="AutoFixture.AutoMoq" Version="4.18.1" />
    <PackageVersion Include="AutoFixture.Xunit2" Version="4.18.1" />
    <PackageVersion Include="AutoFixture" Version="4.18.1" />
@@ -74,9 +74,9 @@
    <PackageVersion Include="SerilogAnalyzer" Version="0.15.0" />
    <PackageVersion Include="SharpFuzz" Version="2.2.0" />
    <!-- Pinned to 3.116.1 because https://github.com/jellyfin/jellyfin/pull/14255 -->
-    <PackageVersion Include="SkiaSharp" Version="[3.116.1]" />
-    <PackageVersion Include="SkiaSharp.HarfBuzz" Version="[3.116.1]" />
-    <PackageVersion Include="SkiaSharp.NativeAssets.Linux" Version="[3.116.1]" />
+    <PackageVersion Include="SkiaSharp" Version="3.116.1" />
+    <PackageVersion Include="SkiaSharp.HarfBuzz" Version="3.116.1" />
+    <PackageVersion Include="SkiaSharp.NativeAssets.Linux" Version="3.116.1" />
    <PackageVersion Include="SmartAnalyzers.MultithreadingAnalyzer" Version="1.1.31" />
    <PackageVersion Include="StyleCop.Analyzers" Version="1.2.0-beta.556" />
    <PackageVersion Include="Svg.Skia" Version="3.2.1" />
--- a/Emby.Naming/Book/BookFileNameParser.cs
+++ b/Emby.Naming/Book/BookFileNameParser.cs
@@ -1,75 +0,0 @@
-using System.Text.RegularExpressions;
-
-namespace Emby.Naming.Book
-{
-    /// <summary>
-    /// Helper class to retrieve basic metadata from a book filename.
-    /// </summary>
-    public static class BookFileNameParser
-    {
-        private const string NameMatchGroup = "name";
-        private const string IndexMatchGroup = "index";
-        private const string YearMatchGroup = "year";
-        private const string SeriesNameMatchGroup = "seriesName";
-
-        private static readonly Regex[] _nameMatches =
-        [
-            // seriesName (seriesYear) #index (of count) (year) where only seriesName and index are required
-            new Regex(@"^(?<seriesName>.+?)((\s\((?<seriesYear>[0-9]{4})\))?)\s#(?<index>[0-9]+)((\s\(of\s(?<count>[0-9]+)\))?)((\s\((?<year>[0-9]{4})\))?)$"),
-            new Regex(@"^(?<name>.+?)\s\((?<seriesName>.+?),\s#(?<index>[0-9]+)\)((\s\((?<year>[0-9]{4})\))?)$"),
-            new Regex(@"^(?<index>[0-9]+)\s\-\s(?<name>.+?)((\s\((?<year>[0-9]{4})\))?)$"),
-            new Regex(@"(?<name>.*)\((?<year>[0-9]{4})\)"),
-            // last resort matches the whole string as the name
-            new Regex(@"(?<name>.*)")
-        ];
-
-        /// <summary>
-        /// Parse a filename name to retrieve the book name, series name, index, and year.
-        /// </summary>
-        /// <param name="name">Book filename to parse for information.</param>
-        /// <returns>Returns <see cref="BookFileNameParserResult"/> object.</returns>
-        public static BookFileNameParserResult Parse(string? name)
-        {
-            var result = new BookFileNameParserResult();
-
-            if (name == null)
-            {
-                return result;
-            }
-
-            foreach (var regex in _nameMatches)
-            {
-                var match = regex.Match(name);
-
-                if (!match.Success)
-                {
-                    continue;
-                }
-
-                if (match.Groups.TryGetValue(NameMatchGroup, out Group? nameGroup) && nameGroup.Success)
-                {
-                    result.Name = nameGroup.Value.Trim();
-                }
-
-                if (match.Groups.TryGetValue(IndexMatchGroup, out Group? indexGroup) && indexGroup.Success && int.TryParse(indexGroup.Value, out var index))
-                {
-                    result.Index = index;
-                }
-
-                if (match.Groups.TryGetValue(YearMatchGroup, out Group? yearGroup) && yearGroup.Success && int.TryParse(yearGroup.Value, out var year))
-                {
-                    result.Year = year;
-                }
-
-                if (match.Groups.TryGetValue(SeriesNameMatchGroup, out Group? seriesGroup) && seriesGroup.Success)
-                {
-                    result.SeriesName = seriesGroup.Value.Trim();
-                }
-
-                break;
-            }
-
-            return result;
-        }
-    }
-}
--- a/Emby.Naming/Book/BookFileNameParserResult.cs
+++ b/Emby.Naming/Book/BookFileNameParserResult.cs
@@ -1,41 +0,0 @@
-using System;
-
-namespace Emby.Naming.Book
-{
-    /// <summary>
-    /// Data object used to pass metadata parsed from a book filename.
-    /// </summary>
-    public class BookFileNameParserResult
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="BookFileNameParserResult"/> class.
-        /// </summary>
-        public BookFileNameParserResult()
-        {
-            Name = null;
-            Index = null;
-            Year = null;
-            SeriesName = null;
-        }
-
-        /// <summary>
-        /// Gets or sets the name of the book.
-        /// </summary>
-        public string? Name { get; set; }
-
-        /// <summary>
-        /// Gets or sets the book index.
-        /// </summary>
-        public int? Index { get; set; }
-
-        /// <summary>
-        /// Gets or sets the publication year.
-        /// </summary>
-        public int? Year { get; set; }
-
-        /// <summary>
-        /// Gets or sets the series name.
-        /// </summary>
-        public string? SeriesName { get; set; }
-    }
-}
--- a/Emby.Server.Implementations/IO/ManagedFileSystem.cs
+++ b/Emby.Server.Implementations/IO/ManagedFileSystem.cs
@@ -497,17 +497,8 @@ namespace Emby.Server.Implementations.IO
        /// <inheritdoc />
        public virtual bool AreEqual(string path1, string path2)
        {
-            if (string.IsNullOrWhiteSpace(path1) || string.IsNullOrWhiteSpace(path2))
-            {
-                return false;
-            }
-
-            var normalized1 = Path.TrimEndingDirectorySeparator(path1);
-            var normalized2 = Path.TrimEndingDirectorySeparator(path2);
-
-            return string.Equals(
-                normalized1,
-                normalized2,
+            return Path.TrimEndingDirectorySeparator(path1).Equals(
+                Path.TrimEndingDirectorySeparator(path2),
                _isEnvironmentCaseInsensitive ? StringComparison.OrdinalIgnoreCase : StringComparison.Ordinal);
        }

--- a/Emby.Server.Implementations/Library/LibraryManager.cs
+++ b/Emby.Server.Implementations/Library/LibraryManager.cs
@@ -2143,7 +2143,7 @@ namespace Emby.Server.Implementations.Library

            item.ValidateImages();

-            await _itemRepository.SaveImagesAsync(item).ConfigureAwait(false);
+            _itemRepository.SaveImages(item);

            RegisterItem(item);
        }
--- a/Emby.Server.Implementations/Library/Resolvers/Books/BookResolver.cs
+++ b/Emby.Server.Implementations/Library/Resolvers/Books/BookResolver.cs
@@ -5,12 +5,12 @@
 using System;
 using System.IO;
 using System.Linq;
-using Emby.Naming.Book;
 using Jellyfin.Data.Enums;
 using Jellyfin.Extensions;
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Library;
 using MediaBrowser.Controller.Resolvers;
+using MediaBrowser.Model.Entities;

 namespace Emby.Server.Implementations.Library.Resolvers.Books
 {
@@ -35,24 +35,19 @@ namespace Emby.Server.Implementations.Library.Resolvers.Books

            var extension = Path.GetExtension(args.Path.AsSpan());

-            if (!_validExtensions.Contains(extension, StringComparison.OrdinalIgnoreCase))
+            if (_validExtensions.Contains(extension, StringComparison.OrdinalIgnoreCase))
            {
-                return null;
-            }
-
-            var result = BookFileNameParser.Parse(Path.GetFileNameWithoutExtension(args.Path));
-
+                // It's a book
                return new Book
                {
                    Path = args.Path,
-                Name = result.Name ?? string.Empty,
-                IndexNumber = result.Index,
-                ProductionYear = result.Year,
-                SeriesName = result.SeriesName ?? Path.GetFileName(Path.GetDirectoryName(args.Path)),
-                IsInMixedFolder = true,
+                    IsInMixedFolder = true
                };
            }

+            return null;
+        }
+
        private Book GetBook(ItemResolveArgs args)
        {
            var bookFiles = args.FileSystemChildren.Where(f =>
@@ -64,22 +59,15 @@ namespace Emby.Server.Implementations.Library.Resolvers.Books
                    StringComparison.OrdinalIgnoreCase);
            }).ToList();

-            // directory is only considered a book when it contains exactly one supported file
-            // other library structures with multiple books to a directory will get picked up as individual files
+            // Don't return a Book if there is more (or less) than one document in the directory
            if (bookFiles.Count != 1)
            {
                return null;
            }

-            var result = BookFileNameParser.Parse(Path.GetFileName(args.Path));
-
            return new Book
            {
-                Path = bookFiles[0].FullName,
-                Name = result.Name ?? string.Empty,
-                IndexNumber = result.Index,
-                ProductionYear = result.Year,
-                SeriesName = result.SeriesName ?? string.Empty,
+                Path = bookFiles[0].FullName
            };
        }
    }
--- a/Emby.Server.Implementations/Library/SearchEngine.cs
+++ b/Emby.Server.Implementations/Library/SearchEngine.cs
@@ -42,7 +42,7 @@ namespace Emby.Server.Implementations.Library
                results = results.GetRange(query.StartIndex.Value, totalRecordCount - query.StartIndex.Value);
            }

-            if (query.Limit.HasValue && query.Limit.Value > 0)
+            if (query.Limit.HasValue)
            {
                results = results.GetRange(0, Math.Min(query.Limit.Value, results.Count));
            }
--- a/Emby.Server.Implementations/Localization/Core/ar.json
+++ b/Emby.Server.Implementations/Localization/Core/ar.json
@@ -16,7 +16,7 @@
    "Folders": "المجلدات",
    "Genres": "التصنيفات",
    "HeaderAlbumArtists": "فناني الألبوم",
-    "HeaderContinueWatching": "أكمل المشاهدة",
+    "HeaderContinueWatching": "إستئناف المشاهدة",
    "HeaderFavoriteAlbums": "الألبومات المفضلة",
    "HeaderFavoriteArtists": "الفنانون المفضلون",
    "HeaderFavoriteEpisodes": "الحلقات المفضلة",
--- a/Emby.Server.Implementations/Localization/Core/mi.json
+++ b/Emby.Server.Implementations/Localization/Core/mi.json
@@ -1,9 +0,0 @@
-{
-    "Albums": "Pukaemi",
-    "AppDeviceValues": "Taupānga: {0}, Pūrere: {1}",
-    "Application": "Taupānga",
-    "Artists": "Kaiwaiata",
-    "AuthenticationSucceededWithUserName": "{0} has been successfully authenticated",
-    "Books": "Ngā pukapuka",
-    "CameraImageUploadedFrom": "Kua tuku ake he whakaahua kāmera hou mai i {0}"
-}
--- a/Emby.Server.Implementations/Localization/Core/sw.json
+++ b/Emby.Server.Implementations/Localization/Core/sw.json
@@ -1 +0,0 @@
-{}
--- a/Emby.Server.Implementations/TV/TVSeriesManager.cs
+++ b/Emby.Server.Implementations/TV/TVSeriesManager.cs
@@ -266,7 +266,7 @@ namespace Emby.Server.Implementations.TV
                items = items.Skip(query.StartIndex.Value);
            }

-            if (query.Limit.HasValue && query.Limit.Value > 0)
+            if (query.Limit.HasValue)
            {
                items = items.Take(query.Limit.Value);
            }
--- a/Jellyfin.Api/Controllers/ActivityLogController.cs
+++ b/Jellyfin.Api/Controllers/ActivityLogController.cs
@@ -1,16 +1,13 @@
 using System;
-using System.Collections.Generic;
 using System.Threading.Tasks;
-using Jellyfin.Data.Enums;
+using Jellyfin.Api.Constants;
 using Jellyfin.Data.Queries;
-using Jellyfin.Database.Implementations.Enums;
 using MediaBrowser.Common.Api;
 using MediaBrowser.Model.Activity;
 using MediaBrowser.Model.Querying;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
-using Microsoft.Extensions.Logging;

 namespace Jellyfin.Api.Controllers;

@@ -35,19 +32,10 @@ public class ActivityLogController : BaseJellyfinApiController
    /// <summary>
    /// Gets activity log entries.
    /// </summary>
-    /// <param name="startIndex">The record index to start at. All items with a lower index will be dropped from the results.</param>
-    /// <param name="limit">The maximum number of records to return.</param>
-    /// <param name="minDate">The minimum date.</param>
-    /// <param name="hasUserId">Filter log entries if it has user id, or not.</param>
-    /// <param name="name">Filter by name.</param>
-    /// <param name="overview">Filter by overview.</param>
-    /// <param name="shortOverview">Filter by short overview.</param>
-    /// <param name="type">Filter by type.</param>
-    /// <param name="itemId">Filter by item id.</param>
-    /// <param name="username">Filter by username.</param>
-    /// <param name="severity">Filter by log severity.</param>
-    /// <param name="sortBy">Specify one or more sort orders. Format: SortBy=Name,Type.</param>
-    /// <param name="sortOrder">Sort Order..</param>
+    /// <param name="startIndex">Optional. The record index to start at. All items with a lower index will be dropped from the results.</param>
+    /// <param name="limit">Optional. The maximum number of records to return.</param>
+    /// <param name="minDate">Optional. The minimum date. Format = ISO.</param>
+    /// <param name="hasUserId">Optional. Filter log entries if it has user id, or not.</param>
    /// <response code="200">Activity log returned.</response>
    /// <returns>A <see cref="QueryResult{ActivityLogEntry}"/> containing the log entries.</returns>
    [HttpGet("Entries")]
@@ -56,60 +44,14 @@ public class ActivityLogController : BaseJellyfinApiController
        [FromQuery] int? startIndex,
        [FromQuery] int? limit,
        [FromQuery] DateTime? minDate,
-        [FromQuery] bool? hasUserId,
-        [FromQuery] string? name,
-        [FromQuery] string? overview,
-        [FromQuery] string? shortOverview,
-        [FromQuery] string? type,
-        [FromQuery] Guid? itemId,
-        [FromQuery] string? username,
-        [FromQuery] LogLevel? severity,
-        [FromQuery] ActivityLogSortBy[]? sortBy,
-        [FromQuery] SortOrder[]? sortOrder)
+        [FromQuery] bool? hasUserId)
    {
-        var query = new ActivityLogQuery
+        return await _activityManager.GetPagedResultAsync(new ActivityLogQuery
        {
            Skip = startIndex,
            Limit = limit,
            MinDate = minDate,
-            HasUserId = hasUserId,
-            Name = name,
-            Overview = overview,
-            ShortOverview = shortOverview,
-            Type = type,
-            ItemId = itemId,
-            Username = username,
-            Severity = severity,
-            OrderBy = GetOrderBy(sortBy ?? [], sortOrder ?? []),
-        };
-
-        return await _activityManager.GetPagedResultAsync(query).ConfigureAwait(false);
-    }
-
-    private static (ActivityLogSortBy SortBy, SortOrder SortOrder)[] GetOrderBy(
-        IReadOnlyList<ActivityLogSortBy> sortBy,
-        IReadOnlyList<SortOrder> requestedSortOrder)
-    {
-        if (sortBy.Count == 0)
-        {
-            return [];
-        }
-
-        var result = new (ActivityLogSortBy, SortOrder)[sortBy.Count];
-        var i = 0;
-        for (; i < requestedSortOrder.Count; i++)
-        {
-            result[i] = (sortBy[i], requestedSortOrder[i]);
-        }
-
-        // Add remaining elements with the first specified SortOrder
-        // or the default one if no SortOrders are specified
-        var order = requestedSortOrder.Count > 0 ? requestedSortOrder[0] : SortOrder.Ascending;
-        for (; i < sortBy.Count; i++)
-        {
-            result[i] = (sortBy[i], order);
-        }
-
-        return result;
+            HasUserId = hasUserId
+        }).ConfigureAwait(false);
    }
 }
--- a/Jellyfin.Api/Controllers/UserLibraryController.cs
+++ b/Jellyfin.Api/Controllers/UserLibraryController.cs
@@ -13,7 +13,6 @@ using Jellyfin.Extensions;
 using MediaBrowser.Controller.Dto;
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Entities.Audio;
-using MediaBrowser.Controller.Entities.TV;
 using MediaBrowser.Controller.Library;
 using MediaBrowser.Controller.Providers;
 using MediaBrowser.Model.Dto;
@@ -569,7 +568,7 @@ public class UserLibraryController : BaseJellyfinApiController
            var item = i.Item2[0];
            var childCount = 0;

-            if (i.Item1 is not null && (i.Item2.Count > 1 || i.Item1 is MusicAlbum || i.Item1 is Series ))
+            if (i.Item1 is not null && (i.Item2.Count > 1 || i.Item1 is MusicAlbum))
            {
                item = i.Item1;
                childCount = i.Item2.Count;
--- a/Jellyfin.Api/Middleware/LegacyEmbyRouteRewriteMiddleware.cs
+++ b/Jellyfin.Api/Middleware/LegacyEmbyRouteRewriteMiddleware.cs
@@ -0,0 +1,53 @@
+using System;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Http;
+using Microsoft.Extensions.Logging;
+
+namespace Jellyfin.Api.Middleware;
+
+/// <summary>
+/// Removes /emby and /mediabrowser from requested route.
+/// </summary>
+public class LegacyEmbyRouteRewriteMiddleware
+{
+    private const string EmbyPath = "/emby";
+    private const string MediabrowserPath = "/mediabrowser";
+
+    private readonly RequestDelegate _next;
+    private readonly ILogger<LegacyEmbyRouteRewriteMiddleware> _logger;
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="LegacyEmbyRouteRewriteMiddleware"/> class.
+    /// </summary>
+    /// <param name="next">The next delegate in the pipeline.</param>
+    /// <param name="logger">The logger.</param>
+    public LegacyEmbyRouteRewriteMiddleware(
+        RequestDelegate next,
+        ILogger<LegacyEmbyRouteRewriteMiddleware> logger)
+    {
+        _next = next;
+        _logger = logger;
+    }
+
+    /// <summary>
+    /// Executes the middleware action.
+    /// </summary>
+    /// <param name="httpContext">The current HTTP context.</param>
+    /// <returns>The async task.</returns>
+    public async Task Invoke(HttpContext httpContext)
+    {
+        var localPath = httpContext.Request.Path.ToString();
+        if (localPath.StartsWith(EmbyPath, StringComparison.OrdinalIgnoreCase))
+        {
+            httpContext.Request.Path = localPath[EmbyPath.Length..];
+            _logger.LogDebug("Removing {EmbyPath} from route.", EmbyPath);
+        }
+        else if (localPath.StartsWith(MediabrowserPath, StringComparison.OrdinalIgnoreCase))
+        {
+            httpContext.Request.Path = localPath[MediabrowserPath.Length..];
+            _logger.LogDebug("Removing {MediabrowserPath} from route.", MediabrowserPath);
+        }
+
+        await _next(httpContext).ConfigureAwait(false);
+    }
+}
--- a/Jellyfin.Data/Enums/ActivityLogSortBy.cs
+++ b/Jellyfin.Data/Enums/ActivityLogSortBy.cs
@@ -1,49 +0,0 @@
-namespace Jellyfin.Data.Enums;
-
-/// <summary>
-/// Activity log sorting options.
-/// </summary>
-public enum ActivityLogSortBy
-{
-    /// <summary>
-    /// Sort by name.
-    /// </summary>
-    Name = 0,
-
-    /// <summary>
-    /// Sort by overview.
-    /// </summary>
-    Overiew = 1,
-
-    /// <summary>
-    /// Sort by short overview.
-    /// </summary>
-    ShortOverview = 2,
-
-    /// <summary>
-    /// Sort by type.
-    /// </summary>
-    Type = 3,
-
-    /*
-    /// <summary>
-    /// Sort by item name.
-    /// </summary>
-    Item = 4,
-    */
-
-    /// <summary>
-    /// Sort by date.
-    /// </summary>
-    DateCreated = 5,
-
-    /// <summary>
-    /// Sort by username.
-    /// </summary>
-    Username = 6,
-
-    /// <summary>
-    /// Sort by severity.
-    /// </summary>
-    LogSeverity = 7
-}
--- a/Jellyfin.Data/Queries/ActivityLogQuery.cs
+++ b/Jellyfin.Data/Queries/ActivityLogQuery.cs
@@ -1,11 +1,7 @@
 using System;
-using System.Collections.Generic;
-using Jellyfin.Data.Enums;
-using Jellyfin.Database.Implementations.Enums;
-using Microsoft.Extensions.Logging;
-
-namespace Jellyfin.Data.Queries;

+namespace Jellyfin.Data.Queries
+{
    /// <summary>
    /// A class representing a query to the activity logs.
    /// </summary>
@@ -20,44 +16,5 @@ public class ActivityLogQuery : PaginatedQuery
        /// Gets or sets the minimum date to query for.
        /// </summary>
        public DateTime? MinDate { get; set; }
-
-    /// <summary>
-    /// Gets or sets the name filter.
-    /// </summary>
-    public string? Name { get; set; }
-
-    /// <summary>
-    /// Gets or sets the overview filter.
-    /// </summary>
-    public string? Overview { get; set; }
-
-    /// <summary>
-    /// Gets or sets the short overview filter.
-    /// </summary>
-    public string? ShortOverview { get; set; }
-
-    /// <summary>
-    /// Gets or sets the type filter.
-    /// </summary>
-    public string? Type { get; set; }
-
-    /// <summary>
-    /// Gets or sets the item filter.
-    /// </summary>
-    public Guid? ItemId { get; set; }
-
-    /// <summary>
-    /// Gets or sets the username filter.
-    /// </summary>
-    public string? Username { get; set; }
-
-    /// <summary>
-    /// Gets or sets the log level filter.
-    /// </summary>
-    public LogLevel? Severity { get; set; }
-
-    /// <summary>
-    /// Gets or sets the result ordering.
-    /// </summary>
-    public IReadOnlyCollection<(ActivityLogSortBy, SortOrder)>? OrderBy { get; set; }
+    }
 }
--- a/Jellyfin.Server.Implementations/Activity/ActivityManager.cs
+++ b/Jellyfin.Server.Implementations/Activity/ActivityManager.cs
@@ -1,21 +1,16 @@
 using System;
-using System.Collections.Generic;
 using System.Linq;
-using System.Linq.Expressions;
 using System.Threading.Tasks;
-using Jellyfin.Data.Enums;
 using Jellyfin.Data.Events;
 using Jellyfin.Data.Queries;
 using Jellyfin.Database.Implementations;
 using Jellyfin.Database.Implementations.Entities;
-using Jellyfin.Database.Implementations.Enums;
-using Jellyfin.Extensions;
 using MediaBrowser.Model.Activity;
 using MediaBrowser.Model.Querying;
 using Microsoft.EntityFrameworkCore;

-namespace Jellyfin.Server.Implementations.Activity;
-
+namespace Jellyfin.Server.Implementations.Activity
+{
    /// <summary>
    /// Manages the storage and retrieval of <see cref="ActivityLog"/> instances.
    /// </summary>
@@ -51,77 +46,28 @@ public class ActivityManager : IActivityManager
        /// <inheritdoc/>
        public async Task<QueryResult<ActivityLogEntry>> GetPagedResultAsync(ActivityLogQuery query)
        {
-        // TODO allow sorting and filtering by item id. Currently not possible because ActivityLog stores the item id as a string.
-
            var dbContext = await _provider.CreateDbContextAsync().ConfigureAwait(false);
            await using (dbContext.ConfigureAwait(false))
            {
-            // TODO switch to LeftJoin in .NET 10.
-            var entries = from a in dbContext.ActivityLogs
-                join u in dbContext.Users on a.UserId equals u.Id into ugj
-                from u in ugj.DefaultIfEmpty()
-                select new ExpandedActivityLog { ActivityLog = a, Username = u.Username };
-
-            if (query.HasUserId is not null)
-            {
-                entries = entries.Where(e => e.ActivityLog.UserId.Equals(default) != query.HasUserId.Value);
-            }
-
-            if (query.MinDate is not null)
-            {
-                entries = entries.Where(e => e.ActivityLog.DateCreated >= query.MinDate.Value);
-            }
-
-            if (!string.IsNullOrEmpty(query.Name))
-            {
-                entries = entries.Where(e => EF.Functions.Like(e.ActivityLog.Name, $"%{query.Name}%"));
-            }
-
-            if (!string.IsNullOrEmpty(query.Overview))
-            {
-                entries = entries.Where(e => EF.Functions.Like(e.ActivityLog.Overview, $"%{query.Overview}%"));
-            }
-
-            if (!string.IsNullOrEmpty(query.ShortOverview))
-            {
-                entries = entries.Where(e => EF.Functions.Like(e.ActivityLog.ShortOverview, $"%{query.ShortOverview}%"));
-            }
-
-            if (!string.IsNullOrEmpty(query.Type))
-            {
-                entries = entries.Where(e => EF.Functions.Like(e.ActivityLog.Type, $"%{query.Type}%"));
-            }
-
-            if (!query.ItemId.IsNullOrEmpty())
-            {
-                var itemId = query.ItemId.Value.ToString("N");
-                entries = entries.Where(e => e.ActivityLog.ItemId == itemId);
-            }
-
-            if (!string.IsNullOrEmpty(query.Username))
-            {
-                entries = entries.Where(e => EF.Functions.Like(e.Username, $"%{query.Username}%"));
-            }
-
-            if (query.Severity is not null)
-            {
-                entries = entries.Where(e => e.ActivityLog.LogSeverity == query.Severity);
-            }
+                var entries = dbContext.ActivityLogs
+                    .OrderByDescending(entry => entry.DateCreated)
+                    .Where(entry => query.MinDate == null || entry.DateCreated >= query.MinDate)
+                    .Where(entry => !query.HasUserId.HasValue || entry.UserId.Equals(default) != query.HasUserId.Value);

                return new QueryResult<ActivityLogEntry>(
                    query.Skip,
                    await entries.CountAsync().ConfigureAwait(false),
-                await ApplyOrdering(entries, query.OrderBy)
+                    await entries
                        .Skip(query.Skip ?? 0)
                        .Take(query.Limit ?? 100)
-                    .Select(entity => new ActivityLogEntry(entity.ActivityLog.Name, entity.ActivityLog.Type, entity.ActivityLog.UserId)
+                        .Select(entity => new ActivityLogEntry(entity.Name, entity.Type, entity.UserId)
                        {
-                        Id = entity.ActivityLog.Id,
-                        Overview = entity.ActivityLog.Overview,
-                        ShortOverview = entity.ActivityLog.ShortOverview,
-                        ItemId = entity.ActivityLog.ItemId,
-                        Date = entity.ActivityLog.DateCreated,
-                        Severity = entity.ActivityLog.LogSeverity
+                            Id = entity.Id,
+                            Overview = entity.Overview,
+                            ShortOverview = entity.ShortOverview,
+                            ItemId = entity.ItemId,
+                            Date = entity.DateCreated,
+                            Severity = entity.LogSeverity
                        })
                        .ToListAsync()
                        .ConfigureAwait(false));
@@ -153,46 +99,5 @@ public class ActivityManager : IActivityManager
                Severity = entry.LogSeverity
            };
        }
-
-    private IOrderedQueryable<ExpandedActivityLog> ApplyOrdering(IQueryable<ExpandedActivityLog> query, IReadOnlyCollection<(ActivityLogSortBy, SortOrder)>? sorting)
-    {
-        if (sorting is null || sorting.Count == 0)
-        {
-            return query.OrderByDescending(e => e.ActivityLog.DateCreated);
-        }
-
-        IOrderedQueryable<ExpandedActivityLog> ordered = null!;
-
-        foreach (var (sortBy, sortOrder) in sorting)
-        {
-            var orderBy = MapOrderBy(sortBy);
-            ordered = sortOrder == SortOrder.Ascending
-                ? (ordered ?? query).OrderBy(orderBy)
-                : (ordered ?? query).OrderByDescending(orderBy);
-        }
-
-        return ordered;
-    }
-
-    private Expression<Func<ExpandedActivityLog, object?>> MapOrderBy(ActivityLogSortBy sortBy)
-    {
-        return sortBy switch
-        {
-            ActivityLogSortBy.Name => e => e.ActivityLog.Name,
-            ActivityLogSortBy.Overiew => e => e.ActivityLog.Overview,
-            ActivityLogSortBy.ShortOverview => e => e.ActivityLog.ShortOverview,
-            ActivityLogSortBy.Type => e => e.ActivityLog.Type,
-            ActivityLogSortBy.DateCreated => e => e.ActivityLog.DateCreated,
-            ActivityLogSortBy.Username => e => e.Username,
-            ActivityLogSortBy.LogSeverity => e => e.ActivityLog.LogSeverity,
-            _ => throw new ArgumentOutOfRangeException(nameof(sortBy), sortBy, "Unhandled ActivityLogSortBy")
-        };
-    }
-
-    private class ExpandedActivityLog
-    {
-        public ActivityLog ActivityLog { get; set; } = null!;
-
-        public string? Username { get; set; }
    }
 }
--- a/Jellyfin.Server.Implementations/Devices/DeviceManager.cs
+++ b/Jellyfin.Server.Implementations/Devices/DeviceManager.cs
@@ -158,7 +158,7 @@ namespace Jellyfin.Server.Implementations.Devices
                devices = devices.Skip(query.Skip.Value);
            }

-            if (query.Limit.HasValue && query.Limit.Value > 0)
+            if (query.Limit.HasValue)
            {
                devices = devices.Take(query.Limit.Value);
            }
--- a/Jellyfin.Server.Implementations/Item/BaseItemRepository.cs
+++ b/Jellyfin.Server.Implementations/Item/BaseItemRepository.cs
@@ -250,7 +250,7 @@ public sealed class BaseItemRepository
    public QueryResult<BaseItemDto> GetItems(InternalItemsQuery filter)
    {
        ArgumentNullException.ThrowIfNull(filter);
-        if (!filter.EnableTotalRecordCount || ((filter.Limit ?? 0) == 0 && (filter.StartIndex ?? 0) == 0))
+        if (!filter.EnableTotalRecordCount || (!filter.Limit.HasValue && (filter.StartIndex ?? 0) == 0))
        {
            var returnList = GetItemList(filter);
            return new QueryResult<BaseItemDto>(
@@ -326,7 +326,7 @@ public sealed class BaseItemRepository
            .OrderByDescending(g => g.MaxDateCreated)
            .Select(g => g);

-        if (filter.Limit.HasValue && filter.Limit.Value > 0)
+        if (filter.Limit.HasValue)
        {
            subqueryGrouped = subqueryGrouped.Take(filter.Limit.Value);
        }
@@ -367,7 +367,7 @@ public sealed class BaseItemRepository
            .OrderByDescending(g => g.LastPlayedDate)
            .Select(g => g.Key!);

-        if (filter.Limit.HasValue && filter.Limit.Value > 0)
+        if (filter.Limit.HasValue)
        {
            query = query.Take(filter.Limit.Value);
        }
@@ -425,15 +425,20 @@ public sealed class BaseItemRepository

    private IQueryable<BaseItemEntity> ApplyQueryPaging(IQueryable<BaseItemEntity> dbQuery, InternalItemsQuery filter)
    {
-        if (filter.StartIndex.HasValue && filter.StartIndex.Value > 0)
+        if (filter.Limit.HasValue || filter.StartIndex.HasValue)
        {
-            dbQuery = dbQuery.Skip(filter.StartIndex.Value);
+            var offset = filter.StartIndex ?? 0;
+
+            if (offset > 0)
+            {
+                dbQuery = dbQuery.Skip(offset);
            }

-        if (filter.Limit.HasValue && filter.Limit.Value > 0)
+            if (filter.Limit.HasValue)
            {
                dbQuery = dbQuery.Take(filter.Limit.Value);
            }
+        }

        return dbQuery;
    }
@@ -547,34 +552,22 @@ public sealed class BaseItemRepository
    }

    /// <inheritdoc  />
-    public async Task SaveImagesAsync(BaseItemDto item, CancellationToken cancellationToken = default)
+    public void SaveImages(BaseItemDto item)
    {
        ArgumentNullException.ThrowIfNull(item);

-        var images = item.ImageInfos.Select(e => Map(item.Id, e)).ToArray();
+        var images = item.ImageInfos.Select(e => Map(item.Id, e));
+        using var context = _dbProvider.CreateDbContext();

-        var context = await _dbProvider.CreateDbContextAsync(cancellationToken).ConfigureAwait(false);
-        await using (context.ConfigureAwait(false))
-        {
-            if (!await context.BaseItems
-                .AnyAsync(bi => bi.Id == item.Id, cancellationToken)
-                .ConfigureAwait(false))
+        if (!context.BaseItems.Any(bi => bi.Id == item.Id))
        {
            _logger.LogWarning("Unable to save ImageInfo for non existing BaseItem");
            return;
        }

-            await context.BaseItemImageInfos
-                .Where(e => e.ItemId == item.Id)
-                .ExecuteDeleteAsync(cancellationToken)
-                .ConfigureAwait(false);
-
-            await context.BaseItemImageInfos
-                .AddRangeAsync(images, cancellationToken)
-                .ConfigureAwait(false);
-
-            await context.SaveChangesAsync(cancellationToken).ConfigureAwait(false);
-        }
+        context.BaseItemImageInfos.Where(e => e.ItemId == item.Id).ExecuteDelete();
+        context.BaseItemImageInfos.AddRange(images);
+        context.SaveChanges();
    }

    /// <inheritdoc  />
@@ -625,18 +618,12 @@ public sealed class BaseItemRepository
            {
                context.BaseItemProviders.Where(e => e.ItemId == entity.Id).ExecuteDelete();
                context.BaseItemImageInfos.Where(e => e.ItemId == entity.Id).ExecuteDelete();
-                context.BaseItemMetadataFields.Where(e => e.ItemId == entity.Id).ExecuteDelete();

                if (entity.Images is { Count: > 0 })
                {
                    context.BaseItemImageInfos.AddRange(entity.Images);
                }

-                if (entity.LockedFields is { Count: > 0 })
-                {
-                    context.BaseItemMetadataFields.AddRange(entity.LockedFields);
-                }
-
                context.BaseItems.Attach(entity).State = EntityState.Modified;
            }
        }
@@ -1197,7 +1184,7 @@ public sealed class BaseItemRepository
    {
        ArgumentNullException.ThrowIfNull(filter);

-        if (!(filter.Limit.HasValue && filter.Limit.Value > 0))
+        if (!filter.Limit.HasValue)
        {
            filter.EnableTotalRecordCount = false;
        }
@@ -1276,15 +1263,20 @@ public sealed class BaseItemRepository
            result.TotalRecordCount = query.Count();
        }

-        if (filter.StartIndex.HasValue && filter.StartIndex.Value > 0)
+        if (filter.Limit.HasValue || filter.StartIndex.HasValue)
        {
-            query = query.Skip(filter.StartIndex.Value);
+            var offset = filter.StartIndex ?? 0;
+
+            if (offset > 0)
+            {
+                query = query.Skip(offset);
            }

-        if (filter.Limit.HasValue && filter.Limit.Value > 0)
+            if (filter.Limit.HasValue)
            {
                query = query.Take(filter.Limit.Value);
            }
+        }

        IQueryable<BaseItemEntity>? itemCountQuery = null;

@@ -1364,7 +1356,7 @@ public sealed class BaseItemRepository

    private static void PrepareFilterQuery(InternalItemsQuery query)
    {
-        if (query.Limit.HasValue && query.Limit.Value > 0 && query.EnableGroupByMetadataKey)
+        if (query.Limit.HasValue && query.EnableGroupByMetadataKey)
        {
            query.Limit = query.Limit.Value + 4;
        }
@@ -1375,54 +1367,14 @@ public sealed class BaseItemRepository
        }
    }

-    /// <summary>
-    /// Gets the clean value for search and sorting purposes.
-    /// </summary>
-    /// <param name="value">The value to clean.</param>
-    /// <returns>The cleaned value.</returns>
-    public static string GetCleanValue(string value)
+    private string GetCleanValue(string value)
    {
        if (string.IsNullOrWhiteSpace(value))
        {
            return value;
        }

-        var noDiacritics = value.RemoveDiacritics();
-
-        // Build a string where any punctuation or symbol is treated as a separator (space).
-        var sb = new StringBuilder(noDiacritics.Length);
-        var previousWasSpace = false;
-        foreach (var ch in noDiacritics)
-        {
-            char outCh;
-            if (char.IsLetterOrDigit(ch) || char.IsWhiteSpace(ch))
-            {
-                outCh = ch;
-            }
-            else
-            {
-                outCh = ' ';
-            }
-
-            // normalize any whitespace character to a single ASCII space.
-            if (char.IsWhiteSpace(outCh))
-            {
-                if (!previousWasSpace)
-                {
-                    sb.Append(' ');
-                    previousWasSpace = true;
-                }
-            }
-            else
-            {
-                sb.Append(outCh);
-                previousWasSpace = false;
-            }
-        }
-
-        // trim leading/trailing spaces that may have been added.
-        var collapsed = sb.ToString().Trim();
-        return collapsed.ToLowerInvariant();
+        return value.RemoveDiacritics().ToLowerInvariant();
    }

    private List<(ItemValueType MagicNumber, string Value)> GetItemValuesToSave(BaseItemDto item, List<string> inheritedTags)
@@ -1695,18 +1647,19 @@ public sealed class BaseItemRepository
        var tags = filter.Tags.ToList();
        var excludeTags = filter.ExcludeTags.ToList();

-        if (filter.IsMovie.HasValue)
+        if (filter.IsMovie == true)
        {
-            var shouldIncludeAllMovieTypes = filter.IsMovie.Value
-                && (filter.IncludeItemTypes.Length == 0
+            if (filter.IncludeItemTypes.Length == 0
                || filter.IncludeItemTypes.Contains(BaseItemKind.Movie)
-                    || filter.IncludeItemTypes.Contains(BaseItemKind.Trailer));
-
-            if (!shouldIncludeAllMovieTypes)
+                || filter.IncludeItemTypes.Contains(BaseItemKind.Trailer))
            {
-                baseQuery = baseQuery.Where(e => e.IsMovie == filter.IsMovie.Value);
+                baseQuery = baseQuery.Where(e => e.IsMovie);
            }
        }
+        else if (filter.IsMovie.HasValue)
+        {
+            baseQuery = baseQuery.Where(e => e.IsMovie == filter.IsMovie);
+        }

        if (filter.IsSeries.HasValue)
        {
--- a/Jellyfin.Server/Extensions/ApiApplicationBuilderExtensions.cs
+++ b/Jellyfin.Server/Extensions/ApiApplicationBuilderExtensions.cs
@@ -117,5 +117,18 @@ namespace Jellyfin.Server.Extensions
        {
            return appBuilder.UseMiddleware<RobotsRedirectionMiddleware>();
        }
+
+        /// <summary>
+        /// Adds /emby and /mediabrowser route trimming to the application pipeline.
+        /// </summary>
+        /// <remarks>
+        /// This must be injected before any path related middleware.
+        /// </remarks>
+        /// <param name="appBuilder">The application builder.</param>
+        /// <returns>The updated application builder.</returns>
+        public static IApplicationBuilder UsePathTrim(this IApplicationBuilder appBuilder)
+        {
+            return appBuilder.UseMiddleware<LegacyEmbyRouteRewriteMiddleware>();
+        }
    }
 }
--- a/Jellyfin.Server/Filters/CachingOpenApiProvider.cs
+++ b/Jellyfin.Server/Filters/CachingOpenApiProvider.cs
@@ -1,5 +1,5 @@
 using System;
-using AsyncKeyedLock;
+using System.Threading;
 using Microsoft.AspNetCore.Mvc.ApiExplorer;
 using Microsoft.Extensions.Caching.Memory;
 using Microsoft.Extensions.Options;
@@ -17,7 +17,7 @@ internal sealed class CachingOpenApiProvider : ISwaggerProvider
    private const string CacheKey = "openapi.json";

    private static readonly MemoryCacheEntryOptions _cacheOptions = new() { SlidingExpiration = TimeSpan.FromMinutes(5) };
-    private static readonly AsyncNonKeyedLocker _lock = new(1);
+    private static readonly SemaphoreSlim _lock = new(1, 1);
    private static readonly TimeSpan _lockTimeout = TimeSpan.FromSeconds(1);

    private readonly IMemoryCache _memoryCache;
@@ -50,13 +50,15 @@ internal sealed class CachingOpenApiProvider : ISwaggerProvider
            return AdjustDocument(openApiDocument, host, basePath);
        }

-        using var acquired = _lock.LockOrNull(_lockTimeout);
+        var acquired = _lock.Wait(_lockTimeout);
+        try
+        {
            if (_memoryCache.TryGetValue(CacheKey, out openApiDocument) && openApiDocument is not null)
            {
                return AdjustDocument(openApiDocument, host, basePath);
            }

-        if (acquired is null)
+            if (!acquired)
            {
                throw new InvalidOperationException("OpenApi document is generating");
            }
@@ -65,6 +67,14 @@ internal sealed class CachingOpenApiProvider : ISwaggerProvider
            _memoryCache.Set(CacheKey, openApiDocument, _cacheOptions);
            return AdjustDocument(openApiDocument, host, basePath);
        }
+        finally
+        {
+            if (acquired)
+            {
+                _lock.Release();
+            }
+        }
+    }

    private OpenApiDocument AdjustDocument(OpenApiDocument document, string? host, string? basePath)
    {
--- a/Jellyfin.Server/Migrations/Routines/RefreshCleanNames.cs
+++ b/Jellyfin.Server/Migrations/Routines/RefreshCleanNames.cs
@@ -1,105 +0,0 @@
-using System;
-using System.Diagnostics;
-using System.Linq;
-using System.Text;
-using System.Threading;
-using System.Threading.Tasks;
-using Jellyfin.Database.Implementations;
-using Jellyfin.Database.Implementations.Entities;
-using Jellyfin.Extensions;
-using Jellyfin.Server.Implementations.Item;
-using Jellyfin.Server.ServerSetupApp;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.Extensions.Logging;
-
-namespace Jellyfin.Server.Migrations.Routines;
-
-/// <summary>
-/// Migration to refresh CleanName values for all library items.
-/// </summary>
-[JellyfinMigration("2025-10-08T12:00:00", nameof(RefreshCleanNames))]
-[JellyfinMigrationBackup(JellyfinDb = true)]
-public class RefreshCleanNames : IAsyncMigrationRoutine
-{
-    private readonly IStartupLogger<RefreshCleanNames> _logger;
-    private readonly IDbContextFactory<JellyfinDbContext> _dbProvider;
-
-    /// <summary>
-    /// Initializes a new instance of the <see cref="RefreshCleanNames"/> class.
-    /// </summary>
-    /// <param name="logger">The logger.</param>
-    /// <param name="dbProvider">Instance of the <see cref="IDbContextFactory{JellyfinDbContext}"/> interface.</param>
-    public RefreshCleanNames(
-        IStartupLogger<RefreshCleanNames> logger,
-        IDbContextFactory<JellyfinDbContext> dbProvider)
-    {
-        _logger = logger;
-        _dbProvider = dbProvider;
-    }
-
-    /// <inheritdoc />
-    public async Task PerformAsync(CancellationToken cancellationToken)
-    {
-        const int Limit = 1000;
-        int itemCount = 0;
-
-        var sw = Stopwatch.StartNew();
-
-        using var context = _dbProvider.CreateDbContext();
-        var records = context.BaseItems.Count(b => !string.IsNullOrEmpty(b.Name));
-        _logger.LogInformation("Refreshing CleanName for {Count} library items", records);
-
-        var processedInPartition = 0;
-
-        await foreach (var item in context.BaseItems
-                          .Where(b => !string.IsNullOrEmpty(b.Name))
-                          .OrderBy(e => e.Id)
-                          .WithPartitionProgress((partition) => _logger.LogInformation("Processed: {Offset}/{Total} - Updated: {UpdatedCount} - Time: {Elapsed}", partition * Limit, records, itemCount, sw.Elapsed))
-                          .PartitionEagerAsync(Limit, cancellationToken)
-                          .WithCancellation(cancellationToken)
-                          .ConfigureAwait(false))
-        {
-            try
-            {
-                var newCleanName = string.IsNullOrWhiteSpace(item.Name) ? string.Empty : BaseItemRepository.GetCleanValue(item.Name);
-                if (!string.Equals(newCleanName, item.CleanName, StringComparison.Ordinal))
-                {
-                    _logger.LogDebug(
-                        "Updating CleanName for item {Id}: '{OldValue}' -> '{NewValue}'",
-                        item.Id,
-                        item.CleanName,
-                        newCleanName);
-                    item.CleanName = newCleanName;
-                    itemCount++;
-                }
-            }
-            catch (Exception ex)
-            {
-                _logger.LogWarning(ex, "Failed to update CleanName for item {Id} ({Name})", item.Id, item.Name);
-            }
-
-            processedInPartition++;
-
-            if (processedInPartition >= Limit)
-            {
-                await context.SaveChangesAsync(cancellationToken).ConfigureAwait(false);
-                // Clear tracked entities to avoid memory growth across partitions
-                context.ChangeTracker.Clear();
-                processedInPartition = 0;
-            }
-        }
-
-        // Save any remaining changes after the loop
-        if (processedInPartition > 0)
-        {
-            await context.SaveChangesAsync(cancellationToken).ConfigureAwait(false);
-            context.ChangeTracker.Clear();
-        }
-
-        _logger.LogInformation(
-            "Refreshed CleanName for {UpdatedCount} out of {TotalCount} items in {Time}",
-            itemCount,
-            records,
-            sw.Elapsed);
-    }
-}
--- a/Jellyfin.Server/Startup.cs
+++ b/Jellyfin.Server/Startup.cs
@@ -173,6 +173,9 @@ namespace Jellyfin.Server
                    mainApp.UseHttpsRedirection();
                }

+                // This must be injected before any path related middleware.
+                mainApp.UsePathTrim();
+
                if (appConfig.HostWebClient())
                {
                    var extensionProvider = new FileExtensionContentTypeProvider();
--- a/Jellyfin.sln
+++ b/Jellyfin.sln
@@ -1,7 +1,7 @@

 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 18
-VisualStudioVersion = 18.0.11222.15 d18.0
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.30503.244
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Jellyfin.Server", "Jellyfin.Server\Jellyfin.Server.csproj", "{07E39F42-A2C6-4B32-AF8C-725F957A73FF}"
 EndProject
@@ -30,7 +30,6 @@ EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{41093F42-C7CC-4D07-956B-6182CBEDE2EC}"
 	ProjectSection(SolutionItems) = preProject
 		.editorconfig = .editorconfig
-		Directory.Packages.props = Directory.Packages.props
 		SharedVersion.cs = SharedVersion.cs
 	EndProjectSection
 EndProject
--- a/MediaBrowser.Common/MediaBrowser.Common.csproj
+++ b/MediaBrowser.Common/MediaBrowser.Common.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">

  <!-- ProjectGuid is only included as a requirement for SonarQube analysis -->
  <PropertyGroup>
--- a/MediaBrowser.Controller/Entities/Folder.cs
+++ b/MediaBrowser.Controller/Entities/Folder.cs
@@ -1409,7 +1409,7 @@ namespace MediaBrowser.Controller.Entities
            if (this is BoxSet && (query.OrderBy is null || query.OrderBy.Count == 0))
            {
                realChildren = realChildren
-                    .OrderBy(e => e.PremiereDate ?? DateTime.MaxValue)
+                    .OrderBy(e => e.ProductionYear ?? int.MaxValue)
                    .ToArray();
            }

--- a/MediaBrowser.Controller/Entities/UserViewBuilder.cs
+++ b/MediaBrowser.Controller/Entities/UserViewBuilder.cs
@@ -455,7 +455,7 @@ namespace MediaBrowser.Controller.Entities
            var itemsArray = totalRecordLimit.HasValue ? items.Take(totalRecordLimit.Value).ToArray() : items.ToArray();
            var totalCount = itemsArray.Length;

-            if (query.Limit.HasValue && query.Limit.Value > 0)
+            if (query.Limit.HasValue)
            {
                itemsArray = itemsArray.Skip(query.StartIndex ?? 0).Take(query.Limit.Value).ToArray();
            }
--- a/MediaBrowser.Controller/IO/FileSystemHelper.cs
+++ b/MediaBrowser.Controller/IO/FileSystemHelper.cs
@@ -63,29 +63,6 @@ public static class FileSystemHelper
        }
    }

-    /// <summary>
-    /// Resolves a single link hop for the specified path.
-    /// </summary>
-    /// <remarks>
-    /// Returns <c>null</c> if the path is not a symbolic link or the filesystem does not support link resolution (e.g., exFAT).
-    /// </remarks>
-    /// <param name="path">The file path to resolve.</param>
-    /// <returns>
-    /// A <see cref="FileInfo"/> representing the next link target if the path is a link; otherwise, <c>null</c>.
-    /// </returns>
-    private static FileInfo? Resolve(string path)
-    {
-        try
-        {
-            return File.ResolveLinkTarget(path, returnFinalTarget: false) as FileInfo;
-        }
-        catch (IOException)
-        {
-            // Filesystem doesn't support links (e.g., exFAT).
-            return null;
-        }
-    }
-
    /// <summary>
    /// Gets the target of the specified file link.
    /// </summary>
@@ -107,26 +84,23 @@ public static class FileSystemHelper

        if (!returnFinalTarget)
        {
-            return Resolve(linkPath);
+            return File.ResolveLinkTarget(linkPath, returnFinalTarget: false) as FileInfo;
        }

-        var targetInfo = Resolve(linkPath);
-        if (targetInfo is null || !targetInfo.Exists)
+        if (File.ResolveLinkTarget(linkPath, returnFinalTarget: false) is not FileInfo targetInfo)
+        {
+            return null;
+        }
+
+        if (!targetInfo.Exists)
        {
            return targetInfo;
        }

        var currentPath = targetInfo.FullName;
        var visited = new HashSet<string>(StringComparer.Ordinal) { linkPath, currentPath };
-
-        while (true)
+        while (File.ResolveLinkTarget(currentPath, returnFinalTarget: false) is FileInfo linkInfo)
        {
-            var linkInfo = Resolve(currentPath);
-            if (linkInfo is null)
-            {
-                break;
-            }
-
            var targetPath = linkInfo.FullName;

            // If an infinite loop is detected, return the file info for the
--- a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
+++ b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
@@ -2378,13 +2378,6 @@ namespace MediaBrowser.Controller.MediaEncoding
                var requestHasSDR = requestedRangeTypes.Contains(VideoRangeType.SDR.ToString(), StringComparison.OrdinalIgnoreCase);
                var requestHasDOVI = requestedRangeTypes.Contains(VideoRangeType.DOVI.ToString(), StringComparison.OrdinalIgnoreCase);

-                // If SDR is the only supported range, we should not copy any of the HDR streams.
-                // All the following copy check assumes at least one HDR format is supported.
-                if (requestedRangeTypes.Length == 1 && requestHasSDR && videoStream.VideoRangeType != VideoRangeType.SDR)
-                {
-                    return false;
-                }
-
                // If the client does not support DOVI and the video stream is DOVI without fallback, we should not copy it.
                if (!requestHasDOVI && videoStream.VideoRangeType == VideoRangeType.DOVI)
                {
@@ -5949,37 +5942,28 @@ namespace MediaBrowser.Controller.MediaEncoding

                var isFullAfbcPipeline = isEncoderSupportAfbc && isDrmInDrmOut && !doOclTonemap;
                var swapOutputWandH = doRkVppTranspose && swapWAndH;
-                var outFormat = doOclTonemap ? "p010" : "nv12";
+                var outFormat = doOclTonemap ? "p010" : (isMjpegEncoder ? "bgra" : "nv12"); // RGA only support full range in rgb fmts
                var hwScaleFilter = GetHwScaleFilter("vpp", "rkrga", outFormat, swapOutputWandH, swpInW, swpInH, reqW, reqH, reqMaxW, reqMaxH);
-                var doScaling = !string.IsNullOrEmpty(GetHwScaleFilter("vpp", "rkrga", string.Empty, swapOutputWandH, swpInW, swpInH, reqW, reqH, reqMaxW, reqMaxH));
+                var doScaling = GetHwScaleFilter("vpp", "rkrga", string.Empty, swapOutputWandH, swpInW, swpInH, reqW, reqH, reqMaxW, reqMaxH);

                if (!hasSubs
                     || doRkVppTranspose
                     || !isFullAfbcPipeline
-                     || doScaling)
+                     || !string.IsNullOrEmpty(doScaling))
                {
-                    var isScaleRatioSupported = IsScaleRatioSupported(inW, inH, reqW, reqH, reqMaxW, reqMaxH, 8.0f);
-
                    // RGA3 hardware only support (1/8 ~ 8) scaling in each blit operation,
                    // but in Trickplay there's a case: (3840/320 == 12), enable 2pass for it
-                    if (doScaling && !isScaleRatioSupported)
+                    if (!string.IsNullOrEmpty(doScaling)
+                        && !IsScaleRatioSupported(inW, inH, reqW, reqH, reqMaxW, reqMaxH, 8.0f))
                    {
                        // Vendor provided BSP kernel has an RGA driver bug that causes the output to be corrupted for P010 format.
                        // Use NV15 instead of P010 to avoid the issue.
                        // SDR inputs are using BGRA formats already which is not affected.
-                        var intermediateFormat = doOclTonemap ? "nv15" : (isMjpegEncoder ? "bgra" : outFormat);
+                        var intermediateFormat = string.Equals(outFormat, "p010", StringComparison.OrdinalIgnoreCase) ? "nv15" : outFormat;
                        var hwScaleFilterFirstPass = $"scale_rkrga=w=iw/7.9:h=ih/7.9:format={intermediateFormat}:force_original_aspect_ratio=increase:force_divisible_by=4:afbc=1";
                        mainFilters.Add(hwScaleFilterFirstPass);
                    }

-                    // The RKMPP MJPEG encoder on some newer chip models no longer supports RGB input.
-                    // Use 2pass here to enable RGA output of full-range YUV in the 2nd pass.
-                    if (isMjpegEncoder && !doOclTonemap && ((doScaling && isScaleRatioSupported) || !doScaling))
-                    {
-                        var hwScaleFilterFirstPass = "vpp_rkrga=format=bgra:afbc=1";
-                        mainFilters.Add(hwScaleFilterFirstPass);
-                    }
-
                    if (!string.IsNullOrEmpty(hwScaleFilter) && doRkVppTranspose)
                    {
                        hwScaleFilter += $":transpose={transposeDir}";
--- a/MediaBrowser.Controller/Persistence/IItemRepository.cs
+++ b/MediaBrowser.Controller/Persistence/IItemRepository.cs
@@ -33,7 +33,7 @@ public interface IItemRepository
    /// <param name="cancellationToken">The cancellation token.</param>
    void SaveItems(IReadOnlyList<BaseItem> items, CancellationToken cancellationToken);

-    Task SaveImagesAsync(BaseItem item, CancellationToken cancellationToken = default);
+    void SaveImages(BaseItem item);

    /// <summary>
    /// Retrieves the item.
--- a/MediaBrowser.MediaEncoding/BdInfo/BdInfoDirectoryInfo.cs
+++ b/MediaBrowser.MediaEncoding/BdInfo/BdInfoDirectoryInfo.cs
@@ -1,4 +1,3 @@
-using System;
 using System.IO;
 using System.Linq;
 using BDInfo.IO;
@@ -59,8 +58,6 @@ public class BdInfoDirectoryInfo : IDirectoryInfo
        }
    }

-    private static bool IsHidden(ReadOnlySpan<char> name) => name.StartsWith('.');
-
    /// <summary>
    /// Gets the directories.
    /// </summary>
@@ -68,7 +65,6 @@ public class BdInfoDirectoryInfo : IDirectoryInfo
    public IDirectoryInfo[] GetDirectories()
    {
        return _fileSystem.GetDirectories(_impl.FullName)
-            .Where(d => !IsHidden(d.Name))
            .Select(x => new BdInfoDirectoryInfo(_fileSystem, x))
            .ToArray();
    }
@@ -80,7 +76,6 @@ public class BdInfoDirectoryInfo : IDirectoryInfo
    public IFileInfo[] GetFiles()
    {
        return _fileSystem.GetFiles(_impl.FullName)
-            .Where(d => !IsHidden(d.Name))
            .Select(x => new BdInfoFileInfo(x))
            .ToArray();
    }
@@ -93,7 +88,6 @@ public class BdInfoDirectoryInfo : IDirectoryInfo
    public IFileInfo[] GetFiles(string searchPattern)
    {
        return _fileSystem.GetFiles(_impl.FullName, new[] { searchPattern }, false, false)
-            .Where(d => !IsHidden(d.Name))
            .Select(x => new BdInfoFileInfo(x))
            .ToArray();
    }
@@ -111,7 +105,6 @@ public class BdInfoDirectoryInfo : IDirectoryInfo
                new[] { searchPattern },
                false,
                searchOption == SearchOption.AllDirectories)
-            .Where(d => !IsHidden(d.Name))
            .Select(x => new BdInfoFileInfo(x))
            .ToArray();
    }
--- a/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
+++ b/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
@@ -511,7 +511,7 @@ namespace MediaBrowser.MediaEncoding.Encoder
                ? "{0} -i {1} -threads {2} -v warning -print_format json -show_streams -show_chapters -show_format"
                : "{0} -i {1} -threads {2} -v warning -print_format json -show_streams -show_format";

-            if (protocol == MediaProtocol.File && !isAudio && _proberSupportsFirstVideoFrame)
+            if (!isAudio && _proberSupportsFirstVideoFrame)
            {
                args += " -show_frames -only_first_vframe";
            }
--- a/MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs
+++ b/MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs
@@ -13,10 +13,8 @@ using System.Threading;
 using System.Threading.Tasks;
 using AsyncKeyedLock;
 using MediaBrowser.Common;
-using MediaBrowser.Common.Configuration;
 using MediaBrowser.Common.Extensions;
 using MediaBrowser.Common.Net;
-using MediaBrowser.Controller.Configuration;
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.IO;
 using MediaBrowser.Controller.Library;
@@ -39,7 +37,6 @@ namespace MediaBrowser.MediaEncoding.Subtitles
        private readonly IMediaSourceManager _mediaSourceManager;
        private readonly ISubtitleParser _subtitleParser;
        private readonly IPathManager _pathManager;
-        private readonly IServerConfigurationManager _serverConfigurationManager;

        /// <summary>
        /// The _semaphoreLocks.
@@ -57,8 +54,7 @@ namespace MediaBrowser.MediaEncoding.Subtitles
            IHttpClientFactory httpClientFactory,
            IMediaSourceManager mediaSourceManager,
            ISubtitleParser subtitleParser,
-            IPathManager pathManager,
-            IServerConfigurationManager serverConfigurationManager)
+            IPathManager pathManager)
        {
            _logger = logger;
            _fileSystem = fileSystem;
@@ -67,7 +63,6 @@ namespace MediaBrowser.MediaEncoding.Subtitles
            _mediaSourceManager = mediaSourceManager;
            _subtitleParser = subtitleParser;
            _pathManager = pathManager;
-            _serverConfigurationManager = serverConfigurationManager;
        }

        private MemoryStream ConvertSubtitles(
@@ -399,8 +394,7 @@ namespace MediaBrowser.MediaEncoding.Subtitles

                try
                {
-                    var timeoutMinutes = _serverConfigurationManager.GetEncodingOptions().SubtitleExtractionTimeoutMinutes;
-                    await process.WaitForExitAsync(TimeSpan.FromMinutes(timeoutMinutes)).ConfigureAwait(false);
+                    await process.WaitForExitAsync(TimeSpan.FromMinutes(30)).ConfigureAwait(false);
                    exitCode = process.ExitCode;
                }
                catch (OperationCanceledException)
@@ -683,8 +677,7 @@ namespace MediaBrowser.MediaEncoding.Subtitles

                try
                {
-                    var timeoutMinutes = _serverConfigurationManager.GetEncodingOptions().SubtitleExtractionTimeoutMinutes;
-                    await process.WaitForExitAsync(TimeSpan.FromMinutes(timeoutMinutes)).ConfigureAwait(false);
+                    await process.WaitForExitAsync(TimeSpan.FromMinutes(30)).ConfigureAwait(false);
                    exitCode = process.ExitCode;
                }
                catch (OperationCanceledException)
@@ -835,8 +828,7 @@ namespace MediaBrowser.MediaEncoding.Subtitles

                try
                {
-                    var timeoutMinutes = _serverConfigurationManager.GetEncodingOptions().SubtitleExtractionTimeoutMinutes;
-                    await process.WaitForExitAsync(TimeSpan.FromMinutes(timeoutMinutes)).ConfigureAwait(false);
+                    await process.WaitForExitAsync(TimeSpan.FromMinutes(30)).ConfigureAwait(false);
                    exitCode = process.ExitCode;
                }
                catch (OperationCanceledException)
--- a/MediaBrowser.Model/Activity/IActivityManager.cs
+++ b/MediaBrowser.Model/Activity/IActivityManager.cs
@@ -1,3 +1,5 @@
+#pragma warning disable CS1591
+
 using System;
 using System.Threading.Tasks;
 using Jellyfin.Data.Events;
@@ -5,30 +7,14 @@ using Jellyfin.Data.Queries;
 using Jellyfin.Database.Implementations.Entities;
 using MediaBrowser.Model.Querying;

-namespace MediaBrowser.Model.Activity;
-
-/// <summary>
-/// Interface for the activity manager.
-/// </summary>
+namespace MediaBrowser.Model.Activity
+{
    public interface IActivityManager
    {
-    /// <summary>
-    /// The event that is triggered when an entity is created.
-    /// </summary>
        event EventHandler<GenericEventArgs<ActivityLogEntry>> EntryCreated;

-    /// <summary>
-    /// Create a new activity log entry.
-    /// </summary>
-    /// <param name="entry">The entry to create.</param>
-    /// <returns>A <see cref="Task"/> representing the asynchronous operation.</returns>
        Task CreateAsync(ActivityLog entry);

-    /// <summary>
-    /// Get a paged list of activity log entries.
-    /// </summary>
-    /// <param name="query">The activity log query.</param>
-    /// <returns>The page of entries.</returns>
        Task<QueryResult<ActivityLogEntry>> GetPagedResultAsync(ActivityLogQuery query);

        /// <summary>
@@ -38,3 +24,4 @@ public interface IActivityManager
        /// <returns>A <see cref="Task"/> representing the asynchronous operation.</returns>
        Task CleanAsync(DateTime startDate);
    }
+}
--- a/MediaBrowser.Model/Configuration/EncodingOptions.cs
+++ b/MediaBrowser.Model/Configuration/EncodingOptions.cs
@@ -57,7 +57,6 @@ public class EncodingOptions
        AllowHevcEncoding = false;
        AllowAv1Encoding = false;
        EnableSubtitleExtraction = true;
-        SubtitleExtractionTimeoutMinutes = 30;
        AllowOnDemandMetadataBasedKeyframeExtractionForExtensions = ["mkv"];
        HardwareDecodingCodecs = ["h264", "vc1"];
    }
@@ -287,11 +286,6 @@ public class EncodingOptions
    /// </summary>
    public bool EnableSubtitleExtraction { get; set; }

-    /// <summary>
-    /// Gets or sets the timeout for subtitle extraction in minutes.
-    /// </summary>
-    public int SubtitleExtractionTimeoutMinutes { get; set; }
-
    /// <summary>
    /// Gets or sets the codecs hardware encoding is used for.
    /// </summary>
--- a/MediaBrowser.Providers/Manager/MetadataService.cs
+++ b/MediaBrowser.Providers/Manager/MetadataService.cs
@@ -151,9 +151,9 @@ namespace MediaBrowser.Providers.Manager
                .ConfigureAwait(false);
            updateType |= beforeSaveResult;

-            if (isFirstRefresh)
+            if (!isFirstRefresh)
            {
-                await SaveItemAsync(metadataResult, ItemUpdateType.MetadataImport, cancellationToken).ConfigureAwait(false);
+                updateType = await SaveInternal(item, refreshOptions, updateType, isFirstRefresh, requiresRefresh, metadataResult, cancellationToken).ConfigureAwait(false);
            }

            // Next run metadata providers
--- a/src/Jellyfin.Extensions/EnumerableExtensions.cs
+++ b/src/Jellyfin.Extensions/EnumerableExtensions.cs
@@ -64,13 +64,13 @@ public static class EnumerableExtensions
    /// <typeparam name="T">The type of item.</typeparam>
    /// <returns>The IEnumerable{Enum}.</returns>
    public static IEnumerable<T> GetUniqueFlags<T>(this T flags)
-        where T : struct, Enum
+        where T : Enum
    {
-        foreach (T value in Enum.GetValues<T>())
+        foreach (Enum value in Enum.GetValues(flags.GetType()))
        {
            if (flags.HasFlag(value))
            {
-                yield return value;
+                yield return (T)value;
            }
        }
    }
--- a/src/Jellyfin.LiveTv/Channels/ChannelManager.cs
+++ b/src/Jellyfin.LiveTv/Channels/ChannelManager.cs
@@ -240,9 +240,12 @@ namespace Jellyfin.LiveTv.Channels
            var all = channels;
            var totalCount = all.Count;

+            if (query.StartIndex.HasValue || query.Limit.HasValue)
+            {
                int startIndex = query.StartIndex ?? 0;
-            int count = (query.Limit ?? 0) > 0 ? Math.Min(query.Limit.Value, totalCount - startIndex) : totalCount - startIndex;
-            all = all.GetRange(query.StartIndex ?? 0, count);
+                int count = query.Limit is null ? totalCount - startIndex : Math.Min(query.Limit.Value, totalCount - startIndex);
+                all = all.GetRange(startIndex, count);
+            }

            if (query.RefreshLatestChannelItems)
            {
--- a/src/Jellyfin.LiveTv/LiveTvManager.cs
+++ b/src/Jellyfin.LiveTv/LiveTvManager.cs
@@ -287,7 +287,7 @@ namespace Jellyfin.LiveTv
                GenreIds = query.GenreIds
            };

-            if (query.Limit.HasValue && query.Limit.Value > 0)
+            if (query.Limit.HasValue)
            {
                internalQuery.Limit = Math.Max(query.Limit.Value * 4, 200);
            }
@@ -305,7 +305,7 @@ namespace Jellyfin.LiveTv

            IEnumerable<BaseItem> programs = orderedPrograms;

-            if (query.Limit.HasValue && query.Limit.Value > 0)
+            if (query.Limit.HasValue)
            {
                programs = programs.Take(query.Limit.Value);
            }
--- a/tests/Jellyfin.Server.Implementations.Tests/Data/SearchPunctuationTests.cs
+++ b/tests/Jellyfin.Server.Implementations.Tests/Data/SearchPunctuationTests.cs
@@ -1,109 +0,0 @@
-using System;
-using AutoFixture;
-using AutoFixture.AutoMoq;
-using Jellyfin.Server.Implementations.Item;
-using MediaBrowser.Controller.Entities.TV;
-using Microsoft.Extensions.Configuration;
-using Moq;
-using Xunit;
-
-namespace Jellyfin.Server.Implementations.Tests.Data
-{
-    public class SearchPunctuationTests
-    {
-        private readonly IFixture _fixture;
-        private readonly BaseItemRepository _repo;
-
-        public SearchPunctuationTests()
-        {
-            var appHost = new Mock<MediaBrowser.Controller.IServerApplicationHost>();
-            appHost.Setup(x => x.ExpandVirtualPath(It.IsAny<string>()))
-                .Returns((string x) => x);
-            appHost.Setup(x => x.ReverseVirtualPath(It.IsAny<string>()))
-                .Returns((string x) => x);
-
-            var configSection = new Mock<IConfigurationSection>();
-            configSection
-                .SetupGet(x => x[It.Is<string>(s => s == MediaBrowser.Controller.Extensions.ConfigurationExtensions.SqliteCacheSizeKey)])
-                .Returns("0");
-            var config = new Mock<IConfiguration>();
-            config
-                .Setup(x => x.GetSection(It.Is<string>(s => s == MediaBrowser.Controller.Extensions.ConfigurationExtensions.SqliteCacheSizeKey)))
-                .Returns(configSection.Object);
-
-            _fixture = new Fixture().Customize(new AutoMoqCustomization { ConfigureMembers = true });
-            _fixture.Inject(appHost.Object);
-            _fixture.Inject(config.Object);
-
-            _repo = _fixture.Create<BaseItemRepository>();
-        }
-
-        [Fact]
-        public void CleanName_keeps_punctuation_and_search_without_punctuation_passes()
-        {
-            var series = new Series
-            {
-                Id = Guid.NewGuid(),
-                Name = "Mr. Robot"
-            };
-
-            series.SortName = "Mr. Robot";
-
-            var entity = _repo.Map(series);
-            Assert.Equal("mr robot", entity.CleanName);
-
-            var searchTerm = "Mr Robot".ToLowerInvariant();
-
-            Assert.Contains(searchTerm, entity.CleanName ?? string.Empty, StringComparison.OrdinalIgnoreCase);
-        }
-
-        [Theory]
-        [InlineData("Spider-Man: Homecoming", "spider man homecoming")]
-        [InlineData("Beyoncé — Live!", "beyonce live")]
-        [InlineData("Hello, World!", "hello world")]
-        [InlineData("(The) Good, the Bad & the Ugly", "the good the bad the ugly")]
-        [InlineData("Wall-E", "wall e")]
-        [InlineData("No. 1: The Beginning", "no 1 the beginning")]
-        [InlineData("Café-au-lait", "cafe au lait")]
-        public void CleanName_normalizes_various_punctuation(string title, string expectedClean)
-        {
-            var series = new Series
-            {
-                Id = Guid.NewGuid(),
-                Name = title
-            };
-
-            series.SortName = title;
-
-            var entity = _repo.Map(series);
-
-            Assert.Equal(expectedClean, entity.CleanName);
-
-            // Ensure a search term without punctuation would match
-            var searchTerm = expectedClean;
-            Assert.Contains(searchTerm, entity.CleanName ?? string.Empty, StringComparison.OrdinalIgnoreCase);
-        }
-
-        [Theory]
-        [InlineData("Face/Off", "face off")]
-        [InlineData("V/H/S", "v h s")]
-        public void CleanName_normalizes_titles_withslashes(string title, string expectedClean)
-        {
-            var series = new Series
-            {
-                Id = Guid.NewGuid(),
-                Name = title
-            };
-
-            series.SortName = title;
-
-            var entity = _repo.Map(series);
-
-            Assert.Equal(expectedClean, entity.CleanName);
-
-            // Ensure a search term without punctuation would match
-            var searchTerm = expectedClean;
-            Assert.Contains(searchTerm, entity.CleanName ?? string.Empty, StringComparison.OrdinalIgnoreCase);
-        }
-    }
-}