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

app.rs: Minor formatting improvments.

Browse Source
This commit is contained in:
Jordan Petridis 2018-03-27 11:50:31 +03:00
parent 7e2640e2d0
commit bdc6264701
No known key found for this signature in database
GPG Key ID: CEABAD9F5683B9A6
1 changed files with 19 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
hammond-gtk/src/app.rs
View File

@ -6,6 +6,8 @@ use gtk;
use gtk::SettingsExt as GtkSettingsExt; use gtk::SettingsExt as GtkSettingsExt;
use gtk::prelude::*; use gtk::prelude::*;
use failure::Error;
use hammond_data::{Podcast, Source}; use hammond_data::{Podcast, Source};
use hammond_data::utils::delete_show; use hammond_data::utils::delete_show;
@ -203,6 +205,8 @@ impl App {
notif.show(); notif.show();
} }
Ok(Action::RemoveShow(pd)) => { Ok(Action::RemoveShow(pd)) => {
let text = format!("Unsubscribed from {}", pd.title());
if let Err(err) = utils::ignore_show(pd.id()) { if let Err(err) = utils::ignore_show(pd.id()) {
error!("Could not insert {} to the ignore list.", pd.title()); error!("Could not insert {} to the ignore list.", pd.title());
error!("Error: {}", err); error!("Error: {}", err);
@ -210,7 +214,7 @@ impl App {
let callback = clone!(pd => move || { let callback = clone!(pd => move || {
if let Err(err) = utils::uningore_show(pd.id()) { if let Err(err) = utils::uningore_show(pd.id()) {
error!("Could not insert {} to the ignore list.", pd.title()); error!("Could not remove {} from the ignore list.", pd.title());
error!("Error: {}", err); error!("Error: {}", err);
} }
@ -224,29 +228,22 @@ impl App {
glib::Continue(false) glib::Continue(false)
}); });
let undo_callback = clone!(pd, sender => move || { let sender_ = sender.clone();
if let Err(err) = utils::uningore_show(pd.id()) { let undo_wrap = move || -> Result<(), Error> {
error!("Could not insert {} to the ignore list.", pd.title()); utils::uningore_show(pd.id())?;
error!("Error: {}", err); sender_.send(Action::RefreshShowsView)?;
sender_.send(Action::RefreshEpisodesView)?;
Ok(())
};
let undo_callback = move || {
if let Err(err) = undo_wrap() {
error!("{}", err)
} }
};
let sender_ = sender.clone();
if let Err(err) = sender.send(Action::RefreshShowsView) { let notif = InAppNotification::new(text, callback, undo_callback, sender_);
error!("Action channl blew up, error {}", err)
}
if let Err(err) = sender.send(Action::RefreshEpisodesView) {
error!("Action channl blew up, error {}", err)
}
});
let text = format!("Unsubscribed from {}", pd.title());
let notif = InAppNotification::new(
text.into(),
callback,
undo_callback,
sender.clone(),
);
overlay.add_overlay(&notif.revealer); overlay.add_overlay(&notif.revealer);
// We need to display the notification after the widget is added to the overlay // We need to display the notification after the widget is added to the overlay
// so there will be a nice animation. // so there will be a nice animation.