16366cf9f2
https://github.com/zed-industries/zed/issues/30972 brought up another case where our context is not enough to track the actual source of the issue: we get a general top-level error without inner error. The reason for this was `.ok_or_else(|| anyhow!("failed to read HEAD SHA"))?; ` on the top level. The PR finally reworks the way we use anyhow to reduce such issues (or at least make it simpler to bubble them up later in a fix). On top of that, uses a few more anyhow methods for better readability. * `.ok_or_else(|| anyhow!("..."))`, `map_err` and other similar error conversion/option reporting cases are replaced with `context` and `with_context` calls * in addition to that, various `anyhow!("failed to do ...")` are stripped with `.context("Doing ...")` messages instead to remove the parasitic `failed to` text * `anyhow::ensure!` is used instead of `if ... { return Err(...); }` calls * `anyhow::bail!` is used instead of `return Err(anyhow!(...));` Release Notes: - N/A
94 lines
2.8 KiB
Rust
94 lines
2.8 KiB
Rust
#![cfg_attr(not(debug_assertions), windows_subsystem = "windows")]
|
|
|
|
#[cfg(target_os = "windows")]
|
|
mod dialog;
|
|
#[cfg(target_os = "windows")]
|
|
mod updater;
|
|
|
|
#[cfg(target_os = "windows")]
|
|
fn main() {
|
|
if let Err(e) = windows_impl::run() {
|
|
log::error!("Error: Zed update failed, {:?}", e);
|
|
windows_impl::show_error(format!("Error: {:?}", e));
|
|
}
|
|
}
|
|
|
|
#[cfg(not(target_os = "windows"))]
|
|
fn main() {}
|
|
|
|
#[cfg(target_os = "windows")]
|
|
mod windows_impl {
|
|
use std::path::Path;
|
|
|
|
use super::dialog::create_dialog_window;
|
|
use super::updater::perform_update;
|
|
use anyhow::{Context as _, Result};
|
|
use windows::{
|
|
Win32::{
|
|
Foundation::{HWND, LPARAM, WPARAM},
|
|
UI::WindowsAndMessaging::{
|
|
DispatchMessageW, GetMessageW, MB_ICONERROR, MB_SYSTEMMODAL, MSG, MessageBoxW,
|
|
PostMessageW, WM_USER,
|
|
},
|
|
},
|
|
core::HSTRING,
|
|
};
|
|
|
|
pub(crate) const WM_JOB_UPDATED: u32 = WM_USER + 1;
|
|
pub(crate) const WM_TERMINATE: u32 = WM_USER + 2;
|
|
|
|
pub(crate) fn run() -> Result<()> {
|
|
let helper_dir = std::env::current_exe()?
|
|
.parent()
|
|
.context("No parent directory")?
|
|
.to_path_buf();
|
|
init_log(&helper_dir)?;
|
|
let app_dir = helper_dir
|
|
.parent()
|
|
.context("No parent directory")?
|
|
.to_path_buf();
|
|
|
|
log::info!("======= Starting Zed update =======");
|
|
let (tx, rx) = std::sync::mpsc::channel();
|
|
let hwnd = create_dialog_window(rx)?.0 as isize;
|
|
std::thread::spawn(move || {
|
|
let result = perform_update(app_dir.as_path(), Some(hwnd));
|
|
tx.send(result).ok();
|
|
unsafe { PostMessageW(Some(HWND(hwnd as _)), WM_TERMINATE, WPARAM(0), LPARAM(0)) }.ok();
|
|
});
|
|
unsafe {
|
|
let mut message = MSG::default();
|
|
while GetMessageW(&mut message, None, 0, 0).as_bool() {
|
|
DispatchMessageW(&message);
|
|
}
|
|
}
|
|
Ok(())
|
|
}
|
|
|
|
fn init_log(helper_dir: &Path) -> Result<()> {
|
|
simplelog::WriteLogger::init(
|
|
simplelog::LevelFilter::Info,
|
|
simplelog::Config::default(),
|
|
std::fs::File::options()
|
|
.append(true)
|
|
.create(true)
|
|
.open(helper_dir.join("auto_update_helper.log"))?,
|
|
)?;
|
|
Ok(())
|
|
}
|
|
|
|
pub(crate) fn show_error(mut content: String) {
|
|
if content.len() > 600 {
|
|
content.truncate(600);
|
|
content.push_str("...\n");
|
|
}
|
|
let _ = unsafe {
|
|
MessageBoxW(
|
|
None,
|
|
&HSTRING::from(content),
|
|
windows::core::w!("Error: Zed update failed."),
|
|
MB_ICONERROR | MB_SYSTEMMODAL,
|
|
)
|
|
};
|
|
}
|
|
}
|