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

update client sync

Browse Source
This commit is contained in:
Luke Pulverenti 2015-09-14 21:16:31 -04:00
parent 6de0f0f33f
commit 4c050bc3f8
1 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
MediaBrowser.Api/EnvironmentService.cs
View File

@ -1,4 +1,5 @@
using MediaBrowser.Common.Net; using MediaBrowser.Common.IO;
using MediaBrowser.Common.Net;
using MediaBrowser.Controller.Net; using MediaBrowser.Controller.Net;
using MediaBrowser.Model.IO; using MediaBrowser.Model.IO;
using MediaBrowser.Model.Net; using MediaBrowser.Model.Net;
@ -8,7 +9,6 @@ using System.Collections.Generic;
using System.Globalization; using System.Globalization;
using System.IO; using System.IO;
using System.Linq; using System.Linq;
using MediaBrowser.Common.IO;
namespace MediaBrowser.Api namespace MediaBrowser.Api
{ {
@ -97,14 +97,14 @@ namespace MediaBrowser.Api
/// The _network manager /// The _network manager
/// </summary> /// </summary>
private readonly INetworkManager _networkManager; private readonly INetworkManager _networkManager;
private IFileSystem _fileSystem; private IFileSystem _fileSystem;
/// <summary> /// <summary>
/// Initializes a new instance of the <see cref="EnvironmentService" /> class. /// Initializes a new instance of the <see cref="EnvironmentService" /> class.
/// </summary> /// </summary>
/// <param name="networkManager">The network manager.</param> /// <param name="networkManager">The network manager.</param>
/// <exception cref="System.ArgumentNullException">networkManager</exception> /// <exception cref="System.ArgumentNullException">networkManager</exception>
public EnvironmentService(INetworkManager networkManager, IFileSystem fileSystem) public EnvironmentService(INetworkManager networkManager, IFileSystem fileSystem)
{ {
if (networkManager == null) if (networkManager == null)
{ {
@ -112,7 +112,7 @@ namespace MediaBrowser.Api
} }
_networkManager = networkManager; _networkManager = networkManager;
_fileSystem = fileSystem; _fileSystem = fileSystem;
} }
/// <summary> /// <summary>
@ -138,7 +138,15 @@ namespace MediaBrowser.Api
return ToOptimizedSerializedResultUsingCache(GetNetworkShares(path).OrderBy(i => i.Path).ToList()); return ToOptimizedSerializedResultUsingCache(GetNetworkShares(path).OrderBy(i => i.Path).ToList());
} }
return ToOptimizedSerializedResultUsingCache(GetFileSystemEntries(request).OrderBy(i => i.Path).ToList()); try
{
return ToOptimizedSerializedResultUsingCache(GetFileSystemEntries(request).OrderBy(i => i.Path).ToList());
}
catch (UnauthorizedAccessException)
{
// Don't throw the original UnauthorizedAccessException because it will cause a 401 response
throw new ApplicationException("Access to the path " + request.Path + " is denied.");
}
} }
public object Get(GetNetworkShares request) public object Get(GetNetworkShares request)
@ -225,7 +233,7 @@ namespace MediaBrowser.Api
private IEnumerable<FileSystemEntryInfo> GetFileSystemEntries(GetDirectoryContents request) private IEnumerable<FileSystemEntryInfo> GetFileSystemEntries(GetDirectoryContents request)
{ {
// using EnumerateFileSystemInfos doesn't handle reparse points (symlinks) // using EnumerateFileSystemInfos doesn't handle reparse points (symlinks)
var entries = _fileSystem.GetFileSystemEntries(request.Path).Where(i => var entries = _fileSystem.GetFileSystemEntries(request.Path).Where(i =>
{ {
if (!request.IncludeHidden && i.Attributes.HasFlag(FileAttributes.Hidden)) if (!request.IncludeHidden && i.Attributes.HasFlag(FileAttributes.Hidden))
{ {