diff options
author | FxQnLr <[email protected]> | 2024-02-25 20:50:50 +0100 |
---|---|---|
committer | FxQnLr <[email protected]> | 2024-02-25 20:50:50 +0100 |
commit | 3a2dc1f2741f7bf4d72c1cbe0fd1993af157ceaa (patch) | |
tree | da0e6f0b8d054a48552b6eeb4973e77a8b9aa920 /src | |
parent | a192e9baca9a14beaa9f87c27a63cff96aa41c94 (diff) | |
download | webol-cli-3a2dc1f2741f7bf4d72c1cbe0fd1993af157ceaa.tar webol-cli-3a2dc1f2741f7bf4d72c1cbe0fd1993af157ceaa.tar.gz webol-cli-3a2dc1f2741f7bf4d72c1cbe0fd1993af157ceaa.zip |
Closes #5. Eta works
Diffstat (limited to 'src')
-rw-r--r-- | src/main.rs | 6 | ||||
-rw-r--r-- | src/requests/start.rs | 10 |
2 files changed, 11 insertions, 5 deletions
diff --git a/src/main.rs b/src/main.rs index d76341f..5a0931d 100644 --- a/src/main.rs +++ b/src/main.rs | |||
@@ -16,9 +16,9 @@ mod config; | |||
16 | mod error; | 16 | mod error; |
17 | mod requests; | 17 | mod requests; |
18 | 18 | ||
19 | static OVERVIEW_STYLE: &str = "{spinner:.green} ({elapsed}{wide_msg}"; | 19 | static OVERVIEW_STYLE: &str = "{spinner:.green} ({elapsed_precise}{wide_msg}"; |
20 | static OVERVIEW_ERROR: &str = "✗ ({elapsed}) {wide_msg}"; | 20 | static OVERVIEW_ERROR: &str = "✗ ({elapsed_precise}) {wide_msg}"; |
21 | static OVERVIEW_DONE: &str = "✓ ({elapsed}) {wide_msg}"; | 21 | static OVERVIEW_DONE: &str = "✓ ({elapsed_precise}) {wide_msg}"; |
22 | static DEFAULT_STYLE: &str = " {spinner:.green} {wide_msg}"; | 22 | static DEFAULT_STYLE: &str = " {spinner:.green} {wide_msg}"; |
23 | static DONE_STYLE: &str = " ✓ {wide_msg}"; | 23 | static DONE_STYLE: &str = " ✓ {wide_msg}"; |
24 | static ERROR_STYLE: &str = " ✗ {wide_msg}"; | 24 | static ERROR_STYLE: &str = " ✗ {wide_msg}"; |
diff --git a/src/requests/start.rs b/src/requests/start.rs index d07177e..3afbe3a 100644 --- a/src/requests/start.rs +++ b/src/requests/start.rs | |||
@@ -121,12 +121,18 @@ async fn status_socket( | |||
121 | } | 121 | } |
122 | } | 122 | } |
123 | 123 | ||
124 | fn get_eta(msg: &str, uuid: &str) -> Result<u64, Error> { | 124 | fn get_eta(msg: &str, uuid: &str) -> Result<String, Error> { |
125 | let spl: Vec<&str> = msg.split('_').collect(); | 125 | let spl: Vec<&str> = msg.split('_').collect(); |
126 | if (spl[0] != "eta") || (spl[2] != uuid) { | 126 | if (spl[0] != "eta") || (spl[2] != uuid) { |
127 | return Err(Error::WsResponse); | 127 | return Err(Error::WsResponse); |
128 | }; | 128 | }; |
129 | Ok(spl[1].parse()?) | 129 | let input: u64 = spl[1].parse()?; |
130 | |||
131 | let sec = input % 60; | ||
132 | let min = (input / 60) % 60; | ||
133 | let hou = (input / (60 * 60)) % 60; | ||
134 | |||
135 | Ok(format!("{hou:0>2}:{min:0>2}:{sec:0>2}")) | ||
130 | } | 136 | } |
131 | 137 | ||
132 | fn verify_response(res: &str, org_uuid: &str) -> Result<Verified, Error> { | 138 | fn verify_response(res: &str, org_uuid: &str) -> Result<Verified, Error> { |