matthiasbeyer/imag
1
0
Fork 0
Code Releases Activity

Fix usage of libimagentrylink interface

Browse source
This commit is contained in:
Matthias Beyer 2016-10-13 18:30:16 +02:00
parent b70564f2ce
commit 02a2034d8b
3 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -97,7 +97,6 @@ fn handle_internal_linking(rt: &Runtime) {
e.get_internal_links() e.get_internal_links()
.map(|links| { .map(|links| {
let i = links let i = links
.iter()
.filter_map(|l| { .filter_map(|l| {
l.to_str() l.to_str()
.map_warn_err(|e| format!("Failed to convert StoreId to string: {:?}", e)) .map_warn_err(|e| format!("Failed to convert StoreId to string: {:?}", e))

2
libimagbookmark/src/collection.rs
View file

@ -114,7 +114,7 @@ impl<'a> BookmarkCollection<'a> {
self.fle self.fle
.get_internal_links() .get_internal_links()
.map(|v| v.into_iter().filter(|id| is_external_link_storeid(id)).collect()) .map(|v| v.filter(|id| is_external_link_storeid(id)).collect())
.map_err_into(BEK::StoreReadError) .map_err_into(BEK::StoreReadError)
} }

5
libimagentrylink/src/external.rs
View file

@ -133,10 +133,9 @@ impl ExternalLinker for Entry {
// /link/external/<SHA> -> load these files and get the external link from their headers, // /link/external/<SHA> -> load these files and get the external link from their headers,
// put them into the return vector. // put them into the return vector.
self.get_internal_links() self.get_internal_links()
.map(|vect| { .map(|iter| {
debug!("Getting external links"); debug!("Getting external links");
vect.into_iter() iter.filter(|l| is_external_link_storeid(l))
.filter(is_external_link_storeid)
.map(|id| { .map(|id| {
debug!("Retrieving entry for id: '{:?}'", id); debug!("Retrieving entry for id: '{:?}'", id);
match store.retrieve(id.clone()) { match store.retrieve(id.clone()) {