diff --git a/src/app_error.rs b/src/app_error.rs index a4a6315..4afcf3f 100644 --- a/src/app_error.rs +++ b/src/app_error.rs @@ -2,15 +2,13 @@ use crate::app_data::DockerCommand; use std::fmt; /// app errors to set in global state -#[allow(unused)] +// #[allow(unused)] #[derive(Debug, Clone, Copy)] pub enum AppError { DockerCommand(DockerCommand), DockerExec, DockerLogs, DockerConnect, - DockerInterval, - InputPoll, MouseCapture(bool), Terminal, } @@ -23,8 +21,6 @@ impl fmt::Display for AppError { Self::DockerExec => write!(f, "Unable to exec into container"), Self::DockerLogs => write!(f, "Unable to save logs"), Self::DockerConnect => write!(f, "Unable to access docker daemon"), - Self::DockerInterval => write!(f, "Docker update interval needs to be greater than 0"), - Self::InputPoll => write!(f, "Unable to poll user input"), Self::MouseCapture(x) => { let reason = if *x { "en" } else { "dis" }; write!(f, "Unable to {reason}able mouse capture") diff --git a/src/parse_args.rs b/src/parse_args.rs index e29d84c..c1cb998 100644 --- a/src/parse_args.rs +++ b/src/parse_args.rs @@ -65,12 +65,7 @@ impl CliArgs { /// An ENV is set in the ./containerised/Dockerfile, if this is ENV found, then sleep for 250ms, else the container, for as yet unknown reasons, will close immediately /// returns a bool, so that the `update_all_containers()` won't bother to check the entry point unless running via a container fn check_if_in_container() -> bool { - if let Ok(value) = std::env::var(ENV_KEY) { - if value == ENV_VALUE { - return true; - } - } - false + std::env::var(ENV_KEY).map_or(false, |i| i == ENV_VALUE) } /// Parse cli arguments diff --git a/src/ui/mod.rs b/src/ui/mod.rs index 2158fef..b0e7fef 100644 --- a/src/ui/mod.rs +++ b/src/ui/mod.rs @@ -59,7 +59,7 @@ impl Ui { } /// Create a new Ui struct, and execute the drawing loop - pub async fn create( + pub async fn start( app_data: Arc>, gui_state: Arc>, input_tx: Sender,