matthiasbeyer/imag
1
0
Fork 0
Code Releases Activity

Fixup Walk type to handle StoreId properly

Browse source
This commit is contained in:
Matthias Beyer 2016-08-22 12:07:50 +02:00
parent 1de09f1606
commit 9cf7897286
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
libimagstore/src/store.rs
View file

@ -65,14 +65,17 @@ pub enum StoreObject {
} }
pub struct Walk { pub struct Walk {
store_path: PathBuf,
dirwalker: WalkDirIter, dirwalker: WalkDirIter,
} }
impl Walk { impl Walk {
fn new(mut store_path: PathBuf, mod_name: &str) -> Walk { fn new(mut store_path: PathBuf, mod_name: &str) -> Walk {
let pb = store_path.clone();
store_path.push(mod_name); store_path.push(mod_name);
Walk { Walk {
store_path: pb,
dirwalker: WalkDir::new(store_path).into_iter(), dirwalker: WalkDir::new(store_path).into_iter(),
} }
} }
@ -95,7 +98,9 @@ impl Iterator for Walk {
Ok(next) => if next.file_type().is_dir() { Ok(next) => if next.file_type().is_dir() {
return Some(StoreObject::Collection(next.path().to_path_buf())) return Some(StoreObject::Collection(next.path().to_path_buf()))
} else if next.file_type().is_file() { } else if next.file_type().is_file() {
return Some(StoreObject::Id(next.path().to_path_buf().into())) let n = next.path().to_path_buf();
let sid = StoreId::new(Some(self.store_path.clone()), n);
return Some(StoreObject::Id(sid))
}, },
Err(e) => { Err(e) => {
warn!("Error in Walker"); warn!("Error in Walker");