matthiasbeyer/imag
1
0
Fork 0
Code Releases Activity

imag-link: Use Err/Ok map utility functions to refactor code

Browse source
This commit is contained in:
Matthias Beyer 2016-09-06 11:09:42 +02:00
parent d5d83400fa
commit 23a42dcb0d
1 changed files with 20 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

67
imag-link/src/main.rs
View file

@ -34,10 +34,11 @@ use libimagstore::error::StoreError;
use libimagstore::store::Entry; use libimagstore::store::Entry;
use libimagstore::store::FileLockEntry; use libimagstore::store::FileLockEntry;
use libimagstore::store::Store; use libimagstore::store::Store;
use libimagerror::trace::{trace_error, trace_error_exit}; use libimagerror::trace::{MapErrTrace, trace_error, trace_error_exit};
use libimagentrylink::external::ExternalLinker; use libimagentrylink::external::ExternalLinker;
use libimagutil::warn_result::*; use libimagutil::warn_result::*;
use libimagutil::warn_exit::warn_exit; use libimagutil::warn_exit::warn_exit;
use libimagutil::info_result::*;
use clap::ArgMatches; use clap::ArgMatches;
use url::Url; use url::Url;
@ -89,7 +90,7 @@ fn handle_internal_linking(rt: &Runtime) {
println!("{: <3}: {}", i, link); println!("{: <3}: {}", i, link);
} }
}) })
.map_err(|e| trace_error(&e)) .map_err_trace()
.ok(); .ok();
}, },
@ -236,38 +237,17 @@ fn handle_external_linking(rt: &Runtime) {
} }
fn add_link_to_entry(store: &Store, matches: &ArgMatches, entry: &mut FileLockEntry) { fn add_link_to_entry(store: &Store, matches: &ArgMatches, entry: &mut FileLockEntry) {
let link = matches.value_of("add").unwrap(); Url::parse(matches.value_of("add").unwrap())
.map_err_trace_exit(1)
let link = Url::parse(link); .map(|link| entry.add_external_link(store, link).map_err_trace().map_info_str("Ok"))
if link.is_err() { .ok();
debug!("URL parsing error...");
trace_error_exit(&link.unwrap_err(), 1);
}
let link = link.unwrap();
if let Err(e) = entry.add_external_link(store, link) {
debug!("Error while adding external link...");
trace_error(&e);
} else {
debug!("Everything worked well");
info!("Ok");
}
} }
fn remove_link_from_entry(store: &Store, matches: &ArgMatches, entry: &mut FileLockEntry) { fn remove_link_from_entry(store: &Store, matches: &ArgMatches, entry: &mut FileLockEntry) {
let link = matches.value_of("remove").unwrap(); Url::parse(matches.value_of("remove").unwrap())
.map_err_trace_exit(1)
let link = Url::parse(link); .map(|link| entry.remove_external_link(store, link).map_err_trace().map_info_str("Ok"))
if link.is_err() { .ok();
trace_error_exit(&link.unwrap_err(), 1);
}
let link = link.unwrap();
if let Err(e) = entry.remove_external_link(store, link) {
trace_error(&e);
} else {
info!("Ok");
}
} }
fn set_links_for_entry(store: &Store, matches: &ArgMatches, entry: &mut FileLockEntry) { fn set_links_for_entry(store: &Store, matches: &ArgMatches, entry: &mut FileLockEntry) {
@ -289,29 +269,22 @@ fn set_links_for_entry(store: &Store, matches: &ArgMatches, entry: &mut FileLock
.filter_map(|x| x) .filter_map(|x| x)
.collect(); .collect();
if let Err(e) = entry.set_external_links(store, links) { entry.set_external_links(store, links)
trace_error(&e); .map_err_trace()
} else { .map_info_str("Ok")
info!("Ok"); .ok();
}
} }
fn list_links_for_entry(store: &Store, entry: &mut FileLockEntry) { fn list_links_for_entry(store: &Store, entry: &mut FileLockEntry) {
let res = entry.get_external_links(store) entry.get_external_links(store)
.and_then(|links| { .and_then(|links| {
for (i, link) in links.iter().enumerate() { for (i, link) in links.iter().enumerate() {
println!("{: <3}: {}", i, link); println!("{: <3}: {}", i, link);
} }
Ok(()) Ok(())
}); })
.map_err_trace()
match res { .map_info_str("Ok")
Err(e) => { .ok();
trace_error(&e);
},
Ok(_) => {
info!("Ok");
},
}
} }