more advanced command-line support

Author: GreemDev

src/Server/Config.cs

@@ -1,8 +1,8 @@
-using System.Diagnostics.CodeAnalysis;
-using System.Text.Json;
+using System.Text.Json;
 using Gommon;
 using Microsoft.Extensions.Configuration.Json;
 using Microsoft.Extensions.FileProviders;
+using Ryujinx.Systems.Update.Server.Helpers;
 using Ryujinx.Systems.Update.Server.Services;
 
 namespace Ryujinx.Systems.Update.Server;
@@ -16,69 +16,66 @@ static Config()
         if (!Directory.Exists("config"))
             Directory.CreateDirectory("config");
 
-
         DiskProvider = new PhysicalFileProvider(new FilePath(Environment.CurrentDirectory) / "config");
     }
 
-    public static bool UseVersionPinning(string[] args,
-        [MaybeNullWhen(false)] out JsonConfigurationSource jcs)
+    extension(WebApplicationBuilder builder)
     {
-        jcs = null;
-
-        if (args.Any(x => x.EqualsIgnoreCase("--gen-version-pinning")))
+        public void TryUseVersionPinning()
         {
-            if (!File.Exists("config/versionPinning.json"))
-                File.WriteAllText("config/versionPinning.json",
-                    """
-                    {
-                        "VersionPinning": {
-                            "Stable": {
-                                "osx": {
-                                    "x64": "1.3.4"
+            if (CommandLineState.GenerateVersionPinning)
+            {
+                if (!File.Exists("config/versionPinning.json"))
+                    File.WriteAllText("config/versionPinning.json",
+                        """
+                        {
+                            "VersionPinning": {
+                                "Stable": {
+                                    "osx": {
+                                        "x64": "1.3.4"
+                                    }
                                 }
                             }
                         }
-                    }
-                    """
-                );
-        }
-
-        if (File.Exists("config/versionPinning.json"))
-            jcs = new()
-            {
-                FileProvider = DiskProvider,
-                Optional = true,
-                ReloadOnChange = false,
-                Path = "versionPinning.json"
-            };
+                        """
+                    );
+            }
 
-        return jcs != null;
-    }
+            if (File.Exists("config/versionPinning.json"))
+                builder.Configuration.Sources.Add(new JsonConfigurationSource
+                {
+                    FileProvider = DiskProvider,
+                    Optional = true,
+                    ReloadOnChange = false,
+                    Path = "versionPinning.json"
+                });
+        }
 
-    public static void TryUseVersionProvider(this WebApplicationBuilder builder, string[] args)
-    {
-        if (args.Any(x => x.EqualsIgnoreCase("--gen-version-provider")))
+        public void TryUseVersionProvider()
         {
-            if (!VersionProvider.Path.ExistsAsFile)
-                VersionProvider.Path.WriteAllText( 
-                    JsonSerializer.Serialize(new VersionProvider
-                    {
-                        Stable = new()
-                        {
-                            Format = "1.{MAJOR}.{BUILD}",
-                            Major = 3,
-                            Build = 0
-                        },
-                        Canary = new()
+            if (CommandLineState.GenerateVersionProvider)
+            {
+                if (!VersionProvider.Path.ExistsAsFile)
+                    VersionProvider.Path.WriteAllText( 
+                        JsonSerializer.Serialize(new VersionProvider
                         {
-                            Format = "1.{MAJOR}.{BUILD}",
-                            Major = 3,
-                            Build = 0
-                        }
-                    }, JSCtx.ReadableDefault.VersionProvider));
-        }
+                            Stable = new()
+                            {
+                                Format = "1.{MAJOR}.{BUILD}",
+                                Major = 3,
+                                Build = 0
+                            },
+                            Canary = new()
+                            {
+                                Format = "1.{MAJOR}.{BUILD}",
+                                Major = 3,
+                                Build = 0
+                            }
+                        }, JSCtx.ReadableDefault.VersionProvider));
+            }
 
-        if (VersionProvider.Path.ExistsAsFile)
-            builder.Services.AddSingleton<VersionProviderService>();
+            if (VersionProvider.Path.ExistsAsFile)
+                builder.Services.AddSingleton<VersionProviderService>();
+        }
     }
 }

src/Server/Controllers/Api/v1/Admin/VersioningController.cs

@@ -1,5 +1,4 @@
-using Gommon;
-using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using Ryujinx.Systems.Update.Common;
 using Ryujinx.Systems.Update.Server.Services;
 

src/Server/Controllers/IndexController.cs

@@ -15,7 +15,7 @@ public ActionResult Index()
     [HttpGet("docs"), HttpGet("info"), HttpGet("help")]
     public ActionResult Help()
     {
-        return CommandLineState.UseSwagger 
+        return CommandLineState.Swagger
             ? Redirect("/swagger") 
             : Index();
     }

src/Server/Helpers/CommandLineState.cs

@@ -1,48 +1,61 @@
-namespace Ryujinx.Systems.Update.Server.Helpers;
+using CommandLine;
 
-public static class CommandLineState
+namespace Ryujinx.Systems.Update.Server.Helpers;
+
+public class CommandLineState
 {
+    public static bool HttpLogging => Instance.UseHttpLogging;
+    public static bool Swagger => Instance.UseSwagger;
+    public static int? Port => Instance.ListenPort;
+    public static bool GenerateVersionPinning => Instance.GenerateVersionPinningConfiguration;
+    public static bool GenerateVersionProvider => Instance.GenerateVersionProviderConfiguration;
+
+    public static bool Init(string[] args)
+    {
+        ParserResult<CommandLineState> parserResult = Parser.Default.ParseArguments<CommandLineState>(args);
+
+        if (parserResult is not Parsed<CommandLineState> parsedCls)
+            return false;
+
+        Instance = parsedCls.Value;
+
+        return true;
+    }
+
+    private static CommandLineState Instance { get; set; } = null!;
+
+    [Option('h',"http-logging", Required = false, Default = 
 #if DEBUG
-    public static bool UseHttpLogging { get; private set; } = true;
-    public static bool UseSwagger { get; private set; } = true;
+            true
 #else
-    public static bool UseHttpLogging { get; private set; } = false;
-    public static bool UseSwagger { get; private set; } = false;
+            false
 #endif
-    public static int? ListenPort { get; private set; }
+        , HelpText = "Register ASP.NET HTTP logging."
+        )]
+    public bool UseHttpLogging { get; set; }
 
-    public static void Init(string[] args)
-    {
-        foreach (var (index, arg) in args.Index())
-        {
-            switch (arg.ToLower())
-            {
-                case "--port":
-                case "-p":
-                {
-                    if (index + 1 >= args.Length)
-                        throw new Exception("port argument expects a value");
-
-                    if (!args[index + 1].TryParse<int>(out var port))
-                        throw new Exception("port argument must be an integer");
-
-                    ListenPort = port;
-
-                    break;
-                }
-                case "--http-logging":
-                case "-l":
-                {
-                    UseHttpLogging = true;
-                    break;
-                }
-                case "--enable-swagger":
-                case "-s":
-                {
-                    UseSwagger = true;
-                    break;
-                }
-            }
-        }
-    }
+    [Option('s',"swagger-ui", Required = false, Default = 
+#if DEBUG
+            true
+#else
+            false
+#endif
+        , HelpText = "Enable Swagger UI at the <ServerUrl>/swagger endpoint. /docs, /info, and /help redirect there as well with this enabled."
+    )]
+    public bool UseSwagger { get; set; } =
+#if DEBUG
+        true
+#else
+        false
+#endif
+        ;
+
+    [Option('p', "port", Required = false, Default = null, HelpText = "Specifies the port to listen on.")]
+    public int? ListenPort { get; set; }
+
+    [Option("gen-version-pinning", Required = false, Default = false, HelpText = "Generates a template configuration for the version pinning system.")]
+    public bool GenerateVersionPinningConfiguration { get; set; }
+
+    [Option("gen-version-provider", Required = false, Default = false, HelpText = "Generates a template configuration for the version provider system.")]
+    public bool GenerateVersionProviderConfiguration { get; set; }
 }

src/Server/Initialization/Swagger.cs

@@ -8,7 +8,7 @@ public static class Swagger
 {
     public static void TrySetup(WebApplicationBuilder builder)
     {
-        if (CommandLineState.UseSwagger)
+        if (CommandLineState.Swagger)
         {
             builder.Services.AddOpenApi(Constants.CurrentApiVersion);
             builder.Services.AddOpenApiDocument(opt =>
@@ -28,7 +28,7 @@ public static void TrySetup(WebApplicationBuilder builder)
 
     public static void TryMapUi(WebApplication app)
     {
-        if (CommandLineState.UseSwagger)
+        if (CommandLineState.Swagger)
         {
             app.MapOpenApi();
             app.UseSwaggerUi(opt =>

src/Server/Program.cs

@@ -4,19 +4,18 @@
 using Ryujinx.Systems.Update.Server.Services;
 using Ryujinx.Systems.Update.Server.Services.GitLab;
 
-CommandLineState.Init(args);
+if (!CommandLineState.Init(args))
+    return;
 
 var builder = WebApplication.CreateBuilder(args);
 
-if (Config.UseVersionPinning(args, out var configSource))
-    builder.Configuration.Sources.Add(configSource);
+builder.TryUseVersionPinning();
+builder.TryUseVersionProvider();
 
-builder.TryUseVersionProvider(args);
+if (CommandLineState.Port != null)
+    builder.WebHost.ConfigureKestrel(options => options.ListenLocalhost(CommandLineState.Port.Value));
 
-if (CommandLineState.ListenPort != null)
-    builder.WebHost.ConfigureKestrel(options => options.ListenLocalhost(CommandLineState.ListenPort.Value));
-
-if (CommandLineState.UseHttpLogging)
+if (CommandLineState.HttpLogging)
     builder.Services.AddHttpLogging();
 
 builder.Services.Configure<ForwardedHeadersOptions>(opts =>
@@ -43,7 +42,7 @@
 
 app.MapControllers();
 
-if (CommandLineState.UseHttpLogging)
+if (CommandLineState.HttpLogging)
     app.UseHttpLogging();
 
 TaskScheduler.UnobservedTaskException += (sender, eventArgs) =>

src/Server/Ryujinx.Systems.Update.Server.csproj

@@ -14,6 +14,7 @@
     </PropertyGroup>
 
     <ItemGroup>
+        <PackageReference Include="CommandLineParser" Version="2.9.1" />
         <PackageReference Include="Gommon" Version="2.8.0.1" />
         <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="10.0.0" />
         <PackageReference Include="NGitLab" Version="11.0.1" />