matthiasbeyer
/
imag
1
0
Fork 0
Code Releases Activity

Merge pull request #1156 from matthiasbeyer/store-verify-from-cli-app 

Move verify implementation from Store to CLI interface
This commit is contained in:
Matthias Beyer 2017-10-31 15:47:57 +01:00 committed by GitHub
parent 2d94be5831 2855a89e24
commit dc26f8c20c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 46 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
bin/core/imag-store/src/verify.rs
View File

@ -17,11 +17,56 @@
// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
//
use std::ops::Deref;
use libimagrt::runtime::Runtime;
use libimagutil::warn_exit::warn_exit;
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) {
if rt.store().verify() {
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"
};
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
},
}
},
});
if result {
info!("Store seems to be fine");
} else {
warn_exit("Store seems to be broken somehow", 1);

56
lib/core/libimagstore/src/store.rs
View File

@ -324,62 +324,6 @@ impl Store {
self.configuration.as_ref()
}
/// Verify the store.
///
/// This function is not intended to be called by normal programs but only by `imag-store`.
#[cfg(feature = "verify")]
pub fn verify(&self) -> bool {
use libimagerror::trace::trace_error_dbg;
info!("Header | Content length | Path");
info!("-------+----------------+-----");
WalkDir::new(self.location.clone())
.into_iter()
.all(|res| match res {
Ok(dent) => {
if dent.file_type().is_file() {
match self.get(PathBuf::from(dent.path())) {
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"
};
info!("{: >6} | {: >14} | {:?}", header, content_len, p.deref());
true
},
Ok(None) => {
info!("{: >6} | {: >14} | {:?}", "?", "couldn't load", dent.path());
true
},
Err(e) => {
trace_error_dbg(&e);
if_cfg_panic!("Error verifying: {:?}", e);
debug!("{:?}", e);
false
},
}
} else {
info!("{: >6} | {: >14} | {:?}", "?", "<no file>", dent.path());
true
}
},
Err(e) => {
trace_error_dbg(&e);
if_cfg_panic!("Error verifying: {:?}", e);
debug!("{:?}", e);
false
},
})
}
/// Creates the Entry at the given location (inside the entry)
///
/// # Return value