aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Monteiro <marknr.monteiro@protonmail.com>2020-02-25 17:01:57 +0100
committerMark Monteiro <marknr.monteiro@protonmail.com>2020-02-25 17:01:57 +0100
commit1b5999a1bc11ee386131e4bbce561896c0e1bced (patch)
tree1985156876bd209c536dd7522a842b7733693076
parent26af5ea45a8ea02b7a3f20b0ebc31ef19f850dea (diff)
Open the Swagger API page on server start if not hosting the static web content
-rw-r--r--Emby.Server.Implementations/ApplicationHost.cs3
-rw-r--r--Emby.Server.Implementations/Browser/BrowserLauncher.cs10
-rw-r--r--Emby.Server.Implementations/EntryPoints/StartupWizard.cs6
-rw-r--r--MediaBrowser.Controller/IServerApplicationHost.cs5
4 files changed, 23 insertions, 1 deletions
diff --git a/Emby.Server.Implementations/ApplicationHost.cs b/Emby.Server.Implementations/ApplicationHost.cs
index a5b88f64f2..789b8724c3 100644
--- a/Emby.Server.Implementations/ApplicationHost.cs
+++ b/Emby.Server.Implementations/ApplicationHost.cs
@@ -244,6 +244,9 @@ namespace Emby.Server.Implementations
/// </summary>
public string ContentRoot { get; private set; }
+ /// <inheritdoc/>
+ public bool IsHostingContent => ContentRoot != null;
+
/// <summary>
/// Gets the server configuration manager.
/// </summary>
diff --git a/Emby.Server.Implementations/Browser/BrowserLauncher.cs b/Emby.Server.Implementations/Browser/BrowserLauncher.cs
index f5da0d0183..b17c2b2700 100644
--- a/Emby.Server.Implementations/Browser/BrowserLauncher.cs
+++ b/Emby.Server.Implementations/Browser/BrowserLauncher.cs
@@ -30,6 +30,16 @@ namespace Emby.Server.Implementations.Browser
}
/// <summary>
+ /// Opens the swagger API page.
+ /// </summary>
+ /// <param name="appHost">The app host.</param>
+ public static void OpenSwaggerPage(IServerApplicationHost appHost)
+ {
+ var url = appHost.GetLocalApiUrl("localhost") + "/swagger/index.html";
+ OpenUrl(appHost, url);
+ }
+
+ /// <summary>
/// Opens the URL.
/// </summary>
/// <param name="appHost">The application host instance.</param>
diff --git a/Emby.Server.Implementations/EntryPoints/StartupWizard.cs b/Emby.Server.Implementations/EntryPoints/StartupWizard.cs
index 5f2d629fea..6b7e2805bd 100644
--- a/Emby.Server.Implementations/EntryPoints/StartupWizard.cs
+++ b/Emby.Server.Implementations/EntryPoints/StartupWizard.cs
@@ -36,7 +36,11 @@ namespace Emby.Server.Implementations.EntryPoints
return Task.CompletedTask;
}
- if (!_config.Configuration.IsStartupWizardCompleted)
+ if (!_appHost.IsHostingContent)
+ {
+ BrowserLauncher.OpenSwaggerPage(_appHost);
+ }
+ else if (!_config.Configuration.IsStartupWizardCompleted)
{
BrowserLauncher.OpenWebApp(_appHost);
}
diff --git a/MediaBrowser.Controller/IServerApplicationHost.cs b/MediaBrowser.Controller/IServerApplicationHost.cs
index 25f0905eb8..134ed110ba 100644
--- a/MediaBrowser.Controller/IServerApplicationHost.cs
+++ b/MediaBrowser.Controller/IServerApplicationHost.cs
@@ -17,6 +17,11 @@ namespace MediaBrowser.Controller
event EventHandler HasUpdateAvailableChanged;
/// <summary>
+ /// Gets a value indicating whether the server is hosting the static web content from jellyfin-web.
+ /// </summary>
+ bool IsHostingContent { get; }
+
+ /// <summary>
/// Gets the system info.
/// </summary>
/// <returns>SystemInfo.</returns>