matthiasbeyer/imag
1
0
Fork 0
Code Releases Activity

Verify that nothing but tables exist in base table

Browse source
This commit is contained in:
Marcel Müller 2016-02-06 19:26:00 +01:00
parent ece70d78a7
commit 6173cff762
No known key found for this signature in database
GPG key ID: DD4ED37D0CAC76E2
2 changed files with 24 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
libimagstore/src/error.rs
View file

@ -130,6 +130,8 @@ pub enum ParserErrorKind {
TOMLParserErrors,
MissingMainSection,
MissingVersionInfo,
NonTableInBaseTable,
HeaderInconsistency,
}
pub struct ParserError {
@ -173,6 +175,8 @@ impl Error for ParserError {
ParserErrorKind::TOMLParserErrors => "Several TOML-Parser-Errors",
ParserErrorKind::MissingMainSection => "Missing main section",
ParserErrorKind::MissingVersionInfo => "Missing version information in main section",
ParserErrorKind::NonTableInBaseTable => "A non-table was found in the base table",
ParserErrorKind::HeaderInconsistency => "The header is inconsistent",
}
}

31
libimagstore/src/store.rs
View file

@ -327,13 +327,7 @@ impl EntryHeader {
}
pub fn verify(&self) -> Result<()> {
if !has_main_section(&self.toml) {
Err(StoreError::from(ParserError::new(ParserErrorKind::MissingMainSection, None)))
} else if !has_imag_version_in_main_section(&self.toml) {
Err(StoreError::from(ParserError::new(ParserErrorKind::MissingVersionInfo, None)))
} else {
Ok(())
}
verify_header(&self.toml)
}
}
@ -352,17 +346,32 @@ fn build_default_header() -> BTreeMap<String, Value> {
m
}
fn verify_header(t: &Table) -> Result<()> {
if !has_main_section(t) {
Err(StoreError::from(ParserError::new(ParserErrorKind::MissingMainSection, None)))
} else if !has_imag_version_in_main_section(t) {
Err(StoreError::from(ParserError::new(ParserErrorKind::MissingVersionInfo, None)))
} else if !has_only_tables(t) {
debug!("Could not verify that it only has tables in its base table");
Err(StoreError::from(ParserError::new(ParserErrorKind::NonTableInBaseTable, None)))
} else {
Ok(())
}
}
fn verify_header_consistency(t: Table) -> EntryResult<Table> {
if !has_main_section(&t) {
Err(ParserError::new(ParserErrorKind::MissingMainSection, None))
} else if !has_imag_version_in_main_section(&t) {
Err(ParserError::new(ParserErrorKind::MissingVersionInfo, None))
use std::error::Error;
if let Err(e) = verify_header(&t) {
Err(ParserError::new(ParserErrorKind::HeaderInconsistency, None))
} else {
Ok(t)
}
}
fn has_only_tables(t: &Table) -> bool {
t.iter().all(|(_, x)| if let &Value::Table(_) = x { true } else { false })
}
fn has_main_section(t: &Table) -> bool {
t.contains_key("imag") &&
match t.get("imag") {