matthiasbeyer/imag
1
0
Fork 0
Code Releases Activity

Rewrite FilterUnlinkedIter to a FilterLessThanIter

Browse source
This commit is contained in:
Matthias Beyer 2016-10-17 13:49:56 +02:00
parent 1e008f26a2
commit c55ad42e59
1 changed files with 20 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
libimagentrylink/src/internal.rs
View file

@ -125,9 +125,13 @@ pub mod iter {
DeleteUnlinkedIter(self) DeleteUnlinkedIter(self)
} }
/// Turn this iterator into a FilterUnlinkedIter, which filters out the unlinked entries. /// Turn this iterator into a FilterLessThanIter, which filters out the unlinked entries.
pub fn without_unlinked(self) -> FilterUnlinkedIter<'a> { pub fn without_unlinked(self) -> FilterLessThanIter<'a> {
FilterUnlinkedIter(self) FilterLessThanIter(self, 1)
}
pub fn with_less_than_n_links(self, n: usize) -> FilterLessThanIter<'a> {
FilterLessThanIter(self, n)
} }
pub fn store(&self) -> &Store { pub fn store(&self) -> &Store {
@ -148,11 +152,20 @@ pub mod iter {
} }
/// An iterator that removes all Items from the iterator that are not linked anymore. /// An iterator that removes all Items from the iterator that have `less than` `N` links.
/// This does _not_ `Store::delete()` anything. /// This does _not_ `Store::delete()` anything.
pub struct FilterUnlinkedIter<'a>(GetIter<'a>); pub struct FilterLessThanIter<'a>(GetIter<'a>, usize);
impl<'a> Iterator for FilterUnlinkedIter<'a> { impl<'a> FilterLessThanIter<'a> {
/// Create a new `FilterNLinksIter` iterator that filters out all entries that have LESS
/// THAN N links
pub fn new(gi: GetIter<'a>, n: usize) -> FilterNLinksIter<'a> {
FilterNLinksIter(gi, n)
}
}
impl<'a> Iterator for FilterLessThanIter<'a> {
type Item = Result<FileLockEntry<'a>>; type Item = Result<FileLockEntry<'a>>;
fn next(&mut self) -> Option<Self::Item> { fn next(&mut self) -> Option<Self::Item> {
@ -166,7 +179,7 @@ pub mod iter {
Err(e) => return Some(Err(e)), Err(e) => return Some(Err(e)),
Ok(links) => links, Ok(links) => links,
}; };
if links.count() == 0 { if links.count() > self.1 {
continue; continue;
} else { } else {
return Some(Ok(fle)); return Some(Ok(fle));
@ -181,7 +194,6 @@ pub mod iter {
} }
/// An iterator that removes all Items from the iterator that are not linked anymore by calling /// An iterator that removes all Items from the iterator that are not linked anymore by calling
/// `Store::delete()` on them. /// `Store::delete()` on them.
/// ///