From 68d7c621d318f4f54e0beb5c5d0769934b12dd73 Mon Sep 17 00:00:00 2001
From: Jordan Petridis <jordanpetridis@protonmail.com>
Date: Tue, 9 Jan 2018 06:15:41 +0200
Subject: [PATCH] EpisodeWidget: Update the local_size label.

---
 hammond-gtk/src/manager.rs         |  4 ++++
 hammond-gtk/src/widgets/episode.rs | 25 +++++++++++++++++--------
 2 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/hammond-gtk/src/manager.rs b/hammond-gtk/src/manager.rs
index 33aa7d2..81d87db 100644
--- a/hammond-gtk/src/manager.rs
+++ b/hammond-gtk/src/manager.rs
@@ -32,6 +32,10 @@ impl Progress {
     pub fn get_total_size(&self) -> u64 {
         self.total_bytes
     }
+
+    pub fn get_downloaded(&self) -> u64 {
+        self.downloaded_bytes
+    }
 }
 
 impl Default for Progress {
diff --git a/hammond-gtk/src/widgets/episode.rs b/hammond-gtk/src/widgets/episode.rs
index b6036ec..8ec2133 100644
--- a/hammond-gtk/src/widgets/episode.rs
+++ b/hammond-gtk/src/widgets/episode.rs
@@ -206,23 +206,28 @@ impl EpisodeWidget {
             .parse::<i32>()
             .unwrap();
 
-        let m = manager::ACTIVE_DOWNLOADS.read().unwrap();
-        if !m.contains_key(&id) {
-            return;
+        let prog_struct = {
+            let m = manager::ACTIVE_DOWNLOADS.read().unwrap();
+            if !m.contains_key(&id) {
+                return;
+            };
+            m.get(&id).cloned()
         };
 
         let progress_bar = self.progress.clone();
         let total_size = self.total_size.clone();
-        if let Some(prog) = m.get(&id) {
+        let local_size = self.local_size.clone();
+        if let Some(prog) = prog_struct {
             self.download.hide();
             self.progress.show();
             self.local_size.show();
             self.total_size.show();
+            self.separator2.show();
             self.prog_separator.show();
             self.cancel.show();
 
             // Setup a callback that will update the progress bar.
-            update_progressbar_callback(prog.clone(), id, progress_bar);
+            update_progressbar_callback(prog.clone(), id, progress_bar, local_size);
 
             // Setup a callback that will update the total_size label
             // with the http ContentLength header number rather than
@@ -269,15 +274,19 @@ fn update_progressbar_callback(
     prog: Arc<Mutex<manager::Progress>>,
     episode_rowid: i32,
     progress_bar: gtk::ProgressBar,
+    local_size: gtk::Label,
 ) {
     timeout_add(
         400,
-        clone!(prog, progress_bar=> move || {
-            let fraction = {
+        clone!(prog, progress_bar => move || {
+            let (fraction, downloaded) = {
                 let m = prog.lock().unwrap();
-                m.get_fraction()
+                (m.get_fraction(), m.get_downloaded())
             };
 
+            // Update local_size label
+            downloaded.file_size(SIZE_OPTS.clone()).map(|x| local_size.set_text(&x));
+
             // I hate floating points.
             if (fraction >= 0.0) && (fraction <= 1.0) && (!fraction.is_nan()) {
                 progress_bar.set_fraction(fraction);