Bump version to 10.10.5

Fix parallel use of not thread-safe SubtitleFormat instance

.config/dotnet-tools.json

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

.devcontainer/Dev - Server Ffmpeg/devcontainer.json

@@ -0,0 +1,28 @@
+{
+    "name": "Development Jellyfin Server - FFmpeg",
+    "image":"mcr.microsoft.com/devcontainers/dotnet:8.0-jammy",
+    // restores nuget packages, installs the dotnet workloads and installs the dev https certificate
+    "postStartCommand": "dotnet restore; dotnet workload update; dotnet dev-certs https --trust; sudo bash \"./.devcontainer/Dev - Server Ffmpeg/install-ffmpeg.sh\"",
+    // reads the extensions list and installs them
+    "postAttachCommand": "cat .vscode/extensions.json | jq -r .recommendations[] | xargs -n 1 code --install-extension",
+    "features": {
+        "ghcr.io/devcontainers/features/dotnet:2": {
+            "version": "none",
+            "dotnetRuntimeVersions": "8.0",
+            "aspNetCoreRuntimeVersions": "8.0"
+        },
+        "ghcr.io/devcontainers-contrib/features/apt-packages:1": {
+            "preserve_apt_list": false,
+            "packages": ["libfontconfig1"]
+        },
+        "ghcr.io/devcontainers/features/docker-in-docker:2": {
+            "dockerDashComposeVersion": "v2"
+        },
+        "ghcr.io/devcontainers/features/github-cli:1": {},
+        "ghcr.io/eitsupi/devcontainer-features/jq-likes:2": {}
+    },
+    "hostRequirements": {
+        "memory": "8gb",
+        "cpus": 4
+    }
+}

.devcontainer/Dev - Server Ffmpeg/install-ffmpeg.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-## configure the following for a manual install of a specific version from the repo
+## configure the following for a manuall install of a specific version from the repo
 
 # wget https://repo.jellyfin.org/releases/server/ubuntu/versions/jellyfin-ffmpeg/6.0.1-1/jellyfin-ffmpeg6_6.0.1-1-jammy_amd64.deb -O ffmpeg.deb
 
@@ -29,4 +29,4 @@ Signed-By: /etc/apt/keyrings/jellyfin.gpg
 EOF
 
 sudo apt update -y
-sudo apt install jellyfin-ffmpeg7 -y
+sudo apt install jellyfin-ffmpeg6 -y

.devcontainer/devcontainer.json

@@ -1,23 +1,19 @@
 {
     "name": "Development Jellyfin Server",
-    "image": "mcr.microsoft.com/devcontainers/dotnet:9.0-bookworm",
-    "service": "app",
-    "workspaceFolder": "/workspaces/${localWorkspaceFolderBasename}",
+    "image":"mcr.microsoft.com/devcontainers/dotnet:8.0-jammy",
     // restores nuget packages, installs the dotnet workloads and installs the dev https certificate
-    "postStartCommand": "sudo dotnet restore; sudo dotnet workload update; sudo dotnet dev-certs https --trust; sudo bash \"./.devcontainer/install-ffmpeg.sh\"",
+    "postStartCommand": "dotnet restore; dotnet workload update; dotnet dev-certs https --trust",
     // reads the extensions list and installs them
     "postAttachCommand": "cat .vscode/extensions.json | jq -r .recommendations[] | xargs -n 1 code --install-extension",
     "features": {
         "ghcr.io/devcontainers/features/dotnet:2": {
             "version": "none",
-            "dotnetRuntimeVersions": "9.0",
-            "aspNetCoreRuntimeVersions": "9.0"
+            "dotnetRuntimeVersions": "8.0",
+            "aspNetCoreRuntimeVersions": "8.0"
         },
         "ghcr.io/devcontainers-contrib/features/apt-packages:1": {
             "preserve_apt_list": false,
-            "packages": [
-                "libfontconfig1"
-            ]
+            "packages": ["libfontconfig1"]
         },
         "ghcr.io/devcontainers/features/docker-in-docker:2": {
             "dockerDashComposeVersion": "v2"

.editorconfig

@@ -192,341 +192,3 @@ csharp_space_between_method_call_empty_parameter_list_parentheses = false
 # Wrapping preferences
 csharp_preserve_single_line_statements = true
 csharp_preserve_single_line_blocks = true
-
-###############################
-# C# Analyzer Rules           #
-###############################
-### ERROR #
-###########
-# error on SA1000: The keyword 'new' should be followed by a space
-dotnet_diagnostic.SA1000.severity = error
-
-# error on SA1001: Commas should not be preceded by whitespace
-dotnet_diagnostic.SA1001.severity = error
-
-# error on SA1106: Code should not contain empty statements
-dotnet_diagnostic.SA1106.severity = error
-
-# error on SA1107: Code should not contain multiple statements on one line
-dotnet_diagnostic.SA1107.severity = error
-
-# error on SA1028: Code should not contain trailing whitespace
-dotnet_diagnostic.SA1028.severity = error
-
-# error on SA1117: The parameters should all be placed on the same line or each parameter should be placed on its own line
-dotnet_diagnostic.SA1117.severity = error
-
-# error on SA1137: Elements should have the same indentation
-dotnet_diagnostic.SA1137.severity = error
-
-# error on SA1142: Refer to tuple fields by name
-dotnet_diagnostic.SA1142.severity = error
-
-# error on SA1210: Using directives should be ordered alphabetically by the namespaces
-dotnet_diagnostic.SA1210.severity = error
-
-# error on SA1316: Tuple element names should use correct casing
-dotnet_diagnostic.SA1316.severity = error
-
-# error on SA1414: Tuple types in signatures should have element names
-dotnet_diagnostic.SA1414.severity = error
-
-# disable warning SA1513: Closing brace should be followed by blank line
-dotnet_diagnostic.SA1513.severity = error
-
-# error on SA1518: File is required to end with a single newline character
-dotnet_diagnostic.SA1518.severity = error
-
-# error on SA1629: Documentation text should end with a period
-dotnet_diagnostic.SA1629.severity = error
-
-# error on CA1001: Types that own disposable fields should be disposable
-dotnet_diagnostic.CA1001.severity = error
-
-# error on CA1012: Abstract types should not have public constructors
-dotnet_diagnostic.CA1012.severity = error
-
-# error on CA1063: Implement IDisposable correctly
-dotnet_diagnostic.CA1063.severity = error
-
-# error on CA1305: Specify IFormatProvider
-dotnet_diagnostic.CA1305.severity = error
-
-# error on CA1307: Specify StringComparison for clarity
-dotnet_diagnostic.CA1307.severity = error
-
-# error on CA1309: Use ordinal StringComparison
-dotnet_diagnostic.CA1309.severity = error
-
-# error on CA1310: Specify StringComparison for correctness
-dotnet_diagnostic.CA1310.severity = error
-
-# error on CA1513: Use 'ObjectDisposedException.ThrowIf' instead of explicitly throwing a new exception instance
-dotnet_diagnostic.CA1513.severity = error
-
-# error on CA1725: Parameter names should match base declaration
-dotnet_diagnostic.CA1725.severity = error
-
-# error on CA1725: Call async methods when in an async method
-dotnet_diagnostic.CA1727.severity = error
-
-# error on CA1813: Avoid unsealed attributes
-dotnet_diagnostic.CA1813.severity = error
-
-# error on CA1834: Use 'StringBuilder.Append(char)' instead of 'StringBuilder.Append(string)' when the input is a constant unit string
-dotnet_diagnostic.CA1834.severity = error
-
-# error on CA1843: Do not use 'WaitAll' with a single task
-dotnet_diagnostic.CA1843.severity = error
-
-# error on CA1845: Use span-based 'string.Concat'
-dotnet_diagnostic.CA1845.severity = error
-
-# error on CA1849: Call async methods when in an async method
-dotnet_diagnostic.CA1849.severity = error
-
-# error on CA1851: Possible multiple enumerations of IEnumerable collection
-dotnet_diagnostic.CA1851.severity = error
-
-# error on CA1854: Prefer a 'TryGetValue' call over a Dictionary indexer access guarded by a 'ContainsKey' check to avoid double lookup
-dotnet_diagnostic.CA1854.severity = error
-
-# error on CA1860: Avoid using 'Enumerable.Any()' extension method
-dotnet_diagnostic.CA1860.severity = error
-
-# error on CA1862: Use the 'StringComparison' method overloads to perform case-insensitive string comparisons
-dotnet_diagnostic.CA1862.severity = error
-
-# error on CA1863: Use 'CompositeFormat'
-dotnet_diagnostic.CA1863.severity = error
-
-# error on CA1864: Prefer the 'IDictionary.TryAdd(TKey, TValue)' method
-dotnet_diagnostic.CA1864.severity = error
-
-# error on CA1865-CA1867: Use 'string.Method(char)' instead of 'string.Method(string)' for string with single char
-dotnet_diagnostic.CA1865.severity = error
-dotnet_diagnostic.CA1866.severity = error
-dotnet_diagnostic.CA1867.severity = error
-
-# error on CA1868: Unnecessary call to 'Contains' for sets
-dotnet_diagnostic.CA1868.severity = error
-
-# error on CA1869: Cache and reuse 'JsonSerializerOptions' instances
-dotnet_diagnostic.CA1869.severity = error
-
-# error on CA1870: Use a cached 'SearchValues' instance
-dotnet_diagnostic.CA1870.severity = error
-
-# error on CA1871: Do not pass a nullable struct to 'ArgumentNullException.ThrowIfNull'
-dotnet_diagnostic.CA1871.severity = error
-
-# error on CA1872: Prefer 'Convert.ToHexString' and 'Convert.ToHexStringLower' over call chains based on 'BitConverter.ToString'
-dotnet_diagnostic.CA1872.severity = error
-
-# error on CA2016: Forward the CancellationToken parameter to methods that take one
-#  or pass in 'CancellationToken.None' explicitly to indicate intentionally not propagating the token
-dotnet_diagnostic.CA2016.severity = error
-
-# error on CA2201: Exception type System.Exception is not sufficiently specific
-dotnet_diagnostic.CA2201.severity = error
-
-# error on CA2215: Dispose methods should call base class dispose
-dotnet_diagnostic.CA2215.severity = error
-
-# error on CA2249: Use 'string.Contains' instead of 'string.IndexOf' to improve readability
-dotnet_diagnostic.CA2249.severity = error
-
-# error on CA2254: Template should be a static expression
-dotnet_diagnostic.CA2254.severity = error
-
-################
-### SUGGESTION #
-################
-# disable warning CA1014: Mark assemblies with CLSCompliantAttribute
-dotnet_diagnostic.CA1014.severity = suggestion
-
-# disable warning CA1024: Use properties where appropriate
-dotnet_diagnostic.CA1024.severity = suggestion
-
-# disable warning CA1031: Do not catch general exception types
-dotnet_diagnostic.CA1031.severity = suggestion
-
-# disable warning CA1032: Implement standard exception constructors
-dotnet_diagnostic.CA1032.severity = suggestion
-
-# disable warning CA1040: Avoid empty interfaces
-dotnet_diagnostic.CA1040.severity = suggestion
-
-# disable warning CA1062: Validate arguments of public methods
-dotnet_diagnostic.CA1062.severity = suggestion
-
-# TODO: enable when false positives are fixed
-# disable warning CA1508: Avoid dead conditional code
-dotnet_diagnostic.CA1508.severity = suggestion
-
-# disable warning CA1515: Consider making public types internal
-dotnet_diagnostic.CA1515.severity = suggestion
-
-# disable warning CA1716: Identifiers should not match keywords
-dotnet_diagnostic.CA1716.severity = suggestion
-
-# disable warning CA1720: Identifiers should not contain type names
-dotnet_diagnostic.CA1720.severity = suggestion
-
-# disable warning CA1724: Type names should not match namespaces
-dotnet_diagnostic.CA1724.severity = suggestion
-
-# disable warning CA1805: Do not initialize unnecessarily
-dotnet_diagnostic.CA1805.severity = suggestion
-
-# disable warning CA1812: internal class that is apparently never instantiated.
-# If so, remove the code from the assembly.
-# If this class is intended to contain only static members, make it static
-dotnet_diagnostic.CA1812.severity = suggestion
-
-# disable warning CA1822: Member does not access instance data and can be marked as static
-dotnet_diagnostic.CA1822.severity = suggestion
-
-# CA1859: Use concrete types when possible for improved performance
-dotnet_diagnostic.CA1859.severity = suggestion
-
-# TODO: Enable
-# CA1861: Prefer 'static readonly' fields over constant array arguments if the called method is called repeatedly and is not mutating the passed array
-dotnet_diagnostic.CA1861.severity = suggestion
-
-# disable warning CA2000: Dispose objects before losing scope
-dotnet_diagnostic.CA2000.severity = suggestion
-
-# disable warning CA2253: Named placeholders should not be numeric values
-dotnet_diagnostic.CA2253.severity = suggestion
-
-# disable warning CA5394: Do not use insecure randomness
-dotnet_diagnostic.CA5394.severity = suggestion
-
-# error on CA3003: Review code for file path injection vulnerabilities
-dotnet_diagnostic.CA3003.severity = suggestion
-
-# error on CA3006: Review code for process command injection vulnerabilities
-dotnet_diagnostic.CA3006.severity = suggestion
-
-###############
-### DISABLED  #
-###############
-# disable warning SA1009: Closing parenthesis should be followed by a space.
-dotnet_diagnostic.SA1009.severity = none
-
-# disable warning SA1011: Closing square bracket should be followed by a space.
-dotnet_diagnostic.SA1011.severity = none
-
-# disable warning SA1101: Prefix local calls with 'this.'
-dotnet_diagnostic.SA1101.severity = none
-
-# disable warning SA1108: Block statements should not contain embedded comments
-dotnet_diagnostic.SA1108.severity = none
-
-# disable warning SA1118: Parameter must not span multiple lines.
-dotnet_diagnostic.SA1118.severity = none
-
-# disable warning SA1128:: Put constructor initializers on their own line
-dotnet_diagnostic.SA1128.severity = none
-
-# disable warning SA1130: Use lambda syntax
-dotnet_diagnostic.SA1130.severity = none
-
-# disable warning SA1200: 'using' directive must appear within a namespace declaration
-dotnet_diagnostic.SA1200.severity = none
-
-# disable warning SA1202: 'public' members must come before 'private' members
-dotnet_diagnostic.SA1202.severity = none
-
-# disable warning SA1204: Static members must appear before non-static members
-dotnet_diagnostic.SA1204.severity = none
-
-# disable warning SA1309: Fields must not begin with an underscore
-dotnet_diagnostic.SA1309.severity = none
-
-# disable warning SA1311: Static readonly fields should begin with upper-case letter
-dotnet_diagnostic.SA1311.severity = none
-
-# disable warning SA1413: Use trailing comma in multi-line initializers
-dotnet_diagnostic.SA1413.severity = none
-
-# disable warning SA1512: Single-line comments must not be followed by blank line
-dotnet_diagnostic.SA1512.severity = none
-
-# disable warning SA1515: Single-line comment should be preceded by blank line
-dotnet_diagnostic.SA1515.severity = none
-
-# disable warning SA1600: Elements should be documented
-dotnet_diagnostic.SA1600.severity = none
-
-# disable warning SA1601: Partial elements should be documented
-dotnet_diagnostic.SA1601.severity = none
-
-# disable warning SA1602: Enumeration items should be documented
-dotnet_diagnostic.SA1602.severity = none
-
-# disable warning SA1633: The file header is missing or not located at the top of the file
-dotnet_diagnostic.SA1633.severity = none
-
-# disable warning CA1054: Change the type of parameter url from string to System.Uri
-dotnet_diagnostic.CA1054.severity = none
-
-# disable warning CA1055: URI return values should not be strings
-dotnet_diagnostic.CA1055.severity = none
-
-# disable warning CA1056: URI properties should not be strings
-dotnet_diagnostic.CA1056.severity = none
-
-# disable warning CA1303: Do not pass literals as localized parameters
-dotnet_diagnostic.CA1303.severity = none
-
-# disable warning CA1308: Normalize strings to uppercase
-dotnet_diagnostic.CA1308.severity = none
-
-# disable warning CA1848: Use the LoggerMessage delegates
-dotnet_diagnostic.CA1848.severity = none
-
-# disable warning CA2101: Specify marshaling for P/Invoke string arguments
-dotnet_diagnostic.CA2101.severity = none
-
-# disable warning CA2234: Pass System.Uri objects instead of strings
-dotnet_diagnostic.CA2234.severity = none
-
-# error on RS0030: Do not used banned APIs
-dotnet_diagnostic.RS0030.severity = error
-
-# disable warning IDISP001: Dispose created
-dotnet_diagnostic.IDISP001.severity = suggestion
-
-# TODO: Enable when false positives are fixed
-# disable warning IDISP003: Dispose previous before re-assigning
-dotnet_diagnostic.IDISP003.severity = suggestion
-
-# disable warning IDISP004: Don't ignore created IDisposable
-dotnet_diagnostic.IDISP004.severity = suggestion
-
-# disable warning IDISP007: Don't dispose injected
-dotnet_diagnostic.IDISP007.severity = suggestion
-
-# disable warning IDISP008: Don't assign member with injected and created disposables
-dotnet_diagnostic.IDISP008.severity = suggestion
-
-[tests/**.{cs,vb}]
-# disable warning SA0001: XML comment analysis is disabled due to project configuration
-dotnet_diagnostic.SA0001.severity = none
-
-# disable warning CA1707: Identifiers should not contain underscores
-dotnet_diagnostic.CA1707.severity = none
-
-# disable warning CA2007: Consider calling ConfigureAwait on the awaited task
-dotnet_diagnostic.CA2007.severity = none
-
-# disable warning CA2234: Pass system uri objects instead of strings
-dotnet_diagnostic.CA2234.severity = suggestion
-
-# disable warning xUnit1028: Test methods must have a supported return type.
-dotnet_diagnostic.xUnit1028.severity = none
-
-# CA1826: Do not use Enumerable methods on indexable collections
-dotnet_diagnostic.CA1826.severity = suggestion

.github/ISSUE_TEMPLATE/issue report.yml

@@ -14,7 +14,7 @@ body:
       label: "This issue respects the following points:"
       description: All conditions are **required**. Failure to comply with any of these conditions may cause your issue to be closed without comment.
       options:
-        - label: This is a **bug**, not a question or a configuration issue; Please visit our [forum or chat rooms](https://jellyfin.org/contact/) first to troubleshoot with volunteers, before creating a report.
+        - label: This is a **bug**, not a question or a configuration issue; Please visit our forum or chat rooms first to troubleshoot with volunteers, before creating a report. The links can be found [here](https://jellyfin.org/contact/).
           required: true
         - label: This issue is **not** already reported on [GitHub](https://github.com/jellyfin/jellyfin/issues?q=is%3Aopen+is%3Aissue) _(I've searched it)_.
           required: true
@@ -86,7 +86,7 @@ body:
       label: Jellyfin Server version
       description: What version of Jellyfin are you using?
       options:
-        - 10.10.0+
+        - 10.9.11+
         - Master
         - Unstable
         - Older*

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

@@ -22,16 +22,16 @@ jobs:
     - name: Checkout repository
       uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
     - name: Setup .NET
-      uses: actions/setup-dotnet@67a3573c9a986a3f9c594539f4ab511d57bb3ce9 # v4.3.1
+      uses: actions/setup-dotnet@3e891b0cb619bf60e2c25674b222b8940e2c1c25 # v4.1.0
       with:
-        dotnet-version: '9.0.x'
+        dotnet-version: '8.0.x'
 
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@45775bd8235c68ba998cffa5171334d58593da47 # v3.28.15
+      uses: github/codeql-action/init@662472033e021d55d94146f66f6058822b0b39fd # v3.27.0
       with:
         languages: ${{ matrix.language }}
         queries: +security-extended
     - name: Autobuild
-      uses: github/codeql-action/autobuild@45775bd8235c68ba998cffa5171334d58593da47 # v3.28.15
+      uses: github/codeql-action/autobuild@662472033e021d55d94146f66f6058822b0b39fd # v3.27.0
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@45775bd8235c68ba998cffa5171334d58593da47 # v3.28.15
+      uses: github/codeql-action/analyze@662472033e021d55d94146f66f6058822b0b39fd # v3.27.0

.github/workflows/ci-compat.yml

@@ -16,17 +16,12 @@ jobs:
           ref: ${{ github.event.pull_request.head.sha }}
           repository: ${{ github.event.pull_request.head.repo.full_name }}
 
-      - name: Setup .NET
-        uses: actions/setup-dotnet@67a3573c9a986a3f9c594539f4ab511d57bb3ce9 # v4.3.1
-        with:
-          dotnet-version: '9.0.x'
-
       - name: Build
         run: |
           dotnet build Jellyfin.Server -o ./out
 
       - name: Upload Head
-        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
+        uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
         with:
           name: abi-head
           retention-days: 14
@@ -46,11 +41,6 @@ jobs:
           repository: ${{ github.event.pull_request.head.repo.full_name }}
           fetch-depth: 0
 
-      - name: Setup .NET
-        uses: actions/setup-dotnet@67a3573c9a986a3f9c594539f4ab511d57bb3ce9 # v4.3.1
-        with:
-          dotnet-version: '9.0.x'
-
       - name: Checkout common ancestor
         env:
           HEAD_REF: ${{ github.head_ref }}
@@ -65,7 +55,7 @@ jobs:
           dotnet build Jellyfin.Server -o ./out
 
       - name: Upload Head
-        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
+        uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
         with:
           name: abi-base
           retention-days: 14
@@ -85,13 +75,13 @@ jobs:
 
     steps:
       - name: Download abi-head
-        uses: actions/download-artifact@95815c38cf2ff2164869cbab79da8d1f422bc89e # v4.2.1
+        uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8
         with:
           name: abi-head
           path: abi-head
 
       - name: Download abi-base
-        uses: actions/download-artifact@95815c38cf2ff2164869cbab79da8d1f422bc89e # v4.2.1
+        uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8
         with:
           name: abi-base
           path: abi-base

.github/workflows/ci-openapi.yml

@@ -21,18 +21,18 @@ jobs:
           ref: ${{ github.event.pull_request.head.sha }}
           repository: ${{ github.event.pull_request.head.repo.full_name }}
       - name: Setup .NET
-        uses: actions/setup-dotnet@67a3573c9a986a3f9c594539f4ab511d57bb3ce9 # v4.3.1
+        uses: actions/setup-dotnet@3e891b0cb619bf60e2c25674b222b8940e2c1c25 # v4.1.0
         with:
-          dotnet-version: '9.0.x'
+          dotnet-version: '8.0.x'
       - name: Generate openapi.json
         run: dotnet test tests/Jellyfin.Server.Integration.Tests/Jellyfin.Server.Integration.Tests.csproj -c Release --filter "Jellyfin.Server.Integration.Tests.OpenApiSpecTests"
       - name: Upload openapi.json
-        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
+        uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
         with:
           name: openapi-head
           retention-days: 14
           if-no-files-found: error
-          path: tests/Jellyfin.Server.Integration.Tests/bin/Release/net9.0/openapi.json
+          path: tests/Jellyfin.Server.Integration.Tests/bin/Release/net8.0/openapi.json
 
   openapi-base:
     name: OpenAPI - BASE
@@ -55,18 +55,18 @@ jobs:
           ANCESTOR_REF=$(git merge-base upstream/${{ github.base_ref }} origin/$HEAD_REF)
           git checkout --progress --force $ANCESTOR_REF
       - name: Setup .NET
-        uses: actions/setup-dotnet@67a3573c9a986a3f9c594539f4ab511d57bb3ce9 # v4.3.1
+        uses: actions/setup-dotnet@3e891b0cb619bf60e2c25674b222b8940e2c1c25 # v4.1.0
         with:
-          dotnet-version: '9.0.x'
+          dotnet-version: '8.0.x'
       - name: Generate openapi.json
         run: dotnet test tests/Jellyfin.Server.Integration.Tests/Jellyfin.Server.Integration.Tests.csproj -c Release --filter "Jellyfin.Server.Integration.Tests.OpenApiSpecTests"
       - name: Upload openapi.json
-        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
+        uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
         with:
           name: openapi-base
           retention-days: 14
           if-no-files-found: error
-          path: tests/Jellyfin.Server.Integration.Tests/bin/Release/net9.0/openapi.json
+          path: tests/Jellyfin.Server.Integration.Tests/bin/Release/net8.0/openapi.json
 
   openapi-diff:
     permissions:
@@ -80,12 +80,12 @@ jobs:
       - openapi-base
     steps:
       - name: Download openapi-head
-        uses: actions/download-artifact@95815c38cf2ff2164869cbab79da8d1f422bc89e # v4.2.1
+        uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8
         with:
           name: openapi-head
           path: openapi-head
       - name: Download openapi-base
-        uses: actions/download-artifact@95815c38cf2ff2164869cbab79da8d1f422bc89e # v4.2.1
+        uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8
         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@95815c38cf2ff2164869cbab79da8d1f422bc89e # v4.2.1
+        uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8
         with:
           name: openapi-head
           path: openapi-head
@@ -172,7 +172,7 @@ jobs:
           strip_components: 1
           target: "/srv/incoming/openapi/unstable/jellyfin-openapi-${{ env.JELLYFIN_VERSION }}"
       - name: Move openapi.json (unstable) into place
-        uses: appleboy/ssh-action@2ead5e36573f08b82fbfce1504f1a4b05a647c6f # v1.2.2
+        uses: appleboy/ssh-action@25ce8cbbcb08177468c7ff7ec5cbfa236f9341e1 # v1.1.0
         with:
           host: "${{ secrets.REPO_HOST }}"
           username: "${{ secrets.REPO_USER }}"
@@ -220,7 +220,7 @@ jobs:
         run: |-
           echo "JELLYFIN_VERSION=${GITHUB_REF#refs/tags/v}" >> $GITHUB_ENV
       - name: Download openapi-head
-        uses: actions/download-artifact@95815c38cf2ff2164869cbab79da8d1f422bc89e # v4.2.1
+        uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8
         with:
           name: openapi-head
           path: openapi-head
@@ -234,7 +234,7 @@ jobs:
           strip_components: 1
           target: "/srv/incoming/openapi/stable/jellyfin-openapi-${{ env.JELLYFIN_VERSION }}"
       - name: Move openapi.json (stable) into place
-        uses: appleboy/ssh-action@2ead5e36573f08b82fbfce1504f1a4b05a647c6f # v1.2.2
+        uses: appleboy/ssh-action@25ce8cbbcb08177468c7ff7ec5cbfa236f9341e1 # v1.1.0
         with:
           host: "${{ secrets.REPO_HOST }}"
           username: "${{ secrets.REPO_USER }}"

.github/workflows/ci-tests.yml

@@ -9,20 +9,19 @@ on:
   pull_request:
 
 env:
-  SDK_VERSION: "9.0.x"
+  SDK_VERSION: "8.0.x"
 
 jobs:
   run-tests:
     strategy:
       matrix:
         os: ["ubuntu-latest", "macos-latest", "windows-latest"]
-      fail-fast: false
 
     runs-on: "${{ matrix.os }}"
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
 
-      - uses: actions/setup-dotnet@67a3573c9a986a3f9c594539f4ab511d57bb3ce9 # v4.3.1
+      - uses: actions/setup-dotnet@3e891b0cb619bf60e2c25674b222b8940e2c1c25 # v4.1.0
         with:
           dotnet-version: ${{ env.SDK_VERSION }}
 
@@ -35,7 +34,7 @@ jobs:
           --verbosity minimal
 
       - name: Merge code coverage results
-        uses: danielpalme/ReportGenerator-GitHub-Action@25b1e0261a9f68d7874dbbace168300558ef68f7 # v5.4.5
+        uses: danielpalme/ReportGenerator-GitHub-Action@62f9e70ab348d56eee76d446b4db903a85ab0ea8 # v5.3.11
         with:
           reports: "**/coverage.cobertura.xml"
           targetdir: "merged/"

.github/workflows/commands.yml

@@ -34,6 +34,94 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.JF_BOT_TOKEN }}
 
+  check-backport:
+    permissions:
+      contents: read
+
+    name: Check Backport
+    if: ${{ ( github.event.issue.pull_request && contains(github.event.comment.body, '@jellyfin-bot check backport') ) || github.event.label.name == 'stable backport' || contains(github.event.pull_request.labels.*.name, 'stable backport' ) }}
+    runs-on: ubuntu-latest
+    steps:
+      - name: Notify as seen
+        uses: peter-evans/create-or-update-comment@71345be0265236311c031f5c7866368bd1eff043 # v4.0.0
+        if: ${{ github.event.comment != null }}
+        with:
+          token: ${{ secrets.JF_BOT_TOKEN }}
+          comment-id: ${{ github.event.comment.id }}
+          reactions: eyes
+
+      - name: Checkout the latest code
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+        with:
+          token: ${{ secrets.JF_BOT_TOKEN }}
+          fetch-depth: 0
+
+      - name: Notify as running
+        id: comment_running
+        uses: peter-evans/create-or-update-comment@71345be0265236311c031f5c7866368bd1eff043 # v4.0.0
+        if: ${{ github.event.comment != null }}
+        with:
+          token: ${{ secrets.JF_BOT_TOKEN }}
+          issue-number: ${{ github.event.issue.number }}
+          body: |
+            Running backport tests...
+
+      - name: Perform test backport
+        id: run_tests
+        run: |
+          set +o errexit
+          git config --global user.name "Jellyfin Bot"
+          git config --global user.email "team@jellyfin.org"
+          CURRENT_BRANCH="origin/${GITHUB_HEAD_REF}"
+          git checkout master
+          git merge --no-ff ${CURRENT_BRANCH}
+          MERGE_COMMIT_HASH=$( git log -q -1 | head -1 | awk '{ print $2 }' )
+          git fetch --all
+          CURRENT_STABLE=$( git branch -r | grep 'origin/release' | sort -rV | head -1 | awk -F '/' '{ print $NF }' )
+          stable_branch="Current stable release branch: ${CURRENT_STABLE}"
+          echo ${stable_branch}
+          echo ::set-output name=branch::${stable_branch}
+          git checkout -t origin/${CURRENT_STABLE} -b ${CURRENT_STABLE}
+          git cherry-pick -sx -m1 ${MERGE_COMMIT_HASH} &>output.txt
+          retcode=$?
+          cat output.txt | grep -v 'hint:'
+          output="$( grep -v 'hint:'  output.txt )"
+          output="${output//'%'/'%25'}"
+          output="${output//$'\n'/'%0A'}"
+          output="${output//$'\r'/'%0D'}" 
+          echo ::set-output name=output::$output
+          exit ${retcode}
+
+      - name: Notify with result success
+        uses: peter-evans/create-or-update-comment@71345be0265236311c031f5c7866368bd1eff043 # v4.0.0
+        if: ${{ github.event.comment != null && success() }}
+        with:
+          token: ${{ secrets.JF_BOT_TOKEN }}
+          comment-id: ${{ steps.comment_running.outputs.comment-id }}
+          body: |
+            ${{ steps.run_tests.outputs.branch }}
+            Output from `git cherry-pick`:
+
+            ---
+
+            ${{ steps.run_tests.outputs.output }}
+          reactions: hooray
+
+      - name: Notify with result failure
+        uses: peter-evans/create-or-update-comment@71345be0265236311c031f5c7866368bd1eff043 # v4.0.0
+        if: ${{ github.event.comment != null && failure() }}
+        with:
+          token: ${{ secrets.JF_BOT_TOKEN }}
+          comment-id: ${{ steps.comment_running.outputs.comment-id }}
+          body: |
+            ${{ steps.run_tests.outputs.branch }}
+            Output from `git cherry-pick`:
+
+            ---
+
+            ${{ steps.run_tests.outputs.output }}
+          reactions: confused
+
   rename:
     name: Rename
     if: contains(github.event.comment.body, '@jellyfin-bot rename') && github.event.comment.author_association == 'MEMBER'
@@ -44,9 +132,9 @@ jobs:
         with:
           repository: jellyfin/jellyfin-triage-script
       - name: install python
-        uses: actions/setup-python@8d9ed9ac5c53483de85588cdf95a591a75ab9f55 # v5.5.0
+        uses: actions/setup-python@0b93645e9fea7318ecaed2b359559ac225c90a2b # v5.3.0
         with:
-          python-version: '3.13'
+          python-version: '3.12'
           cache: 'pip'
       - name: install python packages
         run: pip install -r rename/requirements.txt

.github/workflows/issue-stale.yml

@@ -16,7 +16,7 @@ jobs:
     runs-on: ubuntu-latest
     if: ${{ contains(github.repository, 'jellyfin/') }}
     steps:
-      - uses: actions/stale@5bef64f19d7facfb25b37b414482c7164d639639 # v9.1.0
+      - uses: actions/stale@28ca1036281a5e5922ead5184a1bbf96e5fc984e # v9.0.0
         with:
           repo-token: ${{ secrets.JF_BOT_TOKEN }}
           ascending: true

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

@@ -14,9 +14,9 @@ jobs:
         with:
           repository: jellyfin/jellyfin-triage-script
       - name: install python
-        uses: actions/setup-python@8d9ed9ac5c53483de85588cdf95a591a75ab9f55 # v5.5.0
+        uses: actions/setup-python@0b93645e9fea7318ecaed2b359559ac225c90a2b # v5.3.0
         with:
-          python-version: '3.13'
+          python-version: '3.12'
           cache: 'pip'
       - name: install python packages
         run: pip install -r main-repo-triage/requirements.txt

.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@1df065ebe6e3310545d4f4c4e862e43bdca146f0 # v3.0.3
+        uses: eps1lon/actions-label-merge-conflict@1b1b1fcde06a9b3d089f3464c96417961dde1168 # v3.0.2
         if: ${{ github.event_name == 'push' || github.event_name == 'pull_request_target'}}
         with:
           dirtyLabel: 'merge conflict'

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

@@ -15,7 +15,7 @@ jobs:
     runs-on: ubuntu-latest
     if: ${{ contains(github.repository, 'jellyfin/') }}
     steps:
-      - uses: actions/stale@5bef64f19d7facfb25b37b414482c7164d639639 # v9.1.0
+      - uses: actions/stale@28ca1036281a5e5922ead5184a1bbf96e5fc984e # v9.0.0
         with:
           repo-token: ${{ secrets.JF_BOT_TOKEN }}
           ascending: true

.vscode/extensions.json

@@ -1,13 +1,12 @@
 {
-    "recommendations": [
+	"recommendations": [
         "ms-dotnettools.csharp",
         "editorconfig.editorconfig",
         "github.vscode-github-actions",
         "ms-dotnettools.vscode-dotnet-runtime",
-        "ms-dotnettools.csdevkit",
-        "alexcvzz.vscode-sqlite"
-    ],
-    "unwantedRecommendations": [
+        "ms-dotnettools.csdevkit"
+	],
+	"unwantedRecommendations": [
 
-    ]
+	]
 }

.vscode/launch.json

@@ -6,7 +6,7 @@
             "type": "coreclr",
             "request": "launch",
             "preLaunchTask": "build",
-            "program": "${workspaceFolder}/Jellyfin.Server/bin/Debug/net9.0/jellyfin.dll",
+            "program": "${workspaceFolder}/Jellyfin.Server/bin/Debug/net8.0/jellyfin.dll",
             "args": [],
             "cwd": "${workspaceFolder}/Jellyfin.Server",
             "console": "internalConsole",
@@ -22,7 +22,7 @@
             "type": "coreclr",
             "request": "launch",
             "preLaunchTask": "build",
-            "program": "${workspaceFolder}/Jellyfin.Server/bin/Debug/net9.0/jellyfin.dll",
+            "program": "${workspaceFolder}/Jellyfin.Server/bin/Debug/net8.0/jellyfin.dll",
             "args": ["--nowebclient"],
             "cwd": "${workspaceFolder}/Jellyfin.Server",
             "console": "internalConsole",
@@ -34,7 +34,7 @@
             "type": "coreclr",
             "request": "launch",
             "preLaunchTask": "build",
-            "program": "${workspaceFolder}/Jellyfin.Server/bin/Debug/net9.0/jellyfin.dll",
+            "program": "${workspaceFolder}/Jellyfin.Server/bin/Debug/net8.0/jellyfin.dll",
             "args": ["--nowebclient", "--ffmpeg", "/usr/lib/jellyfin-ffmpeg/ffmpeg"],
             "cwd": "${workspaceFolder}/Jellyfin.Server",
             "console": "internalConsole",

.vscode/settings.json

@@ -1,3 +0,0 @@
-{
-    "dotnet.preferVisualStudioCodeFileSystemWatcher": true
-}

CONTRIBUTORS.md

@@ -192,7 +192,6 @@
  - [jaina heartles](https://github.com/heartles)
  - [oxixes](https://github.com/oxixes)
  - [elfalem](https://github.com/elfalem)
- - [Kenneth Cochran](https://github.com/kennethcochran)
  - [benedikt257](https://github.com/benedikt257)
  - [revam](https://github.com/revam)
 
@@ -268,5 +267,3 @@
  - [0x25CBFC4F](https://github.com/0x25CBFC4F)
  - [Robert Lützner](https://github.com/rluetzner)
  - [Nathan McCrina](https://github.com/nfmccrina)
- - [Martin Reuter](https://github.com/reuterma24)
- - [Michael McElroy](https://github.com/mcmcelro)

Directory.Build.props

@@ -3,11 +3,11 @@
 
   <PropertyGroup>
     <Nullable>enable</Nullable>
+    <CodeAnalysisRuleSet>$(MSBuildThisFileDirectory)/jellyfin.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
 
   <PropertyGroup>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-    <WarningsNotAsErrors>NU1902;NU1903</WarningsNotAsErrors>
   </PropertyGroup>
 
   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">

Directory.Packages.props

@@ -4,52 +4,52 @@
   </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.6" />
+    <PackageVersion Include="AsyncKeyedLock" Version="7.0.2" />
     <PackageVersion Include="AutoFixture.AutoMoq" Version="4.18.1" />
     <PackageVersion Include="AutoFixture.Xunit2" Version="4.18.1" />
     <PackageVersion Include="AutoFixture" Version="4.18.1" />
     <PackageVersion Include="BDInfo" Version="0.8.0" />
-    <PackageVersion Include="BitFaster.Caching" Version="2.5.3" />
     <PackageVersion Include="BlurHashSharp.SkiaSharp" Version="1.3.4" />
     <PackageVersion Include="BlurHashSharp" Version="1.3.4" />
     <PackageVersion Include="CommandLineParser" Version="2.9.1" />
-    <PackageVersion Include="coverlet.collector" Version="6.0.4" />
+    <PackageVersion Include="coverlet.collector" Version="6.0.2" />
     <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="FsCheck.Xunit" Version="3.2.0" />
+    <PackageVersion Include="FsCheck.Xunit" Version="2.16.6" />
     <PackageVersion Include="HarfBuzzSharp.NativeAssets.Linux" Version="7.3.0.3" />
     <PackageVersion Include="ICU4N.Transliterator" Version="60.1.0-alpha.356" />
     <PackageVersion Include="IDisposableAnalyzers" Version="4.0.8" />
     <PackageVersion Include="Jellyfin.XmlTv" Version="10.8.0" />
-    <PackageVersion Include="libse" Version="4.0.12" />
-    <PackageVersion Include="LrcParser" Version="2025.228.1" />
+    <PackageVersion Include="libse" Version="4.0.8" />
+    <PackageVersion Include="LrcParser" Version="2024.0728.2" />
     <PackageVersion Include="MetaBrainz.MusicBrainz" Version="6.1.0" />
-    <PackageVersion Include="Microsoft.AspNetCore.Authorization" Version="9.0.4" />
-    <PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="9.0.4" />
+    <PackageVersion Include="Microsoft.AspNetCore.Authorization" Version="8.0.11" />
+    <PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="8.0.11" />
     <PackageVersion Include="Microsoft.CodeAnalysis.BannedApiAnalyzers" Version="3.3.4" />
-    <PackageVersion Include="Microsoft.Data.Sqlite" Version="9.0.4" />
-    <PackageVersion Include="Microsoft.EntityFrameworkCore.Design" Version="9.0.4" />
-    <PackageVersion Include="Microsoft.EntityFrameworkCore.Relational" Version="9.0.4" />
-    <PackageVersion Include="Microsoft.EntityFrameworkCore.Sqlite" Version="9.0.4" />
-    <PackageVersion Include="Microsoft.EntityFrameworkCore.Tools" Version="9.0.4" />
-    <PackageVersion Include="Microsoft.Extensions.Caching.Abstractions" Version="9.0.4" />
-    <PackageVersion Include="Microsoft.Extensions.Caching.Memory" Version="9.0.4" />
-    <PackageVersion Include="Microsoft.Extensions.Configuration.Abstractions" Version="9.0.4" />
-    <PackageVersion Include="Microsoft.Extensions.Configuration.Binder" Version="9.0.4" />
-    <PackageVersion Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="9.0.4" />
-    <PackageVersion Include="Microsoft.Extensions.Configuration.Json" Version="9.0.4" />
-    <PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.4" />
-    <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="9.0.4" />
-    <PackageVersion Include="Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore" Version="9.0.4" />
-    <PackageVersion Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="9.0.4" />
-    <PackageVersion Include="Microsoft.Extensions.Hosting.Abstractions" Version="9.0.4" />
-    <PackageVersion Include="Microsoft.Extensions.Http" Version="9.0.4" />
-    <PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.4" />
-    <PackageVersion Include="Microsoft.Extensions.Logging" Version="9.0.4" />
-    <PackageVersion Include="Microsoft.Extensions.Options" Version="9.0.4" />
-    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
-    <PackageVersion Include="MimeTypes" Version="2.5.2" />
+    <PackageVersion Include="Microsoft.Data.Sqlite" Version="8.0.11" />
+    <PackageVersion Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.11" />
+    <PackageVersion Include="Microsoft.EntityFrameworkCore.Relational" Version="8.0.11" />
+    <PackageVersion Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.11" />
+    <PackageVersion Include="Microsoft.EntityFrameworkCore.Tools" Version="8.0.11" />
+    <PackageVersion Include="Microsoft.Extensions.Caching.Abstractions" Version="8.0.0" />
+    <PackageVersion Include="Microsoft.Extensions.Caching.Memory" Version="8.0.1" />
+    <PackageVersion Include="Microsoft.Extensions.Configuration.Abstractions" Version="8.0.0" />
+    <PackageVersion Include="Microsoft.Extensions.Configuration.Binder" Version="8.0.2" />
+    <PackageVersion Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="8.0.0" />
+    <PackageVersion Include="Microsoft.Extensions.Configuration.Json" Version="8.0.1" />
+    <PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.2" />
+    <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="8.0.1" />
+    <PackageVersion Include="Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore" Version="8.0.11" />
+    <PackageVersion Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="8.0.11" />
+    <PackageVersion Include="Microsoft.Extensions.Hosting.Abstractions" Version="8.0.1" />
+    <PackageVersion Include="Microsoft.Extensions.Http" Version="8.0.1" />
+    <PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.2" />
+    <PackageVersion Include="Microsoft.Extensions.Logging" Version="8.0.1" />
+    <PackageVersion Include="Microsoft.Extensions.Options" Version="8.0.2" />
+    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
+    <PackageVersion Include="MimeTypes" Version="2.4.0" />
+    <PackageVersion Include="Mono.Nat" Version="3.0.4" />
     <PackageVersion Include="Moq" Version="4.18.4" />
     <PackageVersion Include="NEbml" Version="0.12.0" />
     <PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
@@ -57,35 +57,35 @@
     <PackageVersion Include="prometheus-net.AspNetCore" Version="8.2.1" />
     <PackageVersion Include="prometheus-net.DotNetRuntime" Version="4.4.1" />
     <PackageVersion Include="prometheus-net" Version="8.2.1" />
-    <PackageVersion Include="Serilog.AspNetCore" Version="9.0.0" />
+    <PackageVersion Include="Serilog.AspNetCore" Version="8.0.3" />
     <PackageVersion Include="Serilog.Enrichers.Thread" Version="4.0.0" />
-    <PackageVersion Include="Serilog.Settings.Configuration" Version="9.0.0" />
+    <PackageVersion Include="Serilog.Settings.Configuration" Version="8.0.4" />
     <PackageVersion Include="Serilog.Sinks.Async" Version="2.1.0" />
     <PackageVersion Include="Serilog.Sinks.Console" Version="6.0.0" />
     <PackageVersion Include="Serilog.Sinks.File" Version="6.0.0" />
     <PackageVersion Include="Serilog.Sinks.Graylog" Version="3.1.1" />
     <PackageVersion Include="SerilogAnalyzer" Version="0.15.0" />
-    <PackageVersion Include="SharpFuzz" Version="2.2.0" />
+    <PackageVersion Include="SharpFuzz" Version="2.1.1" />
     <PackageVersion Include="SkiaSharp" Version="2.88.9" />
     <PackageVersion Include="SkiaSharp.HarfBuzz" Version="2.88.9" />
     <PackageVersion Include="SkiaSharp.NativeAssets.Linux" Version="2.88.9" />
     <PackageVersion Include="SmartAnalyzers.MultithreadingAnalyzer" Version="1.1.31" />
     <PackageVersion Include="StyleCop.Analyzers" Version="1.2.0-beta.556" />
-    <PackageVersion Include="Svg.Skia" Version="2.0.0.8" />
+    <PackageVersion Include="Svg.Skia" Version="2.0.0.1" />
     <PackageVersion Include="Swashbuckle.AspNetCore.ReDoc" Version="6.5.0" />
     <PackageVersion Include="Swashbuckle.AspNetCore" Version="6.2.3" />
     <PackageVersion Include="System.Globalization" Version="4.3.0" />
     <PackageVersion Include="System.Linq.Async" Version="6.0.1" />
-    <PackageVersion Include="System.Text.Encoding.CodePages" Version="9.0.4" />
-    <PackageVersion Include="System.Text.Json" Version="9.0.4" />
-    <PackageVersion Include="System.Threading.Tasks.Dataflow" Version="9.0.4" />
+    <PackageVersion Include="System.Text.Encoding.CodePages" Version="8.0.0" />
+    <PackageVersion Include="System.Text.Json" Version="8.0.5" />
+    <PackageVersion Include="System.Threading.Tasks.Dataflow" Version="8.0.1" />
     <PackageVersion Include="TagLibSharp" Version="2.3.0" />
-    <PackageVersion Include="z440.atl.core" Version="6.20.0" />
+    <PackageVersion Include="z440.atl.core" Version="6.11.0" />
     <PackageVersion Include="TMDbLib" Version="2.2.0" />
     <PackageVersion Include="UTF.Unknown" Version="2.5.1" />
     <PackageVersion Include="Xunit.Priority" Version="1.1.6" />
     <PackageVersion Include="xunit.runner.visualstudio" Version="2.8.2" />
-    <PackageVersion Include="Xunit.SkippableFact" Version="1.5.23" />
-    <PackageVersion Include="xunit" Version="2.9.3" />
+    <PackageVersion Include="Xunit.SkippableFact" Version="1.4.13" />
+    <PackageVersion Include="xunit" Version="2.9.2" />
   </ItemGroup>
-</Project>
+</Project>

Emby.Naming/Common/NamingOptions.cs

@@ -238,7 +238,6 @@ namespace Emby.Naming.Common
                 ".dsp",
                 ".dts",
                 ".dvf",
-                ".eac3",
                 ".far",
                 ".flac",
                 ".gdm",
@@ -468,14 +467,6 @@ namespace Emby.Naming.Common
                 {
                     IsNamed = true
                 },
-
-                // Anime style expression
-                // "[Group][Series Name][21][1080p][FLAC][HASH]"
-                // "[Group] Series Name [04][BDRIP]"
-                new EpisodeExpression(@"(?:\[(?:[^\]]+)\]\s*)?(?<seriesname>\[[^\]]+\]|[^[\]]+)\s*\[(?<epnumber>[0-9]+)\]")
-                {
-                    IsNamed = true
-                },
             };
 
             VideoExtraRules = new[]

Emby.Naming/Emby.Naming.csproj

@@ -6,7 +6,7 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <TargetFramework>net9.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <PublishRepositoryUrl>true</PublishRepositoryUrl>
@@ -36,7 +36,7 @@
   <PropertyGroup>
     <Authors>Jellyfin Contributors</Authors>
     <PackageId>Jellyfin.Naming</PackageId>
-    <VersionPrefix>10.11.0</VersionPrefix>
+    <VersionPrefix>10.10.5</VersionPrefix>
     <RepositoryUrl>https://github.com/jellyfin/jellyfin</RepositoryUrl>
     <PackageLicenseExpression>GPL-3.0-only</PackageLicenseExpression>
   </PropertyGroup>

Emby.Naming/TV/SeasonPathParser.cs

@@ -1,35 +1,43 @@
 using System;
 using System.Globalization;
 using System.IO;
-using System.Text.RegularExpressions;
 
 namespace Emby.Naming.TV
 {
     /// <summary>
     /// Class to parse season paths.
     /// </summary>
-    public static partial class SeasonPathParser
+    public static class SeasonPathParser
     {
-        [GeneratedRegex(@"^\s*((?<seasonnumber>(?>\d+))(?:st|nd|rd|th|\.)*(?!\s*[Ee]\d+))\s*(?:[[시즌]*|[シーズン]*|[sS](?:eason|æson|aison|taffel|eries|tagione|äsong|eizoen|easong|ezon|ezona|ezóna|ezonul)*|[tT](?:emporada)*|[kK](?:ausi)*|[Сс](?:езон)*)\s*(?<rightpart>.*)$")]
-        private static partial Regex ProcessPre();
+        /// <summary>
+        /// A season folder must contain one of these somewhere in the name.
+        /// </summary>
+        private static readonly string[] _seasonFolderNames =
+        {
+            "season",
+            "sæson",
+            "temporada",
+            "saison",
+            "staffel",
+            "series",
+            "сезон",
+            "stagione"
+        };
 
-        [GeneratedRegex(@"^\s*(?:[[시즌]*|[シーズン]*|[sS](?:eason|æson|aison|taffel|eries|tagione|äsong|eizoen|easong|ezon|ezona|ezóna|ezonul)*|[tT](?:emporada)*|[kK](?:ausi)*|[Сс](?:езон)*)\s*(?<seasonnumber>(?>\d+)(?!\s*[Ee]\d+))(?<rightpart>.*)$")]
-        private static partial Regex ProcessPost();
+        private static readonly char[] _splitChars = ['.', '_', ' ', '-'];
 
         /// <summary>
         /// Attempts to parse season number from path.
         /// </summary>
         /// <param name="path">Path to season.</param>
-        /// <param name="parentPath">Folder name of the parent.</param>
         /// <param name="supportSpecialAliases">Support special aliases when parsing.</param>
         /// <param name="supportNumericSeasonFolders">Support numeric season folders when parsing.</param>
         /// <returns>Returns <see cref="SeasonPathParserResult"/> object.</returns>
-        public static SeasonPathParserResult Parse(string path, string? parentPath, bool supportSpecialAliases, bool supportNumericSeasonFolders)
+        public static SeasonPathParserResult Parse(string path, bool supportSpecialAliases, bool supportNumericSeasonFolders)
         {
             var result = new SeasonPathParserResult();
-            var parentFolderName = parentPath is null ? null : new DirectoryInfo(parentPath).Name;
 
-            var (seasonNumber, isSeasonFolder) = GetSeasonNumberFromPath(path, parentFolderName, supportSpecialAliases, supportNumericSeasonFolders);
+            var (seasonNumber, isSeasonFolder) = GetSeasonNumberFromPath(path, supportSpecialAliases, supportNumericSeasonFolders);
 
             result.SeasonNumber = seasonNumber;
 
@@ -46,24 +54,15 @@ namespace Emby.Naming.TV
         /// Gets the season number from path.
         /// </summary>
         /// <param name="path">The path.</param>
-        /// <param name="parentFolderName">The parent folder name.</param>
         /// <param name="supportSpecialAliases">if set to <c>true</c> [support special aliases].</param>
         /// <param name="supportNumericSeasonFolders">if set to <c>true</c> [support numeric season folders].</param>
         /// <returns>System.Nullable{System.Int32}.</returns>
         private static (int? SeasonNumber, bool IsSeasonFolder) GetSeasonNumberFromPath(
             string path,
-            string? parentFolderName,
             bool supportSpecialAliases,
             bool supportNumericSeasonFolders)
         {
             string filename = Path.GetFileName(path);
-            filename = Regex.Replace(filename, "[ ._-]", string.Empty);
-
-            if (parentFolderName is not null)
-            {
-                parentFolderName = Regex.Replace(parentFolderName, "[ ._-]", string.Empty);
-                filename = filename.Replace(parentFolderName, string.Empty, StringComparison.OrdinalIgnoreCase);
-            }
 
             if (supportSpecialAliases)
             {
@@ -86,38 +85,53 @@ namespace Emby.Naming.TV
                 }
             }
 
-            if (filename.StartsWith('s'))
+            if (TryGetSeasonNumberFromPart(filename, out int seasonNumber))
             {
-                var testFilename = filename.AsSpan()[1..];
-
-                if (int.TryParse(testFilename, NumberStyles.Integer, CultureInfo.InvariantCulture, out var val))
-                {
-                    return (val, true);
-                }
-            }
-
-            var preMatch = ProcessPre().Match(filename);
-            if (preMatch.Success)
-            {
-                return CheckMatch(preMatch);
-            }
-            else
-            {
-                var postMatch = ProcessPost().Match(filename);
-                return CheckMatch(postMatch);
-            }
-        }
-
-        private static (int? SeasonNumber, bool IsSeasonFolder) CheckMatch(Match match)
-        {
-            var numberString = match.Groups["seasonnumber"];
-            if (numberString.Success)
-            {
-                var seasonNumber = int.Parse(numberString.Value, CultureInfo.InvariantCulture);
                 return (seasonNumber, true);
             }
 
-            return (null, false);
+            // Look for one of the season folder names
+            foreach (var name in _seasonFolderNames)
+            {
+                if (filename.Contains(name, StringComparison.OrdinalIgnoreCase))
+                {
+                    var result = GetSeasonNumberFromPathSubstring(filename.Replace(name, " ", StringComparison.OrdinalIgnoreCase));
+                    if (result.SeasonNumber.HasValue)
+                    {
+                        return result;
+                    }
+
+                    break;
+                }
+            }
+
+            var parts = filename.Split(_splitChars, StringSplitOptions.RemoveEmptyEntries);
+            foreach (var part in parts)
+            {
+                if (TryGetSeasonNumberFromPart(part, out seasonNumber))
+                {
+                    return (seasonNumber, true);
+                }
+            }
+
+            return (null, true);
+        }
+
+        private static bool TryGetSeasonNumberFromPart(ReadOnlySpan<char> part, out int seasonNumber)
+        {
+            seasonNumber = 0;
+            if (part.Length < 2 || !part.StartsWith("s", StringComparison.OrdinalIgnoreCase))
+            {
+                return false;
+            }
+
+            if (int.TryParse(part.Slice(1), NumberStyles.Integer, CultureInfo.InvariantCulture, out var value))
+            {
+                seasonNumber = value;
+                return true;
+            }
+
+            return false;
         }
 
         /// <summary>

Emby.Naming/TV/SeriesResolver.cs

@@ -12,7 +12,7 @@ namespace Emby.Naming.TV
         /// <summary>
         /// Regex that matches strings of at least 2 characters separated by a dot or underscore.
         /// Used for removing separators between words, i.e turns "The_show" into "The show" while
-        /// preserving names like "S.H.O.W".
+        /// preserving namings like "S.H.O.W".
         /// </summary>
         [GeneratedRegex(@"((?<a>[^\._]{2,})[\._]*)|([\._](?<b>[^\._]{2,}))")]
         private static partial Regex SeriesNameRegex();

Emby.Naming/Video/ExtraRuleResolver.cs

@@ -18,9 +18,8 @@ namespace Emby.Naming.Video
         /// </summary>
         /// <param name="path">Path to file.</param>
         /// <param name="namingOptions">The naming options.</param>
-        /// <param name="libraryRoot">Top-level folder for the containing library.</param>
         /// <returns>Returns <see cref="ExtraResult"/> object.</returns>
-        public static ExtraResult GetExtraInfo(string path, NamingOptions namingOptions, string? libraryRoot = "")
+        public static ExtraResult GetExtraInfo(string path, NamingOptions namingOptions)
         {
             var result = new ExtraResult();
 
@@ -70,9 +69,7 @@ namespace Emby.Naming.Video
                 else if (rule.RuleType == ExtraRuleType.DirectoryName)
                 {
                     var directoryName = Path.GetFileName(Path.GetDirectoryName(pathSpan));
-                    string fullDirectory = Path.GetDirectoryName(pathSpan).ToString();
-                    if (directoryName.Equals(rule.Token, StringComparison.OrdinalIgnoreCase)
-                        && !string.Equals(fullDirectory, libraryRoot, StringComparison.OrdinalIgnoreCase))
+                    if (directoryName.Equals(rule.Token, StringComparison.OrdinalIgnoreCase))
                     {
                         result.ExtraType = rule.ExtraType;
                         result.Rule = rule;

Emby.Naming/Video/VideoListResolver.cs

@@ -27,9 +27,8 @@ namespace Emby.Naming.Video
         /// <param name="namingOptions">The naming options.</param>
         /// <param name="supportMultiVersion">Indication we should consider multi-versions of content.</param>
         /// <param name="parseName">Whether to parse the name or use the filename.</param>
-        /// <param name="libraryRoot">Top-level folder for the containing library.</param>
         /// <returns>Returns enumerable of <see cref="VideoInfo"/> which groups files together when related.</returns>
-        public static IReadOnlyList<VideoInfo> Resolve(IReadOnlyList<VideoFileInfo> videoInfos, NamingOptions namingOptions, bool supportMultiVersion = true, bool parseName = true, string? libraryRoot = "")
+        public static IReadOnlyList<VideoInfo> Resolve(IReadOnlyList<VideoFileInfo> videoInfos, NamingOptions namingOptions, bool supportMultiVersion = true, bool parseName = true)
         {
             // Filter out all extras, otherwise they could cause stacks to not be resolved
             // See the unit test TestStackedWithTrailer
@@ -66,7 +65,7 @@ namespace Emby.Naming.Video
             {
                 var info = new VideoInfo(stack.Name)
                 {
-                    Files = stack.Files.Select(i => VideoResolver.Resolve(i, stack.IsDirectoryStack, namingOptions, parseName, libraryRoot))
+                    Files = stack.Files.Select(i => VideoResolver.Resolve(i, stack.IsDirectoryStack, namingOptions, parseName))
                         .OfType<VideoFileInfo>()
                         .ToList()
                 };

Emby.Naming/Video/VideoResolver.cs

@@ -17,11 +17,10 @@ namespace Emby.Naming.Video
         /// <param name="path">The path.</param>
         /// <param name="namingOptions">The naming options.</param>
         /// <param name="parseName">Whether to parse the name or use the filename.</param>
-        /// <param name="libraryRoot">Top-level folder for the containing library.</param>
         /// <returns>VideoFileInfo.</returns>
-        public static VideoFileInfo? ResolveDirectory(string? path, NamingOptions namingOptions, bool parseName = true, string? libraryRoot = "")
+        public static VideoFileInfo? ResolveDirectory(string? path, NamingOptions namingOptions, bool parseName = true)
         {
-            return Resolve(path, true, namingOptions, parseName, libraryRoot);
+            return Resolve(path, true, namingOptions, parseName);
         }
 
         /// <summary>
@@ -29,11 +28,10 @@ namespace Emby.Naming.Video
         /// </summary>
         /// <param name="path">The path.</param>
         /// <param name="namingOptions">The naming options.</param>
-        /// <param name="libraryRoot">Top-level folder for the containing library.</param>
         /// <returns>VideoFileInfo.</returns>
-        public static VideoFileInfo? ResolveFile(string? path, NamingOptions namingOptions, string? libraryRoot = "")
+        public static VideoFileInfo? ResolveFile(string? path, NamingOptions namingOptions)
         {
-            return Resolve(path, false, namingOptions, libraryRoot: libraryRoot);
+            return Resolve(path, false, namingOptions);
         }
 
         /// <summary>
@@ -43,10 +41,9 @@ namespace Emby.Naming.Video
         /// <param name="isDirectory">if set to <c>true</c> [is folder].</param>
         /// <param name="namingOptions">The naming options.</param>
         /// <param name="parseName">Whether or not the name should be parsed for info.</param>
-        /// <param name="libraryRoot">Top-level folder for the containing library.</param>
         /// <returns>VideoFileInfo.</returns>
         /// <exception cref="ArgumentNullException"><c>path</c> is <c>null</c>.</exception>
-        public static VideoFileInfo? Resolve(string? path, bool isDirectory, NamingOptions namingOptions, bool parseName = true, string? libraryRoot = "")
+        public static VideoFileInfo? Resolve(string? path, bool isDirectory, NamingOptions namingOptions, bool parseName = true)
         {
             if (string.IsNullOrEmpty(path))
             {
@@ -78,7 +75,7 @@ namespace Emby.Naming.Video
 
             var format3DResult = Format3DParser.Parse(path, namingOptions);
 
-            var extraResult = ExtraRuleResolver.GetExtraInfo(path, namingOptions, libraryRoot);
+            var extraResult = ExtraRuleResolver.GetExtraInfo(path, namingOptions);
 
             var name = Path.GetFileNameWithoutExtension(path);
 

Emby.Photos/Emby.Photos.csproj

@@ -19,7 +19,7 @@
   </ItemGroup>
 
   <PropertyGroup>
-    <TargetFramework>net9.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
   </PropertyGroup>

Emby.Server.Implementations/AppBase/BaseApplicationPaths.cs

@@ -34,46 +34,76 @@ namespace Emby.Server.Implementations.AppBase
             DataPath = Directory.CreateDirectory(Path.Combine(ProgramDataPath, "data")).FullName;
         }
 
-        /// <inheritdoc/>
+        /// <summary>
+        /// Gets the path to the program data folder.
+        /// </summary>
+        /// <value>The program data path.</value>
         public string ProgramDataPath { get; }
 
         /// <inheritdoc/>
         public string WebPath { get; }
 
-        /// <inheritdoc/>
+        /// <summary>
+        /// Gets the path to the system folder.
+        /// </summary>
+        /// <value>The path to the system folder.</value>
         public string ProgramSystemPath { get; } = AppContext.BaseDirectory;
 
-        /// <inheritdoc/>
+        /// <summary>
+        /// Gets the folder path to the data directory.
+        /// </summary>
+        /// <value>The data directory.</value>
         public string DataPath { get; }
 
         /// <inheritdoc />
         public string VirtualDataPath => "%AppDataPath%";
 
-        /// <inheritdoc/>
+        /// <summary>
+        /// Gets the image cache path.
+        /// </summary>
+        /// <value>The image cache path.</value>
         public string ImageCachePath => Path.Combine(CachePath, "images");
 
-        /// <inheritdoc/>
+        /// <summary>
+        /// Gets the path to the plugin directory.
+        /// </summary>
+        /// <value>The plugins path.</value>
         public string PluginsPath => Path.Combine(ProgramDataPath, "plugins");
 
-        /// <inheritdoc/>
+        /// <summary>
+        /// Gets the path to the plugin configurations directory.
+        /// </summary>
+        /// <value>The plugin configurations path.</value>
         public string PluginConfigurationsPath => Path.Combine(PluginsPath, "configurations");
 
-        /// <inheritdoc/>
+        /// <summary>
+        /// Gets the path to the log directory.
+        /// </summary>
+        /// <value>The log directory path.</value>
         public string LogDirectoryPath { get; }
 
-        /// <inheritdoc/>
+        /// <summary>
+        /// Gets the path to the application configuration root directory.
+        /// </summary>
+        /// <value>The configuration directory path.</value>
         public string ConfigurationDirectoryPath { get; }
 
-        /// <inheritdoc/>
+        /// <summary>
+        /// Gets the path to the system configuration file.
+        /// </summary>
+        /// <value>The system configuration file path.</value>
         public string SystemConfigurationFilePath => Path.Combine(ConfigurationDirectoryPath, "system.xml");
 
-        /// <inheritdoc/>
+        /// <summary>
+        /// Gets or sets the folder path to the cache directory.
+        /// </summary>
+        /// <value>The cache directory.</value>
         public string CachePath { get; set; }
 
-        /// <inheritdoc/>
+        /// <summary>
+        /// Gets the folder path to the temp directory within the cache folder.
+        /// </summary>
+        /// <value>The temp directory.</value>
         public string TempDirectory => Path.Join(Path.GetTempPath(), "jellyfin");
-
-        /// <inheritdoc />
-        public string TrickplayPath => Path.Combine(DataPath, "trickplay");
     }
 }

Emby.Server.Implementations/AppBase/BaseConfigurationManager.cs

@@ -4,7 +4,6 @@ using System.Collections.Generic;
 using System.Globalization;
 using System.IO;
 using System.Linq;
-using System.Threading;
 using MediaBrowser.Common.Configuration;
 using MediaBrowser.Common.Events;
 using MediaBrowser.Common.Extensions;
@@ -20,7 +19,7 @@ namespace Emby.Server.Implementations.AppBase
     public abstract class BaseConfigurationManager : IConfigurationManager
     {
         private readonly ConcurrentDictionary<string, object> _configurations = new();
-        private readonly Lock _configurationSyncLock = new();
+        private readonly object _configurationSyncLock = new();
 
         private ConfigurationStore[] _configurationStores = Array.Empty<ConfigurationStore>();
         private IConfigurationFactory[] _configurationFactories = Array.Empty<IConfigurationFactory>();

Emby.Server.Implementations/ApplicationHost.cs

@@ -35,12 +35,11 @@ using Emby.Server.Implementations.SyncPlay;
 using Emby.Server.Implementations.TV;
 using Emby.Server.Implementations.Updates;
 using Jellyfin.Api.Helpers;
-using Jellyfin.Database.Implementations;
 using Jellyfin.Drawing;
 using Jellyfin.MediaEncoding.Hls.Playlist;
 using Jellyfin.Networking.Manager;
 using Jellyfin.Networking.Udp;
-using Jellyfin.Server.Implementations.Item;
+using Jellyfin.Server.Implementations;
 using Jellyfin.Server.Implementations.MediaSegments;
 using MediaBrowser.Common;
 using MediaBrowser.Common.Configuration;
@@ -57,7 +56,6 @@ using MediaBrowser.Controller.Configuration;
 using MediaBrowser.Controller.Drawing;
 using MediaBrowser.Controller.Dto;
 using MediaBrowser.Controller.Entities;
-using MediaBrowser.Controller.IO;
 using MediaBrowser.Controller.Library;
 using MediaBrowser.Controller.LiveTv;
 using MediaBrowser.Controller.Lyrics;
@@ -85,6 +83,7 @@ using MediaBrowser.Model.Net;
 using MediaBrowser.Model.Serialization;
 using MediaBrowser.Model.System;
 using MediaBrowser.Model.Tasks;
+using MediaBrowser.Providers.Chapters;
 using MediaBrowser.Providers.Lyric;
 using MediaBrowser.Providers.Manager;
 using MediaBrowser.Providers.Plugins.Tmdb;
@@ -269,11 +268,6 @@ namespace Emby.Server.Implementations
 
         public string ExpandVirtualPath(string path)
         {
-            if (path is null)
-            {
-                return null;
-            }
-
             var appPaths = ApplicationPaths;
 
             return path.Replace(appPaths.VirtualDataPath, appPaths.DataPath, StringComparison.OrdinalIgnoreCase)
@@ -498,19 +492,13 @@ namespace Emby.Server.Implementations
 
             serviceCollection.AddSingleton<IBlurayExaminer, BdInfoExaminer>();
 
+            serviceCollection.AddSingleton<IUserDataRepository, SqliteUserDataRepository>();
             serviceCollection.AddSingleton<IUserDataManager, UserDataManager>();
 
-            serviceCollection.AddSingleton<IItemRepository, BaseItemRepository>();
-            serviceCollection.AddSingleton<IPeopleRepository, PeopleRepository>();
-            serviceCollection.AddSingleton<IChapterRepository, ChapterRepository>();
-            serviceCollection.AddSingleton<IMediaAttachmentRepository, MediaAttachmentRepository>();
-            serviceCollection.AddSingleton<IMediaStreamRepository, MediaStreamRepository>();
-            serviceCollection.AddSingleton<IKeyframeRepository, KeyframeRepository>();
-            serviceCollection.AddSingleton<IItemTypeLookup, ItemTypeLookup>();
+            serviceCollection.AddSingleton<IItemRepository, SqliteItemRepository>();
 
             serviceCollection.AddSingleton<IMediaEncoder, MediaBrowser.MediaEncoding.Encoder.MediaEncoder>();
             serviceCollection.AddSingleton<EncodingHelper>();
-            serviceCollection.AddSingleton<IPathManager, PathManager>();
 
             // TODO: Refactor to eliminate the circular dependencies here so that Lazy<T> isn't required
             serviceCollection.AddTransient(provider => new Lazy<ILibraryMonitor>(provider.GetRequiredService<ILibraryMonitor>));
@@ -552,6 +540,8 @@ namespace Emby.Server.Implementations
 
             serviceCollection.AddSingleton<IUserViewManager, UserViewManager>();
 
+            serviceCollection.AddSingleton<IChapterManager, ChapterManager>();
+
             serviceCollection.AddSingleton<IEncodingManager, MediaEncoder.EncodingManager>();
 
             serviceCollection.AddSingleton<IAuthService, AuthService>();
@@ -575,15 +565,10 @@ namespace Emby.Server.Implementations
         /// <summary>
         /// Create services registered with the service container that need to be initialized at application startup.
         /// </summary>
-        /// <param name="startupConfig">The configuration used to initialise the application.</param>
         /// <returns>A task representing the service initialization operation.</returns>
-        public async Task InitializeServices(IConfiguration startupConfig)
+        public async Task InitializeServices()
         {
-            var factory = Resolve<IDbContextFactory<JellyfinDbContext>>();
-            var provider = Resolve<IJellyfinDatabaseProvider>();
-            provider.DbContextFactory = factory;
-
-            var jellyfinDb = await factory.CreateDbContextAsync().ConfigureAwait(false);
+            var jellyfinDb = await Resolve<IDbContextFactory<JellyfinDbContext>>().CreateDbContextAsync().ConfigureAwait(false);
             await using (jellyfinDb.ConfigureAwait(false))
             {
                 if ((await jellyfinDb.Database.GetPendingMigrationsAsync().ConfigureAwait(false)).Any())
@@ -594,6 +579,9 @@ namespace Emby.Server.Implementations
                 }
             }
 
+            ((SqliteItemRepository)Resolve<IItemRepository>()).Initialize();
+            ((SqliteUserDataRepository)Resolve<IUserDataRepository>()).Initialize();
+
             var localizationManager = (LocalizationManager)Resolve<ILocalizationManager>();
             await localizationManager.LoadAll().ConfigureAwait(false);
 
@@ -619,7 +607,7 @@ namespace Emby.Server.Implementations
                 // Don't use an empty string password
                 password = string.IsNullOrWhiteSpace(password) ? null : password;
 
-                var localCert = X509CertificateLoader.LoadPkcs12FromFile(path, password, X509KeyStorageFlags.UserKeySet);
+                var localCert = new X509Certificate2(path, password, X509KeyStorageFlags.UserKeySet);
                 if (!localCert.HasPrivateKey)
                 {
                     Logger.LogError("No private key included in SSL cert {CertificateLocation}.", path);
@@ -647,7 +635,6 @@ namespace Emby.Server.Implementations
             BaseItem.ProviderManager = Resolve<IProviderManager>();
             BaseItem.LocalizationManager = Resolve<ILocalizationManager>();
             BaseItem.ItemRepository = Resolve<IItemRepository>();
-            BaseItem.ChapterRepository = Resolve<IChapterRepository>();
             BaseItem.FileSystem = Resolve<IFileSystem>();
             BaseItem.UserDataManager = Resolve<IUserDataManager>();
             BaseItem.ChannelManager = Resolve<IChannelManager>();

Emby.Server.Implementations/Collections/CollectionManager.cs

@@ -4,7 +4,7 @@ using System.IO;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
-using Jellyfin.Database.Implementations.Entities;
+using Jellyfin.Data.Entities;
 using MediaBrowser.Common.Configuration;
 using MediaBrowser.Controller.Collections;
 using MediaBrowser.Controller.Entities;
@@ -204,7 +204,7 @@ namespace Emby.Server.Implementations.Collections
         {
             if (_libraryManager.GetItemById(collectionId) is not BoxSet collection)
             {
-                throw new ArgumentException("No collection exists with the supplied collectionId " + collectionId);
+                throw new ArgumentException("No collection exists with the supplied Id");
             }
 
             List<BaseItem>? itemList = null;
@@ -218,7 +218,7 @@ namespace Emby.Server.Implementations.Collections
 
                 if (item is null)
                 {
-                    throw new ArgumentException("No item exists with the supplied Id " + id);
+                    throw new ArgumentException("No item exists with the supplied Id");
                 }
 
                 if (!currentLinkedChildrenIds.Contains(id))

Emby.Server.Implementations/Data/BaseSqliteRepository.cs

@@ -0,0 +1,269 @@
+#nullable disable
+
+#pragma warning disable CS1591
+
+using System;
+using System.Collections.Generic;
+using System.Threading;
+using Jellyfin.Extensions;
+using Microsoft.Data.Sqlite;
+using Microsoft.Extensions.Logging;
+
+namespace Emby.Server.Implementations.Data
+{
+    public abstract class BaseSqliteRepository : IDisposable
+    {
+        private bool _disposed = false;
+        private SemaphoreSlim _writeLock = new SemaphoreSlim(1, 1);
+        private SqliteConnection _writeConnection;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="BaseSqliteRepository"/> class.
+        /// </summary>
+        /// <param name="logger">The logger.</param>
+        protected BaseSqliteRepository(ILogger<BaseSqliteRepository> logger)
+        {
+            Logger = logger;
+        }
+
+        /// <summary>
+        /// Gets or sets the path to the DB file.
+        /// </summary>
+        protected string DbFilePath { get; set; }
+
+        /// <summary>
+        /// Gets the logger.
+        /// </summary>
+        /// <value>The logger.</value>
+        protected ILogger<BaseSqliteRepository> Logger { get; }
+
+        /// <summary>
+        /// Gets the cache size.
+        /// </summary>
+        /// <value>The cache size or null.</value>
+        protected virtual int? CacheSize => null;
+
+        /// <summary>
+        /// Gets the locking mode. <see href="https://www.sqlite.org/pragma.html#pragma_locking_mode" />.
+        /// </summary>
+        protected virtual string LockingMode => "NORMAL";
+
+        /// <summary>
+        /// Gets the journal mode. <see href="https://www.sqlite.org/pragma.html#pragma_journal_mode" />.
+        /// </summary>
+        /// <value>The journal mode.</value>
+        protected virtual string JournalMode => "WAL";
+
+        /// <summary>
+        /// Gets the journal size limit. <see href="https://www.sqlite.org/pragma.html#pragma_journal_size_limit" />.
+        /// The default (-1) is overridden to prevent unconstrained WAL size, as reported by users.
+        /// </summary>
+        /// <value>The journal size limit.</value>
+        protected virtual int? JournalSizeLimit => 134_217_728; // 128MiB
+
+        /// <summary>
+        /// Gets the page size.
+        /// </summary>
+        /// <value>The page size or null.</value>
+        protected virtual int? PageSize => null;
+
+        /// <summary>
+        /// Gets the temp store mode.
+        /// </summary>
+        /// <value>The temp store mode.</value>
+        /// <see cref="TempStoreMode"/>
+        protected virtual TempStoreMode TempStore => TempStoreMode.Memory;
+
+        /// <summary>
+        /// Gets the synchronous mode.
+        /// </summary>
+        /// <value>The synchronous mode or null.</value>
+        /// <see cref="SynchronousMode"/>
+        protected virtual SynchronousMode? Synchronous => SynchronousMode.Normal;
+
+        public virtual void Initialize()
+        {
+            // Configuration and pragmas can affect VACUUM so it needs to be last.
+            using (var connection = GetConnection())
+            {
+                connection.Execute("VACUUM");
+            }
+        }
+
+        protected ManagedConnection GetConnection(bool readOnly = false)
+        {
+            if (!readOnly)
+            {
+                _writeLock.Wait();
+                if (_writeConnection is not null)
+                {
+                    return new ManagedConnection(_writeConnection, _writeLock);
+                }
+
+                var writeConnection = new SqliteConnection($"Filename={DbFilePath};Pooling=False");
+                writeConnection.Open();
+
+                if (CacheSize.HasValue)
+                {
+                    writeConnection.Execute("PRAGMA cache_size=" + CacheSize.Value);
+                }
+
+                if (!string.IsNullOrWhiteSpace(LockingMode))
+                {
+                    writeConnection.Execute("PRAGMA locking_mode=" + LockingMode);
+                }
+
+                if (!string.IsNullOrWhiteSpace(JournalMode))
+                {
+                    writeConnection.Execute("PRAGMA journal_mode=" + JournalMode);
+                }
+
+                if (JournalSizeLimit.HasValue)
+                {
+                    writeConnection.Execute("PRAGMA journal_size_limit=" + JournalSizeLimit.Value);
+                }
+
+                if (Synchronous.HasValue)
+                {
+                    writeConnection.Execute("PRAGMA synchronous=" + (int)Synchronous.Value);
+                }
+
+                if (PageSize.HasValue)
+                {
+                    writeConnection.Execute("PRAGMA page_size=" + PageSize.Value);
+                }
+
+                writeConnection.Execute("PRAGMA temp_store=" + (int)TempStore);
+
+                return new ManagedConnection(_writeConnection = writeConnection, _writeLock);
+            }
+
+            var connection = new SqliteConnection($"Filename={DbFilePath};Mode=ReadOnly");
+            connection.Open();
+
+            if (CacheSize.HasValue)
+            {
+                connection.Execute("PRAGMA cache_size=" + CacheSize.Value);
+            }
+
+            if (!string.IsNullOrWhiteSpace(LockingMode))
+            {
+                connection.Execute("PRAGMA locking_mode=" + LockingMode);
+            }
+
+            if (!string.IsNullOrWhiteSpace(JournalMode))
+            {
+                connection.Execute("PRAGMA journal_mode=" + JournalMode);
+            }
+
+            if (JournalSizeLimit.HasValue)
+            {
+                connection.Execute("PRAGMA journal_size_limit=" + JournalSizeLimit.Value);
+            }
+
+            if (Synchronous.HasValue)
+            {
+                connection.Execute("PRAGMA synchronous=" + (int)Synchronous.Value);
+            }
+
+            if (PageSize.HasValue)
+            {
+                connection.Execute("PRAGMA page_size=" + PageSize.Value);
+            }
+
+            connection.Execute("PRAGMA temp_store=" + (int)TempStore);
+
+            return new ManagedConnection(connection, null);
+        }
+
+        public SqliteCommand PrepareStatement(ManagedConnection connection, string sql)
+        {
+            var command = connection.CreateCommand();
+            command.CommandText = sql;
+            return command;
+        }
+
+        protected bool TableExists(ManagedConnection connection, string name)
+        {
+            using var statement = PrepareStatement(connection, "select DISTINCT tbl_name from sqlite_master");
+            foreach (var row in statement.ExecuteQuery())
+            {
+                if (string.Equals(name, row.GetString(0), StringComparison.OrdinalIgnoreCase))
+                {
+                    return true;
+                }
+            }
+
+            return false;
+        }
+
+        protected List<string> GetColumnNames(ManagedConnection connection, string table)
+        {
+            var columnNames = new List<string>();
+
+            foreach (var row in connection.Query("PRAGMA table_info(" + table + ")"))
+            {
+                if (row.TryGetString(1, out var columnName))
+                {
+                    columnNames.Add(columnName);
+                }
+            }
+
+            return columnNames;
+        }
+
+        protected void AddColumn(ManagedConnection connection, string table, string columnName, string type, List<string> existingColumnNames)
+        {
+            if (existingColumnNames.Contains(columnName, StringComparison.OrdinalIgnoreCase))
+            {
+                return;
+            }
+
+            connection.Execute("alter table " + table + " add column " + columnName + " " + type + " NULL");
+        }
+
+        protected void CheckDisposed()
+        {
+            ObjectDisposedException.ThrowIf(_disposed, this);
+        }
+
+        /// <inheritdoc />
+        public void Dispose()
+        {
+            Dispose(true);
+            GC.SuppressFinalize(this);
+        }
+
+        /// <summary>
+        /// Releases unmanaged and - optionally - managed resources.
+        /// </summary>
+        /// <param name="dispose"><c>true</c> to release both managed and unmanaged resources; <c>false</c> to release only unmanaged resources.</param>
+        protected virtual void Dispose(bool dispose)
+        {
+            if (_disposed)
+            {
+                return;
+            }
+
+            if (dispose)
+            {
+                _writeLock.Wait();
+                try
+                {
+                    _writeConnection.Dispose();
+                }
+                finally
+                {
+                    _writeLock.Release();
+                }
+
+                _writeLock.Dispose();
+            }
+
+            _writeConnection = null;
+            _writeLock = null;
+
+            _disposed = true;
+        }
+    }
+}

Emby.Server.Implementations/Data/CleanDatabaseScheduledTask.cs

@@ -1,119 +1,66 @@
 #pragma warning disable CS1591
 
 using System;
-using System.IO;
-using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
-using Jellyfin.Database.Implementations;
 using MediaBrowser.Controller.Entities;
-using MediaBrowser.Controller.IO;
 using MediaBrowser.Controller.Library;
-using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Logging;
 
-namespace Emby.Server.Implementations.Data;
-
-public class CleanDatabaseScheduledTask : ILibraryPostScanTask
+namespace Emby.Server.Implementations.Data
 {
-    private readonly ILibraryManager _libraryManager;
-    private readonly ILogger<CleanDatabaseScheduledTask> _logger;
-    private readonly IDbContextFactory<JellyfinDbContext> _dbProvider;
-    private readonly IPathManager _pathManager;
-
-    public CleanDatabaseScheduledTask(
-        ILibraryManager libraryManager,
-        ILogger<CleanDatabaseScheduledTask> logger,
-        IDbContextFactory<JellyfinDbContext> dbProvider,
-        IPathManager pathManager)
+    public class CleanDatabaseScheduledTask : ILibraryPostScanTask
     {
-        _libraryManager = libraryManager;
-        _logger = logger;
-        _dbProvider = dbProvider;
-        _pathManager = pathManager;
-    }
+        private readonly ILibraryManager _libraryManager;
+        private readonly ILogger<CleanDatabaseScheduledTask> _logger;
 
-    public async Task Run(IProgress<double> progress, CancellationToken cancellationToken)
-    {
-        await CleanDeadItems(cancellationToken, progress).ConfigureAwait(false);
-    }
-
-    private async Task CleanDeadItems(CancellationToken cancellationToken, IProgress<double> progress)
-    {
-        var itemIds = _libraryManager.GetItemIds(new InternalItemsQuery
+        public CleanDatabaseScheduledTask(ILibraryManager libraryManager, ILogger<CleanDatabaseScheduledTask> logger)
         {
-            HasDeadParentId = true
-        });
+            _libraryManager = libraryManager;
+            _logger = logger;
+        }
 
-        var numComplete = 0;
-        var numItems = itemIds.Count + 1;
-
-        _logger.LogDebug("Cleaning {Number} items with dead parent links", numItems);
-
-        foreach (var itemId in itemIds)
+        public Task Run(IProgress<double> progress, CancellationToken cancellationToken)
         {
-            cancellationToken.ThrowIfCancellationRequested();
+            CleanDeadItems(cancellationToken, progress);
+            return Task.CompletedTask;
+        }
 
-            var item = _libraryManager.GetItemById(itemId);
-            if (item is not null)
+        private void CleanDeadItems(CancellationToken cancellationToken, IProgress<double> progress)
+        {
+            var itemIds = _libraryManager.GetItemIds(new InternalItemsQuery
             {
-                _logger.LogInformation("Cleaning item {Item} type: {Type} path: {Path}", item.Name, item.GetType().Name, item.Path ?? string.Empty);
+                HasDeadParentId = true
+            });
 
-                foreach (var mediaSource in item.GetMediaSources(false))
+            var numComplete = 0;
+            var numItems = itemIds.Count;
+
+            _logger.LogDebug("Cleaning {0} items with dead parent links", numItems);
+
+            foreach (var itemId in itemIds)
+            {
+                cancellationToken.ThrowIfCancellationRequested();
+
+                var item = _libraryManager.GetItemById(itemId);
+
+                if (item is not null)
                 {
-                    // Delete extracted subtitles
-                    try
-                    {
-                        var subtitleFolder = _pathManager.GetSubtitleFolderPath(mediaSource.Id);
-                        if (Directory.Exists(subtitleFolder))
-                        {
-                            Directory.Delete(subtitleFolder, true);
-                        }
-                    }
-                    catch (Exception e)
-                    {
-                        _logger.LogWarning("Failed to remove subtitle cache folder for {Item}: {Exception}", item.Id, e.Message);
-                    }
+                    _logger.LogInformation("Cleaning item {0} type: {1} path: {2}", item.Name, item.GetType().Name, item.Path ?? string.Empty);
 
-                    // Delete extracted attachments
-                    try
+                    _libraryManager.DeleteItem(item, new DeleteOptions
                     {
-                        var attachmentFolder = _pathManager.GetAttachmentFolderPath(mediaSource.Id);
-                        if (Directory.Exists(attachmentFolder))
-                        {
-                            Directory.Delete(attachmentFolder, true);
-                        }
-                    }
-                    catch (Exception e)
-                    {
-                        _logger.LogWarning("Failed to remove attachment cache folder for {Item}: {Exception}", item.Id, e.Message);
-                    }
+                        DeleteFileLocation = false
+                    });
                 }
 
-                // Delete item
-                _libraryManager.DeleteItem(item, new DeleteOptions
-                {
-                    DeleteFileLocation = false
-                });
+                numComplete++;
+                double percent = numComplete;
+                percent /= numItems;
+                progress.Report(percent * 100);
             }
 
-            numComplete++;
-            double percent = numComplete;
-            percent /= numItems;
-            progress.Report(percent * 100);
+            progress.Report(100);
         }
-
-        var context = await _dbProvider.CreateDbContextAsync(cancellationToken).ConfigureAwait(false);
-        await using (context.ConfigureAwait(false))
-        {
-            var transaction = await context.Database.BeginTransactionAsync(cancellationToken).ConfigureAwait(false);
-            await using (transaction.ConfigureAwait(false))
-            {
-                await context.ItemValues.Where(e => e.BaseItemsMap!.Count == 0).ExecuteDeleteAsync(cancellationToken).ConfigureAwait(false);
-                await transaction.CommitAsync(cancellationToken).ConfigureAwait(false);
-            }
-        }
-
-        progress.Report(100);
     }
 }

Emby.Server.Implementations/Data/ItemTypeLookup.cs

@@ -1,64 +0,0 @@
-using System.Collections.Frozen;
-using System.Collections.Generic;
-using System.Threading.Channels;
-using Emby.Server.Implementations.Playlists;
-using Jellyfin.Data.Enums;
-using MediaBrowser.Controller.Entities;
-using MediaBrowser.Controller.Entities.Audio;
-using MediaBrowser.Controller.Entities.Movies;
-using MediaBrowser.Controller.Entities.TV;
-using MediaBrowser.Controller.LiveTv;
-using MediaBrowser.Controller.Persistence;
-using MediaBrowser.Controller.Playlists;
-
-namespace Emby.Server.Implementations.Data;
-
-/// <inheritdoc />
-public class ItemTypeLookup : IItemTypeLookup
-{
-    /// <inheritdoc />
-    public IReadOnlyList<string> MusicGenreTypes { get; } = [
-         typeof(Audio).FullName!,
-         typeof(MusicVideo).FullName!,
-         typeof(MusicAlbum).FullName!,
-         typeof(MusicArtist).FullName!,
-    ];
-
-    /// <inheritdoc />
-    public IReadOnlyDictionary<BaseItemKind, string> BaseItemKindNames { get; } = new Dictionary<BaseItemKind, string>()
-    {
-        { BaseItemKind.AggregateFolder, typeof(AggregateFolder).FullName! },
-        { BaseItemKind.Audio, typeof(Audio).FullName! },
-        { BaseItemKind.AudioBook, typeof(AudioBook).FullName! },
-        { BaseItemKind.BasePluginFolder, typeof(BasePluginFolder).FullName! },
-        { BaseItemKind.Book, typeof(Book).FullName! },
-        { BaseItemKind.BoxSet, typeof(BoxSet).FullName! },
-        { BaseItemKind.Channel, typeof(Channel).FullName! },
-        { BaseItemKind.CollectionFolder, typeof(CollectionFolder).FullName! },
-        { BaseItemKind.Episode, typeof(Episode).FullName! },
-        { BaseItemKind.Folder, typeof(Folder).FullName! },
-        { BaseItemKind.Genre, typeof(Genre).FullName! },
-        { BaseItemKind.Movie, typeof(Movie).FullName! },
-        { BaseItemKind.LiveTvChannel, typeof(LiveTvChannel).FullName! },
-        { BaseItemKind.LiveTvProgram, typeof(LiveTvProgram).FullName! },
-        { BaseItemKind.MusicAlbum, typeof(MusicAlbum).FullName! },
-        { BaseItemKind.MusicArtist, typeof(MusicArtist).FullName! },
-        { BaseItemKind.MusicGenre, typeof(MusicGenre).FullName! },
-        { BaseItemKind.MusicVideo, typeof(MusicVideo).FullName! },
-        { BaseItemKind.Person, typeof(Person).FullName! },
-        { BaseItemKind.Photo, typeof(Photo).FullName! },
-        { BaseItemKind.PhotoAlbum, typeof(PhotoAlbum).FullName! },
-        { BaseItemKind.Playlist, typeof(Playlist).FullName! },
-        { BaseItemKind.PlaylistsFolder, typeof(PlaylistsFolder).FullName! },
-        { BaseItemKind.Season, typeof(Season).FullName! },
-        { BaseItemKind.Series, typeof(Series).FullName! },
-        { BaseItemKind.Studio, typeof(Studio).FullName! },
-        { BaseItemKind.Trailer, typeof(Trailer).FullName! },
-        { BaseItemKind.TvChannel, typeof(LiveTvChannel).FullName! },
-        { BaseItemKind.TvProgram, typeof(LiveTvProgram).FullName! },
-        { BaseItemKind.UserRootFolder, typeof(UserRootFolder).FullName! },
-        { BaseItemKind.UserView, typeof(UserView).FullName! },
-        { BaseItemKind.Video, typeof(Video).FullName! },
-        { BaseItemKind.Year, typeof(Year).FullName! }
-    }.ToFrozenDictionary();
-}

Emby.Server.Implementations/Data/ManagedConnection.cs

@@ -0,0 +1,62 @@
+#pragma warning disable CS1591
+
+using System;
+using System.Collections.Generic;
+using System.Threading;
+using Microsoft.Data.Sqlite;
+
+namespace Emby.Server.Implementations.Data;
+
+public sealed class ManagedConnection : IDisposable
+{
+    private readonly SemaphoreSlim? _writeLock;
+
+    private SqliteConnection _db;
+
+    private bool _disposed = false;
+
+    public ManagedConnection(SqliteConnection db, SemaphoreSlim? writeLock)
+    {
+        _db = db;
+        _writeLock = writeLock;
+    }
+
+    public SqliteTransaction BeginTransaction()
+        => _db.BeginTransaction();
+
+    public SqliteCommand CreateCommand()
+        => _db.CreateCommand();
+
+    public void Execute(string commandText)
+        => _db.Execute(commandText);
+
+    public SqliteCommand PrepareStatement(string sql)
+        => _db.PrepareStatement(sql);
+
+    public IEnumerable<SqliteDataReader> Query(string commandText)
+        => _db.Query(commandText);
+
+    public void Dispose()
+    {
+        if (_disposed)
+        {
+            return;
+        }
+
+        if (_writeLock is null)
+        {
+            // Read connections are managed with an internal pool
+            _db.Dispose();
+        }
+        else
+        {
+            // Write lock is managed by BaseSqliteRepository
+            // Don't dispose here
+            _writeLock.Release();
+        }
+
+        _db = null!;
+
+        _disposed = true;
+    }
+}

Emby.Server.Implementations/Data/SqliteExtensions.cs

@@ -127,16 +127,8 @@ namespace Emby.Server.Implementations.Data
                 return false;
             }
 
-            try
-            {
-                result = reader.GetGuid(index);
-                return true;
-            }
-            catch
-            {
-                result = Guid.Empty;
-                return false;
-            }
+            result = reader.GetGuid(index);
+            return true;
         }
 
         public static bool TryGetString(this SqliteDataReader reader, int index, out string result)

Emby.Server.Implementations/Data/SqliteUserDataRepository.cs

@@ -0,0 +1,369 @@
+#nullable disable
+
+#pragma warning disable CS1591
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Threading;
+using Jellyfin.Data.Entities;
+using MediaBrowser.Controller.Configuration;
+using MediaBrowser.Controller.Entities;
+using MediaBrowser.Controller.Library;
+using MediaBrowser.Controller.Persistence;
+using Microsoft.Data.Sqlite;
+using Microsoft.Extensions.Logging;
+
+namespace Emby.Server.Implementations.Data
+{
+    public class SqliteUserDataRepository : BaseSqliteRepository, IUserDataRepository
+    {
+        private readonly IUserManager _userManager;
+
+        public SqliteUserDataRepository(
+            ILogger<SqliteUserDataRepository> logger,
+            IServerConfigurationManager config,
+            IUserManager userManager)
+            : base(logger)
+        {
+            _userManager = userManager;
+
+            DbFilePath = Path.Combine(config.ApplicationPaths.DataPath, "library.db");
+        }
+
+        /// <summary>
+        /// Opens the connection to the database.
+        /// </summary>
+        public override void Initialize()
+        {
+            base.Initialize();
+
+            using (var connection = GetConnection())
+            {
+                var userDatasTableExists = TableExists(connection, "UserDatas");
+                var userDataTableExists = TableExists(connection, "userdata");
+
+                var users = userDatasTableExists ? null : _userManager.Users;
+                using var transaction = connection.BeginTransaction();
+                connection.Execute(string.Join(
+                    ';',
+                    "create table if not exists UserDatas (key nvarchar not null, userId INT not null, rating float null, played bit not null, playCount int not null, isFavorite bit not null, playbackPositionTicks bigint not null, lastPlayedDate datetime null, AudioStreamIndex INT, SubtitleStreamIndex INT)",
+                    "drop index if exists idx_userdata",
+                    "drop index if exists idx_userdata1",
+                    "drop index if exists idx_userdata2",
+                    "drop index if exists userdataindex1",
+                    "drop index if exists userdataindex",
+                    "drop index if exists userdataindex3",
+                    "drop index if exists userdataindex4",
+                    "create unique index if not exists UserDatasIndex1 on UserDatas (key, userId)",
+                    "create index if not exists UserDatasIndex2 on UserDatas (key, userId, played)",
+                    "create index if not exists UserDatasIndex3 on UserDatas (key, userId, playbackPositionTicks)",
+                    "create index if not exists UserDatasIndex4 on UserDatas (key, userId, isFavorite)",
+                    "create index if not exists UserDatasIndex5 on UserDatas (key, userId, lastPlayedDate)"));
+
+                if (!userDataTableExists)
+                {
+                    transaction.Commit();
+                    return;
+                }
+
+                var existingColumnNames = GetColumnNames(connection, "userdata");
+
+                AddColumn(connection, "userdata", "InternalUserId", "int", existingColumnNames);
+                AddColumn(connection, "userdata", "AudioStreamIndex", "int", existingColumnNames);
+                AddColumn(connection, "userdata", "SubtitleStreamIndex", "int", existingColumnNames);
+
+                if (userDatasTableExists)
+                {
+                    return;
+                }
+
+                ImportUserIds(connection, users);
+
+                connection.Execute("INSERT INTO UserDatas (key, userId, rating, played, playCount, isFavorite, playbackPositionTicks, lastPlayedDate, AudioStreamIndex, SubtitleStreamIndex) SELECT key, InternalUserId, rating, played, playCount, isFavorite, playbackPositionTicks, lastPlayedDate, AudioStreamIndex, SubtitleStreamIndex from userdata where InternalUserId not null");
+
+                transaction.Commit();
+            }
+        }
+
+        private void ImportUserIds(ManagedConnection db, IEnumerable<User> users)
+        {
+            var userIdsWithUserData = GetAllUserIdsWithUserData(db);
+
+            using (var statement = db.PrepareStatement("update userdata set InternalUserId=@InternalUserId where UserId=@UserId"))
+            {
+                foreach (var user in users)
+                {
+                    if (!userIdsWithUserData.Contains(user.Id))
+                    {
+                        continue;
+                    }
+
+                    statement.TryBind("@UserId", user.Id);
+                    statement.TryBind("@InternalUserId", user.InternalId);
+
+                    statement.ExecuteNonQuery();
+                }
+            }
+        }
+
+        private List<Guid> GetAllUserIdsWithUserData(ManagedConnection db)
+        {
+            var list = new List<Guid>();
+
+            using (var statement = PrepareStatement(db, "select DISTINCT UserId from UserData where UserId not null"))
+            {
+                foreach (var row in statement.ExecuteQuery())
+                {
+                    try
+                    {
+                        list.Add(row.GetGuid(0));
+                    }
+                    catch (Exception ex)
+                    {
+                        Logger.LogError(ex, "Error while getting user");
+                    }
+                }
+            }
+
+            return list;
+        }
+
+        /// <inheritdoc />
+        public void SaveUserData(long userId, string key, UserItemData userData, CancellationToken cancellationToken)
+        {
+            ArgumentNullException.ThrowIfNull(userData);
+
+            if (userId <= 0)
+            {
+                throw new ArgumentNullException(nameof(userId));
+            }
+
+            ArgumentException.ThrowIfNullOrEmpty(key);
+
+            PersistUserData(userId, key, userData, cancellationToken);
+        }
+
+        /// <inheritdoc />
+        public void SaveAllUserData(long userId, UserItemData[] userData, CancellationToken cancellationToken)
+        {
+            ArgumentNullException.ThrowIfNull(userData);
+
+            if (userId <= 0)
+            {
+                throw new ArgumentNullException(nameof(userId));
+            }
+
+            PersistAllUserData(userId, userData, cancellationToken);
+        }
+
+        /// <summary>
+        /// Persists the user data.
+        /// </summary>
+        /// <param name="internalUserId">The user id.</param>
+        /// <param name="key">The key.</param>
+        /// <param name="userData">The user data.</param>
+        /// <param name="cancellationToken">The cancellation token.</param>
+        public void PersistUserData(long internalUserId, string key, UserItemData userData, CancellationToken cancellationToken)
+        {
+            cancellationToken.ThrowIfCancellationRequested();
+
+            using (var connection = GetConnection())
+            using (var transaction = connection.BeginTransaction())
+            {
+                SaveUserData(connection, internalUserId, key, userData);
+                transaction.Commit();
+            }
+        }
+
+        private static void SaveUserData(ManagedConnection db, long internalUserId, string key, UserItemData userData)
+        {
+            using (var statement = db.PrepareStatement("replace into UserDatas (key, userId, rating,played,playCount,isFavorite,playbackPositionTicks,lastPlayedDate,AudioStreamIndex,SubtitleStreamIndex) values (@key, @userId, @rating,@played,@playCount,@isFavorite,@playbackPositionTicks,@lastPlayedDate,@AudioStreamIndex,@SubtitleStreamIndex)"))
+            {
+                statement.TryBind("@userId", internalUserId);
+                statement.TryBind("@key", key);
+
+                if (userData.Rating.HasValue)
+                {
+                    statement.TryBind("@rating", userData.Rating.Value);
+                }
+                else
+                {
+                    statement.TryBindNull("@rating");
+                }
+
+                statement.TryBind("@played", userData.Played);
+                statement.TryBind("@playCount", userData.PlayCount);
+                statement.TryBind("@isFavorite", userData.IsFavorite);
+                statement.TryBind("@playbackPositionTicks", userData.PlaybackPositionTicks);
+
+                if (userData.LastPlayedDate.HasValue)
+                {
+                    statement.TryBind("@lastPlayedDate", userData.LastPlayedDate.Value.ToDateTimeParamValue());
+                }
+                else
+                {
+                    statement.TryBindNull("@lastPlayedDate");
+                }
+
+                if (userData.AudioStreamIndex.HasValue)
+                {
+                    statement.TryBind("@AudioStreamIndex", userData.AudioStreamIndex.Value);
+                }
+                else
+                {
+                    statement.TryBindNull("@AudioStreamIndex");
+                }
+
+                if (userData.SubtitleStreamIndex.HasValue)
+                {
+                    statement.TryBind("@SubtitleStreamIndex", userData.SubtitleStreamIndex.Value);
+                }
+                else
+                {
+                    statement.TryBindNull("@SubtitleStreamIndex");
+                }
+
+                statement.ExecuteNonQuery();
+            }
+        }
+
+        /// <summary>
+        /// Persist all user data for the specified user.
+        /// </summary>
+        private void PersistAllUserData(long internalUserId, UserItemData[] userDataList, CancellationToken cancellationToken)
+        {
+            cancellationToken.ThrowIfCancellationRequested();
+
+            using (var connection = GetConnection())
+            using (var transaction = connection.BeginTransaction())
+            {
+                foreach (var userItemData in userDataList)
+                {
+                    SaveUserData(connection, internalUserId, userItemData.Key, userItemData);
+                }
+
+                transaction.Commit();
+            }
+        }
+
+        /// <summary>
+        /// Gets the user data.
+        /// </summary>
+        /// <param name="userId">The user id.</param>
+        /// <param name="key">The key.</param>
+        /// <returns>Task{UserItemData}.</returns>
+        /// <exception cref="ArgumentNullException">
+        /// userId
+        /// or
+        /// key.
+        /// </exception>
+        public UserItemData GetUserData(long userId, string key)
+        {
+            if (userId <= 0)
+            {
+                throw new ArgumentNullException(nameof(userId));
+            }
+
+            ArgumentException.ThrowIfNullOrEmpty(key);
+
+            using (var connection = GetConnection(true))
+            {
+                using (var statement = connection.PrepareStatement("select key,userid,rating,played,playCount,isFavorite,playbackPositionTicks,lastPlayedDate,AudioStreamIndex,SubtitleStreamIndex from UserDatas where key =@Key and userId=@UserId"))
+                {
+                    statement.TryBind("@UserId", userId);
+                    statement.TryBind("@Key", key);
+
+                    foreach (var row in statement.ExecuteQuery())
+                    {
+                        return ReadRow(row);
+                    }
+                }
+
+                return null;
+            }
+        }
+
+        public UserItemData GetUserData(long userId, List<string> keys)
+        {
+            ArgumentNullException.ThrowIfNull(keys);
+
+            if (keys.Count == 0)
+            {
+                return null;
+            }
+
+            return GetUserData(userId, keys[0]);
+        }
+
+        /// <summary>
+        /// Return all user-data associated with the given user.
+        /// </summary>
+        /// <param name="userId">The internal user id.</param>
+        /// <returns>The list of user item data.</returns>
+        public List<UserItemData> GetAllUserData(long userId)
+        {
+            if (userId <= 0)
+            {
+                throw new ArgumentNullException(nameof(userId));
+            }
+
+            var list = new List<UserItemData>();
+
+            using (var connection = GetConnection())
+            {
+                using (var statement = connection.PrepareStatement("select key,userid,rating,played,playCount,isFavorite,playbackPositionTicks,lastPlayedDate,AudioStreamIndex,SubtitleStreamIndex from UserDatas where userId=@UserId"))
+                {
+                    statement.TryBind("@UserId", userId);
+
+                    foreach (var row in statement.ExecuteQuery())
+                    {
+                        list.Add(ReadRow(row));
+                    }
+                }
+            }
+
+            return list;
+        }
+
+        /// <summary>
+        /// Read a row from the specified reader into the provided userData object.
+        /// </summary>
+        /// <param name="reader">The list of result set values.</param>
+        /// <returns>The user item data.</returns>
+        private UserItemData ReadRow(SqliteDataReader reader)
+        {
+            var userData = new UserItemData
+            {
+                Key = reader.GetString(0)
+            };
+
+            if (reader.TryGetDouble(2, out var rating))
+            {
+                userData.Rating = rating;
+            }
+
+            userData.Played = reader.GetBoolean(3);
+            userData.PlayCount = reader.GetInt32(4);
+            userData.IsFavorite = reader.GetBoolean(5);
+            userData.PlaybackPositionTicks = reader.GetInt64(6);
+
+            if (reader.TryReadDateTime(7, out var lastPlayedDate))
+            {
+                userData.LastPlayedDate = lastPlayedDate;
+            }
+
+            if (reader.TryGetInt32(8, out var audioStreamIndex))
+            {
+                userData.AudioStreamIndex = audioStreamIndex;
+            }
+
+            if (reader.TryGetInt32(9, out var subtitleStreamIndex))
+            {
+                userData.SubtitleStreamIndex = subtitleStreamIndex;
+            }
+
+            return userData;
+        }
+    }
+}

Emby.Server.Implementations/Data/SynchronousMode.cs

@@ -0,0 +1,30 @@
+namespace Emby.Server.Implementations.Data;
+
+/// <summary>
+/// The disk synchronization mode, controls how aggressively SQLite will write data
+/// all the way out to physical storage.
+/// </summary>
+public enum SynchronousMode
+{
+    /// <summary>
+    /// SQLite continues without syncing as soon as it has handed data off to the operating system.
+    /// </summary>
+    Off = 0,
+
+    /// <summary>
+    /// SQLite database engine will still sync at the most critical moments.
+    /// </summary>
+    Normal = 1,
+
+    /// <summary>
+    /// SQLite database engine will use the xSync method of the VFS
+    /// to ensure that all content is safely written to the disk surface prior to continuing.
+    /// </summary>
+    Full = 2,
+
+    /// <summary>
+    /// EXTRA synchronous is like FULL with the addition that the directory containing a rollback journal
+    /// is synced after that journal is unlinked to commit a transaction in DELETE mode.
+    /// </summary>
+    Extra = 3
+}

Emby.Server.Implementations/Data/TempStoreMode.cs

@@ -0,0 +1,23 @@
+namespace Emby.Server.Implementations.Data;
+
+/// <summary>
+/// Storage mode used by temporary database files.
+/// </summary>
+public enum TempStoreMode
+{
+    /// <summary>
+    /// The compile-time C preprocessor macro SQLITE_TEMP_STORE
+    /// is used to determine where temporary tables and indices are stored.
+    /// </summary>
+    Default = 0,
+
+    /// <summary>
+    /// Temporary tables and indices are stored in a file.
+    /// </summary>
+    File = 1,
+
+    /// <summary>
+    /// Temporary tables and indices are kept in as if they were pure in-memory databases memory.
+    /// </summary>
+    Memory = 2
+}

Emby.Server.Implementations/Devices/DeviceId.cs

@@ -4,7 +4,6 @@ using System;
 using System.Globalization;
 using System.IO;
 using System.Text;
-using System.Threading;
 using MediaBrowser.Common.Configuration;
 using Microsoft.Extensions.Logging;
 
@@ -14,7 +13,7 @@ namespace Emby.Server.Implementations.Devices
     {
         private readonly IApplicationPaths _appPaths;
         private readonly ILogger<DeviceId> _logger;
-        private readonly Lock _syncLock = new();
+        private readonly object _syncLock = new object();
 
         private string? _id;
 

Emby.Server.Implementations/Dto/DtoService.cs

@@ -5,12 +5,11 @@ using System.Collections.Generic;
 using System.Globalization;
 using System.IO;
 using System.Linq;
+using Jellyfin.Data.Entities;
 using Jellyfin.Data.Enums;
-using Jellyfin.Database.Implementations.Entities;
 using Jellyfin.Extensions;
 using MediaBrowser.Common;
 using MediaBrowser.Controller.Channels;
-using MediaBrowser.Controller.Chapters;
 using MediaBrowser.Controller.Drawing;
 using MediaBrowser.Controller.Dto;
 using MediaBrowser.Controller.Entities;
@@ -41,6 +40,7 @@ namespace Emby.Server.Implementations.Dto
         private readonly ILogger<DtoService> _logger;
         private readonly ILibraryManager _libraryManager;
         private readonly IUserDataManager _userDataRepository;
+        private readonly IItemRepository _itemRepo;
 
         private readonly IImageProcessor _imageProcessor;
         private readonly IProviderManager _providerManager;
@@ -51,24 +51,24 @@ namespace Emby.Server.Implementations.Dto
         private readonly Lazy<ILiveTvManager> _livetvManagerFactory;
 
         private readonly ITrickplayManager _trickplayManager;
-        private readonly IChapterRepository _chapterRepository;
 
         public DtoService(
             ILogger<DtoService> logger,
             ILibraryManager libraryManager,
             IUserDataManager userDataRepository,
+            IItemRepository itemRepo,
             IImageProcessor imageProcessor,
             IProviderManager providerManager,
             IRecordingsManager recordingsManager,
             IApplicationHost appHost,
             IMediaSourceManager mediaSourceManager,
             Lazy<ILiveTvManager> livetvManagerFactory,
-            ITrickplayManager trickplayManager,
-            IChapterRepository chapterRepository)
+            ITrickplayManager trickplayManager)
         {
             _logger = logger;
             _libraryManager = libraryManager;
             _userDataRepository = userDataRepository;
+            _itemRepo = itemRepo;
             _imageProcessor = imageProcessor;
             _providerManager = providerManager;
             _recordingsManager = recordingsManager;
@@ -76,7 +76,6 @@ namespace Emby.Server.Implementations.Dto
             _mediaSourceManager = mediaSourceManager;
             _livetvManagerFactory = livetvManagerFactory;
             _trickplayManager = trickplayManager;
-            _chapterRepository = chapterRepository;
         }
 
         private ILiveTvManager LivetvManager => _livetvManagerFactory.Value;
@@ -96,11 +95,11 @@ namespace Emby.Server.Implementations.Dto
 
                 if (item is LiveTvChannel tvChannel)
                 {
-                    (channelTuples ??= []).Add((dto, tvChannel));
+                    (channelTuples ??= new()).Add((dto, tvChannel));
                 }
                 else if (item is LiveTvProgram)
                 {
-                    (programTuples ??= []).Add((item, dto));
+                    (programTuples ??= new()).Add((item, dto));
                 }
 
                 if (item is IItemByName byName)
@@ -166,7 +165,7 @@ namespace Emby.Server.Implementations.Dto
             return dto;
         }
 
-        private static IReadOnlyList<BaseItem> GetTaggedItems(IItemByName byName, User? user, DtoOptions options)
+        private static IList<BaseItem> GetTaggedItems(IItemByName byName, User? user, DtoOptions options)
         {
             return byName.GetTaggedItems(
                 new InternalItemsQuery(user)
@@ -328,7 +327,7 @@ namespace Emby.Server.Implementations.Dto
             return dto;
         }
 
-        private static void SetItemByNameInfo(BaseItem item, BaseItemDto dto, IReadOnlyList<BaseItem> taggedItems)
+        private static void SetItemByNameInfo(BaseItem item, BaseItemDto dto, IList<BaseItem> taggedItems)
         {
             if (item is MusicArtist)
             {
@@ -587,12 +586,12 @@ namespace Emby.Server.Implementations.Dto
                     if (dto.ImageBlurHashes is not null)
                     {
                         // Only add BlurHash for the person's image.
-                        baseItemPerson.ImageBlurHashes = [];
+                        baseItemPerson.ImageBlurHashes = new Dictionary<ImageType, Dictionary<string, string>>();
                         foreach (var (imageType, blurHash) in dto.ImageBlurHashes)
                         {
                             if (blurHash is not null)
                             {
-                                baseItemPerson.ImageBlurHashes[imageType] = [];
+                                baseItemPerson.ImageBlurHashes[imageType] = new Dictionary<string, string>();
                                 foreach (var (imageId, blurHashValue) in blurHash)
                                 {
                                     if (string.Equals(baseItemPerson.PrimaryImageTag, imageId, StringComparison.OrdinalIgnoreCase))
@@ -671,11 +670,11 @@ namespace Emby.Server.Implementations.Dto
 
             if (!string.IsNullOrEmpty(image.BlurHash))
             {
-                dto.ImageBlurHashes ??= [];
+                dto.ImageBlurHashes ??= new Dictionary<ImageType, Dictionary<string, string>>();
 
                 if (!dto.ImageBlurHashes.TryGetValue(image.Type, out var value))
                 {
-                    value = [];
+                    value = new Dictionary<string, string>();
                     dto.ImageBlurHashes[image.Type] = value;
                 }
 
@@ -706,7 +705,7 @@ namespace Emby.Server.Implementations.Dto
 
             if (hashes.Count > 0)
             {
-                dto.ImageBlurHashes ??= [];
+                dto.ImageBlurHashes ??= new Dictionary<ImageType, Dictionary<string, string>>();
 
                 dto.ImageBlurHashes[imageType] = hashes;
             }
@@ -753,7 +752,7 @@ namespace Emby.Server.Implementations.Dto
                 dto.AspectRatio = hasAspectRatio.AspectRatio;
             }
 
-            dto.ImageBlurHashes = [];
+            dto.ImageBlurHashes = new Dictionary<ImageType, Dictionary<string, string>>();
 
             var backdropLimit = options.GetImageLimit(ImageType.Backdrop);
             if (backdropLimit > 0)
@@ -769,7 +768,7 @@ namespace Emby.Server.Implementations.Dto
 
             if (options.EnableImages)
             {
-                dto.ImageTags = [];
+                dto.ImageTags = new Dictionary<ImageType, string>();
 
                 // Prevent implicitly captured closure
                 var currentItem = item;
@@ -1061,7 +1060,7 @@ namespace Emby.Server.Implementations.Dto
 
                 if (options.ContainsField(ItemFields.Chapters))
                 {
-                    dto.Chapters = _chapterRepository.GetChapters(item.Id).ToList();
+                    dto.Chapters = _itemRepo.GetChapters(item);
                 }
 
                 if (options.ContainsField(ItemFields.Trickplay))

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

@@ -18,11 +18,9 @@
     <ProjectReference Include="..\Emby.Photos\Emby.Photos.csproj" />
     <ProjectReference Include="..\src\Jellyfin.Drawing\Jellyfin.Drawing.csproj" />
     <ProjectReference Include="..\MediaBrowser.MediaEncoding\MediaBrowser.MediaEncoding.csproj" />
-    <ProjectReference Include="..\src\Jellyfin.Database\Jellyfin.Database.Implementations\Jellyfin.Database.Implementations.csproj" />
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="BitFaster.Caching" />
     <PackageReference Include="DiscUtils.Udf" />
     <PackageReference Include="Microsoft.Data.Sqlite" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" />
@@ -39,7 +37,7 @@
   </ItemGroup>
 
   <PropertyGroup>
-    <TargetFramework>net9.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
   </PropertyGroup>
@@ -68,6 +66,6 @@
     <EmbeddedResource Include="Localization\iso6392.txt" />
     <EmbeddedResource Include="Localization\countries.json" />
     <EmbeddedResource Include="Localization\Core\*.json" />
-    <EmbeddedResource Include="Localization\Ratings\*.json" />
+    <EmbeddedResource Include="Localization\Ratings\*.csv" />
   </ItemGroup>
 </Project>

Emby.Server.Implementations/EntryPoints/LibraryChangedNotifier.cs

@@ -5,8 +5,8 @@ using System.Globalization;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
+using Jellyfin.Data.Entities;
 using Jellyfin.Data.Events;
-using Jellyfin.Database.Implementations.Entities;
 using Jellyfin.Extensions;
 using MediaBrowser.Controller.Channels;
 using MediaBrowser.Controller.Configuration;
@@ -34,7 +34,7 @@ public sealed class LibraryChangedNotifier : IHostedService, IDisposable
     private readonly IUserManager _userManager;
     private readonly ILogger<LibraryChangedNotifier> _logger;
 
-    private readonly Lock _libraryChangedSyncLock = new();
+    private readonly object _libraryChangedSyncLock = new();
     private readonly List<Folder> _foldersAddedTo = new();
     private readonly List<Folder> _foldersRemovedFrom = new();
     private readonly List<BaseItem> _itemsAdded = new();

Emby.Server.Implementations/EntryPoints/UserDataChangeNotifier.cs

@@ -24,7 +24,7 @@ namespace Emby.Server.Implementations.EntryPoints
         private readonly IUserManager _userManager;
 
         private readonly Dictionary<Guid, List<BaseItem>> _changedItems = new();
-        private readonly Lock _syncLock = new();
+        private readonly object _syncLock = new();
 
         private Timer? _updateTimer;
 
@@ -144,15 +144,9 @@ namespace Emby.Server.Implementations.EntryPoints
                     .Select(i =>
                     {
                         var dto = _userDataManager.GetUserDataDto(i, user);
-                        if (dto is null)
-                        {
-                            return null!;
-                        }
-
                         dto.ItemId = i.Id;
                         return dto;
                     })
-                    .Where(e => e is not null)
                     .ToArray()
             };
         }

Emby.Server.Implementations/HttpServer/Security/AuthService.cs

@@ -1,8 +1,7 @@
 #pragma warning disable CS1591
 
 using System.Threading.Tasks;
-using Jellyfin.Data;
-using Jellyfin.Database.Implementations.Enums;
+using Jellyfin.Data.Enums;
 using MediaBrowser.Controller.Net;
 using Microsoft.AspNetCore.Http;
 

Emby.Server.Implementations/HttpServer/WebSocketConnection.cs

@@ -82,17 +82,17 @@ namespace Emby.Server.Implementations.HttpServer
         public WebSocketState State => _socket.State;
 
         /// <inheritdoc />
-        public async Task SendAsync(OutboundWebSocketMessage message, CancellationToken cancellationToken)
+        public Task SendAsync(OutboundWebSocketMessage message, CancellationToken cancellationToken)
         {
             var json = JsonSerializer.SerializeToUtf8Bytes(message, _jsonOptions);
-            await _socket.SendAsync(json, WebSocketMessageType.Text, true, cancellationToken).ConfigureAwait(false);
+            return _socket.SendAsync(json, WebSocketMessageType.Text, true, cancellationToken);
         }
 
         /// <inheritdoc />
-        public async Task SendAsync<T>(OutboundWebSocketMessage<T> message, CancellationToken cancellationToken)
+        public Task SendAsync<T>(OutboundWebSocketMessage<T> message, CancellationToken cancellationToken)
         {
             var json = JsonSerializer.SerializeToUtf8Bytes(message, _jsonOptions);
-            await _socket.SendAsync(json, WebSocketMessageType.Text, true, cancellationToken).ConfigureAwait(false);
+            return _socket.SendAsync(json, WebSocketMessageType.Text, true, cancellationToken);
         }
 
         /// <inheritdoc />
@@ -224,12 +224,12 @@ namespace Emby.Server.Implementations.HttpServer
             return ret;
         }
 
-        private async Task SendKeepAliveResponse()
+        private Task SendKeepAliveResponse()
         {
             LastKeepAliveDate = DateTime.UtcNow;
-            await SendAsync(
+            return SendAsync(
                 new OutboundKeepAliveMessage(),
-                CancellationToken.None).ConfigureAwait(false);
+                CancellationToken.None);
         }
 
         /// <inheritdoc />

Emby.Server.Implementations/HttpServer/WebSocketManager.cs

@@ -84,7 +84,7 @@ namespace Emby.Server.Implementations.HttpServer
         /// Processes the web socket message received.
         /// </summary>
         /// <param name="result">The result.</param>
-        private async Task ProcessWebSocketMessageReceived(WebSocketMessageInfo result)
+        private Task ProcessWebSocketMessageReceived(WebSocketMessageInfo result)
         {
             var tasks = new Task[_webSocketListeners.Length];
             for (var i = 0; i < _webSocketListeners.Length; ++i)
@@ -92,7 +92,7 @@ namespace Emby.Server.Implementations.HttpServer
                 tasks[i] = _webSocketListeners[i].ProcessMessageAsync(result);
             }
 
-            await Task.WhenAll(tasks).ConfigureAwait(false);
+            return Task.WhenAll(tasks);
         }
     }
 }

Emby.Server.Implementations/IO/FileRefresher.cs

@@ -18,8 +18,8 @@ namespace Emby.Server.Implementations.IO
         private readonly ILibraryManager _libraryManager;
         private readonly IServerConfigurationManager _configurationManager;
 
-        private readonly List<string> _affectedPaths = new();
-        private readonly Lock _timerLock = new();
+        private readonly List<string> _affectedPaths = new List<string>();
+        private readonly object _timerLock = new object();
         private Timer? _timer;
         private bool _disposed;
 

Emby.Server.Implementations/IO/ManagedFileSystem.cs

@@ -541,8 +541,8 @@ namespace Emby.Server.Implementations.IO
             return DriveInfo.GetDrives()
                 .Where(
                     d => (d.DriveType == DriveType.Fixed || d.DriveType == DriveType.Network || d.DriveType == DriveType.Removable)
-                         && d.IsReady
-                         && d.TotalSize != 0)
+                        && d.IsReady
+                        && d.TotalSize != 0)
                 .Select(d => new FileSystemMetadata
                 {
                     Name = d.Name,
@@ -560,36 +560,22 @@ namespace Emby.Server.Implementations.IO
         /// <inheritdoc />
         public virtual IEnumerable<FileSystemMetadata> GetFiles(string path, bool recursive = false)
         {
-            return GetFiles(path, "*", recursive);
+            return GetFiles(path, null, false, recursive);
         }
 
         /// <inheritdoc />
-        public virtual IEnumerable<FileSystemMetadata> GetFiles(string path, string searchPattern, bool recursive = false)
-        {
-            return GetFiles(path, searchPattern, null, false, recursive);
-        }
-
-        /// <inheritdoc />
-        public virtual IEnumerable<FileSystemMetadata> GetFiles(string path, IReadOnlyList<string>? extensions, bool enableCaseSensitiveExtensions, bool recursive)
-        {
-            return GetFiles(path, "*", extensions, enableCaseSensitiveExtensions, recursive);
-        }
-
-        /// <inheritdoc />
-        public virtual IEnumerable<FileSystemMetadata> GetFiles(string path, string searchPattern, IReadOnlyList<string>? extensions, bool enableCaseSensitiveExtensions, bool recursive = false)
+        public virtual IEnumerable<FileSystemMetadata> GetFiles(string path, IReadOnlyList<string>? extensions, bool enableCaseSensitiveExtensions, bool recursive = false)
         {
             var enumerationOptions = GetEnumerationOptions(recursive);
 
-            // On linux and macOS the search pattern is case-sensitive
+            // On linux and osx the search pattern is case sensitive
             // If we're OK with case-sensitivity, and we're only filtering for one extension, then use the native method
             if ((enableCaseSensitiveExtensions || _isEnvironmentCaseInsensitive) && extensions is not null && extensions.Count == 1)
             {
-                searchPattern = searchPattern.EndsWith(extensions[0], StringComparison.Ordinal) ? searchPattern : searchPattern + extensions[0];
-
-                return ToMetadata(new DirectoryInfo(path).EnumerateFiles(searchPattern, enumerationOptions));
+                return ToMetadata(new DirectoryInfo(path).EnumerateFiles("*" + extensions[0], enumerationOptions));
             }
 
-            var files = new DirectoryInfo(path).EnumerateFiles(searchPattern, enumerationOptions);
+            var files = new DirectoryInfo(path).EnumerateFiles("*", enumerationOptions);
 
             if (extensions is not null && extensions.Count > 0)
             {
@@ -642,7 +628,7 @@ namespace Emby.Server.Implementations.IO
         {
             var enumerationOptions = GetEnumerationOptions(recursive);
 
-            // On linux and macOS the search pattern is case-sensitive
+            // On linux and osx the search pattern is case sensitive
             // If we're OK with case-sensitivity, and we're only filtering for one extension, then use the native method
             if ((enableCaseSensitiveExtensions || _isEnvironmentCaseInsensitive) && extensions is not null && extensions.Length == 1)
             {

Emby.Server.Implementations/Images/BaseDynamicImageProvider.cs

@@ -7,7 +7,6 @@ using System.Collections.Generic;
 using System.Globalization;
 using System.IO;
 using System.Linq;
-using System.Net.Mime;
 using System.Threading;
 using System.Threading.Tasks;
 using MediaBrowser.Common.Configuration;
@@ -117,9 +116,9 @@ namespace Emby.Server.Implementations.Images
 
             var mimeType = MimeTypes.GetMimeType(outputPath);
 
-            if (string.Equals(mimeType, MediaTypeNames.Application.Octet, StringComparison.OrdinalIgnoreCase))
+            if (string.Equals(mimeType, "application/octet-stream", StringComparison.OrdinalIgnoreCase))
             {
-                mimeType = MediaTypeNames.Image.Png;
+                mimeType = "image/png";
             }
 
             await ProviderManager.SaveImage(item, outputPath, mimeType, imageType, null, false, cancellationToken).ConfigureAwait(false);

Emby.Server.Implementations/Images/BaseFolderImageProvider.cs

@@ -2,7 +2,6 @@
 
 using System.Collections.Generic;
 using Jellyfin.Data.Enums;
-using Jellyfin.Database.Implementations.Enums;
 using MediaBrowser.Common.Configuration;
 using MediaBrowser.Controller.Drawing;
 using MediaBrowser.Controller.Dto;

Emby.Server.Implementations/Images/CollectionFolderImageProvider.cs

@@ -6,7 +6,6 @@ using System;
 using System.Collections.Generic;
 using System.IO;
 using Jellyfin.Data.Enums;
-using Jellyfin.Database.Implementations.Enums;
 using MediaBrowser.Common.Configuration;
 using MediaBrowser.Controller.Drawing;
 using MediaBrowser.Controller.Dto;

Emby.Server.Implementations/Images/GenreImageProvider.cs

@@ -2,7 +2,6 @@
 
 using System.Collections.Generic;
 using Jellyfin.Data.Enums;
-using Jellyfin.Database.Implementations.Enums;
 using MediaBrowser.Common.Configuration;
 using MediaBrowser.Controller.Drawing;
 using MediaBrowser.Controller.Dto;

Emby.Server.Implementations/Images/MusicGenreImageProvider.cs

@@ -4,7 +4,6 @@
 
 using System.Collections.Generic;
 using Jellyfin.Data.Enums;
-using Jellyfin.Database.Implementations.Enums;
 using MediaBrowser.Common.Configuration;
 using MediaBrowser.Controller.Drawing;
 using MediaBrowser.Controller.Dto;

Emby.Server.Implementations/Library/LibraryManager.cs

@@ -2,6 +2,7 @@
 #pragma warning disable CA5394
 
 using System;
+using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Globalization;
 using System.IO;
@@ -10,7 +11,6 @@ using System.Net;
 using System.Net.Http;
 using System.Threading;
 using System.Threading.Tasks;
-using BitFaster.Caching.Lru;
 using Emby.Naming.Common;
 using Emby.Naming.TV;
 using Emby.Server.Implementations.Library.Resolvers;
@@ -18,10 +18,8 @@ using Emby.Server.Implementations.Library.Validators;
 using Emby.Server.Implementations.Playlists;
 using Emby.Server.Implementations.ScheduledTasks.Tasks;
 using Emby.Server.Implementations.Sorting;
-using Jellyfin.Data;
+using Jellyfin.Data.Entities;
 using Jellyfin.Data.Enums;
-using Jellyfin.Database.Implementations.Entities;
-using Jellyfin.Database.Implementations.Enums;
 using Jellyfin.Extensions;
 using MediaBrowser.Common.Extensions;
 using MediaBrowser.Controller;
@@ -64,6 +62,7 @@ namespace Emby.Server.Implementations.Library
         private const string ShortcutFileExtension = ".mblink";
 
         private readonly ILogger<LibraryManager> _logger;
+        private readonly ConcurrentDictionary<Guid, BaseItem> _cache;
         private readonly ITaskManager _taskManager;
         private readonly IUserManager _userManager;
         private readonly IUserDataManager _userDataRepository;
@@ -77,16 +76,13 @@ namespace Emby.Server.Implementations.Library
         private readonly IItemRepository _itemRepository;
         private readonly IImageProcessor _imageProcessor;
         private readonly NamingOptions _namingOptions;
-        private readonly IPeopleRepository _peopleRepository;
         private readonly ExtraResolver _extraResolver;
-        private readonly IPathManager _pathManager;
-        private readonly FastConcurrentLru<Guid, BaseItem> _cache;
 
         /// <summary>
         /// The _root folder sync lock.
         /// </summary>
-        private readonly Lock _rootFolderSyncLock = new();
-        private readonly Lock _userRootFolderSyncLock = new();
+        private readonly object _rootFolderSyncLock = new object();
+        private readonly object _userRootFolderSyncLock = new object();
 
         private readonly TimeSpan _viewRefreshInterval = TimeSpan.FromHours(24);
 
@@ -116,8 +112,6 @@ namespace Emby.Server.Implementations.Library
         /// <param name="imageProcessor">The image processor.</param>
         /// <param name="namingOptions">The naming options.</param>
         /// <param name="directoryService">The directory service.</param>
-        /// <param name="peopleRepository">The people repository.</param>
-        /// <param name="pathManager">The path manager.</param>
         public LibraryManager(
             IServerApplicationHost appHost,
             ILoggerFactory loggerFactory,
@@ -133,9 +127,7 @@ namespace Emby.Server.Implementations.Library
             IItemRepository itemRepository,
             IImageProcessor imageProcessor,
             NamingOptions namingOptions,
-            IDirectoryService directoryService,
-            IPeopleRepository peopleRepository,
-            IPathManager pathManager)
+            IDirectoryService directoryService)
         {
             _appHost = appHost;
             _logger = loggerFactory.CreateLogger<LibraryManager>();
@@ -150,17 +142,14 @@ namespace Emby.Server.Implementations.Library
             _mediaEncoder = mediaEncoder;
             _itemRepository = itemRepository;
             _imageProcessor = imageProcessor;
-
-            _cache = new FastConcurrentLru<Guid, BaseItem>(_configurationManager.Configuration.CacheSize);
-
+            _cache = new ConcurrentDictionary<Guid, BaseItem>();
             _namingOptions = namingOptions;
-            _peopleRepository = peopleRepository;
-            _pathManager = pathManager;
+
             _extraResolver = new ExtraResolver(loggerFactory.CreateLogger<ExtraResolver>(), namingOptions, directoryService);
 
             _configurationManager.ConfigurationUpdated += ConfigurationUpdated;
 
-            RecordConfigurationValues(_configurationManager.Configuration);
+            RecordConfigurationValues(configurationManager.Configuration);
         }
 
         /// <summary>
@@ -208,33 +197,33 @@ namespace Emby.Server.Implementations.Library
         /// Gets or sets the postscan tasks.
         /// </summary>
         /// <value>The postscan tasks.</value>
-        private ILibraryPostScanTask[] PostscanTasks { get; set; } = [];
+        private ILibraryPostScanTask[] PostscanTasks { get; set; } = Array.Empty<ILibraryPostScanTask>();
 
         /// <summary>
         /// Gets or sets the intro providers.
         /// </summary>
         /// <value>The intro providers.</value>
-        private IIntroProvider[] IntroProviders { get; set; } = [];
+        private IIntroProvider[] IntroProviders { get; set; } = Array.Empty<IIntroProvider>();
 
         /// <summary>
         /// Gets or sets the list of entity resolution ignore rules.
         /// </summary>
         /// <value>The entity resolution ignore rules.</value>
-        private IResolverIgnoreRule[] EntityResolutionIgnoreRules { get; set; } = [];
+        private IResolverIgnoreRule[] EntityResolutionIgnoreRules { get; set; } = Array.Empty<IResolverIgnoreRule>();
 
         /// <summary>
         /// Gets or sets the list of currently registered entity resolvers.
         /// </summary>
         /// <value>The entity resolvers enumerable.</value>
-        private IItemResolver[] EntityResolvers { get; set; } = [];
+        private IItemResolver[] EntityResolvers { get; set; } = Array.Empty<IItemResolver>();
 
-        private IMultiItemResolver[] MultiItemResolvers { get; set; } = [];
+        private IMultiItemResolver[] MultiItemResolvers { get; set; } = Array.Empty<IMultiItemResolver>();
 
         /// <summary>
         /// Gets or sets the comparers.
         /// </summary>
         /// <value>The comparers.</value>
-        private IBaseItemComparer[] Comparers { get; set; } = [];
+        private IBaseItemComparer[] Comparers { get; set; } = Array.Empty<IBaseItemComparer>();
 
         public bool IsScanRunning { get; private set; }
 
@@ -308,7 +297,7 @@ namespace Emby.Server.Implementations.Library
                 }
             }
 
-            _cache.AddOrUpdate(item.Id, item);
+            _cache[item.Id] = item;
         }
 
         public void DeleteItem(BaseItem item, DeleteOptions options)
@@ -367,7 +356,7 @@ namespace Emby.Server.Implementations.Library
 
             var children = item.IsFolder
                 ? ((Folder)item).GetRecursiveChildren(false)
-                : [];
+                : Array.Empty<BaseItem>();
 
             foreach (var metadataPath in GetMetadataPaths(item, children))
             {
@@ -462,55 +451,24 @@ namespace Emby.Server.Implementations.Library
             item.SetParent(null);
 
             _itemRepository.DeleteItem(item.Id);
-            _cache.TryRemove(item.Id, out _);
             foreach (var child in children)
             {
                 _itemRepository.DeleteItem(child.Id);
-                _cache.TryRemove(child.Id, out _);
             }
 
+            _cache.TryRemove(item.Id, out _);
+
             ReportItemRemoved(item, parent);
         }
 
-        private List<string> GetMetadataPaths(BaseItem item, IEnumerable<BaseItem> children)
-        {
-            var list = GetInternalMetadataPaths(item);
-            foreach (var child in children)
-            {
-                list.AddRange(GetInternalMetadataPaths(child));
-            }
-
-            return list;
-        }
-
-        private List<string> GetInternalMetadataPaths(BaseItem item)
+        private static List<string> GetMetadataPaths(BaseItem item, IEnumerable<BaseItem> children)
         {
             var list = new List<string>
             {
                 item.GetInternalMetadataPath()
             };
 
-            if (item is Video video)
-            {
-                // Trickplay
-                list.Add(_pathManager.GetTrickplayDirectory(video));
-
-                // Subtitles and attachments
-                foreach (var mediaSource in item.GetMediaSources(false))
-                {
-                    var subtitleFolder = _pathManager.GetSubtitleFolderPath(mediaSource.Id);
-                    if (subtitleFolder is not null)
-                    {
-                        list.Add(subtitleFolder);
-                    }
-
-                    var attachmentFolder = _pathManager.GetAttachmentFolderPath(mediaSource.Id);
-                    if (attachmentFolder is not null)
-                    {
-                        list.Add(attachmentFolder);
-                    }
-                }
-            }
+            list.AddRange(children.Select(i => i.GetInternalMetadataPath()));
 
             return list;
         }
@@ -631,7 +589,7 @@ namespace Emby.Server.Implementations.Library
                     {
                         _logger.LogError(ex, "Error in GetFilteredFileSystemEntries isPhysicalRoot: {0} IsVf: {1}", isPhysicalRoot, isVf);
 
-                        files = [];
+                        files = Array.Empty<FileSystemMetadata>();
                     }
                     else
                     {
@@ -793,7 +751,14 @@ namespace Emby.Server.Implementations.Library
 
             if (folder.Id.IsEmpty())
             {
-                folder.Id = GetNewItemId(folder.Path, folder.GetType());
+                if (string.IsNullOrEmpty(folder.Path))
+                {
+                    folder.Id = GetNewItemId(folder.GetType().Name, folder.GetType());
+                }
+                else
+                {
+                    folder.Id = GetNewItemId(folder.Path, folder.GetType());
+                }
             }
 
             var dbItem = GetItemById(folder.Id) as BasePluginFolder;
@@ -1088,17 +1053,9 @@ namespace Emby.Server.Implementations.Library
                 cancellationToken: cancellationToken).ConfigureAwait(false);
 
             // Quickly scan CollectionFolders for changes
-            foreach (var child in GetUserRootFolder().Children.OfType<Folder>())
+            foreach (var folder in GetUserRootFolder().Children.OfType<Folder>())
             {
-                // If the user has somehow deleted the collection directory, remove the metadata from the database.
-                if (child is CollectionFolder collectionFolder && !Directory.Exists(collectionFolder.Path))
-                {
-                    _itemRepository.DeleteItem(collectionFolder.Id);
-                }
-                else
-                {
-                    await child.RefreshMetadata(cancellationToken).ConfigureAwait(false);
-                }
+                await folder.RefreshMetadata(cancellationToken).ConfigureAwait(false);
             }
         }
 
@@ -1273,7 +1230,7 @@ namespace Emby.Server.Implementations.Library
                 throw new ArgumentException("Guid can't be empty", nameof(id));
             }
 
-            if (_cache.TryGet(id, out var item))
+            if (_cache.TryGetValue(id, out BaseItem? item))
             {
                 return item;
             }
@@ -1290,7 +1247,7 @@ namespace Emby.Server.Implementations.Library
 
         /// <inheritdoc />
         public T? GetItemById<T>(Guid id)
-            where T : BaseItem
+         where T : BaseItem
         {
             var item = GetItemById(id);
             if (item is T typedItem)
@@ -1317,7 +1274,7 @@ namespace Emby.Server.Implementations.Library
             return ItemIsVisible(item, user) ? item : null;
         }
 
-        public IReadOnlyList<BaseItem> GetItemList(InternalItemsQuery query, bool allowExternalContent)
+        public List<BaseItem> GetItemList(InternalItemsQuery query, bool allowExternalContent)
         {
             if (query.Recursive && !query.ParentId.IsEmpty())
             {
@@ -1343,7 +1300,7 @@ namespace Emby.Server.Implementations.Library
             return itemList;
         }
 
-        public IReadOnlyList<BaseItem> GetItemList(InternalItemsQuery query)
+        public List<BaseItem> GetItemList(InternalItemsQuery query)
         {
             return GetItemList(query, true);
         }
@@ -1367,7 +1324,7 @@ namespace Emby.Server.Implementations.Library
             return _itemRepository.GetCount(query);
         }
 
-        public IReadOnlyList<BaseItem> GetItemList(InternalItemsQuery query, List<BaseItem> parents)
+        public List<BaseItem> GetItemList(InternalItemsQuery query, List<BaseItem> parents)
         {
             SetTopParentIdsOrAncestors(query, parents);
 
@@ -1382,36 +1339,6 @@ namespace Emby.Server.Implementations.Library
             return _itemRepository.GetItemList(query);
         }
 
-        public IReadOnlyList<BaseItem> GetLatestItemList(InternalItemsQuery query, IReadOnlyList<BaseItem> parents, CollectionType collectionType)
-        {
-            SetTopParentIdsOrAncestors(query, parents);
-
-            if (query.AncestorIds.Length == 0 && query.TopParentIds.Length == 0)
-            {
-                if (query.User is not null)
-                {
-                    AddUserToQuery(query, query.User);
-                }
-            }
-
-            return _itemRepository.GetLatestItemList(query, collectionType);
-        }
-
-        public IReadOnlyList<string> GetNextUpSeriesKeys(InternalItemsQuery query, IReadOnlyCollection<BaseItem> parents, DateTime dateCutoff)
-        {
-            SetTopParentIdsOrAncestors(query, parents);
-
-            if (query.AncestorIds.Length == 0 && query.TopParentIds.Length == 0)
-            {
-                if (query.User is not null)
-                {
-                    AddUserToQuery(query, query.User);
-                }
-            }
-
-            return _itemRepository.GetNextUpSeriesKeys(query, dateCutoff);
-        }
-
         public QueryResult<BaseItem> QueryItems(InternalItemsQuery query)
         {
             if (query.User is not null)
@@ -1430,7 +1357,7 @@ namespace Emby.Server.Implementations.Library
                 _itemRepository.GetItemList(query));
         }
 
-        public IReadOnlyList<Guid> GetItemIds(InternalItemsQuery query)
+        public List<Guid> GetItemIds(InternalItemsQuery query)
         {
             if (query.User is not null)
             {
@@ -1516,7 +1443,7 @@ namespace Emby.Server.Implementations.Library
 
             // Optimize by querying against top level views
             query.TopParentIds = parents.SelectMany(i => GetTopParentIdsForQuery(i, query.User)).ToArray();
-            query.AncestorIds = [];
+            query.AncestorIds = Array.Empty<Guid>();
 
             // Prevent searching in all libraries due to empty filter
             if (query.TopParentIds.Length == 0)
@@ -1636,7 +1563,7 @@ namespace Emby.Server.Implementations.Library
                         return GetTopParentIdsForQuery(displayParent, user);
                     }
 
-                    return [];
+                    return Array.Empty<Guid>();
                 }
 
                 if (!view.ParentId.IsEmpty())
@@ -1647,7 +1574,7 @@ namespace Emby.Server.Implementations.Library
                         return GetTopParentIdsForQuery(displayParent, user);
                     }
 
-                    return [];
+                    return Array.Empty<Guid>();
                 }
 
                 // Handle grouping
@@ -1662,7 +1589,7 @@ namespace Emby.Server.Implementations.Library
                         .SelectMany(i => GetTopParentIdsForQuery(i, user));
                 }
 
-                return [];
+                return Array.Empty<Guid>();
             }
 
             if (item is CollectionFolder collectionFolder)
@@ -1676,7 +1603,7 @@ namespace Emby.Server.Implementations.Library
                 return new[] { topParent.Id };
             }
 
-            return [];
+            return Array.Empty<Guid>();
         }
 
         /// <summary>
@@ -1720,7 +1647,7 @@ namespace Emby.Server.Implementations.Library
             {
                 _logger.LogError(ex, "Error getting intros");
 
-                return [];
+                return Enumerable.Empty<IntroInfo>();
             }
         }
 
@@ -2028,13 +1955,13 @@ namespace Emby.Server.Implementations.Library
         /// <inheritdoc />
         public async Task UpdateItemsAsync(IReadOnlyList<BaseItem> items, BaseItem parent, ItemUpdateType updateReason, CancellationToken cancellationToken)
         {
-            _itemRepository.SaveItems(items, cancellationToken);
-
             foreach (var item in items)
             {
                 await RunMetadataSavers(item, updateReason).ConfigureAwait(false);
             }
 
+            _itemRepository.SaveItems(items, cancellationToken);
+
             if (ItemUpdated is not null)
             {
                 foreach (var item in items)
@@ -2547,11 +2474,8 @@ namespace Emby.Server.Implementations.Library
         }
 
         /// <inheritdoc />
-        public int? GetSeasonNumberFromPath(string path, Guid? parentId)
-        {
-            var parentPath = parentId.HasValue ? GetItemById(parentId.Value)?.ContainingFolderPath : null;
-            return SeasonPathParser.Parse(path, parentPath, true, true).SeasonNumber;
-        }
+        public int? GetSeasonNumberFromPath(string path)
+            => SeasonPathParser.Parse(path, true, true).SeasonNumber;
 
         /// <inheritdoc />
         public bool FillMissingEpisodeNumbersFromPath(Episode episode, bool forceRefresh)
@@ -2702,6 +2626,15 @@ namespace Emby.Server.Implementations.Library
                 {
                     episode.ParentIndexNumber = season.IndexNumber;
                 }
+                else
+                {
+                    /*
+                    Anime series don't generally have a season in their file name, however,
+                    TVDb needs a season to correctly get the metadata.
+                    Hence, a null season needs to be filled with something. */
+                    // FIXME perhaps this would be better for TVDb parser to ask for season 1 if no season is specified
+                    episode.ParentIndexNumber = 1;
+                }
 
                 if (episode.ParentIndexNumber.HasValue)
                 {
@@ -2726,7 +2659,7 @@ namespace Emby.Server.Implementations.Library
 
         public IEnumerable<BaseItem> FindExtras(BaseItem owner, IReadOnlyList<FileSystemMetadata> fileSystemChildren, IDirectoryService directoryService)
         {
-            var ownerVideoInfo = VideoResolver.Resolve(owner.Path, owner.IsFolder, _namingOptions, libraryRoot: owner.ContainingFolderPath);
+            var ownerVideoInfo = VideoResolver.Resolve(owner.Path, owner.IsFolder, _namingOptions);
             if (ownerVideoInfo is null)
             {
                 yield break;
@@ -2803,12 +2736,12 @@ namespace Emby.Server.Implementations.Library
             return path;
         }
 
-        public IReadOnlyList<PersonInfo> GetPeople(InternalPeopleQuery query)
+        public List<PersonInfo> GetPeople(InternalPeopleQuery query)
         {
-            return _peopleRepository.GetPeople(query);
+            return _itemRepository.GetPeople(query);
         }
 
-        public IReadOnlyList<PersonInfo> GetPeople(BaseItem item)
+        public List<PersonInfo> GetPeople(BaseItem item)
         {
             if (item.SupportsPeople)
             {
@@ -2823,12 +2756,12 @@ namespace Emby.Server.Implementations.Library
                 }
             }
 
-            return [];
+            return new List<PersonInfo>();
         }
 
-        public IReadOnlyList<Person> GetPeopleItems(InternalPeopleQuery query)
+        public List<Person> GetPeopleItems(InternalPeopleQuery query)
         {
-            return _peopleRepository.GetPeopleNames(query)
+            return _itemRepository.GetPeopleNames(query)
             .Select(i =>
             {
                 try
@@ -2846,9 +2779,9 @@ namespace Emby.Server.Implementations.Library
             .ToList()!; // null values are filtered out
         }
 
-        public IReadOnlyList<string> GetPeopleNames(InternalPeopleQuery query)
+        public List<string> GetPeopleNames(InternalPeopleQuery query)
         {
-            return _peopleRepository.GetPeopleNames(query);
+            return _itemRepository.GetPeopleNames(query);
         }
 
         public void UpdatePeople(BaseItem item, List<PersonInfo> people)
@@ -2857,17 +2790,16 @@ namespace Emby.Server.Implementations.Library
         }
 
         /// <inheritdoc />
-        public async Task UpdatePeopleAsync(BaseItem item, IReadOnlyList<PersonInfo> people, CancellationToken cancellationToken)
+        public async Task UpdatePeopleAsync(BaseItem item, List<PersonInfo> people, CancellationToken cancellationToken)
         {
             if (!item.SupportsPeople)
             {
                 return;
             }
 
+            _itemRepository.UpdatePeople(item.Id, people);
             if (people is not null)
             {
-                people = people.Where(e => e is not null).ToArray();
-                _peopleRepository.UpdatePeople(item.Id, people);
                 await SavePeopleMetadataAsync(people, cancellationToken).ConfigureAwait(false);
             }
         }
@@ -2916,7 +2848,7 @@ namespace Emby.Server.Implementations.Library
                 throw new ArgumentNullException(nameof(name));
             }
 
-            name = _fileSystem.GetValidFilename(name.Trim());
+            name = _fileSystem.GetValidFilename(name);
 
             var rootFolderPath = _configurationManager.ApplicationPaths.DefaultUserViewsPath;
 
@@ -2950,7 +2882,7 @@ namespace Emby.Server.Implementations.Library
                 {
                     var path = Path.Combine(virtualFolderPath, collectionType.ToString()!.ToLowerInvariant() + ".collection"); // Can't be null with legal values?
 
-                    await File.WriteAllBytesAsync(path, []).ConfigureAwait(false);
+                    await File.WriteAllBytesAsync(path, Array.Empty<byte>()).ConfigureAwait(false);
                 }
 
                 CollectionFolder.SaveLibraryOptions(virtualFolderPath, options);
@@ -2982,13 +2914,14 @@ namespace Emby.Server.Implementations.Library
 
         private async Task SavePeopleMetadataAsync(IEnumerable<PersonInfo> people, CancellationToken cancellationToken)
         {
+            List<BaseItem>? personsToSave = null;
+
             foreach (var person in people)
             {
                 cancellationToken.ThrowIfCancellationRequested();
 
                 var itemUpdateType = ItemUpdateType.MetadataDownload;
                 var saveEntity = false;
-                var createEntity = false;
                 var personEntity = GetPerson(person.Name);
 
                 if (personEntity is null)
@@ -3005,7 +2938,6 @@ namespace Emby.Server.Implementations.Library
 
                     personEntity.PresentationUniqueKey = personEntity.CreatePresentationUniqueKey();
                     saveEntity = true;
-                    createEntity = true;
                 }
 
                 foreach (var id in person.ProviderIds)
@@ -3033,15 +2965,15 @@ namespace Emby.Server.Implementations.Library
 
                 if (saveEntity)
                 {
-                    if (createEntity)
-                    {
-                        CreateItems([personEntity], null, CancellationToken.None);
-                    }
-
+                    (personsToSave ??= new()).Add(personEntity);
                     await RunMetadataSavers(personEntity, itemUpdateType).ConfigureAwait(false);
-                    CreateItems([personEntity], null, CancellationToken.None);
                 }
             }
+
+            if (personsToSave is not null)
+            {
+                CreateItems(personsToSave, null, CancellationToken.None);
+            }
         }
 
         private void StartScanInBackground()
@@ -3095,7 +3027,7 @@ namespace Emby.Server.Implementations.Library
             {
                 var libraryOptions = CollectionFolder.GetLibraryOptions(virtualFolderPath);
 
-                libraryOptions.PathInfos = [.. libraryOptions.PathInfos, pathInfo];
+                libraryOptions.PathInfos = [..libraryOptions.PathInfos, pathInfo];
 
                 SyncLibraryOptionsToLocations(virtualFolderPath, libraryOptions);
 

Emby.Server.Implementations/Library/MediaSourceManager.cs

@@ -5,7 +5,6 @@
 using System;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
-using System.Collections.Immutable;
 using System.Globalization;
 using System.IO;
 using System.Linq;
@@ -13,10 +12,8 @@ using System.Text.Json;
 using System.Threading;
 using System.Threading.Tasks;
 using AsyncKeyedLock;
-using Jellyfin.Data;
+using Jellyfin.Data.Entities;
 using Jellyfin.Data.Enums;
-using Jellyfin.Database.Implementations.Entities;
-using Jellyfin.Database.Implementations.Enums;
 using Jellyfin.Extensions;
 using Jellyfin.Extensions.Json;
 using MediaBrowser.Common.Configuration;
@@ -41,7 +38,7 @@ namespace Emby.Server.Implementations.Library
     public class MediaSourceManager : IMediaSourceManager, IDisposable
     {
         // Do not use a pipe here because Roku http requests to the server will fail, without any explicit error message.
-        private const char LiveStreamIdDelimiter = '_';
+        private const char LiveStreamIdDelimeter = '_';
 
         private readonly IServerApplicationHost _appHost;
         private readonly IItemRepository _itemRepo;
@@ -54,8 +51,7 @@ namespace Emby.Server.Implementations.Library
         private readonly ILocalizationManager _localizationManager;
         private readonly IApplicationPaths _appPaths;
         private readonly IDirectoryService _directoryService;
-        private readonly IMediaStreamRepository _mediaStreamRepository;
-        private readonly IMediaAttachmentRepository _mediaAttachmentRepository;
+
         private readonly ConcurrentDictionary<string, ILiveStream> _openStreams = new ConcurrentDictionary<string, ILiveStream>(StringComparer.OrdinalIgnoreCase);
         private readonly AsyncNonKeyedLocker _liveStreamLocker = new(1);
         private readonly JsonSerializerOptions _jsonOptions = JsonDefaults.Options;
@@ -73,9 +69,7 @@ namespace Emby.Server.Implementations.Library
             IFileSystem fileSystem,
             IUserDataManager userDataManager,
             IMediaEncoder mediaEncoder,
-            IDirectoryService directoryService,
-            IMediaStreamRepository mediaStreamRepository,
-            IMediaAttachmentRepository mediaAttachmentRepository)
+            IDirectoryService directoryService)
         {
             _appHost = appHost;
             _itemRepo = itemRepo;
@@ -88,8 +82,6 @@ namespace Emby.Server.Implementations.Library
             _localizationManager = localizationManager;
             _appPaths = applicationPaths;
             _directoryService = directoryService;
-            _mediaStreamRepository = mediaStreamRepository;
-            _mediaAttachmentRepository = mediaAttachmentRepository;
         }
 
         public void AddParts(IEnumerable<IMediaSourceProvider> providers)
@@ -97,9 +89,9 @@ namespace Emby.Server.Implementations.Library
             _providers = providers.ToArray();
         }
 
-        public IReadOnlyList<MediaStream> GetMediaStreams(MediaStreamQuery query)
+        public List<MediaStream> GetMediaStreams(MediaStreamQuery query)
         {
-            var list = _mediaStreamRepository.GetMediaStreams(query);
+            var list = _itemRepo.GetMediaStreams(query);
 
             foreach (var stream in list)
             {
@@ -129,7 +121,7 @@ namespace Emby.Server.Implementations.Library
             return false;
         }
 
-        public IReadOnlyList<MediaStream> GetMediaStreams(Guid itemId)
+        public List<MediaStream> GetMediaStreams(Guid itemId)
         {
             var list = GetMediaStreams(new MediaStreamQuery
             {
@@ -139,7 +131,7 @@ namespace Emby.Server.Implementations.Library
             return GetMediaStreamsForItem(list);
         }
 
-        private IReadOnlyList<MediaStream> GetMediaStreamsForItem(IReadOnlyList<MediaStream> streams)
+        private List<MediaStream> GetMediaStreamsForItem(List<MediaStream> streams)
         {
             foreach (var stream in streams)
             {
@@ -153,13 +145,13 @@ namespace Emby.Server.Implementations.Library
         }
 
         /// <inheritdoc />
-        public IReadOnlyList<MediaAttachment> GetMediaAttachments(MediaAttachmentQuery query)
+        public List<MediaAttachment> GetMediaAttachments(MediaAttachmentQuery query)
         {
-            return _mediaAttachmentRepository.GetMediaAttachments(query);
+            return _itemRepo.GetMediaAttachments(query);
         }
 
         /// <inheritdoc />
-        public IReadOnlyList<MediaAttachment> GetMediaAttachments(Guid itemId)
+        public List<MediaAttachment> GetMediaAttachments(Guid itemId)
         {
             return GetMediaAttachments(new MediaAttachmentQuery
             {
@@ -167,7 +159,7 @@ namespace Emby.Server.Implementations.Library
             });
         }
 
-        public async Task<IReadOnlyList<MediaSourceInfo>> GetPlaybackMediaSources(BaseItem item, User user, bool allowMediaProbe, bool enablePathSubstitution, CancellationToken cancellationToken)
+        public async Task<List<MediaSourceInfo>> GetPlaybackMediaSources(BaseItem item, User user, bool allowMediaProbe, bool enablePathSubstitution, CancellationToken cancellationToken)
         {
             var mediaSources = GetStaticMediaSources(item, enablePathSubstitution, user);
 
@@ -220,7 +212,7 @@ namespace Emby.Server.Implementations.Library
                 list.Add(source);
             }
 
-            return SortMediaSources(list).ToArray();
+            return SortMediaSources(list);
         }
 
         /// <inheritdoc />>
@@ -315,7 +307,7 @@ namespace Emby.Server.Implementations.Library
 
         private static void SetKeyProperties(IMediaSourceProvider provider, MediaSourceInfo mediaSource)
         {
-            var prefix = provider.GetType().FullName.GetMD5().ToString("N", CultureInfo.InvariantCulture) + LiveStreamIdDelimiter;
+            var prefix = provider.GetType().FullName.GetMD5().ToString("N", CultureInfo.InvariantCulture) + LiveStreamIdDelimeter;
 
             if (!string.IsNullOrEmpty(mediaSource.OpenToken) && !mediaSource.OpenToken.StartsWith(prefix, StringComparison.OrdinalIgnoreCase))
             {
@@ -340,7 +332,7 @@ namespace Emby.Server.Implementations.Library
             return sources.FirstOrDefault(i => string.Equals(i.Id, mediaSourceId, StringComparison.OrdinalIgnoreCase));
         }
 
-        public IReadOnlyList<MediaSourceInfo> GetStaticMediaSources(BaseItem item, bool enablePathSubstitution, User user = null)
+        public List<MediaSourceInfo> GetStaticMediaSources(BaseItem item, bool enablePathSubstitution, User user = null)
         {
             ArgumentNullException.ThrowIfNull(item);
 
@@ -427,7 +419,6 @@ namespace Emby.Server.Implementations.Library
                 if (source.MediaStreams.Any(i => i.Type == MediaStreamType.Audio && i.Index == index))
                 {
                     source.DefaultAudioStreamIndex = index;
-                    source.DefaultAudioIndexSource = AudioIndexSource.User;
                     return;
                 }
             }
@@ -435,15 +426,6 @@ namespace Emby.Server.Implementations.Library
             var preferredAudio = NormalizeLanguage(user.AudioLanguagePreference);
 
             source.DefaultAudioStreamIndex = MediaStreamSelector.GetDefaultAudioStreamIndex(source.MediaStreams, preferredAudio, user.PlayDefaultAudioTrack);
-            if (user.PlayDefaultAudioTrack)
-            {
-                source.DefaultAudioIndexSource |= AudioIndexSource.Default;
-            }
-
-            if (preferredAudio.Count > 0)
-            {
-                source.DefaultAudioIndexSource |= AudioIndexSource.Language;
-            }
         }
 
         public void SetDefaultAudioAndSubtitleStreamIndices(BaseItem item, MediaSourceInfo source, User user)
@@ -471,7 +453,7 @@ namespace Emby.Server.Implementations.Library
             }
         }
 
-        private static IEnumerable<MediaSourceInfo> SortMediaSources(IEnumerable<MediaSourceInfo> sources)
+        private static List<MediaSourceInfo> SortMediaSources(IEnumerable<MediaSourceInfo> sources)
         {
             return sources.OrderBy(i =>
             {
@@ -488,7 +470,8 @@ namespace Emby.Server.Implementations.Library
 
                 return stream?.Width ?? 0;
             })
-            .Where(i => i.Type != MediaSourceType.Placeholder);
+            .Where(i => i.Type != MediaSourceType.Placeholder)
+            .ToList();
         }
 
         public async Task<Tuple<LiveStreamResponse, IDirectStreamProvider>> OpenLiveStreamInternal(LiveStreamRequest request, CancellationToken cancellationToken)
@@ -794,13 +777,9 @@ namespace Emby.Server.Implementations.Library
         {
             ArgumentException.ThrowIfNullOrEmpty(id);
 
-            var info = GetLiveStreamInfo(id);
-            if (info is null)
-            {
-                return Task.FromResult<Tuple<MediaSourceInfo, IDirectStreamProvider>>(new Tuple<MediaSourceInfo, IDirectStreamProvider>(null, null));
-            }
-
-            return Task.FromResult<Tuple<MediaSourceInfo, IDirectStreamProvider>>(new Tuple<MediaSourceInfo, IDirectStreamProvider>(info.MediaSource, info as IDirectStreamProvider));
+            // TODO probably shouldn't throw here but it is kept for "backwards compatibility"
+            var info = GetLiveStreamInfo(id) ?? throw new ResourceNotFoundException();
+            return Task.FromResult(new Tuple<MediaSourceInfo, IDirectStreamProvider>(info.MediaSource, info as IDirectStreamProvider));
         }
 
         public ILiveStream GetLiveStreamInfo(string id)
@@ -827,7 +806,7 @@ namespace Emby.Server.Implementations.Library
             return result.Item1;
         }
 
-        public async Task<IReadOnlyList<MediaSourceInfo>> GetRecordingStreamMediaSources(ActiveRecordingInfo info, CancellationToken cancellationToken)
+        public async Task<List<MediaSourceInfo>> GetRecordingStreamMediaSources(ActiveRecordingInfo info, CancellationToken cancellationToken)
         {
             var stream = new MediaSourceInfo
             {
@@ -850,7 +829,10 @@ namespace Emby.Server.Implementations.Library
             await new LiveStreamHelper(_mediaEncoder, _logger, _appPaths)
                 .AddMediaInfoWithProbe(stream, false, false, cancellationToken).ConfigureAwait(false);
 
-            return [stream];
+            return new List<MediaSourceInfo>
+            {
+                stream
+            };
         }
 
         public async Task CloseLiveStream(string id)
@@ -882,11 +864,11 @@ namespace Emby.Server.Implementations.Library
         {
             ArgumentException.ThrowIfNullOrEmpty(key);
 
-            var keys = key.Split(LiveStreamIdDelimiter, 2);
+            var keys = key.Split(LiveStreamIdDelimeter, 2);
 
             var provider = _providers.FirstOrDefault(i => string.Equals(i.GetType().FullName.GetMD5().ToString("N", CultureInfo.InvariantCulture), keys[0], StringComparison.OrdinalIgnoreCase));
 
-            var splitIndex = key.IndexOf(LiveStreamIdDelimiter, StringComparison.Ordinal);
+            var splitIndex = key.IndexOf(LiveStreamIdDelimeter, StringComparison.Ordinal);
             var keyId = key.Substring(splitIndex + 1);
 
             return (provider, keyId);

Emby.Server.Implementations/Library/MediaStreamSelector.cs

@@ -3,7 +3,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using Jellyfin.Database.Implementations.Enums;
+using Jellyfin.Data.Enums;
 using Jellyfin.Extensions;
 using MediaBrowser.Model.Entities;
 
@@ -39,48 +39,46 @@ namespace Emby.Server.Implementations.Library
                 return null;
             }
 
-            // Sort in the following order: Default > No tag > Forced
             var sortedStreams = streams
                 .Where(i => i.Type == MediaStreamType.Subtitle)
                 .OrderByDescending(x => x.IsExternal)
-                .ThenByDescending(x => x.IsDefault)
-                .ThenByDescending(x => !x.IsForced && MatchesPreferredLanguage(x.Language, preferredLanguages))
-                .ThenByDescending(x => x.IsForced && MatchesPreferredLanguage(x.Language, preferredLanguages))
-                .ThenByDescending(x => x.IsForced && IsLanguageUndefined(x.Language))
+                .ThenByDescending(x => x.IsForced && string.Equals(x.Language, audioTrackLanguage, StringComparison.OrdinalIgnoreCase))
                 .ThenByDescending(x => x.IsForced)
+                .ThenByDescending(x => x.IsDefault)
+                .ThenByDescending(x => preferredLanguages.Contains(x.Language, StringComparison.OrdinalIgnoreCase))
                 .ToList();
 
             MediaStream? stream = null;
-
             if (mode == SubtitlePlaybackMode.Default)
             {
-                // Load subtitles according to external, default and forced flags.
-                stream = sortedStreams.FirstOrDefault(x => x.IsExternal || x.IsDefault || x.IsForced);
+                // Load subtitles according to external, forced and default flags.
+                stream = sortedStreams.FirstOrDefault(x => x.IsExternal || x.IsForced || x.IsDefault);
             }
             else if (mode == SubtitlePlaybackMode.Smart)
             {
                 // Only attempt to load subtitles if the audio language is not one of the user's preferred subtitle languages.
-                // If no subtitles of preferred language available, use none.
-                // If the audio language is one of the user's preferred subtitle languages behave like OnlyForced.
+                // If no subtitles of preferred language available, use default behaviour.
                 if (!preferredLanguages.Contains(audioTrackLanguage, StringComparison.OrdinalIgnoreCase))
                 {
-                    stream = sortedStreams.FirstOrDefault(x => MatchesPreferredLanguage(x.Language, preferredLanguages));
+                    stream = sortedStreams.FirstOrDefault(x => preferredLanguages.Contains(x.Language, StringComparison.OrdinalIgnoreCase)) ??
+                        sortedStreams.FirstOrDefault(x => x.IsExternal || x.IsForced || x.IsDefault);
                 }
                 else
                 {
-                    stream = BehaviorOnlyForced(sortedStreams, preferredLanguages).FirstOrDefault();
+                    // Respect forced flag.
+                    stream = sortedStreams.FirstOrDefault(x => x.IsForced);
                 }
             }
             else if (mode == SubtitlePlaybackMode.Always)
             {
-                // Always load (full/non-forced) subtitles of the user's preferred subtitle language if possible, otherwise OnlyForced behaviour.
-                stream = sortedStreams.FirstOrDefault(x => !x.IsForced && MatchesPreferredLanguage(x.Language, preferredLanguages)) ??
-                    BehaviorOnlyForced(sortedStreams, preferredLanguages).FirstOrDefault();
+                // Always load (full/non-forced) subtitles of the user's preferred subtitle language if possible, otherwise default behaviour.
+                stream = sortedStreams.FirstOrDefault(x => !x.IsForced && preferredLanguages.Contains(x.Language, StringComparison.OrdinalIgnoreCase)) ??
+                    sortedStreams.FirstOrDefault(x => x.IsExternal || x.IsForced || x.IsDefault);
             }
             else if (mode == SubtitlePlaybackMode.OnlyForced)
             {
-                // Load subtitles that are flagged forced of the user's preferred subtitle language or with an undefined language
-                stream = BehaviorOnlyForced(sortedStreams, preferredLanguages).FirstOrDefault();
+                // Only load subtitles that are flagged forced.
+                stream = sortedStreams.FirstOrDefault(x => x.IsForced);
             }
 
             return stream?.Index;
@@ -112,72 +110,40 @@ namespace Emby.Server.Implementations.Library
             if (mode == SubtitlePlaybackMode.Default)
             {
                 // Prefer embedded metadata over smart logic
-                // Load subtitles according to external, default, and forced flags.
-                filteredStreams = sortedStreams.Where(s => s.IsExternal || s.IsDefault || s.IsForced)
+                filteredStreams = sortedStreams.Where(s => s.IsForced || s.IsDefault)
                     .ToList();
             }
             else if (mode == SubtitlePlaybackMode.Smart)
             {
                 // Prefer smart logic over embedded metadata
-                // Only attempt to load subtitles if the audio language is not one of the user's preferred subtitle languages, otherwise OnlyForced behavior.
                 if (!preferredLanguages.Contains(audioTrackLanguage, StringComparison.OrdinalIgnoreCase))
                 {
-                    filteredStreams = sortedStreams.Where(s => MatchesPreferredLanguage(s.Language, preferredLanguages))
+                    filteredStreams = sortedStreams.Where(s => !s.IsForced && preferredLanguages.Contains(s.Language, StringComparison.OrdinalIgnoreCase))
                         .ToList();
                 }
-                else
-                {
-                    filteredStreams = BehaviorOnlyForced(sortedStreams, preferredLanguages);
-                }
             }
             else if (mode == SubtitlePlaybackMode.Always)
             {
-                // Always load (full/non-forced) subtitles of the user's preferred subtitle language if possible, otherwise OnlyForced behavior.
-                filteredStreams = sortedStreams.Where(s => !s.IsForced && MatchesPreferredLanguage(s.Language, preferredLanguages))
-                    .ToList() ?? BehaviorOnlyForced(sortedStreams, preferredLanguages);
+                // Always load the most suitable full subtitles
+                filteredStreams = sortedStreams.Where(s => !s.IsForced).ToList();
             }
             else if (mode == SubtitlePlaybackMode.OnlyForced)
             {
-                // Load subtitles that are flagged forced of the user's preferred subtitle language or with an undefined language
-                filteredStreams = BehaviorOnlyForced(sortedStreams, preferredLanguages);
+                // Always load the most suitable full subtitles
+                filteredStreams = sortedStreams.Where(s => s.IsForced).ToList();
             }
 
-            // If filteredStreams is null, initialize it as an empty list to avoid null reference errors
-            filteredStreams ??= new List<MediaStream>();
+            // Load forced subs if we have found no suitable full subtitles
+            var iterStreams = filteredStreams is null || filteredStreams.Count == 0
+                ? sortedStreams.Where(s => s.IsForced && string.Equals(s.Language, audioTrackLanguage, StringComparison.OrdinalIgnoreCase))
+                : filteredStreams;
 
-            foreach (var stream in filteredStreams)
+            foreach (var stream in iterStreams)
             {
                 stream.Score = GetStreamScore(stream, preferredLanguages);
             }
         }
 
-        private static bool MatchesPreferredLanguage(string language, IReadOnlyList<string> preferredLanguages)
-        {
-            // If preferredLanguages is empty, treat it as "any language" (wildcard)
-            return preferredLanguages.Count == 0 ||
-                preferredLanguages.Contains(language, StringComparison.OrdinalIgnoreCase);
-        }
-
-        private static bool IsLanguageUndefined(string language)
-        {
-            // Check for null, empty, or known placeholders
-            return string.IsNullOrEmpty(language) ||
-                language.Equals("und", StringComparison.OrdinalIgnoreCase) ||
-                language.Equals("unknown", StringComparison.OrdinalIgnoreCase) ||
-                language.Equals("undetermined", StringComparison.OrdinalIgnoreCase) ||
-                language.Equals("mul", StringComparison.OrdinalIgnoreCase) ||
-                language.Equals("zxx", StringComparison.OrdinalIgnoreCase);
-        }
-
-        private static List<MediaStream> BehaviorOnlyForced(IEnumerable<MediaStream> sortedStreams, IReadOnlyList<string> preferredLanguages)
-        {
-            return sortedStreams
-                .Where(s => s.IsForced && (MatchesPreferredLanguage(s.Language, preferredLanguages) || IsLanguageUndefined(s.Language)))
-                .OrderByDescending(s => MatchesPreferredLanguage(s.Language, preferredLanguages))
-                .ThenByDescending(s => IsLanguageUndefined(s.Language))
-                .ToList();
-        }
-
         internal static int GetStreamScore(MediaStream stream, IReadOnlyList<string> languagePreferences)
         {
             var index = languagePreferences.FindIndex(x => string.Equals(x, stream.Language, StringComparison.OrdinalIgnoreCase));

Emby.Server.Implementations/Library/MusicManager.cs

@@ -2,11 +2,9 @@
 
 using System;
 using System.Collections.Generic;
-using System.Collections.Immutable;
 using System.Linq;
+using Jellyfin.Data.Entities;
 using Jellyfin.Data.Enums;
-using Jellyfin.Database.Implementations.Entities;
-using Jellyfin.Database.Implementations.Enums;
 using Jellyfin.Extensions;
 using MediaBrowser.Controller.Dto;
 using MediaBrowser.Controller.Entities;
@@ -26,23 +24,30 @@ namespace Emby.Server.Implementations.Library
             _libraryManager = libraryManager;
         }
 
-        public IReadOnlyList<BaseItem> GetInstantMixFromSong(Audio item, User? user, DtoOptions dtoOptions)
+        public List<BaseItem> GetInstantMixFromSong(Audio item, User? user, DtoOptions dtoOptions)
         {
-            return GetInstantMixFromGenres(item.Genres, user, dtoOptions);
+            var list = new List<BaseItem>
+            {
+                item
+            };
+
+            list.AddRange(GetInstantMixFromGenres(item.Genres, user, dtoOptions));
+
+            return list;
         }
 
         /// <inheritdoc />
-        public IReadOnlyList<BaseItem> GetInstantMixFromArtist(MusicArtist artist, User? user, DtoOptions dtoOptions)
+        public List<BaseItem> GetInstantMixFromArtist(MusicArtist artist, User? user, DtoOptions dtoOptions)
         {
             return GetInstantMixFromGenres(artist.Genres, user, dtoOptions);
         }
 
-        public IReadOnlyList<BaseItem> GetInstantMixFromAlbum(MusicAlbum item, User? user, DtoOptions dtoOptions)
+        public List<BaseItem> GetInstantMixFromAlbum(MusicAlbum item, User? user, DtoOptions dtoOptions)
         {
             return GetInstantMixFromGenres(item.Genres, user, dtoOptions);
         }
 
-        public IReadOnlyList<BaseItem> GetInstantMixFromFolder(Folder item, User? user, DtoOptions dtoOptions)
+        public List<BaseItem> GetInstantMixFromFolder(Folder item, User? user, DtoOptions dtoOptions)
         {
             var genres = item
                .GetRecursiveChildren(user, new InternalItemsQuery(user)
@@ -58,12 +63,12 @@ namespace Emby.Server.Implementations.Library
             return GetInstantMixFromGenres(genres, user, dtoOptions);
         }
 
-        public IReadOnlyList<BaseItem> GetInstantMixFromPlaylist(Playlist item, User? user, DtoOptions dtoOptions)
+        public List<BaseItem> GetInstantMixFromPlaylist(Playlist item, User? user, DtoOptions dtoOptions)
         {
             return GetInstantMixFromGenres(item.Genres, user, dtoOptions);
         }
 
-        public IReadOnlyList<BaseItem> GetInstantMixFromGenres(IEnumerable<string> genres, User? user, DtoOptions dtoOptions)
+        public List<BaseItem> GetInstantMixFromGenres(IEnumerable<string> genres, User? user, DtoOptions dtoOptions)
         {
             var genreIds = genres.DistinctNames().Select(i =>
             {
@@ -80,7 +85,7 @@ namespace Emby.Server.Implementations.Library
             return GetInstantMixFromGenreIds(genreIds, user, dtoOptions);
         }
 
-        public IReadOnlyList<BaseItem> GetInstantMixFromGenreIds(Guid[] genreIds, User? user, DtoOptions dtoOptions)
+        public List<BaseItem> GetInstantMixFromGenreIds(Guid[] genreIds, User? user, DtoOptions dtoOptions)
         {
             return _libraryManager.GetItemList(new InternalItemsQuery(user)
             {
@@ -92,7 +97,7 @@ namespace Emby.Server.Implementations.Library
             });
         }
 
-        public IReadOnlyList<BaseItem> GetInstantMixFromItem(BaseItem item, User? user, DtoOptions dtoOptions)
+        public List<BaseItem> GetInstantMixFromItem(BaseItem item, User? user, DtoOptions dtoOptions)
         {
             if (item is MusicGenre)
             {

Emby.Server.Implementations/Library/PathManager.cs

@@ -1,73 +0,0 @@
-using System;
-using System.Globalization;
-using System.IO;
-using MediaBrowser.Common.Configuration;
-using MediaBrowser.Controller.Configuration;
-using MediaBrowser.Controller.Entities;
-using MediaBrowser.Controller.IO;
-
-namespace Emby.Server.Implementations.Library;
-
-/// <summary>
-/// IPathManager implementation.
-/// </summary>
-public class PathManager : IPathManager
-{
-    private readonly IServerConfigurationManager _config;
-    private readonly IApplicationPaths _appPaths;
-
-    /// <summary>
-    /// Initializes a new instance of the <see cref="PathManager"/> class.
-    /// </summary>
-    /// <param name="config">The server configuration manager.</param>
-    /// <param name="appPaths">The application paths.</param>
-    public PathManager(
-        IServerConfigurationManager config,
-        IApplicationPaths appPaths)
-    {
-        _config = config;
-        _appPaths = appPaths;
-    }
-
-    private string SubtitleCachePath => Path.Combine(_appPaths.DataPath, "subtitles");
-
-    private string AttachmentCachePath => Path.Combine(_appPaths.DataPath, "attachments");
-
-    /// <inheritdoc />
-    public string GetAttachmentPath(string mediaSourceId, string fileName)
-    {
-        return Path.Join(GetAttachmentFolderPath(mediaSourceId), fileName);
-    }
-
-    /// <inheritdoc />
-    public string GetAttachmentFolderPath(string mediaSourceId)
-    {
-        var id = Guid.Parse(mediaSourceId).ToString("D", CultureInfo.InvariantCulture).AsSpan();
-
-        return Path.Join(AttachmentCachePath, id[..2], id);
-    }
-
-    /// <inheritdoc />
-    public string GetSubtitleFolderPath(string mediaSourceId)
-    {
-        var id = Guid.Parse(mediaSourceId).ToString("D", CultureInfo.InvariantCulture).AsSpan();
-
-        return Path.Join(SubtitleCachePath, id[..2], id);
-    }
-
-    /// <inheritdoc />
-    public string GetSubtitlePath(string mediaSourceId, int streamIndex, string extension)
-    {
-        return Path.Join(GetSubtitleFolderPath(mediaSourceId), streamIndex.ToString(CultureInfo.InvariantCulture) + extension);
-    }
-
-    /// <inheritdoc />
-    public string GetTrickplayDirectory(BaseItem item, bool saveWithMedia = false)
-    {
-        var id = item.Id.ToString("D", CultureInfo.InvariantCulture).AsSpan();
-
-        return saveWithMedia
-            ? Path.Combine(item.ContainingFolderPath, Path.ChangeExtension(item.Path, ".trickplay"))
-            : Path.Join(_config.ApplicationPaths.TrickplayPath, id[..2], id);
-    }
-}

Emby.Server.Implementations/Library/Resolvers/ExtraResolver.cs

@@ -54,9 +54,9 @@ namespace Emby.Server.Implementations.Library.Resolvers
             _ => _videoResolvers
         };
 
-        public bool TryGetExtraTypeForOwner(string path, VideoFileInfo ownerVideoFileInfo, [NotNullWhen(true)] out ExtraType? extraType, string? libraryRoot = "")
+        public bool TryGetExtraTypeForOwner(string path, VideoFileInfo ownerVideoFileInfo, [NotNullWhen(true)] out ExtraType? extraType)
         {
-            var extraResult = GetExtraInfo(path, _namingOptions, libraryRoot);
+            var extraResult = GetExtraInfo(path, _namingOptions);
             if (extraResult.ExtraType is null)
             {
                 extraType = null;

Emby.Server.Implementations/Library/Resolvers/Movies/MovieResolver.cs

@@ -270,11 +270,11 @@ namespace Emby.Server.Implementations.Library.Resolvers.Movies
             }
 
             var videoInfos = files
-                .Select(i => VideoResolver.Resolve(i.FullName, i.IsDirectory, NamingOptions, parseName, parent.ContainingFolderPath))
+                .Select(i => VideoResolver.Resolve(i.FullName, i.IsDirectory, NamingOptions, parseName))
                 .Where(f => f is not null)
                 .ToList();
 
-            var resolverResult = VideoListResolver.Resolve(videoInfos, NamingOptions, supportMultiEditions, parseName, parent.ContainingFolderPath);
+            var resolverResult = VideoListResolver.Resolve(videoInfos, NamingOptions, supportMultiEditions, parseName);
 
             var result = new MultiItemResolverResult
             {

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

@@ -48,7 +48,7 @@ namespace Emby.Server.Implementations.Library.Resolvers.TV
 
                 var path = args.Path;
 
-                var seasonParserResult = SeasonPathParser.Parse(path, series.ContainingFolderPath, true, true);
+                var seasonParserResult = SeasonPathParser.Parse(path, true, true);
 
                 var season = new Season
                 {

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

@@ -118,7 +118,7 @@ namespace Emby.Server.Implementations.Library.Resolvers.TV
             {
                 if (child.IsDirectory)
                 {
-                    if (IsSeasonFolder(child.FullName, path, isTvContentType))
+                    if (IsSeasonFolder(child.FullName, isTvContentType))
                     {
                         _logger.LogDebug("{Path} is a series because of season folder {Dir}.", path, child.FullName);
                         return true;
@@ -155,12 +155,11 @@ namespace Emby.Server.Implementations.Library.Resolvers.TV
         /// Determines whether [is season folder] [the specified path].
         /// </summary>
         /// <param name="path">The path.</param>
-        /// <param name="parentPath">The parentpath.</param>
         /// <param name="isTvContentType">if set to <c>true</c> [is tv content type].</param>
         /// <returns><c>true</c> if [is season folder] [the specified path]; otherwise, <c>false</c>.</returns>
-        private static bool IsSeasonFolder(string path, string parentPath, bool isTvContentType)
+        private static bool IsSeasonFolder(string path, bool isTvContentType)
         {
-            var seasonNumber = SeasonPathParser.Parse(path, parentPath, isTvContentType, isTvContentType).SeasonNumber;
+            var seasonNumber = SeasonPathParser.Parse(path, isTvContentType, isTvContentType).SeasonNumber;
 
             return seasonNumber.HasValue;
         }

Emby.Server.Implementations/Library/SearchEngine.cs

@@ -3,9 +3,8 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using Jellyfin.Data.Entities;
 using Jellyfin.Data.Enums;
-using Jellyfin.Database.Implementations.Entities;
-using Jellyfin.Database.Implementations.Enums;
 using Jellyfin.Extensions;
 using MediaBrowser.Controller.Dto;
 using MediaBrowser.Controller.Entities;
@@ -172,7 +171,7 @@ namespace Emby.Server.Implementations.Library
                 }
             };
 
-            IReadOnlyList<BaseItem> mediaItems;
+            List<BaseItem> mediaItems;
 
             if (searchQuery.IncludeItemTypes.Length == 1 && searchQuery.IncludeItemTypes[0] == BaseItemKind.MusicArtist)
             {

Emby.Server.Implementations/Library/SplashscreenPostScanTask.cs

@@ -4,13 +4,13 @@ using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 using Jellyfin.Data.Enums;
-using Jellyfin.Database.Implementations.Enums;
 using MediaBrowser.Controller.Drawing;
 using MediaBrowser.Controller.Dto;
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Library;
 using MediaBrowser.Controller.Persistence;
 using MediaBrowser.Model.Entities;
+using MediaBrowser.Model.Querying;
 using Microsoft.Extensions.Logging;
 
 namespace Emby.Server.Implementations.Library;
@@ -43,26 +43,14 @@ public class SplashscreenPostScanTask : ILibraryPostScanTask
     /// <inheritdoc />
     public Task Run(IProgress<double> progress, CancellationToken cancellationToken)
     {
-        var posters = GetItemsWithImageType(ImageType.Primary)
-            .Select(x => x.GetImages(ImageType.Primary).FirstOrDefault()?.Path)
-            .Where(path => !string.IsNullOrEmpty(path))
-            .Select(path => path!)
-            .ToList();
-        var backdrops = GetItemsWithImageType(ImageType.Thumb)
-            .Select(x => x.GetImages(ImageType.Thumb).FirstOrDefault()?.Path)
-            .Where(path => !string.IsNullOrEmpty(path))
-            .Select(path => path!)
-            .ToList();
+        var posters = GetItemsWithImageType(ImageType.Primary).Select(x => x.GetImages(ImageType.Primary).First().Path).ToList();
+        var backdrops = GetItemsWithImageType(ImageType.Thumb).Select(x => x.GetImages(ImageType.Thumb).First().Path).ToList();
         if (backdrops.Count == 0)
         {
             // Thumb images fit better because they include the title in the image but are not provided with TMDb.
             // Using backdrops as a fallback to generate an image at all
             _logger.LogDebug("No thumb images found. Using backdrops to generate splashscreen");
-            backdrops = GetItemsWithImageType(ImageType.Backdrop)
-                .Select(x => x.GetImages(ImageType.Backdrop).FirstOrDefault()?.Path)
-                .Where(path => !string.IsNullOrEmpty(path))
-                .Select(path => path!)
-                .ToList();
+            backdrops = GetItemsWithImageType(ImageType.Backdrop).Select(x => x.GetImages(ImageType.Backdrop).First().Path).ToList();
         }
 
         _imageEncoder.CreateSplashscreen(posters, backdrops);
@@ -77,15 +65,15 @@ public class SplashscreenPostScanTask : ILibraryPostScanTask
             CollapseBoxSetItems = false,
             Recursive = true,
             DtoOptions = new DtoOptions(false),
-            ImageTypes = [imageType],
+            ImageTypes = new[] { imageType },
             Limit = 30,
             // TODO max parental rating configurable
-            MaxParentalRating = new(10, null),
-            OrderBy =
-            [
+            MaxParentalRating = 10,
+            OrderBy = new[]
+            {
                 (ItemSortBy.Random, SortOrder.Ascending)
-            ],
-            IncludeItemTypes = [BaseItemKind.Movie, BaseItemKind.Series]
+            },
+            IncludeItemTypes = new[] { BaseItemKind.Movie, BaseItemKind.Series }
         });
     }
 }

Emby.Server.Implementations/Library/UserDataManager.cs

@@ -1,20 +1,17 @@
-#pragma warning disable RS0030 // Do not use banned APIs
-
 using System;
+using System.Collections.Concurrent;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.Globalization;
-using System.Linq;
 using System.Threading;
-using BitFaster.Caching.Lru;
-using Jellyfin.Database.Implementations;
-using Jellyfin.Database.Implementations.Entities;
+using Jellyfin.Data.Entities;
 using MediaBrowser.Controller.Configuration;
 using MediaBrowser.Controller.Dto;
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Library;
+using MediaBrowser.Controller.Persistence;
 using MediaBrowser.Model.Dto;
 using MediaBrowser.Model.Entities;
-using Microsoft.EntityFrameworkCore;
 using AudioBook = MediaBrowser.Controller.Entities.AudioBook;
 using Book = MediaBrowser.Controller.Entities.Book;
 
@@ -25,22 +22,27 @@ namespace Emby.Server.Implementations.Library
     /// </summary>
     public class UserDataManager : IUserDataManager
     {
+        private readonly ConcurrentDictionary<string, UserItemData> _userData =
+            new ConcurrentDictionary<string, UserItemData>(StringComparer.OrdinalIgnoreCase);
+
         private readonly IServerConfigurationManager _config;
-        private readonly IDbContextFactory<JellyfinDbContext> _repository;
-        private readonly FastConcurrentLru<string, UserItemData> _cache;
+        private readonly IUserManager _userManager;
+        private readonly IUserDataRepository _repository;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="UserDataManager"/> class.
         /// </summary>
         /// <param name="config">Instance of the <see cref="IServerConfigurationManager"/> interface.</param>
-        /// <param name="repository">Instance of the <see cref="IDbContextFactory{JellyfinDbContext}"/> interface.</param>
+        /// <param name="userManager">Instance of the <see cref="IUserManager"/> interface.</param>
+        /// <param name="repository">Instance of the <see cref="IUserDataRepository"/> interface.</param>
         public UserDataManager(
             IServerConfigurationManager config,
-            IDbContextFactory<JellyfinDbContext> repository)
+            IUserManager userManager,
+            IUserDataRepository repository)
         {
             _config = config;
+            _userManager = userManager;
             _repository = repository;
-            _cache = new FastConcurrentLru<string, UserItemData>(Environment.ProcessorCount, _config.Configuration.CacheSize, StringComparer.OrdinalIgnoreCase);
         }
 
         /// <inheritdoc />
@@ -57,29 +59,15 @@ namespace Emby.Server.Implementations.Library
 
             var keys = item.GetUserDataKeys();
 
-            using var dbContext = _repository.CreateDbContext();
-            using var transaction = dbContext.Database.BeginTransaction();
+            var userId = user.InternalId;
 
             foreach (var key in keys)
             {
-                userData.Key = key;
-                var userDataEntry = Map(userData, user.Id, item.Id);
-                if (dbContext.UserData.Any(f => f.ItemId == userDataEntry.ItemId && f.UserId == userDataEntry.UserId && f.CustomDataKey == userDataEntry.CustomDataKey))
-                {
-                    dbContext.UserData.Attach(userDataEntry).State = EntityState.Modified;
-                }
-                else
-                {
-                    dbContext.UserData.Add(userDataEntry);
-                }
+                _repository.SaveUserData(userId, key, userData, cancellationToken);
             }
 
-            dbContext.SaveChanges();
-            transaction.Commit();
-
-            var userId = user.InternalId;
             var cacheKey = GetCacheKey(userId, item.Id);
-            _cache.AddOrUpdate(cacheKey, userData);
+            _userData.AddOrUpdate(cacheKey, userData, (_, _) => userData);
 
             UserDataSaved?.Invoke(this, new UserDataSaveEventArgs
             {
@@ -96,9 +84,10 @@ namespace Emby.Server.Implementations.Library
         {
             ArgumentNullException.ThrowIfNull(user);
             ArgumentNullException.ThrowIfNull(item);
+            ArgumentNullException.ThrowIfNull(reason);
             ArgumentNullException.ThrowIfNull(userDataDto);
 
-            var userData = GetUserData(user, item) ?? throw new InvalidOperationException("UserData should not be null.");
+            var userData = GetUserData(user, item);
 
             if (userDataDto.PlaybackPositionTicks.HasValue)
             {
@@ -138,91 +127,33 @@ namespace Emby.Server.Implementations.Library
             SaveUserData(user, item, userData, reason, CancellationToken.None);
         }
 
-        private UserData Map(UserItemData dto, Guid userId, Guid itemId)
+        private UserItemData GetUserData(User user, Guid itemId, List<string> keys)
         {
-            return new UserData()
-            {
-                ItemId = itemId,
-                CustomDataKey = dto.Key,
-                Item = null,
-                User = null,
-                AudioStreamIndex = dto.AudioStreamIndex,
-                IsFavorite = dto.IsFavorite,
-                LastPlayedDate = dto.LastPlayedDate,
-                Likes = dto.Likes,
-                PlaybackPositionTicks = dto.PlaybackPositionTicks,
-                PlayCount = dto.PlayCount,
-                Played = dto.Played,
-                Rating = dto.Rating,
-                UserId = userId,
-                SubtitleStreamIndex = dto.SubtitleStreamIndex,
-            };
+            var userId = user.InternalId;
+
+            var cacheKey = GetCacheKey(userId, itemId);
+
+            return _userData.GetOrAdd(cacheKey, _ => GetUserDataInternal(userId, keys));
         }
 
-        private UserItemData Map(UserData dto)
+        private UserItemData GetUserDataInternal(long internalUserId, List<string> keys)
         {
-            return new UserItemData()
-            {
-                Key = dto.CustomDataKey!,
-                AudioStreamIndex = dto.AudioStreamIndex,
-                IsFavorite = dto.IsFavorite,
-                LastPlayedDate = dto.LastPlayedDate,
-                Likes = dto.Likes,
-                PlaybackPositionTicks = dto.PlaybackPositionTicks,
-                PlayCount = dto.PlayCount,
-                Played = dto.Played,
-                Rating = dto.Rating,
-                SubtitleStreamIndex = dto.SubtitleStreamIndex,
-            };
-        }
+            var userData = _repository.GetUserData(internalUserId, keys);
 
-        private UserItemData? GetUserData(User user, Guid itemId, List<string> keys)
-        {
-            var cacheKey = GetCacheKey(user.InternalId, itemId);
-
-            if (_cache.TryGet(cacheKey, out var data))
+            if (userData is not null)
             {
-                return data;
+                return userData;
             }
 
-            data = GetUserDataInternal(user.Id, itemId, keys);
-
-            if (data is null)
+            if (keys.Count > 0)
             {
-                return new UserItemData()
+                return new UserItemData
                 {
-                    Key = keys[0],
+                    Key = keys[0]
                 };
             }
 
-            return _cache.GetOrAdd(cacheKey, _ => data);
-        }
-
-        private UserItemData? GetUserDataInternal(Guid userId, Guid itemId, List<string> keys)
-        {
-            if (keys.Count == 0)
-            {
-                return null;
-            }
-
-            using var context = _repository.CreateDbContext();
-            var userData = context.UserData.AsNoTracking().Where(e => e.ItemId == itemId && keys.Contains(e.CustomDataKey) && e.UserId.Equals(userId)).ToArray();
-
-            if (userData.Length > 0)
-            {
-                var directDataReference = userData.FirstOrDefault(e => e.CustomDataKey == itemId.ToString("N"));
-                if (directDataReference is not null)
-                {
-                    return Map(directDataReference);
-                }
-
-                return Map(userData.First());
-            }
-
-            return new UserItemData
-            {
-                Key = keys.Last()!
-            };
+            throw new UnreachableException();
         }
 
         /// <summary>
@@ -235,25 +166,20 @@ namespace Emby.Server.Implementations.Library
         }
 
         /// <inheritdoc />
-        public UserItemData? GetUserData(User user, BaseItem item)
+        public UserItemData GetUserData(User user, BaseItem item)
         {
             return GetUserData(user, item.Id, item.GetUserDataKeys());
         }
 
         /// <inheritdoc />
-        public UserItemDataDto? GetUserDataDto(BaseItem item, User user)
+        public UserItemDataDto GetUserDataDto(BaseItem item, User user)
             => GetUserDataDto(item, null, user, new DtoOptions());
 
         /// <inheritdoc />
-        public UserItemDataDto? GetUserDataDto(BaseItem item, BaseItemDto? itemDto, User user, DtoOptions options)
+        public UserItemDataDto GetUserDataDto(BaseItem item, BaseItemDto? itemDto, User user, DtoOptions options)
         {
             var userData = GetUserData(user, item);
-            if (userData is null)
-            {
-                return null;
-            }
-
-            var dto = GetUserItemDataDto(userData, item.Id);
+            var dto = GetUserItemDataDto(userData);
 
             item.FillUserDataDtoValues(dto, userData, itemDto, user, options);
             return dto;
@@ -263,10 +189,9 @@ namespace Emby.Server.Implementations.Library
         /// Converts a UserItemData to a DTOUserItemData.
         /// </summary>
         /// <param name="data">The data.</param>
-        /// <param name="itemId">The reference key to an Item.</param>
         /// <returns>DtoUserItemData.</returns>
         /// <exception cref="ArgumentNullException"><paramref name="data"/> is <c>null</c>.</exception>
-        private UserItemDataDto GetUserItemDataDto(UserItemData data, Guid itemId)
+        private UserItemDataDto GetUserItemDataDto(UserItemData data)
         {
             ArgumentNullException.ThrowIfNull(data);
 
@@ -279,7 +204,6 @@ namespace Emby.Server.Implementations.Library
                 Rating = data.Rating,
                 Played = data.Played,
                 LastPlayedDate = data.LastPlayedDate,
-                ItemId = itemId,
                 Key = data.Key
             };
         }

Emby.Server.Implementations/Library/UserViewManager.cs

@@ -6,10 +6,8 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
-using Jellyfin.Data;
+using Jellyfin.Data.Entities;
 using Jellyfin.Data.Enums;
-using Jellyfin.Database.Implementations.Entities;
-using Jellyfin.Database.Implementations.Enums;
 using Jellyfin.Extensions;
 using MediaBrowser.Controller.Channels;
 using MediaBrowser.Controller.Configuration;
@@ -310,40 +308,39 @@ namespace Emby.Server.Implementations.Library
                 }
             }
 
-            MediaType[] mediaTypes = [];
+            var mediaTypes = new List<MediaType>();
 
             if (includeItemTypes.Length == 0)
             {
-                HashSet<MediaType> tmpMediaTypes = [];
                 foreach (var parent in parents.OfType<ICollectionFolder>())
                 {
                     switch (parent.CollectionType)
                     {
                         case CollectionType.books:
-                            tmpMediaTypes.Add(MediaType.Book);
-                            tmpMediaTypes.Add(MediaType.Audio);
+                            mediaTypes.Add(MediaType.Book);
+                            mediaTypes.Add(MediaType.Audio);
                             break;
                         case CollectionType.music:
-                            tmpMediaTypes.Add(MediaType.Audio);
+                            mediaTypes.Add(MediaType.Audio);
                             break;
                         case CollectionType.photos:
-                            tmpMediaTypes.Add(MediaType.Photo);
-                            tmpMediaTypes.Add(MediaType.Video);
+                            mediaTypes.Add(MediaType.Photo);
+                            mediaTypes.Add(MediaType.Video);
                             break;
                         case CollectionType.homevideos:
-                            tmpMediaTypes.Add(MediaType.Photo);
-                            tmpMediaTypes.Add(MediaType.Video);
+                            mediaTypes.Add(MediaType.Photo);
+                            mediaTypes.Add(MediaType.Video);
                             break;
                         default:
-                            tmpMediaTypes.Add(MediaType.Video);
+                            mediaTypes.Add(MediaType.Video);
                             break;
                     }
                 }
 
-                mediaTypes = tmpMediaTypes.ToArray();
+                mediaTypes = mediaTypes.Distinct().ToList();
             }
 
-            var excludeItemTypes = includeItemTypes.Length == 0 && mediaTypes.Length == 0
+            var excludeItemTypes = includeItemTypes.Length == 0 && mediaTypes.Count == 0
                 ? new[]
                 {
                     BaseItemKind.Person,
@@ -369,22 +366,12 @@ namespace Emby.Server.Implementations.Library
                 Limit = limit * 5,
                 IsPlayed = isPlayed,
                 DtoOptions = options,
-                MediaTypes = mediaTypes
+                MediaTypes = mediaTypes.ToArray()
             };
 
-            if (request.GroupItems)
+            if (parents.Count == 0)
             {
-                if (parents.OfType<ICollectionFolder>().All(i => i.CollectionType == CollectionType.tvshows))
-                {
-                    query.Limit = limit;
-                    return _libraryManager.GetLatestItemList(query, parents, CollectionType.tvshows);
-                }
-
-                if (parents.OfType<ICollectionFolder>().All(i => i.CollectionType == CollectionType.music))
-                {
-                    query.Limit = limit;
-                    return _libraryManager.GetLatestItemList(query, parents, CollectionType.music);
-                }
+                return _libraryManager.GetItemList(query, false);
             }
 
             return _libraryManager.GetItemList(query, parents);

Emby.Server.Implementations/Library/Validators/CollectionPostScanTask.cs

@@ -4,7 +4,6 @@ using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 using Jellyfin.Data.Enums;
-using Jellyfin.Database.Implementations.Enums;
 using MediaBrowser.Controller.Collections;
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Entities.Movies;

Emby.Server.Implementations/Library/Validators/GenresValidator.cs

@@ -1,9 +1,6 @@
 using System;
-using System.Globalization;
 using System.Threading;
 using System.Threading.Tasks;
-using Jellyfin.Data.Enums;
-using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Library;
 using MediaBrowser.Controller.Persistence;
 using Microsoft.Extensions.Logging;
@@ -78,26 +75,6 @@ namespace Emby.Server.Implementations.Library.Validators
                 progress.Report(percent);
             }
 
-            var deadEntities = _libraryManager.GetItemList(new InternalItemsQuery
-            {
-                IncludeItemTypes = [BaseItemKind.Genre, BaseItemKind.MusicGenre],
-                IsDeadGenre = true,
-                IsLocked = false
-            });
-
-            foreach (var item in deadEntities)
-            {
-                _logger.LogInformation("Deleting dead {ItemType} {ItemId} {ItemName}", item.GetType().Name, item.Id.ToString("N", CultureInfo.InvariantCulture), item.Name);
-
-                _libraryManager.DeleteItem(
-                    item,
-                    new DeleteOptions
-                    {
-                        DeleteFileLocation = false
-                    },
-                    false);
-            }
-
             progress.Report(100);
         }
     }

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

@@ -129,11 +129,5 @@
     "TaskAudioNormalizationDescription": "Skandeer lêers vir oudio-normaliseringsdata.",
     "TaskAudioNormalization": "Odio Normalisering",
     "TaskCleanCollectionsAndPlaylists": "Maak versamelings en snitlyste skoon",
-    "TaskCleanCollectionsAndPlaylistsDescription": "Verwyder items uit versamelings en snitlyste wat nie meer bestaan nie.",
-    "TaskDownloadMissingLyrics": "Laai tekorte lirieke af",
-    "TaskDownloadMissingLyricsDescription": "Laai lirieke af vir liedjies",
-    "TaskExtractMediaSegments": "Media Segment Skandeer",
-    "TaskExtractMediaSegmentsDescription": "Onttrek of verkry mediasegmente van MediaSegment-geaktiveerde inproppe.",
-    "TaskMoveTrickplayImages": "Migreer Trickplay Beeldligging",
-    "TaskMoveTrickplayImagesDescription": "Skuif ontstaande trickplay lêers volgens die biblioteekinstellings."
+    "TaskCleanCollectionsAndPlaylistsDescription": "Verwyder items uit versamelings en snitlyste wat nie meer bestaan nie."
 }

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

@@ -16,7 +16,7 @@
     "Folders": "المجلدات",
     "Genres": "التصنيفات",
     "HeaderAlbumArtists": "فناني الألبوم",
-    "HeaderContinueWatching": "إستئناف المشاهدة",
+    "HeaderContinueWatching": "استئناف المشاهدة",
     "HeaderFavoriteAlbums": "الألبومات المفضلة",
     "HeaderFavoriteArtists": "الفنانون المفضلون",
     "HeaderFavoriteEpisodes": "الحلقات المفضلة",
@@ -31,7 +31,7 @@
     "ItemRemovedWithName": "أُزيل {0} من المكتبة",
     "LabelIpAddressValue": "عنوان الآي بي: {0}",
     "LabelRunningTimeValue": "مدة التشغيل: {0}",
-    "Latest": "الأحدث",
+    "Latest": "أحدث",
     "MessageApplicationUpdated": "حُدث خادم Jellyfin",
     "MessageApplicationUpdatedTo": "حُدث خادم Jellyfin إلى {0}",
     "MessageNamedServerConfigurationUpdatedWithValue": "حُدثت إعدادات الخادم في قسم {0}",
@@ -52,7 +52,7 @@
     "NotificationOptionInstallationFailed": "فشل في التثبيت",
     "NotificationOptionNewLibraryContent": "أُضيف محتوى جديدا",
     "NotificationOptionPluginError": "فشل في الملحق",
-    "NotificationOptionPluginInstalled": "ثُبتت الملحق",
+    "NotificationOptionPluginInstalled": "ثُبتت المكونات الإضافية",
     "NotificationOptionPluginUninstalled": "تمت إزالة الملحق",
     "NotificationOptionPluginUpdateInstalled": "تم تثبيت تحديثات الملحق",
     "NotificationOptionServerRestartRequired": "يجب إعادة تشغيل الخادم",
@@ -90,10 +90,10 @@
     "UserStartedPlayingItemWithValues": "قام {0} ببدء تشغيل {1} على {2}",
     "UserStoppedPlayingItemWithValues": "قام {0} بإيقاف تشغيل {1} على {2}",
     "ValueHasBeenAddedToLibrary": "تمت اضافت {0} إلى مكتبة الوسائط",
-    "ValueSpecialEpisodeName": "حلقة خاصه - {0}",
+    "ValueSpecialEpisodeName": "حلقه خاصه - {0}",
     "VersionNumber": "الإصدار {0}",
     "TaskCleanCacheDescription": "يحذف الملفات المؤقتة التي لم يعد النظام بحاجة إليها.",
-    "TaskCleanCache": "حذف الملفات المؤقتة",
+    "TaskCleanCache": "احذف ما بمجلد الملفات المؤقتة",
     "TasksChannelsCategory": "قنوات الإنترنت",
     "TasksLibraryCategory": "مكتبة",
     "TasksMaintenanceCategory": "صيانة",
@@ -129,12 +129,7 @@
     "TaskRefreshTrickplayImagesDescription": "يُنشئ معاينات Trickplay لمقاطع الفيديو في المكتبات المُمكّنة.",
     "TaskCleanCollectionsAndPlaylists": "حذف المجموعات وقوائم التشغيل",
     "TaskCleanCollectionsAndPlaylistsDescription": "حذف عناصر من المجموعات وقوائم التشغيل التي لم تعد موجودة.",
-    "TaskAudioNormalization": "تسوية الصوت",
+    "TaskAudioNormalization": "تطبيع الصوت",
     "TaskAudioNormalizationDescription": "مسح الملفات لتطبيع بيانات الصوت.",
-    "TaskDownloadMissingLyrics": "تنزيل عبارات القصيدة",
-    "TaskDownloadMissingLyricsDescription": "كلمات",
-    "TaskExtractMediaSegments": "فحص مقاطع الوسائط",
-    "TaskExtractMediaSegmentsDescription": "يستخرج مقاطع وسائط من إضافات MediaSegment المُفعّلة.",
-    "TaskMoveTrickplayImages": "تغيير مكان صور المعاينة السريعة",
-    "TaskMoveTrickplayImagesDescription": "تُنقل ملفات التشغيل السريع الحالية بناءً على إعدادات المكتبة."
+    "TaskDownloadMissingLyrics": "تنزيل عبارات القصيدة"
 }

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

@@ -1,6 +1,6 @@
 {
     "Sync": "Сінхранізаваць",
-    "Playlists": "Спісы прайгравання",
+    "Playlists": "Плэйлісты",
     "Latest": "Апошні",
     "LabelIpAddressValue": "IP-адрас: {0}",
     "ItemAddedWithName": "{0} быў дададзены ў бібліятэку",
@@ -16,7 +16,7 @@
     "Collections": "Калекцыі",
     "Default": "Па змаўчанні",
     "FailedLoginAttemptWithUserName": "Няўдалая спроба ўваходу з {0}",
-    "Folders": "Тэчкі",
+    "Folders": "Папкі",
     "Favorites": "Абранае",
     "External": "Знешні",
     "Genres": "Жанры",

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

@@ -121,7 +121,7 @@
     "TaskCleanActivityLog": "Изчисти дневника с активност",
     "TaskOptimizeDatabaseDescription": "Прави базата данни по-компактна и освобождава място. Пускането на тази задача след сканиране на библиотеката или правене на други промени, свързани с модификации на базата данни, може да подобри производителността.",
     "TaskOptimizeDatabase": "Оптимизирай базата данни",
-    "TaskKeyframeExtractorDescription": "Извличат се ключови кадри от видеофайловете ,за да се създаде по точен HLS списък . Задачата може да отнеме много време.",
+    "TaskKeyframeExtractorDescription": "Извличат се ключови кадри от видеофайловете ,за да се създаде по точен ХЛС списък . Задачата може да отнеме много време.",
     "TaskKeyframeExtractor": "Извличане на ключови кадри",
     "External": "Външен",
     "HearingImpaired": "Увреден слух",
@@ -129,12 +129,8 @@
     "TaskRefreshTrickplayImagesDescription": "Създава прегледи на Trickplay за видеа в активирани библиотеки.",
     "TaskDownloadMissingLyrics": "Свали липсващи текстове",
     "TaskDownloadMissingLyricsDescription": "Свали текстове за песни",
-    "TaskCleanCollectionsAndPlaylists": "Изчисти колекциите и плейлистите",
+    "TaskCleanCollectionsAndPlaylists": "Изчисти колекциите и плейлистовете",
     "TaskCleanCollectionsAndPlaylistsDescription": "Премахни несъществуващи файлове в колекциите и плейлистите.",
     "TaskAudioNormalization": "Нормализиране на звука",
-    "TaskAudioNormalizationDescription": "Сканирай файловете за нормализация на звука.",
-    "TaskExtractMediaSegmentsDescription": "Изважда медиини сегменти от MediaSegment плъгини.",
-    "TaskMoveTrickplayImages": "Мигриране на Локацията за Trickplay изображения",
-    "TaskMoveTrickplayImagesDescription": "Премества съществуващите trickplay изображения спрямо настройките на библиотеката.",
-    "TaskExtractMediaSegments": "Сканиране за сегменти"
+    "TaskAudioNormalizationDescription": "Сканирай файловете за нормализация на звука."
 }

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

@@ -125,11 +125,5 @@
     "TaskKeyframeExtractor": "কি-ফ্রেম নিষ্কাশক",
     "TaskKeyframeExtractorDescription": "ভিডিয়ো থেকে কি-ফ্রেম নিষ্কাশনের মাধ্যমে অধিকতর সঠিক HLS প্লে লিস্ট তৈরী করে। এই প্রক্রিয়া দীর্ঘ সময় ধরে চলতে পারে।",
     "TaskRefreshTrickplayImages": "ট্রিকপ্লে ইমেজ তৈরি করুন",
-    "TaskRefreshTrickplayImagesDescription": "সক্ষম লাইব্রেরিতে ভিডিওর জন্য ট্রিকপ্লে প্রিভিউ তৈরি করে।",
-    "TaskDownloadMissingLyricsDescription": "গানের লিরিক্স ডাউনলোড করে",
-    "TaskCleanCollectionsAndPlaylists": "সংগ্রহ এবং প্লেলিস্ট পরিষ্কার করুন",
-    "TaskCleanCollectionsAndPlaylistsDescription": "সংগ্রহ এবং প্লেলিস্ট থেকে আইটেমগুলি সরিয়ে দেয় যা আর বিদ্যমান নেই।",
-    "TaskExtractMediaSegments": "মিডিয়া সেগমেন্ট স্ক্যান",
-    "TaskExtractMediaSegmentsDescription": "MediaSegment সক্ষম প্লাগইনগুলি থেকে মিডিয়া সেগমেন্টগুলি বের করে বা প্রাপ্ত করে।",
-    "TaskDownloadMissingLyrics": "অনুপস্থিত গান ডাউনলোড করুন"
+    "TaskRefreshTrickplayImagesDescription": "সক্ষম লাইব্রেরিতে ভিডিওর জন্য ট্রিকপ্লে প্রিভিউ তৈরি করে।"
 }

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

@@ -16,7 +16,7 @@
     "Folders": "Carpetes",
     "Genres": "Gèneres",
     "HeaderAlbumArtists": "Artistes de l'àlbum",
-    "HeaderContinueWatching": "Continua veient",
+    "HeaderContinueWatching": "Continuar veient",
     "HeaderFavoriteAlbums": "Àlbums preferits",
     "HeaderFavoriteArtists": "Artistes preferits",
     "HeaderFavoriteEpisodes": "Episodis preferits",
@@ -24,13 +24,13 @@
     "HeaderFavoriteSongs": "Cançons preferides",
     "HeaderLiveTV": "TV en directe",
     "HeaderNextUp": "A continuació",
-    "HeaderRecordingGroups": "Grups Musicals",
+    "HeaderRecordingGroups": "Grups d'enregistrament",
     "HomeVideos": "Vídeos domèstics",
-    "Inherit": "Heretat",
-    "ItemAddedWithName": "{0} s'ha afegit a la biblioteca",
-    "ItemRemovedWithName": "{0} s'ha eliminat de la biblioteca",
+    "Inherit": "Hereta",
+    "ItemAddedWithName": "{0} ha sigut afegit a la biblioteca",
+    "ItemRemovedWithName": "{0} ha sigut eliminat de la biblioteca",
     "LabelIpAddressValue": "Adreça IP: {0}",
-    "LabelRunningTimeValue": "Temps en marxa: {0}",
+    "LabelRunningTimeValue": "Temps en funcionament: {0}",
     "Latest": "Darrers",
     "MessageApplicationUpdated": "El servidor de Jellyfin ha estat actualitzat",
     "MessageApplicationUpdatedTo": "El servidor de Jellyfin ha estat actualitzat a {0}",
@@ -44,8 +44,8 @@
     "NameSeasonNumber": "Temporada {0}",
     "NameSeasonUnknown": "Temporada desconeguda",
     "NewVersionIsAvailable": "Una nova versió del servidor de Jellyfin està disponible per a descarregar.",
-    "NotificationOptionApplicationUpdateAvailable": "Actualització de l'aplicatiu disponible",
-    "NotificationOptionApplicationUpdateInstalled": "Actualització de l'aplicatiu instal·lada",
+    "NotificationOptionApplicationUpdateAvailable": "Actualització de l'aplicació disponible",
+    "NotificationOptionApplicationUpdateInstalled": "Actualització de l'aplicació instal·lada",
     "NotificationOptionAudioPlayback": "Reproducció d'àudio iniciada",
     "NotificationOptionAudioPlaybackStopped": "Reproducció d'àudio aturada",
     "NotificationOptionCameraImageUploaded": "Imatge de càmera pujada",
@@ -54,8 +54,8 @@
     "NotificationOptionPluginError": "Un complement ha fallat",
     "NotificationOptionPluginInstalled": "Complement instal·lat",
     "NotificationOptionPluginUninstalled": "Complement desinstal·lat",
-    "NotificationOptionPluginUpdateInstalled": "Actualització del complement instal·lada",
-    "NotificationOptionServerRestartRequired": "El servidor s'ha de reiniciar",
+    "NotificationOptionPluginUpdateInstalled": "Actualització de complement instal·lada",
+    "NotificationOptionServerRestartRequired": "Reinici del servidor requerit",
     "NotificationOptionTaskFailed": "Tasca programada fallida",
     "NotificationOptionUserLockedOut": "Usuari expulsat",
     "NotificationOptionVideoPlayback": "Reproducció de vídeo iniciada",
@@ -64,15 +64,15 @@
     "Playlists": "Llistes de reproducció",
     "Plugin": "Complement",
     "PluginInstalledWithName": "{0} ha estat instal·lat",
-    "PluginUninstalledWithName": "S'ha instalat {0}",
-    "PluginUpdatedWithName": "S'ha actualitzat {0}",
+    "PluginUninstalledWithName": "{0} ha estat desinstal·lat",
+    "PluginUpdatedWithName": "{0} ha estat actualitzat",
     "ProviderValue": "Proveïdor: {0}",
     "ScheduledTaskFailedWithName": "{0} ha fallat",
-    "ScheduledTaskStartedWithName": "S'ha iniciat {0}",
-    "ServerNameNeedsToBeRestarted": "S'ha de reiniciar {0}",
+    "ScheduledTaskStartedWithName": "{0} s'ha iniciat",
+    "ServerNameNeedsToBeRestarted": "{0} necessita ser reiniciat",
     "Shows": "Sèries",
     "Songs": "Cançons",
-    "StartupEmbyServerIsLoading": "El servidor de Jellyfin s'està carregant. Proveu de nou en una estona.",
+    "StartupEmbyServerIsLoading": "El servidor de Jellyfin s'està carregant. Proveu-ho altre cop aviat.",
     "SubtitleDownloadFailureForItem": "Subtitles failed to download for {0}",
     "SubtitleDownloadFailureFromForItem": "Els subtítols per a {1} no s'han pogut baixar de {0}",
     "Sync": "Sincronitzar",
@@ -80,41 +80,41 @@
     "TvShows": "Sèries de TV",
     "User": "Usuari",
     "UserCreatedWithName": "S'ha creat l'usuari {0}",
-    "UserDeletedWithName": "S'ha eliminat l'usuari {0}",
+    "UserDeletedWithName": "L'usuari {0} ha estat eliminat",
     "UserDownloadingItemWithValues": "{0} està descarregant {1}",
-    "UserLockedOutWithName": "S'ha expulsat a l'usuari {0}",
+    "UserLockedOutWithName": "L'usuari {0} ha sigut expulsat",
     "UserOfflineFromDevice": "{0} s'ha desconnectat de {1}",
     "UserOnlineFromDevice": "{0} està connectat des de {1}",
-    "UserPasswordChangedWithName": "S'ha canviat la contrasenya per a l'usuari {0}",
+    "UserPasswordChangedWithName": "La contrasenya ha estat canviada per a l'usuari {0}",
     "UserPolicyUpdatedWithName": "La política d'usuari s'ha actualitzat per a {0}",
-    "UserStartedPlayingItemWithValues": "{0} ha començat a reproduir {1} a {2}",
-    "UserStoppedPlayingItemWithValues": "{0} ha parat de reproduir {1} a {2}",
-    "ValueHasBeenAddedToLibrary": "S'ha afegit {0} a la teva biblioteca",
+    "UserStartedPlayingItemWithValues": "{0} ha començat a reproduir {1}",
+    "UserStoppedPlayingItemWithValues": "{0} ha parat de reproduir {1}",
+    "ValueHasBeenAddedToLibrary": "{0} ha sigut afegit a la teva biblioteca",
     "ValueSpecialEpisodeName": "Especial - {0}",
     "VersionNumber": "Versió {0}",
     "TaskDownloadMissingSubtitlesDescription": "Cerca a internet els subtítols que faltin a partir de la configuració de metadades.",
     "TaskDownloadMissingSubtitles": "Descarrega els subtítols que faltin",
-    "TaskRefreshChannelsDescription": "Actualitza la informació dels canals per internet.",
+    "TaskRefreshChannelsDescription": "Actualitza la informació dels canals d'internet.",
     "TaskRefreshChannels": "Actualitza els canals",
     "TaskCleanTranscodeDescription": "Elimina els arxius de transcodificacions que tinguin més d'un dia.",
     "TaskCleanTranscode": "Neteja les transcodificacions",
-    "TaskUpdatePluginsDescription": "Actualitza els complements que estan configurats per a actualitzar-se automàticament.",
-    "TaskUpdatePlugins": "Actualitza els complements",
-    "TaskRefreshPeopleDescription": "Actualitza les metadades dels actors i directors de la teva biblioteca de mitjans.",
+    "TaskUpdatePluginsDescription": "Actualitza els connectors que estan configurats per a actualitzar-se automàticament.",
+    "TaskUpdatePlugins": "Actualitza els connectors",
+    "TaskRefreshPeopleDescription": "Actualitza les metadades dels actors i directors de la teva mediateca.",
     "TaskRefreshPeople": "Actualitza les persones",
     "TaskCleanLogsDescription": "Esborra els logs que tinguin més de {0} dies.",
     "TaskCleanLogs": "Neteja els registres",
-    "TaskRefreshLibraryDescription": "Escaneja la biblioteca de mitjans buscant fitxers nous i refresca les metadades.",
+    "TaskRefreshLibraryDescription": "Escaneja la mediateca buscant fitxers nous i refresca les metadades.",
     "TaskRefreshLibrary": "Escaneja la biblioteca de mitjans",
     "TaskRefreshChapterImagesDescription": "Crea les miniatures dels vídeos que tinguin capítols.",
     "TaskRefreshChapterImages": "Extreure les imatges dels capítols",
-    "TaskCleanCacheDescription": "Elimina la memòria cau no necessària per al servidor.",
-    "TaskCleanCache": "Elimina la memòria cau",
-    "TasksChannelsCategory": "Canals per internet",
-    "TasksApplicationCategory": "Aplicatiu",
+    "TaskCleanCacheDescription": "Elimina els arxius temporals que ja no són necessaris per al servidor.",
+    "TaskCleanCache": "Elimina arxius temporals",
+    "TasksChannelsCategory": "Canals d'internet",
+    "TasksApplicationCategory": "Aplicació",
     "TasksLibraryCategory": "Biblioteca",
     "TasksMaintenanceCategory": "Manteniment",
-    "TaskCleanActivityLogDescription": "Eliminades les entrades del registre d'activitats més antigues que l'antiguitat configurada.",
+    "TaskCleanActivityLogDescription": "Eliminat entrades del registre d'activitats mes antigues que l'antiguitat configurada.",
     "TaskCleanActivityLog": "Buidar el registre d'activitat",
     "Undefined": "Indefinit",
     "Forced": "Forçat",
@@ -128,13 +128,9 @@
     "TaskRefreshTrickplayImages": "Generar miniatures de línia de temps",
     "TaskRefreshTrickplayImagesDescription": "Crear miniatures de línia de temps per vídeos en les biblioteques habilitades.",
     "TaskCleanCollectionsAndPlaylistsDescription": "Esborra elements de col·leccions i llistes de reproducció que ja no existeixen.",
-    "TaskCleanCollectionsAndPlaylists": "Neteja les col·leccions i llistes de reproducció",
-    "TaskAudioNormalization": "Estabilització d'Àudio",
-    "TaskAudioNormalizationDescription": "Escaneja arxius per dades d'estabilització d'àudio.",
-    "TaskDownloadMissingLyricsDescription": "Baixar les lletres de les cançons",
-    "TaskDownloadMissingLyrics": "Baixar les lletres que falten",
-    "TaskExtractMediaSegments": "Escaneig de segments multimèdia",
-    "TaskExtractMediaSegmentsDescription": "Extreu o obté segments multimèdia usant els connectors MediaSegment activats.",
-    "TaskMoveTrickplayImages": "Migra la ubicació de la imatge de Trickplay",
-    "TaskMoveTrickplayImagesDescription": "Mou els fitxers trickplay existents segons la configuració de la biblioteca."
+    "TaskCleanCollectionsAndPlaylists": "Neteja col·leccions i llistes de reproducció",
+    "TaskAudioNormalization": "Normalització d'Àudio",
+    "TaskAudioNormalizationDescription": "Escaneja arxius per dades de normalització d'àudio.",
+    "TaskDownloadMissingLyricsDescription": "Baixar lletres de les cançons",
+    "TaskDownloadMissingLyrics": "Baixar lletres que falten"
 }

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

@@ -1,5 +1,5 @@
 {
-    "Albums": "Albummer",
+    "Albums": "Album",
     "AppDeviceValues": "App: {0}, Enhed: {1}",
     "Application": "Applikation",
     "Artists": "Kunstnere",
@@ -72,7 +72,7 @@
     "ServerNameNeedsToBeRestarted": "{0} skal genstartes",
     "Shows": "Serier",
     "Songs": "Sange",
-    "StartupEmbyServerIsLoading": "Jellyfin er i gang med at starte. Prøv igen om et øjeblik.",
+    "StartupEmbyServerIsLoading": "Jellyfin Server er i gang med at starte. Forsøg igen om et øjeblik.",
     "SubtitleDownloadFailureForItem": "Fejlet i download af undertekster for {0}",
     "SubtitleDownloadFailureFromForItem": "Undertekster kunne ikke hentes fra {0} til {1}",
     "Sync": "Synkroniser",
@@ -93,13 +93,13 @@
     "ValueSpecialEpisodeName": "Special - {0}",
     "VersionNumber": "Version {0}",
     "TaskDownloadMissingSubtitlesDescription": "Søger på internettet efter manglende undertekster baseret på metadata-konfigurationen.",
-    "TaskDownloadMissingSubtitles": "Hent manglende undertekster",
+    "TaskDownloadMissingSubtitles": "Hentede medie mangler undertekster",
     "TaskUpdatePluginsDescription": "Henter og installerer opdateringer for plugins, som er konfigurerede til at blive opdateret automatisk.",
-    "TaskUpdatePlugins": "Opdater plugins",
+    "TaskUpdatePlugins": "Opdater Plugins",
     "TaskCleanLogsDescription": "Sletter log-filer som er mere end {0} dage gamle.",
-    "TaskCleanLogs": "Ryd log-mappe",
+    "TaskCleanLogs": "Ryd Log-mappe",
     "TaskRefreshLibraryDescription": "Scanner dit mediebibliotek for nye filer og opdateret metadata.",
-    "TaskRefreshLibrary": "Scan mediebibliotek",
+    "TaskRefreshLibrary": "Scan Mediebibliotek",
     "TaskCleanCacheDescription": "Sletter cache-filer som systemet ikke længere bruger.",
     "TaskCleanCache": "Ryd cache-mappe",
     "TasksChannelsCategory": "Internetkanaler",
@@ -108,33 +108,33 @@
     "TasksMaintenanceCategory": "Vedligeholdelse",
     "TaskRefreshChapterImages": "Udtræk kapitelbilleder",
     "TaskRefreshChapterImagesDescription": "Laver miniaturebilleder for videoer, der har kapitler.",
-    "TaskRefreshChannelsDescription": "Opdaterer information for internetkanaler.",
-    "TaskRefreshChannels": "Opdater kanaler",
-    "TaskCleanTranscodeDescription": "Fjerner omkodningsfiler, som er mere end 1 dag gamle.",
-    "TaskCleanTranscode": "Tøm omkodningsmappen",
-    "TaskRefreshPeople": "Opdater personer",
+    "TaskRefreshChannelsDescription": "Opdaterer information for internetkanal.",
+    "TaskRefreshChannels": "Opdater Kanaler",
+    "TaskCleanTranscodeDescription": "Fjerner transcode-filer, som er mere end 1 dag gammel.",
+    "TaskCleanTranscode": "Tøm Transcode-mappen",
+    "TaskRefreshPeople": "Opdater Personer",
     "TaskRefreshPeopleDescription": "Opdaterer metadata for skuespillere og instruktører i dit mediebibliotek.",
     "TaskCleanActivityLogDescription": "Sletter linjer i aktivitetsloggen ældre end den konfigurerede alder.",
-    "TaskCleanActivityLog": "Ryd aktivitetslog",
+    "TaskCleanActivityLog": "Ryd Aktivitetslog",
     "Undefined": "Udefineret",
     "Forced": "Tvunget",
     "Default": "Standard",
-    "TaskOptimizeDatabaseDescription": "Komprimerer databasen for at frigøre plads. Denne handling køres efter at have scannet mediebiblioteket, eller efter at have lavet ændringer til databasen.",
-    "TaskOptimizeDatabase": "Optimer database",
-    "TaskKeyframeExtractorDescription": "Udtrækker rammer fra videofiler for at lave mere præcise HLS-playlister. Denne opgave kan tage lang tid.",
-    "TaskKeyframeExtractor": "Udtræk nøglerammer",
+    "TaskOptimizeDatabaseDescription": "Komprimerer databasen og frigør plads. Denne handling køres efter at have scannet mediebiblioteket, eller efter at have lavet ændringer til databasen, for at højne ydeevnen.",
+    "TaskOptimizeDatabase": "Optimér database",
+    "TaskKeyframeExtractorDescription": "Udtrækker billeder fra videofiler for at lave mere præcise HLS-playlister. Denne opgave kan tage lang tid.",
+    "TaskKeyframeExtractor": "Udtræk af nøglebillede",
     "External": "Ekstern",
     "HearingImpaired": "Hørehæmmet",
-    "TaskRefreshTrickplayImages": "Generer trickplay-billeder",
-    "TaskRefreshTrickplayImagesDescription": "Laver trickplay-billeder for videoer i aktiverede biblioteker.",
+    "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.",
-    "TaskAudioNormalizationDescription": "Skanner filer for data vedrørende lydnormalisering.",
-    "TaskAudioNormalization": "Lydnormalisering",
-    "TaskDownloadMissingLyricsDescription": "Søger på internettet efter manglende sangtekster baseret på metadata-konfigurationen",
-    "TaskDownloadMissingLyrics": "Hent manglende sangtekster",
-    "TaskExtractMediaSegments": "Scan for mediesegmenter",
-    "TaskMoveTrickplayImages": "Migrer billedelokationer for trickplay-billeder",
-    "TaskMoveTrickplayImagesDescription": "Flyt eksisterende trickplay-billeder jævnfør biblioteksindstillinger.",
-    "TaskExtractMediaSegmentsDescription": "Udtrækker eller henter mediesegmenter fra plugins som understøtter MediaSegment."
+    "TaskAudioNormalizationDescription": "Skanner filer for data vedrørende audio-normalisering.",
+    "TaskAudioNormalization": "Audio-normalisering",
+    "TaskDownloadMissingLyricsDescription": "Hentede sange mangler sangtekster",
+    "TaskDownloadMissingLyrics": "Hentede medie mangler sangtekster",
+    "TaskExtractMediaSegments": "Scan mediesegment",
+    "TaskMoveTrickplayImages": "Migrer billedelokation for Trickplay",
+    "TaskMoveTrickplayImagesDescription": "Flyt eksisterende trickplay-filer jævnfør biblioteksindstillilnger.",
+    "TaskExtractMediaSegmentsDescription": "Ekstraherer eller henter mediesegmenter fra plugins som understøtter MediaSegment."
 }

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

@@ -5,7 +5,7 @@
     "Artists": "Interpreten",
     "AuthenticationSucceededWithUserName": "{0} erfolgreich authentifiziert",
     "Books": "Bücher",
-    "CameraImageUploadedFrom": "Ein neues Kamerabild wurde von {0} hochgeladen",
+    "CameraImageUploadedFrom": "Ein neues Kamerafoto wurde von {0} hochgeladen",
     "Channels": "Kanäle",
     "ChapterNameValue": "Kapitel {0}",
     "Collections": "Sammlungen",
@@ -18,7 +18,7 @@
     "HeaderAlbumArtists": "Album-Interpreten",
     "HeaderContinueWatching": "Weiterschauen",
     "HeaderFavoriteAlbums": "Lieblingsalben",
-    "HeaderFavoriteArtists": "Lieblingsinterpreten",
+    "HeaderFavoriteArtists": "Lieblings-Interpreten",
     "HeaderFavoriteEpisodes": "Lieblingsepisoden",
     "HeaderFavoriteShows": "Lieblingsserien",
     "HeaderFavoriteSongs": "Lieblingslieder",
@@ -43,7 +43,7 @@
     "NameInstallFailed": "Installation von {0} fehlgeschlagen",
     "NameSeasonNumber": "Staffel {0}",
     "NameSeasonUnknown": "Staffel unbekannt",
-    "NewVersionIsAvailable": "Eine neue Jellyfin-Serverversion steht zum Download bereit.",
+    "NewVersionIsAvailable": "Eine neue Version von Jellyfin-Server steht zum Download bereit.",
     "NotificationOptionApplicationUpdateAvailable": "Anwendungsaktualisierung verfügbar",
     "NotificationOptionApplicationUpdateInstalled": "Anwendungsaktualisierung installiert",
     "NotificationOptionAudioPlayback": "Audiowiedergabe gestartet",
@@ -72,12 +72,12 @@
     "ServerNameNeedsToBeRestarted": "{0} muss neu gestartet werden",
     "Shows": "Serien",
     "Songs": "Lieder",
-    "StartupEmbyServerIsLoading": "Jellyfin-Server lädt. Bitte versuche es gleich noch einmal.",
+    "StartupEmbyServerIsLoading": "Jellyfin-Server startet, bitte versuche es gleich noch einmal.",
     "SubtitleDownloadFailureForItem": "Download der Untertitel fehlgeschlagen für {0}",
     "SubtitleDownloadFailureFromForItem": "Untertitel von {0} für {1} konnten nicht heruntergeladen werden",
     "Sync": "Synchronisation",
     "System": "System",
-    "TvShows": "TV-Serien",
+    "TvShows": "TV-Sendungen",
     "User": "Benutzer",
     "UserCreatedWithName": "Benutzer {0} wurde erstellt",
     "UserDeletedWithName": "Benutzer {0} wurde gelöscht",
@@ -92,30 +92,30 @@
     "ValueHasBeenAddedToLibrary": "{0} wurde deiner Bibliothek hinzugefügt",
     "ValueSpecialEpisodeName": "Extra - {0}",
     "VersionNumber": "Version {0}",
-    "TaskDownloadMissingSubtitlesDescription": "Sucht im Internet basierend auf den Metadaten-Einstellungen nach fehlenden Untertiteln.",
-    "TaskDownloadMissingSubtitles": "Fehlende Untertitel herunterladen",
-    "TaskRefreshChannelsDescription": "Aktualisiert Internet-Kanal-Informationen.",
-    "TaskRefreshChannels": "Kanäle aktualisieren",
-    "TaskCleanTranscodeDescription": "Löscht Transkodierungsdateien, die älter als einen Tag sind.",
-    "TaskCleanTranscode": "Transkodierungs-Verzeichnis aufräumen",
+    "TaskDownloadMissingSubtitlesDescription": "Suche im Internet basierend auf den Metadaten-Einstellungen nach fehlenden Untertiteln.",
+    "TaskDownloadMissingSubtitles": "Lade fehlende Untertitel herunter",
+    "TaskRefreshChannelsDescription": "Aktualisiere Internet-Kanal-Informationen.",
+    "TaskRefreshChannels": "Aktualisiere Kanäle",
+    "TaskCleanTranscodeDescription": "Löscht Transkodierdateien, die älter als einen Tag sind.",
+    "TaskCleanTranscode": "Räume Transkodierungs-Verzeichnis auf",
     "TaskUpdatePluginsDescription": "Lädt Updates für Plugins herunter, welche für automatische Updates konfiguriert sind und installiert diese.",
-    "TaskUpdatePlugins": "Plugins aktualisieren",
+    "TaskUpdatePlugins": "Aktualisiere Plugins",
     "TaskRefreshPeopleDescription": "Aktualisiert Metadaten für Schauspieler und Regisseure in deinen Bibliotheken.",
-    "TaskRefreshPeople": "Personen aktualisieren",
+    "TaskRefreshPeople": "Aktualisiere Personen",
     "TaskCleanLogsDescription": "Lösche Log-Dateien, die älter als {0} Tage sind.",
-    "TaskCleanLogs": "Log-Verzeichnis aufräumen",
-    "TaskRefreshLibraryDescription": "Durchsucht alle Bibliotheken nach neu hinzugefügten Dateien und aktualisiert Metadaten.",
-    "TaskRefreshLibrary": "Medien-Bibliothek scannen",
+    "TaskCleanLogs": "Räumt Log-Verzeichnis auf",
+    "TaskRefreshLibraryDescription": "Scannt alle Bibliotheken nach neu hinzugefügten Dateien und aktualisiere Metadaten.",
+    "TaskRefreshLibrary": "Scanne Medien-Bibliothek",
     "TaskRefreshChapterImagesDescription": "Erstellt Vorschaubilder für Videos, die Kapitel besitzen.",
-    "TaskRefreshChapterImages": "Kapitel-Bilder extrahieren",
-    "TaskCleanCacheDescription": "Löscht vom System nicht mehr benötigte Zwischenspeicherdateien.",
-    "TaskCleanCache": "Zwischenspeicher-Verzeichnis aufräumen",
+    "TaskRefreshChapterImages": "Extrahiere Kapitel-Bilder",
+    "TaskCleanCacheDescription": "Löscht nicht mehr benötigte Zwischenspeicherdateien.",
+    "TaskCleanCache": "Leere Zwischenspeicher",
     "TasksChannelsCategory": "Internet-Kanäle",
     "TasksApplicationCategory": "Anwendung",
     "TasksLibraryCategory": "Bibliothek",
     "TasksMaintenanceCategory": "Wartung",
     "TaskCleanActivityLogDescription": "Löscht Aktivitätsprotokolleinträge, die älter als das konfigurierte Alter sind.",
-    "TaskCleanActivityLog": "Aktivitätsprotokolle aufräumen",
+    "TaskCleanActivityLog": "Aktivitätsprotokoll aufräumen",
     "Undefined": "Undefiniert",
     "Forced": "Erzwungen",
     "Default": "Standard",
@@ -128,12 +128,12 @@
     "TaskRefreshTrickplayImages": "Trickplay-Bilder generieren",
     "TaskRefreshTrickplayImagesDescription": "Erstellt ein Trickplay-Vorschauen für Videos in aktivierten Bibliotheken.",
     "TaskCleanCollectionsAndPlaylists": "Sammlungen und Playlisten aufräumen",
-    "TaskCleanCollectionsAndPlaylistsDescription": "Löscht nicht mehr vorhandene Einträge aus den Sammlungen und Playlisten.",
+    "TaskCleanCollectionsAndPlaylistsDescription": "Lösche nicht mehr vorhandene Einträge aus den Sammlungen und Playlisten.",
     "TaskAudioNormalization": "Audio Normalisierung",
     "TaskAudioNormalizationDescription": "Durchsucht Dateien nach Audionormalisierungsdaten.",
     "TaskDownloadMissingLyricsDescription": "Lädt Songtexte herunter",
     "TaskDownloadMissingLyrics": "Fehlende Songtexte herunterladen",
-    "TaskExtractMediaSegments": "Mediensegmente scannen",
+    "TaskExtractMediaSegments": "Scanne Mediensegmente",
     "TaskExtractMediaSegmentsDescription": "Extrahiert oder empfängt Mediensegmente von Plugins die Mediensegmente nutzen.",
     "TaskMoveTrickplayImages": "Verzeichnis für Trickplay-Bilder migrieren",
     "TaskMoveTrickplayImagesDescription": "Trickplay-Bilder werden entsprechend der Bibliothekseinstellungen verschoben."

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

@@ -11,7 +11,7 @@
     "Collections": "Συλλογές",
     "DeviceOfflineWithName": "Ο/Η {0} αποσυνδέθηκε",
     "DeviceOnlineWithName": "Ο/Η {0} συνδέθηκε",
-    "FailedLoginAttemptWithUserName": "Αποτυχία προσπάθειας σύνδεσης από {0}",
+    "FailedLoginAttemptWithUserName": "Αποτυχημένη προσπάθεια σύνδεσης από {0}",
     "Favorites": "Αγαπημένα",
     "Folders": "Φάκελοι",
     "Genres": "Είδη",
@@ -27,8 +27,8 @@
     "HeaderRecordingGroups": "Ομάδες Ηχογράφησης",
     "HomeVideos": "Προσωπικά Βίντεο",
     "Inherit": "Κληρονόμηση",
-    "ItemAddedWithName": "Το {0} προστέθηκε στη βιβλιοθήκη",
-    "ItemRemovedWithName": "Το {0} διαγράφτηκε από τη βιβλιοθήκη",
+    "ItemAddedWithName": "{0} προστέθηκε στη βιβλιοθήκη",
+    "ItemRemovedWithName": "{0} διαγράφηκε από τη βιβλιοθήκη",
     "LabelIpAddressValue": "Διεύθυνση IP: {0}",
     "LabelRunningTimeValue": "Διάρκεια: {0}",
     "Latest": "Πρόσφατα",
@@ -40,7 +40,7 @@
     "Movies": "Ταινίες",
     "Music": "Μουσική",
     "MusicVideos": "Μουσικά Βίντεο",
-    "NameInstallFailed": "H εγκατάσταση του {0} απέτυχε",
+    "NameInstallFailed": "{0} η εγκατάσταση απέτυχε",
     "NameSeasonNumber": "Κύκλος {0}",
     "NameSeasonUnknown": "Άγνωστος Κύκλος",
     "NewVersionIsAvailable": "Μια νέα έκδοση του διακομιστή Jellyfin είναι διαθέσιμη για λήψη.",
@@ -54,7 +54,7 @@
     "NotificationOptionPluginError": "Αποτυχία του πρόσθετου",
     "NotificationOptionPluginInstalled": "Το πρόσθετο εγκαταστάθηκε",
     "NotificationOptionPluginUninstalled": "Το πρόσθετο απεγκαταστάθηκε",
-    "NotificationOptionPluginUpdateInstalled": "Η ενημέρωση του πρόσθετου εγκαταστάθηκε",
+    "NotificationOptionPluginUpdateInstalled": "Η αναβάθμιση του πρόσθετου εγκαταστάθηκε",
     "NotificationOptionServerRestartRequired": "Ο διακομιστής χρειάζεται επανεκκίνηση",
     "NotificationOptionTaskFailed": "Αποτυχία προγραμματισμένης εργασίας",
     "NotificationOptionUserLockedOut": "Ο χρήστης αποκλείστηκε",
@@ -63,9 +63,9 @@
     "Photos": "Φωτογραφίες",
     "Playlists": "Λίστες αναπαραγωγής",
     "Plugin": "Πρόσθετο",
-    "PluginInstalledWithName": "Το {0} εγκαταστάθηκε",
-    "PluginUninstalledWithName": "Το {0} έχει απεγκατασταθεί",
-    "PluginUpdatedWithName": "Το {0} ενημερώθηκε",
+    "PluginInstalledWithName": "{0} εγκαταστήθηκε",
+    "PluginUninstalledWithName": "{0} έχει απεγκατασταθεί",
+    "PluginUpdatedWithName": "{0} έχει αναβαθμιστεί",
     "ProviderValue": "Πάροχος: {0}",
     "ScheduledTaskFailedWithName": "{0} αποτυχία",
     "ScheduledTaskStartedWithName": "{0} ξεκίνησε",
@@ -96,7 +96,7 @@
     "TaskCleanLogsDescription": "Διαγράφει αρχεία καταγραφής που είναι πάνω από {0} ημέρες.",
     "TaskCleanLogs": "Εκκαθάριση Καταλόγου Καταγραφής",
     "TaskRefreshLibraryDescription": "Σαρώνει την βιβλιοθήκη πολυμέσων σας για νέα αρχεία και ανανεώνει τα μεταδεδομένα.",
-    "TaskRefreshLibrary": "Σάρωση Βιβλιοθήκης Πολυμέσων",
+    "TaskRefreshLibrary": "Βιβλιοθήκη Σάρωσης Πολυμέσων",
     "TaskRefreshChapterImagesDescription": "Δημιουργεί μικρογραφίες για βίντεο που έχουν κεφάλαια.",
     "TaskRefreshChapterImages": "Εξαγωγή Εικόνων Κεφαλαίου",
     "TaskCleanCacheDescription": "Διαγράφει αρχεία προσωρινής μνήμης που δεν χρειάζονται πλέον το σύστημα.",
@@ -125,16 +125,10 @@
     "TaskKeyframeExtractor": "Εξαγωγέας βασικών καρέ βίντεο",
     "External": "Εξωτερικό",
     "HearingImpaired": "Με προβλήματα ακοής",
-    "TaskRefreshTrickplayImages": "Δημιουργία εικόνων Trickplay",
+    "TaskRefreshTrickplayImages": "Δημιουργήστε εικόνες Trickplay",
     "TaskRefreshTrickplayImagesDescription": "Δημιουργεί προεπισκοπήσεις trickplay για βίντεο σε ενεργοποιημένες βιβλιοθήκες.",
     "TaskAudioNormalization": "Ομοιομορφία ήχου",
     "TaskAudioNormalizationDescription": "Ανίχνευση αρχείων για δεδομένα ομοιομορφίας ήχου.",
     "TaskCleanCollectionsAndPlaylists": "Καθαρισμός συλλογών και λιστών αναπαραγωγής",
-    "TaskCleanCollectionsAndPlaylistsDescription": "Αφαιρούνται στοιχεία από τις συλλογές και τις λίστες αναπαραγωγής που δεν υπάρχουν πλέον.",
-    "TaskMoveTrickplayImages": "Αλλαγή τοποθεσίας εικόνων Trickplay",
-    "TaskDownloadMissingLyrics": "Λήψη στίχων που λείπουν",
-    "TaskMoveTrickplayImagesDescription": "Μετακινεί τα υπάρχοντα αρχεία trickplay σύμφωνα με τις ρυθμίσεις της βιβλιοθήκης.",
-    "TaskDownloadMissingLyricsDescription": "Κατεβάζει στίχους για τραγούδια",
-    "TaskExtractMediaSegments": "Σάρωση τμημάτων πολυμέσων",
-    "TaskExtractMediaSegmentsDescription": "Εξάγει ή βρίσκει τμήματα πολυμέσων από επεκτάσεις που χρησιμοποιούν το MediaSegment."
+    "TaskCleanCollectionsAndPlaylistsDescription": "Αφαιρούνται στοιχεία από τις συλλογές και τις λίστες αναπαραγωγής που δεν υπάρχουν πλέον."
 }

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

@@ -122,9 +122,5 @@
     "AuthenticationSucceededWithUserName": "{0} sukcese aŭtentikigis",
     "TaskKeyframeExtractorDescription": "Eltiras ĉefkadrojn el videodosieroj por krei pli precizajn HLS-ludlistojn. Ĉi tiu tasko povas funkcii dum longa tempo.",
     "TaskKeyframeExtractor": "Eltiri Ĉefkadrojn",
-    "External": "Ekstera",
-    "TaskAudioNormalizationDescription": "Skanas dosierojn por sonnivelaj normaligaj datumoj.",
-    "TaskRefreshTrickplayImages": "Generi la bildojn por TrickPlay (Antaŭrigardo rapida antaŭen)",
-    "TaskAudioNormalization": "Normaligo Sonnivela",
-    "HearingImpaired": "Surda"
+    "External": "Ekstera"
 }

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

@@ -15,7 +15,7 @@
     "Favorites": "Favoritos",
     "Folders": "Carpetas",
     "Genres": "Géneros",
-    "HeaderAlbumArtists": "Artistas del álbum",
+    "HeaderAlbumArtists": "Artistas de álbum",
     "HeaderContinueWatching": "Seguir viendo",
     "HeaderFavoriteAlbums": "Álbumes favoritos",
     "HeaderFavoriteArtists": "Artistas favoritos",

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

@@ -131,9 +131,5 @@
     "TaskAudioNormalizationDescription": "Analiza los archivos para normalizar el audio.",
     "TaskCleanCollectionsAndPlaylists": "Limpieza de colecciones y listas de reproducción",
     "TaskDownloadMissingLyrics": "Descargar letra faltante",
-    "TaskDownloadMissingLyricsDescription": "Descarga letras de canciones",
-    "TaskExtractMediaSegmentsDescription": "Extrae u obtiene segmentos de medios de complementos habilitados para MediaSegment.",
-    "TaskMoveTrickplayImagesDescription": "Mueve archivos de trickplay existentes según la configuración de la biblioteca.",
-    "TaskExtractMediaSegments": "Escaneo de segmentos de medios",
-    "TaskMoveTrickplayImages": "Migrar la ubicación de la imagen de Trickplay"
+    "TaskDownloadMissingLyricsDescription": "Descarga letras de canciones"
 }

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

@@ -19,25 +19,25 @@
     "Artists": "Artistak",
     "Albums": "Albumak",
     "TaskOptimizeDatabase": "Datu basea optimizatu",
-    "TaskDownloadMissingSubtitlesDescription": "Falta diren azpitituluak bilatzen ditu interneten metadatuen konfigurazioaren arabera.",
+    "TaskDownloadMissingSubtitlesDescription": "Metadataren konfigurazioan oinarrituta falta diren azpitituluak bilatzen ditu interneten.",
     "TaskDownloadMissingSubtitles": "Falta diren azpitituluak deskargatu",
     "TaskRefreshChannelsDescription": "Internet kanalen informazioa eguneratu.",
     "TaskRefreshChannels": "Kanalak eguneratu",
-    "TaskCleanTranscodeDescription": "Egun bat baino zaharragoak diren transkodifikazio fitxategiak ezabatzen ditu.",
-    "TaskCleanTranscode": "Transkodifikazio direktorioa garbitu",
-    "TaskUpdatePluginsDescription": "Automatikoki deskargatu eta instalatu eguneraketak konfiguratutako pluginetarako.",
+    "TaskCleanTranscodeDescription": "Egun bat baino zaharragoak diren transcode fitxategiak ezabatzen ditu.",
+    "TaskCleanTranscode": "Transcode direktorioa garbitu",
+    "TaskUpdatePluginsDescription": "Automatikoki eguneratzeko konfiguratutako pluginen eguneraketak deskargatu eta instalatzen ditu.",
     "TaskUpdatePlugins": "Pluginak eguneratu",
-    "TaskRefreshPeopleDescription": "Zure liburutegiko aktore eta zuzendarien metadatuak eguneratzen ditu.",
+    "TaskRefreshPeopleDescription": "Zure liburutegiko aktore eta zuzendarien metadata eguneratzen du.",
     "TaskRefreshPeople": "Jendea eguneratu",
     "TaskCleanLogsDescription": "{0} egun baino zaharragoak diren log fitxategiak ezabatzen ditu.",
     "TaskCleanLogs": "Log direktorioa garbitu",
-    "TaskRefreshLibraryDescription": "Zure multimedia liburutegia eskaneatzen du fitxategi berriak eta metadatuak eguneratzeko.",
-    "TaskRefreshLibrary": "Multimedia liburutegia eskaneatu",
+    "TaskRefreshLibraryDescription": "Zure multimedia liburutegia eskaneatzen du fitxategi berriak eta metadatak eguneratzeko.",
+    "TaskRefreshLibrary": "Multimedia Liburutegia eskaneatu",
     "TaskRefreshChapterImagesDescription": "Kapituluak dituzten bideoen miniaturak sortzen ditu.",
     "TaskRefreshChapterImages": "Kapituluen irudiak erauzi",
     "TaskCleanCacheDescription": "Sistemak behar ez dituen cache fitxategiak ezabatzen ditu.",
-    "TaskCleanCache": "Cache direktorioa garbitu",
-    "TaskCleanActivityLogDescription": "Konfiguratutako baino zaharragoak diren jarduera-log sarrerak ezabatzen ditu.",
+    "TaskCleanCache": "Cache Directorioa garbitu",
+    "TaskCleanActivityLogDescription": "Konfiguratuta data baino zaharragoak diren log-ak ezabatu.",
     "TaskCleanActivityLog": "Erabilera Log-a garbitu",
     "TasksChannelsCategory": "Internet Kanalak",
     "TasksApplicationCategory": "Aplikazioa",
@@ -45,22 +45,22 @@
     "TasksMaintenanceCategory": "Mantenua",
     "VersionNumber": "Bertsioa {0}",
     "ValueHasBeenAddedToLibrary": "{0} zure multimedia liburutegian gehitu da",
-    "UserStoppedPlayingItemWithValues": "{0} {1} ikusten bukatu du {2}-(e)n",
-    "UserStartedPlayingItemWithValues": "{0} {1} ikusten ari da {2}-(e)n",
-    "UserPolicyUpdatedWithName": "{0} erabiltzailearen politikak aldatu dira",
-    "UserPasswordChangedWithName": "{0} erabiltzailearen pasahitza aldatu da",
-    "UserOnlineFromDevice": "{0} online dago {1}-(e)tik",
-    "UserOfflineFromDevice": "{0} {1}-(e)tik deskonektatu da",
-    "UserLockedOutWithName": "{0} erabiltzailea blokeatu da",
-    "UserDownloadingItemWithValues": "{0} {1} deskargatzen ari da",
+    "UserStoppedPlayingItemWithValues": "{0}-ek {1} ikusteaz bukatu du {2}-(a)n",
+    "UserStartedPlayingItemWithValues": "{0} {1} ikusten ari da {2}-(a)n",
+    "UserPolicyUpdatedWithName": "{0} Erabiltzailearen politikak aldatu dira",
+    "UserPasswordChangedWithName": "{0} Erabiltzailearen pasahitza aldatu da",
+    "UserOnlineFromDevice": "{0} online dago {1}-tik",
+    "UserOfflineFromDevice": "{0} {1}-tik deskonektatu da",
+    "UserLockedOutWithName": "{0} Erabiltzailea blokeatu da",
+    "UserDownloadingItemWithValues": "{1} {0}-tik deskargatzen",
     "UserDeletedWithName": "{0} Erabiltzailea ezabatu da",
     "UserCreatedWithName": "{0} Erabiltzailea sortu da",
     "User": "Erabiltzailea",
     "Undefined": "Ezezaguna",
-    "TvShows": "TB serieak",
+    "TvShows": "TB showak",
     "System": "Sistema",
-    "SubtitleDownloadFailureFromForItem": "{1}-en azpitutuluak {0}-tik deskargatzeak huts egin du",
-    "StartupEmbyServerIsLoading": "Jellyfin zerbitzaria kargatzen. Saiatu berriro beranduago.",
+    "SubtitleDownloadFailureFromForItem": "{1}-en azpitutuluak {0} deskargatzean huts egin du",
+    "StartupEmbyServerIsLoading": "Jellyfin zerbitzaria kargatzen. Saiatu berriro beranduxeago.",
     "ServerNameNeedsToBeRestarted": "{0} berrabiarazi behar da",
     "ScheduledTaskStartedWithName": "{0} hasi da",
     "ScheduledTaskFailedWithName": "{0} huts egin du",
@@ -89,26 +89,26 @@
     "NameSeasonNumber": "{0} Denboraldia",
     "NameInstallFailed": "{0} instalazioak huts egin du",
     "Music": "Musika",
-    "MixedContent": "Eduki mistoa",
+    "MixedContent": "Denetariko edukia",
     "MessageServerConfigurationUpdated": "Zerbitzariaren konfigurazioa eguneratu da",
-    "MessageNamedServerConfigurationUpdatedWithValue": "Zerbitzariaren {0} konfigurazio atala eguneratu da",
+    "MessageNamedServerConfigurationUpdatedWithValue": "Zerbitzariaren konfigurazio {0} atala eguneratu da",
     "MessageApplicationUpdatedTo": "Jellyfin zerbitzaria {0}-ra eguneratu da",
     "MessageApplicationUpdated": "Jellyfin zerbitzaria eguneratu da",
     "Latest": "Azkena",
-    "LabelRunningTimeValue": "Iraupena: {0}",
+    "LabelRunningTimeValue": "Denbora martxan: {0}",
     "LabelIpAddressValue": "IP helbidea: {0}",
-    "ItemRemovedWithName": "{0} liburutegitik kendu da",
+    "ItemRemovedWithName": "{0} liburutegitik ezabatu da",
     "ItemAddedWithName": "{0} liburutegira gehitu da",
     "HomeVideos": "Etxeko bideoak",
-    "HeaderNextUp": "Hurrengoa",
+    "HeaderNextUp": "Nobedadeak",
     "HeaderLiveTV": "Zuzeneko TB",
     "HeaderFavoriteSongs": "Gogoko abestiak",
-    "HeaderFavoriteShows": "Gogoko serieak",
+    "HeaderFavoriteShows": "Gogoko showak",
     "HeaderFavoriteEpisodes": "Gogoko atalak",
     "HeaderFavoriteArtists": "Gogoko artistak",
     "HeaderFavoriteAlbums": "Gogoko albumak",
     "Forced": "Behartuta",
-    "FailedLoginAttemptWithUserName": "{0}-tik saioa hasteak huts egin du",
+    "FailedLoginAttemptWithUserName": "Login egiten akatsa, saiatu hemen {0}",
     "External": "Kanpokoa",
     "DeviceOnlineWithName": "{0} konektatu da",
     "DeviceOfflineWithName": "{0} deskonektatu da",
@@ -117,23 +117,13 @@
     "AuthenticationSucceededWithUserName": "{0} ongi autentifikatu da",
     "Application": "Aplikazioa",
     "AppDeviceValues": "App: {0}, Gailua: {1}",
-    "HearingImpaired": "Entzumen urritasuna",
+    "HearingImpaired": "Entzunaldia aldatua",
     "ProviderValue": "Hornitzailea: {0}",
     "TaskKeyframeExtractorDescription": "Bideo fitxategietako fotograma gakoak ateratzen ditu HLS erreprodukzio-zerrenda zehatzagoak sortzeko. Zeregin honek denbora asko iraun dezake.",
     "HeaderRecordingGroups": "Grabaketa taldeak",
     "Inherit": "Oinordetu",
     "TaskOptimizeDatabaseDescription": "Datu-basea trinkotu eta bertatik espazioa askatzen du. Liburutegia eskaneatu ondoren edo datu-basean aldaketak egin ondoren ataza hau exekutatzeak errendimendua hobetu lezake.",
     "TaskKeyframeExtractor": "Fotograma gakoen erauzgailua",
-    "TaskRefreshTrickplayImages": "Trickplay irudiak sortu",
-    "TaskRefreshTrickplayImagesDescription": "Bideoentzako trickplay aurrebistak sortzen ditu gaitutako liburutegietan.",
-    "TaskAudioNormalization": "Audio normalizazioa",
-    "TaskDownloadMissingLyrics": "Deskargatu falta diren letrak",
-    "TaskDownloadMissingLyricsDescription": "Deskargatu abestientzako letrak",
-    "TaskExtractMediaSegments": "Multimedia segmentuen eskaneoa",
-    "TaskCleanCollectionsAndPlaylistsDescription": "Jada existitzen ez diren bildumak eta erreprodukzio-zerrendak kentzen ditu.",
-    "TaskCleanCollectionsAndPlaylists": "Garbitu bildumak eta erreprodukzio-zerrendak",
-    "TaskExtractMediaSegmentsDescription": "Media segmentuak atera edo lortzen ditu MediaSegment gaituta duten pluginetik.",
-    "TaskMoveTrickplayImages": "Aldatu Trickplay irudien kokalekua",
-    "TaskMoveTrickplayImagesDescription": "Lehendik dauden trickplay fitxategiak liburutegiaren ezarpenen arabera mugitzen dira.",
-    "TaskAudioNormalizationDescription": "Audio normalizazio datuak lortzeko fitxategiak eskaneatzen ditu."
+    "TaskRefreshTrickplayImages": "\"Trickplay Irudiak Sortu",
+    "TaskRefreshTrickplayImagesDescription": "Bideoentzako trickplay aurrebistak sortzen ditu gaitutako liburutegietan."
 }

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

@@ -130,10 +130,5 @@
     "TaskCleanCollectionsAndPlaylists": "Puhdista kokoelmat ja soittolistat",
     "TaskAudioNormalization": "Äänenvoimakkuuden normalisointi",
     "TaskAudioNormalizationDescription": "Etsii tiedostoista äänenvoimakkuuden normalisointitietoja.",
-    "TaskDownloadMissingLyrics": "Lataa puuttuva lyriikka",
-    "TaskExtractMediaSegments": "Mediasegmentin skannaus",
-    "TaskDownloadMissingLyricsDescription": "Ladataan sanoituksia",
-    "TaskExtractMediaSegmentsDescription": "Poimii tai hankkii mediasegmenttejä MediaSegment-yhteensopivista laajennuksista.",
-    "TaskMoveTrickplayImages": "Siirrä Trickplay-kuvien sijainti",
-    "TaskMoveTrickplayImagesDescription": "Siirtää olemassa olevia trickplay-tiedostoja kirjaston asetusten mukaan."
+    "TaskDownloadMissingLyrics": "Lataa puuttuva lyriikka"
 }

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

@@ -135,6 +135,5 @@
     "TaskDownloadMissingLyricsDescription": "Téléchargement des paroles des chansons",
     "TaskMoveTrickplayImagesDescription": "Déplace les fichiers trickplay existants en fonction des paramètres de la bibliothèque.",
     "TaskDownloadMissingLyrics": "Télécharger les paroles des chansons manquantes",
-    "TaskMoveTrickplayImages": "Changer l'emplacement des images Trickplay",
-    "TaskExtractMediaSegmentsDescription": "Extrait ou obtient des segments de média à partir des plugins compatibles avec MediaSegment."
+    "TaskMoveTrickplayImages": "Changer l'emplacement des images Trickplay"
 }

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

@@ -1,139 +1,16 @@
 {
     "Albums": "Albaim",
-    "Artists": "Ealaíontóirí",
-    "AuthenticationSucceededWithUserName": "D'éirigh le fíordheimhniú {0}",
-    "Books": "Leabhair",
-    "CameraImageUploadedFrom": "Uaslódáladh íomhá ceamara nua ó {0}",
+    "Artists": "Ealaíontóir",
+    "AuthenticationSucceededWithUserName": "{0} fíordheimhnithe",
+    "Books": "leabhair",
+    "CameraImageUploadedFrom": "Tá íomhá ceamara nua uaslódáilte ó {0}",
     "Channels": "Cainéil",
     "ChapterNameValue": "Caibidil {0}",
     "Collections": "Bailiúcháin",
-    "Default": "Réamhshocrú",
-    "DeviceOfflineWithName": "Tá {0} dícheangailte",
-    "DeviceOnlineWithName": "Tá {0} nasctha",
-    "External": "Seachtrach",
-    "FailedLoginAttemptWithUserName": "Theip ar iarracht logáil isteach ó {0}",
-    "Favorites": "Ceanáin",
-    "TaskExtractMediaSegments": "Scanadh Deighleog na Meán",
-    "TaskMoveTrickplayImages": "Imirce Suíomh Íomhá Trickplay",
-    "TaskDownloadMissingLyrics": "Íosluchtaigh liricí ar iarraidh",
-    "TaskKeyframeExtractor": "Keyframe Eastarraingteoir",
-    "TaskAudioNormalization": "Normalú Fuaime",
-    "TaskAudioNormalizationDescription": "Scanann comhaid le haghaidh sonraí normalaithe fuaime.",
-    "TaskRefreshLibraryDescription": "Déanann sé do leabharlann meán a scanadh le haghaidh comhaid nua agus athnuachana meiteashonraí.",
-    "TaskCleanLogs": "Eolaire Logchomhad Glan",
-    "TaskCleanLogsDescription": "Scriostar comhaid loga atá níos mó ná {0} lá d'aois.",
-    "TaskRefreshPeopleDescription": "Nuashonraítear meiteashonraí d’aisteoirí agus stiúrthóirí i do leabharlann meán.",
-    "TaskRefreshTrickplayImages": "Gin Íomhánna Trickplay",
-    "TaskRefreshTrickplayImagesDescription": "Cruthaíonn sé réamhamhairc trickplay le haghaidh físeáin i leabharlanna cumasaithe.",
-    "TaskRefreshChannels": "Cainéil Athnuaigh",
-    "TaskRefreshChannelsDescription": "Athnuachan eolas faoi chainéil idirlín.",
-    "TaskOptimizeDatabase": "Bunachar sonraí a bharrfheabhsú",
-    "TaskKeyframeExtractorDescription": "Baintear eochairfhrámaí as comhaid físe chun seinmliostaí HLS níos cruinne a chruthú. Féadfaidh an tasc seo a bheith ar siúl ar feadh i bhfad.",
-    "TaskCleanCollectionsAndPlaylistsDescription": "Baintear míreanna as bailiúcháin agus seinmliostaí nach ann dóibh a thuilleadh.",
-    "TaskDownloadMissingLyricsDescription": "Íosluchtaigh liricí do na hamhráin",
-    "TaskUpdatePluginsDescription": "Íoslódálann agus suiteálann nuashonruithe do bhreiseáin atá cumraithe le nuashonrú go huathoibríoch.",
-    "TaskDownloadMissingSubtitlesDescription": "Déanann sé cuardach ar an idirlíon le haghaidh fotheidil atá ar iarraidh bunaithe ar chumraíocht meiteashonraí.",
-    "TaskExtractMediaSegmentsDescription": "Sliocht nó faigheann codanna meán ó bhreiseáin chumasaithe MediaSegment.",
-    "TaskCleanCollectionsAndPlaylists": "Glan suas bailiúcháin agus seinmliostaí",
-    "TaskOptimizeDatabaseDescription": "Comhdhlúthaíonn bunachar sonraí agus gearrtar spás saor in aisce. Má ritheann tú an tasc seo tar éis scanadh a dhéanamh ar an leabharlann nó athruithe eile a dhéanamh a thugann le tuiscint gur cheart go bhfeabhsófaí an fheidhmíocht.",
-    "TaskMoveTrickplayImagesDescription": "Bogtar comhaid trickplay atá ann cheana de réir socruithe na leabharlainne.",
-    "AppDeviceValues": "Aip: {0}, Gléas: {1}",
-    "Application": "Feidhmchlár",
-    "Folders": "Fillteáin",
-    "Forced": "Éigean",
-    "Genres": "Seánraí",
-    "HeaderAlbumArtists": "Ealaíontóirí albam",
-    "HeaderContinueWatching": "Leanúint ar aghaidh ag Breathnú",
-    "HeaderFavoriteAlbums": "Albam is fearr leat",
-    "HeaderFavoriteArtists": "Ealaíontóirí is Fearr",
-    "HeaderFavoriteEpisodes": "Eipeasóid is fearr leat",
-    "HeaderFavoriteShows": "Seónna is Fearr",
-    "HeaderFavoriteSongs": "Amhráin is fearr leat",
-    "HeaderLiveTV": "Teilifís beo",
-    "HeaderNextUp": "Ar Aghaidh Suas",
-    "HeaderRecordingGroups": "Grúpaí Taifeadta",
-    "HearingImpaired": "Lag éisteachta",
-    "HomeVideos": "Físeáin Baile",
-    "Inherit": "Oidhreacht",
-    "ItemAddedWithName": "Cuireadh {0} leis an leabharlann",
-    "ItemRemovedWithName": "Baineadh {0} den leabharlann",
-    "LabelIpAddressValue": "Seoladh IP: {0}",
-    "LabelRunningTimeValue": "Am rite: {0}",
-    "Latest": "Is déanaí",
-    "MessageApplicationUpdated": "Tá Freastalaí Jellyfin nuashonraithe",
-    "MessageApplicationUpdatedTo": "Nuashonraíodh Freastalaí Jellyfin go {0}",
-    "MessageNamedServerConfigurationUpdatedWithValue": "Nuashonraíodh an chuid cumraíochta freastalaí {0}",
-    "MessageServerConfigurationUpdated": "Nuashonraíodh cumraíocht an fhreastalaí",
-    "MixedContent": "Ábhar measctha",
-    "Movies": "Scannáin",
-    "Music": "Ceol",
-    "MusicVideos": "Físeáin Ceoil",
-    "NameInstallFailed": "Theip ar shuiteáil {0}",
-    "NameSeasonNumber": "Séasúr {0}",
-    "NameSeasonUnknown": "Séasúr Anaithnid",
-    "NewVersionIsAvailable": "Tá leagan nua de Jellyfin Server ar fáil le híoslódáil.",
-    "NotificationOptionApplicationUpdateAvailable": "Nuashonrú feidhmchláir ar fáil",
-    "NotificationOptionApplicationUpdateInstalled": "Nuashonrú feidhmchláir suiteáilte",
-    "NotificationOptionAudioPlayback": "Cuireadh tús le hathsheinm fuaime",
-    "NotificationOptionAudioPlaybackStopped": "Cuireadh deireadh le hathsheinm fuaime",
-    "NotificationOptionCameraImageUploaded": "Íosluchtaigh grianghraf ceamara",
-    "NotificationOptionInstallationFailed": "Teip suiteála",
-    "NotificationOptionNewLibraryContent": "Ábhar nua curtha leis",
-    "NotificationOptionPluginError": "Teip breiseán",
-    "NotificationOptionPluginInstalled": "Breiseán suiteáilte",
-    "NotificationOptionPluginUninstalled": "Breiseán díshuiteáilte",
-    "NotificationOptionPluginUpdateInstalled": "Nuashonrú breiseán suiteáilte",
-    "NotificationOptionServerRestartRequired": "Teastaíonn atosú an fhreastalaí",
-    "NotificationOptionTaskFailed": "Teip tasc sceidealta",
-    "NotificationOptionUserLockedOut": "Úsáideoir glasáilte amach",
-    "NotificationOptionVideoPlayback": "Cuireadh tús le hathsheinm físe",
-    "NotificationOptionVideoPlaybackStopped": "Cuireadh deireadh le hathsheinm físe",
-    "Photos": "Grianghraif",
-    "Playlists": "Seinmliostaí",
-    "Plugin": "Breiseán",
-    "PluginInstalledWithName": "Suiteáladh {0}",
-    "PluginUninstalledWithName": "Díshuiteáladh {0}",
-    "PluginUpdatedWithName": "Nuashonraíodh {0}",
-    "ProviderValue": "Soláthraí: {0}",
-    "ScheduledTaskFailedWithName": "Theip ar {0}",
-    "ScheduledTaskStartedWithName": "Thosaigh {0}",
-    "ServerNameNeedsToBeRestarted": "Ní mór {0} a atosú",
-    "Shows": "Seónna",
-    "Songs": "Amhráin",
-    "StartupEmbyServerIsLoading": "Tá freastalaí Jellyfin á luchtú. Bain triail eile as gan mhoill.",
-    "SubtitleDownloadFailureFromForItem": "Theip ar fhotheidil a íoslódáil ó {0} le haghaidh {1}",
-    "Sync": "Sioncrónaigh",
-    "System": "Córas",
-    "TvShows": "Seónna Teilifíse",
-    "Undefined": "Neamhshainithe",
-    "User": "Úsáideoir",
-    "UserCreatedWithName": "Cruthaíodh úsáideoir {0}",
-    "UserDeletedWithName": "Scriosadh úsáideoir {0}",
-    "UserDownloadingItemWithValues": "Tá {0} á íoslódáil {1}",
-    "UserLockedOutWithName": "Tá úsáideoir {0} glasáilte amach",
-    "UserOfflineFromDevice": "Tá {0} dícheangailte ó {1}",
-    "UserOnlineFromDevice": "Tá {0} ar líne ó {1}",
-    "UserPasswordChangedWithName": "Athraíodh pasfhocal don úsáideoir {0}",
-    "UserPolicyUpdatedWithName": "Nuashonraíodh polasaí úsáideora le haghaidh {0}",
-    "UserStartedPlayingItemWithValues": "Tá {0} ag seinnt {1} ar {2}",
-    "UserStoppedPlayingItemWithValues": "Chríochnaigh {0} ag imirt {1} ar {2}",
-    "ValueHasBeenAddedToLibrary": "Cuireadh {0} le do leabharlann meán",
-    "ValueSpecialEpisodeName": "Speisialta - {0}",
-    "VersionNumber": "Leagan {0}",
-    "TasksMaintenanceCategory": "Cothabháil",
-    "TasksLibraryCategory": "Leabharlann",
-    "TasksApplicationCategory": "Feidhmchlár",
-    "TasksChannelsCategory": "Cainéil Idirlín",
-    "TaskCleanActivityLog": "Loga Gníomhaíochta Glan",
-    "TaskCleanActivityLogDescription": "Scrios iontrálacha loga gníomhaíochta atá níos sine ná an aois chumraithe.",
-    "TaskCleanCache": "Eolaire Taisce Glan",
-    "TaskCleanCacheDescription": "Scriostar comhaid taisce nach bhfuil ag teastáil ón gcóras a thuilleadh.",
-    "TaskRefreshChapterImages": "Sliocht Íomhánna Caibidil",
-    "TaskRefreshChapterImagesDescription": "Cruthaíonn mionsamhlacha le haghaidh físeáin a bhfuil caibidlí acu.",
-    "TaskRefreshLibrary": "Scan Leabharlann na Meán",
-    "TaskRefreshPeople": "Daoine Athnuaigh",
-    "TaskUpdatePlugins": "Nuashonraigh Breiseáin",
-    "TaskCleanTranscodeDescription": "Scriostar comhaid traschódaithe níos mó ná lá amháin d'aois.",
-    "TaskCleanTranscode": "Eolaire Transcode Glan",
-    "TaskDownloadMissingSubtitles": "Íosluchtaigh fotheidil ar iarraidh"
+    "Default": "Mainneachtain",
+    "DeviceOfflineWithName": "scoireadh {0}",
+    "DeviceOnlineWithName": "{0} ceangailte",
+    "External": "Forimeallach",
+    "FailedLoginAttemptWithUserName": "Iarracht ar theip ar fhíordheimhniú ó {0}",
+    "Favorites": "Ceanáin"
 }

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

@@ -16,7 +16,7 @@
     "Folders": "תיקיות",
     "Genres": "ז׳אנרים",
     "HeaderAlbumArtists": "אמני האלבום",
-    "HeaderContinueWatching": "המשך צפייה",
+    "HeaderContinueWatching": "להמשיך לצפות",
     "HeaderFavoriteAlbums": "אלבומים מועדפים",
     "HeaderFavoriteArtists": "אמנים מועדפים",
     "HeaderFavoriteEpisodes": "פרקים מועדפים",
@@ -32,8 +32,8 @@
     "LabelIpAddressValue": "Ip כתובת: {0}",
     "LabelRunningTimeValue": "משך צפייה: {0}",
     "Latest": "אחרון",
-    "MessageApplicationUpdated": "שרת ג'ליפין עודכן",
-    "MessageApplicationUpdatedTo": "שרת ג'ליפין עודכן לגרסה {0}",
+    "MessageApplicationUpdated": "שרת הJellyfin עודכן",
+    "MessageApplicationUpdatedTo": "שרת ה־Jellyfin עודכן לגרסה {0}",
     "MessageNamedServerConfigurationUpdatedWithValue": "סעיף הגדרת השרת {0} עודכן",
     "MessageServerConfigurationUpdated": "תצורת השרת עודכנה",
     "MixedContent": "תוכן מעורב",
@@ -43,7 +43,7 @@
     "NameInstallFailed": "התקנת {0} נכשלה",
     "NameSeasonNumber": "עונה {0}",
     "NameSeasonUnknown": "עונה לא ידועה",
-    "NewVersionIsAvailable": "גרסה חדשה של שרת ג'ליפין זמינה להורדה.",
+    "NewVersionIsAvailable": "גרסה חדשה של שרת Jellyfin זמינה להורדה.",
     "NotificationOptionApplicationUpdateAvailable": "קיים עדכון זמין ליישום",
     "NotificationOptionApplicationUpdateInstalled": "עדכון ליישום הותקן",
     "NotificationOptionAudioPlayback": "ניגון שמע החל",
@@ -72,7 +72,7 @@
     "ServerNameNeedsToBeRestarted": "{0} דורש הפעלה מחדש",
     "Shows": "סדרות",
     "Songs": "שירים",
-    "StartupEmbyServerIsLoading": "שרת ג'ליפין טוען. נא לנסות שוב בקרוב.",
+    "StartupEmbyServerIsLoading": "שרת Jellyfin בהליכי טעינה. נא לנסות שנית בהקדם.",
     "SubtitleDownloadFailureForItem": "Subtitles failed to download for {0}",
     "SubtitleDownloadFailureFromForItem": "הורדת כתוביות מ־{0} עבור {1} נכשלה",
     "Sync": "סנכרון",
@@ -133,8 +133,8 @@
     "TaskCleanCollectionsAndPlaylists": "מנקה אוספים ורשימות השמעה",
     "TaskDownloadMissingLyrics": "הורדת מילים חסרות",
     "TaskDownloadMissingLyricsDescription": "הורדת מילים לשירים",
-    "TaskMoveTrickplayImages": "העברת מיקום התמונות",
+    "TaskMoveTrickplayImages": "מעביר את מיקום תמונות Trickplay",
     "TaskExtractMediaSegments": "סריקת מדיה",
     "TaskExtractMediaSegmentsDescription": "מחלץ חלקי מדיה מתוספים המאפשרים זאת.",
-    "TaskMoveTrickplayImagesDescription": "הזזת קבצי טריקפליי קיימים בהתאם להגדרות הספרייה."
+    "TaskMoveTrickplayImagesDescription": "מזיז קבצי trickplay קיימים בהתאם להגדרות הספרייה."
 }

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

@@ -99,7 +99,7 @@
     "ValueHasBeenAddedToLibrary": "{0} आपके माध्यम ग्रन्थालय में उपजात हो गया हैं",
     "TasksLibraryCategory": "संग्रहालय",
     "TaskOptimizeDatabase": "जानकारी प्रवृद्धि",
-    "TaskDownloadMissingSubtitles": "लापता अनुलेख डाउनलोड करें",
+    "TaskDownloadMissingSubtitles": "असमेत अनुलेख को अवाहरति करें",
     "TaskRefreshLibrary": "माध्यम संग्राहत को छाने",
     "TaskCleanActivityLog": "क्रियाकलाप लॉग साफ करें",
     "TasksChannelsCategory": "इंटरनेट प्रणाली",
@@ -127,7 +127,5 @@
     "TaskRefreshTrickplayImages": "ट्रिकप्लै चित्रों को सृजन करे",
     "TaskRefreshTrickplayImagesDescription": "नियत संग्रहों में चलचित्रों का ट्रीकप्लै दर्शनों को सृजन करे.",
     "TaskAudioNormalization": "श्रव्य सामान्यीकरण",
-    "TaskAudioNormalizationDescription": "श्रव्य सामान्यीकरण के लिए फाइलें अन्वेषण करें",
-    "TaskDownloadMissingLyrics": "लापता गानों के बोल डाउनलोड करेँ",
-    "TaskDownloadMissingLyricsDescription": "गानों के बोल डाउनलोड करता है"
+    "TaskAudioNormalizationDescription": "श्रव्य सामान्यीकरण के लिए फाइलें अन्वेषण करें"
 }

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

@@ -1,3 +0,0 @@
-{
-    "Books": "liv"
-}

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

@@ -13,7 +13,7 @@
     "DeviceOnlineWithName": "{0} belépett",
     "FailedLoginAttemptWithUserName": "Sikertelen bejelentkezési kísérlet innen: {0}",
     "Favorites": "Kedvencek",
-    "Folders": "Mappák",
+    "Folders": "Könyvtárak",
     "Genres": "Műfajok",
     "HeaderAlbumArtists": "Albumelőadók",
     "HeaderContinueWatching": "Megtekintés folytatása",

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

@@ -58,8 +58,8 @@
     "NotificationOptionServerRestartRequired": "Riavvio del server necessario",
     "NotificationOptionTaskFailed": "Operazione pianificata fallita",
     "NotificationOptionUserLockedOut": "Utente bloccato",
-    "NotificationOptionVideoPlayback": "Riproduzione video iniziata",
-    "NotificationOptionVideoPlaybackStopped": "Riproduzione video interrotta",
+    "NotificationOptionVideoPlayback": "La riproduzione video è iniziata",
+    "NotificationOptionVideoPlaybackStopped": "La riproduzione video è stata interrotta",
     "Photos": "Foto",
     "Playlists": "Playlist",
     "Plugin": "Plugin",
@@ -134,7 +134,5 @@
     "TaskDownloadMissingLyricsDescription": "Scarica testi per le canzoni",
     "TaskDownloadMissingLyrics": "Scarica testi mancanti",
     "TaskMoveTrickplayImages": "Sposta le immagini Trickplay",
-    "TaskMoveTrickplayImagesDescription": "Sposta le immagini Trickplay esistenti secondo la configurazione della libreria.",
-    "TaskExtractMediaSegmentsDescription": "Estrae o ottiene segmenti multimediali dai plugin abilitati MediaSegment.",
-    "TaskExtractMediaSegments": "Scansiona Segmento Media"
+    "TaskMoveTrickplayImagesDescription": "Sposta le immagini Trickplay esistenti secondo la configurazione della libreria."
 }

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

@@ -134,6 +134,5 @@
     "TaskExtractMediaSegments": "メディアセグメントを読み取る",
     "TaskMoveTrickplayImages": "Trickplayの画像を移動",
     "TaskMoveTrickplayImagesDescription": "ライブラリ設定によりTrickplayのファイルを移動。",
-    "TaskDownloadMissingLyrics": "失われた歌詞をダウンロード",
-    "TaskExtractMediaSegmentsDescription": "MediaSegment 対応プラグインからメディア セグメントを抽出または取得します。"
+    "TaskDownloadMissingLyrics": "記録されていない歌詞をダウンロード"
 }

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

@@ -3,7 +3,7 @@
     "AppDeviceValues": "앱: {0}, 장치: {1}",
     "Application": "애플리케이션",
     "Artists": "아티스트",
-    "AuthenticationSucceededWithUserName": "{0} 사용자가 성공적으로 인증됨",
+    "AuthenticationSucceededWithUserName": "{0}이(가) 성공적으로 인증됨",
     "Books": "도서",
     "CameraImageUploadedFrom": "{0}에서 새로운 카메라 이미지가 업로드됨",
     "Channels": "채널",
@@ -70,7 +70,7 @@
     "ScheduledTaskFailedWithName": "{0} 실패",
     "ScheduledTaskStartedWithName": "{0} 시작",
     "ServerNameNeedsToBeRestarted": "{0}를 재시작해야합니다",
-    "Shows": "시리즈",
+    "Shows": "쇼",
     "Songs": "노래",
     "StartupEmbyServerIsLoading": "Jellyfin 서버를 불러오고 있습니다. 잠시 후에 다시 시도하십시오.",
     "SubtitleDownloadFailureForItem": "Subtitles failed to download for {0}",
@@ -81,14 +81,14 @@
     "User": "사용자",
     "UserCreatedWithName": "사용자 {0} 생성됨",
     "UserDeletedWithName": "사용자 {0} 삭제됨",
-    "UserDownloadingItemWithValues": "{0} 사용자가 {1} 다운로드 중",
-    "UserLockedOutWithName": "{0} 사용자 잠김",
-    "UserOfflineFromDevice": "{0} 사용자의 {1}에서 연결이 끊김",
-    "UserOnlineFromDevice": "{0} 사용자가 {1}에서 접속함",
-    "UserPasswordChangedWithName": "{0} 사용자 비밀번호 변경됨",
-    "UserPolicyUpdatedWithName": "{0} 사용자 정책 업데이트됨",
-    "UserStartedPlayingItemWithValues": "{0} 사용자의 {2}에서 {1} 재생 중",
-    "UserStoppedPlayingItemWithValues": "{0} 사용자의 {2}에서 {1} 재생을 마침",
+    "UserDownloadingItemWithValues": "{0}이(가) {1}을 다운로드 중입니다",
+    "UserLockedOutWithName": "유저 {0} 은(는) 잠금처리 되었습니다",
+    "UserOfflineFromDevice": "{1}에서 {0}의 연결이 끊킴",
+    "UserOnlineFromDevice": "{0}이 {1}으로 접속",
+    "UserPasswordChangedWithName": "사용자 {0}의 비밀번호가 변경되었습니다",
+    "UserPolicyUpdatedWithName": "{0}의 사용자 정책이 업데이트되었습니다",
+    "UserStartedPlayingItemWithValues": "{2}에서 {0}이 {1} 재생 중",
+    "UserStoppedPlayingItemWithValues": "{2}에서 {0}이 {1} 재생을 마침",
     "ValueHasBeenAddedToLibrary": "{0}가 미디어 라이브러리에 추가되었습니다",
     "ValueSpecialEpisodeName": "스페셜 - {0}",
     "VersionNumber": "버전 {0}",
@@ -130,11 +130,5 @@
     "TaskAudioNormalizationDescription": "오디오의 볼륨 수준을 일정하게 조정하기 위해 파일을 스캔합니다.",
     "TaskRefreshTrickplayImages": "비디오 탐색용 미리보기 썸네일 생성",
     "TaskRefreshTrickplayImagesDescription": "활성화된 라이브러리에서 비디오의 트릭플레이 미리보기를 생성합니다.",
-    "TaskCleanCollectionsAndPlaylistsDescription": "더 이상 존재하지 않는 컬렉션 및 재생 목록에서 항목을 제거합니다.",
-    "TaskExtractMediaSegments": "미디어 세그먼트 스캔",
-    "TaskExtractMediaSegmentsDescription": "MediaSegment를 지원하는 플러그인에서 미디어 세그먼트를 추출하거나 가져옵니다.",
-    "TaskMoveTrickplayImages": "트릭플레이 이미지 위치 마이그레이션",
-    "TaskMoveTrickplayImagesDescription": "추출된 트릭플레이 이미지를 라이브러리 설정에 따라 이동합니다.",
-    "TaskDownloadMissingLyrics": "누락된 가사 다운로드",
-    "TaskDownloadMissingLyricsDescription": "가사 다운로드"
+    "TaskCleanCollectionsAndPlaylistsDescription": "더 이상 존재하지 않는 컬렉션 및 재생 목록에서 항목을 제거합니다."
 }

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

@@ -1,139 +0,0 @@
-{
-    "Albums": "Alben",
-    "Application": "Applikatioun",
-    "Artists": "Kënschtler",
-    "Books": "Bicher",
-    "Channels": "Kanäl",
-    "Collections": "Kollektiounen",
-    "Default": "Standard",
-    "ChapterNameValue": "Kapitel {0}",
-    "DeviceOnlineWithName": "{0} ass Online",
-    "DeviceOfflineWithName": "{0} ass Offline",
-    "External": "Extern",
-    "Favorites": "Favoritten",
-    "Folders": "Dossieren",
-    "Forced": "Forcéiert",
-    "HeaderAlbumArtists": "Album Kënschtler",
-    "HeaderFavoriteAlbums": "Léifsten Alben",
-    "HeaderFavoriteArtists": "Léifsten Kënschtler",
-    "HeaderFavoriteEpisodes": "Léifsten Episoden",
-    "HeaderFavoriteShows": "Léifsten Shows",
-    "HeaderFavoriteSongs": "Léifsten Lidder",
-    "Genres": "Generen",
-    "HeaderContinueWatching": "Weider kucken",
-    "Inherit": "Iwwerhuelen",
-    "HeaderNextUp": "Als Nächst",
-    "HeaderRecordingGroups": "Opname Gruppen",
-    "HearingImpaired": "Daaf",
-    "HomeVideos": "Amateur Videoen",
-    "ItemRemovedWithName": "Element ewech geholl: {0}",
-    "LabelIpAddressValue": "IP Adress: {0}",
-    "LabelRunningTimeValue": "Lafzäit: {0}",
-    "Latest": "Dat Aktuellst",
-    "MessageApplicationUpdatedTo": "Jellyfin Server aktualiséiert op {0}",
-    "MessageNamedServerConfigurationUpdatedWithValue": "Server Konfiguratiounssektioun {0} aktualiséiert",
-    "MessageServerConfigurationUpdated": "Server Konfiguratioun aktualiséiert",
-    "Movies": "Filmer",
-    "Music": "Musek",
-    "NameInstallFailed": "{0} Installatioun net gelongen",
-    "NameSeasonNumber": "Staffel {0}",
-    "NameSeasonUnknown": "Staffel Onbekannt",
-    "MusicVideos": "Museksvideoen",
-    "NotificationOptionApplicationUpdateAvailable": "Applikatiouns Update verfügbar",
-    "NotificationOptionApplicationUpdateInstalled": "Applikatiouns Update nët Installéiert",
-    "NotificationOptionAudioPlayback": "Audio ofspillen gestart",
-    "NotificationOptionAudioPlaybackStopped": "Audio ofspillen gestoppt",
-    "NotificationOptionCameraImageUploaded": "Kamera Bild eropgelueden",
-    "NotificationOptionInstallationFailed": "Installatioun net gelongen",
-    "NotificationOptionNewLibraryContent": "Neien Bibliothéik Inhalt",
-    "NotificationOptionPluginError": "Plugin Feeler",
-    "NotificationOptionPluginInstalled": "Plugin installéiert",
-    "NotificationOptionPluginUninstalled": "Plugin desinstalléiert",
-    "NotificationOptionPluginUpdateInstalled": "Plugin Update installéiert",
-    "Photos": "Fotoen",
-    "NotificationOptionTaskFailed": "Aufgab net gelongen",
-    "NotificationOptionUserLockedOut": "Benotzer Gesperrt",
-    "NotificationOptionVideoPlaybackStopped": "Video ofspillen gestoppt",
-    "NotificationOptionVideoPlayback": "Video ofspillen gestartet",
-    "Plugin": "Plugin",
-    "PluginUninstalledWithName": "{0} desinstalléiert",
-    "PluginUpdatedWithName": "{0} aktualiséiert",
-    "ProviderValue": "Provider: {0}",
-    "ScheduledTaskFailedWithName": "Aufgab: {0} net gelongen",
-    "Playlists": "Playlëschten",
-    "Shows": "Shows",
-    "Songs": "Lidder",
-    "ServerNameNeedsToBeRestarted": "{0} muss nei gestart ginn",
-    "StartupEmbyServerIsLoading": "Jellyfin Server luedt. Probéier méi spéit nach eng Kéier.",
-    "Sync": "Synchroniséieren",
-    "System": "System",
-    "User": "Benotzer",
-    "TvShows": "TV Shows",
-    "Undefined": "Net definéiert",
-    "UserCreatedWithName": "Benotzer {0} erstellt",
-    "UserDownloadingItemWithValues": "{0} luet {1} erof",
-    "UserOfflineFromDevice": "{0} Benotzer Offline um Gerät {1}",
-    "UserLockedOutWithName": "Benotzer {0} gesperrt",
-    "UserOnlineFromDevice": "{0} Benotzer Online um Gerät {1}",
-    "UserPasswordChangedWithName": "Benotzer Passwuert geännert fir {0}",
-    "UserPolicyUpdatedWithName": "Benotzer Politik aktualiséiert fir: {0}",
-    "UserStartedPlayingItemWithValues": "{0} spillt {1} op {2} oof",
-    "ValueHasBeenAddedToLibrary": "{0} der Bibliothéik bäigefüügt",
-    "VersionNumber": "Versioun {0}",
-    "TasksMaintenanceCategory": "Ënnerhalt",
-    "TasksLibraryCategory": "Bibliothéik",
-    "ValueSpecialEpisodeName": "Spezial-Episodenumm",
-    "TasksChannelsCategory": "Internet Kanäl",
-    "TaskCleanActivityLog": "Aktivitéits Log botzen",
-    "TaskCleanActivityLogDescription": "Läscht Aktivitéitslogs méi al wéi konfiguréiert.",
-    "TaskCleanCache": "Aufgab Cache Botzen",
-    "TaskRefreshChapterImages": "Kapitel Biller erstellen",
-    "TaskRefreshChapterImagesDescription": "Erstellt Miniaturbiller fir Videoen, déi Kapitelen hunn.",
-    "TaskAudioNormalization": "Audio Normaliséierung",
-    "TaskRefreshLibrary": "Bibliothéik aktualiséieren",
-    "TaskRefreshLibraryDescription": "Scannt deng Mediebibliothéik no neien Dateien a frëscht d’Metadata op.",
-    "TaskCleanLogs": "Log Dateien botzen",
-    "TaskRefreshPeople": "Persounen aktualiséieren",
-    "TaskRefreshPeopleDescription": "Aktualiséiert Metadata fir Schauspiller a Regisseuren an denger Mediebibliothéik.",
-    "TaskRefreshTrickplayImagesDescription": "Erstellt Trickplay-Viraussiichten fir Videoen an aktivéierte Bibliothéiken.",
-    "TaskCleanTranscode": "Transkodéieren botzen",
-    "TaskCleanTranscodeDescription": "Läscht Transkodéierungsdateien, déi méi al wéi een Dag sinn.",
-    "TaskRefreshChannels": "Kanäl aktualiséieren",
-    "TaskDownloadMissingLyrics": "Fehlend Liddertexter eroflueden",
-    "TaskDownloadMissingLyricsDescription": "Lued Liddertexter fir Lidder erof",
-    "TaskDownloadMissingSubtitles": "Fehlend Ënnertitelen eroflueden",
-    "TaskOptimizeDatabase": "Datebank optiméieren",
-    "TaskKeyframeExtractor": "Schlësselbild Extrakter",
-    "TaskCleanCollectionsAndPlaylists": "Sammlungen a Playlisten botzen",
-    "TaskCleanCollectionsAndPlaylistsDescription": "Ewechhuele vun Elementer aus Sammlungen a Playlisten, déi net méi existéieren.",
-    "TaskExtractMediaSegments": "Mediesegment-Scan",
-    "NewVersionIsAvailable": "Nei Versioun fir Jellyfin Server ass verfügbar.",
-    "CameraImageUploadedFrom": "En neit Kamera Bild gouf vu {0} eropgelueden",
-    "PluginInstalledWithName": "{0} installéiert",
-    "TaskMoveTrickplayImagesDescription": "Verschëfft existent Trickplay-Dateien no de Bibliothéik-Astellungen.",
-    "AppDeviceValues": "App: {0}, Geräter: {1}",
-    "FailedLoginAttemptWithUserName": "Net Gelongen Umeldung {0}",
-    "HeaderLiveTV": "LiveTV",
-    "ItemAddedWithName": "Element derbäi gesat: {0}",
-    "NotificationOptionServerRestartRequired": "Server Restart Erfuerderlech",
-    "ScheduledTaskStartedWithName": "Aufgab: {0} gestart",
-    "AuthenticationSucceededWithUserName": "{0} Authentifikatioun gelongen",
-    "MixedContent": "Gemëschten Inhalt",
-    "MessageApplicationUpdated": "Jellyfin Server Aktualiséiert",
-    "SubtitleDownloadFailureFromForItem": "Ënnertitel Download Feeler vun {0} fir {1}",
-    "TaskCleanLogsDescription": "Läscht Log-Dateien, déi méi al wéi {0} Deeg sinn.",
-    "TaskUpdatePlugins": "Plugins aktualiséieren",
-    "UserDeletedWithName": "Benotzer {0} geläscht",
-    "TasksApplicationCategory": "Applikatioun",
-    "TaskCleanCacheDescription": "Läscht Cache-Dateien, déi net méi vum System gebraucht ginn.",
-    "UserStoppedPlayingItemWithValues": "{0} ass mat {1} op {2} fäerdeg",
-    "TaskAudioNormalizationDescription": "Scannt Dateien no Donnéeën fir d’Audio-Normaliséierung.",
-    "TaskRefreshTrickplayImages": "Trickplay-Biller generéieren",
-    "TaskDownloadMissingSubtitlesDescription": "Sicht am Internet no fehlenden Ënnertitelen op Basis vun der Metadata-Konfiguratioun.",
-    "TaskMoveTrickplayImages": "Trickplay-Biller-Plaz migréieren",
-    "TaskUpdatePluginsDescription": "Lued Aktualiséierungen erof a installéiert se fir Plugins, déi fir automatesch Updates konfiguréiert sinn.",
-    "TaskKeyframeExtractorDescription": "Extrahéiert Schlësselbiller aus Videodateien, fir méi präzis HLS-Playlisten ze erstellen. Dës Aufgab kann eng längere Zäit daueren.",
-    "TaskRefreshChannelsDescription": "Aktualiséiert Informatiounen iwwer Internetkanäl.",
-    "TaskExtractMediaSegmentsDescription": "Extrahéiert oder kritt Mediesegmenter aus Plugins, déi MediaSegment ënnerstëtzen.",
-    "TaskOptimizeDatabaseDescription": "Kompriméiert d’Datebank a schneit de fräie Speicherplatz zou. Dës Aufgab no engem Bibliothéik-Scan oder anere Ännerungen, déi Datebankmodifikatioune mat sech bréngen, auszeféieren, kann d’Performance verbesseren."
-}

Emby.Server.Implementations/Localization/Core/lt-LT.json

@@ -94,14 +94,14 @@
     "VersionNumber": "Version {0}",
     "TaskUpdatePluginsDescription": "Atsisiųsti ir įdiegti atnaujinimus priedams kuriem yra nustatytas automatiškas atnaujinimas.",
     "TaskUpdatePlugins": "Atnaujinti Priedus",
-    "TaskDownloadMissingSubtitlesDescription": "Ieško trūkstamų subtitrų internete remiantis metaduomenų konfigūracija.",
+    "TaskDownloadMissingSubtitlesDescription": "Ieško internete trūkstamų subtitrų remiantis metaduomenų konfigūracija.",
     "TaskCleanTranscodeDescription": "Ištrina dienos senumo perkodavimo failus.",
     "TaskCleanTranscode": "Išvalyti Perkodavimo Direktorija",
     "TaskRefreshLibraryDescription": "Ieškoti naujų failų jūsų mediatekoje ir atnaujina metaduomenis.",
     "TaskRefreshLibrary": "Skenuoti Mediateka",
     "TaskDownloadMissingSubtitles": "Atsisiųsti trūkstamus subtitrus",
-    "TaskRefreshChannelsDescription": "Atnaujina internetinių kanalų informaciją.",
-    "TaskRefreshChannels": "Atnaujinti kanalus",
+    "TaskRefreshChannelsDescription": "Atnaujina internetinių kanalų informacija.",
+    "TaskRefreshChannels": "Atnaujinti Kanalus",
     "TaskRefreshPeopleDescription": "Atnaujina metaduomenis apie aktorius ir režisierius jūsų mediatekoje.",
     "TaskRefreshPeople": "Atnaujinti Žmones",
     "TaskCleanLogsDescription": "Ištrina žurnalo failus kurie yra senesni nei {0} dienos.",
@@ -119,22 +119,22 @@
     "Forced": "Priverstas",
     "Default": "Numatytas",
     "TaskCleanActivityLogDescription": "Ištrina veiklos žuranlo įrašus, kurie yra senesni nei nustatytas amžius.",
-    "TaskOptimizeDatabase": "Optimizuoti duomenų bazę",
+    "TaskOptimizeDatabase": "Optimizuoti duomenų bazės",
     "TaskKeyframeExtractorDescription": "Iš vaizdo įrašo paruošia reikšminius kadrus, kad būtų sukuriamas tikslenis HLS grojaraštis. Šios užduoties vykdymas gali ilgai užtrukti.",
-    "TaskKeyframeExtractor": "Pagrindinių kadrų išgavėjas",
-    "TaskOptimizeDatabaseDescription": "Suspaudžia duomenų bazę ir atlaisvina vietą. Paleidžiant šią užduotį, po bibliotekos skenavimo arba kitų veiksmų kurie galimai modifikuoja duomenų bazę, gali pagerinti greitaveiką.",
+    "TaskKeyframeExtractor": "Pagrindinių kadrų ištraukėjas",
+    "TaskOptimizeDatabaseDescription": "Suspaudžia duomenų bazę ir atlaisvina vietą. Paleidžiant šią užduotį, po bibliotekos skenavimo arba kitų veiksmų kurie galimai modifikuoja duomenų bazė, gali pagerinti greitaveiką.",
     "External": "Išorinis",
     "HearingImpaired": "Su klausos sutrikimais",
     "TaskRefreshTrickplayImages": "Generuoti Trickplay atvaizdus",
     "TaskRefreshTrickplayImagesDescription": "Sukuria trickplay peržiūras vaizdo įrašams įgalintose bibliotekose.",
-    "TaskCleanCollectionsAndPlaylists": "Išvalo duomenis kolekcijose ir grojaraščiuose",
-    "TaskCleanCollectionsAndPlaylistsDescription": "Pašalina neegzistuojančius elementus iš kolekcijų ir grojaraščių.",
+    "TaskCleanCollectionsAndPlaylists": "Sutvarko duomenis jūsų kolekcijose ir grojaraščiuose",
+    "TaskCleanCollectionsAndPlaylistsDescription": "Pašalina nebeegzistuojančius elementus iš kolekcijų ir grojaraščių.",
     "TaskAudioNormalization": "Garso Normalizavimas",
     "TaskAudioNormalizationDescription": "Skenuoti garso normalizavimo informacijos failuose.",
-    "TaskExtractMediaSegments": "Medijos segmentų nuskaitymas",
+    "TaskExtractMediaSegments": "Medijos Segmentų Nuskaitymas",
     "TaskDownloadMissingLyrics": "Parsisiųsti trūkstamus dainų tekstus",
     "TaskExtractMediaSegmentsDescription": "Ištraukia arba gauna medijos segmentus iš MediaSegment ijungtų papildinių.",
-    "TaskMoveTrickplayImages": "Pakeisti Trickplay vaizdų vietą",
-    "TaskMoveTrickplayImagesDescription": "Perkelia egzistuojančius trickplay failus pagal bibliotekos nustatymus.",
+    "TaskMoveTrickplayImages": "Migruoti Trickplay Vaizdų Vietą",
+    "TaskMoveTrickplayImagesDescription": "Perkelia egzisuojančius trickplay failus pagal bibliotekos nustatymus.",
     "TaskDownloadMissingLyricsDescription": "Parsisiųsti dainų žodžius"
 }

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

@@ -123,17 +123,11 @@
     "External": "Ārējais",
     "HearingImpaired": "Ar dzirdes traucējumiem",
     "TaskKeyframeExtractor": "Atslēgkadru ekstraktors",
-    "TaskKeyframeExtractorDescription": "Izvelk atslēgkadrus no video failiem lai izveidotu precīzākus HLS atskaņošanas sarakstus. Šis process var būt ilgs.",
+    "TaskKeyframeExtractorDescription": "Ekstraktē atslēgkadrus no video failiem lai izveidotu precīzākus HLS atskaņošanas sarakstus. Šis process var būt ilgs.",
     "TaskRefreshTrickplayImages": "Ģenerēt partīšanas attēlus",
     "TaskRefreshTrickplayImagesDescription": "Izveido priekšskatījumus videoklipu pārtīšanai iespējotajās bibliotēkās.",
     "TaskAudioNormalization": "Audio normalizācija",
     "TaskCleanCollectionsAndPlaylistsDescription": "Noņem vairs neeksistējošus vienumus no kolekcijām un atskaņošanas sarakstiem.",
     "TaskAudioNormalizationDescription": "Skanē failus priekš audio normālizācijas informācijas.",
-    "TaskCleanCollectionsAndPlaylists": "Notīrīt kolekcijas un atskaņošanas sarakstus",
-    "TaskExtractMediaSegments": "Multivides segmenta skenēšana",
-    "TaskExtractMediaSegmentsDescription": "Izvelk vai iegūst multivides segmentus no MediaSegment iespējotiem spraudņiem.",
-    "TaskMoveTrickplayImages": "Trickplay attēlu pārvietošana",
-    "TaskMoveTrickplayImagesDescription": "Pārvieto esošos trickplay failus atbilstoši bibliotēkas iestatījumiem.",
-    "TaskDownloadMissingLyrics": "Lejupielādēt trūkstošos vārdus",
-    "TaskDownloadMissingLyricsDescription": "Lejupielādēt vārdus dziesmām"
+    "TaskCleanCollectionsAndPlaylists": "Notīrīt kolekcijas un atskaņošanas sarakstus"
 }

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

@@ -131,6 +131,5 @@
     "TaskRefreshTrickplayImages": "Генерирај слики за прегледување (Trickplay)",
     "TaskAudioNormalization": "Нормализација на звукот",
     "TaskRefreshTrickplayImagesDescription": "Креира трикплеј прегледи за видеа во овозможените библиотеки.",
-    "TaskCleanCollectionsAndPlaylistsDescription": "Отстранува ставки од колекциите и плејлистите што веќе не постојат.",
-    "TaskExtractMediaSegments": "Скенирање на сегменти на содржина"
+    "TaskCleanCollectionsAndPlaylistsDescription": "Отстранува ставки од колекциите и плејлистите што веќе не постојат."
 }

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

@@ -9,14 +9,14 @@
     "Channels": "Saluran",
     "ChapterNameValue": "Bab {0}",
     "Collections": "Koleksi",
-    "DeviceOfflineWithName": "{0} telah dinyahsambung",
+    "DeviceOfflineWithName": "{0} telah diputuskan sambungan",
     "DeviceOnlineWithName": "{0} telah disambung",
-    "FailedLoginAttemptWithUserName": "Percubaan gagal log masuk daripada {0}",
+    "FailedLoginAttemptWithUserName": "Cubaan log masuk gagal dari {0}",
     "Favorites": "Kegemaran",
-    "Folders": "Folder-folder",
+    "Folders": "Fail-fail",
     "Genres": "Genre-genre",
-    "HeaderAlbumArtists": "Album artis-artis",
-    "HeaderContinueWatching": "Teruskan Menonton",
+    "HeaderAlbumArtists": "Album Artis-artis",
+    "HeaderContinueWatching": "Terus Menonton",
     "HeaderFavoriteAlbums": "Album-album Kegemaran",
     "HeaderFavoriteArtists": "Artis-artis Kegemaran",
     "HeaderFavoriteEpisodes": "Episod-episod Kegemaran",
@@ -25,26 +25,26 @@
     "HeaderLiveTV": "TV Siaran Langsung",
     "HeaderNextUp": "Seterusnya",
     "HeaderRecordingGroups": "Kumpulan-kumpulan Rakaman",
-    "HomeVideos": "Video Peribadi",
-    "Inherit": "Warisi",
-    "ItemAddedWithName": "{0} telah ditambah ke dalam pustaka",
+    "HomeVideos": "Video Personal",
+    "Inherit": "Mewarisi",
+    "ItemAddedWithName": "{0} telah ditambahkan ke dalam pustaka",
     "ItemRemovedWithName": "{0} telah dibuang daripada pustaka",
     "LabelIpAddressValue": "Alamat IP: {0}",
     "LabelRunningTimeValue": "Masa berjalan: {0}",
-    "Latest": "Terbaharu",
-    "MessageApplicationUpdated": "Pelayan Jellyfin telah dikemas kini",
-    "MessageApplicationUpdatedTo": "Pelayan Jellyfin telah dikemas kini ke {0}",
-    "MessageNamedServerConfigurationUpdatedWithValue": "Konfigurasi pelayan bahagian {0} telah dikemas kini",
+    "Latest": "Terbaru",
+    "MessageApplicationUpdated": "Jellyfin Server telah dikemas kini",
+    "MessageApplicationUpdatedTo": "Jellyfin Server telah dikemas kini ke {0}",
+    "MessageNamedServerConfigurationUpdatedWithValue": "Konfigurasi pelayan di bahagian {0} telah dikemas kini",
     "MessageServerConfigurationUpdated": "Konfigurasi pelayan telah dikemas kini",
     "MixedContent": "Kandungan campuran",
     "Movies": "Filem-filem",
     "Music": "Muzik",
     "MusicVideos": "Video Muzik",
     "NameInstallFailed": "{0} pemasangan gagal",
-    "NameSeasonNumber": "Musim ke-{0}",
+    "NameSeasonNumber": "Musim {0}",
     "NameSeasonUnknown": "Musim Tidak Diketahui",
-    "NewVersionIsAvailable": "Versi terbaharu Pelayan Jellyfin telah tersedia untuk dimuat turun.",
-    "NotificationOptionApplicationUpdateAvailable": "Kemas kini aplikasi telah tersedia",
+    "NewVersionIsAvailable": "Versi terbaru Jellyfin Server bersedia untuk dimuat turunkan.",
+    "NotificationOptionApplicationUpdateAvailable": "Kemas kini aplikasi telah sedia",
     "NotificationOptionApplicationUpdateInstalled": "Kemas kini aplikasi telah dipasang",
     "NotificationOptionAudioPlayback": "Ulangmain audio bermula",
     "NotificationOptionAudioPlaybackStopped": "Ulangmain audio dihentikan",
@@ -98,8 +98,8 @@
     "TasksLibraryCategory": "Perpustakaan",
     "TasksMaintenanceCategory": "Penyelenggaraan",
     "Undefined": "Tidak ditentukan",
-    "Forced": "Dipaksa",
-    "Default": "Lalai",
+    "Forced": "Paksa",
+    "Default": "Asal",
     "TaskCleanCache": "Bersihkan Direktori Cache",
     "TaskCleanActivityLogDescription": "Padamkan entri log aktiviti yang lebih tua daripada usia yang dikonfigurasi.",
     "TaskRefreshPeople": "Segarkan Orang",
@@ -126,15 +126,5 @@
     "TaskKeyframeExtractor": "Ekstrak bingkai kunci",
     "TaskKeyframeExtractorDescription": "Ekstrak bingkai kunci dari fail video untuk membina HLS playlist yang lebih tepat. Tugas ini mungkin perlukan masa yang panjang.",
     "TaskRefreshTrickplayImagesDescription": "Jana gambar prebiu Trickplay untuk video dalam perpustakaan.",
-    "TaskRefreshTrickplayImages": "Jana gambar Trickplay",
-    "TaskExtractMediaSegments": "Imbasan Segmen Media",
-    "TaskExtractMediaSegmentsDescription": "Mengekstrak atau mendapatkan segmen media daripada pemalam yang didayakan MediaSegment.",
-    "TaskMoveTrickplayImagesDescription": "Mengalihkan fail trickplay sedia ada mengikut tetapan pustakan digital.",
-    "TaskDownloadMissingLyrics": "Muat turun lirik yang hilang",
-    "TaskDownloadMissingLyricsDescription": "Memuat turun lirik-lirik untuk lagu-lagu",
-    "TaskMoveTrickplayImages": "Alih Lokasi Imej Trickplay",
-    "TaskCleanCollectionsAndPlaylists": "Bersihkan koleksi dan senarai audio video",
-    "TaskAudioNormalization": "Normalisasi Audio",
-    "TaskAudioNormalizationDescription": "Mengimbas fail-fail untuk data normalisasi audio.",
-    "TaskCleanCollectionsAndPlaylistsDescription": "Mengalih keluar item daripada koleksi dan senarai audio video yang tidak wujud lagi."
+    "TaskRefreshTrickplayImages": "Jana gambar Trickplay"
 }