Merge pull request #1 from FxQnLr/eta

Eta

1 files changed, 75 insertions, 16 deletions

diff --git a/src/main.rs b/src/main.rs
index ab7e476..afe6fac 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,6 +1,10 @@
-use clap::{Parser, Subcommand};
+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 serde::Deserialize;
@@ -9,7 +13,15 @@ mod config;
 mod error;
 mod requests;
 
-/// webol http client
+static OVERVIEW_STYLE: &str = "{spinner:.green} ({elapsed}{wide_msg}";
+static OVERVIEW_ERROR: &str = "✗ ({elapsed}) {wide_msg}";
+static OVERVIEW_DONE: &str = "✓ ({elapsed}) {wide_msg}";
+static DEFAULT_STYLE: &str = "  {spinner:.green} {wide_msg}";
+static DONE_STYLE: &str = "  ✓ {wide_msg}";
+static ERROR_STYLE: &str = "  ✗ {wide_msg}";
+static TICK_SPEED: u64 = 1000 / 16;
+
+/// webol client
 #[derive(Parser)]
 #[command(author, version, about, long_about = None)]
 struct Args {
@@ -21,12 +33,17 @@ struct Args {
 enum Commands {
     Start {
         /// id of the device
-        id: String
+        id: String,
+        #[arg(short, long)]
+        ping: Option<bool>
     },
     Device {
         #[command(subcommand)]
         devicecmd: DeviceCmd,
-    }
+    },
+    CliGen {
+        id: Shell,
+    },
 }
 
 #[derive(Subcommand)]
@@ -34,7 +51,8 @@ enum DeviceCmd {
     Add {
         id: String,
         mac: String,
-        broadcast_addr: String
+        broadcast_addr: String,
+        ip: String
     },
     Get {
         id: String,
@@ -42,35 +60,46 @@ enum DeviceCmd {
     Edit {
         id: String,
         mac: String,
-        broadcast_addr: String
+        broadcast_addr: String,
+        ip: String
     },
 }
 
-fn main() -> Result<(), CliError> {
+#[tokio::main]
+async fn main() -> Result<(), CliError> {
     let cli = Args::parse();
 
     match cli.commands {
-        Commands::Start { id } => {
-            start(id)?;
+        Commands::Start { id, ping } => {
+            start(id, ping.unwrap_or(true)).await?;
         },
         Commands::Device { devicecmd } => {
             match devicecmd {
-                DeviceCmd::Add { id, mac, broadcast_addr } => {
-                    device::put(id, mac, broadcast_addr)?;
+                DeviceCmd::Add { id, mac, broadcast_addr, ip } => {
+                    device::put(id, mac, broadcast_addr, ip).await?;
                 },
                 DeviceCmd::Get { id } => {
-                    device::get(id)?;
+                    device::get(id).await?;
                 },
-                DeviceCmd::Edit { id, mac, broadcast_addr } => {
-                    device::post(id, mac, broadcast_addr)?;
+                DeviceCmd::Edit { id, mac, broadcast_addr, ip } => {
+                    device::post(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)
         }
     }
 
     Ok(())
 }
 
+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> {
     let mut map = HeaderMap::new();
     map.append("Accept-Content", HeaderValue::from_str("application/json").unwrap());
@@ -87,14 +116,44 @@ fn default_headers() -> Result<HeaderMap, CliError> {
     Ok(map)
 }
 
-fn format_url(path: &str) -> Result<String, CliError> {
+fn format_url(path: &str, protocol: Protocols) -> Result<String, CliError> {
     Ok(format!(
-        "{}/{}",
+        "{}://{}/{}",
+        protocol,
         SETTINGS.get_string("server").map_err(CliError::Config)?,
         path
     ))
 }
 
+fn add_pb(mp: &MultiProgress, template: &str, message: String) -> ProgressBar {
+    let pb = mp.add(ProgressBar::new(1));
+    pb.set_style(ProgressStyle::with_template(template).unwrap());
+    pb.enable_steady_tick(Duration::from_millis(TICK_SPEED));
+    pb.set_message(message);
+
+    pb
+}
+
+fn finish_pb(pb: ProgressBar, message: String, template: &str) {
+    pb.set_style(ProgressStyle::with_template(template).unwrap());
+    pb.finish_with_message(message);
+
+}
+
+enum Protocols {
+    Http,
+    Websocket,
+}
+
+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")
+        }
+    }
+}
+
 #[derive(Debug, Deserialize)]
 struct ErrorResponse {
     error: String