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

Pipeline: Fix a panic if the list of futures was 0.

Browse Source
This commit is contained in:
Jordan Petridis 2018-01-23 19:07:11 +02:00
parent f9096e5fac
commit 457e43978f
No known key found for this signature in database
GPG Key ID: CEABAD9F5683B9A6
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
hammond-data/src/pipeline.rs
View File

@ -45,7 +45,6 @@ macro_rules! clone {
/// Convert `rss::Channel` into Feed -> Index Podcast -> Index Episodes. /// Convert `rss::Channel` into Feed -> Index Podcast -> Index Episodes.
pub fn pipeline<S: IntoIterator<Item = Source>>(sources: S, ignore_etags: bool) -> Result<()> { pub fn pipeline<S: IntoIterator<Item = Source>>(sources: S, ignore_etags: bool) -> Result<()> {
let pool = CpuPool::new_num_cpus(); let pool = CpuPool::new_num_cpus();
let mut core = Core::new()?; let mut core = Core::new()?;
let handle = core.handle(); let handle = core.handle();
let client = Client::configure() let client = Client::configure()
@ -53,15 +52,19 @@ pub fn pipeline<S: IntoIterator<Item = Source>>(sources: S, ignore_etags: bool)
.connector(HttpsConnector::new(4, &handle)?) .connector(HttpsConnector::new(4, &handle)?)
.build(&handle); .build(&handle);
let list = sources let list: Vec<_> = sources
.into_iter() .into_iter()
.map(clone!(pool => move |s| s.into_feed(&client, pool.clone(), ignore_etags))) .map(clone!(pool => move |s| s.into_feed(&client, pool.clone(), ignore_etags)))
.map(|fut| fut.and_then(clone!(pool => move |feed| pool.clone().spawn(feed.index())))) .map(|fut| fut.and_then(clone!(pool => move |feed| pool.clone().spawn(feed.index()))))
.map(|fut| fut.map(|_| ()).map_err(|err| error!("Error: {}", err))) .map(|fut| fut.map(|_| ()).map_err(|err| error!("Error: {}", err)))
.collect(); .collect();
// Thats not really concurrent yet I think. // TODO: this could be moved at the start of the function.
core.run(collect_futures(list))?; if !list.is_empty() {
// Thats not really concurrent yet I think.
core.run(collect_futures(list))?;
}
Ok(()) Ok(())
} }