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

EpisodesStack: Refactor update method to return a Result<T, Error>.

Browse Source
This commit is contained in:
Jordan Petridis 2018-02-07 00:31:04 +02:00
parent 1c84f0d721
commit 7eb038b899
No known key found for this signature in database
GPG Key ID: CEABAD9F5683B9A6
1 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
hammond-gtk/src/content.rs
View File

@ -2,6 +2,8 @@ use gtk;
use gtk::Cast; use gtk::Cast;
use gtk::prelude::*; use gtk::prelude::*;
use failure::Error;
use hammond_data::Podcast; use hammond_data::Podcast;
use hammond_data::dbqueries; use hammond_data::dbqueries;
@ -46,13 +48,17 @@ impl Content {
self.update_widget() self.update_widget()
} }
// TODO: Maybe propagate the error?
pub fn update_episode_view(&self) { pub fn update_episode_view(&self) {
self.episodes.update(); if let Err(err) = self.episodes.update() {
error!("Something went wrong while trying to update the episode view.");
error!("Error: {}", err);
}
} }
pub fn update_episode_view_if_baground(&self) { pub fn update_episode_view_if_baground(&self) {
if self.stack.get_visible_child_name() != Some("episodes".into()) { if self.stack.get_visible_child_name() != Some("episodes".into()) {
self.episodes.update(); self.update_episode_view();
} }
} }
@ -270,24 +276,21 @@ impl EpisodeStack {
EpisodeStack { stack, sender } EpisodeStack { stack, sender }
} }
pub fn update(&self) { // Look into refactoring to a state-machine.
pub fn update(&self) -> Result<(), Error> {
let old = self.stack let old = self.stack
.get_child_by_name("episodes") .get_child_by_name("episodes")
// This is guaranted to exists, based on `EpisodeStack::new()`. .ok_or_else(|| format_err!("Faild to get \"episodes\" child from the stack."))?
.unwrap()
.downcast::<gtk::Box>() .downcast::<gtk::Box>()
// This is guaranted to be a Box based on the `EpisodesView` impl. .map_err(|_| format_err!("Failed to downcast stack child to a Box."))?;
.unwrap();
debug!("Name: {:?}", WidgetExt::get_name(&old)); debug!("Name: {:?}", WidgetExt::get_name(&old));
let scrolled_window = old.get_children() let scrolled_window = old.get_children()
.first() .first()
// This is guaranted to exist based on the episodes_view.ui file. .ok_or_else(|| format_err!("Box container has no childs."))?
.unwrap()
.clone() .clone()
.downcast::<gtk::ScrolledWindow>() .downcast::<gtk::ScrolledWindow>()
// This is guaranted based on the episodes_view.ui file. .map_err(|_| format_err!("Failed to downcast stack child to a ScrolledWindow."))?;
.unwrap();
debug!("Name: {:?}", WidgetExt::get_name(&scrolled_window)); debug!("Name: {:?}", WidgetExt::get_name(&scrolled_window));
let eps = EpisodesView::new(self.sender.clone()); let eps = EpisodesView::new(self.sender.clone());
@ -306,5 +309,7 @@ impl EpisodeStack {
} }
old.destroy(); old.destroy();
Ok(())
} }
} }