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

Building on stable too now.

Browse Source
This commit is contained in:
Jordan Petridis 2017-10-02 19:42:38 +03:00
parent 6b689f4635
commit fe7ef323c4
No known key found for this signature in database
GPG Key ID: CEABAD9F5683B9A6
1 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/index_feed.rs
View File

@ -6,7 +6,7 @@ use rss;
use reqwest; use reqwest;
use rayon::prelude::*; use rayon::prelude::*;
use std::sync::{Arc, Mutex}; use std::sync::{Arc, Mutex};
use schema; use schema;
use dbqueries; use dbqueries;
use feedparser; use feedparser;
@ -81,9 +81,13 @@ pub fn index_loop(db: SqliteConnection) -> Result<()> {
let mut f = fetch_feeds(m.clone())?; let mut f = fetch_feeds(m.clone())?;
f.par_iter_mut().for_each(|&mut (ref mut req, ref source)| { // f.par_iter_mut().for_each(|&mut (ref mut req, ref source)| {
complete_index_from_source(req, source, m.clone()).unwrap() // TODO: Once for_each is stable, uncomment above line and delete collect.
}); let _ : Vec<_> = f.par_iter_mut()
.map(|&mut (ref mut req, ref source)| {
complete_index_from_source(req, source, m.clone()).unwrap();
})
.collect();
Ok(()) Ok(())
} }
@ -253,9 +257,11 @@ mod tests {
"http://feeds.feedburner.com/linuxunplugged", "http://feeds.feedburner.com/linuxunplugged",
]; ];
inpt.iter().for_each(|feed| { inpt.iter().map(|feed| {
index_source(&db, &NewSource::new_with_uri(feed)).unwrap() index_source(&db, &NewSource::new_with_uri(feed)).unwrap()
}); })
.fold((), |(), _| ());
index_loop(db).unwrap(); index_loop(db).unwrap();
// index_loop takes oweneship of the dbconnection in order to create mutexes. // index_loop takes oweneship of the dbconnection in order to create mutexes.
@ -291,7 +297,7 @@ mod tests {
), ),
]; ];
urls.iter().for_each(|&(path, url)| { urls.iter().map(|&(path, url)| {
let tempdb = m.lock().unwrap(); let tempdb = m.lock().unwrap();
// Create and insert a Source into db // Create and insert a Source into db
let s = insert_return_source(&tempdb, url).unwrap(); let s = insert_return_source(&tempdb, url).unwrap();
@ -304,7 +310,8 @@ mod tests {
// Index the channel // Index the channel
complete_index(m.clone(), chan, &s).unwrap(); complete_index(m.clone(), chan, &s).unwrap();
}); })
.fold((), |(), _| ());
// Assert the index rows equal the controlled results // Assert the index rows equal the controlled results
let tempdb = m.lock().unwrap(); let tempdb = m.lock().unwrap();