teascade/yepzon-locationer
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Make subcommand optional

Browse Source
This commit is contained in:
Sofia 2020-08-29 02:58:17 +03:00
parent 64742a0e21
commit bb87581ea5
3 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/args.rs
View File

@ -12,7 +12,7 @@ pub struct EnvOpt {
)] )]
pub config: PathBuf, pub config: PathBuf,
#[argh(subcommand)] #[argh(subcommand)]
pub subcommand: Subcommand, pub subcommand: Option<Subcommand>,
} }
#[derive(FromArgs)] #[derive(FromArgs)]

2
src/cmd.rs
View File

@ -6,7 +6,7 @@ use thingy_lib::chrono::NaiveDateTime;
use thingy_lib::{try_get_datetime, Config, MessagedError}; use thingy_lib::{try_get_datetime, Config, MessagedError};
pub fn from_env(env: EnvOpt) -> Result<(), GenericError> { pub fn from_env(env: EnvOpt) -> Result<(), GenericError> {
match env.subcommand { match env.subcommand.unwrap() {
Subcommand::Between(opt) => { Subcommand::Between(opt) => {
let config = Config::from_path(&env.config)?; let config = Config::from_path(&env.config)?;
let mut api = API::new(config.clone()); let mut api = API::new(config.clone());

10
src/main.rs
View File

@ -12,8 +12,12 @@ use thingy_lib::Config;
fn main() { fn main() {
let env: EnvOpt = argh::from_env(); let env: EnvOpt = argh::from_env();
if let Err(e) = cmd::from_env(env) { if env.subcommand.is_some() {
eprintln!("Critical Error: {}", e); if let Err(e) = cmd::from_env(env) {
std::process::exit(1); eprintln!("Critical Error: {}", e);
std::process::exit(1);
}
} else {
println!("Open nwg UI instead");
} }
} }