diff --git a/Emby.Server.Implementations/AppBase/BaseApplicationPaths.cs b/Emby.Server.Implementations/AppBase/BaseApplicationPaths.cs
index 3ee09c9c04..fd9ce3a364 100644
--- a/Emby.Server.Implementations/AppBase/BaseApplicationPaths.cs
+++ b/Emby.Server.Implementations/AppBase/BaseApplicationPaths.cs
@@ -35,6 +35,12 @@ namespace Emby.Server.Implementations.AppBase
/// The program data path.
public string ProgramDataPath { get; private set; }
+ ///
+ /// Gets the path to the web resources folder
+ ///
+ /// The web resources path.
+ public string WebPath { get; set; }
+
///
/// Gets the path to the system folder
///
diff --git a/Emby.Server.Implementations/ApplicationHost.cs b/Emby.Server.Implementations/ApplicationHost.cs
index 05ede0ddab..f240ef871a 100644
--- a/Emby.Server.Implementations/ApplicationHost.cs
+++ b/Emby.Server.Implementations/ApplicationHost.cs
@@ -621,7 +621,7 @@ namespace Emby.Server.Implementations
string contentRoot = ServerConfigurationManager.Configuration.DashboardSourcePath;
if (string.IsNullOrEmpty(contentRoot))
{
- contentRoot = Path.Combine(ServerConfigurationManager.ApplicationPaths,WebPath, "src");
+ contentRoot = Path.Combine(ServerConfigurationManager.ApplicationPaths.WebPath, "src");
}
var host = new WebHostBuilder()
@@ -921,6 +921,7 @@ namespace Emby.Server.Implementations
logger.LogInformation("User Interactive: {IsUserInteractive}", Environment.UserInteractive);
logger.LogInformation("Processor count: {ProcessorCount}", Environment.ProcessorCount);
logger.LogInformation("Program data path: {ProgramDataPath}", appPaths.ProgramDataPath);
+ logger.LogInformation("Web resources path: {WebPath}", appPaths.WebPath);
logger.LogInformation("Application directory: {ApplicationPath}", appPaths.ProgramSystemPath);
}
@@ -1393,6 +1394,7 @@ namespace Emby.Server.Implementations
CompletedInstallations = InstallationManager.CompletedInstallations.ToArray(),
Id = SystemId,
ProgramDataPath = ApplicationPaths.ProgramDataPath,
+ WebPath = ApplicationPaths.WebPath,
LogPath = ApplicationPaths.LogDirectoryPath,
ItemsByNamePath = ApplicationPaths.InternalMetadataPath,
InternalMetadataPath = ApplicationPaths.InternalMetadataPath,
diff --git a/Emby.Server.Implementations/ServerApplicationPaths.cs b/Emby.Server.Implementations/ServerApplicationPaths.cs
index adaf23234f..68d5881220 100644
--- a/Emby.Server.Implementations/ServerApplicationPaths.cs
+++ b/Emby.Server.Implementations/ServerApplicationPaths.cs
@@ -35,6 +35,12 @@ namespace Emby.Server.Implementations
/// The root folder path.
public string RootFolderPath => Path.Combine(ProgramDataPath, "root");
+/* ///
+ /// Gets the path to the Web resources
+ ///
+ /// The web folder path.
+ public string WebPath => WebPath; */
+
///
/// Gets the path to the default user view directory. Used if no specific user view is defined.
///
diff --git a/Jellyfin.Server/Program.cs b/Jellyfin.Server/Program.cs
index 3d81ade35c..8f1498b13b 100644
--- a/Jellyfin.Server/Program.cs
+++ b/Jellyfin.Server/Program.cs
@@ -277,7 +277,7 @@ namespace Jellyfin.Server
if (string.IsNullOrEmpty(webDir))
{
// Use default location under ResourcesPath
- webDir = Path.Combine(AppContext.BaseDirectory, "jellyfin-web")
+ webDir = Path.Combine(AppContext.BaseDirectory, "jellyfin-web");
}
}
diff --git a/MediaBrowser.Common/Configuration/IApplicationPaths.cs b/MediaBrowser.Common/Configuration/IApplicationPaths.cs
index cb4e8bf5f0..1f56c98fd8 100644
--- a/MediaBrowser.Common/Configuration/IApplicationPaths.cs
+++ b/MediaBrowser.Common/Configuration/IApplicationPaths.cs
@@ -11,6 +11,12 @@ namespace MediaBrowser.Common.Configuration
/// The program data path.
string ProgramDataPath { get; }
+ ///
+ /// Gets the path to the web resources folder
+ ///
+ /// The web resources path.
+ string WebPath { get; }
+
///
/// Gets the path to the program system folder
///
diff --git a/MediaBrowser.Model/System/SystemInfo.cs b/MediaBrowser.Model/System/SystemInfo.cs
index 6482f2c840..fa72624819 100644
--- a/MediaBrowser.Model/System/SystemInfo.cs
+++ b/MediaBrowser.Model/System/SystemInfo.cs
@@ -83,6 +83,12 @@ namespace MediaBrowser.Model.System
/// The program data path.
public string ProgramDataPath { get; set; }
+ ///
+ /// Gets or sets the web resources path.
+ ///
+ /// The web resources path.
+ public string WebPath { get; set; }
+
///
/// Gets or sets the items by name path.
///