chore: replace atty with is-terminal (sigoden#156)

rooct · Nov 30, 2023 · af434ea · af434ea
1 parent 3a74860
commit af434ea
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 31 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -18,7 +18,7 @@ dirs = "5.0.0"
 eventsource-stream = "0.2.3"
 futures-util = "0.3.26"
 inquire = "0.6.2"
-is-terminal = "0.4.4"
+is-terminal = "0.4.9"
 reedline = "0.21.0"
 serde = { version = "1.0.152", features = ["derive"] }
 serde_json = "1.0.93"
@@ -27,7 +27,6 @@ tokio = { version = "1.26.0", features = ["full"] }
 crossbeam = "0.8.2"
 crossterm = "0.26.1"
 chrono = "0.4.23"
-atty = "0.2.14"
 unicode-width = "0.1.10"
 bincode = "1.3.3"
 ctrlc = "3.2.5"

diff --git a/src/main.rs b/src/main.rs
@@ -71,18 +71,18 @@ fn main() -> Result<()> {
     }
     let no_stream = cli.no_stream;
     let client = init_client(config.clone())?;
-    if atty::isnt(atty::Stream::Stdin) {
+    if stdin().is_terminal() {
+        match text {
+            Some(text) => start_directive(client.as_ref(), &config, &text, no_stream),
+            None => start_interactive(config),
+        }
+    } else {
         let mut input = String::new();
         stdin().read_to_string(&mut input)?;
         if let Some(text) = text {
             input = format!("{text}\n{input}");
         }
         start_directive(client.as_ref(), &config, &input, no_stream)
-    } else {
-        match text {
-            Some(text) => start_directive(client.as_ref(), &config, &text, no_stream),
-            None => start_interactive(config),
-        }
     }
 }