@pheem49/mint 1.8.2 → 1.10.0

package/crates/mint-cli/src/gmail.rs

@@ -37,8 +37,28 @@ pub async fn auth(no_open: bool, port: u16) -> Result<()> {
     if !no_open {
         open_browser(&url)?;
     }
-    println!("Waiting for Gmail OAuth callback on {redirect} ...");
-    let code = wait_for_code(listener, &state)?;
+    use indicatif::{ProgressBar, ProgressStyle};
+    use std::time::Duration;
+    let spinner = ProgressBar::new_spinner();
+    spinner.set_style(
+        ProgressStyle::default_spinner()
+            .tick_chars("⠋⠙⠹⠸⠼⠴⠦⠧⠇⠏")
+            .template("{spinner:.green} {msg}")
+            .unwrap(),
+    );
+    spinner.set_message("Waiting for Gmail OAuth authorization in browser...");
+    spinner.enable_steady_tick(Duration::from_millis(80));
+
+    let code = match wait_for_code(listener, &state) {
+        Ok(c) => {
+            spinner.finish_and_clear();
+            c
+        }
+        Err(e) => {
+            spinner.finish_and_clear();
+            return Err(e);
+        }
+    };
     let token: Value = mint_core::HTTP_CLIENT
         .clone()
         .post(TOKEN_URL)

package/crates/mint-cli/src/image.rs

@@ -27,21 +27,21 @@ pub fn read_clipboard_image() -> Result<Option<String>> {
         if let Ok(output) = std::process::Command::new("xclip")
             .args(["-selection", "clipboard", "-t", "image/png", "-o"])
             .output()
+            && output.status.success()
+            && !output.stdout.is_empty()
         {
-            if output.status.success() && !output.stdout.is_empty() {
-                let encoded = BASE64.encode(&output.stdout);
-                return Ok(Some(format!("data:image/png;base64,{encoded}")));
-            }
+            let encoded = BASE64.encode(&output.stdout);
+            return Ok(Some(format!("data:image/png;base64,{encoded}")));
         }
 
         if let Ok(output) = std::process::Command::new("wl-paste")
             .args(["--type", "image/png"])
             .output()
+            && output.status.success()
+            && !output.stdout.is_empty()
         {
-            if output.status.success() && !output.stdout.is_empty() {
-                let encoded = BASE64.encode(&output.stdout);
-                return Ok(Some(format!("data:image/png;base64,{encoded}")));
-            }
+            let encoded = BASE64.encode(&output.stdout);
+            return Ok(Some(format!("data:image/png;base64,{encoded}")));
         }
 
         Ok(None)