From ea70addbc6eb4096cb8a745f8c55d0d56f3d2267 Mon Sep 17 00:00:00 2001
From: Jordan Petridis <jordanpetridis@protonmail.com>
Date: Tue, 9 Jan 2018 09:21:07 +0200
Subject: [PATCH] Removed some unwrap()s.

---
 hammond-data/src/models/queryables.rs |  1 -
 hammond-gtk/src/manager.rs            | 38 +++++++++++++++------------
 hammond-gtk/src/views/episodes.rs     |  5 +---
 hammond-gtk/src/widgets/episode.rs    | 26 +++++++++++-------
 4 files changed, 38 insertions(+), 32 deletions(-)

diff --git a/hammond-data/src/models/queryables.rs b/hammond-data/src/models/queryables.rs
index 99fc27c..53f2e53 100644
--- a/hammond-data/src/models/queryables.rs
+++ b/hammond-data/src/models/queryables.rs
@@ -613,7 +613,6 @@ impl<'a> Source {
     fn update_etag(&mut self, req: &reqwest::Response) -> Result<()> {
         let headers = req.headers();
 
-        // let etag = headers.get_raw("ETag").unwrap();
         let etag = headers.get::<ETag>();
         let lmod = headers.get::<LastModified>();
 
diff --git a/hammond-gtk/src/manager.rs b/hammond-gtk/src/manager.rs
index 81d87db..1cec780 100644
--- a/hammond-gtk/src/manager.rs
+++ b/hammond-gtk/src/manager.rs
@@ -68,29 +68,33 @@ pub fn add(id: i32, directory: &str, sender: Sender<Action>) {
     let prog = Arc::new(Mutex::new(Progress::default()));
 
     {
-        let mut m = ACTIVE_DOWNLOADS.write().unwrap();
-        m.insert(id, prog.clone());
-    }
-    {
-        let m = ACTIVE_DOWNLOADS.read().unwrap();
-        info!("ACTIVE DOWNLOADS: {:#?}", m);
+        ACTIVE_DOWNLOADS
+            .write()
+            .ok()
+            .map(|mut m| m.insert(id, prog.clone()));
     }
+    // {
+    //     let m = ACTIVE_DOWNLOADS.read().unwrap();
+    //     info!("ACTIVE DOWNLOADS: {:#?}", m);
+    // }
 
     let dir = directory.to_owned();
     thread::spawn(move || {
-        let episode = dbqueries::get_episode_from_rowid(id).unwrap();
-        let e = get_episode(&mut episode.into(), dir.as_str(), Some(prog));
-        if let Err(err) = e {
-            error!("Error: {}", err);
-        };
+        if let Ok(episode) = dbqueries::get_episode_from_rowid(id) {
+            get_episode(&mut episode.into(), dir.as_str(), Some(prog))
+                .err()
+                .map(|err| {
+                    error!("Error while trying to download an episode");
+                    error!("Error: {}", err);
+                });
 
-        {
-            let mut m = ACTIVE_DOWNLOADS.write().unwrap();
-            m.remove(&id);
+            {
+                ACTIVE_DOWNLOADS.write().ok().map(|mut x| x.remove(&id));
+            }
+
+            sender.send(Action::RefreshEpisodesView).unwrap();
+            sender.send(Action::RefreshWidget).unwrap();
         }
-
-        sender.send(Action::RefreshEpisodesView).unwrap();
-        sender.send(Action::RefreshWidget).unwrap();
     });
 }
 
diff --git a/hammond-gtk/src/views/episodes.rs b/hammond-gtk/src/views/episodes.rs
index c0b04a8..5bb44b9 100644
--- a/hammond-gtk/src/views/episodes.rs
+++ b/hammond-gtk/src/views/episodes.rs
@@ -205,10 +205,7 @@ impl EpisodesViewWidget {
         let image: gtk::Image = builder.get_object("cover").unwrap();
 
         if let Ok(pd) = dbqueries::get_podcast_cover_from_id(episode.podcast_id()) {
-            let img = get_pixbuf_from_path(&pd, 64);
-            if let Some(i) = img {
-                image.set_from_pixbuf(&i);
-            }
+            get_pixbuf_from_path(&pd, 64).map(|img| image.set_from_pixbuf(&img));
         }
 
         let ep = EpisodeWidget::new(episode, sender.clone());
diff --git a/hammond-gtk/src/widgets/episode.rs b/hammond-gtk/src/widgets/episode.rs
index b700daa..651d4c2 100644
--- a/hammond-gtk/src/widgets/episode.rs
+++ b/hammond-gtk/src/widgets/episode.rs
@@ -205,13 +205,15 @@ impl EpisodeWidget {
             .parse::<i32>()
             .unwrap();
 
-        let prog_struct = {
-            let m = manager::ACTIVE_DOWNLOADS.read().unwrap();
-            if !m.contains_key(&id) {
-                return;
-            };
-            m.get(&id).cloned()
-        };
+        let prog_struct = || -> Option<_> {
+            if let Ok(m) = manager::ACTIVE_DOWNLOADS.read() {
+                if !m.contains_key(&id) {
+                    return None;
+                };
+                return m.get(&id).cloned();
+            }
+            None
+        }();
 
         let progress_bar = self.progress.clone();
         let total_size = self.total_size.clone();
@@ -237,11 +239,15 @@ impl EpisodeWidget {
 }
 
 fn on_download_clicked(ep: &EpisodeWidgetQuery, sender: Sender<Action>) {
-    let pd = dbqueries::get_podcast_from_id(ep.podcast_id()).unwrap();
-    let download_fold = downloader::get_download_folder(&pd.title().to_owned()).unwrap();
+    let download_fold = dbqueries::get_podcast_from_id(ep.podcast_id())
+        .ok()
+        .map(|pd| downloader::get_download_folder(&pd.title().to_owned()).ok())
+        .and_then(|x| x);
 
     // Start a new download.
-    manager::add(ep.rowid(), &download_fold, sender.clone());
+    if let Some(fold) = download_fold {
+        manager::add(ep.rowid(), &fold, sender.clone());
+    }
 
     // Update Views
     sender.send(Action::RefreshEpisodesView).unwrap();