From 56b5bf4cb4e12e6827f5b1b78413dd2b2d4ce788 Mon Sep 17 00:00:00 2001 From: Fabian-Lars Date: Thu, 20 Feb 2025 10:48:42 +0000 Subject: [PATCH] fix(updater): Propagate request error (#2439) Committed via a GitHub action: https://github.com/tauri-apps/plugins-workspace/actions/runs/13433538989 Co-authored-by: FabianLars --- src/updater.rs | 35 +++++++++++++++++++---------------- 1 file changed, 19 insertions(+), 16 deletions(-) diff --git a/src/updater.rs b/src/updater.rs index f9209a0..a3e3cb3 100644 --- a/src/updater.rs +++ b/src/updater.rs @@ -383,26 +383,29 @@ impl Updater { .send() .await; - if let Ok(res) = response { - if res.status().is_success() { - // no updates found! - if StatusCode::NO_CONTENT == res.status() { - return Ok(None); - }; + match response { + Ok(res) => { + if res.status().is_success() { + // no updates found! + if StatusCode::NO_CONTENT == res.status() { + return Ok(None); + }; - raw_json = Some(res.json().await?); - match serde_json::from_value::(raw_json.clone().unwrap()) - .map_err(Into::into) - { - Ok(release) => { - last_error = None; - remote_release = Some(release); - // we found a relase, break the loop - break; + raw_json = Some(res.json().await?); + match serde_json::from_value::(raw_json.clone().unwrap()) + .map_err(Into::into) + { + Ok(release) => { + last_error = None; + remote_release = Some(release); + // we found a relase, break the loop + break; + } + Err(err) => last_error = Some(err), } - Err(err) => last_error = Some(err), } } + Err(err) => last_error = Some(err.into()), } }