matthiasbeyer/imag
1
0
Fork 0
Code Releases Activity

Refactor iflet into and_then().or_else()

Browse source
This commit is contained in:
Matthias Beyer 2016-10-13 14:38:33 +02:00
parent 3fe8ec5d33
commit da408f60fd
1 changed files with 7 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
libimagstore/src/store.rs
View file

@ -160,18 +160,16 @@ impl StoreEntry {
}
fn get_entry(&mut self) -> Result<Entry> {
let id = &self.id.clone();
if !self.is_borrowed() {
let file = self.file.get_file_content();
if let Err(err) = file {
if err.err_type() == SEK::FileNotFound {
Ok(Entry::new(self.id.clone()))
self.file
.get_file_content()
.and_then(|mut file| Entry::from_reader(id.clone(), &mut file))
.or_else(|err| if err.err_type() == SEK::FileNotFound {
Ok(Entry::new(id.clone()))
} else {
Err(err)
}
} else {
// TODO:
Entry::from_reader(self.id.clone(), &mut file.unwrap())
}
})
} else {
Err(SE::new(SEK::EntryAlreadyBorrowed, None))
}