aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Controller/IO/FileData.cs
diff options
context:
space:
mode:
authordkanada <dkanada@users.noreply.github.com>2020-06-15 20:21:25 +0900
committerGitHub <noreply@github.com>2020-06-15 20:21:25 +0900
commitdabb869a6b9f1c3359a663fd6b6e380f882e2ae2 (patch)
tree64dbd5a55d0a400f195c8de58d835739e82b9b74 /MediaBrowser.Controller/IO/FileData.cs
parentb79957d07eeda3c888d0ec2051bb4185a410ac0e (diff)
parent100e9d586dff877610c488936aa035f61f6fedb5 (diff)
Merge branch 'master' into hwaccel
Diffstat (limited to 'MediaBrowser.Controller/IO/FileData.cs')
-rw-r--r--MediaBrowser.Controller/IO/FileData.cs6
1 files changed, 3 insertions, 3 deletions
diff --git a/MediaBrowser.Controller/IO/FileData.cs b/MediaBrowser.Controller/IO/FileData.cs
index 4bbb60283..aa7373815 100644
--- a/MediaBrowser.Controller/IO/FileData.cs
+++ b/MediaBrowser.Controller/IO/FileData.cs
@@ -35,7 +35,8 @@ namespace MediaBrowser.Controller.IO
/// <param name="resolveShortcuts">if set to <c>true</c> [resolve shortcuts].</param>
/// <returns>Dictionary{System.StringFileSystemInfo}.</returns>
/// <exception cref="ArgumentNullException">path</exception>
- public static FileSystemMetadata[] GetFilteredFileSystemEntries(IDirectoryService directoryService,
+ public static FileSystemMetadata[] GetFilteredFileSystemEntries(
+ IDirectoryService directoryService,
string path,
IFileSystem fileSystem,
IServerApplicationHost appHost,
@@ -76,7 +77,7 @@ namespace MediaBrowser.Controller.IO
if (string.IsNullOrEmpty(newPath))
{
- //invalid shortcut - could be old or target could just be unavailable
+ // invalid shortcut - could be old or target could just be unavailable
logger.LogWarning("Encountered invalid shortcut: " + fullName);
continue;
}
@@ -117,7 +118,6 @@ namespace MediaBrowser.Controller.IO
}
return returnResult;
}
-
}
}