matthiasbeyer/imag
1
0
Fork 0
Code Releases Activity

Refactor: File::from_parser_result() shouldnt do error handling, do this in calling code

Browse source
This commit is contained in:
Matthias Beyer 2015-11-24 16:34:03 +01:00
parent b6af948c0e
commit 1b1f0678cb
2 changed files with 13 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/storage/backend.rs
View file

@ -128,7 +128,14 @@ impl StorageBackend {
if let Ok(file) = FSFile::open(path) {
let mut s = String::new();
file.read_to_string(&mut s);
File::from_parser_result(id, p.read(s))
let parser_out = p.read(s);
if let Ok((header, data)) = parser_out {
Some(File::from_parser_result(id, header, data))
} else {
info!("Cannot build File from ID '{}'. Parser Error:\n{}",
id, parser_out.err().unwrap());
None
}
} else {
None
}

14
src/storage/file.rs
View file

@ -185,15 +185,11 @@ impl File {
}
}
pub fn from_parser_result(id: FileID, r: Result<(FileHeaderData, String), ParserError>) -> Option<File> {
if let Ok((header, data)) = r {
Some(File {
header: header,
data: data,
id: id,
})
} else {
None
pub fn from_parser_result(id: FileID, header: FileHeaderData, data: String) -> File {
File {
header: header,
data: data,
id: id,
}
}