matthiasbeyer/imag
1
0
Fork 0
Code Releases Activity

Merge pull request #347 from matthiasbeyer/libimaglink/unique-internal-links

Browse source 
Libimaglink/unique internal links
This commit is contained in:
Matthias Beyer 2016-04-16 17:05:07 +02:00
commit 3d124df0c2
3 changed files with 28 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
libimaglink/Cargo.toml
View file

@ -4,6 +4,7 @@ version = "0.1.0"
authors = ["Matthias Beyer <mail@beyermatthias.de>"]
[dependencies]
itertools = "0.4.7"
log = "0.3.4"
toml = "0.1.27"
url = "0.5.5"

46
libimaglink/src/internal.rs
View file

@ -1,3 +1,5 @@
use std::cmp::Ordering;
use libimagstore::storeid::StoreId;
use libimagstore::store::Entry;
use libimagstore::store::EntryHeader;
@ -7,6 +9,7 @@ use error::{LinkError, LinkErrorKind};
use result::Result;
use toml::Value;
use itertools::Itertools;
pub type Link = StoreId;
@ -42,15 +45,14 @@ impl InternalLinker for Entry {
return Err(e);
}
let link = link.get_location().clone();
let link = link.to_str();
if link.is_none() {
new_links.push(link);
}
let new_links = links_into_values(new_links);
if new_links.iter().any(|o| o.is_none()) {
return Err(LinkError::new(LinkErrorKind::InternalConversionError, None));
}
let link = link.unwrap();
new_links.push(Value::String(String::from(link)));
}
let new_links = new_links.into_iter().map(|o| o.unwrap()).collect();
process_rw_result(self.get_header_mut().set("imag.links", Value::Array(new_links)))
}
@ -87,11 +89,23 @@ impl InternalLinker for Entry {
}
fn rewrite_links(header: &mut EntryHeader, links: Vec<StoreId>) -> Result<()> {
let links : Vec<Option<Value>> = links
fn links_into_values(links: Vec<StoreId>) -> Vec<Option<Value>> {
links
.into_iter()
.map(|s| s.to_str().map(|s| Value::String(String::from(s))))
.collect();
.map(|s| s.to_str().map(|s| String::from(s)))
.unique()
.map(|elem| elem.map(|s| Value::String(s)))
.sorted_by(|a, b| {
match (a, b) {
(&Some(Value::String(ref a)), &Some(Value::String(ref b))) => Ord::cmp(a, b),
(&None, _) | (_, &None) => Ordering::Equal,
_ => unreachable!()
}
})
}
fn rewrite_links(header: &mut EntryHeader, links: Vec<StoreId>) -> Result<()> {
let links = links_into_values(links);
if links.iter().any(|o| o.is_none()) {
// if any type convert failed we fail as well
@ -110,15 +124,7 @@ fn add_foreign_link(target: &mut Entry, from: StoreId) -> Result<()> {
target.get_internal_links()
.and_then(|mut links| {
links.push(from);
let links : Vec<Option<Value>> = links
.into_iter()
.map(|s| {
match s.to_str() {
Some(s) => Some(Value::String(String::from(s))),
_ => None
}
})
.collect();
let links = links_into_values(links);
if links.iter().any(|o| o.is_none()) {
Err(LinkError::new(LinkErrorKind::InternalConversionError, None))
} else {

1
libimaglink/src/lib.rs
View file

@ -1,3 +1,4 @@
extern crate itertools;
#[macro_use] extern crate log;
extern crate toml;
extern crate url;