FEATURE: Default to printing out our help if no subcommand is used.

This commit is contained in:
Jeremy Wall 2018-08-26 15:46:52 -05:00
parent cbd767d81b
commit 0003e1b9c3

View File

@ -30,7 +30,7 @@ use ucglib::convert::traits;
use ucglib::convert::ConverterRegistry; use ucglib::convert::ConverterRegistry;
// TODO(jwall): List the target output types automatically. // TODO(jwall): List the target output types automatically.
fn do_flags<'a>() -> clap::ArgMatches<'a> { fn do_flags<'a, 'b>() -> clap::App<'a, 'b> {
clap_app!( clap_app!(
ucg => ucg =>
(version: crate_version!()) (version: crate_version!())
@ -55,7 +55,7 @@ fn do_flags<'a>() -> clap::ArgMatches<'a> {
(@subcommand converters => (@subcommand converters =>
(about: "list the available converters") (about: "list the available converters")
) )
).get_matches() )
} }
fn run_converter(c: &traits::Converter, v: Rc<Val>, f: Option<&str>) -> traits::Result { fn run_converter(c: &traits::Converter, v: Rc<Val>, f: Option<&str>) -> traits::Result {
@ -201,11 +201,11 @@ fn visit_ucg_files(
Ok(result) Ok(result)
} }
fn main() { fn inspect_command(
let app = do_flags(); matches: &clap::ArgMatches,
let cache: Rc<RefCell<Cache>> = Rc::new(RefCell::new(MemoryCache::new())); cache: Rc<RefCell<Cache>>,
let registry = ConverterRegistry::make_registry(); registry: &ConverterRegistry,
if let Some(matches) = app.subcommand_matches("inspect") { ) {
let file = matches.value_of("INPUT").unwrap(); let file = matches.value_of("INPUT").unwrap();
let sym = matches.value_of("sym"); let sym = matches.value_of("sym");
let target = matches.value_of("target").unwrap(); let target = matches.value_of("target").unwrap();
@ -241,7 +241,13 @@ fn main() {
process::exit(1); process::exit(1);
} }
} }
} else if let Some(matches) = app.subcommand_matches("build") { }
fn build_command(
matches: &clap::ArgMatches,
cache: Rc<RefCell<Cache>>,
registry: &ConverterRegistry,
) {
let files = matches.values_of("INPUT"); let files = matches.values_of("INPUT");
let recurse = matches.is_present("recurse"); let recurse = matches.is_present("recurse");
let mut ok = true; let mut ok = true;
@ -261,7 +267,13 @@ fn main() {
if !ok { if !ok {
process::exit(1) process::exit(1)
} }
} else if let Some(matches) = app.subcommand_matches("test") { }
fn test_command(
matches: &clap::ArgMatches,
cache: Rc<RefCell<Cache>>,
registry: &ConverterRegistry,
) {
let files = matches.values_of("INPUT"); let files = matches.values_of("INPUT");
let recurse = matches.is_present("recurse"); let recurse = matches.is_present("recurse");
if files.is_none() { if files.is_none() {
@ -286,7 +298,9 @@ fn main() {
} }
} }
process::exit(0); process::exit(0);
} else if let Some(_todo) = app.subcommand_matches("converters") { }
fn converters_command(registry: &ConverterRegistry) {
println!("Available converters:"); println!("Available converters:");
println!(""); println!("");
for (name, c) in registry.get_converter_list().iter() { for (name, c) in registry.get_converter_list().iter() {
@ -295,5 +309,23 @@ fn main() {
println!(" Output Extension: `.{}`", c.file_ext()); println!(" Output Extension: `.{}`", c.file_ext());
println!(""); println!("");
} }
}
fn main() {
let mut app = do_flags();
let app_matches = app.clone().get_matches();
let cache: Rc<RefCell<Cache>> = Rc::new(RefCell::new(MemoryCache::new()));
let registry = ConverterRegistry::make_registry();
if let Some(matches) = app_matches.subcommand_matches("inspect") {
inspect_command(matches, cache, &registry);
} else if let Some(matches) = app_matches.subcommand_matches("build") {
build_command(matches, cache, &registry);
} else if let Some(matches) = app_matches.subcommand_matches("test") {
test_command(matches, cache, &registry);
} else if let Some(_) = app_matches.subcommand_matches("converters") {
converters_command(&registry)
} else {
app.print_help().unwrap();
println!("");
} }
} }