From f8dd56429656a1d66ae53d9708f72cfd398522ae Mon Sep 17 00:00:00 2001 From: George Hilliard Date: Fri, 5 Jun 2020 18:12:12 -0500 Subject: [PATCH] Refactor CameraErr to be less verbose --- src/main.rs | 61 ++++++++++++++++++++++------------------------------- 1 file changed, 25 insertions(+), 36 deletions(-) diff --git a/src/main.rs b/src/main.rs index b87b849..4ba0d25 100644 --- a/src/main.rs +++ b/src/main.rs @@ -79,46 +79,35 @@ fn camera_loop(camera_config: &CameraConfig, output: &mut dyn Write) -> Result Result { - let mut camera = - BcCamera::new_with_addr(camera_config.camera_addr).map_err(CameraErr::before_connect)?; - if let Some(timeout) = camera_config.timeout { - camera.set_rx_timeout(timeout); - } - - println!( - "{}: Connecting to camera at {}", - camera_config.name, camera_config.camera_addr - ); - camera.connect().map_err(CameraErr::before_connect)?; - - camera - .login(&camera_config.username, camera_config.password.as_deref()) - .map_err(CameraErr::after_connect)?; - - println!( - "{}: Connected to camera, starting video stream", - camera_config.name - ); - camera.start_video(output).map_err(CameraErr::after_connect) -} - struct CameraErr { connected: bool, err: neolink::Error, } -impl CameraErr { - fn before_connect>(e: E) -> Self { - CameraErr { - connected: false, - err: e.into(), +fn camera_main(camera_config: &CameraConfig, output: &mut dyn Write) -> Result { + let mut connected = false; + (|| { + let mut camera = + BcCamera::new_with_addr(camera_config.camera_addr)?; + if let Some(timeout) = camera_config.timeout { + camera.set_rx_timeout(timeout); } - } - fn after_connect>(e: E) -> Self { - CameraErr { - connected: true, - err: e.into(), - } - } + + println!( + "{}: Connecting to camera at {}", + camera_config.name, camera_config.camera_addr + ); + camera.connect()?; + + connected = true; + + camera + .login(&camera_config.username, camera_config.password.as_deref())?; + + println!( + "{}: Connected to camera, starting video stream", + camera_config.name + ); + camera.start_video(output) + })().map_err(|err| CameraErr { connected, err }) }