From fd40715b29f63626b37ea1f99dc8715da3fceeba Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Thu, 24 Oct 2019 17:53:36 +0200
Subject: [PATCH] Remove calls to exit() and replace them with error
 propagation up to main()

Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
---
 bin/core/imag-edit/Cargo.toml |  1 +
 bin/core/imag-edit/src/lib.rs | 47 ++++++++++++-----------------------
 2 files changed, 17 insertions(+), 31 deletions(-)

diff --git a/bin/core/imag-edit/Cargo.toml b/bin/core/imag-edit/Cargo.toml
index 6dc9a67d..590a9cce 100644
--- a/bin/core/imag-edit/Cargo.toml
+++ b/bin/core/imag-edit/Cargo.toml
@@ -25,6 +25,7 @@ version      = "3.0.0"
 toml         = "0.5.1"
 toml-query   = "0.9.2"
 failure      = "0.1.5"
+resiter      = "0.3.0"
 
 libimagstore     = { version = "0.10.0", path = "../../../lib/core/libimagstore" }
 libimagrt        = { version = "0.10.0", path = "../../../lib/core/libimagrt" }
diff --git a/bin/core/imag-edit/src/lib.rs b/bin/core/imag-edit/src/lib.rs
index 7d515c6d..132aaea3 100644
--- a/bin/core/imag-edit/src/lib.rs
+++ b/bin/core/imag-edit/src/lib.rs
@@ -37,6 +37,7 @@
 extern crate clap;
 #[macro_use] extern crate log;
 extern crate failure;
+extern crate resiter;
 
 extern crate libimagentryedit;
 extern crate libimagerror;
@@ -44,16 +45,16 @@ extern crate libimagrt;
 extern crate libimagstore;
 extern crate libimagutil;
 
-use libimagerror::trace::MapErrTrace;
-use libimagerror::iter::TraceIterator;
 use libimagentryedit::edit::Edit;
 use libimagentryedit::edit::EditHeader;
 use libimagrt::runtime::Runtime;
 use libimagrt::application::ImagApplication;
-use libimagstore::storeid::StoreIdIterator;
 use libimagstore::iter::get::StoreIdGetIteratorExtension;
+use libimagerror::iter::IterInnerOkOrElse;
 
 use failure::Fallible as Result;
+use failure::err_msg;
+use resiter::AndThen;
 use clap::App;
 
 mod ui;
@@ -68,39 +69,23 @@ impl ImagApplication for ImagEdit {
         let edit_header = rt.cli().is_present("edit-header");
         let edit_header_only = rt.cli().is_present("edit-header-only");
 
-        let sids = rt
-            .ids::<crate::ui::PathProvider>()
-            .map_err_trace_exit_unwrap()
-            .unwrap_or_else(|| {
-                error!("No ids supplied");
-                ::std::process::exit(1);
-            })
-            .into_iter();
-
-        StoreIdIterator::new(Box::new(sids.into_iter().map(Ok)))
+        rt.ids::<crate::ui::PathProvider>()?
+            .ok_or_else(|| err_msg("No ids supplied"))?
+            .into_iter()
+            .map(Ok)
             .into_get_iter(rt.store())
-            .trace_unwrap_exit()
-            .map(|o| o.unwrap_or_else(|| {
-                error!("Did not find one entry");
-                ::std::process::exit(1)
-            }))
-            .for_each(|mut entry| {
+            .map_inner_ok_or_else(|| err_msg("Did not find one entry"))
+            .inspect(|e| debug!("Editing = {:?}", e))
+            .and_then_ok(|mut entry| {
                 if edit_header {
-                    let _ = entry
-                        .edit_header_and_content(&rt)
-                        .map_err_trace_exit_unwrap();
+                    entry.edit_header_and_content(&rt)
                 } else if edit_header_only {
-                    let _ = entry
-                        .edit_header(&rt)
-                        .map_err_trace_exit_unwrap();
+                    entry.edit_header(&rt)
                 } else {
-                    let _ = entry
-                        .edit_content(&rt)
-                        .map_err_trace_exit_unwrap();
+                    entry.edit_content(&rt)
                 }
-            });
-
-        Ok(())
+            })
+            .collect()
     }
 
     fn build_cli<'a>(app: App<'a, 'a>) -> App<'a, 'a> {