matthiasbeyer/imag
1
0
Fork 0
Code Releases Activity

Change build_ui to use subcommands()

Browse source
This commit is contained in:
Mario Krehl 2016-09-02 16:43:31 +02:00 committed by Matthias Beyer
parent 352d7e9083
commit a740dcd7ba
1 changed files with 15 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
bin/src/main.rs
View file

@ -104,9 +104,8 @@ fn get_commands() -> Vec<String> {
} }
pub fn build_ui<'a>(app: App<'a, 'a>) -> App<'a, 'a> { pub fn build_ui<'a>(app: App<'a, 'a>) -> App<'a, 'a> {
get_commands() app
.iter() .settings(&[AppSettings::AllowExternalSubcommands])
.fold(app, |app, cmd| app.subcommand(SubCommand::with_name(cmd)))
.arg(Arg::with_name("version") .arg(Arg::with_name("version")
.long("version") .long("version")
.takes_value(false) .takes_value(false)
@ -127,7 +126,10 @@ pub fn build_ui<'a>(app: App<'a, 'a>) -> App<'a, 'a> {
.multiple(false) .multiple(false)
.help("Show help")) .help("Show help"))
.subcommand(SubCommand::with_name("help").help("Show help")) .subcommand(SubCommand::with_name("help").help("Show help"))
.settings(&[AppSettings::AllowExternalSubcommands]) .subcommands(get_commands()
.iter()
.map(|cmd| SubCommand::with_name(cmd))
)
} }
fn main() { fn main() {
@ -173,19 +175,9 @@ fn main() {
} }
} }
matches.subcommand_name() match matches.subcommand() {
.map(|subcommand| { (subcommand, Some(scmd)) => {
let subcommand_args : Vec<&str> = scmd.values_of(subcommand).unwrap().collect();
let mut subcommand_args = vec![];
for arg in Runtime::arg_names() {
matches.value_of(arg)
.map(|value| {
subcommand_args.push(arg);
subcommand_args.push(value);
});
}
debug!("Calling 'imag-{}' with args: {:?}", subcommand, subcommand_args); debug!("Calling 'imag-{}' with args: {:?}", subcommand, subcommand_args);
match Command::new(format!("imag-{}", subcommand)) match Command::new(format!("imag-{}", subcommand))
@ -223,5 +215,10 @@ fn main() {
} }
} }
} }
}); },
// clap ensures we have valid input by exiting if not.
// The above case is a catch-all for subcommands,
// so nothing else needs to be expexted.
_ => unreachable!(),
}
} }