matthiasbeyer/imag
1
0
Fork 0
Code Releases Activity

Remove calls to exit() and replace them with error propagation up to main()

Browse source 
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
This commit is contained in:
Matthias Beyer 2019-10-19 08:54:57 +02:00
parent 4b8ca2b110
commit 05685a6f2d
1 changed files with 61 additions and 94 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

155
bin/core/imag-gps/src/lib.rs
View file

@ -45,12 +45,11 @@ extern crate libimagerror;
extern crate libimagstore; extern crate libimagstore;
use std::io::Write; use std::io::Write;
use std::process::exit;
use std::str::FromStr; use std::str::FromStr;
use failure::Error;
use failure::err_msg;
use failure::Fallible as Result; use failure::Fallible as Result;
use failure::err_msg;
use clap::App; use clap::App;
use libimagstore::storeid::StoreId; use libimagstore::storeid::StoreId;
@ -58,9 +57,6 @@ use libimagentrygps::types::*;
use libimagentrygps::entry::*; use libimagentrygps::entry::*;
use libimagrt::application::ImagApplication; use libimagrt::application::ImagApplication;
use libimagrt::runtime::Runtime; use libimagrt::runtime::Runtime;
use libimagerror::trace::MapErrTrace;
use libimagerror::exit::ExitUnwrap;
use libimagerror::io::ToExitCode;
mod ui; mod ui;
@ -71,22 +67,22 @@ mod ui;
pub enum ImagGps {} pub enum ImagGps {}
impl ImagApplication for ImagGps { impl ImagApplication for ImagGps {
fn run(rt: Runtime) -> Result<()> { fn run(rt: Runtime) -> Result<()> {
if let Some(name) = rt.cli().subcommand_name() { match rt.cli().subcommand_name().ok_or_else(|| err_msg("No subcommand called"))? {
match name { "add" => add(&rt),
"add" => add(&rt), "remove" => remove(&rt),
"remove" => remove(&rt), "get" => get(&rt),
"get" => get(&rt), other => {
other => { debug!("Unknown command");
debug!("Unknown command"); if rt.handle_unknown_subcommand("imag-gps", other, rt.cli())
let _ = rt.handle_unknown_subcommand("imag-gps", other, rt.cli()) .map_err(Error::from)?
.map_err_trace_exit_unwrap() .success()
.code() {
.map(::std::process::exit); Ok(())
} else {
Err(format_err!("Subcommand failed"))
} }
} }
} }
Ok(())
} }
fn build_cli<'a>(app: App<'a, 'a>) -> App<'a, 'a> { fn build_cli<'a>(app: App<'a, 'a>) -> App<'a, 'a> {
@ -106,46 +102,33 @@ impl ImagApplication for ImagGps {
} }
} }
fn rt_get_ids(rt: &Runtime) -> Vec<StoreId> { fn rt_get_ids(rt: &Runtime) -> Result<Vec<StoreId>> {
rt rt
.ids::<crate::ui::PathProvider>() .ids::<crate::ui::PathProvider>()?
.map_err_trace_exit_unwrap() .ok_or_else(|| err_msg("No ids supplied"))
.unwrap_or_else(|| {
error!("No ids supplied");
::std::process::exit(1);
})
} }
fn add(rt: &Runtime) { fn add(rt: &Runtime) -> Result<()> {
let c = { let c = {
let parse = |value: &str| -> (i64, i64, i64) { let parse = |value: &str| -> Result<(i64, i64, i64)> {
debug!("Parsing '{}' into degree, minute and second", value); debug!("Parsing '{}' into degree, minute and second", value);
let ary = value.split('.') let ary = value.split('.')
.map(|v| {debug!("Parsing = {}", v); v}) .map(|v| {debug!("Parsing = {}", v); v})
.map(FromStr::from_str) .map(FromStr::from_str)
.map(|elem| { .map(|elem| elem.or_else(|_| Err(err_msg("Error while converting number"))))
elem.or_else(|_| Err(err_msg("Error while converting number"))) .collect::<Result<Vec<i64>>>()?;
.map_err_trace_exit_unwrap()
})
.collect::<Vec<i64>>();
let degree = ary.get(0).unwrap_or_else(|| { let degree = ary.get(0).ok_or_else(|| err_msg("Degree missing. This value is required."))?;
error!("Degree missing. This value is required."); let minute = ary.get(1).ok_or_else(|| err_msg("Degree missing. This value is required."))?;
exit(1)
});
let minute = ary.get(1).unwrap_or_else(|| {
error!("Degree missing. This value is required.");
exit(1)
});
let second = ary.get(2).unwrap_or(&0); let second = ary.get(2).unwrap_or(&0);
(*degree, *minute, *second) Ok((*degree, *minute, *second))
}; };
let scmd = rt.cli().subcommand_matches("add").unwrap(); // safed by main() let scmd = rt.cli().subcommand_matches("add").unwrap(); // safed by main()
let long = parse(scmd.value_of("longitude").unwrap()); // unwrap safed by clap let long = parse(scmd.value_of("longitude").unwrap())?; // unwrap safed by clap
let lati = parse(scmd.value_of("latitude").unwrap()); // unwrap safed by clap let lati = parse(scmd.value_of("latitude").unwrap())?; // unwrap safed by clap
let long = GPSValue::new(long.0, long.1, long.2); let long = GPSValue::new(long.0, long.1, long.2);
let lati = GPSValue::new(lati.0, lati.1, lati.2); let lati = GPSValue::new(lati.0, lati.1, lati.2);
@ -153,82 +136,66 @@ fn add(rt: &Runtime) {
Coordinates::new(long, lati) Coordinates::new(long, lati)
}; };
rt_get_ids(&rt) rt_get_ids(&rt)?
.into_iter() .into_iter()
.for_each(|id| { .map(|id| {
rt.store() rt.store()
.get(id.clone()) .get(id.clone())?
.map_err_trace_exit_unwrap() .ok_or_else(|| format_err!("No such entry: {}", id))?
.unwrap_or_else(|| { // if we have Ok(None) .set_coordinates(c.clone())?;
error!("No such entry: {}", id);
exit(1)
})
.set_coordinates(c.clone())
.map_err_trace_exit_unwrap();
rt.report_touched(&id).unwrap_or_exit(); rt.report_touched(&id).map_err(Error::from)
}); })
.collect()
} }
fn remove(rt: &Runtime) { fn remove(rt: &Runtime) -> Result<()> {
let print_removed = rt let print_removed = rt
.cli() .cli()
.subcommand_matches("remove") .subcommand_matches("remove")
.unwrap() .unwrap()
.is_present("print-removed"); // safed by main() .is_present("print-removed"); // safed by main()
rt_get_ids(&rt) rt_get_ids(&rt)?
.into_iter() .into_iter()
.for_each(|id| { .map(|id| {
let removed_value = rt let removed_value : Coordinates = rt
.store() .store()
.get(id.clone()) .get(id.clone())?
.map_err_trace_exit_unwrap() .ok_or_else(|| format_err!("No such entry: {}", id))?
.unwrap_or_else(|| { // if we have Ok(None) .remove_coordinates()?
error!("No such entry: {}", id); .ok_or_else(|| format_err!("Entry had no coordinates: {}", id))??;
exit(1)
})
.remove_coordinates()
.map_err_trace_exit_unwrap() // The delete action failed
.unwrap_or_else(|| { // if we have Ok(None)
error!("Entry had no coordinates: {}", id);
exit(1)
})
.map_err_trace_exit_unwrap(); // The parsing of the deleted values failed
if print_removed { if print_removed {
writeln!(rt.stdout(), "{}", removed_value).to_exit_code().unwrap_or_exit(); writeln!(rt.stdout(), "{}", removed_value)?;
} }
rt.report_touched(&id).unwrap_or_exit(); rt.report_touched(&id).map_err(Error::from)
}); })
.collect()
} }
fn get(rt: &Runtime) { fn get(rt: &Runtime) -> Result<()> {
let mut stdout = rt.stdout(); let mut stdout = rt.stdout();
rt_get_ids(&rt) rt_get_ids(&rt)?
.into_iter() .into_iter()
.for_each(|id| { .map(|id| {
let value = rt let value = rt
.store() .store()
.get(id.clone()) .get(id.clone())?
.map_err_trace_exit_unwrap() .ok_or_else(|| { // if we have Ok(None)
.unwrap_or_else(|| { // if we have Ok(None) format_err!("No such entry: {}", id)
error!("No such entry: {}", id); })?
exit(1) .get_coordinates()?
}) .ok_or_else(|| { // if we have Ok(None)
.get_coordinates() format_err!("Entry has no coordinates: {}", id)
.map_err_trace_exit_unwrap() // The get action failed })?;
.unwrap_or_else(|| { // if we have Ok(None)
error!("Entry has no coordinates: {}", id);
exit(1)
});
writeln!(stdout, "{}", value).to_exit_code().unwrap_or_exit(); writeln!(stdout, "{}", value)?;
rt.report_touched(&id).unwrap_or_exit(); rt.report_touched(&id).map_err(Error::from)
}) })
.collect()
} }