feat: 添加 thiserror 依赖并改进错误处理

Author: ZR233

Cargo.lock

@@ -57,4 +57,5 @@ lzma-rs = "0.3"
 regex = "1"
 sha2 = "0.10"
 tar = "0.4"
+thiserror = {workspace = true}
 ureq = "3.0"

ostool/Cargo.toml

@@ -1,4 +1,8 @@
-use std::{env, path::PathBuf, process::exit};
+use std::{
+    env,
+    path::PathBuf,
+    process::{ExitCode, exit},
+};
 
 use clap::{Parser, Subcommand};
 use log::{LevelFilter, debug};
@@ -76,7 +80,18 @@ struct CliUboot {
 }
 
 #[tokio::main]
-async fn main() -> anyhow::Result<()> {
+async fn main() -> ExitCode {
+    match try_main().await {
+        Ok(()) => ExitCode::SUCCESS,
+        Err(err) => {
+            eprintln!("Error: {err:#}");
+            eprintln!("\nTrace:\n{err:?}");
+            ExitCode::FAILURE
+        }
+    }
+}
+
+async fn try_main() -> anyhow::Result<()> {
     env_logger::builder()
         .format_module_path(false)
         .filter_level(LevelFilter::Info)
@@ -118,7 +133,7 @@ async fn main() -> anyhow::Result<()> {
         ..Default::default()
     };
 
-    app.set_elf_path(args.elf).await;
+    app.set_elf_path(args.elf).await?;
     app.objcopy_elf()?;
 
     app.debug = args.debug;

ostool/src/bin/cargo-osrun.rs

@@ -11,7 +11,13 @@ use std::{
 
 use colored::Colorize;
 
-use crate::{build::config::Cargo, ctx::AppContext, utils::Command};
+use anyhow::Context;
+
+use crate::{
+    build::config::Cargo,
+    ctx::AppContext,
+    utils::{Command, PathResultExt},
+};
 
 /// A builder for constructing and executing Cargo commands.
 ///
@@ -237,7 +243,7 @@ impl<'a> CargoBuilder<'a> {
             .join(if self.ctx.debug { "debug" } else { "release" })
             .join(&self.config.package);
 
-        self.ctx.set_elf_path(elf_path).await;
+        self.ctx.set_elf_path(elf_path).await?;
 
         if self.config.to_bin && !self.skip_objcopy {
             self.ctx.objcopy_output_bin()?;
@@ -310,7 +316,12 @@ impl<'a> CargoBuilder<'a> {
                 if let Some(ref config_path) = self.config_path {
                     let combined = config_path
                         .parent()
-                        .ok_or_else(|| anyhow::anyhow!("Invalid config path"))?
+                        .ok_or_else(|| {
+                            anyhow::anyhow!(
+                                "invalid config path without parent: {}",
+                                config_path.display()
+                            )
+                        })?
                         .join(extra);
                     Ok(Some(combined))
                 } else {
@@ -397,7 +408,8 @@ impl<'a> CargoBuilder<'a> {
         // Write to temp file
         tokio::fs::write(&target_path, content)
             .await
-            .map_err(|e| anyhow::anyhow!("Failed to write to temp file: {}", e))?;
+            .with_path("failed to write downloaded cargo config", &target_path)
+            .with_context(|| format!("while downloading cargo config from {url}"))?;
 
         println!("Config downloaded to: {}", target_path.display());
 

ostool/src/build/cargo_builder.rs

@@ -28,6 +28,7 @@ use crate::{
         config::{Cargo, Custom},
     },
     ctx::AppContext,
+    utils::PathResultExt,
 };
 
 /// Cargo builder implementation for building projects.
@@ -150,18 +151,25 @@ impl AppContext {
                 dir.clone()
             };
 
-            bin_path
-                .canonicalize()
-                .or_else(|_| {
-                    if let Some(parent) = bin_path.parent() {
-                        parent
-                            .canonicalize()
-                            .map(|p| p.join(bin_path.file_name().unwrap()))
-                    } else {
-                        Ok(bin_path.clone())
-                    }
-                })
-                .context("Failed to normalize path")
+            match bin_path.canonicalize() {
+                Ok(path) => Ok(path),
+                Err(file_err) => {
+                    let Some(parent) = bin_path.parent() else {
+                        return Err(file_err).with_path("failed to canonicalize path", &bin_path);
+                    };
+                    let Some(file_name) = bin_path.file_name() else {
+                        return Err(file_err).with_path("failed to canonicalize path", &bin_path);
+                    };
+
+                    parent
+                        .canonicalize()
+                        .map(|parent_dir| parent_dir.join(file_name))
+                        .with_path("failed to canonicalize parent path", parent)
+                        .with_context(|| {
+                            format!("failed to normalize path: {}", bin_path.display())
+                        })
+                }
+            }
         };
 
         let build_dir = self

ostool/src/build/mod.rs

@@ -6,7 +6,7 @@
 
 use std::{path::PathBuf, sync::Arc};
 
-use anyhow::anyhow;
+use anyhow::{Context, anyhow};
 use cargo_metadata::Metadata;
 use colored::Colorize;
 use cursive::Cursive;
@@ -19,7 +19,7 @@ use jkconfig::{
 use object::{Architecture, Object};
 use tokio::fs;
 
-use crate::build::config::BuildConfig;
+use crate::{build::config::BuildConfig, utils::PathResultExt};
 
 /// Configuration for output directories.
 ///
@@ -148,30 +148,28 @@ impl AppContext {
         let res = cargo_metadata::MetadataCommand::new()
             .current_dir(&self.paths.manifest)
             .no_deps()
-            .exec()?;
+            .exec()
+            .with_context(|| {
+                format!(
+                    "failed to load cargo metadata from {}",
+                    self.paths.manifest.display()
+                )
+            })?;
         Ok(res)
     }
 
     /// Sets the ELF file path and detects its architecture.
     ///
     /// This also reads the ELF file to detect the target CPU architecture.
-    pub async fn set_elf_path(&mut self, path: PathBuf) {
+    pub async fn set_elf_path(&mut self, path: PathBuf) -> anyhow::Result<()> {
         self.paths.artifacts.elf = Some(path.clone());
-        let binary_data = match fs::read(path).await {
-            Ok(data) => data,
-            Err(e) => {
-                println!("Failed to read ELF file: {e}");
-                return;
-            }
-        };
-        let file = match object::File::parse(binary_data.as_slice()) {
-            Ok(f) => f,
-            Err(e) => {
-                println!("Failed to parse ELF file: {e}");
-                return;
-            }
-        };
-        self.arch = Some(file.architecture())
+        let binary_data = fs::read(&path)
+            .await
+            .with_path("failed to read ELF file", &path)?;
+        let file = object::File::parse(binary_data.as_slice())
+            .with_context(|| format!("failed to parse ELF file: {}", path.display()))?;
+        self.arch = Some(file.architecture());
+        Ok(())
     }
 
     /// Strips debug symbols from the ELF file.
@@ -191,13 +189,15 @@ impl AppContext {
             .artifacts
             .elf
             .as_ref()
-            .ok_or(anyhow!("elf not exist"))?
-            .canonicalize()?;
+            .ok_or(anyhow!("elf not exist"))?;
+        let elf_path = elf_path
+            .canonicalize()
+            .with_path("failed to canonicalize file", elf_path)?;
 
         let stripped_elf_path = elf_path.with_file_name(
             elf_path
                 .file_stem()
-                .ok_or(anyhow!("Invalid file path"))?
+                .ok_or_else(|| anyhow!("invalid ELF file path: {}", elf_path.display()))?
                 .to_string_lossy()
                 .to_string()
                 + ".elf",
@@ -251,12 +251,14 @@ impl AppContext {
             .artifacts
             .elf
             .as_ref()
-            .ok_or(anyhow!("elf not exist"))?
-            .canonicalize()?;
+            .ok_or(anyhow!("elf not exist"))?;
+        let elf_path = elf_path
+            .canonicalize()
+            .with_path("failed to canonicalize file", elf_path)?;
 
         let bin_name = elf_path
             .file_stem()
-            .ok_or(anyhow!("Invalid file path"))?
+            .ok_or_else(|| anyhow!("invalid ELF file path: {}", elf_path.display()))?
             .to_string_lossy()
             .to_string()
             + ".bin";
@@ -268,7 +270,7 @@ impl AppContext {
         };
 
         if let Some(parent) = bin_path.parent() {
-            std::fs::create_dir_all(parent)?;
+            std::fs::create_dir_all(parent).with_path("failed to create directory", parent)?;
         }
 
         println!(
@@ -326,11 +328,12 @@ impl AppContext {
         self.build_config_path = Some(config_path.clone());
 
         let Some(c): Option<BuildConfig> = jkconfig::run(
-            config_path,
+            config_path.clone(),
             menu,
             &[self.ui_hock_feature_select(), self.ui_hock_pacage_select()],
         )
-        .await?
+        .await
+        .with_context(|| format!("failed to load build config: {}", config_path.display()))?
         else {
             anyhow::bail!("No build configuration obtained");
         };

ostool/src/ctx.rs

@@ -1,6 +1,6 @@
-use std::{env::current_dir, path::PathBuf};
+use std::{env::current_dir, path::PathBuf, process::ExitCode};
 
-use anyhow::Result;
+use anyhow::{Context, Result};
 use clap::*;
 
 use log::info;
@@ -70,7 +70,18 @@ pub struct UbootArgs {
 }
 
 #[tokio::main]
-async fn main() -> Result<()> {
+async fn main() -> ExitCode {
+    match try_main().await {
+        Ok(()) => ExitCode::SUCCESS,
+        Err(err) => {
+            eprintln!("Error: {err:#}");
+            eprintln!("\nTrace:\n{err:?}");
+            ExitCode::FAILURE
+        }
+    }
+}
+
+async fn try_main() -> Result<()> {
     #[cfg(not(feature = "ui-log"))]
     {
         env_logger::builder()
@@ -81,7 +92,7 @@ async fn main() -> Result<()> {
 
     let cli = Cli::parse();
 
-    let pwd = current_dir()?;
+    let pwd = current_dir().context("failed to get current working directory")?;
 
     let workspace_folder = match cli.workdir {
         Some(dir) => dir,
@@ -119,7 +130,7 @@ async fn main() -> Result<()> {
                 }
                 build::config::BuildSystem::Custom(custom_cfg) => {
                     ctx.shell_run_cmd(&custom_cfg.build_cmd)?;
-                    ctx.set_elf_path(custom_cfg.elf_path.clone().into()).await;
+                    ctx.set_elf_path(custom_cfg.elf_path.clone().into()).await?;
                     info!(
                         "ELF {:?}: {}",
                         ctx.arch,

ostool/src/main.rs

@@ -8,6 +8,7 @@
 //! - QEMU settings (`.qemu.toml`)
 //! - U-Boot settings (`.uboot.toml`)
 
+use anyhow::Context;
 use anyhow::Result;
 use clap::ValueEnum;
 use log::info;
@@ -16,6 +17,7 @@ use tokio::fs;
 use crate::ctx::AppContext;
 use crate::run::qemu::QemuConfig;
 use crate::run::uboot::UbootConfig;
+use crate::utils::PathResultExt;
 
 /// Menu configuration mode selector.
 #[derive(ValueEnum, Clone, Debug)]
@@ -76,14 +78,15 @@ impl MenuConfigHandler {
             println!("\n未找到 U-Boot 配置文件，将使用默认配置");
         }
 
-        let config = jkconfig::run::<QemuConfig>(config_path, true, &[]).await?;
+        let config = jkconfig::run::<QemuConfig>(config_path.clone(), true, &[])
+            .await
+            .with_context(|| format!("failed to load QEMU config: {}", config_path.display()))?;
 
         if let Some(c) = config {
-            fs::write(
-                ctx.value_replace_with_var(ctx.paths.workspace.join(".qemu.toml")),
-                toml::to_string_pretty(&c)?,
-            )
-            .await?;
+            let save_path = ctx.paths.workspace.join(".qemu.toml");
+            fs::write(&save_path, toml::to_string_pretty(&c)?)
+                .await
+                .with_path("failed to write file", &save_path)?;
             println!("\nQEMU 配置已保存到 .qemu.toml");
         } else {
             println!("\n未更改 QEMU 配置");
@@ -105,13 +108,18 @@ impl MenuConfigHandler {
         } else {
             println!("\n未找到 U-Boot 配置文件，将使用默认配置");
         }
-        let config = jkconfig::run::<UbootConfig>(uboot_config_path, true, &[]).await?;
+        let config = jkconfig::run::<UbootConfig>(uboot_config_path.clone(), true, &[])
+            .await
+            .with_context(|| {
+                format!(
+                    "failed to load U-Boot config: {}",
+                    uboot_config_path.display()
+                )
+            })?;
         if let Some(c) = config {
-            fs::write(
-                ctx.value_replace_with_var(ctx.paths.workspace.join(".uboot.toml")),
-                toml::to_string_pretty(&c)?,
-            )
-            .await?;
+            fs::write(&uboot_config_path, toml::to_string_pretty(&c)?)
+                .await
+                .with_path("failed to write file", &uboot_config_path)?;
             println!("\nU-Boot 配置已保存到 .uboot.toml");
         } else {
             println!("\n未更改 U-Boot 配置");