From 15053516f888fe1bb085061f39cd7fb2e6e992f0 Mon Sep 17 00:00:00 2001
From: Joe Rogers <1337joe@gmail.com>
Date: Mon, 21 Feb 2022 21:59:41 +0100
Subject: [PATCH 1/3] Rewrite tests for coverage and less duplication

Address minor warnings
Revert making GetInternalMetadataPath mockable
---
 MediaBrowser.Controller/Entities/BaseItem.cs  |   2 +-
 .../MediaInfo/AudioResolver.cs                |   2 +-
 .../MediaInfo/MediaInfoResolver.cs            |   2 +-
 .../MediaInfo/SubtitleResolver.cs             |   2 +-
 .../ExternalFiles/ExternalPathParserTests.cs  |  98 +++++
 .../Jellyfin.Naming.Tests.csproj              |   1 +
 .../MediaInfo/AudioResolverTests.cs           | 192 +++------
 .../MediaInfo/MediaInfoResolverTests.cs       | 375 ++++++++++++++++++
 .../MediaInfo/SubtitleResolverTests.cs        | 215 +++-------
 9 files changed, 572 insertions(+), 317 deletions(-)
 create mode 100644 tests/Jellyfin.Naming.Tests/ExternalFiles/ExternalPathParserTests.cs
 create mode 100644 tests/Jellyfin.Providers.Tests/MediaInfo/MediaInfoResolverTests.cs

diff --git a/MediaBrowser.Controller/Entities/BaseItem.cs b/MediaBrowser.Controller/Entities/BaseItem.cs
index c527328583..0f62e8e1eb 100644
--- a/MediaBrowser.Controller/Entities/BaseItem.cs
+++ b/MediaBrowser.Controller/Entities/BaseItem.cs
@@ -887,7 +887,7 @@ namespace MediaBrowser.Controller.Entities
             return Name;
         }
 
-        public virtual string GetInternalMetadataPath()
+        public string GetInternalMetadataPath()
         {
             var basePath = ConfigurationManager.ApplicationPaths.InternalMetadataPath;
 
diff --git a/MediaBrowser.Providers/MediaInfo/AudioResolver.cs b/MediaBrowser.Providers/MediaInfo/AudioResolver.cs
index 9329978a84..ff90eeffbc 100644
--- a/MediaBrowser.Providers/MediaInfo/AudioResolver.cs
+++ b/MediaBrowser.Providers/MediaInfo/AudioResolver.cs
@@ -12,7 +12,7 @@ namespace MediaBrowser.Providers.MediaInfo
     public class AudioResolver : MediaInfoResolver
     {
         /// <summary>
-        /// Initializes a new instance of the <see cref="MediaInfoResolver"/> class for external audio file processing.
+        /// Initializes a new instance of the <see cref="AudioResolver"/> class for external audio file processing.
         /// </summary>
         /// <param name="localizationManager">The localization manager.</param>
         /// <param name="mediaEncoder">The media encoder.</param>
diff --git a/MediaBrowser.Providers/MediaInfo/MediaInfoResolver.cs b/MediaBrowser.Providers/MediaInfo/MediaInfoResolver.cs
index 83d5e15e29..e88b88cead 100644
--- a/MediaBrowser.Providers/MediaInfo/MediaInfoResolver.cs
+++ b/MediaBrowser.Providers/MediaInfo/MediaInfoResolver.cs
@@ -102,7 +102,7 @@ namespace MediaBrowser.Providers.MediaInfo
 
                 if (mediaInfo.MediaStreams.Count == 1)
                 {
-                    MediaStream mediaStream = mediaInfo.MediaStreams.First();
+                    MediaStream mediaStream = mediaInfo.MediaStreams[0];
                     mediaStream.Index = startIndex++;
                     mediaStream.IsDefault = pathInfo.IsDefault || mediaStream.IsDefault;
                     mediaStream.IsForced = pathInfo.IsForced || mediaStream.IsForced;
diff --git a/MediaBrowser.Providers/MediaInfo/SubtitleResolver.cs b/MediaBrowser.Providers/MediaInfo/SubtitleResolver.cs
index 78b3836e78..289036fdab 100644
--- a/MediaBrowser.Providers/MediaInfo/SubtitleResolver.cs
+++ b/MediaBrowser.Providers/MediaInfo/SubtitleResolver.cs
@@ -12,7 +12,7 @@ namespace MediaBrowser.Providers.MediaInfo
     public class SubtitleResolver : MediaInfoResolver
     {
         /// <summary>
-        /// Initializes a new instance of the <see cref="MediaInfoResolver"/> class for external subtitle file processing.
+        /// Initializes a new instance of the <see cref="SubtitleResolver"/> class for external subtitle file processing.
         /// </summary>
         /// <param name="localizationManager">The localization manager.</param>
         /// <param name="mediaEncoder">The media encoder.</param>
diff --git a/tests/Jellyfin.Naming.Tests/ExternalFiles/ExternalPathParserTests.cs b/tests/Jellyfin.Naming.Tests/ExternalFiles/ExternalPathParserTests.cs
new file mode 100644
index 0000000000..7bc97aa081
--- /dev/null
+++ b/tests/Jellyfin.Naming.Tests/ExternalFiles/ExternalPathParserTests.cs
@@ -0,0 +1,98 @@
+using System.Text.RegularExpressions;
+using Emby.Naming.Common;
+using Emby.Naming.ExternalFiles;
+using MediaBrowser.Model.Dlna;
+using MediaBrowser.Model.Globalization;
+using Moq;
+using Xunit;
+
+namespace Jellyfin.Naming.Tests.ExternalFiles;
+
+public class ExternalPathParserTests
+{
+    private readonly ExternalPathParser _audioPathParser;
+    private readonly ExternalPathParser _subtitlePathParser;
+
+    public ExternalPathParserTests()
+    {
+        var englishCultureDto = new CultureDto("English", "English", "en", new[] { "eng" });
+        var frenchCultureDto = new CultureDto("French", "French", "fr", new[] { "fre", "fra" });
+
+        var localizationManager = new Mock<ILocalizationManager>(MockBehavior.Loose);
+        localizationManager.Setup(lm => lm.FindLanguageInfo(It.IsRegex(@"en.*", RegexOptions.IgnoreCase)))
+            .Returns(englishCultureDto);
+        localizationManager.Setup(lm => lm.FindLanguageInfo(It.IsRegex(@"fr.*", RegexOptions.IgnoreCase)))
+            .Returns(frenchCultureDto);
+
+        _audioPathParser = new ExternalPathParser(new NamingOptions(), localizationManager.Object, DlnaProfileType.Audio);
+        _subtitlePathParser = new ExternalPathParser(new NamingOptions(), localizationManager.Object, DlnaProfileType.Subtitle);
+    }
+
+    [Theory]
+    [InlineData("", false)]
+    [InlineData("MyVideo.srt", false)]
+    [InlineData("MyVideo.mka", true)]
+    public void ParseFile_AudioFile_ReturnsPathWhenAudio(string path, bool valid)
+    {
+        var actual = _audioPathParser.ParseFile(path, string.Empty);
+
+        if (valid)
+        {
+            Assert.NotNull(actual);
+            Assert.Equal(path, actual!.Path);
+        }
+        else
+        {
+            Assert.Null(actual);
+        }
+    }
+
+    [Theory]
+    [InlineData("", false)]
+    [InlineData("MyVideo.srt", true)]
+    [InlineData("MyVideo.mka", false)]
+    public void ParseFile_SubtitleFile_ReturnsPathWhenSubtitle(string path, bool valid)
+    {
+        var actual = _subtitlePathParser.ParseFile(path, string.Empty);
+
+        if (valid)
+        {
+            Assert.NotNull(actual);
+            Assert.Equal(path, actual!.Path);
+        }
+        else
+        {
+            Assert.Null(actual);
+        }
+    }
+
+    [Theory]
+    [InlineData("", null, null)]
+    [InlineData(".default", null, null, true, false)]
+    [InlineData(".forced", null, null, false, true)]
+    [InlineData(".foreign", null, null, false, true)]
+    [InlineData(".default.forced", null, null, true, true)]
+    [InlineData(".forced.default", null, null, true, true)]
+    [InlineData(".DEFAULT.FORCED", null, null, true, true)]
+    [InlineData(".en", null, "eng")]
+    [InlineData(".EN", null, "eng")]
+    [InlineData(".fr.en", "fr", "eng")]
+    [InlineData(".en.fr", "en", "fre")]
+    [InlineData(".title.en.fr", "title.en", "fre")]
+    [InlineData(".Title Goes Here", "Title Goes Here", null)]
+    [InlineData(".Title.with.Separator", "Title.with.Separator", null)]
+    [InlineData(".title.en.default.forced", "title", "eng", true, true)]
+    [InlineData(".forced.default.en.title", "title", "eng", true, true)]
+    public void ParseFile_ExtraTokens_ParseToValues(string tokens, string? title, string? language, bool isDefault = false, bool isForced = false)
+    {
+        var path = "My.Video" + tokens + ".srt";
+
+        var actual = _subtitlePathParser.ParseFile(path, tokens);
+
+        Assert.NotNull(actual);
+        Assert.Equal(title, actual!.Title);
+        Assert.Equal(language, actual.Language);
+        Assert.Equal(isDefault, actual.IsDefault);
+        Assert.Equal(isForced, actual.IsForced);
+    }
+}
diff --git a/tests/Jellyfin.Naming.Tests/Jellyfin.Naming.Tests.csproj b/tests/Jellyfin.Naming.Tests/Jellyfin.Naming.Tests.csproj
index c4f01b2712..cc3d4faa03 100644
--- a/tests/Jellyfin.Naming.Tests/Jellyfin.Naming.Tests.csproj
+++ b/tests/Jellyfin.Naming.Tests/Jellyfin.Naming.Tests.csproj
@@ -13,6 +13,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />
+    <PackageReference Include="Moq" Version="4.16.1" />
     <PackageReference Include="xunit" Version="2.4.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3" />
     <PackageReference Include="coverlet.collector" Version="3.1.2" />
diff --git a/tests/Jellyfin.Providers.Tests/MediaInfo/AudioResolverTests.cs b/tests/Jellyfin.Providers.Tests/MediaInfo/AudioResolverTests.cs
index 69f10d6700..381d6c72d5 100644
--- a/tests/Jellyfin.Providers.Tests/MediaInfo/AudioResolverTests.cs
+++ b/tests/Jellyfin.Providers.Tests/MediaInfo/AudioResolverTests.cs
@@ -1,177 +1,79 @@
-using System;
 using System.Collections.Generic;
-using System.Text.RegularExpressions;
 using System.Threading;
 using System.Threading.Tasks;
 using Emby.Naming.Common;
+using MediaBrowser.Controller;
+using MediaBrowser.Controller.Configuration;
 using MediaBrowser.Controller.Entities;
+using MediaBrowser.Controller.Entities.Movies;
 using MediaBrowser.Controller.Library;
+using MediaBrowser.Controller.LiveTv;
 using MediaBrowser.Controller.MediaEncoding;
-using MediaBrowser.Controller.Providers;
 using MediaBrowser.Model.Entities;
 using MediaBrowser.Model.Globalization;
 using MediaBrowser.Providers.MediaInfo;
 using Moq;
 using Xunit;
 
-namespace Jellyfin.Providers.Tests.MediaInfo
+namespace Jellyfin.Providers.Tests.MediaInfo;
+
+public class AudioResolverTests
 {
-    public class AudioResolverTests
+    private readonly AudioResolver _audioResolver;
+
+    public AudioResolverTests()
     {
-        private const string VideoDirectoryPath = "Test Data/Video";
-        private const string MetadataDirectoryPath = "Test Data/Metadata";
-        private readonly AudioResolver _audioResolver;
+        // prep BaseItem and Video for calls made that expect managers
+        Video.LiveTvManager = Mock.Of<ILiveTvManager>();
 
-        public AudioResolverTests()
-        {
-            var englishCultureDto = new CultureDto("English", "English", "en", new[] { "eng" });
+        var applicationPaths = new Mock<IServerApplicationPaths>().Object;
+        var serverConfig = new Mock<IServerConfigurationManager>();
+        serverConfig.Setup(c => c.ApplicationPaths)
+            .Returns(applicationPaths);
+        BaseItem.ConfigurationManager = serverConfig.Object;
 
-            var localizationManager = new Mock<ILocalizationManager>(MockBehavior.Loose);
-            localizationManager.Setup(lm => lm.FindLanguageInfo(It.IsRegex(@"en.*", RegexOptions.IgnoreCase)))
-                .Returns(englishCultureDto);
+        // build resolver to test with
+        var localizationManager = Mock.Of<ILocalizationManager>();
 
-            var mediaEncoder = new Mock<IMediaEncoder>(MockBehavior.Strict);
-            mediaEncoder.Setup(me => me.GetMediaInfo(It.IsAny<MediaInfoRequest>(), It.IsAny<CancellationToken>()))
-                .Returns<MediaInfoRequest, CancellationToken>((_, _) => Task.FromResult(new MediaBrowser.Model.MediaInfo.MediaInfo
+        var mediaEncoder = new Mock<IMediaEncoder>(MockBehavior.Strict);
+        mediaEncoder.Setup(me => me.GetMediaInfo(It.IsAny<MediaInfoRequest>(), It.IsAny<CancellationToken>()))
+            .Returns<MediaInfoRequest, CancellationToken>((_, _) => Task.FromResult(new MediaBrowser.Model.MediaInfo.MediaInfo
+            {
+                MediaStreams = new List<MediaStream>
                 {
-                    MediaStreams = new List<MediaStream>
-                    {
-                        new()
-                    }
-                }));
+                    new()
+                }
+            }));
 
-            _audioResolver = new AudioResolver(localizationManager.Object, mediaEncoder.Object, new NamingOptions());
-        }
+        _audioResolver = new AudioResolver(localizationManager, mediaEncoder.Object, new NamingOptions());
+    }
 
-        [Fact]
-        public async void AddExternalStreamsAsync_GivenMixedFilenames_ReturnsValidSubtitles()
+    [Theory]
+    [InlineData("My.Video.srt", false, false)]
+    [InlineData("My.Video.mp3", false, true)]
+    [InlineData("My.Video.srt", true, false)]
+    [InlineData("My.Video.mp3", true, true)]
+    public async void GetExternalStreams_MixedFilenames_PicksAudio(string file, bool metadataDirectory, bool matches)
+    {
+        BaseItem.MediaSourceManager = Mock.Of<IMediaSourceManager>();
+
+        var video = new Movie
         {
-            var startIndex = 0;
-            var index = startIndex;
-            var files = new[]
-            {
-                VideoDirectoryPath + "/MyVideo.en.aac",
-                VideoDirectoryPath + "/MyVideo.en.forced.default.dts",
-                VideoDirectoryPath + "/My.Video.mp3",
-                VideoDirectoryPath + "/Some.Other.Video.mp3",
-                VideoDirectoryPath + "/My.Video.png",
-                VideoDirectoryPath + "/My.Video.srt",
-                VideoDirectoryPath + "/My.Video.txt",
-                VideoDirectoryPath + "/My.Video.vtt",
-                VideoDirectoryPath + "/My.Video.ass",
-                VideoDirectoryPath + "/My.Video.sub",
-                VideoDirectoryPath + "/My.Video.ssa",
-                VideoDirectoryPath + "/My.Video.smi",
-                VideoDirectoryPath + "/My.Video.sami",
-                VideoDirectoryPath + "/My.Video.en.mp3",
-                VideoDirectoryPath + "/My.Video.en.forced.mp3",
-                VideoDirectoryPath + "/My.Video.en.default.forced.aac",
-                VideoDirectoryPath + "/My.Video.Label.mp3",
-                VideoDirectoryPath + "/My.Video.With Additional Garbage.en.aac",
-                VideoDirectoryPath + "/My.Video.With.Additional.Garbage.en.mp3"
-            };
-            var metadataFiles = new[]
-            {
-                MetadataDirectoryPath + "/My.Video.en.aac"
-            };
-            var expectedResult = new[]
-            {
-                CreateMediaStream(VideoDirectoryPath + "/MyVideo.en.aac", "eng", null, index++),
-                CreateMediaStream(VideoDirectoryPath + "/MyVideo.en.forced.default.dts", "eng", null, index++, isDefault: true, isForced: true),
-                CreateMediaStream(VideoDirectoryPath + "/My.Video.mp3", null, null, index++),
-                CreateMediaStream(VideoDirectoryPath + "/My.Video.en.mp3", "eng", null, index++),
-                CreateMediaStream(VideoDirectoryPath + "/My.Video.en.forced.mp3", "eng", null, index++, isDefault: false, isForced: true),
-                CreateMediaStream(VideoDirectoryPath + "/My.Video.en.default.forced.aac", "eng", null, index++, isDefault: true, isForced: true),
-                CreateMediaStream(VideoDirectoryPath + "/My.Video.Label.mp3", null, "Label", index++),
-                CreateMediaStream(VideoDirectoryPath + "/My.Video.With Additional Garbage.en.aac", "eng", "With Additional Garbage", index++),
-                CreateMediaStream(VideoDirectoryPath + "/My.Video.With.Additional.Garbage.en.mp3", "eng", "With.Additional.Garbage", index++),
-                CreateMediaStream(MetadataDirectoryPath + "/My.Video.en.aac", "eng", null, index)
-            };
+            Path = MediaInfoResolverTests.VideoDirectoryPath + "/My.Video.mkv"
+        };
 
-            BaseItem.MediaSourceManager = Mock.Of<IMediaSourceManager>();
+        var directoryService = MediaInfoResolverTests.GetDirectoryServiceForExternalFile(file, metadataDirectory);
+        var streams = await _audioResolver.GetExternalStreamsAsync(video, 0, directoryService, false, CancellationToken.None);
 
-            var video = new Mock<Video>();
-            video.CallBase = true;
-            video.Setup(moq => moq.Path).Returns(VideoDirectoryPath + "/My.Video.mkv");
-            video.Setup(moq => moq.GetInternalMetadataPath()).Returns(MetadataDirectoryPath);
-
-            var directoryService = new Mock<IDirectoryService>(MockBehavior.Strict);
-            directoryService.Setup(ds => ds.GetFilePaths(It.IsRegex(@"Test Data[/\\]Video"), It.IsAny<bool>(), It.IsAny<bool>()))
-                .Returns(files);
-            directoryService.Setup(ds => ds.GetFilePaths(It.IsRegex(@"Test Data[/\\]Metadata"), It.IsAny<bool>(), It.IsAny<bool>()))
-                .Returns(metadataFiles);
-
-            var streams = await _audioResolver.GetExternalStreamsAsync(video.Object, startIndex, directoryService.Object, false, CancellationToken.None);
-
-            Assert.Equal(expectedResult.Length, streams.Count);
-            for (var i = 0; i < expectedResult.Length; i++)
-            {
-                var expected = expectedResult[i];
-                var actual = streams[i];
-
-                Assert.Equal(expected.Index, actual.Index);
-                Assert.Equal(expected.Type, actual.Type);
-                Assert.Equal(expected.IsExternal, actual.IsExternal);
-                Assert.Equal(expected.Path, actual.Path);
-                Assert.Equal(expected.Language, actual.Language);
-                Assert.Equal(expected.Title, actual.Title);
-            }
-        }
-
-        [Theory]
-        [InlineData("MyVideo.en.aac", "eng", null, false, false)]
-        [InlineData("MyVideo.en.forced.default.dts", "eng", null, true, true)]
-        [InlineData("My.Video.mp3", null, null, false, false)]
-        [InlineData("My.Video.English.mp3", "eng", null, false, false)]
-        [InlineData("My.Video.Title.mp3", null, "Title", false, false)]
-        [InlineData("My.Video.forced.English.mp3", "eng", null, true, false)]
-        [InlineData("My.Video.default.English.mp3", "eng", null, false, true)]
-        [InlineData("My.Video.English.forced.default.Title.mp3", "eng", "Title", true, true)]
-        public async void AddExternalStreamsAsync_GivenSingleFile_ReturnsExpectedStream(string file, string? language, string? title, bool isForced, bool isDefault)
+        if (matches)
         {
-            BaseItem.MediaSourceManager = Mock.Of<IMediaSourceManager>();
-
-            var video = new Mock<Video>();
-            video.CallBase = true;
-            video.Setup(moq => moq.Path).Returns(VideoDirectoryPath + "/My.Video.mkv");
-            video.Setup(moq => moq.GetInternalMetadataPath()).Returns(MetadataDirectoryPath);
-
-            var directoryService = new Mock<IDirectoryService>(MockBehavior.Strict);
-            directoryService.Setup(ds => ds.GetFilePaths(It.IsRegex(@"Test Data[/\\]Video"), It.IsAny<bool>(), It.IsAny<bool>()))
-                .Returns(new[] { VideoDirectoryPath + "/" + file });
-            directoryService.Setup(ds => ds.GetFilePaths(It.IsRegex(@"Test Data[/\\]Metadata"), It.IsAny<bool>(), It.IsAny<bool>()))
-                .Returns(Array.Empty<string>());
-
-            var streams = await _audioResolver.GetExternalStreamsAsync(video.Object, 0, directoryService.Object, false, CancellationToken.None);
-
             Assert.Single(streams);
-
             var actual = streams[0];
-
-            var expected = CreateMediaStream(VideoDirectoryPath + "/" + file, language, title, 0, isForced, isDefault);
-            Assert.Equal(expected.Index, actual.Index);
-            Assert.Equal(expected.Type, actual.Type);
-            Assert.Equal(expected.IsExternal, actual.IsExternal);
-            Assert.Equal(expected.Path, actual.Path);
-            Assert.Equal(expected.Language, actual.Language);
-            Assert.Equal(expected.Title, actual.Title);
-            Assert.Equal(expected.IsDefault, actual.IsDefault);
-            Assert.Equal(expected.IsForced, actual.IsForced);
+            Assert.Equal(MediaStreamType.Audio, actual.Type);
         }
-
-        private static MediaStream CreateMediaStream(string path, string? language, string? title, int index, bool isForced = false, bool isDefault = false)
+        else
         {
-            return new()
-            {
-                Index = index,
-                Type = MediaStreamType.Audio,
-                IsExternal = true,
-                Path = path,
-                Language = language,
-                Title = title,
-                IsForced = isForced,
-                IsDefault = isDefault
-            };
+            Assert.Empty(streams);
         }
     }
 }
diff --git a/tests/Jellyfin.Providers.Tests/MediaInfo/MediaInfoResolverTests.cs b/tests/Jellyfin.Providers.Tests/MediaInfo/MediaInfoResolverTests.cs
new file mode 100644
index 0000000000..02bf878a01
--- /dev/null
+++ b/tests/Jellyfin.Providers.Tests/MediaInfo/MediaInfoResolverTests.cs
@@ -0,0 +1,375 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text.RegularExpressions;
+using System.Threading;
+using System.Threading.Tasks;
+using Emby.Naming.Common;
+using MediaBrowser.Controller;
+using MediaBrowser.Controller.Configuration;
+using MediaBrowser.Controller.Entities;
+using MediaBrowser.Controller.Entities.Movies;
+using MediaBrowser.Controller.Library;
+using MediaBrowser.Controller.LiveTv;
+using MediaBrowser.Controller.MediaEncoding;
+using MediaBrowser.Controller.Providers;
+using MediaBrowser.Model.Entities;
+using MediaBrowser.Model.Globalization;
+using MediaBrowser.Model.MediaInfo;
+using MediaBrowser.Providers.MediaInfo;
+using Moq;
+using Xunit;
+
+namespace Jellyfin.Providers.Tests.MediaInfo;
+
+public class MediaInfoResolverTests
+{
+    public const string VideoDirectoryPath = "Test Data/Video";
+    private const string VideoDirectoryRegex = @"Test Data[/\\]Video";
+    private const string MetadataDirectoryPath = "library/00/00000000000000000000000000000000";
+    private const string MetadataDirectoryRegex = @"library.*";
+
+    private readonly ILocalizationManager _localizationManager;
+    private readonly MediaInfoResolver _subtitleResolver;
+
+    public MediaInfoResolverTests()
+    {
+        // prep BaseItem and Video for calls made that expect managers
+        Video.LiveTvManager = Mock.Of<ILiveTvManager>();
+
+        var applicationPaths = new Mock<IServerApplicationPaths>().Object;
+        var serverConfig = new Mock<IServerConfigurationManager>();
+        serverConfig.Setup(c => c.ApplicationPaths)
+            .Returns(applicationPaths);
+        BaseItem.ConfigurationManager = serverConfig.Object;
+
+        // build resolver to test with
+        var englishCultureDto = new CultureDto("English", "English", "en", new[] { "eng" });
+
+        var localizationManager = new Mock<ILocalizationManager>(MockBehavior.Loose);
+        localizationManager.Setup(lm => lm.FindLanguageInfo(It.IsRegex(@"en.*", RegexOptions.IgnoreCase)))
+            .Returns(englishCultureDto);
+        _localizationManager = localizationManager.Object;
+
+        var mediaEncoder = new Mock<IMediaEncoder>(MockBehavior.Strict);
+        mediaEncoder.Setup(me => me.GetMediaInfo(It.IsAny<MediaInfoRequest>(), It.IsAny<CancellationToken>()))
+            .Returns<MediaInfoRequest, CancellationToken>((_, _) => Task.FromResult(new MediaBrowser.Model.MediaInfo.MediaInfo
+            {
+                MediaStreams = new List<MediaStream>
+                {
+                    new()
+                }
+            }));
+
+        _subtitleResolver = new SubtitleResolver(_localizationManager, mediaEncoder.Object, new NamingOptions());
+    }
+
+    [Theory]
+    [InlineData("https://url.com/My.Video.mkv")]
+    [InlineData("non-existent/path")]
+    public void GetExternalFiles_BadPaths_ReturnsNoSubtitles(string path)
+    {
+        // need a media source manager capable of returning something other than file protocol
+        var mediaSourceManager = new Mock<IMediaSourceManager>();
+        mediaSourceManager.Setup(m => m.GetPathProtocol(It.IsRegex(@"http.*")))
+            .Returns(MediaProtocol.Http);
+        BaseItem.MediaSourceManager = mediaSourceManager.Object;
+
+        var video = new Movie
+        {
+            Path = path
+        };
+
+        var files = _subtitleResolver.GetExternalFiles(video, Mock.Of<IDirectoryService>(), false);
+
+        Assert.Empty(files);
+    }
+
+    [Theory]
+    [InlineData("My.Video.srt", null)] // exact
+    [InlineData("My.Video.en.srt", "eng")]
+    [InlineData("MyVideo.en.srt", "eng")] // shorter title
+    [InlineData("My _ Video.en.srt", "eng")] // longer title
+    [InlineData("My.Video.en.srt", "eng", true)]
+    public void GetExternalFiles_FuzzyMatching_MatchesAndParsesToken(string file, string? language, bool metadataDirectory = false)
+    {
+        BaseItem.MediaSourceManager = Mock.Of<IMediaSourceManager>();
+
+        var video = new Movie
+        {
+            Path = VideoDirectoryPath + "/My.Video.mkv"
+        };
+
+        var directoryService = GetDirectoryServiceForExternalFile(file, metadataDirectory);
+        var streams = _subtitleResolver.GetExternalFiles(video, directoryService, false).ToList();
+
+        Assert.Single(streams);
+        var actual = streams[0];
+        Assert.Equal(language, actual.Language);
+        Assert.Null(actual.Title);
+    }
+
+    [Theory]
+    [InlineData("My.Video.mp3")]
+    [InlineData("My.Video.png")]
+    [InlineData("My.Video.txt")]
+    // [InlineData("My.Video Sequel.srt")]
+    [InlineData("Some.Other.Video.srt")]
+    public void GetExternalFiles_FuzzyMatching_RejectsNonMatches(string file)
+    {
+        BaseItem.MediaSourceManager = Mock.Of<IMediaSourceManager>();
+
+        var video = new Movie
+        {
+            Path = VideoDirectoryPath + "/My.Video.mkv"
+        };
+
+        var directoryService = GetDirectoryServiceForExternalFile(file);
+        var streams = _subtitleResolver.GetExternalFiles(video, directoryService, false).ToList();
+
+        Assert.Empty(streams);
+    }
+
+    [Theory]
+    [InlineData("https://url.com/My.Video.mkv")]
+    [InlineData("non-existent/path")]
+    [InlineData(VideoDirectoryPath)] // valid but no files found for this test
+    public async void GetExternalStreams_BadPaths_ReturnsNoSubtitles(string path)
+    {
+        // need a media source manager capable of returning something other than file protocol
+        var mediaSourceManager = new Mock<IMediaSourceManager>();
+        mediaSourceManager.Setup(m => m.GetPathProtocol(It.IsRegex(@"http.*")))
+            .Returns(MediaProtocol.Http);
+        BaseItem.MediaSourceManager = mediaSourceManager.Object;
+
+        var video = new Movie
+        {
+            Path = path
+        };
+
+        var directoryService = new Mock<IDirectoryService>(MockBehavior.Strict);
+        directoryService.Setup(ds => ds.GetFilePaths(It.IsAny<string>(), It.IsAny<bool>(), It.IsAny<bool>()))
+            .Returns(Array.Empty<string>());
+
+        var mediaEncoder = Mock.Of<IMediaEncoder>(MockBehavior.Strict);
+
+        var subtitleResolver = new SubtitleResolver(_localizationManager, mediaEncoder, new NamingOptions());
+
+        var streams = await subtitleResolver.GetExternalStreamsAsync(video, 0, directoryService.Object, false, CancellationToken.None);
+
+        Assert.Empty(streams);
+    }
+
+    private static TheoryData<string, MediaStream[], MediaStream[]> GetExternalStreams_MergeMetadata_HandlesOverridesCorrectly_Data()
+    {
+        var data = new TheoryData<string, MediaStream[], MediaStream[]>();
+
+        // filename and stream have no metadata set
+        string file = "My.Video.srt";
+        data.Add(
+            file,
+            new[]
+            {
+                CreateMediaStream(VideoDirectoryPath + "/" + file, null, null, 0)
+            },
+            new[]
+            {
+                CreateMediaStream(VideoDirectoryPath + "/" + file, null, null, 0)
+            });
+
+        // filename has metadata
+        file = "My.Video.Title1.default.forced.en.srt";
+        data.Add(
+            file,
+            new[]
+            {
+                CreateMediaStream(VideoDirectoryPath + "/" + file, null, null, 0)
+            },
+            new[]
+            {
+                CreateMediaStream(VideoDirectoryPath + "/" + file, "eng", "Title1", 0, true, true)
+            });
+
+        // single stream with metadata
+        file = "My.Video.mks";
+        data.Add(
+            file,
+            new[]
+            {
+                CreateMediaStream(VideoDirectoryPath + "/" + file, "eng", "Title", 0, true, true)
+            },
+            new[]
+            {
+                CreateMediaStream(VideoDirectoryPath + "/" + file, "eng", "Title", 0, true, true)
+            });
+
+        // stream wins for title/language, filename wins for flags when conflicting
+        file = "My.Video.Title2.default.forced.en.srt";
+        data.Add(
+            file,
+            new[]
+            {
+                CreateMediaStream(VideoDirectoryPath + "/" + file, "fra", "Metadata", 0)
+            },
+            new[]
+            {
+                CreateMediaStream(VideoDirectoryPath + "/" + file, "fra", "Metadata", 0, true, true)
+            });
+
+        // multiple stream with metadata - filename flags ignored but other data filled in when missing from stream
+        file = "My.Video.Title3.default.forced.en.srt";
+        data.Add(
+            file,
+            new[]
+            {
+                CreateMediaStream(VideoDirectoryPath + "/" + file, null, null, 0, true, true),
+                CreateMediaStream(VideoDirectoryPath + "/" + file, "fra", "Metadata", 1)
+            },
+            new[]
+            {
+                CreateMediaStream(VideoDirectoryPath + "/" + file, "eng", "Title3", 0, true, true),
+                CreateMediaStream(VideoDirectoryPath + "/" + file, "fra", "Metadata", 1)
+            });
+
+        return data;
+    }
+
+    [Theory]
+    [MemberData(nameof(GetExternalStreams_MergeMetadata_HandlesOverridesCorrectly_Data))]
+    public async void GetExternalStreams_MergeMetadata_HandlesOverridesCorrectly(string file, MediaStream[] inputStreams, MediaStream[] expectedStreams)
+    {
+        BaseItem.MediaSourceManager = Mock.Of<IMediaSourceManager>();
+
+        var video = new Movie
+        {
+            Path = VideoDirectoryPath + "/My.Video.mkv"
+        };
+
+        var mediaEncoder = new Mock<IMediaEncoder>(MockBehavior.Strict);
+        mediaEncoder.Setup(me => me.GetMediaInfo(It.IsAny<MediaInfoRequest>(), It.IsAny<CancellationToken>()))
+            .Returns<MediaInfoRequest, CancellationToken>((_, _) => Task.FromResult(new MediaBrowser.Model.MediaInfo.MediaInfo
+            {
+                MediaStreams = inputStreams.ToList()
+            }));
+
+        var subtitleResolver = new SubtitleResolver(_localizationManager, mediaEncoder.Object, new NamingOptions());
+
+        var directoryService = GetDirectoryServiceForExternalFile(file);
+        var streams = await subtitleResolver.GetExternalStreamsAsync(video, 0, directoryService, false, CancellationToken.None);
+
+        Assert.Equal(expectedStreams.Length, streams.Count);
+        for (var i = 0; i < expectedStreams.Length; i++)
+        {
+            var expected = expectedStreams[i];
+            var actual = streams[i];
+
+            Assert.True(actual.IsExternal);
+            Assert.Equal(expected.Index, actual.Index);
+            Assert.Equal(expected.Type, actual.Type);
+            Assert.Equal(expected.Path, actual.Path);
+            Assert.Equal(expected.IsDefault, actual.IsDefault);
+            Assert.Equal(expected.IsForced, actual.IsForced);
+            Assert.Equal(expected.Language, actual.Language);
+            Assert.Equal(expected.Title, actual.Title);
+        }
+    }
+
+    [Theory]
+    [InlineData(1, 1)]
+    [InlineData(1, 2)]
+    [InlineData(2, 1)]
+    [InlineData(2, 2)]
+    public async void GetExternalStreams_StreamIndex_HandlesFilesAndContainers(int fileCount, int streamCount)
+    {
+        BaseItem.MediaSourceManager = Mock.Of<IMediaSourceManager>();
+
+        var video = new Movie
+        {
+            Path = VideoDirectoryPath + "/My.Video.mkv"
+        };
+
+        var files = new string[fileCount];
+        for (int i = 0; i < fileCount; i++)
+        {
+            files[i] = $"{VideoDirectoryPath}/MyVideo.{i}.srt";
+        }
+
+        var directoryService = new Mock<IDirectoryService>(MockBehavior.Strict);
+        directoryService.Setup(ds => ds.GetFilePaths(It.IsRegex(VideoDirectoryRegex), It.IsAny<bool>(), It.IsAny<bool>()))
+            .Returns(files);
+        directoryService.Setup(ds => ds.GetFilePaths(It.IsRegex(MetadataDirectoryRegex), It.IsAny<bool>(), It.IsAny<bool>()))
+            .Returns(Array.Empty<string>());
+
+        List<MediaStream> GenerateMediaStreams()
+        {
+            var mediaStreams = new List<MediaStream>();
+            for (int i = 0; i < streamCount; i++)
+            {
+                mediaStreams.Add(new());
+            }
+
+            return mediaStreams;
+        }
+
+        var mediaEncoder = new Mock<IMediaEncoder>(MockBehavior.Strict);
+        mediaEncoder.Setup(me => me.GetMediaInfo(It.IsAny<MediaInfoRequest>(), It.IsAny<CancellationToken>()))
+            .Returns<MediaInfoRequest, CancellationToken>((_, _) => Task.FromResult(new MediaBrowser.Model.MediaInfo.MediaInfo
+            {
+                MediaStreams = GenerateMediaStreams()
+            }));
+
+        var subtitleResolver = new SubtitleResolver(_localizationManager, mediaEncoder.Object, new NamingOptions());
+
+        int startIndex = 1;
+        var streams = await subtitleResolver.GetExternalStreamsAsync(video, startIndex, directoryService.Object, false, CancellationToken.None);
+
+        Assert.Equal(fileCount * streamCount, streams.Count);
+        for (var i = 0; i < streams.Count; i++)
+        {
+            Assert.Equal(startIndex + i, streams[i].Index);
+            // intentional integer division to ensure correct number of streams come back from each file
+            Assert.Matches(@$".*\.{i / streamCount}\.srt", streams[i].Path);
+        }
+    }
+
+    private static MediaStream CreateMediaStream(string path, string? language, string? title, int index, bool isForced = false, bool isDefault = false)
+    {
+        return new MediaStream
+        {
+            Index = index,
+            Type = MediaStreamType.Subtitle,
+            Path = path,
+            IsDefault = isDefault,
+            IsForced = isForced,
+            Language = language,
+            Title = title
+        };
+    }
+
+    /// <summary>
+    /// Provides an <see cref="IDirectoryService"/> that when queried for the test video/metadata directory will return a path including the provided file name.
+    /// </summary>
+    /// <param name="file">The name of the file to locate.</param>
+    /// <param name="useMetadataDirectory"><c>true</c> if the file belongs in the metadata directory.</param>
+    /// <returns>A mocked <see cref="IDirectoryService"/>.</returns>
+    public static IDirectoryService GetDirectoryServiceForExternalFile(string file, bool useMetadataDirectory = false)
+    {
+        var directoryService = new Mock<IDirectoryService>(MockBehavior.Strict);
+        if (useMetadataDirectory)
+        {
+            directoryService.Setup(ds => ds.GetFilePaths(It.IsRegex(VideoDirectoryRegex), It.IsAny<bool>(), It.IsAny<bool>()))
+                .Returns(Array.Empty<string>());
+            directoryService.Setup(ds => ds.GetFilePaths(It.IsRegex(MetadataDirectoryRegex), It.IsAny<bool>(), It.IsAny<bool>()))
+                .Returns(new[] { MetadataDirectoryPath + "/" + file });
+        }
+        else
+        {
+            directoryService.Setup(ds => ds.GetFilePaths(It.IsRegex(VideoDirectoryRegex), It.IsAny<bool>(), It.IsAny<bool>()))
+                .Returns(new[] { VideoDirectoryPath + "/" + file });
+            directoryService.Setup(ds => ds.GetFilePaths(It.IsRegex(MetadataDirectoryRegex), It.IsAny<bool>(), It.IsAny<bool>()))
+                .Returns(Array.Empty<string>());
+        }
+
+        return directoryService.Object;
+    }
+}
diff --git a/tests/Jellyfin.Providers.Tests/MediaInfo/SubtitleResolverTests.cs b/tests/Jellyfin.Providers.Tests/MediaInfo/SubtitleResolverTests.cs
index 2532d8926a..0f1086f59b 100644
--- a/tests/Jellyfin.Providers.Tests/MediaInfo/SubtitleResolverTests.cs
+++ b/tests/Jellyfin.Providers.Tests/MediaInfo/SubtitleResolverTests.cs
@@ -1,200 +1,79 @@
-using System;
 using System.Collections.Generic;
-using System.Text.RegularExpressions;
 using System.Threading;
 using System.Threading.Tasks;
 using Emby.Naming.Common;
+using MediaBrowser.Controller;
+using MediaBrowser.Controller.Configuration;
 using MediaBrowser.Controller.Entities;
+using MediaBrowser.Controller.Entities.Movies;
 using MediaBrowser.Controller.Library;
+using MediaBrowser.Controller.LiveTv;
 using MediaBrowser.Controller.MediaEncoding;
-using MediaBrowser.Controller.Providers;
 using MediaBrowser.Model.Entities;
 using MediaBrowser.Model.Globalization;
 using MediaBrowser.Providers.MediaInfo;
 using Moq;
 using Xunit;
 
-namespace Jellyfin.Providers.Tests.MediaInfo
+namespace Jellyfin.Providers.Tests.MediaInfo;
+
+public class SubtitleResolverTests
 {
-    public class SubtitleResolverTests
+    private readonly SubtitleResolver _subtitleResolver;
+
+    public SubtitleResolverTests()
     {
-        private const string VideoDirectoryPath = "Test Data/Video";
-        private const string MetadataDirectoryPath = "Test Data/Metadata";
-        private readonly SubtitleResolver _subtitleResolver;
+        // prep BaseItem and Video for calls made that expect managers
+        Video.LiveTvManager = Mock.Of<ILiveTvManager>();
 
-        public SubtitleResolverTests()
-        {
-            var englishCultureDto = new CultureDto("English", "English", "en", new[] { "eng" });
-            var frenchCultureDto = new CultureDto("French", "French", "fr", new[] { "fre", "fra" });
+        var applicationPaths = new Mock<IServerApplicationPaths>().Object;
+        var serverConfig = new Mock<IServerConfigurationManager>();
+        serverConfig.Setup(c => c.ApplicationPaths)
+            .Returns(applicationPaths);
+        BaseItem.ConfigurationManager = serverConfig.Object;
 
-            var localizationManager = new Mock<ILocalizationManager>(MockBehavior.Loose);
-            localizationManager.Setup(lm => lm.FindLanguageInfo(It.IsRegex(@"en.*", RegexOptions.IgnoreCase)))
-                .Returns(englishCultureDto);
-            localizationManager.Setup(lm => lm.FindLanguageInfo(It.IsRegex(@"fr.*", RegexOptions.IgnoreCase)))
-                .Returns(frenchCultureDto);
+        // build resolver to test with
+        var localizationManager = Mock.Of<ILocalizationManager>();
 
-            var mediaEncoder = new Mock<IMediaEncoder>(MockBehavior.Strict);
-            mediaEncoder.Setup(me => me.GetMediaInfo(It.IsAny<MediaInfoRequest>(), It.IsAny<CancellationToken>()))
-                .Returns<MediaInfoRequest, CancellationToken>((_, _) => Task.FromResult(new MediaBrowser.Model.MediaInfo.MediaInfo
+        var mediaEncoder = new Mock<IMediaEncoder>(MockBehavior.Strict);
+        mediaEncoder.Setup(me => me.GetMediaInfo(It.IsAny<MediaInfoRequest>(), It.IsAny<CancellationToken>()))
+            .Returns<MediaInfoRequest, CancellationToken>((_, _) => Task.FromResult(new MediaBrowser.Model.MediaInfo.MediaInfo
+            {
+                MediaStreams = new List<MediaStream>
                 {
-                    MediaStreams = new List<MediaStream>
-                    {
-                        new()
-                    }
-                }));
+                    new()
+                }
+            }));
 
-            _subtitleResolver = new SubtitleResolver(localizationManager.Object, mediaEncoder.Object, new NamingOptions());
-        }
+        _subtitleResolver = new SubtitleResolver(localizationManager, mediaEncoder.Object, new NamingOptions());
+    }
 
-        [Fact]
-        public async void AddExternalStreamsAsync_GivenMixedFilenames_ReturnsValidSubtitles()
+    [Theory]
+    [InlineData("My.Video.srt", false, true)]
+    [InlineData("My.Video.mp3", false, false)]
+    [InlineData("My.Video.srt", true, true)]
+    [InlineData("My.Video.mp3", true, false)]
+    public async void GetExternalStreams_MixedFilenames_PicksSubtitles(string file, bool metadataDirectory, bool matches)
+    {
+        BaseItem.MediaSourceManager = Mock.Of<IMediaSourceManager>();
+
+        var video = new Movie
         {
-            var startIndex = 0;
-            var index = startIndex;
-            var files = new[]
-            {
-                VideoDirectoryPath + "/MyVideo.en.srt",
-                VideoDirectoryPath + "/MyVideo.en.forced.default.sub",
-                VideoDirectoryPath + "/My.Video.mp3",
-                VideoDirectoryPath + "/My.Video.png",
-                VideoDirectoryPath + "/My.Video.srt",
-                VideoDirectoryPath + "/My.Video.txt",
-                VideoDirectoryPath + "/My.Video.vtt",
-                VideoDirectoryPath + "/My.Video.ass",
-                VideoDirectoryPath + "/My.Video.sub",
-                VideoDirectoryPath + "/My.Video.ssa",
-                VideoDirectoryPath + "/My.Video.smi",
-                VideoDirectoryPath + "/My.Video.sami",
-                VideoDirectoryPath + "/My.Video.mks",
-                VideoDirectoryPath + "/My.Video.en.srt",
-                VideoDirectoryPath + "/My.Video.default.en.srt",
-                VideoDirectoryPath + "/My.Video.default.forced.en.srt",
-                VideoDirectoryPath + "/My.Video.en.default.forced.srt",
-                VideoDirectoryPath + "/My.Video.en.With Additional Garbage.sub",
-                VideoDirectoryPath + "/My.Video.With Additional Garbage.English.sub",
-                VideoDirectoryPath + "/My.Video.With.Additional.Garbage.en.srt",
-                VideoDirectoryPath + "/Some.Other.Video.srt"
-            };
-            var metadataFiles = new[]
-            {
-                MetadataDirectoryPath + "/My.Video.en.srt"
-            };
-            var expectedResult = new[]
-            {
-                CreateMediaStream(VideoDirectoryPath + "/MyVideo.en.srt", "srt", "eng", null, index++),
-                CreateMediaStream(VideoDirectoryPath + "/MyVideo.en.forced.default.sub", "sub", "eng", null, index++, isDefault: true, isForced: true),
-                CreateMediaStream(VideoDirectoryPath + "/My.Video.srt", "srt", null, null, index++),
-                CreateMediaStream(VideoDirectoryPath + "/My.Video.vtt", "vtt", null, null, index++),
-                CreateMediaStream(VideoDirectoryPath + "/My.Video.ass", "ass", null, null, index++),
-                CreateMediaStream(VideoDirectoryPath + "/My.Video.sub", "sub", null, null, index++),
-                CreateMediaStream(VideoDirectoryPath + "/My.Video.ssa", "ssa", null, null, index++),
-                CreateMediaStream(VideoDirectoryPath + "/My.Video.smi", "smi", null, null, index++),
-                CreateMediaStream(VideoDirectoryPath + "/My.Video.sami", "sami", null, null, index++),
-                CreateMediaStream(VideoDirectoryPath + "/My.Video.mks", "mks", null, null, index++),
-                CreateMediaStream(VideoDirectoryPath + "/My.Video.en.srt", "srt", "eng", null, index++),
-                CreateMediaStream(VideoDirectoryPath + "/My.Video.default.en.srt", "srt", "eng", null, index++, isDefault: true),
-                CreateMediaStream(VideoDirectoryPath + "/My.Video.default.forced.en.srt", "srt", "eng", null, index++, isForced: true, isDefault: true),
-                CreateMediaStream(VideoDirectoryPath + "/My.Video.en.default.forced.srt", "srt", "eng", null, index++, isForced: true, isDefault: true),
-                CreateMediaStream(VideoDirectoryPath + "/My.Video.en.With Additional Garbage.sub", "sub", "eng", "With Additional Garbage", index++),
-                CreateMediaStream(VideoDirectoryPath + "/My.Video.With Additional Garbage.English.sub", "sub", "eng", "With Additional Garbage", index++),
-                CreateMediaStream(VideoDirectoryPath + "/My.Video.With.Additional.Garbage.en.srt", "srt", "eng", "With.Additional.Garbage", index++),
-                CreateMediaStream(MetadataDirectoryPath + "/My.Video.en.srt", "srt", "eng", null, index)
-            };
+            Path = MediaInfoResolverTests.VideoDirectoryPath + "/My.Video.mkv"
+        };
 
-            BaseItem.MediaSourceManager = Mock.Of<IMediaSourceManager>();
+        var directoryService = MediaInfoResolverTests.GetDirectoryServiceForExternalFile(file, metadataDirectory);
+        var streams = await _subtitleResolver.GetExternalStreamsAsync(video, 0, directoryService, false, CancellationToken.None);
 
-            var video = new Mock<Video>();
-            video.CallBase = true;
-            video.Setup(moq => moq.Path).Returns(VideoDirectoryPath + "/My.Video.mkv");
-            video.Setup(moq => moq.GetInternalMetadataPath()).Returns(MetadataDirectoryPath);
-
-            var directoryService = new Mock<IDirectoryService>(MockBehavior.Strict);
-            directoryService.Setup(ds => ds.GetFilePaths(It.IsRegex(@"Test Data[/\\]Video"), It.IsAny<bool>(), It.IsAny<bool>()))
-                .Returns(files);
-            directoryService.Setup(ds => ds.GetFilePaths(It.IsRegex(@"Test Data[/\\]Metadata"), It.IsAny<bool>(), It.IsAny<bool>()))
-                .Returns(metadataFiles);
-
-            var streams = await _subtitleResolver.GetExternalStreamsAsync(video.Object, startIndex, directoryService.Object, false, CancellationToken.None);
-
-            Assert.Equal(expectedResult.Length, streams.Count);
-            for (var i = 0; i < expectedResult.Length; i++)
-            {
-                var expected = expectedResult[i];
-                var actual = streams[i];
-
-                Assert.Equal(expected.Index, actual.Index);
-                Assert.Equal(expected.Type, actual.Type);
-                Assert.Equal(expected.IsExternal, actual.IsExternal);
-                Assert.Equal(expected.Path, actual.Path);
-                Assert.Equal(expected.IsDefault, actual.IsDefault);
-                Assert.Equal(expected.IsForced, actual.IsForced);
-                Assert.Equal(expected.Language, actual.Language);
-                Assert.Equal(expected.Title, actual.Title);
-            }
-        }
-
-        [Theory]
-        [InlineData("MyVideo.en.srt", "srt", "eng", null, false, false)]
-        [InlineData("MyVideo.en.forced.default.srt", "srt", "eng", null, true, true)]
-        [InlineData("My.Video.srt", "srt", null, null, false, false)]
-        [InlineData("My.Video.foreign.srt", "srt", null, null, true, false)]
-        [InlineData("My.Video.default.srt", "srt", null, null, false, true)]
-        [InlineData("My.Video.forced.default.srt", "srt", null, null, true, true)]
-        [InlineData("My.Video.en.srt", "srt", "eng", null, false, false)]
-        [InlineData("My.Video.fr.en.srt", "srt", "eng", "fr", false, false)]
-        [InlineData("My.Video.en.fr.srt", "srt", "fre", "en", false, false)]
-        [InlineData("My.Video.default.en.srt", "srt", "eng", null, false, true)]
-        [InlineData("My.Video.default.forced.en.srt", "srt", "eng", null, true, true)]
-        [InlineData("My.Video.en.default.forced.srt", "srt", "eng", null, true, true)]
-        [InlineData("My.Video.Track Label.srt", "srt", null, "Track Label", false, false)]
-        [InlineData("My.Video.Track.Label.srt", "srt", null, "Track.Label", false, false)]
-        [InlineData("My.Video.Track Label.en.default.forced.srt", "srt", "eng", "Track Label", true, true)]
-        [InlineData("My.Video.en.default.forced.Track Label.srt", "srt", "eng", "Track Label", true, true)]
-        public async void AddExternalStreamsAsync_GivenSingleFile_ReturnsExpectedSubtitle(string file, string codec, string? language, string? title, bool isForced, bool isDefault)
+        if (matches)
         {
-            BaseItem.MediaSourceManager = Mock.Of<IMediaSourceManager>();
-
-            var video = new Mock<Video>();
-            video.CallBase = true;
-            video.Setup(moq => moq.Path).Returns(VideoDirectoryPath + "/My.Video.mkv");
-            video.Setup(moq => moq.GetInternalMetadataPath()).Returns(MetadataDirectoryPath);
-
-            var directoryService = new Mock<IDirectoryService>(MockBehavior.Strict);
-            directoryService.Setup(ds => ds.GetFilePaths(It.IsRegex(@"Test Data[/\\]Video"), It.IsAny<bool>(), It.IsAny<bool>()))
-                .Returns(new[] { VideoDirectoryPath + "/" + file });
-            directoryService.Setup(ds => ds.GetFilePaths(It.IsRegex(@"Test Data[/\\]Metadata"), It.IsAny<bool>(), It.IsAny<bool>()))
-                .Returns(Array.Empty<string>());
-
-            var streams = await _subtitleResolver.GetExternalStreamsAsync(video.Object, 0, directoryService.Object, false, CancellationToken.None);
-
             Assert.Single(streams);
             var actual = streams[0];
-
-            var expected = CreateMediaStream(VideoDirectoryPath + "/" + file, codec, language, title, 0, isForced, isDefault);
-            Assert.Equal(expected.Index, actual.Index);
-            Assert.Equal(expected.Type, actual.Type);
-            Assert.Equal(expected.IsExternal, actual.IsExternal);
-            Assert.Equal(expected.Path, actual.Path);
-            Assert.Equal(expected.IsDefault, actual.IsDefault);
-            Assert.Equal(expected.IsForced, actual.IsForced);
-            Assert.Equal(expected.Language, actual.Language);
-            Assert.Equal(expected.Title, actual.Title);
+            Assert.Equal(MediaStreamType.Subtitle, actual.Type);
         }
-
-        private static MediaStream CreateMediaStream(string path, string codec, string? language, string? title, int index, bool isForced = false, bool isDefault = false)
+        else
         {
-            return new()
-            {
-                Index = index,
-                Codec = codec,
-                Type = MediaStreamType.Subtitle,
-                IsExternal = true,
-                Path = path,
-                IsDefault = isDefault,
-                IsForced = isForced,
-                Language = language,
-                Title = title
-            };
+            Assert.Empty(streams);
         }
     }
 }

From cf033b25f8c405393a66079c43a77010ac779afb Mon Sep 17 00:00:00 2001
From: Joe Rogers <1337joe@gmail.com>
Date: Mon, 21 Feb 2022 22:08:54 +0100
Subject: [PATCH 2/3] Require delimiter immediately after filename match

---
 .../MediaInfo/MediaInfoResolver.cs                   | 12 ++++++++++--
 .../MediaInfo/MediaInfoResolverTests.cs              |  2 +-
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/MediaBrowser.Providers/MediaInfo/MediaInfoResolver.cs b/MediaBrowser.Providers/MediaInfo/MediaInfoResolver.cs
index e88b88cead..40b45faf52 100644
--- a/MediaBrowser.Providers/MediaInfo/MediaInfoResolver.cs
+++ b/MediaBrowser.Providers/MediaInfo/MediaInfoResolver.cs
@@ -43,6 +43,11 @@ namespace MediaBrowser.Providers.MediaInfo
         /// </summary>
         private readonly IMediaEncoder _mediaEncoder;
 
+        /// <summary>
+        /// The <see cref="NamingOptions"/> instance.
+        /// </summary>
+        private readonly NamingOptions _namingOptions;
+
         /// <summary>
         /// The <see cref="DlnaProfileType"/> of the files this resolver should resolve.
         /// </summary>
@@ -62,6 +67,7 @@ namespace MediaBrowser.Providers.MediaInfo
             DlnaProfileType type)
         {
             _mediaEncoder = mediaEncoder;
+            _namingOptions = namingOptions;
             _type = type;
             _externalPathParser = new ExternalPathParser(namingOptions, localizationManager, _type);
         }
@@ -159,9 +165,11 @@ namespace MediaBrowser.Providers.MediaInfo
 
             foreach (var file in files)
             {
-                if (_compareInfo.IsPrefix(Path.GetFileNameWithoutExtension(file), video.FileNameWithoutExtension, CompareOptions, out int matchLength))
+                var fileNameWithoutExtension = Path.GetFileNameWithoutExtension(file);
+                if (_compareInfo.IsPrefix(fileNameWithoutExtension, video.FileNameWithoutExtension, CompareOptions, out int matchLength)
+                    && (fileNameWithoutExtension.Length == matchLength || _namingOptions.MediaFlagDelimiters.Contains(fileNameWithoutExtension[matchLength].ToString())))
                 {
-                    var externalPathInfo = _externalPathParser.ParseFile(file, Path.GetFileNameWithoutExtension(file)[matchLength..]);
+                    var externalPathInfo = _externalPathParser.ParseFile(file, fileNameWithoutExtension[matchLength..]);
 
                     if (externalPathInfo != null)
                     {
diff --git a/tests/Jellyfin.Providers.Tests/MediaInfo/MediaInfoResolverTests.cs b/tests/Jellyfin.Providers.Tests/MediaInfo/MediaInfoResolverTests.cs
index 02bf878a01..926ec5c91b 100644
--- a/tests/Jellyfin.Providers.Tests/MediaInfo/MediaInfoResolverTests.cs
+++ b/tests/Jellyfin.Providers.Tests/MediaInfo/MediaInfoResolverTests.cs
@@ -113,7 +113,7 @@ public class MediaInfoResolverTests
     [InlineData("My.Video.mp3")]
     [InlineData("My.Video.png")]
     [InlineData("My.Video.txt")]
-    // [InlineData("My.Video Sequel.srt")]
+    [InlineData("My.Video Sequel.srt")]
     [InlineData("Some.Other.Video.srt")]
     public void GetExternalFiles_FuzzyMatching_RejectsNonMatches(string file)
     {

From a9a3f6bf028993eacbcd3ff95f3a2c0e6867a43e Mon Sep 17 00:00:00 2001
From: Joe Rogers <1337joe@gmail.com>
Date: Tue, 22 Feb 2022 15:13:44 +0100
Subject: [PATCH 3/3] Split match/rejected tests, add wider sampling of
 extensions

---
 .../ExternalFiles/ExternalPathParserTests.cs  | 71 +++++++++++--------
 1 file changed, 42 insertions(+), 29 deletions(-)

diff --git a/tests/Jellyfin.Naming.Tests/ExternalFiles/ExternalPathParserTests.cs b/tests/Jellyfin.Naming.Tests/ExternalFiles/ExternalPathParserTests.cs
index 7bc97aa081..b396b54400 100644
--- a/tests/Jellyfin.Naming.Tests/ExternalFiles/ExternalPathParserTests.cs
+++ b/tests/Jellyfin.Naming.Tests/ExternalFiles/ExternalPathParserTests.cs
@@ -29,41 +29,54 @@ public class ExternalPathParserTests
     }
 
     [Theory]
-    [InlineData("", false)]
-    [InlineData("MyVideo.srt", false)]
-    [InlineData("MyVideo.mka", true)]
-    public void ParseFile_AudioFile_ReturnsPathWhenAudio(string path, bool valid)
+    [InlineData("")]
+    [InlineData("MyVideo.ass")]
+    [InlineData("MyVideo.mks")]
+    [InlineData("MyVideo.sami")]
+    [InlineData("MyVideo.srt")]
+    [InlineData("MyVideo.m4v")]
+    public void ParseFile_AudioExtensionsNotMatched_ReturnsNull(string path)
     {
-        var actual = _audioPathParser.ParseFile(path, string.Empty);
-
-        if (valid)
-        {
-            Assert.NotNull(actual);
-            Assert.Equal(path, actual!.Path);
-        }
-        else
-        {
-            Assert.Null(actual);
-        }
+        Assert.Null(_audioPathParser.ParseFile(path, string.Empty));
     }
 
     [Theory]
-    [InlineData("", false)]
-    [InlineData("MyVideo.srt", true)]
-    [InlineData("MyVideo.mka", false)]
-    public void ParseFile_SubtitleFile_ReturnsPathWhenSubtitle(string path, bool valid)
+    [InlineData("MyVideo.aa")]
+    [InlineData("MyVideo.aac")]
+    [InlineData("MyVideo.flac")]
+    [InlineData("MyVideo.m4a")]
+    [InlineData("MyVideo.mka")]
+    [InlineData("MyVideo.mp3")]
+    public void ParseFile_AudioExtensionsMatched_ReturnsPath(string path)
+    {
+        var actual = _audioPathParser.ParseFile(path, string.Empty);
+        Assert.NotNull(actual);
+        Assert.Equal(path, actual!.Path);
+    }
+
+    [Theory]
+    [InlineData("")]
+    [InlineData("MyVideo.aa")]
+    [InlineData("MyVideo.aac")]
+    [InlineData("MyVideo.flac")]
+    [InlineData("MyVideo.mka")]
+    [InlineData("MyVideo.m4v")]
+    public void ParseFile_SubtitleExtensionsNotMatched_ReturnsNull(string path)
+    {
+        Assert.Null(_subtitlePathParser.ParseFile(path, string.Empty));
+    }
+
+    [Theory]
+    [InlineData("MyVideo.ass")]
+    [InlineData("MyVideo.mks")]
+    [InlineData("MyVideo.sami")]
+    [InlineData("MyVideo.srt")]
+    [InlineData("MyVideo.vtt")]
+    public void ParseFile_SubtitleExtensionsMatched_ReturnsPath(string path)
     {
         var actual = _subtitlePathParser.ParseFile(path, string.Empty);
-
-        if (valid)
-        {
-            Assert.NotNull(actual);
-            Assert.Equal(path, actual!.Path);
-        }
-        else
-        {
-            Assert.Null(actual);
-        }
+        Assert.NotNull(actual);
+        Assert.Equal(path, actual!.Path);
     }
 
     [Theory]