matthiasbeyer
/
imag
1
0
Fork 0
Code Releases Activity

Merge branch 'fix-libimagentrylink-remove-links-with-set' into master

This commit is contained in:
Matthias Beyer 2019-05-18 12:35:58 +02:00
parent 21b24e2d26 5a250bd991
commit 6264e2cb51
1 changed files with 0 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
lib/entry/libimagentrylink/src/internal.rs
View File

@ -162,9 +162,6 @@ pub trait InternalLinker {
/// Get the internal links from the implementor object /// Get the internal links from the implementor object
fn get_internal_links(&self) -> Result<LinkIter>; fn get_internal_links(&self) -> Result<LinkIter>;
/// Set the internal links for the implementor object
fn set_internal_links(&mut self, links: Vec<&mut Entry>) -> Result<LinkIter>;
/// Add an internal link to the implementor object /// Add an internal link to the implementor object
fn add_internal_link(&mut self, link: &mut Entry) -> Result<()>; fn add_internal_link(&mut self, link: &mut Entry) -> Result<()>;
@ -273,38 +270,6 @@ impl InternalLinker for Entry {
process_rw_result(res) process_rw_result(res)
} }
/// Set the links in a header and return the old links, if any.
fn set_internal_links(&mut self, links: Vec<&mut Entry>) -> Result<LinkIter> {
debug!("Setting internal links");
let self_location = self.get_location().clone();
let mut new_links = vec![];
for link in links {
if let Err(e) = add_foreign_link(link, self_location.clone()) {
return Err(e);
}
new_links.push(link.get_location().clone().into());
}
let new_links = LinkIter::new(new_links)
.into_values()
.into_iter()
.fold(Ok(vec![]), |acc: Result<Vec<_>>, elem| {
acc.and_then(move |mut v| {
v.push(elem.context(EM::ConversionError)?);
Ok(v)
})
})?;
let res = self
.get_header_mut()
.insert("links.internal", Value::Array(new_links))
.context(format_err!("Failed to insert header 'links.internal' of '{}'", self.get_location()))
.context(EM::EntryHeaderReadError)
.map_err(Error::from);
process_rw_result(res)
}
fn add_internal_link(&mut self, link: &mut Entry) -> Result<()> { fn add_internal_link(&mut self, link: &mut Entry) -> Result<()> {
debug!("Adding internal link: {:?}", link); debug!("Adding internal link: {:?}", link);
let location = link.get_location().clone().into(); let location = link.get_location().clone().into();