diff --git a/Emby.Server.Implementations/IO/ManagedFileSystem.cs b/Emby.Server.Implementations/IO/ManagedFileSystem.cs
index 4f8a52f411..ee6846ad36 100644
--- a/Emby.Server.Implementations/IO/ManagedFileSystem.cs
+++ b/Emby.Server.Implementations/IO/ManagedFileSystem.cs
@@ -704,6 +704,12 @@ namespace Emby.Server.Implementations.IO
return Directory.EnumerateFileSystemEntries(path, "*", GetEnumerationOptions(recursive));
}
+ ///
+ public virtual bool Exists(string path)
+ {
+ return Directory.Exists(path) || File.Exists(path);
+ }
+
private EnumerationOptions GetEnumerationOptions(bool recursive)
{
return new EnumerationOptions
diff --git a/MediaBrowser.Controller/Entities/BaseItem.cs b/MediaBrowser.Controller/Entities/BaseItem.cs
index 0f62e8e1eb..c527328583 100644
--- a/MediaBrowser.Controller/Entities/BaseItem.cs
+++ b/MediaBrowser.Controller/Entities/BaseItem.cs
@@ -887,7 +887,7 @@ namespace MediaBrowser.Controller.Entities
return Name;
}
- public string GetInternalMetadataPath()
+ public virtual string GetInternalMetadataPath()
{
var basePath = ConfigurationManager.ApplicationPaths.InternalMetadataPath;
diff --git a/MediaBrowser.Controller/Providers/DirectoryService.cs b/MediaBrowser.Controller/Providers/DirectoryService.cs
index cfbcfa2741..d8ed2360ff 100644
--- a/MediaBrowser.Controller/Providers/DirectoryService.cs
+++ b/MediaBrowser.Controller/Providers/DirectoryService.cs
@@ -79,9 +79,5 @@ namespace MediaBrowser.Controller.Providers
return filePaths;
}
-
- ///
- public bool PathExists(string path)
- => Directory.Exists(path);
}
}
diff --git a/MediaBrowser.Controller/Providers/IDirectoryService.cs b/MediaBrowser.Controller/Providers/IDirectoryService.cs
index e5428a0356..48d6276918 100644
--- a/MediaBrowser.Controller/Providers/IDirectoryService.cs
+++ b/MediaBrowser.Controller/Providers/IDirectoryService.cs
@@ -16,12 +16,5 @@ namespace MediaBrowser.Controller.Providers
IReadOnlyList GetFilePaths(string path);
IReadOnlyList GetFilePaths(string path, bool clearCache, bool sort = false);
-
- ///
- /// Does the path exist.
- ///
- /// The path.
- /// Whether the path exists.
- bool PathExists(string path);
}
}
diff --git a/MediaBrowser.Model/IO/IFileSystem.cs b/MediaBrowser.Model/IO/IFileSystem.cs
index 7207795b09..234d96369e 100644
--- a/MediaBrowser.Model/IO/IFileSystem.cs
+++ b/MediaBrowser.Model/IO/IFileSystem.cs
@@ -200,5 +200,12 @@ namespace MediaBrowser.Model.IO
void SetAttributes(string path, bool isHidden, bool readOnly);
IEnumerable GetDrives();
+
+ ///
+ /// Determines whether the directory or file exists.
+ ///
+ /// The path.
+ /// Whether the path exists.
+ bool Exists(string path);
}
}
diff --git a/MediaBrowser.Providers/MediaInfo/AudioResolver.cs b/MediaBrowser.Providers/MediaInfo/AudioResolver.cs
index ff90eeffbc..0bdf447ba7 100644
--- a/MediaBrowser.Providers/MediaInfo/AudioResolver.cs
+++ b/MediaBrowser.Providers/MediaInfo/AudioResolver.cs
@@ -3,6 +3,7 @@ using MediaBrowser.Controller.Entities;
using MediaBrowser.Controller.MediaEncoding;
using MediaBrowser.Model.Dlna;
using MediaBrowser.Model.Globalization;
+using MediaBrowser.Model.IO;
namespace MediaBrowser.Providers.MediaInfo
{
@@ -16,13 +17,20 @@ namespace MediaBrowser.Providers.MediaInfo
///
/// The localization manager.
/// The media encoder.
+ /// The file system.
/// The object containing FileExtensions, MediaDefaultFlags, MediaForcedFlags and MediaFlagDelimiters.
public AudioResolver(
ILocalizationManager localizationManager,
IMediaEncoder mediaEncoder,
+ IFileSystem fileSystem,
NamingOptions namingOptions)
- : base(localizationManager, mediaEncoder, namingOptions, DlnaProfileType.Audio)
- {
+ : base(
+ localizationManager,
+ mediaEncoder,
+ fileSystem,
+ namingOptions,
+ DlnaProfileType.Audio)
+ {
}
}
}
diff --git a/MediaBrowser.Providers/MediaInfo/FFProbeProvider.cs b/MediaBrowser.Providers/MediaInfo/FFProbeProvider.cs
index 560e20dae7..fcd3f28d48 100644
--- a/MediaBrowser.Providers/MediaInfo/FFProbeProvider.cs
+++ b/MediaBrowser.Providers/MediaInfo/FFProbeProvider.cs
@@ -19,9 +19,9 @@ using MediaBrowser.Controller.MediaEncoding;
using MediaBrowser.Controller.Persistence;
using MediaBrowser.Controller.Providers;
using MediaBrowser.Controller.Subtitles;
-using MediaBrowser.Model.Dlna;
using MediaBrowser.Model.Entities;
using MediaBrowser.Model.Globalization;
+using MediaBrowser.Model.IO;
using MediaBrowser.Model.MediaInfo;
using Microsoft.Extensions.Logging;
@@ -58,11 +58,12 @@ namespace MediaBrowser.Providers.MediaInfo
ISubtitleManager subtitleManager,
IChapterManager chapterManager,
ILibraryManager libraryManager,
+ IFileSystem fileSystem,
NamingOptions namingOptions)
{
_logger = logger;
- _audioResolver = new AudioResolver(localization, mediaEncoder, namingOptions);
- _subtitleResolver = new SubtitleResolver(localization, mediaEncoder, namingOptions);
+ _audioResolver = new AudioResolver(localization, mediaEncoder, fileSystem, namingOptions);
+ _subtitleResolver = new SubtitleResolver(localization, mediaEncoder, fileSystem, namingOptions);
_videoProber = new FFProbeVideoInfo(
_logger,
mediaSourceManager,
diff --git a/MediaBrowser.Providers/MediaInfo/MediaInfoResolver.cs b/MediaBrowser.Providers/MediaInfo/MediaInfoResolver.cs
index baa0978fc6..dc3576eaba 100644
--- a/MediaBrowser.Providers/MediaInfo/MediaInfoResolver.cs
+++ b/MediaBrowser.Providers/MediaInfo/MediaInfoResolver.cs
@@ -14,6 +14,7 @@ using MediaBrowser.Model.Dlna;
using MediaBrowser.Model.Dto;
using MediaBrowser.Model.Entities;
using MediaBrowser.Model.Globalization;
+using MediaBrowser.Model.IO;
using MediaBrowser.Model.MediaInfo;
namespace MediaBrowser.Providers.MediaInfo
@@ -43,6 +44,8 @@ namespace MediaBrowser.Providers.MediaInfo
///
private readonly IMediaEncoder _mediaEncoder;
+ private readonly IFileSystem _fileSystem;
+
///
/// The instance.
///
@@ -58,15 +61,18 @@ namespace MediaBrowser.Providers.MediaInfo
///
/// The localization manager.
/// The media encoder.
+ /// The file system.
/// The object containing FileExtensions, MediaDefaultFlags, MediaForcedFlags and MediaFlagDelimiters.
/// The of the parsed file.
protected MediaInfoResolver(
ILocalizationManager localizationManager,
IMediaEncoder mediaEncoder,
+ IFileSystem fileSystem,
NamingOptions namingOptions,
DlnaProfileType type)
{
_mediaEncoder = mediaEncoder;
+ _fileSystem = fileSystem;
_namingOptions = namingOptions;
_type = type;
_externalPathParser = new ExternalPathParser(namingOptions, localizationManager, _type);
@@ -148,7 +154,7 @@ namespace MediaBrowser.Providers.MediaInfo
// Check if video folder exists
string folder = video.ContainingFolderPath;
- if (!directoryService.PathExists(folder))
+ if (!_fileSystem.Exists(folder))
{
return Array.Empty();
}
@@ -157,7 +163,7 @@ namespace MediaBrowser.Providers.MediaInfo
var files = directoryService.GetFilePaths(folder, clearCache).ToList();
var internalMetadataPath = video.GetInternalMetadataPath();
- if (directoryService.PathExists(internalMetadataPath))
+ if (_fileSystem.Exists(internalMetadataPath))
{
files.AddRange(directoryService.GetFilePaths(internalMetadataPath, clearCache));
}
diff --git a/MediaBrowser.Providers/MediaInfo/SubtitleResolver.cs b/MediaBrowser.Providers/MediaInfo/SubtitleResolver.cs
index 289036fdab..4b9ba944a1 100644
--- a/MediaBrowser.Providers/MediaInfo/SubtitleResolver.cs
+++ b/MediaBrowser.Providers/MediaInfo/SubtitleResolver.cs
@@ -3,6 +3,7 @@ using MediaBrowser.Controller.Entities;
using MediaBrowser.Controller.MediaEncoding;
using MediaBrowser.Model.Dlna;
using MediaBrowser.Model.Globalization;
+using MediaBrowser.Model.IO;
namespace MediaBrowser.Providers.MediaInfo
{
@@ -16,13 +17,20 @@ namespace MediaBrowser.Providers.MediaInfo
///
/// The localization manager.
/// The media encoder.
+ /// The file system.
/// The object containing FileExtensions, MediaDefaultFlags, MediaForcedFlags and MediaFlagDelimiters.
public SubtitleResolver(
ILocalizationManager localizationManager,
IMediaEncoder mediaEncoder,
+ IFileSystem fileSystem,
NamingOptions namingOptions)
- : base(localizationManager, mediaEncoder, namingOptions, DlnaProfileType.Subtitle)
- {
+ : base(
+ localizationManager,
+ mediaEncoder,
+ fileSystem,
+ namingOptions,
+ DlnaProfileType.Subtitle)
+ {
}
}
}
diff --git a/tests/Jellyfin.Providers.Tests/MediaInfo/AudioResolverTests.cs b/tests/Jellyfin.Providers.Tests/MediaInfo/AudioResolverTests.cs
index 381d6c72d5..9df0c7a06d 100644
--- a/tests/Jellyfin.Providers.Tests/MediaInfo/AudioResolverTests.cs
+++ b/tests/Jellyfin.Providers.Tests/MediaInfo/AudioResolverTests.cs
@@ -11,6 +11,7 @@ using MediaBrowser.Controller.LiveTv;
using MediaBrowser.Controller.MediaEncoding;
using MediaBrowser.Model.Entities;
using MediaBrowser.Model.Globalization;
+using MediaBrowser.Model.IO;
using MediaBrowser.Providers.MediaInfo;
using Moq;
using Xunit;
@@ -45,7 +46,13 @@ public class AudioResolverTests
}
}));
- _audioResolver = new AudioResolver(localizationManager, mediaEncoder.Object, new NamingOptions());
+ var fileSystem = new Mock(MockBehavior.Strict);
+ fileSystem.Setup(fs => fs.Exists(It.IsRegex(MediaInfoResolverTests.VideoDirectoryRegex)))
+ .Returns(true);
+ fileSystem.Setup(fs => fs.Exists(It.IsRegex(MediaInfoResolverTests.MetadataDirectoryRegex)))
+ .Returns(true);
+
+ _audioResolver = new AudioResolver(localizationManager, mediaEncoder.Object, fileSystem.Object, new NamingOptions());
}
[Theory]
diff --git a/tests/Jellyfin.Providers.Tests/MediaInfo/MediaInfoResolverTests.cs b/tests/Jellyfin.Providers.Tests/MediaInfo/MediaInfoResolverTests.cs
index 89deb39140..94a4961b51 100644
--- a/tests/Jellyfin.Providers.Tests/MediaInfo/MediaInfoResolverTests.cs
+++ b/tests/Jellyfin.Providers.Tests/MediaInfo/MediaInfoResolverTests.cs
@@ -15,6 +15,7 @@ using MediaBrowser.Controller.MediaEncoding;
using MediaBrowser.Controller.Providers;
using MediaBrowser.Model.Entities;
using MediaBrowser.Model.Globalization;
+using MediaBrowser.Model.IO;
using MediaBrowser.Model.MediaInfo;
using MediaBrowser.Providers.MediaInfo;
using Moq;
@@ -25,9 +26,9 @@ 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.*";
+ public const string VideoDirectoryRegex = @"Test Data[/\\]Video";
+ public const string MetadataDirectoryPath = "library/00/00000000000000000000000000000000";
+ public const string MetadataDirectoryRegex = @"library.*";
private readonly ILocalizationManager _localizationManager;
private readonly MediaInfoResolver _subtitleResolver;
@@ -61,7 +62,15 @@ public class MediaInfoResolverTests
}
}));
- _subtitleResolver = new SubtitleResolver(_localizationManager, mediaEncoder.Object, new NamingOptions());
+ var fileSystem = new Mock(MockBehavior.Strict);
+ fileSystem.Setup(fs => fs.Exists(It.IsAny()))
+ .Returns(false);
+ fileSystem.Setup(fs => fs.Exists(It.IsRegex(VideoDirectoryRegex)))
+ .Returns(true);
+ fileSystem.Setup(fs => fs.Exists(It.IsRegex(MetadataDirectoryRegex)))
+ .Returns(true);
+
+ _subtitleResolver = new SubtitleResolver(_localizationManager, mediaEncoder.Object, fileSystem.Object, new NamingOptions());
}
[Fact]
@@ -88,24 +97,35 @@ public class MediaInfoResolverTests
{
BaseItem.MediaSourceManager = Mock.Of();
- var video = new Movie
+ string containingFolderPath, metadataPath;
+
+ if (metadataDirectory)
{
- Path = VideoDirectoryPath + "/My.Video.mkv"
- };
+ containingFolderPath = VideoDirectoryPath;
+ metadataPath = "invalid";
+ }
+ else
+ {
+ containingFolderPath = "invalid";
+ metadataPath = MetadataDirectoryPath;
+ }
+
+ var video = new Mock();
+ video.Setup(m => m.Path)
+ .Returns(VideoDirectoryPath + "/My.Video.mkv");
+ video.Setup(m => m.ContainingFolderPath)
+ .Returns(containingFolderPath);
+ video.Setup(m => m.GetInternalMetadataPath())
+ .Returns(metadataPath);
string pathNotFoundRegex = metadataDirectory ? MetadataDirectoryRegex : VideoDirectoryRegex;
var directoryService = new Mock(MockBehavior.Strict);
// any path other than test target exists and provides an empty listing
- directoryService.Setup(ds => ds.PathExists(It.IsAny()))
- .Returns(true);
directoryService.Setup(ds => ds.GetFilePaths(It.IsAny(), It.IsAny(), It.IsAny()))
.Returns(Array.Empty());
- directoryService.Setup(ds => ds.PathExists(It.IsRegex(pathNotFoundRegex)))
- .Returns(false);
-
- _subtitleResolver.GetExternalFiles(video, directoryService.Object, false);
+ _subtitleResolver.GetExternalFiles(video.Object, directoryService.Object, false);
directoryService.Verify(
ds => ds.GetFilePaths(It.IsRegex(pathNotFoundRegex), It.IsAny(), It.IsAny()),
@@ -176,12 +196,11 @@ public class MediaInfoResolverTests
var directoryService = new Mock(MockBehavior.Strict);
directoryService.Setup(ds => ds.GetFilePaths(It.IsAny(), It.IsAny(), It.IsAny()))
.Returns(Array.Empty());
- directoryService.Setup(ds => ds.PathExists(It.IsAny()))
- .Returns(true);
var mediaEncoder = Mock.Of(MockBehavior.Strict);
+ var fileSystem = Mock.Of();
- var subtitleResolver = new SubtitleResolver(_localizationManager, mediaEncoder, new NamingOptions());
+ var subtitleResolver = new SubtitleResolver(_localizationManager, mediaEncoder, fileSystem, new NamingOptions());
var streams = await subtitleResolver.GetExternalStreamsAsync(video, 0, directoryService.Object, false, CancellationToken.None);
@@ -280,7 +299,13 @@ public class MediaInfoResolverTests
MediaStreams = inputStreams.ToList()
}));
- var subtitleResolver = new SubtitleResolver(_localizationManager, mediaEncoder.Object, new NamingOptions());
+ var fileSystem = new Mock(MockBehavior.Strict);
+ fileSystem.Setup(fs => fs.Exists(It.IsRegex(VideoDirectoryRegex)))
+ .Returns(true);
+ fileSystem.Setup(fs => fs.Exists(It.IsRegex(MetadataDirectoryRegex)))
+ .Returns(true);
+
+ var subtitleResolver = new SubtitleResolver(_localizationManager, mediaEncoder.Object, fileSystem.Object, new NamingOptions());
var directoryService = GetDirectoryServiceForExternalFile(file);
var streams = await subtitleResolver.GetExternalStreamsAsync(video, 0, directoryService, false, CancellationToken.None);
@@ -327,10 +352,6 @@ public class MediaInfoResolverTests
.Returns(files);
directoryService.Setup(ds => ds.GetFilePaths(It.IsRegex(MetadataDirectoryRegex), It.IsAny(), It.IsAny()))
.Returns(Array.Empty());
- directoryService.Setup(ds => ds.PathExists(It.IsRegex(MetadataDirectoryRegex)))
- .Returns(true);
- directoryService.Setup(ds => ds.PathExists(It.IsRegex(VideoDirectoryRegex)))
- .Returns(true);
List GenerateMediaStreams()
{
@@ -350,7 +371,13 @@ public class MediaInfoResolverTests
MediaStreams = GenerateMediaStreams()
}));
- var subtitleResolver = new SubtitleResolver(_localizationManager, mediaEncoder.Object, new NamingOptions());
+ var fileSystem = new Mock(MockBehavior.Strict);
+ fileSystem.Setup(fs => fs.Exists(It.IsRegex(VideoDirectoryRegex)))
+ .Returns(true);
+ fileSystem.Setup(fs => fs.Exists(It.IsRegex(MetadataDirectoryRegex)))
+ .Returns(true);
+
+ var subtitleResolver = new SubtitleResolver(_localizationManager, mediaEncoder.Object, fileSystem.Object, new NamingOptions());
int startIndex = 1;
var streams = await subtitleResolver.GetExternalStreamsAsync(video, startIndex, directoryService.Object, false, CancellationToken.None);
@@ -402,11 +429,6 @@ public class MediaInfoResolverTests
.Returns(Array.Empty());
}
- directoryService.Setup(ds => ds.PathExists(It.IsRegex(MetadataDirectoryRegex)))
- .Returns(true);
- directoryService.Setup(ds => ds.PathExists(It.IsRegex(VideoDirectoryRegex)))
- .Returns(true);
-
return directoryService.Object;
}
}
diff --git a/tests/Jellyfin.Providers.Tests/MediaInfo/SubtitleResolverTests.cs b/tests/Jellyfin.Providers.Tests/MediaInfo/SubtitleResolverTests.cs
index 0f1086f59b..3ba9d8fbfc 100644
--- a/tests/Jellyfin.Providers.Tests/MediaInfo/SubtitleResolverTests.cs
+++ b/tests/Jellyfin.Providers.Tests/MediaInfo/SubtitleResolverTests.cs
@@ -11,6 +11,7 @@ using MediaBrowser.Controller.LiveTv;
using MediaBrowser.Controller.MediaEncoding;
using MediaBrowser.Model.Entities;
using MediaBrowser.Model.Globalization;
+using MediaBrowser.Model.IO;
using MediaBrowser.Providers.MediaInfo;
using Moq;
using Xunit;
@@ -45,7 +46,13 @@ public class SubtitleResolverTests
}
}));
- _subtitleResolver = new SubtitleResolver(localizationManager, mediaEncoder.Object, new NamingOptions());
+ var fileSystem = new Mock(MockBehavior.Strict);
+ fileSystem.Setup(fs => fs.Exists(It.IsRegex(MediaInfoResolverTests.VideoDirectoryRegex)))
+ .Returns(true);
+ fileSystem.Setup(fs => fs.Exists(It.IsRegex(MediaInfoResolverTests.MetadataDirectoryRegex)))
+ .Returns(true);
+
+ _subtitleResolver = new SubtitleResolver(localizationManager, mediaEncoder.Object, fileSystem.Object, new NamingOptions());
}
[Theory]