From e38ccf7a0c74d95e2a979782d884f00880084ab2 Mon Sep 17 00:00:00 2001 From: ajp_anton Date: Thu, 16 Jul 2026 00:40:31 +0000 Subject: [PATCH 01/11] Release version 0.2.1 --- README.md | 3 ++- .../Jellyfin.Plugin.Multilang.csproj | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 53f04ec..63b88f7 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,8 @@ Multilang is a Jellyfin plugin that lets different users see different metadata languages without changing Jellyfin's stored metadata. -The plugin is built for Jellyfin 10.11.9 and is currently early beta software. +The plugin is built for the Jellyfin 10.11.x stable series and is currently +early beta software. ## What It Does diff --git a/src/Jellyfin.Plugin.Multilang/Jellyfin.Plugin.Multilang.csproj b/src/Jellyfin.Plugin.Multilang/Jellyfin.Plugin.Multilang.csproj index 0282781..f8930b1 100644 --- a/src/Jellyfin.Plugin.Multilang/Jellyfin.Plugin.Multilang.csproj +++ b/src/Jellyfin.Plugin.Multilang/Jellyfin.Plugin.Multilang.csproj @@ -6,9 +6,9 @@ enable enable false - 0.2.0 - 0.2.0.0 - 0.2.0.0 + 0.2.1 + 0.2.1.0 + 0.2.1.0 ajp_anton From a6acccfa66556210baf9c770364f1c2f59523515 Mon Sep 17 00:00:00 2001 From: ajp_anton Date: Thu, 16 Jul 2026 00:42:52 +0000 Subject: [PATCH 02/11] Retarget plugin to Jellyfin 12 RC --- README.md | 4 ++-- global.json | 2 +- .../Jellyfin.Plugin.Multilang.csproj | 15 ++++++++------- .../Jellyfin.Plugin.Multilang.Tests.csproj | 4 ++-- 4 files changed, 13 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index 63b88f7..e6302cd 100644 --- a/README.md +++ b/README.md @@ -3,8 +3,8 @@ Multilang is a Jellyfin plugin that lets different users see different metadata languages without changing Jellyfin's stored metadata. -The plugin is built for the Jellyfin 10.11.x stable series and is currently -early beta software. +The `main` branch is built for the Jellyfin 10.11.x stable series. The +`jellyfin12` branch targets Jellyfin 12 and is currently early beta software. ## What It Does diff --git a/global.json b/global.json index 12d3d54..4cd1f3c 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "sdk": { - "version": "9.0.116", + "version": "10.0.110", "rollForward": "latestFeature" } } diff --git a/src/Jellyfin.Plugin.Multilang/Jellyfin.Plugin.Multilang.csproj b/src/Jellyfin.Plugin.Multilang/Jellyfin.Plugin.Multilang.csproj index f8930b1..a97422d 100644 --- a/src/Jellyfin.Plugin.Multilang/Jellyfin.Plugin.Multilang.csproj +++ b/src/Jellyfin.Plugin.Multilang/Jellyfin.Plugin.Multilang.csproj @@ -2,13 +2,13 @@ Jellyfin.Plugin.Multilang - net9.0 + net10.0 enable enable false - 0.2.1 - 0.2.1.0 - 0.2.1.0 + 0.3.0 + 0.3.0.0 + 0.3.0.0 ajp_anton @@ -17,13 +17,14 @@ - + runtime - + runtime - + + diff --git a/tests/Jellyfin.Plugin.Multilang.Tests/Jellyfin.Plugin.Multilang.Tests.csproj b/tests/Jellyfin.Plugin.Multilang.Tests/Jellyfin.Plugin.Multilang.Tests.csproj index f439f23..8b4da5f 100644 --- a/tests/Jellyfin.Plugin.Multilang.Tests/Jellyfin.Plugin.Multilang.Tests.csproj +++ b/tests/Jellyfin.Plugin.Multilang.Tests/Jellyfin.Plugin.Multilang.Tests.csproj @@ -1,7 +1,7 @@  - net9.0 + net10.0 enable enable false @@ -13,7 +13,7 @@ - + From 8c79cfd3e6b5c7ff467baca817fd59fbf4f142f5 Mon Sep 17 00:00:00 2001 From: ajp_anton Date: Thu, 16 Jul 2026 00:50:12 +0000 Subject: [PATCH 03/11] Use standard auth headers for Jellyfin 12 --- .../Api/MultilangController.cs | 33 +------------------ .../Configuration/shared.js | 2 ++ .../Services/ItemsProxyRequestBuilder.cs | 1 - .../wwwroot/inject.js | 4 ++- .../ItemsProxyRequestBuilderTests.cs | 2 +- 5 files changed, 7 insertions(+), 35 deletions(-) diff --git a/src/Jellyfin.Plugin.Multilang/Api/MultilangController.cs b/src/Jellyfin.Plugin.Multilang/Api/MultilangController.cs index c9dfebf..1e40602 100644 --- a/src/Jellyfin.Plugin.Multilang/Api/MultilangController.cs +++ b/src/Jellyfin.Plugin.Multilang/Api/MultilangController.cs @@ -309,6 +309,7 @@ public sealed class MultilangController : ControllerBase var upstreamSw = Stopwatch.StartNew(); var http = _httpClientFactory.CreateClient(); using var request = new HttpRequestMessage(HttpMethod.Get, proxyRequest.Upstream); + request.Headers.TryAddWithoutValidation("Authorization", $"MediaBrowser Token=\"{token}\""); request.Headers.TryAddWithoutValidation("X-Emby-Token", token); request.Headers.TryAddWithoutValidation("X-MediaBrowser-Token", token); using var response = await http.SendAsync(request, cancellationToken).ConfigureAwait(false); @@ -1250,10 +1251,6 @@ public sealed class MultilangController : ControllerBase if (string.IsNullOrWhiteSpace(token)) return null; - var tokenUserId = await GetUserIdFromJellyfinApiAsync(token).ConfigureAwait(false); - if (!string.IsNullOrWhiteSpace(tokenUserId)) - return tokenUserId; - var remoteEndpoint = HttpContext.Connection.RemoteIpAddress?.ToString() ?? string.Empty; var deviceId = info?.DeviceId ?? string.Empty; var session = await _sessionManager.GetSessionByAuthenticationToken(token, deviceId, remoteEndpoint).ConfigureAwait(false); @@ -1274,34 +1271,6 @@ public sealed class MultilangController : ControllerBase : null; } - private async Task GetUserIdFromJellyfinApiAsync(string token) - { - var baseUri = $"{Request.Scheme}://{Request.Host}{Request.PathBase}"; - var usersMe = new UriBuilder(new Uri(new Uri(baseUri), "/Users/Me")); - usersMe.Query = Microsoft.AspNetCore.WebUtilities.QueryHelpers.AddQueryString( - string.Empty, - "api_key", - token).TrimStart('?'); - - var http = _httpClientFactory.CreateClient(); - using var request = new HttpRequestMessage(HttpMethod.Get, usersMe.Uri); - request.Headers.TryAddWithoutValidation("X-Emby-Token", token); - request.Headers.TryAddWithoutValidation("X-MediaBrowser-Token", token); - using var response = await http.SendAsync(request, HttpContext.RequestAborted).ConfigureAwait(false); - if (!response.IsSuccessStatusCode) - return null; - - await using var stream = await response.Content.ReadAsStreamAsync(HttpContext.RequestAborted).ConfigureAwait(false); - using var doc = await JsonDocument.ParseAsync(stream, cancellationToken: HttpContext.RequestAborted).ConfigureAwait(false); - if (!doc.RootElement.TryGetProperty("Id", out var idProperty)) - return null; - - var raw = idProperty.GetString(); - return Guid.TryParse(raw, out var guid) - ? guid.ToString("N") - : raw?.Length == 32 && raw.All(Uri.IsHexDigit) ? raw.ToLowerInvariant() : null; - } - private async Task IsRequesterAdminAsync() { var info = await _authorizationContext.GetAuthorizationInfo(HttpContext).ConfigureAwait(false); diff --git a/src/Jellyfin.Plugin.Multilang/Configuration/shared.js b/src/Jellyfin.Plugin.Multilang/Configuration/shared.js index 4dd9290..048f38c 100644 --- a/src/Jellyfin.Plugin.Multilang/Configuration/shared.js +++ b/src/Jellyfin.Plugin.Multilang/Configuration/shared.js @@ -19,6 +19,7 @@ const t = token() || qs.get("token") || qs.get("api_key") || ""; const h = { "Content-Type": "application/json" }; if (t) { + h.Authorization = `MediaBrowser Token="${t}"`; h["X-Emby-Token"] = t; h["X-MediaBrowser-Token"] = t; } @@ -31,6 +32,7 @@ const h = {}; if (contentType) h["Content-Type"] = contentType; if (t) { + h.Authorization = `MediaBrowser Token="${t}"`; h["X-Emby-Token"] = t; h["X-MediaBrowser-Token"] = t; } diff --git a/src/Jellyfin.Plugin.Multilang/Services/ItemsProxyRequestBuilder.cs b/src/Jellyfin.Plugin.Multilang/Services/ItemsProxyRequestBuilder.cs index 021bad5..143f85e 100644 --- a/src/Jellyfin.Plugin.Multilang/Services/ItemsProxyRequestBuilder.cs +++ b/src/Jellyfin.Plugin.Multilang/Services/ItemsProxyRequestBuilder.cs @@ -71,7 +71,6 @@ public static class ItemsProxyRequestBuilder } var cacheQuery = QueryHelpers.AddQueryString(string.Empty, pairs).TrimStart('?'); - pairs.Add(KeyValuePair.Create("api_key", token)); builder.Query = QueryHelpers.AddQueryString(string.Empty, pairs).TrimStart('?'); var normalizedForCache = builder.Path + (cacheQuery.Length > 0 ? "?" + cacheQuery : string.Empty); return new ItemsProxyRequest( diff --git a/src/Jellyfin.Plugin.Multilang/wwwroot/inject.js b/src/Jellyfin.Plugin.Multilang/wwwroot/inject.js index 53af922..f7ea06e 100644 --- a/src/Jellyfin.Plugin.Multilang/wwwroot/inject.js +++ b/src/Jellyfin.Plugin.Multilang/wwwroot/inject.js @@ -311,7 +311,9 @@ function refreshItems(itemIds) { const token = getClientToken(); - const headers = token ? { "X-Emby-Token": token, "X-MediaBrowser-Token": token } : {}; + const headers = token + ? { Authorization: `MediaBrowser Token="${token}"`, "X-Emby-Token": token, "X-MediaBrowser-Token": token } + : {}; itemIds.forEach((itemId) => { fetch(`${BASE_PATH}/Multilang/RefreshItem/${itemId}?includeChildren=true${token ? `&token=${encodeURIComponent(token)}` : ""}`, { method: "POST", headers }); }); diff --git a/tests/Jellyfin.Plugin.Multilang.Tests/ItemsProxyRequestBuilderTests.cs b/tests/Jellyfin.Plugin.Multilang.Tests/ItemsProxyRequestBuilderTests.cs index ae2d7e7..0f14b12 100644 --- a/tests/Jellyfin.Plugin.Multilang.Tests/ItemsProxyRequestBuilderTests.cs +++ b/tests/Jellyfin.Plugin.Multilang.Tests/ItemsProxyRequestBuilderTests.cs @@ -22,8 +22,8 @@ public sealed class ItemsProxyRequestBuilderTests Assert.NotNull(result); Assert.Equal($"/Users/{UserId}/Items", result.Upstream.AbsolutePath); - Assert.Contains("api_key=token", result.Upstream.Query); Assert.DoesNotContain("api_key=old", result.Upstream.Query); + Assert.DoesNotContain("api_key", result.Upstream.Query, StringComparison.OrdinalIgnoreCase); Assert.DoesNotContain("api_key", result.NormalizedUrlForCache, StringComparison.OrdinalIgnoreCase); Assert.Contains("userId=" + UserId, result.NormalizedUrlForCache); } From 3c82485a0a7d0c6c98c3c0babce8aac59a2a2a77 Mon Sep 17 00:00:00 2001 From: ajp_anton Date: Sun, 19 Jul 2026 01:35:02 +0000 Subject: [PATCH 04/11] Add language-aware article sorting --- .../Api/MultilangController.cs | 21 ++++++ .../Configuration/PluginConfiguration.cs | 4 ++ .../Configuration/configPage.html | 61 +++++++++++++++-- .../Configuration/shared.css | 4 ++ .../Services/ItemsProxySorting.cs | 59 ++++++++++++----- .../Services/ItemsProxyTransformer.cs | 51 ++++++++++++--- .../ItemsProxySortingTests.cs | 65 ++++++++++++++++++- .../ItemsProxyTransformerResolutionTests.cs | 9 ++- 8 files changed, 237 insertions(+), 37 deletions(-) diff --git a/src/Jellyfin.Plugin.Multilang/Api/MultilangController.cs b/src/Jellyfin.Plugin.Multilang/Api/MultilangController.cs index 1e40602..a2df1f7 100644 --- a/src/Jellyfin.Plugin.Multilang/Api/MultilangController.cs +++ b/src/Jellyfin.Plugin.Multilang/Api/MultilangController.cs @@ -17,6 +17,7 @@ using MediaBrowser.Controller.Entities; using MediaBrowser.Controller.Library; using MediaBrowser.Controller.Net; using MediaBrowser.Controller.Session; +using MediaBrowser.Model.Globalization; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; @@ -42,6 +43,7 @@ public sealed class MultilangController : ControllerBase private readonly IUserManager _userManager; private readonly IHttpClientFactory _httpClientFactory; private readonly IApplicationPaths _appPaths; + private readonly ILocalizationManager _localizationManager; private readonly ProviderCatalog _providerCatalog; private readonly SortArticleCatalog _articleCatalog; private readonly RefreshService _refreshService; @@ -59,6 +61,7 @@ public sealed class MultilangController : ControllerBase IUserManager userManager, IHttpClientFactory httpClientFactory, IApplicationPaths appPaths, + ILocalizationManager localizationManager, ProviderCatalog providerCatalog, SortArticleCatalog articleCatalog, RefreshService refreshService, @@ -75,6 +78,7 @@ public sealed class MultilangController : ControllerBase _userManager = userManager; _httpClientFactory = httpClientFactory; _appPaths = appPaths; + _localizationManager = localizationManager; _providerCatalog = providerCatalog; _articleCatalog = articleCatalog; _refreshService = refreshService; @@ -111,6 +115,13 @@ public sealed class MultilangController : ControllerBase public IActionResult ArticleBuiltins() => Ok(_articleCatalog.GetBuiltIns().OrderBy(k => k.Key, StringComparer.OrdinalIgnoreCase).ToDictionary(k => k.Key, v => v.Value)); + [HttpGet("MetadataLanguages")] + public IActionResult MetadataLanguages() + => Ok(_localizationManager.GetCultures() + .Where(c => !string.IsNullOrWhiteSpace(c.Name)) + .OrderBy(c => c.DisplayName, StringComparer.OrdinalIgnoreCase) + .Select(c => new { c.Name, c.DisplayName })); + [HttpGet("AdminConfig")] public async Task AdminConfig() { @@ -143,6 +154,8 @@ public sealed class MultilangController : ControllerBase private static bool AdminConfigAffectsCachedItems(PluginConfiguration previous, PluginConfiguration next) => !StringArrayEquals(previous.Languages, next.Languages, StringComparer.OrdinalIgnoreCase) || !string.Equals(previous.AssetStorageMode, next.AssetStorageMode, StringComparison.OrdinalIgnoreCase) || + previous.IgnoreArticlesWhenSorting != next.IgnoreArticlesWhenSorting || + !string.Equals(previous.JellyfinTitleLanguageFallback, next.JellyfinTitleLanguageFallback, StringComparison.OrdinalIgnoreCase) || !ArticleEntriesEqual(previous.ArticleEntries, next.ArticleEntries); private static bool StringArrayEquals(string[] previous, string[] next, StringComparer comparer) @@ -1401,6 +1414,10 @@ public sealed class AdminConfigDto public string AssetStorageMode { get; set; } = "url"; + public bool IgnoreArticlesWhenSorting { get; set; } = true; + + public string JellyfinTitleLanguageFallback { get; set; } = string.Empty; + public SortArticleEntry[] ArticleEntries { get; set; } = []; public bool EnableLogging { get; set; } @@ -1422,6 +1439,8 @@ public sealed class AdminConfigDto ItemsProxyCacheTtlMinutes = cfg.ItemsProxyCacheTtlMinutes, ItemsProxyCacheMaxMiB = cfg.ItemsProxyCacheMaxMiB, AssetStorageMode = NormalizeAssetStorageMode(cfg.AssetStorageMode), + IgnoreArticlesWhenSorting = cfg.IgnoreArticlesWhenSorting, + JellyfinTitleLanguageFallback = cfg.JellyfinTitleLanguageFallback, ArticleEntries = cfg.ArticleEntries, EnableLogging = cfg.EnableLogging, VerboseLogging = cfg.VerboseLogging, @@ -1444,6 +1463,8 @@ public sealed class AdminConfigDto ItemsProxyCacheTtlMinutes = Math.Max(1, ItemsProxyCacheTtlMinutes), ItemsProxyCacheMaxMiB = Math.Max(1, ItemsProxyCacheMaxMiB), AssetStorageMode = NormalizeAssetStorageMode(AssetStorageMode), + IgnoreArticlesWhenSorting = IgnoreArticlesWhenSorting, + JellyfinTitleLanguageFallback = JellyfinTitleLanguageFallback?.Trim() ?? string.Empty, ArticleEntries = ArticleEntries .Where(e => !string.IsNullOrWhiteSpace(e.Language)) .Select(e => new SortArticleEntry { Language = e.Language.Trim(), Articles = e.Articles ?? string.Empty, AlwaysApply = e.AlwaysApply }) diff --git a/src/Jellyfin.Plugin.Multilang/Configuration/PluginConfiguration.cs b/src/Jellyfin.Plugin.Multilang/Configuration/PluginConfiguration.cs index 3ad5c7d..7081333 100644 --- a/src/Jellyfin.Plugin.Multilang/Configuration/PluginConfiguration.cs +++ b/src/Jellyfin.Plugin.Multilang/Configuration/PluginConfiguration.cs @@ -29,6 +29,10 @@ public sealed class PluginConfiguration : BasePluginConfiguration public string AssetStorageMode { get; set; } = "url"; + public bool IgnoreArticlesWhenSorting { get; set; } = true; + + public string JellyfinTitleLanguageFallback { get; set; } = string.Empty; + [XmlArray("SortArticles")] [XmlArrayItem("SortArticleEntry")] public SortArticleEntry[] ArticleEntries { get; set; } = []; diff --git a/src/Jellyfin.Plugin.Multilang/Configuration/configPage.html b/src/Jellyfin.Plugin.Multilang/Configuration/configPage.html index f7a6c25..54bad28 100644 --- a/src/Jellyfin.Plugin.Multilang/Configuration/configPage.html +++ b/src/Jellyfin.Plugin.Multilang/Configuration/configPage.html @@ -28,16 +28,25 @@
- Languages + Languages to fetch
- +
Use BCP-47 language tags. These are the languages refresh jobs fetch and user rules can select.
+
+ +
+
+ + +
+
- Articles + List of articles
Comma- or semicolon-separated leading articles to ignore per language.
+
To ignore a language's articles, even on titles in other languages, check "Always ignore".
@@ -179,7 +188,7 @@ \n\n"; + private readonly string _root = Path.Combine(Path.GetTempPath(), "web-inject-test-" + Guid.NewGuid().ToString("N")); + private string Index => Path.Combine(_root, "index.html"); + + public WebScriptInjectorTests() + { + Directory.CreateDirectory(_root); + File.WriteAllText(Index, Shell); + } + + [Fact] + public void ReplacingShorterScriptPreservesOtherPluginAndRepeatedInjectionDoesNotWrite() + { + File.WriteAllText(Index, Shell.Replace("", OtherBlock + "")); + Inject("a-long-old-script-version.js"); + Inject("v2.js"); + var content = File.ReadAllText(Index); + Assert.DoesNotContain("a-long-old", content); + Assert.Contains(OtherBlock, content); + Assert.Contains("v2.js", content); + Assert.EndsWith("", content.TrimEnd()); + Assert.Equal(1, content.Split("").Length - 1); + var timestamp = new DateTime(2000, 1, 1, 0, 0, 0, DateTimeKind.Utc); + File.SetLastWriteTimeUtc(Index, timestamp); + Inject("v2.js"); + Assert.Equal(timestamp, File.GetLastWriteTimeUtc(Index)); + Assert.Single(Directory.GetFiles(_root)); + } + + [Fact] + public void RemovalPreservesOtherPlugin() + { + var original = Shell.Replace("", OtherBlock + ""); + File.WriteAllText(Index, original); + Inject("plugin.js"); + WebScriptInjector.RemoveInjected(_root); + var content = File.ReadAllText(Index); + Assert.DoesNotContain("", content); + Assert.Contains(OtherBlock, content); + Assert.EndsWith("", content.TrimEnd()); + WebScriptInjector.RemoveInjected(_root); + Assert.Equal(content, File.ReadAllText(Index)); + } + + [Fact] + public void MissingBodyEndLeavesFileUntouched() + { + File.WriteAllText(Index, "incomplete"); + Inject("plugin.js"); + Assert.Equal("incomplete", File.ReadAllText(Index)); + Assert.Single(Directory.GetFiles(_root)); + } + + [Theory] + [InlineData(false)] + [InlineData(true)] + public async Task SharedLockProtectsWholeReadModifyWriteIncludingRemoval(bool remove) + { + Inject("plugin.js"); + using var entered = new ManualResetEventSlim(); + using var release = new ManualResetEventSlim(); + var other = Task.Run(() => + { + using var mutex = new Mutex(false, "Jellyfin.Web.IndexHtml"); + Assert.True(mutex.WaitOne(TimeSpan.FromSeconds(10))); + try + { + var content = File.ReadAllText(Index); + entered.Set(); + Assert.True(release.Wait(TimeSpan.FromSeconds(10))); + File.WriteAllText(Index, content.Replace("", OtherBlock + "")); + } + finally { mutex.ReleaseMutex(); } + }); + Task ours = Task.CompletedTask; + try + { + Assert.True(entered.Wait(TimeSpan.FromSeconds(10))); + using var calling = new ManualResetEventSlim(); + ours = Task.Run(() => + { + calling.Set(); + if (remove) WebScriptInjector.RemoveInjected(_root); + else Inject("updated.js"); + }); + Assert.True(calling.Wait(TimeSpan.FromSeconds(10))); + await Task.Delay(100); + Assert.False(ours.IsCompleted); + } + finally + { + release.Set(); + await Task.WhenAll(other, ours).WaitAsync(TimeSpan.FromSeconds(10)); + } + var final = File.ReadAllText(Index); + Assert.Contains(OtherBlock, final); + Assert.Equal(!remove, final.Contains("")); + if (!remove) Assert.Contains("updated.js", final); + Assert.EndsWith("", final.TrimEnd()); + } + + [Fact] + public async Task ReadersNeverSeeTruncatedHtmlDuringUpdates() + { + using var stop = new CancellationTokenSource(); + using var reading = new ManualResetEventSlim(); + var reader = Task.Run(() => + { + reading.Set(); + while (!stop.IsCancellationRequested) + { + var content = File.ReadAllText(Index); + Assert.StartsWith("", content); + Assert.EndsWith("", content.TrimEnd()); + } + }); + try + { + Assert.True(reading.Wait(TimeSpan.FromSeconds(10))); + for (var i = 0; i < 30; i++) + Inject(new string('x', i % 2 == 0 ? 131072 : 1) + i + ".js"); + } + finally + { + stop.Cancel(); + await reader.WaitAsync(TimeSpan.FromSeconds(10)); + } + Assert.Single(Directory.GetFiles(_root)); + } + + private void Inject(string source) + => WebScriptInjector.EnsureInjected(_root, $"", NullLogger.Instance); + + public void Dispose() => Directory.Delete(_root, recursive: true); +}