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

Use map_err(From::from) instead of ? into Ok() wrapping pattern.

Browse Source
This commit is contained in:
Jordan Petridis 2018-01-24 15:27:36 +02:00
parent 0e16f0acb0
commit 5da002fe6d
No known key found for this signature in database
GPG Key ID: CEABAD9F5683B9A6
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
hammond-data/src/models/episode.rs
View File

@ -173,8 +173,7 @@ impl Episode {
pub fn set_played_now(&mut self) -> Result<()> { pub fn set_played_now(&mut self) -> Result<()> {
let epoch = Utc::now().timestamp() as i32; let epoch = Utc::now().timestamp() as i32;
self.set_played(Some(epoch)); self.set_played(Some(epoch));
self.save()?; self.save().map(|_| ())
Ok(())
} }
/// Helper method to easily save/"sync" current state of self to the Database. /// Helper method to easily save/"sync" current state of self to the Database.
@ -182,7 +181,7 @@ impl Episode {
let db = connection(); let db = connection();
let tempdb = db.get()?; let tempdb = db.get()?;
Ok(self.save_changes::<Episode>(&*tempdb)?) self.save_changes::<Episode>(&*tempdb).map_err(From::from)
} }
} }
@ -329,8 +328,7 @@ impl EpisodeWidgetQuery {
pub fn set_played_now(&mut self) -> Result<()> { pub fn set_played_now(&mut self) -> Result<()> {
let epoch = Utc::now().timestamp() as i32; let epoch = Utc::now().timestamp() as i32;
self.set_played(Some(epoch)); self.set_played(Some(epoch));
self.save()?; self.save().map(|_| ())
Ok(())
} }
/// Helper method to easily save/"sync" current state of self to the Database. /// Helper method to easily save/"sync" current state of self to the Database.
@ -340,9 +338,10 @@ impl EpisodeWidgetQuery {
let db = connection(); let db = connection();
let tempdb = db.get()?; let tempdb = db.get()?;
Ok(diesel::update(episode.filter(rowid.eq(self.rowid))) diesel::update(episode.filter(rowid.eq(self.rowid)))
.set(self) .set(self)
.execute(&*tempdb)?) .execute(&*tempdb)
.map_err(From::from)
} }
} }
@ -406,9 +405,10 @@ impl EpisodeCleanerQuery {
let db = connection(); let db = connection();
let tempdb = db.get()?; let tempdb = db.get()?;
Ok(diesel::update(episode.filter(rowid.eq(self.rowid()))) diesel::update(episode.filter(rowid.eq(self.rowid())))
.set(self) .set(self)
.execute(&*tempdb)?) .execute(&*tempdb)
.map_err(From::from)
} }
} }

2
hammond-data/src/models/podcast.rs
View File

@ -113,7 +113,7 @@ impl Podcast {
let db = connection(); let db = connection();
let tempdb = db.get()?; let tempdb = db.get()?;
Ok(self.save_changes::<Podcast>(&*tempdb)?) self.save_changes::<Podcast>(&*tempdb).map_err(From::from)
} }
} }