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

Convert Feed struct-tuple into a plain struct.

Browse Source
This commit is contained in:
Jordan Petridis 2017-11-17 16:24:48 +02:00
parent 3d108d4a7a
commit 2152aa9034
No known key found for this signature in database
GPG Key ID: CEABAD9F5683B9A6
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -13,7 +13,10 @@ use std::sync::{Arc, Mutex};
pub type Database = Arc<Mutex<SqliteConnection>>; pub type Database = Arc<Mutex<SqliteConnection>>;
#[derive(Debug)] #[derive(Debug)]
pub struct Feed(rss::Channel, Source); pub struct Feed {
channel: rss::Channel,
source: Source,
}
impl Feed { impl Feed {
pub fn new_from_source(db: &Database, s: Source) -> Result<Feed> { pub fn new_from_source(db: &Database, s: Source) -> Result<Feed> {
@ -21,7 +24,10 @@ impl Feed {
} }
pub fn new_from_channel_source(chan: rss::Channel, s: Source) -> Feed { pub fn new_from_channel_source(chan: rss::Channel, s: Source) -> Feed {
Feed(chan, s) Feed {
channel: chan,
source: s,
}
} }
fn index(&self, db: &Database) -> Result<()> { fn index(&self, db: &Database) -> Result<()> {
@ -34,13 +40,13 @@ impl Feed {
} }
fn index_channel(&self, con: &SqliteConnection) -> Result<Podcast> { fn index_channel(&self, con: &SqliteConnection) -> Result<Podcast> {
let pd = feedparser::parse_podcast(&self.0, self.1.id()); let pd = feedparser::parse_podcast(&self.channel, self.source.id());
// Convert NewPodcast to Podcast // Convert NewPodcast to Podcast
insert_return_podcast(con, &pd) insert_return_podcast(con, &pd)
} }
fn index_channel_items(&self, db: &Database, pd: &Podcast) -> Result<()> { fn index_channel_items(&self, db: &Database, pd: &Podcast) -> Result<()> {
let it = self.0.items(); let it = self.channel.items();
let episodes: Vec<_> = it.par_iter() let episodes: Vec<_> = it.par_iter()
.map(|x| feedparser::parse_episode(x, pd.id())) .map(|x| feedparser::parse_episode(x, pd.id()))
.collect(); .collect();