matthiasbeyer/imag
1
0
Fork 0
Code Releases Activity

Outsource iterator in iter module

Browse source
This commit is contained in:
Matthias Beyer 2018-04-26 11:31:01 +02:00
parent ab15d89e64
commit 9fc9e7fe17
3 changed files with 79 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

77
lib/entry/libimagentrycategory/src/iter.rs Normal file
View file

@ -0,0 +1,77 @@
//
// imag - the personal information management suite for the commandline
// Copyright (C) 2015-2018 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 error::Result;
use error::CategoryError as CE;
use error::CategoryErrorKind as CEK;
use store::CATEGORY_REGISTER_NAME_FIELD_PATH;
/// Iterator for Category names
///
/// Iterates over Result<Category>
///
/// # Return values
///
/// In each iteration, a Option<Result<Category>> is returned. Error kinds are as follows:
///
/// * CategoryErrorKind::StoreReadError if a name could not be fetched from the store
/// * CategoryErrorKind::HeaderReadError if the header of the fetched item couldn't be read
/// * CategoryErrorKind::TypeError if the name could not be fetched because it is not a String
///
pub struct CategoryNameIter<'a>(&'a Store, StoreIdIterator);
impl<'a> CategoryNameIter<'a> {
fn new(store: &'a Store, sidit: StoreIdIterator) -> CategoryNameIter<'a> {
CategoryNameIter(store, sidit)
}
}
impl<'a> Iterator for CategoryNameIter<'a> {
type Item = Result<Category>;
fn next(&mut self) -> Option<Self::Item> {
// TODO: Optimize me with lazy_static
let query = CATEGORY_REGISTER_NAME_FIELD_PATH;
while let Some(sid) = self.1.next() {
if sid.is_in_collection(&["category"]) {
let func = |store: &Store| { // hack for returning Some(Result<_, _>)
store
.get(sid)?
.ok_or_else(|| CE::from_kind(CEK::StoreReadError))?
.get_header()
.read_string(query)
.chain_err(|| CEK::HeaderReadError)?
.map(Category::from)
.ok_or_else(|| CE::from_kind(CEK::StoreReadError))
};
return Some(func(&self.0))
} // else continue
}
None
}
}

1
lib/entry/libimagentrycategory/src/lib.rs
View file

@ -51,6 +51,7 @@ pub mod category;
pub mod entry;
pub mod error;
pub mod store;
pub mod iter;
module_entry_path_mod!("category");

51
lib/entry/libimagentrycategory/src/store.rs
View file

@ -33,6 +33,7 @@ use error::CategoryErrorKind as CEK;
use error::CategoryError as CE;
use error::ResultExt;
use error::Result;
use iter::CategoryNameIter;
pub const CATEGORY_REGISTER_NAME_FIELD_PATH : &'static str = "category.register.name";
@ -221,53 +222,3 @@ fn represents_category(store: &Store, sid: StoreId, name: &str) -> Result<bool>
})
}
/// Iterator for Category names
///
/// Iterates over Result<Category>
///
/// # Return values
///
/// In each iteration, a Option<Result<Category>> is returned. Error kinds are as follows:
///
/// * CategoryErrorKind::StoreReadError if a name could not be fetched from the store
/// * CategoryErrorKind::HeaderReadError if the header of the fetched item couldn't be read
/// * CategoryErrorKind::TypeError if the name could not be fetched because it is not a String
///
pub struct CategoryNameIter<'a>(&'a Store, StoreIdIterator);
impl<'a> CategoryNameIter<'a> {
fn new(store: &'a Store, sidit: StoreIdIterator) -> CategoryNameIter<'a> {
CategoryNameIter(store, sidit)
}
}
impl<'a> Iterator for CategoryNameIter<'a> {
type Item = Result<Category>;
fn next(&mut self) -> Option<Self::Item> {
// TODO: Optimize me with lazy_static
let query = CATEGORY_REGISTER_NAME_FIELD_PATH;
while let Some(sid) = self.1.next() {
if sid.is_in_collection(&["category"]) {
let func = |store: &Store| { // hack for returning Some(Result<_, _>)
store
.get(sid)?
.ok_or_else(|| CE::from_kind(CEK::StoreReadError))?
.get_header()
.read_string(query)
.chain_err(|| CEK::HeaderReadError)?
.map(Category::from)
.ok_or_else(|| CE::from_kind(CEK::StoreReadError))
};
return Some(func(&self.0))
} // else continue
}
None
}
}