2 files changed, 92 insertions, 0 deletions
diff --git a/tests/Jellyfin.Server.Implementations.Tests/IO/FileRefresherTests.cs b/tests/Jellyfin.Server.Implementations.Tests/IO/FileRefresherTests.cs
new file mode 100644
index 0000000000..fd5f8e4160
--- /dev/null
+++ b/tests/Jellyfin.Server.Implementations.Tests/IO/FileRefresherTests.cs
@@ -0,0 +1,57 @@
+using System;
+using System.IO;
+using System.Threading.Tasks;
+using Emby.Server.Implementations.IO;
+using MediaBrowser.Controller.Configuration;
+using MediaBrowser.Controller.Entities;
+using MediaBrowser.Controller.Library;
+using MediaBrowser.Model.Configuration;
+using Microsoft.Extensions.Logging.Abstractions;
+using Moq;
+using Xunit;
+
+namespace Jellyfin.Server.Implementations.Tests.IO;
+
+public class FileRefresherTests
+{
+    [Fact]
+    public async Task ProcessPathChanges_PathLookupThrows_StillRefreshesRemainingPaths()
+    {
+        var tempDir = Directory.CreateTempSubdirectory("filerefresher");
+        try
+        {
+            // Ordered so the failing path is dequeued first.
+            var failingPath = Path.Combine(tempDir.FullName, "failing", "episode.mkv");
+            var workingPath = Directory.CreateDirectory(Path.Combine(tempDir.FullName, "working")).FullName;
+
+            var workingItem = new Folder { Path = workingPath, Name = "working" };
+            var workingItemFound = new TaskCompletionSource();
+
+            var libraryManager = new Mock<ILibraryManager>(MockBehavior.Loose);
+            libraryManager.Setup(x => x.FindByPath(failingPath, null))
+                .Throws(new ObjectDisposedException("IServiceProvider"));
+            libraryManager.Setup(x => x.FindByPath(workingPath, null))
+                .Returns(workingItem)
+                .Callback(() => workingItemFound.TrySetResult());
+
+            var configurationManager = new Mock<IServerConfigurationManager>(MockBehavior.Loose);
+            configurationManager.Setup(x => x.Configuration)
+                .Returns(new ServerConfiguration { LibraryMonitorDelay = 1 });
+
+            using var refresher = new FileRefresher(
+                failingPath,
+                configurationManager.Object,
+                libraryManager.Object,
+                NullLogger.Instance);
+            refresher.AddPath(workingPath);
+
+            await workingItemFound.Task.WaitAsync(TimeSpan.FromSeconds(30), TestContext.Current.CancellationToken);
+
+            libraryManager.Verify(x => x.FindByPath(failingPath, null), Times.Once);
+        }
+        finally
+        {
+            tempDir.Delete(true);
+        }
+    }
+}
diff --git a/tests/Jellyfin.Server.Implementations.Tests/IO/ManagedFileSystemTests.cs b/tests/Jellyfin.Server.Implementations.Tests/IO/ManagedFileSystemTests.cs
index 6cadfacce8..b39ca83483 100644
--- a/tests/Jellyfin.Server.Implementations.Tests/IO/ManagedFileSystemTests.cs
+++ b/tests/Jellyfin.Server.Implementations.Tests/IO/ManagedFileSystemTests.cs
@@ -100,6 +100,41 @@ public partial class ManagedFileSystemTests
         Assert.Equal(expectedFileName, _sut.GetValidFilename(filename));
     }
 
+    [Theory]
+    [InlineData("/media", "/media/tv", true)]
+    [InlineData("/media", "/media/tv/show/episode.mkv", true)]
+    [InlineData("/media/", "/media/tv", true)]
+    [InlineData("/", "/media", true)]
+    [InlineData("/media", "/media", false)]
+    [InlineData("/media", "/media/", true)]
+    [InlineData("/media", "/data/media/tv", false)]
+    [InlineData("/media", "/mediastuff/tv", false)]
+    [InlineData("/data/media", "/data/media/tv", true)]
+    [InlineData("/media/tv", "/media", false)]
+    [InlineData("/MEDIA", "/media/tv", false)]
+    public void ContainsSubPath_Unix_ReturnsExpected(string parentPath, string path, bool expected)
+    {
+        Assert.SkipWhen(OperatingSystem.IsWindows(), "Unix-only test");
+
+        Assert.Equal(expected, _sut.ContainsSubPath(parentPath, path));
+    }
+
+    [Theory]
+    [InlineData(@"C:\media", @"C:\media\tv", true)]
+    [InlineData(@"C:\media\", @"C:\media\tv", true)]
+    [InlineData(@"C:\", @"C:\media", true)]
+    [InlineData(@"C:\media", @"C:\media", false)]
+    [InlineData(@"C:\media", @"C:\data\media\tv", false)]
+    [InlineData(@"C:\media", @"C:\mediastuff\tv", false)]
+    [InlineData(@"C:\MEDIA", @"C:\media\tv", true)]
+    [InlineData(@"C:\media", @"C:\media/tv", true)]
+    public void ContainsSubPath_Windows_ReturnsExpected(string parentPath, string path, bool expected)
+    {
+        Assert.SkipUnless(OperatingSystem.IsWindows(), "Windows-only test");
+
+        Assert.Equal(expected, _sut.ContainsSubPath(parentPath, path));
+    }
+
     [Fact]
     public void GetFileInfo_DanglingSymlink_ExistsFalse()
     {