Cutlery/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-07-09 03:04:24 -04:00
Code Issues Packages Projects Releases Wiki Activity

switched to built-in methods for directory browsing

Browse Source
This commit is contained in:
Luke Pulverenti 2013-04-27 19:09:44 -04:00
parent 70ae9a2c86
commit e744302709
1 changed files with 31 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
MediaBrowser.Api/EnvironmentService.cs
View File

@ -1,5 +1,4 @@
using MediaBrowser.Common.Net; using MediaBrowser.Common.Net;
using MediaBrowser.Controller.IO;
using MediaBrowser.Model.IO; using MediaBrowser.Model.IO;
using MediaBrowser.Model.Net; using MediaBrowser.Model.Net;
using ServiceStack.ServiceHost; using ServiceStack.ServiceHost;
@ -206,19 +205,40 @@ namespace MediaBrowser.Api
/// <returns>IEnumerable{FileSystemEntryInfo}.</returns> /// <returns>IEnumerable{FileSystemEntryInfo}.</returns>
private IEnumerable<FileSystemEntryInfo> GetFileSystemEntries(GetDirectoryContents request) private IEnumerable<FileSystemEntryInfo> GetFileSystemEntries(GetDirectoryContents request)
{ {
var fileSystemEntries = FileSystem.GetFileSystemEntries(request.Path, "*", request.IncludeFiles, request.IncludeDirectories).Where(f => !f.IsSystemFile); var entries = new DirectoryInfo(request.Path).EnumerateFileSystemInfos("*", SearchOption.TopDirectoryOnly).Where(i =>
if (!request.IncludeHidden)
{ {
fileSystemEntries = fileSystemEntries.Where(f => !f.IsHidden); if (i.Attributes.HasFlag(FileAttributes.System))
{
return false;
} }
return fileSystemEntries.Select(f => new FileSystemEntryInfo if (!request.IncludeHidden && i.Attributes.HasFlag(FileAttributes.Hidden))
{ {
Name = f.cFileName, return false;
Path = f.Path, }
Type = f.IsDirectory ? FileSystemEntryType.Directory : FileSystemEntryType.File
var isDirectory = i.Attributes.HasFlag(FileAttributes.Directory);
if (!request.IncludeFiles && !isDirectory)
{
return false;
}
if (!request.IncludeDirectories && isDirectory)
{
return false;
}
return true;
}); });
return entries.Select(f => new FileSystemEntryInfo
{
Name = f.Name,
Path = f.FullName,
Type = f.Attributes.HasFlag(FileAttributes.Directory) ? FileSystemEntryType.Directory : FileSystemEntryType.File
}).ToList();
} }
/// <summary> /// <summary>