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

Minor cleanup.

Browse Source
This commit is contained in:
Jordan Petridis 2017-11-24 19:28:34 +02:00
parent 91f4a30c01
commit f7f0a16858
No known key found for this signature in database
GPG Key ID: CEABAD9F5683B9A6
1 changed files with 11 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
hammond-data/src/feed.rs
View File

@ -31,9 +31,7 @@ impl Feed {
pub fn index(&self) -> Result<()> { pub fn index(&self) -> Result<()> {
let pd = self.get_podcast()?; let pd = self.get_podcast()?;
self.index_channel_items(&pd)
self.index_channel_items(&pd)?;
Ok(())
} }
// #[allow(dead_code)] // #[allow(dead_code)]
@ -52,7 +50,7 @@ impl Feed {
episodes.into_iter().for_each(|x| { episodes.into_iter().for_each(|x| {
let e = x.index(&con); let e = x.index(&con);
if let Err(err) = e { if let Err(err) = e {
error!("Failed to index episode: {:?}.", x); error!("Failed to index episode: {:?}.", x.title);
error!("Error msg: {}", err); error!("Error msg: {}", err);
}; };
}); });
@ -87,21 +85,23 @@ impl Feed {
let db = connection(); let db = connection();
let con = db.get().unwrap(); let con = db.get().unwrap();
// TODO: Make it parallel // TODO: Make it parallel
// This returns only the episodes in the xml feed.
let episodes: Vec<_> = eps.into_iter() let episodes: Vec<_> = eps.into_iter()
.filter_map(|ep| ep.into_episode(&con).ok()) .filter_map(|ep| ep.into_episode(&con).ok())
.collect(); .collect();
Ok(episodes) Ok(episodes)
// This would return every episode of the feed from the db.
// self.index_channel_items(&pd)?; // self.index_channel_items(&pd)?;
// Ok(dbqueries::get_pd_episodes(&pd)?) // Ok(dbqueries::get_pd_episodes(&pd)?)
} }
} }
pub fn index_all() -> Result<()> { pub fn index_all() -> Result<()> {
let mut f = fetch_all()?; let mut feeds = fetch_all()?;
index(&mut f); index(&mut feeds);
Ok(()) Ok(())
} }
@ -118,9 +118,7 @@ pub fn index(feeds: &mut [Feed]) {
pub fn fetch_all() -> Result<Vec<Feed>> { pub fn fetch_all() -> Result<Vec<Feed>> {
let feeds = dbqueries::get_sources()?; let feeds = dbqueries::get_sources()?;
Ok(fetch(feeds))
let results = fetch(feeds);
Ok(results)
} }
pub fn fetch(feeds: Vec<Source>) -> Vec<Feed> { pub fn fetch(feeds: Vec<Source>) -> Vec<Feed> {
@ -128,14 +126,11 @@ pub fn fetch(feeds: Vec<Source>) -> Vec<Feed> {
.into_par_iter() .into_par_iter()
.filter_map(|x| { .filter_map(|x| {
let uri = x.uri().to_owned(); let uri = x.uri().to_owned();
let l = Feed::from_source(x); let feed = Feed::from_source(x).ok();
if l.is_ok() { if feed.is_none() {
l.ok() error!("Error While trying to fetch from source url: {}.", uri);
} else {
error!("Error While trying to fetch from source: {}.", uri);
error!("Error msg: {}", l.unwrap_err());
None
} }
feed
}) })
.collect(); .collect();