From 9dfb18a4877d36212a892a49424c411c83529bf7 Mon Sep 17 00:00:00 2001 From: Jordan Petridis Date: Thu, 8 Feb 2018 21:02:16 +0200 Subject: [PATCH] EpisodeWidget: Minor refactor of set_total_size method. --- hammond-gtk/src/widgets/episode.rs | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/hammond-gtk/src/widgets/episode.rs b/hammond-gtk/src/widgets/episode.rs index 0349ed2..de50cd7 100644 --- a/hammond-gtk/src/widgets/episode.rs +++ b/hammond-gtk/src/widgets/episode.rs @@ -202,15 +202,16 @@ impl EpisodeWidget { /// Set the Episode label dependings on its size fn set_total_size(&self, bytes: Option) -> Result<(), Error> { - if let Some(size) = bytes { - if size != 0 { - let s = size.file_size(SIZE_OPTS.clone()) - .map_err(|err| format_err!("{}", err))?; - self.total_size.set_text(&s); - self.total_size.show(); - self.separator2.show(); - } - }; + let size = bytes.ok_or_else(|| format_err!("Size is None."))?; + if size == 0 { + bail!("Size is 0."); + } + + let s = size.file_size(SIZE_OPTS.clone()) + .map_err(|err| format_err!("{}", err))?; + self.total_size.set_text(&s); + self.total_size.show(); + self.separator2.show(); Ok(()) }