matthiasbeyer/imag
1
0
Fork 0
Code Releases Activity

Add verify

Browse source
This commit is contained in:
Marcel Müller 2016-02-06 18:50:39 +01:00
parent e079628397
commit 293fd0da00
No known key found for this signature in database
GPG key ID: DD4ED37D0CAC76E2
1 changed files with 16 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
libimagstore/src/store.rs
View file

@ -186,6 +186,8 @@ impl Store {
assert!(se.is_borrowed(), "Tried to update a non borrowed entry."); assert!(se.is_borrowed(), "Tried to update a non borrowed entry.");
try!(entry.entry.verify());
try!(se.write_entry(&entry.entry)); try!(se.write_entry(&entry.entry));
se.status = StoreEntryStatus::Present; se.status = StoreEntryStatus::Present;
@ -324,6 +326,16 @@ impl EntryHeader {
.map(EntryHeader::from_table) .map(EntryHeader::from_table)
} }
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(())
}
}
} }
fn build_default_header() -> BTreeMap<String, Value> { fn build_default_header() -> BTreeMap<String, Value> {
@ -470,6 +482,10 @@ impl Entry {
&mut self.content &mut self.content
} }
pub fn verify(&self) -> Result<()> {
self.header.verify()
}
} }