From 6653339da760d5e6181026299fe44fe0664f0628 Mon Sep 17 00:00:00 2001 From: George Kaklamanos Date: Tue, 23 May 2023 19:27:20 +0300 Subject: [PATCH] Move argument parsing in separate module --- src/cli.rs | 17 +++++++++++++++++ src/main.rs | 17 ++--------------- 2 files changed, 19 insertions(+), 15 deletions(-) create mode 100644 src/cli.rs diff --git a/src/cli.rs b/src/cli.rs new file mode 100644 index 0000000..e725a14 --- /dev/null +++ b/src/cli.rs @@ -0,0 +1,17 @@ +use clap::Parser; + +#[derive(Parser)] +#[command(version, about)] +pub struct Cli { + /// SpaceAPI endpoint + #[arg(short, long)] + pub url: String, + + /// Period of querying, in seconds + #[arg(short, long, default_value_t = 300)] + pub delay: u64, +} + +pub fn parse() -> Cli { + Cli::parse() +} diff --git a/src/main.rs b/src/main.rs index 96827d0..ff8e9aa 100644 --- a/src/main.rs +++ b/src/main.rs @@ -1,18 +1,5 @@ -use clap::Parser; - mod client; - -#[derive(Parser)] -#[command(version, about)] -struct Cli { - /// SpaceAPI endpoint - #[arg(short, long)] - url: String, - - /// Period of querying, in seconds - #[arg(short, long, default_value_t = 300)] - delay: u64, -} +mod cli; use std::sync::{Arc, Mutex}; type Body = Arc>; @@ -21,7 +8,7 @@ use rocket::{get, launch, routes, State}; #[launch] fn rocket() -> _ { - let cli = Cli::parse(); + let cli = cli::parse(); let body: Body = Arc::new(Mutex::new(String::new())); let body_state = body.clone();