merge pull request #3 from snakehand/master

Improve handling of cli commands
devmatteini · Feb 6, 2021 · f45cd18 · f45cd18
2 parents 18fa2ca + 3f7bf32
commit f45cd18
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 42 deletions.
diff --git a/src/main.rs b/src/main.rs
@@ -3,6 +3,7 @@ use structopt::StructOpt;
 use pihole_switch::pihole;
 use pihole_switch::pihole::config::{PiHoleConfig, PIHOLE_DEFAULT_HOST};
 use pihole_switch::pihole::disable_time::PiHoleDisableTime;
+use pihole_switch::pihole::PiholeResult;
 use pihole_switch::resolve_api_token::resolve_api_token;
 
 use crate::cli::io::{print_error, print_pihole_error, print_success};
@@ -21,67 +22,55 @@ fn main() {
     let host = args.host;
 
     let exit_code = match args.cmd {
-        Command::Enable { token } => handle_enable(token, host),
-        Command::Disable { token, time } => handle_disable(token, host, time),
+        Command::Enable { token } => handle_command(
+            token,
+            host,
+            &|conf: &PiHoleConfig| pihole::enable(conf),
+            &"enable",
+        ),
+        Command::Disable { token, time } => handle_command(
+            token,
+            host,
+            &|conf: &PiHoleConfig| {
+                let disable_time = PiHoleDisableTime::from_secs(time);
+                pihole::disable(conf, disable_time)
+            },
+            &"disable",
+        ),
     };
 
     std::process::exit(exit_code as i32);
 }
 
-fn handle_enable(token: Option<String>, host: Option<String>) -> ExitCode {
+fn handle_command(
+    token: Option<String>,
+    host: Option<String>,
+    cmd_func: &dyn Fn(&PiHoleConfig) -> PiholeResult,
+    cmd_name: &str,
+) -> ExitCode {
     match resolve_api_token(token) {
         Ok(token) => {
             let config = build_pihole_config(token, host);
-
-            let res = pihole::enable(&config);
-
-            match res {
-                Ok(_) => print_success("PiHole enabled successfully!"),
-                Err(err) => {
-                    print_pihole_error(err);
-                    return ExitCode::Error;
+            match cmd_func(&config) {
+                Ok(_) => {
+                    print_success(&format!("PiHole {}d successfully!", cmd_name));
+                    ExitCode::Ok
                 }
-            }
-        }
-        Err(err) => {
-            print_error(&format!(
-                "{}\nUse `phs enable [token]` or set PIHOLE_TOKEN environment variable",
-                err
-            ));
-
-            return ExitCode::Error;
-        }
-    }
-
-    ExitCode::Ok
-}
-
-fn handle_disable(token: Option<String>, host: Option<String>, time: Option<u64>) -> ExitCode {
-    match resolve_api_token(token) {
-        Ok(token) => {
-            let config = build_pihole_config(token, host);
-            let disable_time = PiHoleDisableTime::from_secs(time);
-            let res = pihole::disable(&config, disable_time);
-
-            match res {
-                Ok(_) => print_success("PiHole disabled successfully!"),
                 Err(err) => {
                     print_pihole_error(err);
-                    return ExitCode::Error;
+                    ExitCode::Error
                 }
             }
         }
         Err(err) => {
             print_error(&format!(
-                "{}\nUse `phs disable [token]` or set PIHOLE_TOKEN environment variable",
-                err
+                "{}\nUse `phs {} [token]` or set PIHOLE_TOKEN environment variable",
+                err, cmd_name
             ));
 
-            return ExitCode::Error;
+            ExitCode::Error
         }
     }
-
-    ExitCode::Ok
 }
 
 fn build_pihole_config(token: String, host: Option<String>) -> PiHoleConfig {

diff --git a/src/pihole/mod.rs b/src/pihole/mod.rs
@@ -23,7 +23,7 @@ impl ExpectedStatus {
     }
 }
 
-type PiholeResult = Result<(), PiHoleError>;
+pub type PiholeResult = Result<(), PiHoleError>;
 
 pub fn enable(config: &PiHoleConfig) -> PiholeResult {
     let url = format!("{}?enable&auth={}", &config.api_url, &config.api_token);