MirrorHub/construct
0
0
Fork 0
mirror of https://github.com/matrix-construct/construct synced 2024-11-25 16:22:35 +01:00
Code Issues Releases Wiki Activity

modules/console: Show help rather than bad command if possible.

Browse source
This commit is contained in:
Jason Volk 2019-08-20 20:37:07 -07:00
parent a5e422cc03
commit 224c67032a
2 changed files with 17 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
construct/console.cc
View file

@ -336,7 +336,7 @@ construct::console::handle_line_bymodule()
// we use this code to translate it.
case -2: throw bad_command
{
"%s", out.str()
out.str()
};
// Command isn't handled by the module; continue handling here

19
modules/console.cc
View file

@ -198,6 +198,10 @@ _console_command(opt &out,
#pragma GCC visibility push(default)
bool
console_cmd__help(opt &,
const string_view &line);
/// This function may be linked and called by those wishing to execute a
/// command. Output from the command will be appended to the provided ostream.
/// The input to the command is passed in `line`. Since `struct opt` is not
@ -215,7 +219,16 @@ try
has(opts, "html")
};
return _console_command(opt, line);
int ret
{
_console_command(opt, line)
};
if(ret <= 0)
if(console_cmd__help(opt, line))
return -2;
return ret;
}
catch(const params::error &e)
{
@ -273,7 +286,7 @@ console_command_derived(opt &out, const string_view &line)
}
default:
break;
return -2;
}
return -1;
@ -352,7 +365,7 @@ console_cmd__help(opt &out, const string_view &line)
//TODO: help string symbol map
}
out << "Commands available: \n"
out << "\nSubcommands available:\n"
<< std::endl;
const size_t elems