mirrors/CLI11
1
0
Fork 0
mirror of https://github.com/CLIUtils/CLI11.git synced 2025-05-01 05:03:52 +00:00
Code Issues Releases Wiki Activity

Added subcommand callback

Browse Source
This commit is contained in:
Henry Fredrick Schreiner 2017-02-03 17:50:59 -05:00
parent 200072dc38
commit 9c55fa2872
2 changed files with 45 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
include/CLI.hpp
View File

@ -34,11 +34,16 @@ namespace CLI {
struct Error : public std::runtime_error { struct Error : public std::runtime_error {
int exit_code; int exit_code;
Error(std::string parent, std::string name, int exit_code=255) : runtime_error(parent + ": " + name), exit_code(exit_code) {} bool print_help;
Error(std::string parent, std::string name, int exit_code=255, bool print_help=true) : runtime_error(parent + ": " + name), exit_code(exit_code), print_help(print_help) {}
};
struct Success : public Error {
Success() : Error("Success", "Successfully completed, should be caught and quit", 0, false) {}
}; };
struct CallForHelp : public Error { struct CallForHelp : public Error {
CallForHelp() : Error("CallForHelp","This should be caught in your main function, see examples", 0) {} CallForHelp() : Error("CallForHelp", "This should be caught in your main function, see examples", 0) {}
}; };
struct BadNameString : public Error { struct BadNameString : public Error {
@ -588,8 +593,18 @@ protected:
bool parsed{false}; bool parsed{false};
App* subcommand = nullptr; App* subcommand = nullptr;
std::function<void(App*)> app_callback;
public: public:
void set_callback(std::function<void(App*)> callback) {
app_callback = callback;
}
void run_callback() {
if(app_callback)
app_callback(this);
}
/// Reset the parsed data /// Reset the parsed data
void reset() { void reset() {
@ -978,6 +993,7 @@ public:
} }
for(Option& opt : options) { for(Option& opt : options) {
while (opt.positional() && opt.count() < opt.expected() && positionals.size() > 0) { while (opt.positional() && opt.count() < opt.expected() && positionals.size() > 0) {
opt.get_new(); opt.get_new();
@ -994,6 +1010,8 @@ public:
} }
if(positionals.size()>0) if(positionals.size()>0)
throw PositionalError("[" + detail::join(positionals) + "]"); throw PositionalError("[" + detail::join(positionals) + "]");
run_callback();
} }
void _parse_subcommand(std::vector<std::string> &args) { void _parse_subcommand(std::vector<std::string> &args) {
@ -1124,9 +1142,11 @@ public:
if(e.exit_code != 0) { if(e.exit_code != 0) {
std::cerr << "ERROR: "; std::cerr << "ERROR: ";
std::cerr << e.what() << std::endl; std::cerr << e.what() << std::endl;
std::cerr << help() << std::endl; if(e.print_help)
std::cerr << help() << std::endl;
} else { } else {
std::cout << help() << std::endl; if(e.print_help)
std::cout << help() << std::endl;
} }
return e.exit_code; return e.exit_code;
} }

21
tests/CLITest.cpp
View File

@ -330,6 +330,27 @@ TEST_F(TApp, BasicSubcommands) {
EXPECT_EQ(sub2, app.get_subcommand()); EXPECT_EQ(sub2, app.get_subcommand());
} }
TEST_F(TApp, Callbacks) {
auto sub1 = app.add_subcommand("sub1");
sub1->set_callback([](CLI::App*){
throw CLI::Success();
});
auto sub2 = app.add_subcommand("sub2");
bool val = false;
sub2->set_callback([&val](CLI::App*){
val = true;
});
app.reset();
args = {"sub2"};
EXPECT_FALSE(val);
EXPECT_NO_THROW(run());
EXPECT_TRUE(val);
}
// TODO: Add directory test // TODO: Add directory test