From 9bb21e6a190e16888ad1725ebe6f7e4978189707 Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Tue, 11 Oct 2016 11:17:20 +0200
Subject: [PATCH] imag-bookmark: Rewrite add() with iterator helpers

---
 imag-bookmark/src/main.rs | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/imag-bookmark/src/main.rs b/imag-bookmark/src/main.rs
index 88f41f7b..dd4e20a6 100644
--- a/imag-bookmark/src/main.rs
+++ b/imag-bookmark/src/main.rs
@@ -49,7 +49,9 @@ use libimagrt::runtime::Runtime;
 use libimagrt::setup::generate_runtime_setup;
 use libimagbookmark::collection::BookmarkCollection;
 use libimagbookmark::link::Link as BookmarkLink;
-use libimagerror::trace::{trace_error, trace_error_exit};
+use libimagerror::trace::{MapErrTrace, trace_error, trace_error_exit};
+use libimagutil::info_result::*;
+use libimagutil::iter::*;
 
 mod ui;
 
@@ -82,12 +84,14 @@ fn add(rt: &Runtime) {
     let coll = scmd.value_of("collection").unwrap(); // enforced by clap
 
     BookmarkCollection::get(rt.store(), coll)
-        .map(|mut collection| {
-            for url in scmd.values_of("urls").unwrap() { // enforced by clap
-                collection.add_link(BookmarkLink::from(url)).map_err(|e| trace_error(&e)).ok();
-            }
-        });
-    info!("Ready");
+        .and_then(|mut collection| {
+            scmd.values_of("urls")
+                .unwrap() // enforced by clap
+                .fold_defresult(|url| collection.add_link(BookmarkLink::from(url)))
+        })
+        .map_err_trace()
+        .map_info_str("Ready")
+        .ok();
 }
 
 fn collection(rt: &Runtime) {