starred/jellyfin-jellyfin-1
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-12-22 08:45:23 +03:00
Code Issues Packages Projects Releases Wiki Activity

update directory picker

Browse Source
This commit is contained in:
Luke Pulverenti
2017-04-02 00:08:07 -04:00
parent 733b891f52
commit 6e4d234212
4 changed files with 41 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
Emby.Common.Implementations/IO/SharpCifsFileSystem.cs
View File

@@ -55,7 +55,7 @@ namespace Emby.Common.Implementations.IO
private string GetReturnPath(SmbFile file)
{
return file.GetCanonicalPath();
return file.GetCanonicalPath().TrimEnd('/');
//return file.GetPath();
}
@@ -419,9 +419,16 @@ namespace Emby.Common.Implementations.IO
}
}
private SmbFile CreateSmbDirectoryForListFiles(string path)
{
// In order to call ListFiles, it has to end with the separator
return CreateSmbFile(path.TrimEnd('/') + '/');
}
public IEnumerable<FileSystemMetadata> GetDirectories(string path, bool recursive = false)
{
var dir = CreateSmbFile(path);
var dir = CreateSmbDirectoryForListFiles(path);
AssertDirectoryExists(dir, path);
var list = ListFiles(dir, recursive);
@@ -437,7 +444,7 @@ namespace Emby.Common.Implementations.IO
public IEnumerable<FileSystemMetadata> GetFiles(string path, string[] extensions, bool enableCaseSensitiveExtensions, bool recursive = false)
{
var dir = CreateSmbFile(path);
var dir = CreateSmbDirectoryForListFiles(path);
AssertDirectoryExists(dir, path);
var list = ListFiles(dir, recursive);
@@ -459,7 +466,7 @@ namespace Emby.Common.Implementations.IO
public IEnumerable<FileSystemMetadata> GetFileSystemEntries(string path, bool recursive = false)
{
var dir = CreateSmbFile(path);
var dir = CreateSmbDirectoryForListFiles(path);
AssertDirectoryExists(dir, path);
var list = ListFiles(dir, recursive);
@@ -472,7 +479,7 @@ namespace Emby.Common.Implementations.IO
public IEnumerable<string> GetFileSystemEntryPaths(string path, bool recursive = false)
{
var dir = CreateSmbFile(path);
var dir = CreateSmbDirectoryForListFiles(path);
AssertDirectoryExists(dir, path);
var list = ListFiles(dir, recursive);
@@ -485,7 +492,7 @@ namespace Emby.Common.Implementations.IO
public IEnumerable<string> GetFilePaths(string path, string[] extensions, bool enableCaseSensitiveExtensions, bool recursive = false)
{
var dir = CreateSmbFile(path);
var dir = CreateSmbDirectoryForListFiles(path);
AssertDirectoryExists(dir, path);
var list = ListFiles(dir, recursive);
@@ -507,7 +514,7 @@ namespace Emby.Common.Implementations.IO
public IEnumerable<string> GetDirectoryPaths(string path, bool recursive = false)
{
var dir = CreateSmbFile(path);
var dir = CreateSmbDirectoryForListFiles(path);
AssertDirectoryExists(dir, path);
var list = ListFiles(dir, recursive);