Refactor CameraErr to be less verbose

This commit is contained in:
George Hilliard committed 2020-06-05 18:12:12 -05:00
1 parent c783f8ad78
commit f8dd564296
1 file changed
+25 -36
+25 -36
View File
@@ -79,46 +79,35 @@ fn camera_loop(camera_config: &CameraConfig, output: &mut dyn Write) -> Result<N
}
}
fn camera_main(camera_config: &CameraConfig, output: &mut dyn Write) -> Result<Never, CameraErr> {
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: Into<neolink::Error>>(e: E) -> Self {
CameraErr {
connected: false,
err: e.into(),
fn camera_main(camera_config: &CameraConfig, output: &mut dyn Write) -> Result<Never, CameraErr> {
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: Into<neolink::Error>>(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 })
}