matthiasbeyer/imag
1
0
Fork 0
Code Releases Activity

Reimplement libimagentrylink::external::is_external_link_storeid() using StoreId::is_in_collection()

Browse source
This commit is contained in:
Matthias Beyer 2016-08-28 13:41:28 +02:00
parent b2806ab592
commit d594b7c6a2
1 changed files with 1 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
libimagentrylink/src/external.rs
View file

@ -91,16 +91,8 @@ pub trait ExternalLinker : InternalLinker {
/// Check whether the StoreId starts with `/link/external/` /// Check whether the StoreId starts with `/link/external/`
pub fn is_external_link_storeid(id: &StoreId) -> bool { pub fn is_external_link_storeid(id: &StoreId) -> bool {
use std::path::Component;
debug!("Checking whether this is a link/external/*: '{:?}'", id); debug!("Checking whether this is a link/external/*: '{:?}'", id);
id.components() id.is_in_collection(&["link", "external"])
.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> { fn get_external_link_from_file(entry: &FileLockEntry) -> Result<Url> {