Merge remote-tracking branch 'upstream/master' into epg-fixes

7 files changed, 210 insertions, 8 deletions

diff --git a/tests/Jellyfin.Controller.Tests/Entities/InternalItemsQueryTests.cs b/tests/Jellyfin.Controller.Tests/Entities/InternalItemsQueryTests.cs
new file mode 100644
index 0000000000..7093b25006
--- /dev/null
+++ b/tests/Jellyfin.Controller.Tests/Entities/InternalItemsQueryTests.cs
@@ -0,0 +1,26 @@
+using System;
+using MediaBrowser.Controller.Entities;
+using MediaBrowser.Model.Querying;
+using Xunit;
+
+namespace Jellyfin.Controller.Tests.Entities;
+
+public class InternalItemsQueryTests
+{
+    public static TheoryData<ItemFilter[]> ApplyFilters_Invalid()
+    {
+        var data = new TheoryData<ItemFilter[]>();
+        data.Add([ItemFilter.IsFolder, ItemFilter.IsNotFolder]);
+        data.Add([ItemFilter.IsPlayed, ItemFilter.IsUnplayed]);
+        data.Add([ItemFilter.Likes, ItemFilter.Dislikes]);
+        return data;
+    }
+
+    [Theory]
+    [MemberData(nameof(ApplyFilters_Invalid))]
+    public void ApplyFilters_Invalid_ThrowsArgumentException(ItemFilter[] filters)
+    {
+        var query = new InternalItemsQuery();
+        Assert.Throws<ArgumentException>(() => query.ApplyFilters(filters));
+    }
+}
diff --git a/tests/Jellyfin.MediaEncoding.Tests/Probing/ProbeResultNormalizerTests.cs b/tests/Jellyfin.MediaEncoding.Tests/Probing/ProbeResultNormalizerTests.cs
index 8a2f84734e..3369af0e84 100644
--- a/tests/Jellyfin.MediaEncoding.Tests/Probing/ProbeResultNormalizerTests.cs
+++ b/tests/Jellyfin.MediaEncoding.Tests/Probing/ProbeResultNormalizerTests.cs
@@ -39,6 +39,23 @@ namespace Jellyfin.MediaEncoding.Tests.Probing
         public void GetFrameRate_Success(string value, float? expected)
             => Assert.Equal(expected, ProbeResultNormalizer.GetFrameRate(value));
 
+        [Theory]
+        [InlineData("1:1", true)]
+        [InlineData("3201:3200", true)]
+        [InlineData("1215:1216", true)]
+        [InlineData("1001:1000", true)]
+        [InlineData("16:15", false)]
+        [InlineData("8:9", false)]
+        [InlineData("32:27", false)]
+        [InlineData("10:11", false)]
+        [InlineData("64:45", false)]
+        [InlineData("4:3", false)]
+        [InlineData("0:1", false)]
+        [InlineData("", false)]
+        [InlineData(null, false)]
+        public void IsNearSquarePixelSar_DetectsCorrectly(string? sar, bool expected)
+            => Assert.Equal(expected, ProbeResultNormalizer.IsNearSquarePixelSar(sar));
+
         [Fact]
         public void GetMediaInfo_MetaData_Success()
         {
@@ -123,6 +140,7 @@ namespace Jellyfin.MediaEncoding.Tests.Probing
             Assert.Equal(358, res.VideoStream.Height);
             Assert.Equal(720, res.VideoStream.Width);
             Assert.Equal("2.40:1", res.VideoStream.AspectRatio);
+            Assert.True(res.VideoStream.IsAnamorphic); // SAR 32:27 — genuinely anamorphic NTSC DVD 16:9
             Assert.Equal("yuv420p", res.VideoStream.PixelFormat);
             Assert.Equal(31d, res.VideoStream.Level);
             Assert.Equal(1, res.VideoStream.RefFrames);
@@ -191,8 +209,8 @@ namespace Jellyfin.MediaEncoding.Tests.Probing
             Assert.Equal("mkv,webm", res.Container);
 
             Assert.Equal(2, res.MediaStreams.Count);
-
-            Assert.False(res.MediaStreams[0].IsAVC);
+            Assert.Equal(540, res.MediaStreams[0].Width);
+            Assert.Equal(360, res.MediaStreams[0].Height);
         }
 
         [Fact]
diff --git a/tests/Jellyfin.Model.Tests/Dlna/StreamInfoTests.cs b/tests/Jellyfin.Model.Tests/Dlna/StreamInfoTests.cs
index 8dea468064..4b3126fe11 100644
--- a/tests/Jellyfin.Model.Tests/Dlna/StreamInfoTests.cs
+++ b/tests/Jellyfin.Model.Tests/Dlna/StreamInfoTests.cs
@@ -216,8 +216,7 @@ public class StreamInfoTests
 
         string legacyUrl = streamInfo.ToUrl_Original(BaseUrl, "123");
 
-        // New version will return and & after the ? due to optional parameters.
-        string newUrl = streamInfo.ToUrl(BaseUrl, "123", null).Replace("?&", "?", StringComparison.OrdinalIgnoreCase);
+        string newUrl = streamInfo.ToUrl(BaseUrl, "123", null);
 
         Assert.Equal(legacyUrl, newUrl, ignoreCase: true);
     }
@@ -234,8 +233,7 @@ public class StreamInfoTests
             FillAllProperties(streamInfo);
             string legacyUrl = streamInfo.ToUrl_Original(BaseUrl, "123");
 
-            // New version will return and & after the ? due to optional parameters.
-            string newUrl = streamInfo.ToUrl(BaseUrl, "123", null).Replace("?&", "?", StringComparison.OrdinalIgnoreCase);
+            string newUrl = streamInfo.ToUrl(BaseUrl, "123", null);
 
             Assert.Equal(legacyUrl, newUrl, ignoreCase: true);
         }
diff --git a/tests/Jellyfin.Model.Tests/Extensions/EnumerableExtensionsTests.cs b/tests/Jellyfin.Model.Tests/Extensions/EnumerableExtensionsTests.cs
new file mode 100644
index 0000000000..135a139cdf
--- /dev/null
+++ b/tests/Jellyfin.Model.Tests/Extensions/EnumerableExtensionsTests.cs
@@ -0,0 +1,116 @@
+using System.Linq;
+using MediaBrowser.Model.Extensions;
+using MediaBrowser.Model.Providers;
+using Xunit;
+
+namespace Jellyfin.Model.Tests.Extensions;
+
+public class EnumerableExtensionsTests
+{
+    [Fact]
+    public void OrderByLanguageDescending_PreferredLanguageFirst()
+    {
+        var images = new[]
+        {
+            new RemoteImageInfo { Language = "en", CommunityRating = 5.0, VoteCount = 100 },
+            new RemoteImageInfo { Language = "de", CommunityRating = 9.0, VoteCount = 200 },
+            new RemoteImageInfo { Language = null, CommunityRating = 7.0, VoteCount = 50 },
+            new RemoteImageInfo { Language = "fr", CommunityRating = 8.0, VoteCount = 150 },
+        };
+
+        var result = images.OrderByLanguageDescending("de").ToList();
+
+        Assert.Equal("de", result[0].Language);
+        Assert.Equal("en", result[1].Language);
+        Assert.Null(result[2].Language);
+        Assert.Equal("fr", result[3].Language);
+    }
+
+    [Fact]
+    public void OrderByLanguageDescending_EnglishBeforeNoLanguage()
+    {
+        var images = new[]
+        {
+            new RemoteImageInfo { Language = null, CommunityRating = 9.0, VoteCount = 500 },
+            new RemoteImageInfo { Language = "en", CommunityRating = 3.0, VoteCount = 10 },
+        };
+
+        var result = images.OrderByLanguageDescending("de").ToList();
+
+        // English should come before no-language, even with lower rating
+        Assert.Equal("en", result[0].Language);
+        Assert.Null(result[1].Language);
+    }
+
+    [Fact]
+    public void OrderByLanguageDescending_SameLanguageSortedByRatingThenVoteCount()
+    {
+        var images = new[]
+        {
+            new RemoteImageInfo { Language = "de", CommunityRating = 5.0, VoteCount = 100 },
+            new RemoteImageInfo { Language = "de", CommunityRating = 9.0, VoteCount = 50 },
+            new RemoteImageInfo { Language = "de", CommunityRating = 9.0, VoteCount = 200 },
+        };
+
+        var result = images.OrderByLanguageDescending("de").ToList();
+
+        Assert.Equal(200, result[0].VoteCount);
+        Assert.Equal(50, result[1].VoteCount);
+        Assert.Equal(100, result[2].VoteCount);
+    }
+
+    [Fact]
+    public void OrderByLanguageDescending_NullRequestedLanguage_DefaultsToEnglish()
+    {
+        var images = new[]
+        {
+            new RemoteImageInfo { Language = "fr", CommunityRating = 9.0, VoteCount = 500 },
+            new RemoteImageInfo { Language = "en", CommunityRating = 5.0, VoteCount = 10 },
+        };
+
+        var result = images.OrderByLanguageDescending(null!).ToList();
+
+        // With null requested language, English becomes the preferred language (score 4)
+        Assert.Equal("en", result[0].Language);
+        Assert.Equal("fr", result[1].Language);
+    }
+
+    [Fact]
+    public void OrderByLanguageDescending_EnglishRequested_NoDoubleBoost()
+    {
+        // When requested language IS English, "en" gets score 4 (requested match),
+        // no-language gets score 2, others get score 0
+        var images = new[]
+        {
+            new RemoteImageInfo { Language = null, CommunityRating = 9.0, VoteCount = 500 },
+            new RemoteImageInfo { Language = "en", CommunityRating = 3.0, VoteCount = 10 },
+            new RemoteImageInfo { Language = "fr", CommunityRating = 8.0, VoteCount = 300 },
+        };
+
+        var result = images.OrderByLanguageDescending("en").ToList();
+
+        Assert.Equal("en", result[0].Language);
+        Assert.Null(result[1].Language);
+        Assert.Equal("fr", result[2].Language);
+    }
+
+    [Fact]
+    public void OrderByLanguageDescending_FullPriorityOrder()
+    {
+        var images = new[]
+        {
+            new RemoteImageInfo { Language = "fr", CommunityRating = 9.0, VoteCount = 500 },
+            new RemoteImageInfo { Language = null, CommunityRating = 8.0, VoteCount = 400 },
+            new RemoteImageInfo { Language = "en", CommunityRating = 7.0, VoteCount = 300 },
+            new RemoteImageInfo { Language = "de", CommunityRating = 6.0, VoteCount = 200 },
+        };
+
+        var result = images.OrderByLanguageDescending("de").ToList();
+
+        // Expected order: de (requested) > en > no-language > fr (other)
+        Assert.Equal("de", result[0].Language);
+        Assert.Equal("en", result[1].Language);
+        Assert.Null(result[2].Language);
+        Assert.Equal("fr", result[3].Language);
+    }
+}
diff --git a/tests/Jellyfin.Naming.Tests/Video/CleanStringTests.cs b/tests/Jellyfin.Naming.Tests/Video/CleanStringTests.cs
index 6c9c98cbe8..df5819d747 100644
--- a/tests/Jellyfin.Naming.Tests/Video/CleanStringTests.cs
+++ b/tests/Jellyfin.Naming.Tests/Video/CleanStringTests.cs
@@ -29,6 +29,7 @@ namespace Jellyfin.Naming.Tests.Video
         [InlineData("[OCN] 애타는 로맨스 720p-NEXT", "애타는 로맨스")]
         [InlineData("[tvN] 혼술남녀.E01-E16.720p-NEXT", "혼술남녀")]
         [InlineData("[tvN] 연애말고 결혼 E01~E16 END HDTV.H264.720p-WITH", "연애말고 결혼")]
+        [InlineData("2026年01月10日23時00分00秒-[新]TRIGUN　STARGAZE[字].mp4", "2026年01月10日23時00分00秒-[新]TRIGUN　STARGAZE")]
         // FIXME: [InlineData("After The Sunset - [0004].mkv", "After The Sunset")]
         public void CleanStringTest_NeedsCleaning_Success(string input, string expectedName)
         {
@@ -44,6 +45,7 @@ namespace Jellyfin.Naming.Tests.Video
         [InlineData("American.Psycho.mkv")]
         [InlineData("American Psycho.mkv")]
         [InlineData("Run lola run (lola rennt) (2009).mp4")]
+        [InlineData("2026年01月05日00時55分00秒-[新]違国日記【ＡＮｉＭｉＤＮｉＧＨＴ！！！】＃１.mp4")]
         public void CleanStringTest_DoesntNeedCleaning_False(string? input)
         {
             Assert.False(VideoResolver.TryCleanString(input, _namingOptions, out var newName));
diff --git a/tests/Jellyfin.Naming.Tests/Video/MultiVersionTests.cs b/tests/Jellyfin.Naming.Tests/Video/MultiVersionTests.cs
index 6b13986957..2fb45600b1 100644
--- a/tests/Jellyfin.Naming.Tests/Video/MultiVersionTests.cs
+++ b/tests/Jellyfin.Naming.Tests/Video/MultiVersionTests.cs
@@ -1,3 +1,4 @@
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using Emby.Naming.Common;
@@ -269,8 +270,13 @@ namespace Jellyfin.Naming.Tests.Video
                 files.Select(i => VideoResolver.Resolve(i, false, _namingOptions)).OfType<VideoFileInfo>().ToList(),
                 _namingOptions).ToList();
 
-            Assert.Equal(7, result.Count);
-            Assert.Empty(result[0].AlternateVersions);
+            Assert.Single(result);
+            Assert.Equal(6, result[0].AlternateVersions.Count);
+
+            // Verify 3D recognition is preserved on alternate versions
+            var hsbs = result[0].AlternateVersions.First(v => v.Path.Contains("3d-hsbs", StringComparison.Ordinal));
+            Assert.True(hsbs.Is3D);
+            Assert.Equal("hsbs", hsbs.Format3D);
         }
 
         [Fact]
@@ -435,5 +441,39 @@ namespace Jellyfin.Naming.Tests.Video
 
             Assert.Empty(result);
         }
+
+        [Fact]
+        public void Resolve_GivenUnderscoreSeparator_GroupsVersions()
+        {
+            var files = new[]
+            {
+                "/movies/Movie (2020)/Movie (2020)_4K.mkv",
+                "/movies/Movie (2020)/Movie (2020)_1080p.mkv"
+            };
+
+            var result = VideoListResolver.Resolve(
+                files.Select(i => VideoResolver.Resolve(i, false, _namingOptions)).OfType<VideoFileInfo>().ToList(),
+                _namingOptions).ToList();
+
+            Assert.Single(result);
+            Assert.Single(result[0].AlternateVersions);
+        }
+
+        [Fact]
+        public void Resolve_GivenDotSeparator_GroupsVersions()
+        {
+            var files = new[]
+            {
+                "/movies/Movie (2020)/Movie (2020).UHD.mkv",
+                "/movies/Movie (2020)/Movie (2020).1080p.mkv"
+            };
+
+            var result = VideoListResolver.Resolve(
+                files.Select(i => VideoResolver.Resolve(i, false, _namingOptions)).OfType<VideoFileInfo>().ToList(),
+                _namingOptions).ToList();
+
+            Assert.Single(result);
+            Assert.Single(result[0].AlternateVersions);
+        }
     }
 }
diff --git a/tests/Jellyfin.Networking.Tests/NetworkParseTests.cs b/tests/Jellyfin.Networking.Tests/NetworkParseTests.cs
index 871604514b..b63009d6a5 100644
--- a/tests/Jellyfin.Networking.Tests/NetworkParseTests.cs
+++ b/tests/Jellyfin.Networking.Tests/NetworkParseTests.cs
@@ -377,6 +377,8 @@ namespace Jellyfin.Networking.Tests
         [InlineData("192.168.1.208/24,-16,eth16|10.0.0.1/24,10,eth7", "192.168.1.0/24", "10.0.0.1", "192.168.1.209", "10.0.0.1")] // LAN not bound, so return external.
         [InlineData("192.168.1.208/24,-16,eth16|10.0.0.1/24,10,eth7", "192.168.1.0/24", "192.168.1.208,10.0.0.1", "8.8.8.8", "10.0.0.1")] // return external bind address
         [InlineData("192.168.1.208/24,-16,eth16|10.0.0.1/24,10,eth7", "192.168.1.0/24", "192.168.1.208,10.0.0.1", "192.168.1.210", "192.168.1.208")] // return LAN bind address
+        // Cross-subnet IPv4 request should return IPv4, not IPv6 (Issue #15898)
+        [InlineData("192.168.1.208/24,-16,eth16|fd00::1/64,10,eth7", "192.168.1.0/24", "", "192.168.2.100", "192.168.1.208")]
         public void GetBindInterface_ValidSourceGiven_Success(string interfaces, string lan, string bind, string source, string result)
         {
             var conf = new NetworkConfiguration