From 1ff0553c2f27be12cb0dff779992bff70f6cc4c9 Mon Sep 17 00:00:00 2001 From: sigoden Date: Sun, 5 May 2024 06:45:33 +0800 Subject: [PATCH] refactor: no spinner for `aichat -e` if no terminal stdout (#483) --- src/main.rs | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/src/main.rs b/src/main.rs index 01f4bfb..2b00240 100644 --- a/src/main.rs +++ b/src/main.rs @@ -177,10 +177,16 @@ async fn start_interactive(config: &GlobalConfig) -> Result<()> { async fn execute(config: &GlobalConfig, mut input: Input) -> Result<()> { let client = init_client(config)?; config.read().maybe_print_send_tokens(&input); - let (spinner_tx, spinner_rx) = oneshot::channel(); - tokio::spawn(run_spinner(" Generating", spinner_rx)); - let ret = client.send_message(input.clone()).await; - let _ = spinner_tx.send(()); + let is_terminal_stdout = stdout().is_terminal(); + let ret = if is_terminal_stdout { + let (spinner_tx, spinner_rx) = oneshot::channel(); + tokio::spawn(run_spinner(" Generating", spinner_rx)); + let ret = client.send_message(input.clone()).await; + let _ = spinner_tx.send(()); + ret + } else { + client.send_message(input.clone()).await + }; let (mut eval_str, _) = ret?; if let Ok(true) = CODE_BLOCK_RE.is_match(&eval_str) { eval_str = extract_block(&eval_str); @@ -193,7 +199,7 @@ async fn execute(config: &GlobalConfig, mut input: Input) -> Result<()> { println!("{}", markdown_render.render(&eval_str).trim()); return Ok(()); } - if stdout().is_terminal() { + if is_terminal_stdout { let mut explain = false; loop { let answer = Select::new(