aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Pulverenti <luke.pulverenti@gmail.com>2015-09-14 08:50:37 -0400
committerLuke Pulverenti <luke.pulverenti@gmail.com>2015-09-14 08:50:37 -0400
commit3ed1ac10cb0e827ced475edfd0f8de913a5e4099 (patch)
tree7d79af1a48fe534a84b827177e1bc030b0e4e766
parentf346997992031e4f49fe1d0294e54962f8c6eddd (diff)
update docs
-rw-r--r--MediaBrowser.Common.Implementations/HttpClientManager/HttpClientManager.cs42
-rw-r--r--MediaBrowser.Server.Startup.Common/Browser/BrowserLauncher.cs21
-rw-r--r--MediaBrowser.ServerApplication/ServerNotifyIcon.cs41
-rw-r--r--MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj6
4 files changed, 25 insertions, 85 deletions
diff --git a/MediaBrowser.Common.Implementations/HttpClientManager/HttpClientManager.cs b/MediaBrowser.Common.Implementations/HttpClientManager/HttpClientManager.cs
index 5dd1ab808..7157f6325 100644
--- a/MediaBrowser.Common.Implementations/HttpClientManager/HttpClientManager.cs
+++ b/MediaBrowser.Common.Implementations/HttpClientManager/HttpClientManager.cs
@@ -869,25 +869,11 @@ namespace MediaBrowser.Common.Implementations.HttpClientManager
Task<WebResponse> asyncTask = Task.Factory.FromAsync<WebResponse>(request.BeginGetResponse, request.EndGetResponse, null);
ThreadPool.RegisterWaitForSingleObject((asyncTask as IAsyncResult).AsyncWaitHandle, TimeoutCallback, request, timeout, true);
- asyncTask.ContinueWith(task =>
- {
- taskCompletion.TrySetResult(task.Result);
-
- }, TaskContinuationOptions.NotOnFaulted);
+ var callback = new TaskCallback { taskCompletion = taskCompletion };
+ asyncTask.ContinueWith(callback.OnSuccess, TaskContinuationOptions.NotOnFaulted);
// Handle errors
- asyncTask.ContinueWith(task =>
- {
- if (task.Exception != null)
- {
- taskCompletion.TrySetException(task.Exception);
- }
- else
- {
- taskCompletion.TrySetException(new List<Exception>());
- }
-
- }, TaskContinuationOptions.OnlyOnFaulted);
+ asyncTask.ContinueWith(callback.OnError, TaskContinuationOptions.OnlyOnFaulted);
return taskCompletion.Task;
}
@@ -903,5 +889,27 @@ namespace MediaBrowser.Common.Implementations.HttpClientManager
}
}
}
+
+ private class TaskCallback
+ {
+ public TaskCompletionSource<WebResponse> taskCompletion;
+
+ public void OnSuccess(Task<WebResponse> task)
+ {
+ taskCompletion.TrySetResult(task.Result);
+ }
+
+ public void OnError(Task<WebResponse> task)
+ {
+ if (task.Exception != null)
+ {
+ taskCompletion.TrySetException(task.Exception);
+ }
+ else
+ {
+ taskCompletion.TrySetException(new List<Exception>());
+ }
+ }
+ }
}
}
diff --git a/MediaBrowser.Server.Startup.Common/Browser/BrowserLauncher.cs b/MediaBrowser.Server.Startup.Common/Browser/BrowserLauncher.cs
index 3eeb072a8..a4504f25a 100644
--- a/MediaBrowser.Server.Startup.Common/Browser/BrowserLauncher.cs
+++ b/MediaBrowser.Server.Startup.Common/Browser/BrowserLauncher.cs
@@ -24,15 +24,6 @@ namespace MediaBrowser.Server.Startup.Common.Browser
}
/// <summary>
- /// Opens the github.
- /// </summary>
- /// <param name="logger">The logger.</param>
- public static void OpenGithub(ILogger logger)
- {
- OpenUrl("https://github.com/MediaBrowser/MediaBrowser", logger);
- }
-
- /// <summary>
/// Opens the community.
/// </summary>
/// <param name="logger">The logger.</param>
@@ -62,18 +53,6 @@ namespace MediaBrowser.Server.Startup.Common.Browser
}
/// <summary>
- /// Opens the swagger.
- /// </summary>
- /// <param name="appHost">The app host.</param>
- /// <param name="logger">The logger.</param>
- public static void OpenSwagger(IServerApplicationHost appHost, ILogger logger)
- {
- var url = appHost.GetLocalApiUrl("localhost") + "/swagger-ui/index.html";
-
- OpenUrl(url, logger);
- }
-
- /// <summary>
/// Opens the URL.
/// </summary>
/// <param name="url">The URL.</param>
diff --git a/MediaBrowser.ServerApplication/ServerNotifyIcon.cs b/MediaBrowser.ServerApplication/ServerNotifyIcon.cs
index 725720731..3501c8c27 100644
--- a/MediaBrowser.ServerApplication/ServerNotifyIcon.cs
+++ b/MediaBrowser.ServerApplication/ServerNotifyIcon.cs
@@ -21,9 +21,6 @@ namespace MediaBrowser.ServerApplication
private ToolStripMenuItem cmdRestart;
private ToolStripSeparator toolStripSeparator1;
private ToolStripMenuItem cmdCommunity;
- private ToolStripMenuItem cmdApiDocs;
- private ToolStripMenuItem cmdSwagger;
- private ToolStripMenuItem cmdGtihub;
private readonly ILogger _logger;
private readonly IServerApplicationHost _appHost;
@@ -66,9 +63,6 @@ namespace MediaBrowser.ServerApplication
toolStripSeparator2 = new ToolStripSeparator();
cmdConfigure = new ToolStripMenuItem();
cmdBrowse = new ToolStripMenuItem();
- cmdApiDocs = new ToolStripMenuItem();
- cmdSwagger = new ToolStripMenuItem();
- cmdGtihub = new ToolStripMenuItem();
//
// notifyIcon1
@@ -86,7 +80,6 @@ namespace MediaBrowser.ServerApplication
toolStripSeparator2,
cmdRestart,
toolStripSeparator1,
- cmdApiDocs,
cmdCommunity,
cmdExit});
contextMenuStrip1.Name = "contextMenuStrip1";
@@ -128,24 +121,6 @@ namespace MediaBrowser.ServerApplication
//
cmdBrowse.Name = "cmdBrowse";
cmdBrowse.Size = new System.Drawing.Size(208, 22);
- //
- // cmdApiDocs
- //
- cmdApiDocs.DropDownItems.AddRange(new ToolStripItem[] {
- cmdSwagger,
- cmdGtihub});
- cmdApiDocs.Name = "cmdApiDocs";
- cmdApiDocs.Size = new System.Drawing.Size(208, 22);
- //
- // cmdSwagger
- //
- cmdSwagger.Name = "cmdSwagger";
- cmdSwagger.Size = new System.Drawing.Size(136, 22);
- //
- // cmdGtihub
- //
- cmdGtihub.Name = "cmdGtihub";
- cmdGtihub.Size = new System.Drawing.Size(136, 22);
cmdExit.Click += cmdExit_Click;
cmdRestart.Click += cmdRestart_Click;
@@ -153,9 +128,6 @@ namespace MediaBrowser.ServerApplication
cmdCommunity.Click += cmdCommunity_Click;
cmdBrowse.Click += cmdBrowse_Click;
- cmdSwagger.Click += cmdSwagger_Click;
- cmdGtihub.Click += cmdGtihub_Click;
-
_configurationManager.ConfigurationUpdated += Instance_ConfigurationUpdated;
LocalizeText();
@@ -181,9 +153,6 @@ namespace MediaBrowser.ServerApplication
cmdExit.Text = _localization.GetLocalizedString("LabelExit");
cmdCommunity.Text = _localization.GetLocalizedString("LabelVisitCommunity");
- cmdGtihub.Text = _localization.GetLocalizedString("LabelGithub");
- cmdSwagger.Text = _localization.GetLocalizedString("LabelApiDocumentation");
- cmdApiDocs.Text = _localization.GetLocalizedString("LabelDeveloperResources");
cmdBrowse.Text = _localization.GetLocalizedString("LabelBrowseLibrary");
cmdConfigure.Text = _localization.GetLocalizedString("LabelConfigureServer");
cmdRestart.Text = _localization.GetLocalizedString("LabelRestartServer");
@@ -229,16 +198,6 @@ namespace MediaBrowser.ServerApplication
_appHost.Shutdown();
}
- void cmdGtihub_Click(object sender, EventArgs e)
- {
- BrowserLauncher.OpenGithub(_logger);
- }
-
- void cmdSwagger_Click(object sender, EventArgs e)
- {
- BrowserLauncher.OpenSwagger(_appHost, _logger);
- }
-
~ServerNotifyIcon()
{
Dispose();
diff --git a/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj b/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
index 5bbb61538..3f5b9dd41 100644
--- a/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
+++ b/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
@@ -299,9 +299,6 @@
<Content Include="dashboard-ui\secondaryitems.html">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
- <Content Include="dashboard-ui\serversecurity.html">
- <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
- </Content>
<Content Include="dashboard-ui\shared.html">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
@@ -1134,9 +1131,6 @@
<Content Include="dashboard-ui\scripts\livetvsuggested.js">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
- <Content Include="dashboard-ui\scripts\serversecurity.js">
- <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
- </Content>
<Content Include="dashboard-ui\scripts\sync.js">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>