Replace if Let Err(_) with .map_err().ok() patterns.

I dislike the indentation and the noise if let adds.
This commit is contained in:
Jordan Petridis
2018-04-16 04:03:44 +03:00
parent 3132856efe
commit bc6eeec663
10 changed files with 96 additions and 105 deletions
+15 -17
View File
@@ -97,10 +97,10 @@ impl EpisodeWidget {
self.set_duration(episode.duration());
// Determine what the state of the media widgets should be.
if let Err(err) = determine_media_state(self.media.clone(), &episode) {
error!("Something went wrong determining the Media State.");
error!("Error: {}", err);
}
determine_media_state(self.media.clone(), &episode)
.map_err(|err| error!("Error: {}", err))
.map_err(|_| error!("Could not determine Media State"))
.ok();
let episode = Arc::new(Mutex::new(episode));
self.connect_buttons(episode, sender);
@@ -111,9 +111,9 @@ impl EpisodeWidget {
if let Ok(media) = self.media.lock() {
media.play_connect_clicked(clone!(episode, sender => move |_| {
if let Ok(mut ep) = episode.lock() {
if let Err(err) = on_play_bttn_clicked(&mut ep, title.clone(), sender.clone()){
error!("Error: {}", err);
};
on_play_bttn_clicked(&mut ep, title.clone(), sender.clone())
.map_err(|err| error!("Error: {}", err))
.ok();
}
}));
@@ -122,16 +122,14 @@ impl EpisodeWidget {
// Make the button insensitive so it won't be pressed twice
dl.set_sensitive(false);
if let Ok(ep) = episode.lock() {
if let Err(err) = on_download_clicked(&ep, sender.clone()) {
error!("Download failed to start.");
error!("Error: {}", err);
} else {
info!("Donwload started succesfully.");
if let Err(err) = determine_media_state(media_machine.clone(), &ep) {
error!("Something went wrong determining the Media State.");
error!("Error: {}", err);
}
}
on_download_clicked(&ep, sender.clone())
.and_then(|_| {
info!("Donwload started succesfully.");
determine_media_state(media_machine.clone(), &ep)
})
.map_err(|err| error!("Error: {}", err))
.map_err(|_| error!("Could not determine Media State"))
.ok();
}
// Restore sensitivity after operations above complete
+7 -7
View File
@@ -74,18 +74,18 @@ impl ShowWidget {
self.setup_listbox(pd.clone(), sender.clone());
self.set_description(pd.description());
if let Err(err) = self.set_cover(pd.clone()) {
error!("Failed to set a cover: {}", err)
}
self.set_cover(pd.clone())
.map_err(|err| error!("Failed to set a cover: {}", err))
.ok();
let link = pd.link().to_owned();
self.link.set_tooltip_text(Some(link.as_str()));
self.link.connect_clicked(move |_| {
info!("Opening link: {}", &link);
if let Err(err) = open::that(&link) {
error!("Failed to open link: {}", &link);
error!("Error: {}", err);
}
open::that(&link)
.map_err(|err| error!("Error: {}", err))
.map_err(|_| error!("Failed open link: {}", &link))
.ok();
});
let show_menu: gtk::Popover = builder.get_object("show_menu").unwrap();