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

Pipeline: avoid panicking by checking the lenght and returning an error.

Browse Source
This commit is contained in:
Jordan Petridis 2018-01-26 14:17:43 +02:00
parent 2912bad110
commit df85a4ea9e
No known key found for this signature in database
GPG Key ID: CEABAD9F5683B9A6
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -44,9 +44,6 @@ macro_rules! clone {
/// Messy temp diagram: /// Messy temp diagram:
/// Source -> GET Request -> Update Etags -> Check Status -> Parse xml/Rss -> /// Source -> GET Request -> Update Etags -> Check Status -> Parse xml/Rss ->
/// Convert `rss::Channel` into Feed -> Index Podcast -> Index Episodes. /// Convert `rss::Channel` into Feed -> Index Podcast -> Index Episodes.
///
/// # Panics
/// If `sources` contains no Items.
pub fn pipeline<S: IntoIterator<Item = Source>>( pub fn pipeline<S: IntoIterator<Item = Source>>(
sources: S, sources: S,
ignore_etags: bool, ignore_etags: bool,
@ -61,7 +58,10 @@ pub fn pipeline<S: IntoIterator<Item = Source>>(
.map(|fut| fut.map(|_| ()).map_err(|err| error!("Error: {}", err))) .map(|fut| fut.map(|_| ()).map_err(|err| error!("Error: {}", err)))
.collect(); .collect();
assert!(!list.is_empty()); if list.is_empty() {
bail!("No futures were found to run.");
}
// Thats not really concurrent yet I think. // Thats not really concurrent yet I think.
tokio_core.run(collect_futures(list))?; tokio_core.run(collect_futures(list))?;
@ -69,7 +69,11 @@ pub fn pipeline<S: IntoIterator<Item = Source>>(
} }
/// Creates a tokio-core, a cpu_pool, and a hyper::Client and runs the pipeline. /// Creates a tokio-core, a cpu_pool, and a hyper::Client and runs the pipeline.
pub fn run<S: IntoIterator<Item = Source>>(sources: S, ignore_etags: bool) -> Result<()> { pub fn run(sources: Vec<Source>, ignore_etags: bool) -> Result<()> {
if sources.is_empty() {
return Ok(());
}
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();