From 705021e90c8a854fe4ea5416cb5e49564b1e9d20 Mon Sep 17 00:00:00 2001 From: GeckoEidechse Date: Mon, 20 Mar 2023 12:37:22 +0100 Subject: [PATCH 1/2] fix: Handle error when Northstar download fails In case of download failure return an error message --- src-tauri/src/lib.rs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src-tauri/src/lib.rs b/src-tauri/src/lib.rs index ee3c91edc..1e548166b 100644 --- a/src-tauri/src/lib.rs +++ b/src-tauri/src/lib.rs @@ -195,7 +195,10 @@ async fn do_install(nmod: &thermite::model::ModVersion, game_path: &std::path::P let download_path = format!("{}/{}", download_directory.clone(), filename); println!("{}", download_path); - let nfile = thermite::core::manage::download_file(&nmod.url, download_path).unwrap(); + let nfile = match thermite::core::manage::download_file(&nmod.url, download_path){ + Ok(res) => res, + Err(err) => return Err(anyhow!("Failed downloading Northstar {}", err)), + }; println!("Extracting Northstar..."); extract(nfile, game_path)?; From 85bb5253657c16d9674a9be2f6c8090b413ca7fb Mon Sep 17 00:00:00 2001 From: GeckoEidechse Date: Mon, 20 Mar 2023 12:41:01 +0100 Subject: [PATCH 2/2] chore: Fix formatting --- src-tauri/src/lib.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src-tauri/src/lib.rs b/src-tauri/src/lib.rs index 1e548166b..12c839fea 100644 --- a/src-tauri/src/lib.rs +++ b/src-tauri/src/lib.rs @@ -195,7 +195,7 @@ async fn do_install(nmod: &thermite::model::ModVersion, game_path: &std::path::P let download_path = format!("{}/{}", download_directory.clone(), filename); println!("{}", download_path); - let nfile = match thermite::core::manage::download_file(&nmod.url, download_path){ + let nfile = match thermite::core::manage::download_file(&nmod.url, download_path) { Ok(res) => res, Err(err) => return Err(anyhow!("Failed downloading Northstar {}", err)), };