[WIP] Improved CLI options

Author: 0xced

src/nugraph/GraphCommand.cs

@@ -51,10 +51,13 @@ protected override async Task<int> ExecuteAsync(CommandContext commandContext, G
         if (graphUrl != null)
         {
             var url = graphUrl.ToString();
-            // Using "console.WriteLine(url)" (lowercase c) would insert newlines at the physical console length, making the written URL neither copyable nor clickable
-            // At that point the status has terminated so it's fine not using the IAnsiConsole methods
-            await stdOut.WriteLineAsync(url);
-            if (!settings.NoBrowser)
+            if (settings.UrlAction.HasFlag(UrlAction.print))
+            {
+                // Using "console.WriteLine(url)" (lowercase c) would insert newlines at the physical console length, making the written URL neither copyable nor clickable
+                // At that point the status has terminated so it's fine not using the IAnsiConsole methods
+                await stdOut.WriteLineAsync(url);
+            }
+            if (settings.UrlAction.HasFlag(UrlAction.open))
             {
                 Process.Start(new ProcessStartInfo(url) { UseShellExecute = true });
             }

src/nugraph/GraphCommandSettings.cs

@@ -12,6 +12,15 @@
 
 namespace nugraph;
 
+[Flags]
+[SuppressMessage("ReSharper", "InconsistentNaming", Justification = "Better fit for command line options")]
+internal enum UrlAction
+{
+    nothing = 0,
+    open = 1 << 0,
+    print = 1 << 1,
+}
+
 [SuppressMessage("ReSharper", "AutoPropertyCanBeMadeGetOnly.Global", Justification = "Required for Spectre.Console.Cli binding")]
 [SuppressMessage("ReSharper", "UnusedAutoPropertyAccessor.Global", Justification = "Required for Spectre.Console.Cli binding")]
 [SuppressMessage("ReSharper", "ClassNeverInstantiated.Global", Justification = "Instantiated by Spectre.Console.Cli through reflection")]
@@ -22,41 +31,50 @@ internal sealed class GraphCommandSettings : CommandSettings
 
     [CommandArgument(0, "[SOURCE]")]
     [Description("The source of the graph. Can be either a directory containing a .NET project, a .NET project file (csproj/fsproj/vbproj) or the name of a NuGet package, " +
-                 "optionally with a specific version, e.g. [b]Newtonsoft.Json/13.0.3[/].")]
+                 "optionally with a specific version, e.g. [b]Newtonsoft.Json/13.0.3[/]")]
     public string? SourceInput { get; init; }
 
     public FileOrPackage? Source { get; private set; }
 
-    [CommandOption("-o|--output <OUTPUT>")]
-    [Description("The path to the dependency graph output file. If not specified, the dependency graph URL is written on the standard output and an online service is opened in the default browser.")]
-    public FileInfo? OutputFile { get; init; }
-
     [CommandOption("-f|--framework <FRAMEWORK>")]
-    [Description("The target framework to consider when building the dependency graph.")]
+    [Description("The target framework to consider when building the dependency graph")]
     [TypeConverter(typeof(NuGetFrameworkConverter))]
     public NuGetFramework? Framework { get; init; }
 
     [CommandOption("-r|--runtime <RUNTIME_IDENTIFIER>")]
-    [Description("The target runtime to consider when building the dependency graph.")]
+    [Description("The target runtime to consider when building the dependency graph")]
     public string? RuntimeIdentifier { get; init; }
 
+    [CommandOption("-o|--output <OUTPUT>")]
+    [Description("The path to the dependency graph output file\n" +
+                 "If not specified, the default web browser is used to render the dependency graph using an online service\n" +
+                 "See also the [b]--format[/] and [b]--url[/] options")]
+    public FileInfo? OutputFile { get; init; }
+
     [CommandOption("-m|--format <FORMAT>")]
-    [Description($"The format to use when the [b]--output[/] option is not specified.\n" +
+    [Description($"The format to use when the [b]--output[/] option is not specified\n" +
                  $"Use [b]mmd[/] or [b]mermaid[/] for Mermaid Live Editor https://mermaid.live\n" +
                  $"Use [b]dot[/], [b]gv[/] or [b]graphviz[/] for Edotor https://edotor.net\n" +
-                 "See https://github.com/0xced/nugraph/#output for even more supported formats.")]
+                 "See https://github.com/0xced/nugraph/#output for even more supported formats")]
     [DefaultValue("mermaid")]
     public string Format { get; init; } = "";
 
     public OnlineService Service { get; private set; }
 
+    [CommandOption("-u|--url")]
+    [Description("Defines what to do when the [b]--output[/] option is not specified\n" +
+                 "Use [b]open[/] for rendering the dependency graph using an online service or [b]print[/] for printing the graph URL on the standard output without opening the browser\n" +
+                 "Both options can be combined with a coma ([b]open,print[/]) to both open the URL and print it")]
+    [DefaultValue(UrlAction.open)]
+    public UrlAction UrlAction { get; init; }
+
     [CommandOption("-d|--direction <GRAPH_DIRECTION>")]
     [Description($"The direction of the dependency graph. Possible values are [b]{nameof(GraphDirection.LeftToRight)}[/] and [b]{nameof(GraphDirection.TopToBottom)}[/]")]
     [DefaultValue(GraphDirection.LeftToRight)]
     public GraphDirection GraphDirection { get; init; }
 
     [CommandOption("-t|--title <GRAPH_TITLE>")]
-    [Description("The title of the dependency graph.")]
+    [Description("The title of the dependency graph")]
     [DefaultValue(DefaultTitle)]
     public string Title { get; set; } = "";
 
@@ -66,19 +84,14 @@ internal sealed class GraphCommandSettings : CommandSettings
     public bool GraphIncludeVersions { get; init; }
 
     [CommandOption("-i|--ignore <PACKAGE>")]
-    [Description("Packages to ignore in the dependency graph. Supports * wildcards. May be used multiple times.")]
+    [Description("Packages to ignore in the dependency graph. Supports * wildcards. May be used multiple times")]
     public string[] GraphIgnore { get; init; } = [];
 
     [CommandOption("--no-links")]
-    [Description("Remove clickable links from the the dependency graph. Can be useful to reduce the size of the graph if you get \"Maximum text size in diagram exceeded\" in Mermaid Live Editor.")]
+    [Description("Remove clickable links from the the dependency graph. Can be useful to reduce the size of the graph if you get \"Maximum text size in diagram exceeded\" in Mermaid Live Editor")]
     [DefaultValue(false)]
     public bool NoLinks { get; set; }
 
-    [CommandOption("--no-browser")]
-    [Description("Do not open the default browser, only print the graph URL on the console when the [b]--output[/] option is not specified.")]
-    [DefaultValue(false)]
-    public bool NoBrowser { get; set; }
-
     [CommandOption("-l|--log <LEVEL>")]
     [Description($"The NuGet operations log level. Possible values are [b]{nameof(LogLevel.Debug)}[/], [b]{nameof(LogLevel.Verbose)}[/], [b]{nameof(LogLevel.Information)}[/], [b]{nameof(LogLevel.Minimal)}[/], [b]{nameof(LogLevel.Warning)}[/] and [b]{nameof(LogLevel.Error)}[/]")]
 #if DEBUG
@@ -89,20 +102,20 @@ internal sealed class GraphCommandSettings : CommandSettings
     public LogLevel LogLevel { get; init; }
 
     [CommandOption("--nuget-root <PATH>", IsHidden = true)]
-    [Description("The NuGet root directory. Can be used to completely isolate nugraph from default NuGet operations.")]
+    [Description("The NuGet root directory, can be used to completely isolate nugraph from default NuGet operations")]
     public string? NuGetRoot { get; init; }
 
     [CommandOption("--sdk <PATH>", IsHidden = true)]
     [Description("Path to the .NET SDK directory. E.g. [b]/usr/local/share/dotnet/sdk/8.0.410[/]")]
     public DirectoryInfo? Sdk { get; init; }
 
     [CommandOption("--include-ignored-packages", IsHidden = true)]
-    [Description("Include ignored packages in the dependency graph. Used for debugging.")]
+    [Description("Include ignored packages in the dependency graph, used for debugging")]
     [DefaultValue(false)]
     public bool GraphWriteIgnoredPackages { get; init; }
 
     [CommandOption("--diagnose", IsHidden = true)]
-    [Description("Prints diagnostics information.")]
+    [Description("Prints diagnostics information")]
     [DefaultValue(false)]
     public bool Diagnose { get; init; }