aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Api/EnvironmentService.cs
diff options
context:
space:
mode:
authorAndrew Schurman <arcticwaters@gmail.com>2015-08-15 13:01:40 -0700
committerAndrew Schurman <arcticwaters@gmail.com>2015-08-15 13:35:43 -0700
commit5571bf47367798f23d91c290ba75ef44672e027e (patch)
treec75ac90bb2e70adc21da693b2e7e6b362133552d /MediaBrowser.Api/EnvironmentService.cs
parentebd2f7b63d13bce6e5a30f8b37f89617bed44ff2 (diff)
Handle symlinks in library folders
Diffstat (limited to 'MediaBrowser.Api/EnvironmentService.cs')
-rw-r--r--MediaBrowser.Api/EnvironmentService.cs4
1 files changed, 3 insertions, 1 deletions
diff --git a/MediaBrowser.Api/EnvironmentService.cs b/MediaBrowser.Api/EnvironmentService.cs
index 73b6573a6..457b4709b 100644
--- a/MediaBrowser.Api/EnvironmentService.cs
+++ b/MediaBrowser.Api/EnvironmentService.cs
@@ -221,7 +221,9 @@ namespace MediaBrowser.Api
/// <returns>IEnumerable{FileSystemEntryInfo}.</returns>
private IEnumerable<FileSystemEntryInfo> GetFileSystemEntries(GetDirectoryContents request)
{
- var entries = new DirectoryInfo(request.Path).EnumerateFileSystemInfos().Where(i =>
+ // using EnumerateFileSystemInfos doesn't handle reparse points (symlinks)
+ var entries = new DirectoryInfo(request.Path).EnumerateDirectories("*", SearchOption.TopDirectoryOnly)
+ .Concat<FileSystemInfo>(new DirectoryInfo(request.Path).EnumerateFiles("*", SearchOption.TopDirectoryOnly)).Where(i =>
{
if (!request.IncludeHidden && i.Attributes.HasFlag(FileAttributes.Hidden))
{