aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Api/EnvironmentService.cs
diff options
context:
space:
mode:
authorLukePulverenti <luke.pulverenti@gmail.com>2013-02-28 14:32:41 -0500
committerLukePulverenti <luke.pulverenti@gmail.com>2013-02-28 14:32:41 -0500
commitaf7aa597c35279e286ee88641854db69744e7b15 (patch)
tree09cddf891558aed82f62bd5802fd9ff9ab21f116 /MediaBrowser.Api/EnvironmentService.cs
parent4435e83e696c9172b2dcb8a5d48d866f767a421c (diff)
referenced core plugins, fixed some dashboard issues, extracted library manager
Diffstat (limited to 'MediaBrowser.Api/EnvironmentService.cs')
-rw-r--r--MediaBrowser.Api/EnvironmentService.cs20
1 files changed, 12 insertions, 8 deletions
diff --git a/MediaBrowser.Api/EnvironmentService.cs b/MediaBrowser.Api/EnvironmentService.cs
index f3c5d70c0..56be18d86 100644
--- a/MediaBrowser.Api/EnvironmentService.cs
+++ b/MediaBrowser.Api/EnvironmentService.cs
@@ -97,18 +97,18 @@ namespace MediaBrowser.Api
throw new ArgumentNullException("Path");
}
- // Reject invalid input
- if (!Path.IsPathRooted(path))
+ if (path.StartsWith(NetworkPrefix, StringComparison.OrdinalIgnoreCase) && path.LastIndexOf('\\') == 1)
{
- throw new ArgumentException(string.Format("Invalid path: {0}", path));
+ return ToOptimizedResult(GetNetworkShares(path).ToList());
}
- if (path.StartsWith(NetworkPrefix, StringComparison.OrdinalIgnoreCase) && path.LastIndexOf('\\') == 1)
+ // Reject invalid input
+ if (!Path.IsPathRooted(path))
{
- return GetNetworkShares(path).ToList();
+ throw new ArgumentException(string.Format("Invalid path: {0}", path));
}
- return GetFileSystemEntries(request).ToList();
+ return ToOptimizedResult(GetFileSystemEntries(request).ToList());
}
/// <summary>
@@ -118,7 +118,9 @@ namespace MediaBrowser.Api
/// <returns>System.Object.</returns>
public object Get(GetDrives request)
{
- return GetDrives().ToList();
+ var result = GetDrives().ToList();
+
+ return ToOptimizedResult(result);
}
/// <summary>
@@ -128,7 +130,9 @@ namespace MediaBrowser.Api
/// <returns>System.Object.</returns>
public object Get(GetNetworkComputers request)
{
- return GetNetworkComputers().ToList();
+ var result = GetNetworkComputers().ToList();
+
+ return ToOptimizedResult(result);
}
/// <summary>