max
/
tauri-plugins-workspace
mirror of https://github.com/tauri-apps/plugins-workspace
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge d407712d59 into 10f9e66e32

Browse Source
pull/2592/merge
thep0y 3 months ago committed by GitHub
parent 10f9e66e32 d407712d59
commit b13e86cf0c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 28 additions and 16 deletions
Show Stats Download Patch File Download Diff File

5
.changes/updater-logging.md
Unescape View File

@ -0,0 +1,5 @@
---
"updater": patch
---
replace tracing with log for conditional logging.

1
Cargo.lock generated
Unescape View File

@ -6915,6 +6915,7 @@ dependencies = [
"thiserror 2.0.12",
"time",
"tokio",
"tracing",
"url",
"windows-sys 0.59.0",
"zip",

2
plugins/updater/Cargo.toml
Unescape View File

@ -31,6 +31,7 @@ serde = { workspace = true }
serde_json = { workspace = true }
thiserror = { workspace = true }
log = { workspace = true }
tracing = { workspace = true, optional = true }
tokio = "1"
reqwest = { version = "0.12", default-features = false, features = [
"json",
@ -71,3 +72,4 @@ zip = ["dep:zip", "dep:tar", "dep:flate2"]
native-tls = ["reqwest/native-tls"]
native-tls-vendored = ["reqwest/native-tls-vendored"]
rustls-tls = ["reqwest/rustls-tls"]
tracing = ["dep:tracing"]

36
plugins/updater/src/updater.rs
Unescape View File

@ -18,6 +18,8 @@ use std::ffi::OsStr;
use base64::Engine;
use futures_util::StreamExt;
use http::HeaderName;
#[cfg(not(feature = "tracing"))]
use log as logger;
use minisign_verify::{PublicKey, Signature};
use percent_encoding::{AsciiSet, CONTROLS};
use reqwest::{
@ -28,6 +30,8 @@ use semver::Version;
use serde::{de::Error as DeError, Deserialize, Deserializer, Serialize};
use tauri::{utils::platform::current_exe, AppHandle, Resource, Runtime};
use time::OffsetDateTime;
#[cfg(feature = "tracing")]
use tracing as logger;
use url::Url;
use crate::{
@ -387,14 +391,14 @@ impl Updater {
.replace("{{arch}}", self.arch)
.parse()?;
log::debug!("checking for updates {url}");
logger::debug!("checking for updates {url}");
let mut request = ClientBuilder::new().user_agent(UPDATER_USER_AGENT);
if let Some(timeout) = self.timeout {
request = request.timeout(timeout);
}
if let Some(ref proxy) = self.proxy {
log::debug!("using proxy {proxy}");
logger::debug!("using proxy {proxy}");
let proxy = reqwest::Proxy::all(proxy.as_str())?;
request = request.proxy(proxy);
}
@ -415,36 +419,36 @@ impl Updater {
if res.status().is_success() {
// no updates found!
if StatusCode::NO_CONTENT == res.status() {
log::debug!("update endpoint returned 204 No Content");
logger::debug!("update endpoint returned 204 No Content");
return Ok(None);
};
let update_response: serde_json::Value = res.json().await?;
log::debug!("update response: {update_response:?}");
logger::debug!("update response: {update_response:?}");
raw_json = Some(update_response.clone());
match serde_json::from_value::<RemoteRelease>(update_response)
.map_err(Into::into)
{
Ok(release) => {
log::debug!("parsed release response {release:?}");
logger::debug!("parsed release response {release:?}");
last_error = None;
remote_release = Some(release);
// we found a release, break the loop
break;
}
Err(err) => {
log::error!("failed to deserialize update response: {err}");
logger::error!("failed to deserialize update response: {err}");
last_error = Some(err)
}
}
} else {
log::error!(
logger::error!(
"update endpoint did not respond with a successful status code"
);
}
}
Err(err) => {
log::error!("failed to check for updates: {err}");
logger::error!("failed to check for updates: {err}");
last_error = Some(err.into())
}
}
@ -713,7 +717,7 @@ impl Update {
};
if let Some(on_before_exit) = self.on_before_exit.as_ref() {
log::debug!("running on_before_exit hook");
logger::debug!("running on_before_exit hook");
on_before_exit();
}
@ -882,7 +886,7 @@ impl Update {
#[cfg(feature = "zip")]
if infer::archive::is_gz(bytes) {
log::debug!("extracting AppImage");
logger::debug!("extracting AppImage");
// extract the buffer to the tmp_dir
// we extract our signed archive into our final directory without any temp file
let archive = Cursor::new(bytes);
@ -906,7 +910,7 @@ impl Update {
return Err(Error::BinaryNotFoundInArchive);
}
log::debug!("rewriting AppImage");
logger::debug!("rewriting AppImage");
return match std::fs::write(&self.extract_path, bytes)
.and_then(|_| std::fs::set_permissions(&self.extract_path, permissions))
{
@ -960,7 +964,7 @@ impl Update {
fn install_deb(&self, bytes: &[u8]) -> Result<()> {
// First verify the bytes are actually a .deb package
if !infer::archive::is_deb(bytes) {
log::warn!("update is not a valid deb package");
logger::warn!("update is not a valid deb package");
return Err(Error::InvalidUpdaterFormat);
}
@ -1003,7 +1007,7 @@ impl Update {
.status()
{
if status.success() {
log::debug!("installed deb with pkexec");
logger::debug!("installed deb with pkexec");
return Ok(());
}
}
@ -1011,7 +1015,7 @@ impl Update {
// 2. Try zenity or kdialog for a graphical sudo experience
if let Ok(password) = self.get_password_graphically() {
if self.install_with_sudo(deb_path, &password)? {
log::debug!("installed deb with GUI sudo");
logger::debug!("installed deb with GUI sudo");
return Ok(());
}
}
@ -1024,7 +1028,7 @@ impl Update {
.status()?;
if status.success() {
log::debug!("installed deb with sudo");
logger::debug!("installed deb with sudo");
Ok(())
} else {
Err(Error::DebInstallFailed)
@ -1148,7 +1152,7 @@ impl Update {
};
if need_authorization {
log::debug!("app installation needs admin privileges");
logger::debug!("app installation needs admin privileges");
// Use AppleScript to perform moves with admin privileges
let apple_script = format!(
"do shell script \"rm -rf '{src}' && mv -f '{new}' '{src}'\" with administrator privileges",

Write Preview
Loading…
Cancel
Save