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

Compare fields before indexing.

Browse Source
This commit is contained in:
Jordan Petridis 2017-09-23 11:24:54 +03:00
parent a3e47effb4
commit b2ac9685ff
No known key found for this signature in database
GPG Key ID: CEABAD9F5683B9A6
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/feedparser.rs
View File

@ -61,7 +61,7 @@ pub fn parse_episode<'a>(item: &'a Item, parent_id: i32) -> Result<models::NewEp
Ok(bar) => bar.timestamp() as i32, Ok(bar) => bar.timestamp() as i32,
Err(baz) => { Err(baz) => {
error!("Error while trying to parse \"{}\" as date.", foo); error!("Error while trying to parse \"{}\" as date.", foo);
error!("{}", baz); error!("Error: {}", baz);
debug!("Falling back to default 0"); debug!("Falling back to default 0");
0 0
} }
@ -344,7 +344,9 @@ mod tests {
assert_eq!(i.length, Some(15077388)); assert_eq!(i.length, Some(15077388));
assert_eq!( assert_eq!(
i.guid, i.guid,
Some("https://request-for-explanation.github.io/podcast/ep9-a-once-in-a-lifetime-rfc/",) Some(
"https://request-for-explanation.github.io/podcast/ep9-a-once-in-a-lifetime-rfc/",
)
); );
assert_eq!(i.published_date, Some("Mon, 28 Aug 2017 15:00:00 PDT")); assert_eq!(i.published_date, Some("Mon, 28 Aug 2017 15:00:00 PDT"));
// Need to fix datetime parser first // Need to fix datetime parser first

10
src/index_feed.rs
View File

@ -59,13 +59,12 @@ fn index_podcast(
let pd = feedparser::parse_podcast(channel, parent.id())?; let pd = feedparser::parse_podcast(channel, parent.id())?;
match dbqueries::load_podcast(con, &pd.title) { match dbqueries::load_podcast(con, &pd.title) {
Ok(mut foo) => { Ok(mut foo) => if foo.link() != pd.link || foo.description() != pd.description {
// TODO: Cmp first before replacing
foo.set_link(&pd.link); foo.set_link(&pd.link);
foo.set_description(&pd.description); foo.set_description(&pd.description);
foo.set_image_uri(pd.image_uri.as_ref().map(|s| s.as_str())); foo.set_image_uri(pd.image_uri.as_ref().map(|s| s.as_str()));
foo.save_changes::<Podcast>(con)?; foo.save_changes::<Podcast>(con)?;
} },
Err(_) => { Err(_) => {
diesel::insert(&pd) diesel::insert(&pd)
.into(schema::podcast::table) .into(schema::podcast::table)
@ -80,8 +79,7 @@ fn index_episode(con: &SqliteConnection, item: &rss::Item, parent: &Podcast) ->
let ep = feedparser::parse_episode(item, parent.id())?; let ep = feedparser::parse_episode(item, parent.id())?;
match dbqueries::load_episode(con, &ep.uri.unwrap()) { match dbqueries::load_episode(con, &ep.uri.unwrap()) {
Ok(mut foo) => { Ok(mut foo) => if foo.title() != ep.title || foo.published_date() != ep.published_date {
// TODO: Cmp first before replacing
foo.set_title(ep.title); foo.set_title(ep.title);
foo.set_description(ep.description); foo.set_description(ep.description);
foo.set_published_date(ep.published_date); foo.set_published_date(ep.published_date);
@ -89,7 +87,7 @@ fn index_episode(con: &SqliteConnection, item: &rss::Item, parent: &Podcast) ->
foo.set_length(ep.length); foo.set_length(ep.length);
foo.set_epoch(ep.epoch); foo.set_epoch(ep.epoch);
foo.save_changes::<Episode>(con)?; foo.save_changes::<Episode>(con)?;
} },
Err(_) => { Err(_) => {
diesel::insert(&ep) diesel::insert(&ep)
.into(schema::episode::table) .into(schema::episode::table)