Cutlery/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-11-03 19:17:24 -05:00
Code Issues Packages Projects Releases Wiki Activity

Handle symlinks in library folders

Browse Source
This commit is contained in:
Andrew Schurman 2015-08-15 13:01:40 -07:00
parent ebd2f7b63d
commit 5571bf4736
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
MediaBrowser.Api/EnvironmentService.cs
View File

@ -221,7 +221,9 @@ namespace MediaBrowser.Api
/// <returns>IEnumerable{FileSystemEntryInfo}.</returns> /// <returns>IEnumerable{FileSystemEntryInfo}.</returns>
private IEnumerable<FileSystemEntryInfo> GetFileSystemEntries(GetDirectoryContents request) 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)) if (!request.IncludeHidden && i.Attributes.HasFlag(FileAttributes.Hidden))
{ {

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

@ -58,8 +58,9 @@ namespace MediaBrowser.Controller.Providers
try try
{ {
var list = new DirectoryInfo(path) // using EnumerateFileSystemInfos doesn't handle reparse points (symlinks)
.EnumerateFileSystemInfos("*", SearchOption.TopDirectoryOnly); var list = new DirectoryInfo(path).EnumerateDirectories("*", SearchOption.TopDirectoryOnly)
.Concat<FileSystemInfo>(new DirectoryInfo(path).EnumerateFiles("*", SearchOption.TopDirectoryOnly));
// Seeing dupes on some users file system for some reason // Seeing dupes on some users file system for some reason
foreach (var item in list) foreach (var item in list)