alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-04-23 02:24:44 +01:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Use config setting to decide if web content should be hosted

Browse Source 
Also fail server startup if web content is expected but missing
This commit is contained in:
Mark Monteiro
2020-02-28 20:49:04 +01:00
parent 3f4b9e9a81
commit 29bad073eb
4 changed files with 18 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Emby.Server.Implementations/ApplicationHost.cs
View File

@@ -240,13 +240,10 @@ namespace Emby.Server.Implementations
public int HttpsPort { get; private set; }
/// <summary>
/// Gets the content root for the webhost. If the webhost is not serving static web content, this will be null.
/// Gets the content root for the webhost.
/// </summary>
public string ContentRoot { get; private set; }
/// <inheritdoc/>
public bool IsHostingContent => ContentRoot != null;
/// <summary>
/// Gets the server configuration manager.
/// </summary>

4
Emby.Server.Implementations/EntryPoints/StartupWizard.cs
View File

@@ -2,7 +2,9 @@ using System.Threading.Tasks;
using Emby.Server.Implementations.Browser;
using MediaBrowser.Controller;
using MediaBrowser.Controller.Configuration;
using MediaBrowser.Controller.Extensions;
using MediaBrowser.Controller.Plugins;
using Microsoft.Extensions.Configuration;
namespace Emby.Server.Implementations.EntryPoints
{
@@ -36,7 +38,7 @@ namespace Emby.Server.Implementations.EntryPoints
return Task.CompletedTask;
}
if (!_appHost.IsHostingContent)
if (_appHost.Resolve<IConfiguration>().IsNoWebContent())
{
BrowserLauncher.OpenSwaggerPage(_appHost);
}