lgladsden/jellyfin-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Only add internal files if the internal metadata path exists

Browse Source 
Signed-off-by: Cody Robibero <cody@robibe.ro>
This commit is contained in:
Cody Robibero 2022-02-27 19:45:15 -07:00
parent e26446f9c0
commit 40e413d575
4 changed files with 29 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
MediaBrowser.Controller/Providers/DirectoryService.cs
View File

@ -3,6 +3,7 @@
using System;
using System.Collections.Concurrent;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using MediaBrowser.Model.IO;
@ -78,5 +79,9 @@ namespace MediaBrowser.Controller.Providers
return filePaths;
}
/// <inheritdoc />
public bool PathExists(string path)
=> Directory.Exists(path);
}
}

7
MediaBrowser.Controller/Providers/IDirectoryService.cs
View File

@ -16,5 +16,12 @@ namespace MediaBrowser.Controller.Providers
IReadOnlyList<string> GetFilePaths(string path);
IReadOnlyList<string> GetFilePaths(string path, bool clearCache, bool sort = false);
/// <summary>
/// Does the path exist.
/// </summary>
/// <param name="path">The path.</param>
/// <returns>Whether the path exists.</returns>
bool PathExists(string path);
}
}

6
MediaBrowser.Providers/MediaInfo/MediaInfoResolver.cs
View File

@ -148,7 +148,7 @@ namespace MediaBrowser.Providers.MediaInfo
// Check if video folder exists
string folder = video.ContainingFolderPath;
if (!Directory.Exists(folder))
if (!directoryService.PathExists(folder))
{
return Array.Empty<ExternalPathParserResult>();
}
@ -156,7 +156,11 @@ namespace MediaBrowser.Providers.MediaInfo
var externalPathInfos = new List<ExternalPathParserResult>();
var files = directoryService.GetFilePaths(folder, clearCache).ToList();
var internalMetadataPath = video.GetInternalMetadataPath();
if (directoryService.PathExists(internalMetadataPath))
{
files.AddRange(directoryService.GetFilePaths(video.GetInternalMetadataPath(), clearCache));
}
if (!files.Any())
{

11
tests/Jellyfin.Providers.Tests/MediaInfo/MediaInfoResolverTests.cs
View File

@ -150,6 +150,8 @@ public class MediaInfoResolverTests
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>());
directoryService.Setup(ds => ds.PathExists(It.IsAny<string>()))
.Returns(true);
var mediaEncoder = Mock.Of<IMediaEncoder>(MockBehavior.Strict);
@ -299,6 +301,10 @@ public class MediaInfoResolverTests
.Returns(files);
directoryService.Setup(ds => ds.GetFilePaths(It.IsRegex(MetadataDirectoryRegex), It.IsAny<bool>(), It.IsAny<bool>()))
.Returns(Array.Empty<string>());
directoryService.Setup(ds => ds.PathExists(It.IsRegex(MetadataDirectoryRegex)))
.Returns(true);
directoryService.Setup(ds => ds.PathExists(It.IsRegex(VideoDirectoryRegex)))
.Returns(true);
List<MediaStream> GenerateMediaStreams()
{
@ -370,6 +376,11 @@ public class MediaInfoResolverTests
.Returns(Array.Empty<string>());
}
directoryService.Setup(ds => ds.PathExists(It.IsRegex(MetadataDirectoryRegex)))
.Returns(true);
directoryService.Setup(ds => ds.PathExists(It.IsRegex(VideoDirectoryRegex)))
.Returns(true);
return directoryService.Object;
}
}