toxblh/podcasts
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Removed some unwrap()s.

Browse Source
This commit is contained in:
Jordan Petridis
2018-01-09 09:21:07 +02:00
parent 87a259e1a4
commit ea70addbc6
4 changed files with 38 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
hammond-gtk/src/widgets/episode.rs
+16 -10
View File
@@ -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();