|
@@ -541,8 +541,8 @@ namespace Emby.Server.Implementations.IO
|
|
|
return DriveInfo.GetDrives()
|
|
|
.Where(
|
|
|
d => (d.DriveType == DriveType.Fixed || d.DriveType == DriveType.Network || d.DriveType == DriveType.Removable)
|
|
|
- && d.IsReady
|
|
|
- && d.TotalSize != 0)
|
|
|
+ && d.IsReady
|
|
|
+ && d.TotalSize != 0)
|
|
|
.Select(d => new FileSystemMetadata
|
|
|
{
|
|
|
Name = d.Name,
|
|
@@ -560,11 +560,23 @@ namespace Emby.Server.Implementations.IO
|
|
|
/// <inheritdoc />
|
|
|
public virtual IEnumerable<FileSystemMetadata> GetFiles(string path, bool recursive = false)
|
|
|
{
|
|
|
- return GetFiles(path, null, false, recursive);
|
|
|
+ return GetFiles(path, "*", recursive);
|
|
|
}
|
|
|
|
|
|
/// <inheritdoc />
|
|
|
- public virtual IEnumerable<FileSystemMetadata> GetFiles(string path, IReadOnlyList<string>? extensions, bool enableCaseSensitiveExtensions, bool recursive = false)
|
|
|
+ public virtual IEnumerable<FileSystemMetadata> GetFiles(string path, string searchPattern, bool recursive = false)
|
|
|
+ {
|
|
|
+ return GetFiles(path, searchPattern, null, false, recursive);
|
|
|
+ }
|
|
|
+
|
|
|
+ /// <inheritdoc />
|
|
|
+ public virtual IEnumerable<FileSystemMetadata> GetFiles(string path, IReadOnlyList<string>? extensions, bool enableCaseSensitiveExtensions, bool recursive)
|
|
|
+ {
|
|
|
+ return GetFiles(path, "*", extensions, enableCaseSensitiveExtensions, recursive);
|
|
|
+ }
|
|
|
+
|
|
|
+ /// <inheritdoc />
|
|
|
+ public virtual IEnumerable<FileSystemMetadata> GetFiles(string path, string searchPattern, IReadOnlyList<string>? extensions, bool enableCaseSensitiveExtensions, bool recursive = false)
|
|
|
{
|
|
|
var enumerationOptions = GetEnumerationOptions(recursive);
|
|
|
|
|
@@ -572,10 +584,12 @@ namespace Emby.Server.Implementations.IO
|
|
|
// If we're OK with case-sensitivity, and we're only filtering for one extension, then use the native method
|
|
|
if ((enableCaseSensitiveExtensions || _isEnvironmentCaseInsensitive) && extensions is not null && extensions.Count == 1)
|
|
|
{
|
|
|
- return ToMetadata(new DirectoryInfo(path).EnumerateFiles("*" + extensions[0], enumerationOptions));
|
|
|
+ searchPattern = searchPattern.EndsWith(extensions[0], StringComparison.Ordinal) ? searchPattern : searchPattern + extensions[0];
|
|
|
+
|
|
|
+ return ToMetadata(new DirectoryInfo(path).EnumerateFiles(searchPattern, enumerationOptions));
|
|
|
}
|
|
|
|
|
|
- var files = new DirectoryInfo(path).EnumerateFiles("*", enumerationOptions);
|
|
|
+ var files = new DirectoryInfo(path).EnumerateFiles(searchPattern, enumerationOptions);
|
|
|
|
|
|
if (extensions is not null && extensions.Count > 0)
|
|
|
{
|