From faf4a4bce0d52af6c17213a3a449826a1c64d0ba Mon Sep 17 00:00:00 2001 From: Jordan Petridis Date: Mon, 30 Oct 2017 14:13:36 +0200 Subject: [PATCH] Renamed `watched` field in the episode table of the database to `played`. --- .../2017-09-15-001128_init_schema/up.sql | 2 +- hammond-data/src/dbcheckup.rs | 16 ++++++++-------- hammond-data/src/dbqueries.rs | 10 +++++----- hammond-data/src/models.rs | 12 ++++++------ hammond-data/src/schema.rs | 2 +- hammond-gtk/src/widgets/episode.rs | 12 ++++++------ 6 files changed, 27 insertions(+), 27 deletions(-) diff --git a/hammond-data/migrations/2017-09-15-001128_init_schema/up.sql b/hammond-data/migrations/2017-09-15-001128_init_schema/up.sql index d318f25..a1d9124 100644 --- a/hammond-data/migrations/2017-09-15-001128_init_schema/up.sql +++ b/hammond-data/migrations/2017-09-15-001128_init_schema/up.sql @@ -20,7 +20,7 @@ CREATE TABLE `episode` ( `epoch` INTEGER NOT NULL DEFAULT 0, `length` INTEGER, `guid` TEXT, - `watched` INTEGER , + `played` INTEGER , `podcast_id` INTEGER NOT NULL ); diff --git a/hammond-data/src/dbcheckup.rs b/hammond-data/src/dbcheckup.rs index 235d0aa..43dedcf 100644 --- a/hammond-data/src/dbcheckup.rs +++ b/hammond-data/src/dbcheckup.rs @@ -32,18 +32,18 @@ fn download_checker(db: &Database) -> Result<()> { } // TODO: Write unit test. -fn watched_cleaner(db: &Database) -> Result<()> { +fn played_cleaner(db: &Database) -> Result<()> { let mut episodes = { let tempdb = db.lock().unwrap(); - dbqueries::get_watched_episodes(&tempdb)? + dbqueries::get_played_episodes(&tempdb)? }; let now_utc = Utc::now().timestamp() as i32; episodes.par_iter_mut().for_each(|mut ep| { - if ep.local_uri().is_some() && ep.watched().is_some() { - let watched = ep.watched().unwrap(); + if ep.local_uri().is_some() && ep.played().is_some() { + let played = ep.played().unwrap(); // TODO: expose a config and a user set option. - let limit = watched + 172_800; // add 2days in seconds + let limit = played + 172_800; // add 2days in seconds if now_utc > limit { let e = delete_local_content(&Arc::clone(db), &mut ep); if let Err(err) = e { @@ -79,15 +79,15 @@ pub fn delete_local_content(db: &Database, ep: &mut Episode) -> Result<()> { Ok(()) } -pub fn set_watched_now(db: &Database, ep: &mut Episode) -> Result<()> { +pub fn set_played_now(db: &Database, ep: &mut Episode) -> Result<()> { let epoch = Utc::now().timestamp() as i32; - ep.set_watched(Some(epoch)); + ep.set_played(Some(epoch)); ep.save(db)?; Ok(()) } pub fn run(db: &Database) -> Result<()> { download_checker(db)?; - watched_cleaner(db)?; + played_cleaner(db)?; Ok(()) } diff --git a/hammond-data/src/dbqueries.rs b/hammond-data/src/dbqueries.rs index 125989a..ad7516d 100644 --- a/hammond-data/src/dbqueries.rs +++ b/hammond-data/src/dbqueries.rs @@ -45,10 +45,10 @@ pub fn get_downloaded_episodes(con: &SqliteConnection) -> QueryResult QueryResult> { +pub fn get_played_episodes(con: &SqliteConnection) -> QueryResult> { use schema::episode::dsl::*; - let eps = episode.filter(watched.is_not_null()).load::(con); + let eps = episode.filter(played.is_not_null()).load::(con); eps } @@ -104,7 +104,7 @@ pub fn get_pd_unplayed_episodes( use schema::episode::dsl::*; let eps = Episode::belonging_to(parent) - .filter(watched.is_null()) + .filter(played.is_null()) .order(epoch.desc()) .load::(con); eps @@ -185,8 +185,8 @@ pub fn update_none_to_played_now(connection: &SqliteConnection, parent: &Podcast use schema::episode::dsl::*; let epoch_now = Utc::now().timestamp() as i32; - diesel::update(Episode::belonging_to(parent).filter(watched.is_null())) - .set(watched.eq(Some(epoch_now))) + diesel::update(Episode::belonging_to(parent).filter(played.is_null())) + .set(played.eq(Some(epoch_now))) .execute(connection)?; Ok(()) diff --git a/hammond-data/src/models.rs b/hammond-data/src/models.rs index 8eb3ff8..0105ac7 100644 --- a/hammond-data/src/models.rs +++ b/hammond-data/src/models.rs @@ -22,8 +22,8 @@ pub struct Episode { epoch: i32, length: Option, guid: Option, - /// Represent the epoch value of when the episode was last watched. - watched: Option, + /// Represent the epoch value of when the episode was last played. + played: Option, podcast_id: i32, } @@ -97,12 +97,12 @@ impl Episode { self.length = value; } - pub fn watched(&self) -> Option { - self.watched + pub fn played(&self) -> Option { + self.played } - pub fn set_watched(&mut self, value: Option) { - self.watched = value; + pub fn set_played(&mut self, value: Option) { + self.played = value; } pub fn save(&self, db: &Database) -> Result<()> { diff --git a/hammond-data/src/schema.rs b/hammond-data/src/schema.rs index ab5157c..298fa4c 100644 --- a/hammond-data/src/schema.rs +++ b/hammond-data/src/schema.rs @@ -9,7 +9,7 @@ table! { epoch -> Integer, length -> Nullable, guid -> Nullable, - watched -> Nullable, + played -> Nullable, podcast_id -> Integer, } } diff --git a/hammond-gtk/src/widgets/episode.rs b/hammond-gtk/src/widgets/episode.rs index 3cf3baa..c8f510a 100644 --- a/hammond-gtk/src/widgets/episode.rs +++ b/hammond-gtk/src/widgets/episode.rs @@ -75,7 +75,7 @@ fn epidose_widget(db: &Database, episode: &mut Episode, pd_title: &str) -> gtk:: }); } - if episode.watched().is_some() { + if episode.played().is_some() { unplayed_button.show(); played_button.hide(); } @@ -90,7 +90,7 @@ fn epidose_widget(db: &Database, episode: &mut Episode, pd_title: &str) -> gtk:: play_button.connect_clicked(clone!(db, episode => move |_| { on_play_bttn_clicked(&db, episode.id()); - let _ = set_watched_now(&db, &mut episode.clone()); + let _ = set_played_now(&db, &mut episode.clone()); })); delete_button.connect_clicked( @@ -102,15 +102,15 @@ fn epidose_widget(db: &Database, episode: &mut Episode, pd_title: &str) -> gtk:: }), ); - played_button.connect_clicked(clone!(db, episode, unplayed_button => move |watched| { - let _ = set_watched_now(&db, &mut episode.clone()); - watched.hide(); + played_button.connect_clicked(clone!(db, episode, unplayed_button => move |played| { + let _ = set_played_now(&db, &mut episode.clone()); + played.hide(); unplayed_button.show(); })); unplayed_button.connect_clicked(clone!(db, episode, played_button => move |un| { let mut episode = episode.clone(); - episode.set_watched(None); + episode.set_played(None); let _ = episode.save(&db); un.hide(); played_button.show();