matthiasbeyer
/
imag
1
0
Fork 0
Code Releases Activity

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

Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
This commit is contained in:
Matthias Beyer 2019-10-19 08:54:57 +02:00
parent b36454ac38
commit 647ca2fea6
2 changed files with 55 additions and 96 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
bin/core/imag-category/Cargo.toml
View File

@ -24,6 +24,7 @@ log = "0.4.6"
toml = "0.5.1" toml = "0.5.1"
toml-query = "0.9.2" toml-query = "0.9.2"
failure = "0.1.5" failure = "0.1.5"
resiter = "0.3.0"
libimagstore = { version = "0.10.0", path = "../../../lib/core/libimagstore" } libimagstore = { version = "0.10.0", path = "../../../lib/core/libimagstore" }
libimagrt = { version = "0.10.0", path = "../../../lib/core/libimagrt" } libimagrt = { version = "0.10.0", path = "../../../lib/core/libimagrt" }

150
bin/core/imag-category/src/lib.rs
View File

@ -39,6 +39,7 @@ extern crate clap;
extern crate log; extern crate log;
#[macro_use] #[macro_use]
extern crate failure; extern crate failure;
extern crate resiter;
extern crate libimagentrycategory; extern crate libimagentrycategory;
extern crate libimagerror; extern crate libimagerror;
@ -50,19 +51,20 @@ use failure::Fallible as Result;
use clap::App; use clap::App;
use libimagerror::trace::MapErrTrace; use libimagerror::trace::MapErrTrace;
use libimagerror::exit::ExitUnwrap;
use libimagerror::io::ToExitCode;
use libimagrt::runtime::Runtime; use libimagrt::runtime::Runtime;
use libimagrt::application::ImagApplication; use libimagrt::application::ImagApplication;
use libimagerror::iter::IterInnerOkOrElse;
mod ui; mod ui;
use std::io::Write; use std::io::Write;
use failure::err_msg;
use failure::Error;
use resiter::AndThen;
use libimagentrycategory::store::CategoryStore; use libimagentrycategory::store::CategoryStore;
use libimagstore::storeid::StoreIdIterator;
use libimagstore::iter::get::StoreIdGetIteratorExtension; use libimagstore::iter::get::StoreIdGetIteratorExtension;
use libimagerror::iter::TraceIterator;
use libimagentrycategory::entry::EntryCategory; use libimagentrycategory::entry::EntryCategory;
use libimagentrycategory::category::Category; use libimagentrycategory::category::Category;
@ -73,25 +75,22 @@ use libimagentrycategory::category::Category;
pub enum ImagCategory {} pub enum ImagCategory {}
impl ImagApplication for ImagCategory { impl ImagApplication for ImagCategory {
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 { "set" => set(&rt),
"set" => set(&rt), "get" => get(&rt),
"get" => get(&rt), "list-category" => list_category(&rt),
"list-category" => list_category(&rt), "create-category" => create_category(&rt),
"create-category" => create_category(&rt), "delete-category" => delete_category(&rt),
"delete-category" => delete_category(&rt), "list-categories" => list_categories(&rt),
"list-categories" => list_categories(&rt), other => {
other => { debug!("Unknown command");
debug!("Unknown command"); if rt.handle_unknown_subcommand("imag-category", other, rt.cli())?.success() {
let _ = rt.handle_unknown_subcommand("imag-category", other, rt.cli()) Ok(())
.map_err_trace_exit_unwrap() } else {
.code() Err(err_msg("Failed to handle unknown subcommand"))
.map(::std::process::exit); }
}, },
}
} }
Ok(())
} }
fn build_cli<'a>(app: App<'a, 'a>) -> App<'a, 'a> { fn build_cli<'a>(app: App<'a, 'a>) -> App<'a, 'a> {
@ -112,125 +111,84 @@ impl ImagApplication for ImagCategory {
} }
fn set(rt: &Runtime) { fn set(rt: &Runtime) -> Result<()> {
let scmd = rt.cli().subcommand_matches("set").unwrap(); // safed by main() let scmd = rt.cli().subcommand_matches("set").unwrap(); // safed by main()
let name = scmd.value_of("set-name").map(String::from).unwrap(); // safed by clap let name = scmd.value_of("set-name").map(String::from).unwrap(); // safed by clap
let sids = rt rt.ids::<crate::ui::PathProvider>()?
.ids::<crate::ui::PathProvider>() .ok_or_else(|| err_msg("No ids supplied"))?
.map_err_trace_exit_unwrap() .into_iter()
.unwrap_or_else(|| { .map(Ok)
error!("No ids supplied");
::std::process::exit(1);
})
.into_iter();
StoreIdIterator::new(Box::new(sids.map(Ok)))
.into_get_iter(rt.store()) .into_get_iter(rt.store())
.trace_unwrap_exit() .map_inner_ok_or_else(|| err_msg("Did not find one entry"))
.map(|o| o.unwrap_or_else(|| { .and_then_ok(|mut e| e.set_category_checked(rt.store(), &name))
error!("Did not find one entry"); .collect()
::std::process::exit(1)
}))
.for_each(|mut entry| {
entry
.set_category_checked(rt.store(), &name)
.map_err_trace_exit_unwrap();
})
} }
fn get(rt: &Runtime) { fn get(rt: &Runtime) -> Result<()> {
let out = rt.stdout(); let out = rt.stdout();
let mut outlock = out.lock(); let mut outlock = out.lock();
let sids = rt rt.ids::<crate::ui::PathProvider>()?
.ids::<crate::ui::PathProvider>() .ok_or_else(|| err_msg("No ids supplied"))?
.map_err_trace_exit_unwrap() .into_iter()
.unwrap_or_else(|| { .map(Ok)
error!("No ids supplied");
::std::process::exit(1);
})
.into_iter();
StoreIdIterator::new(Box::new(sids.map(Ok)))
.into_get_iter(rt.store()) .into_get_iter(rt.store())
.trace_unwrap_exit() .map(|el| el.and_then(|o| o.ok_or_else(|| err_msg("Did not find one entry"))))
.map(|o| o.unwrap_or_else(|| { .map(|entry| entry.and_then(|e| e.get_category()))
error!("Did not find one entry"); .map(|name| name.and_then(|n| writeln!(outlock, "{}", n).map_err(Error::from)))
::std::process::exit(1) .collect()
}))
.map(|entry| entry.get_category().map_err_trace_exit_unwrap())
.for_each(|name| {
writeln!(outlock, "{}", name).to_exit_code().unwrap_or_exit();
})
} }
fn list_category(rt: &Runtime) { fn list_category(rt: &Runtime) -> Result<()> {
let scmd = rt.cli().subcommand_matches("list-category").unwrap(); // safed by main() let scmd = rt.cli().subcommand_matches("list-category").unwrap(); // safed by main()
let name = scmd.value_of("list-category-name").map(String::from).unwrap(); // safed by clap let name = scmd.value_of("list-category-name").map(String::from).unwrap(); // safed by clap
if let Some(category) = rt.store().get_category_by_name(&name).map_err_trace_exit_unwrap() { if let Some(category) = rt.store().get_category_by_name(&name)? {
let out = rt.stdout(); let out = rt.stdout();
let mut outlock = out.lock(); let mut outlock = out.lock();
category category
.get_entries(rt.store()) .get_entries(rt.store())
.map_err_trace_exit_unwrap() .map_err_trace_exit_unwrap()
.for_each(|entry| { .map(|entry| writeln!(outlock, "{}", entry?.get_location()).map_err(Error::from))
writeln!(outlock, "{}", entry.map_err_trace_exit_unwrap().get_location()) .collect()
.to_exit_code()
.unwrap_or_exit();
})
} else { } else {
info!("No category named '{}'", name); Err(format_err!("No category named '{}'", name))
::std::process::exit(1)
} }
} }
fn create_category(rt: &Runtime) { fn create_category(rt: &Runtime) -> Result<()> {
let scmd = rt.cli().subcommand_matches("create-category").unwrap(); // safed by main() let scmd = rt.cli().subcommand_matches("create-category").unwrap(); // safed by main()
let name = scmd.value_of("create-category-name").map(String::from).unwrap(); // safed by clap let name = scmd.value_of("create-category-name").map(String::from).unwrap(); // safed by clap
rt.store().create_category(&name).map(|_| ())
let _ = rt
.store()
.create_category(&name)
.map_err_trace_exit_unwrap();
} }
fn delete_category(rt: &Runtime) { fn delete_category(rt: &Runtime) -> Result<()> {
use libimaginteraction::ask::ask_bool; use libimaginteraction::ask::ask_bool;
let scmd = rt.cli().subcommand_matches("delete-category").unwrap(); // safed by main() let scmd = rt.cli().subcommand_matches("delete-category").unwrap(); // safed by main()
let name = scmd.value_of("delete-category-name").map(String::from).unwrap(); // safed by clap let name = scmd.value_of("delete-category-name").map(String::from).unwrap(); // safed by clap
let ques = format!("Do you really want to delete category '{}' and remove links to all categorized enties?", name); let ques = format!("Do you really want to delete category '{}' and remove links to all categorized enties?", name);
let mut input = rt.stdin().unwrap_or_else(|| { let mut input = rt.stdin().ok_or_else(|| err_msg("No input stream. Cannot ask for permission"))?;
error!("No input stream. Cannot ask for permission");
::std::process::exit(1)
});
let mut output = rt.stdout(); let mut output = rt.stdout();
let answer = ask_bool(&ques, Some(false), &mut input, &mut output).map_err_trace_exit_unwrap(); let answer = ask_bool(&ques, Some(false), &mut input, &mut output)?;
if answer { if answer {
info!("Deleting category '{}'", name); info!("Deleting category '{}'", name);
rt rt.store().delete_category(&name).map(|_| ())
.store()
.delete_category(&name)
.map_err_trace_exit_unwrap();
} else { } else {
info!("Not doing anything"); info!("Not doing anything");
Ok(())
} }
} }
fn list_categories(rt: &Runtime) { fn list_categories(rt: &Runtime) -> Result<()> {
let out = rt.stdout(); let out = rt.stdout();
let mut outlock = out.lock(); let mut outlock = out.lock();
rt.store() rt.store()
.all_category_names() .all_category_names()?
.map_err_trace_exit_unwrap() .map(|name| name.and_then(|n| writeln!(outlock, "{}", n).map_err(Error::from)))
.for_each(|name| { .collect()
writeln!(outlock, "{}", name.map_err_trace_exit_unwrap())
.to_exit_code()
.unwrap_or_exit();
})
} }