From c5c859d6b6d91ca4b9ee8ed8127168e314651ed8 Mon Sep 17 00:00:00 2001 From: Jack Wills <32690432+mrjackwills@users.noreply.github.com> Date: Mon, 30 May 2022 01:11:54 +0000 Subject: [PATCH] refactor: input_handler unwraps() feat: disregarding docker command errors replace if_some() +unwrap() with if let Some(). Docker commands unwrap() replace with unwrap_or(()) --- src/input_handler/mod.rs | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/src/input_handler/mod.rs b/src/input_handler/mod.rs index c69f61d..d8b863e 100644 --- a/src/input_handler/mod.rs +++ b/src/input_handler/mod.rs @@ -179,39 +179,37 @@ impl InputHandler { // Does is matter though? let panel = self.gui_state.lock().selected_panel; if panel == SelectablePanel::Commands { - let command = self.app_data.lock().get_docker_command(); + let option_command = self.app_data.lock().get_docker_command(); - if command.is_some() { - let id = self.app_data.lock().get_selected_container_id(); - if id.is_some() { - let id = id.unwrap(); - match command.unwrap() { - // TODO handle theses errors? + if let Some(command) = option_command { + let option_id = self.app_data.lock().get_selected_container_id(); + if let Some(id) = option_id { + match command { DockerControls::Pause => self .docker_sender .send(DockerMessage::Pause(id)) .await - .unwrap(), + .unwrap_or(()), DockerControls::Unpause => self .docker_sender .send(DockerMessage::Unpause(id)) .await - .unwrap(), + .unwrap_or(()), DockerControls::Start => self .docker_sender .send(DockerMessage::Start(id)) .await - .unwrap(), + .unwrap_or(()), DockerControls::Stop => self .docker_sender .send(DockerMessage::Stop(id)) .await - .unwrap(), + .unwrap_or(()), DockerControls::Restart => self .docker_sender .send(DockerMessage::Restart(id)) .await - .unwrap(), + .unwrap_or(()), } } }