From 3e112d1cb69198786b6df7e5a5815a78911cba83 Mon Sep 17 00:00:00 2001 From: Joe Ardent Date: Tue, 15 Jul 2025 17:28:40 -0700 Subject: [PATCH] tiny tidy --- src/frontend/mod.rs | 48 ++++++++++++++++++++++----------------------- src/main.rs | 4 +++- 2 files changed, 27 insertions(+), 25 deletions(-) diff --git a/src/frontend/mod.rs b/src/frontend/mod.rs index 528561e..d0f225d 100644 --- a/src/frontend/mod.rs +++ b/src/frontend/mod.rs @@ -45,7 +45,7 @@ impl App { } #[tokio::main] - pub async fn run( + pub async fn start_and_run( &mut self, terminal: &mut DefaultTerminal, config: Config, @@ -141,29 +141,6 @@ impl App { } } -async fn shutdown(handles: &mut JoinSet) { - let mut alarm = tokio::time::interval(tokio::time::Duration::from_secs(5)); - alarm.tick().await; - loop { - tokio::select! { - join_result = handles.join_next() => { - match join_result { - Some(handle) => match handle { - Ok(h) => println!("Stopped {h:?}"), - Err(e) => println!("Got error {e:?}"), - } - None => break, - } - } - _ = alarm.tick() => { - println!("Exit timeout reached, aborting all unjoined tasks"); - handles.abort_all(); - break; - }, - } - } -} - impl Widget for &App { fn render(self, area: Rect, buf: &mut Buffer) { let title = Line::from(" Joecalsend ".bold()); @@ -194,3 +171,26 @@ impl Widget for &App { .render(area, buf); } } + +async fn shutdown(handles: &mut JoinSet) { + let mut alarm = tokio::time::interval(tokio::time::Duration::from_secs(5)); + alarm.tick().await; + loop { + tokio::select! { + join_result = handles.join_next() => { + match join_result { + Some(handle) => match handle { + Ok(h) => println!("Stopped {h:?}"), + Err(e) => println!("Got error {e:?}"), + } + None => break, + } + } + _ = alarm.tick() => { + println!("Exit timeout reached, aborting all unjoined tasks"); + handles.abort_all(); + break; + }, + } + } +} diff --git a/src/main.rs b/src/main.rs index 81bb3a8..62deea1 100644 --- a/src/main.rs +++ b/src/main.rs @@ -35,5 +35,7 @@ fn main() -> error::Result<()> { let mut app = App::new(); - Ok(ratatui::run(|terminal| app.run(terminal, config, device))?) + Ok(ratatui::run(|terminal| { + app.start_and_run(terminal, config, device) + })?) }