From 0f2ecf239760322ce292cff644a31e5aab07226f Mon Sep 17 00:00:00 2001 From: Vomitblood Date: Mon, 28 Oct 2024 02:15:59 +0800 Subject: [PATCH] moved argument parser to separate file --- src/args.rs | 150 +++++++++++++++++++++++++++++++++++++++++++++++++++ src/lib.rs | 1 + src/main.rs | 153 +--------------------------------------------------- 3 files changed, 152 insertions(+), 152 deletions(-) create mode 100644 src/args.rs diff --git a/src/args.rs b/src/args.rs new file mode 100644 index 0000000..f936fc4 --- /dev/null +++ b/src/args.rs @@ -0,0 +1,150 @@ +pub fn argument_parser() -> clap::ArgMatches { + return clap::command!() + // info + .about("Pokemon Colorscripts written in Rust") + .author("Vomitblood") + // fetch subcommand + .subcommand( + clap::Command::new("fetch") + .about("Fetch the latest colorscripts from the repository") + // fetch/extract_destination + .arg( + clap::Arg::new("extract_destination") + .help("eXtract the colorscripts archive to a custom location") + .short('x') + .long("extract-destination") + .default_value(crate::constants::DATA_DIRECTORY.to_str().unwrap()), + ) + // fetch/verbose + .arg( + clap::Arg::new("verbose") + .help("Print colorscripts when generating") + .short('v') + .long("verbose") + .action(clap::ArgAction::SetTrue), + ), + ) + // list subcommand + .subcommand( + clap::Command::new("list") + .about("Print a list of Pokemon names and Pokedex number") + // list/forms + .arg( + clap::Arg::new("forms") + .help("Print a list of forms of the specified Pokemon") + .short('f') + .long("forms") + .default_value("") + .hide_default_value(true), + ) + .after_help( + "Tip: Use `grep` to search for a specific Pokemon form! +Example: `rustmon list | grep 'pikachu'` +For more advanced usage, use `less` or `more` to scroll through the list!", + ), + ) + // print subcommand + .subcommand( + clap::Command::new("print") + .about("Print a Pokemon colorscript") + .arg_required_else_help(true) + // print/big + .arg( + clap::Arg::new("big") + .help("Print a bigger version of the colorscript") + .short('b') + .long("big") + .action(clap::ArgAction::SetTrue), + ) + // print/form + .arg( + clap::Arg::new("form") + .help("Print Pokemon by list of space-separated forms. Follows the order of the names/Pokedex number specified. If not specified, it will print the regular form. Has no effect on random Pokemon.") + .short('f') + .long("form") + .default_value("regular") + .value_delimiter(' ') + .requires("name_or_pokedex"), + ) + // print/hide-name + .arg( + clap::Arg::new("hide-name") + .help("Do not print Pokemon name") + .long("hide-name") + .action(clap::ArgAction::SetTrue), + ) + // print/name + .arg( + clap::Arg::new("name") + .help("Print Pokemon by list of space-separated names. Use `random` to print a random Pokemon.") + .short('n') + .long("name") + .default_value("") + .hide_default_value(true) + .value_delimiter(' ') + .conflicts_with("pokedex") + ) + // print/pokedex + .arg( + clap::Arg::new("pokedex") + .help("Print Pokemon by list of space-separated Pokedex numbers. Use `0` to print a random Pokemon.") + .short('p') + .long("pokedex") + // TODO: use a dynamic range instead of 0..906 + // try not to hardcode? + .value_parser(clap::value_parser!(u16).range(0..906)) + .default_value("0") + .hide_default_value(true) + .value_delimiter(' ') + .conflicts_with("name") + ) + // print/shiny + .arg( + clap::Arg::new("shiny") + .help( + "Rate of printing the shiny version of the colorscript (e.g. 0.10 for 10% chance)", + ) + .short('s') + .long("shiny") + .value_parser(clap::value_parser!(f32)) + .default_value("0.00"), + ) + // print/spacing + .arg( + clap::Arg::new("spacing") + .help( + "Number of spaces between colorscripts", + ) + .long("spacing") + .value_parser(clap::value_parser!(u8).range(0..21)) + .default_value("4"), + ) + .group( + clap::ArgGroup::new("name_or_pokedex") + .args(["name", "pokedex"]) + .required(false), + ) + ) + // say subcommand + .subcommand( + clap::Command::new("say") + .about("Print a speaking Pokemon") + .after_help( + "Tip: Pipe the output to `rustmon say` to see the Pokemon speak! +Example: `echo \"Never gonna give you up\" | rustmon say`" + ) + // say/text + .arg( + clap::Arg::new("text") + .help("Input text for Pokemon to say") + .short('t') + .long("text") + .default_value("") + .hide_default_value(true) + .required(false) + ) + ) + .subcommand_required(true) + // finalize + .get_matches(); +} diff --git a/src/lib.rs b/src/lib.rs index 68f03e1..6e74887 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -1,3 +1,4 @@ +pub mod args; pub mod constants; pub mod fetch; pub mod list; diff --git a/src/main.rs b/src/main.rs index cd2b94e..059b8fe 100644 --- a/src/main.rs +++ b/src/main.rs @@ -22,7 +22,7 @@ /// Pokemon Colorscripts written in Rust fn main() { - let args = argument_parser(); + let args = rustmon::args::argument_parser(); if let Some(fetch_args) = args.subcommand_matches("fetch") { // fetch @@ -91,154 +91,3 @@ fn main() { rustmon::say::say(text); } } - -fn argument_parser() -> clap::ArgMatches { - return clap::command!() - // info - .about("Pokemon Colorscripts written in Rust") - .author("Vomitblood") - // fetch subcommand - .subcommand( - clap::Command::new("fetch") - .about("Fetch the latest colorscripts from the repository") - // fetch/extract_destination - .arg( - clap::Arg::new("extract_destination") - .help("eXtract the colorscripts archive to a custom location") - .short('x') - .long("extract-destination") - .default_value(rustmon::constants::DATA_DIRECTORY.to_str().unwrap()), - ) - // fetch/verbose - .arg( - clap::Arg::new("verbose") - .help("Print colorscripts when generating") - .short('v') - .long("verbose") - .action(clap::ArgAction::SetTrue), - ), - ) - // list subcommand - .subcommand( - clap::Command::new("list") - .about("Print a list of Pokemon names and Pokedex number") - // list/forms - .arg( - clap::Arg::new("forms") - .help("Print a list of forms of the specified Pokemon") - .short('f') - .long("forms") - .default_value("") - .hide_default_value(true), - ) - .after_help( - "Tip: Use `grep` to search for a specific Pokemon form! -Example: `rustmon list | grep 'pikachu'` -For more advanced usage, use `less` or `more` to scroll through the list!", - ), - ) - // print subcommand - .subcommand( - clap::Command::new("print") - .about("Print a Pokemon colorscript") - .arg_required_else_help(true) - // print/big - .arg( - clap::Arg::new("big") - .help("Print a bigger version of the colorscript") - .short('b') - .long("big") - .action(clap::ArgAction::SetTrue), - ) - // print/form - .arg( - clap::Arg::new("form") - .help("Print Pokemon by list of space-separated forms. Follows the order of the names/Pokedex number specified. If not specified, it will print the regular form. Has no effect on random Pokemon.") - .short('f') - .long("form") - .default_value("regular") - .value_delimiter(' ') - .requires("name_or_pokedex"), - ) - // print/hide-name - .arg( - clap::Arg::new("hide-name") - .help("Do not print Pokemon name") - .long("hide-name") - .action(clap::ArgAction::SetTrue), - ) - // print/name - .arg( - clap::Arg::new("name") - .help("Print Pokemon by list of space-separated names. Use `random` to print a random Pokemon.") - .short('n') - .long("name") - .default_value("") - .hide_default_value(true) - .value_delimiter(' ') - .conflicts_with("pokedex") - ) - // print/pokedex - .arg( - clap::Arg::new("pokedex") - .help("Print Pokemon by list of space-separated Pokedex numbers. Use `0` to print a random Pokemon.") - .short('p') - .long("pokedex") - // TODO: use a dynamic range instead of 0..906 - // try not to hardcode? - .value_parser(clap::value_parser!(u16).range(0..906)) - .default_value("0") - .hide_default_value(true) - .value_delimiter(' ') - .conflicts_with("name") - ) - // print/shiny - .arg( - clap::Arg::new("shiny") - .help( - "Rate of printing the shiny version of the colorscript (e.g. 0.10 for 10% chance)", - ) - .short('s') - .long("shiny") - .value_parser(clap::value_parser!(f32)) - .default_value("0.00"), - ) - // print/spacing - .arg( - clap::Arg::new("spacing") - .help( - "Number of spaces between colorscripts", - ) - .long("spacing") - .value_parser(clap::value_parser!(u8).range(0..21)) - .default_value("4"), - ) - .group( - clap::ArgGroup::new("name_or_pokedex") - .args(["name", "pokedex"]) - .required(false), - ) - ) - // say subcommand - .subcommand( - clap::Command::new("say") - .about("Print a speaking Pokemon") - .after_help( - "Tip: Pipe the output to `rustmon say` to see the Pokemon speak! -Example: `echo \"Never gonna give you up\" | rustmon say`" - ) - // say/text - .arg( - clap::Arg::new("text") - .help("Input text for Pokemon to say") - .short('t') - .long("text") - .default_value("") - .hide_default_value(true) - .required(false) - ) - ) - .subcommand_required(true) - // finalize - .get_matches(); -}