tk/spectre.console
1
0
Fork 0
mirror of https://github.com/nsnail/spectre.console.git synced 2025-04-16 17:02:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix async race condition

Browse Source
This commit is contained in:
Sean Fausett 2021-04-30 15:40:17 +12:00 committed by Patrik Svensson
parent 2ba06577ef
commit 1dfc6bdadc
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -16,7 +16,7 @@ namespace Spectre.Console.Cli
_registrar.Register(typeof(DefaultPairDeconstructor), typeof(DefaultPairDeconstructor)); _registrar.Register(typeof(DefaultPairDeconstructor), typeof(DefaultPairDeconstructor));
} }
public Task<int> Execute(IConfiguration configuration, IEnumerable<string> args) public async Task<int> Execute(IConfiguration configuration, IEnumerable<string> args)
{ {
if (configuration == null) if (configuration == null)
{ {
@ -45,7 +45,7 @@ namespace Spectre.Console.Cli
{ {
var console = configuration.Settings.Console.GetConsole(); var console = configuration.Settings.Console.GetConsole();
console.WriteLine(ResolveApplicationVersion(configuration)); console.WriteLine(ResolveApplicationVersion(configuration));
return Task.FromResult(0); return 0;
} }
} }
} }
@ -60,7 +60,7 @@ namespace Spectre.Console.Cli
{ {
// Display help. // Display help.
configuration.Settings.Console.SafeRender(HelpWriter.Write(model)); configuration.Settings.Console.SafeRender(HelpWriter.Write(model));
return Task.FromResult(0); return 0;
} }
// Get the command to execute. // Get the command to execute.
@ -69,18 +69,20 @@ namespace Spectre.Console.Cli
{ {
// Branches can't be executed. Show help. // Branches can't be executed. Show help.
configuration.Settings.Console.SafeRender(HelpWriter.WriteCommand(model, leaf.Command)); configuration.Settings.Console.SafeRender(HelpWriter.WriteCommand(model, leaf.Command));
return Task.FromResult(leaf.ShowHelp ? 0 : 1); return leaf.ShowHelp ? 0 : 1;
} }
// Register the arguments with the container. // Register the arguments with the container.
_registrar.RegisterInstance(typeof(IRemainingArguments), parsedResult.Remaining); _registrar.RegisterInstance(typeof(IRemainingArguments), parsedResult.Remaining);
// Create the resolver and the context. // Create the resolver and the context.
using var resolver = new TypeResolverAdapter(_registrar.Build()); using (var resolver = new TypeResolverAdapter(_registrar.Build()))
{
var context = new CommandContext(parsedResult.Remaining, leaf.Command.Name, leaf.Command.Data); var context = new CommandContext(parsedResult.Remaining, leaf.Command.Name, leaf.Command.Data);
// Execute the command tree. // Execute the command tree.
return Execute(leaf, parsedResult.Tree, context, resolver, configuration); return await Execute(leaf, parsedResult.Tree, context, resolver, configuration);
}
} }
private static string ResolveApplicationVersion(IConfiguration configuration) private static string ResolveApplicationVersion(IConfiguration configuration)