Adapt "imag store verify" implementation for removed Store::walk()

This commit is contained in:
Matthias Beyer 2018-05-01 17:49:41 +02:00
parent 258d9f90d3
commit 0dbef993c1

View file

@ -21,49 +21,34 @@ use std::ops::Deref;
use libimagrt::runtime::Runtime; use libimagrt::runtime::Runtime;
use libimagutil::warn_exit::warn_exit; use libimagutil::warn_exit::warn_exit;
use libimagerror::trace::MapErrTrace;
use libimagerror::iter::TraceIterator;
use libimagstore::store::Header; use libimagstore::store::Header;
use libimagstore::store::StoreObject;
/// Verify the store. /// Verify the store.
/// ///
/// This function is not intended to be called by normal programs but only by `imag-store`. /// This function is not intended to be called by normal programs but only by `imag-store`.
pub fn verify(rt: &Runtime) { pub fn verify(rt: &Runtime) {
use libimagerror::trace::trace_error_dbg;
info!("Header | Content length | Path"); info!("Header | Content length | Path");
info!("-------+----------------+-----"); info!("-------+----------------+-----");
let result = rt let result = rt
.store() .store()
.walk("") .entries()
.into_iter() .map_err_trace_exit_unwrap(1)
.all(|res| match res { .into_get_iter()
StoreObject::Collection(_) => true, .trace_unwrap_exit(1)
StoreObject::Id(id) => { .filter_map(|x| x)
match rt.store().get(id.clone()) { .all(|fle| {
Ok(Some(fle)) => {
let p = fle.get_location(); let p = fle.get_location();
let content_len = fle.get_content().len(); let content_len = fle.get_content().len();
let header = if fle.get_header().verify().is_ok() { let (header, status) = if fle.get_header().verify().is_ok() {
"ok" ("ok", true)
} else { } else {
"broken" ("broken", false)
}; };
info!("{: >6} | {: >14} | {:?}", header, content_len, p.deref()); info!("{: >6} | {: >14} | {:?}", header, content_len, p.deref());
true status
},
Ok(None) => {
info!("{: >6} | {: >14} | {:?}", "?", "couldn't load", id.local());
true
},
Err(e) => {
trace_error_dbg(&e);
false
},
}
},
}); });
if result { if result {