1 files changed, 61 insertions, 50 deletions

diff --git a/src/main.rs b/src/main.rs
index afe6fac..5a0931d 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,21 +1,24 @@
 use std::{fmt::Display, time::Duration};
 
-use clap::{Parser, Command, CommandFactory, Subcommand};
-use clap_complete::{generate, Shell, Generator};
-use config::SETTINGS;
-use error::CliError;
-use indicatif::{ProgressBar, ProgressStyle, MultiProgress};
-use requests::{start::start, device};
-use reqwest::header::{HeaderMap, HeaderValue};
+use crate::config::Config;
+use clap::{Command, CommandFactory, Parser, Subcommand};
+use clap_complete::{generate, Generator, Shell};
+use error::Error;
+use indicatif::{MultiProgress, ProgressBar, ProgressStyle};
+use requests::{device, start::start};
+use reqwest::{
+    header::{HeaderMap, HeaderValue},
+    Response,
+};
 use serde::Deserialize;
 
 mod config;
 mod error;
 mod requests;
 
-static OVERVIEW_STYLE: &str = "{spinner:.green} ({elapsed}{wide_msg}";
-static OVERVIEW_ERROR: &str = "✗ ({elapsed}) {wide_msg}";
-static OVERVIEW_DONE: &str = "✓ ({elapsed}) {wide_msg}";
+static OVERVIEW_STYLE: &str = "{spinner:.green} ({elapsed_precise}{wide_msg}";
+static OVERVIEW_ERROR: &str = "✗ ({elapsed_precise}) {wide_msg}";
+static OVERVIEW_DONE: &str = "✓ ({elapsed_precise}) {wide_msg}";
 static DEFAULT_STYLE: &str = "  {spinner:.green} {wide_msg}";
 static DONE_STYLE: &str = "  ✓ {wide_msg}";
 static ERROR_STYLE: &str = "  ✗ {wide_msg}";
@@ -35,7 +38,7 @@ enum Commands {
         /// id of the device
         id: String,
         #[arg(short, long)]
-        ping: Option<bool>
+        ping: Option<bool>,
     },
     Device {
         #[command(subcommand)]
@@ -52,7 +55,7 @@ enum DeviceCmd {
         id: String,
         mac: String,
         broadcast_addr: String,
-        ip: String
+        ip: String,
     },
     Get {
         id: String,
@@ -61,35 +64,45 @@ enum DeviceCmd {
         id: String,
         mac: String,
         broadcast_addr: String,
-        ip: String
+        ip: String,
     },
 }
 
 #[tokio::main]
-async fn main() -> Result<(), CliError> {
+async fn main() -> Result<(), anyhow::Error> {
+    let config = Config::load()?;
+
     let cli = Args::parse();
 
     match cli.commands {
         Commands::Start { id, ping } => {
-            start(id, ping.unwrap_or(true)).await?;
-        },
-        Commands::Device { devicecmd } => {
-            match devicecmd {
-                DeviceCmd::Add { id, mac, broadcast_addr, ip } => {
-                    device::put(id, mac, broadcast_addr, ip).await?;
-                },
-                DeviceCmd::Get { id } => {
-                    device::get(id).await?;
-                },
-                DeviceCmd::Edit { id, mac, broadcast_addr, ip } => {
-                    device::post(id, mac, broadcast_addr, ip).await?;
-                },
+            start(&config, id, ping.unwrap_or(true)).await?;
+        }
+        Commands::Device { devicecmd } => match devicecmd {
+            DeviceCmd::Add {
+                id,
+                mac,
+                broadcast_addr,
+                ip,
+            } => {
+                device::put(&config, id, mac, broadcast_addr, ip).await?;
+            }
+            DeviceCmd::Get { id } => {
+                device::get(&config, id).await?;
+            }
+            DeviceCmd::Edit {
+                id,
+                mac,
+                broadcast_addr,
+                ip,
+            } => {
+                device::post(&config, id, mac, broadcast_addr, ip).await?;
             }
         },
         Commands::CliGen { id } => {
             eprintln!("Generating completion file for {id:?}...");
             let mut cmd = Args::command();
-            print_completions(id, &mut cmd)
+            print_completions(id, &mut cmd);
         }
     }
 
@@ -100,29 +113,28 @@ fn print_completions<G: Generator>(gen: G, cmd: &mut Command) {
     generate(gen, cmd, cmd.get_name().to_string(), &mut std::io::stdout());
 }
 
-fn default_headers() -> Result<HeaderMap, CliError> {
+fn default_headers(config: &Config) -> Result<HeaderMap, Error> {
     let mut map = HeaderMap::new();
-    map.append("Accept-Content", HeaderValue::from_str("application/json").unwrap());
-    map.append("Content-Type", HeaderValue::from_str("application/json").unwrap());
-    map.append(
-        "Authorization",
-        HeaderValue::from_str(
-            SETTINGS.get_string("key")
-            .map_err(CliError::Config)?
-            .as_str()
-        ).unwrap()
-    );
+    map.append("Accept-Content", HeaderValue::from_str("application/json")?);
+    map.append("Content-Type", HeaderValue::from_str("application/json")?);
+    map.append("Authorization", HeaderValue::from_str(&config.apikey)?);
 
     Ok(map)
 }
 
-fn format_url(path: &str, protocol: Protocols) -> Result<String, CliError> {
-    Ok(format!(
-        "{}://{}/{}",
-        protocol,
-        SETTINGS.get_string("server").map_err(CliError::Config)?,
-        path
-    ))
+fn format_url(config: &Config, path: &str, protocol: &Protocols) -> String {
+    format!("{}://{}/{}", protocol, config.server, path)
+}
+
+async fn check_success(res: Response) -> Result<String, Error> {
+    let status = res.status();
+    if status.is_success() {
+        Ok(res.text().await?)
+    } else if status.as_u16() == 401 {
+        Err(Error::Authorization)
+    } else {
+        Err(Error::HttpStatus(status.as_u16()))
+    }
 }
 
 fn add_pb(mp: &MultiProgress, template: &str, message: String) -> ProgressBar {
@@ -134,10 +146,9 @@ fn add_pb(mp: &MultiProgress, template: &str, message: String) -> ProgressBar {
     pb
 }
 
-fn finish_pb(pb: ProgressBar, message: String, template: &str) {
+fn finish_pb(pb: &ProgressBar, message: String, template: &str) {
     pb.set_style(ProgressStyle::with_template(template).unwrap());
     pb.finish_with_message(message);
-
 }
 
 enum Protocols {
@@ -149,12 +160,12 @@ impl Display for Protocols {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         match self {
             Self::Http => f.write_str("http"),
-            Self::Websocket => f.write_str("ws")
+            Self::Websocket => f.write_str("ws"),
         }
     }
 }
 
 #[derive(Debug, Deserialize)]
 struct ErrorResponse {
-    error: String
+    error: String,
 }