michael.heier/jellyfin
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Add further resources to complete WebPath

Browse Source
This commit is contained in:
Joshua Boniface 2019-03-10 17:04:18 -04:00
parent 25deca9579
commit 132ce3ece1
6 changed files with 28 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Emby.Server.Implementations/AppBase/BaseApplicationPaths.cs
View File

@ -35,6 +35,12 @@ namespace Emby.Server.Implementations.AppBase
/// <value>The program data path.</value>
public string ProgramDataPath { get; private set; }
/// <summary>
/// Gets the path to the web resources folder
/// </summary>
/// <value>The web resources path.</value>
public string WebPath { get; set; }
/// <summary>
/// Gets the path to the system folder
/// </summary>

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

@ -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,

6
Emby.Server.Implementations/ServerApplicationPaths.cs
View File

@ -35,6 +35,12 @@ namespace Emby.Server.Implementations
/// <value>The root folder path.</value>
public string RootFolderPath => Path.Combine(ProgramDataPath, "root");
/* /// <summary>
/// Gets the path to the Web resources
/// </summary>
/// <value>The web folder path.</value>
public string WebPath => WebPath; */
/// <summary>
/// Gets the path to the default user view directory. Used if no specific user view is defined.
/// </summary>

2
Jellyfin.Server/Program.cs
View File

@ -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");
}
}

6
MediaBrowser.Common/Configuration/IApplicationPaths.cs
View File

@ -11,6 +11,12 @@ namespace MediaBrowser.Common.Configuration
/// <value>The program data path.</value>
string ProgramDataPath { get; }
/// <summary>
/// Gets the path to the web resources folder
/// </summary>
/// <value>The web resources path.</value>
string WebPath { get; }
/// <summary>
/// Gets the path to the program system folder
/// </summary>

6
MediaBrowser.Model/System/SystemInfo.cs
View File

@ -83,6 +83,12 @@ namespace MediaBrowser.Model.System
/// <value>The program data path.</value>
public string ProgramDataPath { get; set; }
/// <summary>
/// Gets or sets the web resources path.
/// </summary>
/// <value>The web resources path.</value>
public string WebPath { get; set; }
/// <summary>
/// Gets or sets the items by name path.
/// </summary>