matthiasbeyer/imag
1
0
Fork 0
Code Releases Activity

Refactor libimagentryannotation to fit new store iterator interface

Browse source
This commit is contained in:
Matthias Beyer 2018-04-30 17:28:54 +02:00
parent 40688a3c2d
commit 6f81d02445
2 changed files with 17 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/entry/libimagentryannotation/src/annotateable.rs
View file

@ -92,7 +92,7 @@ impl Annotateable for Entry {
fn annotations<'a>(&self, store: &'a Store) -> Result<AnnotationIter<'a>> {
self.get_internal_links()
.map_err(From::from)
.map(|iter| StoreIdIterator::new(Box::new(iter.map(|e| e.get_store_id().clone()))))
.map(|iter| StoreIdIterator::new(Box::new(iter.map(|e| e.get_store_id().clone()).map(Ok))))
.map(|i| AnnotationIter::new(i, store))
}

14
lib/entry/libimagentryannotation/src/iter.rs
View file

@ -24,6 +24,7 @@ use libimagstore::store::FileLockEntry;
use libimagstore::storeid::StoreIdIterator;
use error::Result;
use error::AnnotationError as AE;
use error::AnnotationErrorKind as AEK;
use error::ResultExt;
@ -43,8 +44,12 @@ impl<'a> Iterator for AnnotationIter<'a> {
fn next(&mut self) -> Option<Self::Item> {
loop {
match self.0.next().map(|id| self.1.get(id)) {
Some(Ok(Some(entry))) => {
match self.0.next() {
None => return None, // iterator consumed
Some(Err(e)) => return Some(Err(e).map_err(AE::from)),
Some(Ok(id)) => match self.1.get(id) {
Err(e) => return Some(Err(e).chain_err(|| AEK::StoreReadError)),
Ok(Some(entry)) => {
match entry.get_header().read_bool("annotation.is_annotation").chain_err(|| AEK::HeaderReadError) {
Ok(None) => continue, // not an annotation
Ok(Some(false)) => continue,
@ -52,9 +57,8 @@ impl<'a> Iterator for AnnotationIter<'a> {
Err(e) => return Some(Err(e)),
}
},
Some(Ok(None)) => continue,
Some(Err(e)) => return Some(Err(e).chain_err(|| AEK::StoreReadError)),
None => return None, // iterator consumed
Ok(None) => continue,
}
}
}
}