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

Add configuration flag for Web directory

Browse Source
This commit is contained in:
Joshua Boniface 2019-03-10 16:17:48 -04:00
parent 4b91c9bf66
commit 93d15cd969
4 changed files with 28 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -17,12 +17,14 @@ namespace Emby.Server.Implementations.AppBase
string programDataPath, string programDataPath,
string logDirectoryPath, string logDirectoryPath,
string configurationDirectoryPath, string configurationDirectoryPath,
string cacheDirectoryPath) string cacheDirectoryPath,
string webDirectoryPath)
{ {
ProgramDataPath = programDataPath; ProgramDataPath = programDataPath;
LogDirectoryPath = logDirectoryPath; LogDirectoryPath = logDirectoryPath;
ConfigurationDirectoryPath = configurationDirectoryPath; ConfigurationDirectoryPath = configurationDirectoryPath;
CachePath = cacheDirectoryPath; CachePath = cacheDirectoryPath;
WebPath = webDirectoryPath;
DataPath = Path.Combine(ProgramDataPath, "data"); DataPath = Path.Combine(ProgramDataPath, "data");
} }

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

@ -17,11 +17,13 @@ namespace Emby.Server.Implementations
string programDataPath, string programDataPath,
string logDirectoryPath, string logDirectoryPath,
string configurationDirectoryPath, string configurationDirectoryPath,
string cacheDirectoryPath) string cacheDirectoryPath,
string webDirectoryPath)
: base(programDataPath, : base(programDataPath,
logDirectoryPath, logDirectoryPath,
configurationDirectoryPath, configurationDirectoryPath,
cacheDirectoryPath) cacheDirectoryPath,
webDirectoryPath)
{ {
} }

19
Jellyfin.Server/Program.cs
View File

@ -264,6 +264,23 @@ namespace Jellyfin.Server
} }
} }
// webDir
// IF --webdir
// ELSE IF $JELLYFIN_WEB_DIR
// ELSE use <bindir>/jellyfin-web
var webDir = options.WebDir;
if (string.IsNullOrEmpty(webDir))
{
webDir = Environment.GetEnvironmentVariable("JELLYFIN_WEB_DIR");
if (string.IsNullOrEmpty(webDir))
{
// Use default location under ResourcesPath
webDir = Path.Combine(AppContext.BaseDirectory, "jellyfin-web")
}
}
// logDir // logDir
// IF --logdir // IF --logdir
// ELSE IF $JELLYFIN_LOG_DIR // ELSE IF $JELLYFIN_LOG_DIR
@ -296,7 +313,7 @@ namespace Jellyfin.Server
Environment.Exit(1); Environment.Exit(1);
} }
return new ServerApplicationPaths(dataDir, logDir, configDir, cacheDir); return new ServerApplicationPaths(dataDir, logDir, configDir, cacheDir, webDir);
} }
private static async Task<IConfiguration> CreateConfiguration(IApplicationPaths appPaths) private static async Task<IConfiguration> CreateConfiguration(IApplicationPaths appPaths)

3
Jellyfin.Server/StartupOptions.cs
View File

@ -11,6 +11,9 @@ 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.")]
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.")]
public string CacheDir { get; set; } public string CacheDir { get; set; }