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

Refactored dbquerries.

Browse Source 
Refactored so dbquerries.rs module *should* be the only piece of code
that interacts with a Database connection. Insert stuff will be moved too.
This commit is contained in:
Jordan Petridis 2017-11-19 23:08:36 +02:00
parent 47b32ac000
commit beaeeffba8
No known key found for this signature in database
GPG Key ID: CEABAD9F5683B9A6
3 changed files with 65 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

113
hammond-data/src/dbqueries.rs
View File

@ -13,9 +13,7 @@ pub fn get_sources() -> QueryResult<Vec<Source>> {
use schema::source::dsl::*;
let con = POOL.clone().get().unwrap();
let s = source.load::<Source>(&*con);
// s.iter().for_each(|x| println!("{:#?}", x));
s
source.load::<Source>(&*con)
}
pub fn get_podcasts() -> QueryResult<Vec<Podcast>> {
@ -32,82 +30,88 @@ pub fn get_episodes() -> QueryResult<Vec<Episode>> {
episode.order(epoch.desc()).load::<Episode>(&*con)
}
pub fn get_downloaded_episodes(con: &SqliteConnection) -> QueryResult<Vec<Episode>> {
pub fn get_downloaded_episodes() -> QueryResult<Vec<Episode>> {
use schema::episode::dsl::*;
episode.filter(local_uri.is_not_null()).load::<Episode>(con)
let con = POOL.clone().get().unwrap();
episode
.filter(local_uri.is_not_null())
.load::<Episode>(&*con)
}
pub fn get_played_episodes(con: &SqliteConnection) -> QueryResult<Vec<Episode>> {
pub fn get_played_episodes() -> QueryResult<Vec<Episode>> {
use schema::episode::dsl::*;
episode.filter(played.is_not_null()).load::<Episode>(con)
let con = POOL.clone().get().unwrap();
episode.filter(played.is_not_null()).load::<Episode>(&*con)
}
pub fn get_episode_from_id(con: &SqliteConnection, ep_id: i32) -> QueryResult<Episode> {
pub fn get_episode_from_id(ep_id: i32) -> QueryResult<Episode> {
use schema::episode::dsl::*;
episode.filter(id.eq(ep_id)).get_result::<Episode>(con)
let con = POOL.clone().get().unwrap();
episode.filter(id.eq(ep_id)).get_result::<Episode>(&*con)
}
pub fn get_episode_local_uri_from_id(
con: &SqliteConnection,
ep_id: i32,
) -> QueryResult<Option<String>> {
pub fn get_episode_local_uri_from_id(ep_id: i32) -> QueryResult<Option<String>> {
use schema::episode::dsl::*;
let con = POOL.clone().get().unwrap();
episode
.filter(id.eq(ep_id))
.select(local_uri)
.get_result::<Option<String>>(con)
.get_result::<Option<String>>(&*con)
}
pub fn get_episodes_with_limit(con: &SqliteConnection, limit: u32) -> QueryResult<Vec<Episode>> {
pub fn get_episodes_with_limit(limit: u32) -> QueryResult<Vec<Episode>> {
use schema::episode::dsl::*;
let con = POOL.clone().get().unwrap();
episode
.order(epoch.desc())
.limit(i64::from(limit))
.load::<Episode>(con)
.load::<Episode>(&*con)
}
pub fn get_podcast_from_id(con: &SqliteConnection, pid: i32) -> QueryResult<Podcast> {
pub fn get_podcast_from_id(pid: i32) -> QueryResult<Podcast> {
use schema::podcast::dsl::*;
podcast.filter(id.eq(pid)).get_result::<Podcast>(con)
let con = POOL.clone().get().unwrap();
podcast.filter(id.eq(pid)).get_result::<Podcast>(&*con)
}
pub fn get_pd_episodes(con: &SqliteConnection, parent: &Podcast) -> QueryResult<Vec<Episode>> {
pub fn get_pd_episodes(parent: &Podcast) -> QueryResult<Vec<Episode>> {
use schema::episode::dsl::*;
let con = POOL.clone().get().unwrap();
Episode::belonging_to(parent)
.order(epoch.desc())
.load::<Episode>(con)
.load::<Episode>(&*con)
}
pub fn get_pd_unplayed_episodes(
con: &SqliteConnection,
parent: &Podcast,
) -> QueryResult<Vec<Episode>> {
pub fn get_pd_unplayed_episodes(parent: &Podcast) -> QueryResult<Vec<Episode>> {
use schema::episode::dsl::*;
let con = POOL.clone().get().unwrap();
Episode::belonging_to(parent)
.filter(played.is_null())
.order(epoch.desc())
.load::<Episode>(con)
.load::<Episode>(&*con)
}
pub fn get_pd_episodes_limit(
con: &SqliteConnection,
parent: &Podcast,
limit: u32,
) -> QueryResult<Vec<Episode>> {
pub fn get_pd_episodes_limit(parent: &Podcast, limit: u32) -> QueryResult<Vec<Episode>> {
use schema::episode::dsl::*;
let con = POOL.clone().get().unwrap();
Episode::belonging_to(parent)
.order(epoch.desc())
.limit(i64::from(limit))
.load::<Episode>(con)
.load::<Episode>(&*con)
}
pub fn get_source_from_uri(uri_: &str) -> QueryResult<Source> {
@ -117,59 +121,62 @@ pub fn get_source_from_uri(uri_: &str) -> QueryResult<Source> {
source.filter(uri.eq(uri_)).get_result::<Source>(&*con)
}
pub fn get_podcast_from_title(con: &SqliteConnection, title_: &str) -> QueryResult<Podcast> {
pub fn get_podcast_from_title(title_: &str) -> QueryResult<Podcast> {
use schema::podcast::dsl::*;
podcast.filter(title.eq(title_)).get_result::<Podcast>(con)
let con = POOL.clone().get().unwrap();
podcast
.filter(title.eq(title_))
.get_result::<Podcast>(&*con)
}
pub fn get_episode_from_uri(con: &SqliteConnection, uri_: &str) -> QueryResult<Episode> {
pub fn get_episode_from_uri(uri_: &str) -> QueryResult<Episode> {
use schema::episode::dsl::*;
episode.filter(uri.eq(uri_)).get_result::<Episode>(con)
let con = POOL.clone().get().unwrap();
episode.filter(uri.eq(uri_)).get_result::<Episode>(&*con)
}
pub fn remove_feed(pd: &Podcast) -> QueryResult<usize> {
let con = POOL.clone().get().unwrap();
con.transaction(|| -> QueryResult<usize> {
delete_source(&*con, pd.source_id())?;
delete_podcast(&*con, *pd.id())?;
delete_podcast_episodes(&*con, *pd.id())
delete_source(pd.source_id())?;
delete_podcast(*pd.id())?;
delete_podcast_episodes(*pd.id())
})
}
pub fn delete_source(connection: &SqliteConnection, source_id: i32) -> QueryResult<usize> {
pub fn delete_source(source_id: i32) -> QueryResult<usize> {
use schema::source::dsl::*;
diesel::delete(source.filter(id.eq(source_id))).execute(connection)
let con = POOL.clone().get().unwrap();
diesel::delete(source.filter(id.eq(source_id))).execute(&*con)
}
pub fn delete_podcast(connection: &SqliteConnection, podcast_id: i32) -> QueryResult<usize> {
pub fn delete_podcast(podcast_id: i32) -> QueryResult<usize> {
use schema::podcast::dsl::*;
diesel::delete(podcast.filter(id.eq(podcast_id))).execute(connection)
let con = POOL.clone().get().unwrap();
diesel::delete(podcast.filter(id.eq(podcast_id))).execute(&*con)
}
pub fn delete_podcast_episodes(
connection: &SqliteConnection,
parent_id: i32,
) -> QueryResult<usize> {
pub fn delete_podcast_episodes(parent_id: i32) -> QueryResult<usize> {
use schema::episode::dsl::*;
diesel::delete(episode.filter(podcast_id.eq(parent_id))).execute(connection)
let con = POOL.clone().get().unwrap();
diesel::delete(episode.filter(podcast_id.eq(parent_id))).execute(&*con)
}
pub fn update_none_to_played_now(
connection: &SqliteConnection,
parent: &Podcast,
) -> QueryResult<usize> {
pub fn update_none_to_played_now(parent: &Podcast) -> QueryResult<usize> {
use schema::episode::dsl::*;
let con = POOL.clone().get().unwrap();
let epoch_now = Utc::now().timestamp() as i32;
connection.transaction(|| -> QueryResult<usize> {
con.transaction(|| -> QueryResult<usize> {
diesel::update(Episode::belonging_to(parent).filter(played.is_null()))
.set(played.eq(Some(epoch_now)))
.execute(connection)
.execute(&*con)
})
}

10
hammond-data/src/models/insertables.rs
View File

@ -67,7 +67,7 @@ impl<'a> NewEpisode<'a> {
let ep = {
// let tempdb = db.lock().unwrap();
// dbqueries::get_episode_from_uri(&tempdb, self.uri.unwrap())
dbqueries::get_episode_from_uri(con, self.uri.unwrap())
dbqueries::get_episode_from_uri(self.uri.unwrap())
};
match ep {
@ -103,16 +103,12 @@ impl NewPodcast {
// Look out for when tryinto lands into stable.
pub fn into_podcast(self) -> Result<Podcast> {
self.index()?;
let tempdb = POOL.clone().get().unwrap();
Ok(dbqueries::get_podcast_from_title(&*tempdb, &self.title)?)
Ok(dbqueries::get_podcast_from_title(&self.title)?)
}
fn index(&self) -> QueryResult<()> {
use schema::podcast::dsl::*;
let pd = {
let tempdb = POOL.clone().get().unwrap();
dbqueries::get_podcast_from_title(&*tempdb, &self.title)
};
let pd = dbqueries::get_podcast_from_title(&self.title);
match pd {
Ok(foo) => if foo.link() != self.link {

11
hammond-data/src/utils.rs
View File

@ -8,7 +8,6 @@ use r2d2_diesel::ConnectionManager;
use errors::*;
use dbqueries;
use POOL;
use models::Episode;
use std::path::Path;
@ -46,10 +45,7 @@ pub fn establish_connection() -> SqliteConnection {
// TODO: Write unit test.
fn download_checker() -> Result<()> {
let episodes = {
let tempdb = POOL.clone().get().unwrap();
dbqueries::get_downloaded_episodes(&tempdb)?
};
let episodes = dbqueries::get_downloaded_episodes()?;
episodes.into_par_iter().for_each(|mut ep| {
if !Path::new(ep.local_uri().unwrap()).exists() {
@ -67,10 +63,7 @@ fn download_checker() -> Result<()> {
// TODO: Write unit test.
fn played_cleaner() -> Result<()> {
let episodes = {
let tempdb = POOL.clone().get().unwrap();
dbqueries::get_played_episodes(&*tempdb)?
};
let episodes = dbqueries::get_played_episodes()?;
let now_utc = Utc::now().timestamp() as i32;
episodes.into_par_iter().for_each(|mut ep| {