matthiasbeyer/imag
1
0
Fork 0
Code Releases Activity

Fix libimagentrylink::external::* for new StoreId interface

Browse source
This commit is contained in:
Matthias Beyer 2016-08-25 18:49:26 +02:00
parent d252623b75
commit aeb95b1e11
1 changed files with 17 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
libimagentrylink/src/external.rs
View file

@ -91,8 +91,16 @@ pub trait ExternalLinker : InternalLinker {
/// Check whether the StoreId starts with `/link/external/`
pub fn is_external_link_storeid(id: &StoreId) -> bool {
debug!("Checking whether this is a /link/external/*: '{:?}'", id);
id.parent().map(|par| par.ends_with("/link/external")).unwrap_or(false)
use std::path::Component;
debug!("Checking whether this is a link/external/*: '{:?}'", id);
id.components()
.take(2)
.zip(&["link", "external"])
.map(|(c, pred)| match c {
Component::Normal(ref s) => s.to_str().map(|ref s| s == pred).unwrap_or(false),
_ => false
}).all(|x| x)
}
fn get_external_link_from_file(entry: &FileLockEntry) -> Result<Url> {
@ -144,7 +152,13 @@ impl ExternalLinker for Entry {
s.input_str(&link.as_str()[..]);
s.result_str()
};
let file_id = ModuleEntryPath::new(format!("external/{}", hash)).into_storeid();
let file_id = try!(
ModuleEntryPath::new(format!("external/{}", hash)).into_storeid()
.map_err_into(LEK::StoreWriteError)
.map_dbg_err(|_| {
format!("Failed to build StoreId for this hash '{:?}'", hash)
})
);
debug!("Link = '{:?}'", link);
debug!("Hash = '{:?}'", hash);