lgladsden/jellyfin-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Implement review feedback

Browse Source
This commit is contained in:
Joshua Boniface 2019-03-12 09:18:45 -04:00
parent 5f7524aca2
commit 3c4043199a
7 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -36,9 +36,9 @@ namespace Emby.Server.Implementations.AppBase
public string ProgramDataPath { get; private set; } public string ProgramDataPath { get; private set; }
/// <summary> /// <summary>
/// Gets the path to the web resources folder /// Gets the path to the web UI resources folder
/// </summary> /// </summary>
/// <value>The web resources path.</value> /// <value>The web UI resources path.</value>
public string WebPath { get; set; } public string WebPath { get; set; }
/// <summary> /// <summary>

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

@ -621,7 +621,7 @@ namespace Emby.Server.Implementations
string contentRoot = ServerConfigurationManager.Configuration.DashboardSourcePath; string contentRoot = ServerConfigurationManager.Configuration.DashboardSourcePath;
if (string.IsNullOrEmpty(contentRoot)) if (string.IsNullOrEmpty(contentRoot))
{ {
contentRoot = Path.Combine(ServerConfigurationManager.ApplicationPaths.WebPath, "src"); contentRoot = ServerConfigurationManager.ApplicationPaths.WebPath;
} }
var host = new WebHostBuilder() var host = new WebHostBuilder()

2
Jellyfin.Server/Program.cs
View File

@ -277,7 +277,7 @@ namespace Jellyfin.Server
if (string.IsNullOrEmpty(webDir)) if (string.IsNullOrEmpty(webDir))
{ {
// Use default location under ResourcesPath // Use default location under ResourcesPath
webDir = Path.Combine(AppContext.BaseDirectory, "jellyfin-web"); webDir = Path.Combine(AppContext.BaseDirectory, "jellyfin-web", "src");
} }
} }

2
Jellyfin.Server/StartupOptions.cs
View File

@ -11,7 +11,7 @@ namespace Jellyfin.Server
[Option('d', "datadir", Required = false, HelpText = "Path to use for the data folder (database files, etc.).")] [Option('d', "datadir", Required = false, HelpText = "Path to use for the data folder (database files, etc.).")]
public string DataDir { get; set; } public string DataDir { get; set; }
[Option('w', "webdir", Required = false, HelpText = "Path to the Jellyfin web resources.")] [Option('w', "webdir", Required = false, HelpText = "Path to the Jellyfin web UI resources.")]
public string WebDir { get; set; } public string WebDir { get; set; }
[Option('C', "cachedir", Required = false, HelpText = "Path to use for caching.")] [Option('C', "cachedir", Required = false, HelpText = "Path to use for caching.")]

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

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

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

@ -84,9 +84,9 @@ namespace MediaBrowser.Model.System
public string ProgramDataPath { get; set; } public string ProgramDataPath { get; set; }
/// <summary> /// <summary>
/// Gets or sets the web resources path. /// Gets or sets the web UI resources path.
/// </summary> /// </summary>
/// <value>The web resources path.</value> /// <value>The web UI resources path.</value>
public string WebPath { get; set; } public string WebPath { get; set; }
/// <summary> /// <summary>

2
MediaBrowser.WebDashboard/Api/DashboardService.cs
View File

@ -149,7 +149,7 @@ namespace MediaBrowser.WebDashboard.Api
return _serverConfigurationManager.Configuration.DashboardSourcePath; return _serverConfigurationManager.Configuration.DashboardSourcePath;
} }
return Path.Combine(_serverConfigurationManager.ApplicationPaths.WebPath, "src"); return _serverConfigurationManager.ApplicationPaths.WebPath;
} }
} }