Merge pull request #1477 from matthiasbeyer/libimagstore/remove-walk
Remove Store::walk()
This commit is contained in:
GitHub
commit
eb20a9d881
2 changed files with 19 additions and 110 deletions
|
|
@ -21,49 +21,34 @@ use std::ops::Deref;
|
|||
|
||||
use libimagrt::runtime::Runtime;
|
||||
use libimagutil::warn_exit::warn_exit;
|
||||
use libimagerror::trace::MapErrTrace;
|
||||
use libimagerror::iter::TraceIterator;
|
||||
use libimagstore::store::Header;
|
||||
use libimagstore::store::StoreObject;
|
||||
|
||||
/// Verify the store.
|
||||
///
|
||||
/// This function is not intended to be called by normal programs but only by `imag-store`.
|
||||
pub fn verify(rt: &Runtime) {
|
||||
use libimagerror::trace::trace_error_dbg;
|
||||
|
||||
info!("Header | Content length | Path");
|
||||
info!("-------+----------------+-----");
|
||||
let result = rt
|
||||
.store()
|
||||
.walk("")
|
||||
.into_iter()
|
||||
.all(|res| match res {
|
||||
StoreObject::Collection(_) => true,
|
||||
StoreObject::Id(id) => {
|
||||
match rt.store().get(id.clone()) {
|
||||
Ok(Some(fle)) => {
|
||||
let p = fle.get_location();
|
||||
let content_len = fle.get_content().len();
|
||||
let header = if fle.get_header().verify().is_ok() {
|
||||
"ok"
|
||||
} else {
|
||||
"broken"
|
||||
};
|
||||
.entries()
|
||||
.map_err_trace_exit_unwrap(1)
|
||||
.into_get_iter()
|
||||
.trace_unwrap_exit(1)
|
||||
.filter_map(|x| x)
|
||||
.all(|fle| {
|
||||
let p = fle.get_location();
|
||||
let content_len = fle.get_content().len();
|
||||
let (header, status) = if fle.get_header().verify().is_ok() {
|
||||
("ok", true)
|
||||
} else {
|
||||
("broken", false)
|
||||
};
|
||||
|
||||
info!("{: >6} | {: >14} | {:?}", header, content_len, p.deref());
|
||||
true
|
||||
},
|
||||
|
||||
Ok(None) => {
|
||||
info!("{: >6} | {: >14} | {:?}", "?", "couldn't load", id.local());
|
||||
true
|
||||
},
|
||||
|
||||
Err(e) => {
|
||||
trace_error_dbg(&e);
|
||||
false
|
||||
},
|
||||
}
|
||||
},
|
||||
info!("{: >6} | {: >14} | {:?}", header, content_len, p.deref());
|
||||
status
|
||||
});
|
||||
|
||||
if result {
|
||||
|
|
|
|||
|
|
@ -32,8 +32,6 @@ use std::fmt::Debug;
|
|||
use std::fmt::Error as FMTError;
|
||||
|
||||
use toml::Value;
|
||||
use walkdir::WalkDir;
|
||||
use walkdir::Iter as WalkDirIter;
|
||||
use toml_query::read::TomlValueReadExt;
|
||||
use toml_query::read::TomlValueReadTypeExt;
|
||||
|
||||
|
|
@ -47,7 +45,6 @@ pub use file_abstraction::FileAbstraction;
|
|||
pub use file_abstraction::FSFileAbstraction;
|
||||
pub use file_abstraction::InMemoryFileAbstraction;
|
||||
|
||||
use libimagerror::trace::trace_error;
|
||||
use libimagutil::debug_result::*;
|
||||
|
||||
/// The Result Type returned by any interaction with the store that could fail
|
||||
|
|
@ -69,72 +66,6 @@ struct StoreEntry {
|
|||
status: StoreEntryStatus,
|
||||
}
|
||||
|
||||
pub enum StoreObject {
|
||||
Id(StoreId),
|
||||
Collection(PathBuf),
|
||||
}
|
||||
|
||||
pub struct Walk {
|
||||
store_path: PathBuf,
|
||||
dirwalker: WalkDirIter,
|
||||
}
|
||||
|
||||
impl Walk {
|
||||
|
||||
fn new(mut store_path: PathBuf, mod_name: &str) -> Walk {
|
||||
let pb = store_path.clone();
|
||||
store_path.push(mod_name);
|
||||
Walk {
|
||||
store_path: pb,
|
||||
dirwalker: WalkDir::new(store_path).into_iter(),
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
impl ::std::ops::Deref for Walk {
|
||||
type Target = WalkDirIter;
|
||||
|
||||
fn deref(&self) -> &Self::Target {
|
||||
&self.dirwalker
|
||||
}
|
||||
}
|
||||
|
||||
impl Iterator for Walk {
|
||||
type Item = StoreObject;
|
||||
|
||||
fn next(&mut self) -> Option<Self::Item> {
|
||||
|
||||
while let Some(something) = self.dirwalker.next() {
|
||||
debug!("[Walk] Processing next item: {:?}", something);
|
||||
match something {
|
||||
Ok(next) => if next.file_type().is_dir() {
|
||||
debug!("Found directory...");
|
||||
return Some(StoreObject::Collection(next.path().to_path_buf()))
|
||||
} else /* if next.file_type().is_file() */ {
|
||||
debug!("Found file...");
|
||||
let n = next.path().to_path_buf();
|
||||
let sid = match StoreId::from_full_path(&self.store_path, n) {
|
||||
Err(e) => {
|
||||
debug!("Could not construct StoreId object from it");
|
||||
trace_error(&e);
|
||||
continue;
|
||||
},
|
||||
Ok(o) => o,
|
||||
};
|
||||
return Some(StoreObject::Id(sid))
|
||||
},
|
||||
Err(e) => {
|
||||
warn!("Error in Walker");
|
||||
debug!("{:?}", e);
|
||||
return None;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
None
|
||||
}
|
||||
}
|
||||
|
||||
impl StoreEntry {
|
||||
|
||||
fn new(id: StoreId, backend: &Arc<FileAbstraction>) -> Result<StoreEntry> {
|
||||
|
|
@ -396,15 +327,6 @@ impl Store {
|
|||
self.retrieve(id.clone()).map(Some).chain_err(|| SEK::GetCallError(id))
|
||||
}
|
||||
|
||||
/// Walk the store tree for the module
|
||||
///
|
||||
/// The difference between a `Walk` and a `StoreIdIterator` is that with a `Walk`, one can find
|
||||
/// "collections" (folders).
|
||||
pub fn walk<'a>(&'a self, mod_name: &str) -> Walk {
|
||||
debug!("Creating Walk object for {}", mod_name);
|
||||
Walk::new(self.path().clone(), mod_name)
|
||||
}
|
||||
|
||||
/// Write (update) the `FileLockEntry` to disk
|
||||
///
|
||||
/// # Return value
|
||||
|
|
@ -813,6 +735,8 @@ impl<'a> Drop for FileLockEntry<'a> {
|
|||
|
||||
/// This will not silently ignore errors but prints the result of the _update() call for testing
|
||||
fn drop(&mut self) {
|
||||
use libimagerror::trace::trace_error;
|
||||
|
||||
trace!("Dropping: {:?} - from FileLockEntry::drop() (test impl)", self.get_location());
|
||||
let _ = self.store._update(self, true).map_err(|e| trace_error(&e));
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue