github/darkfi
1
1
Fork 0
mirror of https://github.com/darkrenaissance/darkfi.git synced 2026-01-10 07:08:05 -05:00
Code Issues Packages Projects Releases Wiki Activity

drk/interactive: restore blocking mode when printing notifications

Browse Source
This commit is contained in:
skoupidi
2025-11-06 20:23:54 +02:00
parent 9a5b6f6029
commit 564dce98e0
1 changed files with 48 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
bin/drk/src/interactive.rs
View File

@@ -678,27 +678,55 @@ async fn listen_for_line(
_ = input_future.fuse() => break,
// Manage filled channel
_ = channel_future.fuse() => {
while !shell_receiver.is_empty() {
match shell_receiver.recv().await {
Ok(msg) => {
// We only print if snooze is inactive,
// but have to consume the message regardless,
// so the queue gets empty.
if *snooze_active {
continue
}
// Hide prompt, print output, show prompt again
let _ = state.hide();
for line in msg {
println!("{}\r", line.replace("\n", "\n\r"));
}
let _ = state.show();
}
Err(e) => {
// We only print if snooze is inactive,
// but have to consume the message regardless,
// so the queue gets empty.
if *snooze_active {
while !shell_receiver.is_empty() {
if let Err(e) = shell_receiver.recv().await {
eprintln!("Error while reading shell receiver channel: {e}");
break
}
}
} else {
// Hide prompt
if let Err(e) = state.hide() {
eprintln!("Error while hiding linenoise state: {e}");
break
};
// Restore blocking mode
unsafe {
let flags = fcntl(fd, F_GETFL, 0);
fcntl(fd, F_SETFL, flags & !O_NONBLOCK);
}
// Print output
while !shell_receiver.is_empty() {
match shell_receiver.recv().await {
Ok(msg) => {
for line in msg {
println!("{}\r", line.replace("\n", "\n\r"));
}
}
Err(e) => {
eprintln!("Error while reading shell receiver channel: {e}");
break
}
}
}
// Set stdin to non-blocking mode
unsafe {
let flags = fcntl(fd, F_GETFL, 0);
fcntl(fd, F_SETFL, flags | O_NONBLOCK);
}
// Show prompt again
if let Err(e) = state.show() {
eprintln!("Error while showing linenoise state: {e}");
break
};
}
}
}
@@ -710,7 +738,9 @@ async fn listen_for_line(
fcntl(fd, F_SETFL, flags & !O_NONBLOCK);
}
let _ = state.edit_stop();
if let Err(e) = state.edit_stop() {
eprintln!("Error while stopping linenoise state: {e}");
};
line
}