matthiasbeyer/imag
1
0
Fork 0
Code Releases Activity

Fix Iterator impl for GlobStoreIdIterator

Browse source 
This patch fixes the `impl Iterator for GlobStoreIdIterator` which used
the glob() result to fetch the files from the FS, but glob() returns the
absolute pathes (to filesystem root).

We have to strip the `store_path` prefix and use the local part for
building the StoreId object.
This commit is contained in:
Matthias Beyer 2016-09-05 18:12:29 +02:00
parent 737aab80dc
commit e4e5b52171
1 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
libimagstore/src/store.rs
View file

@ -1503,6 +1503,8 @@ mod glob_store_iter {
impl GlobStoreIdIterator {
pub fn new(paths: Paths, store_path: PathBuf) -> GlobStoreIdIterator {
debug!("Create a GlobStoreIdIterator(store_path = {:?}, /* ... */)", store_path);
GlobStoreIdIterator {
store_path: store_path,
paths: paths,
@ -1518,8 +1520,13 @@ mod glob_store_iter {
self.paths
.next()
.and_then(|o| {
debug!("GlobStoreIdIterator::next() => {:?}", o);
o.map_err_into(SEK::StoreIdHandlingError)
.and_then(|p| StoreId::new(Some(self.store_path.clone()), p))
.and_then(|p| {
let p = try!(p.strip_prefix(&self.store_path)
.map_err_into(SEK::StoreIdHandlingError));
StoreId::new(Some(self.store_path.clone()), PathBuf::from(p))
})
.map_err(|e| {
debug!("GlobStoreIdIterator error: {:?}", e);
trace_error(&e);