matthiasbeyer/imag
1
0
Fork 0
Code Releases Activity

Fix libimagentryannotation for changes in libimagnotes

Browse source
This commit is contained in:
Matthias Beyer 2017-09-15 12:52:03 +02:00
parent cefe58ffd4
commit 5271255ae3
1 changed files with 19 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
lib/entry/libimagentryannotation/src/annotation_fetcher.rs
View file

@ -20,8 +20,8 @@
use libimagstore::store::Entry; use libimagstore::store::Entry;
use libimagstore::store::Store; use libimagstore::store::Store;
use libimagentrylink::internal::InternalLinker; use libimagentrylink::internal::InternalLinker;
use libimagnotes::note::Note; use libimagnotes::notestore::NoteStore;
use libimagnotes::note::NoteIterator; use libimagnotes::iter::NoteIterator;
use libimagstore::storeid::StoreIdIterator; use libimagstore::storeid::StoreIdIterator;
use error::Result; use error::Result;
@ -43,8 +43,8 @@ impl<'a> AnnotationFetcher<'a> for Store {
/// Wrapper around `Note::all_notes()` of `libimagnotes` which filters out normal notes and /// Wrapper around `Note::all_notes()` of `libimagnotes` which filters out normal notes and
/// leaves only annotations in the iterator. /// leaves only annotations in the iterator.
fn all_annotations(&'a self) -> Result<AnnotationIter<'a>> { fn all_annotations(&'a self) -> Result<AnnotationIter<'a>> {
Note::all_notes(self) NoteStore::all_notes(self)
.map(|iter| AnnotationIter::new(iter)) .map(|iter| AnnotationIter::new(iter, self))
.chain_err(|| AEK::StoreReadError) .chain_err(|| AEK::StoreReadError)
} }
@ -59,8 +59,8 @@ impl<'a> AnnotationFetcher<'a> for Store {
entry.get_internal_links() entry.get_internal_links()
.chain_err(|| AEK::StoreReadError) .chain_err(|| AEK::StoreReadError)
.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(|iter| NoteIterator::new(self, iter)) .map(NoteIterator::new)
.map(|iter| AnnotationIter::new(iter)) .map(|i| AnnotationIter::new(i, self))
} }
} }
@ -70,8 +70,9 @@ pub mod iter {
use toml_query::read::TomlValueReadExt; use toml_query::read::TomlValueReadExt;
use libimagnotes::note::Note; use libimagnotes::iter::NoteIterator;
use libimagnotes::note::NoteIterator; use libimagstore::store::Store;
use libimagstore::store::FileLockEntry;
use error::Result; use error::Result;
use error::AnnotationErrorKind as AEK; use error::AnnotationErrorKind as AEK;
@ -79,23 +80,23 @@ pub mod iter {
use error::ResultExt; use error::ResultExt;
#[derive(Debug)] #[derive(Debug)]
pub struct AnnotationIter<'a>(NoteIterator<'a>); pub struct AnnotationIter<'a>(NoteIterator, &'a Store);
impl<'a> AnnotationIter<'a> { impl<'a> AnnotationIter<'a> {
pub fn new(noteiter: NoteIterator<'a>) -> AnnotationIter<'a> { pub fn new(noteiter: NoteIterator, store: &'a Store) -> AnnotationIter<'a> {
AnnotationIter(noteiter) AnnotationIter(noteiter, store)
} }
} }
impl<'a> Iterator for AnnotationIter<'a> { impl<'a> Iterator for AnnotationIter<'a> {
type Item = Result<Note<'a>>; type Item = Result<FileLockEntry<'a>>;
fn next(&mut self) -> Option<Result<Note<'a>>> { fn next(&mut self) -> Option<Self::Item> {
loop { loop {
match self.0.next() { match self.0.next().map(|id| self.1.get(id)) {
Some(Ok(note)) => { Some(Ok(Some(note))) => {
match note.get_header().read("annotation.is_annotation") { match note.get_header().read("annotation.is_annotation") {
Ok(None) => continue, // not an annotation Ok(None) => continue, // not an annotation
Ok(Some(&Value::Boolean(true))) => return Some(Ok(note)), Ok(Some(&Value::Boolean(true))) => return Some(Ok(note)),
@ -103,6 +104,7 @@ pub mod iter {
Err(e) => return Some(Err(e).chain_err(|| AEK::HeaderReadError)), Err(e) => return Some(Err(e).chain_err(|| AEK::HeaderReadError)),
} }
}, },
Some(Ok(None)) => continue,
Some(Err(e)) => return Some(Err(e).chain_err(|| AEK::StoreReadError)), Some(Err(e)) => return Some(Err(e).chain_err(|| AEK::StoreReadError)),
None => return None, // iterator consumed None => return None, // iterator consumed
} }