tk/spectre.console
1
0
Fork 0
mirror of https://github.com/nsnail/spectre.console.git synced 2025-06-16 12:13:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

Check if the command has a version option on its setting class

Browse Source
This commit is contained in:
Frank Ray 2024-10-11 17:10:53 +01:00 committed by Patrik Svensson
parent cefb51df7b
commit e9f9f56189
1 changed files with 29 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/Spectre.Console.Cli/Internal/CommandExecutor.cs
View File

@ -14,6 +14,8 @@ internal sealed class CommandExecutor
public async Task<int> Execute(IConfiguration configuration, IEnumerable<string> args) public async Task<int> Execute(IConfiguration configuration, IEnumerable<string> args)
{ {
CommandTreeParserResult parsedResult;
if (configuration == null) if (configuration == null)
{ {
throw new ArgumentNullException(nameof(configuration)); throw new ArgumentNullException(nameof(configuration));
@ -33,22 +35,43 @@ internal sealed class CommandExecutor
var firstArgument = arguments.FirstOrDefault(); var firstArgument = arguments.FirstOrDefault();
if (firstArgument != null) if (firstArgument != null)
{ {
// Asking for version? Kind of a hack, but it's alright. // Asking for version?
// We should probably make this a bit better in the future.
if (firstArgument.Equals("--version", StringComparison.OrdinalIgnoreCase) || if (firstArgument.Equals("--version", StringComparison.OrdinalIgnoreCase) ||
firstArgument.Equals("-v", StringComparison.OrdinalIgnoreCase)) firstArgument.Equals("-v", StringComparison.OrdinalIgnoreCase))
{ {
if (configuration.Settings.ApplicationVersion != null) if (configuration.Settings.ApplicationVersion != null)
{ {
var console = configuration.Settings.Console.GetConsole(); // We need to check if the command has a version option on its setting class.
console.MarkupLine(configuration.Settings.ApplicationVersion); // Do this by first parsing the command line args and checking the remaining args.
return 0; try
{
// Parse and map the model against the arguments.
parsedResult = ParseCommandLineArguments(model, configuration.Settings, arguments);
}
catch (Exception)
{
// Something went wrong with parsing the command line arguments,
// however we know the first argument is a version option.
var console = configuration.Settings.Console.GetConsole();
console.MarkupLine(configuration.Settings.ApplicationVersion);
return 0;
}
// Check the parsed remaining args for the version options.
if ((firstArgument.Equals("-v", StringComparison.OrdinalIgnoreCase) && parsedResult.Remaining.Parsed.Contains("-v")) ||
(firstArgument.Equals("--version", StringComparison.OrdinalIgnoreCase) && parsedResult.Remaining.Parsed.Contains("--version")))
{
// The version option is not a member of the command settings.
var console = configuration.Settings.Console.GetConsole();
console.MarkupLine(configuration.Settings.ApplicationVersion);
return 0;
}
} }
} }
} }
// Parse and map the model against the arguments. // Parse and map the model against the arguments.
var parsedResult = ParseCommandLineArguments(model, configuration.Settings, arguments); parsedResult = ParseCommandLineArguments(model, configuration.Settings, arguments);
// Register the arguments with the container. // Register the arguments with the container.
_registrar.RegisterInstance(typeof(CommandTreeParserResult), parsedResult); _registrar.RegisterInstance(typeof(CommandTreeParserResult), parsedResult);