github-mirrors/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-04-24 05:57:20 -04:00
Code Issues Projects Releases Packages Wiki Activity

Accept single-hyphen usage and rename -programdatadir to -datadir

Browse source 
For backwards compatibility, modify the args[] strings to replace single-hyphens with double-hyphens before parsing.

Also rename -programdatadir to -datadir.
This commit is contained in:
PloughPuff 2019-01-28 14:51:31 +00:00 • committed by Bond-009
parent fd361421b1
commit ebd2a30087
2 changed files with 17 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Emby.Server.Implementations/StartupOptions.cs
View file

@ -7,8 +7,8 @@ namespace Emby.Server.Implementations
/// </summary>
public class StartupOptions
{
[Option('d', "programdata", Required = false, HelpText = "Path to use for program data (databases files etc.).")]
public string PathProgramData { get; set; }
[Option('d', "datadir", Required = false, HelpText = "Path to use for the data folder (databases files etc.).")]
public string PathData { get; set; }
[Option('c', "configdir", Required = false, HelpText = "Path to use for config data (user policies and puctures).")]
public string PathConfig { get; set; }

17
Jellyfin.Server/Program.cs
View file

@ -27,6 +27,7 @@ using ILogger = Microsoft.Extensions.Logging.ILogger;
namespace Jellyfin.Server
{
using CommandLine;
using System.Text.RegularExpressions;
public static class Program
{
@ -37,6 +38,18 @@ namespace Jellyfin.Server
public static async Task Main(string[] args)
{
// For backwards compatibility.
// Modify any input arguments now which start with single-hyphen to POSIX standard
// double-hyphen to allow parsing by CommandLineParser package.
var pattern = @"^(-[^-\s]{2})"; // Match -xx, not -x, not --xx, not xx
var substitution = @"-$1"; // Prepend with additional single-hyphen
var regex = new Regex(pattern);
for (var i = 0; i < args.Length; i++)
{
args[i] = regex.Replace(args[i], substitution);
}
// For CommandLine package, change default behaviour to output errors to stdout (instead of stderr)
var parser = new Parser(config => config.HelpWriter = Console.Out);
@ -139,9 +152,9 @@ namespace Jellyfin.Server
string programDataPath = Environment.GetEnvironmentVariable("JELLYFIN_DATA_PATH");
if (string.IsNullOrEmpty(programDataPath))
{
if (options.PathProgramData != null)
if (options.PathData != null)
{
programDataPath = options.PathProgramData;
programDataPath = options.PathData;
}
else
{