matthiasbeyer/imag
1
0
Fork 0
Code Releases Activity

Change the interface of StoreId::is_in_collection()

Browse source 
to use &PathBuf rather than &[&str] as argument.
This commit is contained in:
Matthias Beyer 2016-09-02 17:14:11 +02:00
parent 85f79ae3e5
commit a77cc2bab2
1 changed files with 4 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
libimagstore/src/storeid.rs
View file

@ -86,26 +86,11 @@ impl StoreId {
self.id.components()
}
/// Check whether a StoreId points to an entry in a specific collection.
/// Convenience function over PathBuf::starts_with().
///
/// A "collection" here is simply a directory. So `foo/bar/baz` is an entry which is in
/// collection ["foo", "bar"].
///
/// # Warning
///
/// The collection specification _has_ to start with the module name. Otherwise this function
/// may return false negatives.
///
pub fn is_in_collection(&self, colls: &[&str]) -> bool {
use std::path::Component;
self.id
.components()
.zip(colls)
.all(|(component, pred_coll)| match component {
Component::Normal(ref s) => s.to_str().map(|ref s| s == pred_coll).unwrap_or(false),
_ => false
}) && colls.last().map(|last| !self.id.ends_with(last)).unwrap_or(false)
/// This function calls `PathBuf::starts_with()` on the _local_ part of `self`.
pub fn is_in_collection(&self, collspec: &PathBuf) -> bool {
self.id.starts_with(collspec)
}
}