add basic eta

4 files changed, 22 insertions, 9 deletions

diff --git a/docker-compose.yml b/docker-compose.yml
index 0a52d16..3a0ade5 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,6 +1,6 @@
 services:
   webol:
-    image: ghcr.io/fxqnlr/webol:dev-2
+    image: ghcr.io/fxqnlr/webol:dev-6
     container_name: webol
     restart: no
     depends_on:
diff --git a/src/error.rs b/src/error.rs
index 27fc7a6..f15c60a 100644
--- a/src/error.rs
+++ b/src/error.rs
@@ -1,9 +1,10 @@
-use std::fmt::Debug;
+use std::{fmt::Debug, num::ParseIntError};
 
 pub enum CliError {
     Reqwest(reqwest::Error),
     Config(config::ConfigError),
     Serde(serde_json::Error),
+    Parse(ParseIntError),
     WsResponse,
 }
 
@@ -13,6 +14,7 @@ impl Debug for CliError {
             Self::Reqwest(err) => { err.fmt(f) },
             Self::Config(err) => { err.fmt(f) },
             Self::Serde(err) => { err.fmt(f) },
+            Self::Parse(err) => { err.fmt(f) },
             Self::WsResponse => { f.write_str("Error in Response") },
         }
     }
diff --git a/src/main.rs b/src/main.rs
index d7c985f..204e671 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -12,9 +12,9 @@ mod config;
 mod error;
 mod requests;
 
-static OVERVIEW_STYLE: &str = "{spinner:.green} {wide_msg}({elapsed})";
-static OVERVIEW_ERROR: &str = "✗ {wide_msg}({elapsed})";
-static OVERVIEW_DONE: &str = "✓ {wide_msg}({elapsed})";
+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}";
diff --git a/src/requests/start.rs b/src/requests/start.rs
index 882b154..ca4ca44 100644
--- a/src/requests/start.rs
+++ b/src/requests/start.rs
@@ -1,5 +1,5 @@
 use futures_util::{StreamExt, SinkExt};
-use indicatif::MultiProgress;
+use indicatif::{MultiProgress, ProgressBar};
 use reqwest::StatusCode;
 use serde::Deserialize;
 use tokio_tungstenite::{connect_async, tungstenite::Message};
@@ -9,7 +9,7 @@ use crate::{error::CliError, default_headers, ErrorResponse, format_url, Protoco
 pub async fn start(id: String, ping: bool) -> Result<(), CliError> {
 
     let send_start = MultiProgress::new();
-    let overview = add_pb(&send_start, OVERVIEW_STYLE, format!("start {}", id));
+    let overview = add_pb(&send_start, OVERVIEW_STYLE, format!(") start {}", id));
 
     // TODO: calculate average start-time on server
     let url = format_url("start", Protocols::Http)?;
@@ -38,7 +38,7 @@ pub async fn start(id: String, ping: bool) -> Result<(), CliError> {
             }
 
             if ping {
-                let status = status_socket(body.uuid, &send_start).await?;
+                let status = status_socket(body.uuid, &send_start, &overview, id).await?;
                 if status {
                     finish_pb(overview, format!("successfully started {}", body.id), OVERVIEW_DONE);
                 } else {
@@ -59,7 +59,7 @@ pub async fn start(id: String, ping: bool) -> Result<(), CliError> {
     Ok(())
 }
 
-async fn status_socket(uuid: String, pb: &MultiProgress) -> Result<bool, CliError> {
+async fn status_socket(uuid: String, pb: &MultiProgress, overview: &ProgressBar, id: String) -> Result<bool, CliError> {
     // TODO: Remove unwraps
     let ws_pb = add_pb(pb, DEFAULT_STYLE, "connect to websocket".to_string());
     let (mut ws_stream, _response) = connect_async(format_url("status", Protocols::Websocket)?)
@@ -68,6 +68,11 @@ async fn status_socket(uuid: String, pb: &MultiProgress) -> Result<bool, CliErro
     finish_pb(ws_pb, "connected to websocket".to_string(), DONE_STYLE);
     
     ws_stream.send(Message::Text(uuid.clone())).await.unwrap();
+    
+    // Get ETA
+    let eta_msg = ws_stream.next().await.unwrap().unwrap();
+    let eta = get_eta(eta_msg.into_text().unwrap(), uuid.clone())? + overview.elapsed().as_secs();
+    overview.set_message(format!("/{}) start {}", eta, id));
 
     let msg_pb = add_pb(pb, DEFAULT_STYLE, "await message".to_string());
     let msg = ws_stream.next().await.unwrap();
@@ -101,6 +106,12 @@ async fn status_socket(uuid: String, pb: &MultiProgress) -> Result<bool, CliErro
     }
 }
 
+fn get_eta(msg: String, uuid: String) -> Result<u64, CliError> {
+    let spl: Vec<&str> = msg.split('_').collect();
+    if (spl[0] != "eta") || (spl[2] != uuid) { return Err(CliError::WsResponse); };
+    Ok(u64::from_str_radix(spl[1], 10).map_err(CliError::Parse)?)
+}
+
 fn verify_response(res: String, org_uuid: String) -> Result<Verified, CliError> {
     let spl: Vec<&str> = res.split('_').collect();
     let res_type = spl[0];