matthiasbeyer/imag
1
0
Fork 0
Code Releases Activity

Refactor header checking to use toml-query

Browse source
This commit is contained in:
Matthias Beyer 2017-12-22 11:49:32 +01:00
parent 2bf91fab09
commit 20a552f527
1 changed files with 30 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

59
lib/core/libimagstore/src/store.rs
View file

@ -32,10 +32,10 @@ use std::fmt::Debug;
use std::fmt::Error as FMTError; use std::fmt::Error as FMTError;
use toml::Value; use toml::Value;
use toml::value::Table;
use glob::glob; use glob::glob;
use walkdir::WalkDir; use walkdir::WalkDir;
use walkdir::Iter as WalkDirIter; use walkdir::Iter as WalkDirIter;
use toml_query::read::TomlValueReadExt;
use error::{StoreError as SE, StoreErrorKind as SEK}; use error::{StoreError as SE, StoreErrorKind as SEK};
use error::ResultExt; use error::ResultExt;
@ -1067,10 +1067,7 @@ pub trait Header {
impl Header for Value { impl Header for Value {
fn verify(&self) -> Result<()> { fn verify(&self) -> Result<()> {
match *self { verify_header(self)
Value::Table(ref t) => verify_header(&t),
_ => Err(SE::from_kind(SEK::HeaderTypeFailure)),
}
} }
fn parse(s: &str) -> Result<Value> { fn parse(s: &str) -> Result<Value> {
@ -1079,7 +1076,6 @@ impl Header for Value {
from_str(s) from_str(s)
.map_err(From::from) .map_err(From::from)
.and_then(verify_header_consistency) .and_then(verify_header_consistency)
.map(Value::Table)
} }
fn default_header() -> Value { fn default_header() -> Value {
@ -1098,16 +1094,16 @@ impl Header for Value {
} }
fn verify_header_consistency(t: Table) -> Result<Table> { fn verify_header_consistency(t: Value) -> Result<Value> {
verify_header(&t).chain_err(|| SEK::HeaderInconsistency).map(|_| t) verify_header(&t).chain_err(|| SEK::HeaderInconsistency).map(|_| t)
} }
fn verify_header(t: &Table) -> Result<()> { fn verify_header(t: &Value) -> Result<()> {
if !has_main_section(t) { if !has_main_section(t)? {
Err(SE::from_kind(SEK::MissingMainSection)) Err(SE::from_kind(SEK::MissingMainSection))
} else if !has_imag_version_in_main_section(t) { } else if !has_imag_version_in_main_section(t)? {
Err(SE::from_kind(SEK::MissingVersionInfo)) Err(SE::from_kind(SEK::MissingVersionInfo))
} else if !has_only_tables(t) { } else if !has_only_tables(t)? {
debug!("Could not verify that it only has tables in its base table"); debug!("Could not verify that it only has tables in its base table");
Err(SE::from_kind(SEK::NonTableInBaseTable)) Err(SE::from_kind(SEK::NonTableInBaseTable))
} else { } else {
@ -1115,31 +1111,28 @@ fn verify_header(t: &Table) -> Result<()> {
} }
} }
fn has_only_tables(t: &Table) -> bool { fn has_only_tables(t: &Value) -> Result<bool> {
debug!("Verifying that table has only tables"); debug!("Verifying that table has only tables");
t.iter().all(|(_, x)| is_match!(*x, Value::Table(_))) match *t {
Value::Table(ref tab) => Ok(tab.iter().all(|(_, x)| is_match!(*x, Value::Table(_)))),
_ => Err(SE::from_kind(SEK::HeaderTypeFailure)),
}
} }
fn has_main_section(t: &Table) -> bool { fn has_main_section(t: &Value) -> Result<bool> {
t.contains_key("imag") && is_match!(t.get("imag"), Some(&Value::Table(_))) t.read("imag")?
.ok_or(SE::from_kind(SEK::ConfigKeyMissingError("imag")))
.map(Value::is_table)
} }
fn has_imag_version_in_main_section(t: &Table) -> bool { fn has_imag_version_in_main_section(t: &Value) -> Result<bool> {
use semver::Version; use toml_query::read::TomlValueReadExt;
match *t.get("imag").unwrap() { t.read("imag.version")?
Value::Table(ref sec) => { .ok_or(SE::from_kind(SEK::ConfigKeyMissingError("imag.version")))?
sec.get("version") .as_str()
.and_then(|v| { .map(|s| ::semver::Version::parse(s).is_ok())
match *v { .ok_or(SE::from_kind(SEK::ConfigTypeError("imag.version", "String")))
Value::String(ref s) => Some(Version::parse(&s[..]).is_ok()),
_ => Some(false),
}
})
.unwrap_or(false)
}
_ => false,
}
} }
@ -1184,7 +1177,7 @@ mod test {
let mut map = BTreeMap::new(); let mut map = BTreeMap::new();
map.insert("imag".into(), Value::Table(BTreeMap::new())); map.insert("imag".into(), Value::Table(BTreeMap::new()));
assert!(!has_imag_version_in_main_section(&map)); assert!(has_imag_version_in_main_section(&map).is_err());
} }
#[test] #[test]
@ -1194,7 +1187,7 @@ mod test {
sub.insert("version".into(), Value::String("0.0.0".into())); sub.insert("version".into(), Value::String("0.0.0".into()));
map.insert("imag".into(), Value::Table(sub)); map.insert("imag".into(), Value::Table(sub));
assert!(has_imag_version_in_main_section(&map)); assert!(has_imag_version_in_main_section(&map)?);
} }
#[test] #[test]
@ -1204,7 +1197,7 @@ mod test {
sub.insert("version".into(), Value::Boolean(false)); sub.insert("version".into(), Value::Boolean(false));
map.insert("imag".into(), Value::Table(sub)); map.insert("imag".into(), Value::Table(sub));
assert!(!has_imag_version_in_main_section(&map)); assert!(has_imag_version_in_main_section(&map).is_err());
} }
#[test] #[test]