toxblh/podcasts
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Lazy_load: Use IntoIterator for T, instead of Iterator.

Browse Source
This commit is contained in:
Jordan Petridis 2018-04-06 22:56:44 +03:00
parent c79a92f3b2
commit 854581f0bf
No known key found for this signature in database
GPG Key ID: CEABAD9F5683B9A6
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
hammond-gtk/src/widgets/episode.rs
View File

@ -383,7 +383,7 @@ pub fn episodes_listbox(pd: Arc<Podcast>, sender: Sender<Action>) -> Result<gtk:
Err(Disconnected) => return glib::Continue(false), Err(Disconnected) => return glib::Continue(false),
}; };
lazy_load(episodes.into_iter(), list.clone(), clone!(sender => move |ep| { lazy_load(episodes, list.clone(), clone!(sender => move |ep| {
let w = EpisodeWidget::new(ep, sender.clone()); let w = EpisodeWidget::new(ep, sender.clone());
w.container.clone() w.container.clone()
})); }));
@ -396,21 +396,19 @@ pub fn episodes_listbox(pd: Arc<Podcast>, sender: Sender<Action>) -> Result<gtk:
use gtk::{IsA, Widget}; use gtk::{IsA, Widget};
fn lazy_load<T, U, P, Z>(mut data: T, container: Z, mut predicate: P) fn lazy_load<T, U, P, Z>(data: T, container: Z, mut predicate: P)
where where
T: Iterator + 'static, T: IntoIterator + 'static,
T::Item: 'static, T::Item: 'static,
Z: ContainerExt + 'static, Z: ContainerExt + 'static,
P: FnMut(T::Item) -> U + 'static, P: FnMut(T::Item) -> U + 'static,
U: IsA<Widget>, U: IsA<Widget>,
{ {
let mut data = data.into_iter();
gtk::idle_add(move || { gtk::idle_add(move || {
data.next() data.next()
.and_then(|x| { .map(|x| container.add(&predicate(x)))
container.add(&predicate(x)); .map(|_| glib::Continue(true))
Some(glib::Continue(true)) .unwrap_or(glib::Continue(false))
})
.or(Some(glib::Continue(false)))
.unwrap()
}); });
} }