From 2d6f02c4075cc6e09c6b7e479d25a3a25d4bd564 Mon Sep 17 00:00:00 2001
From: Jordan Petridis <jordanpetridis@protonmail.com>
Date: Sat, 23 Dec 2017 15:44:28 +0200
Subject: [PATCH] EpisodeWidget: Do not display size if it's 0 bytes.

---
 hammond-data/src/parser.rs                  |  2 +-
 hammond-gtk/resources/gtk/episode_widget.ui |  3 +--
 hammond-gtk/src/widgets/episode.rs          | 15 ++++++++++-----
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/hammond-data/src/parser.rs b/hammond-data/src/parser.rs
index 5ef3d21..352d273 100644
--- a/hammond-data/src/parser.rs
+++ b/hammond-data/src/parser.rs
@@ -63,7 +63,7 @@ pub(crate) fn new_episode(item: &Item, parent_id: i32) -> Result<NewEpisode> {
     let pub_date = date.map(|x| x.to_rfc2822()).ok();
     let epoch = date.map(|x| x.timestamp() as i32).unwrap_or(0);
 
-    let length = item.enclosure().map(|x| x.length().parse().unwrap_or(0));
+    let length = || -> Option<i32> { item.enclosure().map(|x| x.length().parse().ok())? }();
     let duration = parse_itunes_duration(item);
 
     Ok(NewEpisodeBuilder::default()
diff --git a/hammond-gtk/resources/gtk/episode_widget.ui b/hammond-gtk/resources/gtk/episode_widget.ui
index f6dd911..ff4a249 100644
--- a/hammond-gtk/resources/gtk/episode_widget.ui
+++ b/hammond-gtk/resources/gtk/episode_widget.ui
@@ -104,8 +104,8 @@
                 </child>
                 <child>
                   <object class="GtkLabel" id="separator2">
-                    <property name="visible">True</property>
                     <property name="can_focus">False</property>
+                    <property name="no_show_all">True</property>
                     <property name="label" translatable="yes">·</property>
                     <property name="track_visited_links">False</property>
                     <style>
@@ -120,7 +120,6 @@
                 </child>
                 <child>
                   <object class="GtkLabel" id="size_label">
-                    <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="no_show_all">True</property>
                     <property name="label" translatable="yes">42 MB</property>
diff --git a/hammond-gtk/src/widgets/episode.rs b/hammond-gtk/src/widgets/episode.rs
index fb9c4ef..6c26449 100644
--- a/hammond-gtk/src/widgets/episode.rs
+++ b/hammond-gtk/src/widgets/episode.rs
@@ -47,6 +47,7 @@ pub struct EpisodeWidget {
     progress: gtk::ProgressBar,
     progress_label: gtk::Label,
     separator1: gtk::Label,
+    separator2: gtk::Label,
 }
 
 impl Default for EpisodeWidget {
@@ -68,6 +69,7 @@ impl Default for EpisodeWidget {
         let progress_label: gtk::Label = builder.get_object("progress_label").unwrap();
 
         let separator1: gtk::Label = builder.get_object("separator1").unwrap();
+        let separator2: gtk::Label = builder.get_object("separator2").unwrap();
 
         EpisodeWidget {
             container,
@@ -82,6 +84,7 @@ impl Default for EpisodeWidget {
             date,
             progress_label,
             separator1,
+            separator2,
         }
     }
 }
@@ -120,11 +123,13 @@ impl EpisodeWidget {
         };
 
         if let Some(size) = episode.length() {
-            let s = size.file_size(custom_options);
-            if let Ok(s) = s {
-                self.size.set_text(&s);
-            } else {
-                self.size.hide();
+            if size != 0 {
+                let s = size.file_size(custom_options);
+                if let Ok(s) = s {
+                    self.size.set_text(&s);
+                    self.size.show();
+                    self.separator2.show();
+                }
             }
         };