Add iterator for contacts
This commit is contained in:
parent
b05c8c6f6d
commit
4fa41faa59
3 changed files with 77 additions and 0 deletions
|
@ -17,6 +17,8 @@
|
|||
// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
//
|
||||
|
||||
use libimagstore::storeid::StoreId;
|
||||
|
||||
error_chain! {
|
||||
types {
|
||||
ContactError, ContactErrorKind, ResultExt, Result;
|
||||
|
@ -40,6 +42,11 @@ error_chain! {
|
|||
display("Type error in header, expected {} at '{}', found other type", ty, loc)
|
||||
}
|
||||
|
||||
EntryNotFound(sid: StoreId) {
|
||||
description("Entry not found with StoreId")
|
||||
display("Entry {:?} not found", sid)
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
|
|
69
lib/domain/libimagcontact/src/iter.rs
Normal file
69
lib/domain/libimagcontact/src/iter.rs
Normal file
|
@ -0,0 +1,69 @@
|
|||
//
|
||||
// imag - the personal information management suite for the commandline
|
||||
// Copyright (C) 2015, 2016 Matthias Beyer <mail@beyermatthias.de> and contributors
|
||||
//
|
||||
// This library is free software; you can redistribute it and/or
|
||||
// modify it under the terms of the GNU Lesser General Public
|
||||
// License as published by the Free Software Foundation; version
|
||||
// 2.1 of the License.
|
||||
//
|
||||
// This library is distributed in the hope that it will be useful,
|
||||
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
// Lesser General Public License for more details.
|
||||
//
|
||||
// You should have received a copy of the GNU Lesser General Public
|
||||
// License along with this library; if not, write to the Free Software
|
||||
// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
//
|
||||
|
||||
use libimagstore::storeid::StoreIdIterator;
|
||||
use libimagstore::store::Store;
|
||||
use libimagstore::store::FileLockEntry;
|
||||
|
||||
use contact::Contact;
|
||||
use error::ContactError as CE;
|
||||
use error::ContactErrorKind as CEK;
|
||||
use error::Result;
|
||||
|
||||
pub struct ContactIter<'a>(StoreIdIterator, &'a Store);
|
||||
|
||||
/// Iterator over contacts
|
||||
///
|
||||
/// As the libimagcontact works with libimagentryref in the backend, we must hold a reference to the
|
||||
/// Store here as well, so we can check whether a fetched StoreId actually points to a contact
|
||||
/// reference or not.
|
||||
///
|
||||
/// So, the Iterator `Store::get()`s the object pointed to by the StoreId and returns it if
|
||||
/// everything worked.
|
||||
impl<'a> ContactIter<'a> {
|
||||
|
||||
pub fn new(sii: StoreIdIterator, store: &'a Store) -> ContactIter<'a> {
|
||||
ContactIter(sii, store)
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
impl<'a> Iterator for ContactIter<'a> {
|
||||
type Item = Result<FileLockEntry<'a>>;
|
||||
|
||||
fn next(&mut self) -> Option<Self::Item> {
|
||||
loop {
|
||||
match self.0.next() {
|
||||
None => return None,
|
||||
Some(sid) => match self.1.get(sid.clone()).map_err(From::from) {
|
||||
Err(e) => return Some(Err(e)),
|
||||
Ok(None) => return Some(Err(CE::from_kind(CEK::EntryNotFound(sid)))),
|
||||
Ok(Some(entry)) => match entry.is_contact().map_err(From::from) {
|
||||
Ok(true) => return Some(Ok(entry)),
|
||||
Ok(false) => continue,
|
||||
Err(e) => return Some(Err(e)),
|
||||
},
|
||||
|
||||
},
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -47,6 +47,7 @@ module_entry_path_mod!("contact");
|
|||
|
||||
pub mod contact;
|
||||
pub mod error;
|
||||
pub mod iter;
|
||||
pub mod store;
|
||||
mod util;
|
||||
|
||||
|
|
Loading…
Reference in a new issue