matthiasbeyer/imag
1
0
Fork 0
Code Releases Activity

Move header verifying into helper function

Browse source
This commit is contained in:
Matthias Beyer 2016-01-18 19:46:12 +01:00
parent 2a4f3baf0b
commit 9884f78dae
1 changed files with 12 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
libimagstore/src/header.rs
View file

@ -112,20 +112,22 @@ impl EntryHeader {
let mut parser = Parser::new(s);
parser.parse()
.ok_or(ParserError::new(ParserErrorKind::TOMLParserErrors, None))
.and_then(|table| {
if !has_main_section(&table) {
Err(ParserError::new(ParserErrorKind::MissingMainSection, None))
} else if !has_imag_version_in_main_section(&table) {
Err(ParserError::new(ParserErrorKind::MissingVersionInfo, None))
} else {
Ok(table)
}
})
.map(|table| EntryHeader::new(table))
.and_then(|t| verify_header_consistency(t))
.map(|t| EntryHeader::new(t))
}
}
fn verify_header_consistency(t: Table) -> Result<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))
} else {
Ok(t)
}
}
fn has_main_section(t: &Table) -> bool {
t.contains_key("imag") &&
match t.get("imag") {