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

ShowWidget: Refactor to return Result<T, Error> wherever possible.

Browse Source
This commit is contained in:
Jordan Petridis 2018-02-06 02:47:39 +02:00
parent 0dc16dab9a
commit d3f279374a
No known key found for this signature in database
GPG Key ID: CEABAD9F5683B9A6
1 changed files with 24 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
hammond-gtk/src/widgets/show.rs
View File

@ -1,4 +1,5 @@
use dissolve; use dissolve;
use failure::Error;
use gtk; use gtk;
use gtk::prelude::*; use gtk::prelude::*;
use open; use open;
@ -65,7 +66,9 @@ impl ShowWidget {
self.unsub self.unsub
.connect_clicked(clone!(pd, sender => move |bttn| { .connect_clicked(clone!(pd, sender => move |bttn| {
on_unsub_button_clicked(&pd, bttn, sender.clone()); if let Err(err) = on_unsub_button_clicked(&pd, bttn, sender.clone()) {
error!("Error: {}", err);
}
})); }));
self.setup_listbox(pd, sender.clone()); self.setup_listbox(pd, sender.clone());
@ -76,9 +79,10 @@ impl ShowWidget {
self.link.set_tooltip_text(Some(link.as_str())); self.link.set_tooltip_text(Some(link.as_str()));
self.link.connect_clicked(move |_| { self.link.connect_clicked(move |_| {
info!("Opening link: {}", &link); info!("Opening link: {}", &link);
open::that(&link) if let Err(err) = open::that(&link) {
.err() error!("Failed to open link: {}", &link);
.map(|err| error!("Something went wrong: {}", err)); error!("Error: {}", err);
}
}); });
} }
@ -107,7 +111,11 @@ impl ShowWidget {
} }
} }
fn on_unsub_button_clicked(pd: &Podcast, unsub_button: &gtk::Button, sender: Sender<Action>) { fn on_unsub_button_clicked(
pd: &Podcast,
unsub_button: &gtk::Button,
sender: Sender<Action>,
) -> Result<(), Error> {
// hack to get away without properly checking for none. // hack to get away without properly checking for none.
// if pressed twice would panic. // if pressed twice would panic.
unsub_button.hide(); unsub_button.hide();
@ -118,16 +126,19 @@ fn on_unsub_button_clicked(pd: &Podcast, unsub_button: &gtk::Button, sender: Sen
error!("Error: {}", err); error!("Error: {}", err);
} }
})); }));
sender.send(Action::HeaderBarNormal).unwrap();
sender.send(Action::ShowShowsAnimated).unwrap(); sender.send(Action::HeaderBarNormal)?;
sender.send(Action::ShowShowsAnimated)?;
// Queue a refresh after the switch to avoid blocking the db. // Queue a refresh after the switch to avoid blocking the db.
sender.send(Action::RefreshShowsView).unwrap(); sender.send(Action::RefreshShowsView)?;
sender.send(Action::RefreshEpisodesView).unwrap(); sender.send(Action::RefreshEpisodesView)?;
Ok(())
} }
#[allow(dead_code)] #[allow(dead_code)]
fn on_played_button_clicked(pd: &Podcast, sender: Sender<Action>) { fn on_played_button_clicked(pd: &Podcast, sender: Sender<Action>) -> Result<(), Error> {
let _ = dbqueries::update_none_to_played_now(pd); dbqueries::update_none_to_played_now(pd)?;
sender.send(Action::RefreshWidget)?;
sender.send(Action::RefreshWidget).unwrap(); Ok(())
} }