robin/haze
1
0
Fork 0
mirror of https://codeberg.org/icewind/haze.git synced 2026-06-03 17:14:08 +02:00
Code Issues Projects Releases Wiki Activity

fallback when stdout is not a tty

Browse source
This commit is contained in:
Robin Appelman 2021-04-08 21:46:44 +02:00
commit 67dcfaf1df
1 changed files with 7 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/exec.rs
View file

@ -6,7 +6,7 @@ use futures_util::StreamExt;
use std::io::{stdout, Read, Write}; use std::io::{stdout, Read, Write};
use std::time::Duration; use std::time::Duration;
use termion::raw::IntoRawMode; use termion::raw::IntoRawMode;
use termion::{async_stdin, terminal_size}; use termion::{async_stdin, is_tty, terminal_size};
use tokio::io::AsyncWriteExt; use tokio::io::AsyncWriteExt;
use tokio::task::spawn; use tokio::task::spawn;
use tokio::time::sleep; use tokio::time::sleep;
@ -18,6 +18,12 @@ pub async fn exec_tty<S1: AsRef<str>, S2: Into<String>>(
cmd: Vec<S2>, cmd: Vec<S2>,
env: Vec<&str>, env: Vec<&str>,
) -> Result<i64> { ) -> Result<i64> {
let stdout = stdout();
if !is_tty(&stdout) {
return exec(docker, container, user, cmd, env, Some(stdout)).await;
}
let tty_size = terminal_size()?; let tty_size = terminal_size()?;
let cmd = cmd.into_iter().map(S2::into).collect(); let cmd = cmd.into_iter().map(S2::into).collect();
let env = env.into_iter().map(String::from).collect(); let env = env.into_iter().map(String::from).collect();
@ -67,7 +73,6 @@ pub async fn exec_tty<S1: AsRef<str>, S2: Into<String>>(
}); });
// set stdout in raw mode so we can do tty stuff // set stdout in raw mode so we can do tty stuff
let stdout = stdout();
let mut stdout = stdout.lock().into_raw_mode()?; let mut stdout = stdout.lock().into_raw_mode()?;
// pipe docker exec output into stdout // pipe docker exec output into stdout