matthiasbeyer/imag
1
0
Fork 0
Code Releases Activity

Fix handle_internal_linking() and add error output in case of Err(_) via libimagutil::warn_result::*

Browse source
This commit is contained in:
Matthias Beyer 2016-08-28 14:31:10 +02:00
parent 0b89cd9ff9
commit c104e165fd
2 changed files with 15 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
imag-link/Cargo.toml
View file

@ -23,3 +23,6 @@ path = "../libimagentrylink"
[dependencies.libimagerror] [dependencies.libimagerror]
path = "../libimagerror" path = "../libimagerror"
[dependencies.libimagutil]
path = "../libimagutil"

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

@ -24,6 +24,7 @@ extern crate libimagentrylink;
extern crate libimagrt; extern crate libimagrt;
extern crate libimagstore; extern crate libimagstore;
extern crate libimagerror; extern crate libimagerror;
extern crate libimagutil;
use std::process::exit; use std::process::exit;
use std::ops::Deref; use std::ops::Deref;
@ -36,6 +37,7 @@ use libimagstore::store::FileLockEntry;
use libimagstore::store::Store; use libimagstore::store::Store;
use libimagerror::trace::{trace_error, trace_error_exit}; use libimagerror::trace::{trace_error, trace_error_exit};
use libimagentrylink::external::ExternalLinker; use libimagentrylink::external::ExternalLinker;
use libimagutil::warn_result::*;
use clap::ArgMatches; use clap::ArgMatches;
use url::Url; use url::Url;
@ -77,7 +79,16 @@ fn handle_internal_linking(rt: &Runtime) {
Ok(Some(e)) => { Ok(Some(e)) => {
e.get_internal_links() e.get_internal_links()
.map(|links| { .map(|links| {
for (i, link) in links.iter().map(|l| l.to_str().ok()).filter_map(|x| x).enumerate() { let i = links
.iter()
.filter_map(|l| {
l.to_str()
.map_warn_err(|e| format!("Failed to convert StoreId to string: {:?}", e))
.ok()
})
.enumerate();
for (i, link) in i {
println!("{: <3}: {}", i, link); println!("{: <3}: {}", i, link);
} }
}) })