stonewareslord/live-cli
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 3 Wiki Activity

Print output when done

Browse Source
This commit is contained in:
Austen Adler 2022-12-29 15:10:28 -05:00
parent bdd28da59e
commit 3471ea3c0b
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main.rs
View File

@ -190,7 +190,7 @@ fn main() -> Result<()> {
let (message_rx, command_request_tx) = init_message_passing(); let (message_rx, command_request_tx) = init_message_passing();
// Run the actual application // Run the actual application
let app = App::new(message_rx, command_request_tx, text_orig); let mut app = App::new(message_rx, command_request_tx, text_orig);
enable_raw_mode()?; enable_raw_mode()?;
let mut stdout = io::stdout(); let mut stdout = io::stdout();
execute!( execute!(
@ -202,7 +202,7 @@ fn main() -> Result<()> {
let backend = CrosstermBackend::new(stdout); let backend = CrosstermBackend::new(stdout);
let mut terminal = Terminal::new(backend)?; let mut terminal = Terminal::new(backend)?;
let res = run_app(&mut terminal, app); let res = run_app(&mut terminal, &mut app);
// Restore terminal // Restore terminal
disable_raw_mode()?; disable_raw_mode()?;
@ -219,6 +219,8 @@ fn main() -> Result<()> {
if let Some(res) = res { if let Some(res) = res {
std::io::stderr().write_all(res.as_bytes())?; std::io::stderr().write_all(res.as_bytes())?;
std::io::stderr().write_all(b"\n")?; std::io::stderr().write_all(b"\n")?;
// TODO: I do not want to collect the whole thing into a vec
app.command_options.read().command_result.as_ref().map(|r| std::io::stdout().write_all(&r.stdout.bytes().collect::<Vec<u8>>())).transpose()?;
} }
Ok(()) Ok(())
@ -248,7 +250,7 @@ fn init_message_passing() -> (Receiver<EventMessage>, Sender<CommandRequest>) {
#[allow(clippy::too_many_lines)] #[allow(clippy::too_many_lines)]
#[cfg_attr(debug_assertions, instrument(skip(terminal, app)))] #[cfg_attr(debug_assertions, instrument(skip(terminal, app)))]
fn run_app<B: Backend>(terminal: &mut Terminal<B>, mut app: App) -> Result<Option<String>> { fn run_app<B: Backend>(terminal: &mut Terminal<B>, app: &mut App) -> Result<Option<String>> {
// When starting the app, ensure the command runs at least once // When starting the app, ensure the command runs at least once
{ {
let mut command_options = app.command_options.write(); let mut command_options = app.command_options.write();