matthiasbeyer/imag
1
0
Fork 0
Code Releases Activity

Ensure that StoreId::storified() does not alter already storified StoreId objects

Browse source
This commit is contained in:
Matthias Beyer 2016-07-04 12:49:12 +02:00
parent a706680fd5
commit 9605d6daa6
1 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
libimagstore/src/storeid.rs
View file

@ -19,11 +19,16 @@ pub struct StoreId(PathBuf);
impl StoreId {
pub fn storified(self, store: &Store) -> StoreId {
debug!("Create new store id out of: {:?} and {:?}", store.path(), self);
let mut new_id = store.path().clone();
new_id.push(self);
debug!("Created: '{:?}'", new_id);
StoreId::from(new_id)
if self.starts_with(store.path()) {
debug!("Not storifying {:?}, because it is already.", self);
self
} else {
debug!("Create new store id out of: {:?} and {:?}", store.path(), self);
let mut new_id = store.path().clone();
new_id.push(self);
debug!("Created: '{:?}'", new_id);
StoreId::from(new_id)
}
}
}