fix: ui unwraps()
replace unwraps with if let Ok() and unwrap_or(())
This commit is contained in:
+19
-18
@@ -58,13 +58,13 @@ pub async fn create_ui(
|
|||||||
)
|
)
|
||||||
.await;
|
.await;
|
||||||
|
|
||||||
disable_raw_mode().unwrap();
|
disable_raw_mode().unwrap_or(());
|
||||||
execute!(
|
execute!(
|
||||||
terminal.backend_mut(),
|
terminal.backend_mut(),
|
||||||
LeaveAlternateScreen,
|
LeaveAlternateScreen,
|
||||||
DisableMouseCapture
|
DisableMouseCapture
|
||||||
)?;
|
)?;
|
||||||
terminal.show_cursor().unwrap();
|
terminal.show_cursor().unwrap_or(());
|
||||||
|
|
||||||
if let Err(err) = res {
|
if let Err(err) = res {
|
||||||
println!("{}", err);
|
println!("{}", err);
|
||||||
@@ -105,26 +105,27 @@ async fn run_app<B: Backend>(
|
|||||||
let mut now = Instant::now();
|
let mut now = Instant::now();
|
||||||
loop {
|
loop {
|
||||||
terminal.draw(|f| ui(f, &app_data, &gui_state)).unwrap();
|
terminal.draw(|f| ui(f, &app_data, &gui_state)).unwrap();
|
||||||
if crossterm::event::poll(input_poll_rate).unwrap() {
|
if crossterm::event::poll(input_poll_rate).unwrap_or_default() {
|
||||||
let event = event::read().unwrap();
|
if let Ok(event) = event::read() {
|
||||||
if let Event::Key(key) = event {
|
if let Event::Key(key) = event {
|
||||||
sender
|
sender
|
||||||
.send(InputMessages::ButtonPress(key.code))
|
.send(InputMessages::ButtonPress(key.code))
|
||||||
.await
|
.await
|
||||||
.unwrap_or(());
|
.unwrap_or(());
|
||||||
} else if let Event::Mouse(m) = event {
|
} else if let Event::Mouse(m) = event {
|
||||||
sender
|
sender
|
||||||
.send(InputMessages::MouseEvent(m))
|
.send(InputMessages::MouseEvent(m))
|
||||||
.await
|
.await
|
||||||
.unwrap_or(());
|
.unwrap_or(());
|
||||||
} else if let Event::Resize(_, _) = event {
|
} else if let Event::Resize(_, _) = event {
|
||||||
gui_state.lock().clear_area_map();
|
gui_state.lock().clear_area_map();
|
||||||
terminal.autoresize().unwrap_or(());
|
terminal.autoresize().unwrap_or(());
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if now.elapsed() >= update_duration {
|
if now.elapsed() >= update_duration {
|
||||||
docker_sx.send(DockerMessage::Update).await.unwrap();
|
docker_sx.send(DockerMessage::Update).await.unwrap_or(());
|
||||||
now = Instant::now();
|
now = Instant::now();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user