actions/cargo-binstall
1
0
Fork 0
mirror of https://github.com/cargo-bins/cargo-binstall.git synced 2025-06-15 15:16:37 +00:00
Code Issues Projects Releases Packages Wiki Activity

Add stdout/stderr printing support to UIThread

Browse source 
Signed-off-by: Jiahao XU <Jiahao_XU@outlook.com>
This commit is contained in:
Jiahao XU 2022-06-19 00:45:31 +10:00
parent c33f195d5f
commit ac492e6d8b
No known key found for this signature in database
GPG key ID: 591C0B03040416D6
1 changed files with 40 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

64
src/helpers/ui_thread.rs
View file

@ -1,14 +1,26 @@
use std::io::{self, BufRead, Write};
use bytes::Bytes;
use tokio::sync::mpsc;
use tokio::task::spawn_blocking;
use crate::BinstallError;
pub(super) enum UIRequest {
/// Request user confirmation
Confirm,
/// Print to stdout
PrintToStdout(Bytes),
/// Print to stderr
PrintToStderr(Bytes),
/// Flush stdout
FlushStdout,
}
#[derive(Debug)]
struct UIThreadInner {
/// Request for confirmation
request_tx: mpsc::Sender<()>,
request_tx: mpsc::Sender<UIRequest>,
/// Confirmation
confirm_rx: mpsc::Receiver<Result<(), BinstallError>>,
@ -23,35 +35,39 @@ impl UIThreadInner {
// This task should be the only one able to
// access stdin
let mut stdin = io::stdin().lock();
let mut stdout = io::stdout().lock();
let mut stderr = io::stderr().lock();
let mut input = String::with_capacity(16);
loop {
if request_rx.blocking_recv().is_none() {
break;
}
match request_rx.blocking_recv() {
Some(UIRequest::Confirm) => {
let res = loop {
writeln!(&mut stdout, "Do you wish to continue? yes/[no]").unwrap();
write!(&mut stdout, "? ").unwrap();
stdout.flush().unwrap();
// Lock stdout so that nobody can interfere
// with confirmation.
let mut stdout = io::stdout().lock();
input.clear();
stdin.read_line(&mut input).unwrap();
let res = loop {
writeln!(&mut stdout, "Do you wish to continue? yes/[no]").unwrap();
write!(&mut stdout, "? ").unwrap();
stdout.flush().unwrap();
match input.as_str().trim() {
"yes" | "y" | "YES" | "Y" => break Ok(()),
"no" | "n" | "NO" | "N" | "" => {
break Err(BinstallError::UserAbort)
}
_ => continue,
}
};
input.clear();
stdin.read_line(&mut input).unwrap();
match input.as_str().trim() {
"yes" | "y" | "YES" | "Y" => break Ok(()),
"no" | "n" | "NO" | "N" | "" => break Err(BinstallError::UserAbort),
_ => continue,
confirm_tx
.blocking_send(res)
.expect("entry exits when confirming request")
}
};
confirm_tx
.blocking_send(res)
.expect("entry exits when confirming request");
Some(UIRequest::PrintToStdout(output)) => stdout.write_all(&output).unwrap(),
Some(UIRequest::PrintToStderr(output)) => stderr.write_all(&output).unwrap(),
Some(UIRequest::FlushStdout) => stdout.flush().unwrap(),
None => break,
}
}
});
@ -63,7 +79,7 @@ impl UIThreadInner {
async fn confirm(&mut self) -> Result<(), BinstallError> {
self.request_tx
.send(())
.send(UIRequest::Confirm)
.await
.map_err(|_| BinstallError::UserAbort)?;