feat: 添加菜单配置处理逻辑，支持 QEMU 和 U-Boot 模式

Author: ZR233

ostool/src/ctx.rs

@@ -1,20 +1,12 @@
-use std::{
-    collections::HashMap,
-    path::{Path, PathBuf},
-    sync::Arc,
-};
+use std::{path::PathBuf, sync::Arc};
 
 use anyhow::anyhow;
 use cargo_metadata::Metadata;
 use colored::Colorize;
 use cursive::Cursive;
 use jkconfig::{
     ElemHock,
-    data::{
-        app_data::{AppData, default_schema_by_init},
-        item::ItemType,
-        types::ElementType,
-    },
+    data::{app_data::AppData, item::ItemType, types::ElementType},
     ui::components::editors::{show_feature_select, show_list_select},
 };
 
@@ -50,39 +42,6 @@ impl AppContext {
         Ok(())
     }
 
-    // axvisor
-    pub async fn launch_menuconfig_ui(&mut self) -> anyhow::Result<bool> {
-        let config_path = match &self.build_config_path {
-            Some(path) => path.clone(),
-            None => self.workspace_folder.join(".build.toml"),
-        };
-
-        // Ensure the configuration file exists
-        if !config_path.exists() {
-            println!(
-                "Configuration file does not exist, creating new file: {}",
-                config_path.display()
-            );
-            tokio::fs::write(&config_path, "").await?;
-        }
-
-        // Generate schema path
-        let schema_path = default_schema_by_init(&config_path);
-
-        // Create empty config file if it doesn't exist
-        if !config_path.exists() {
-            println!(
-                "Creating empty configuration file: {}",
-                config_path.display()
-            );
-            std::fs::write(&config_path, "")?;
-        }
-
-        let mut app_data = AppData::new(Some(config_path), Some(schema_path))?;
-
-        Ok(true)
-    }
-
     pub fn command(&self, program: &str) -> crate::utils::Command {
         let this = self.clone();
         crate::utils::Command::new(program, &self.manifest_dir, move |s| {
@@ -275,6 +234,11 @@ impl AppContext {
             format!("{}", self.workspace_folder.display()).as_ref(),
         )
     }
+
+    pub fn ui_hocks(&self) -> Vec<ElemHock> {
+        vec![self.ui_hock_feature_select(), self.ui_hock_pacage_select()]
+    }
+
     fn ui_hock_feature_select(&self) -> ElemHock {
         let path = "system.features";
         let cargo_toml = self.workspace_folder.join("Cargo.toml");

ostool/src/lib.rs

@@ -2,6 +2,7 @@
 
 pub mod build;
 pub mod ctx;
+pub mod menuconfig;
 pub mod run;
 pub mod sterm;
 pub mod utils;

ostool/src/main.rs

@@ -7,6 +7,7 @@ use log::info;
 use ostool::{
     build,
     ctx::AppContext,
+    menuconfig::{MenuConfigHandler, MenuConfigMode},
     run::{cargo::CargoRunnerKind, qemu::RunQemuArgs, uboot::RunUbootArgs},
 };
 
@@ -27,7 +28,11 @@ enum SubCommands {
         config: Option<PathBuf>,
     },
     Run(RunArgs),
-    Menuconfig,
+    Menuconfig {
+        /// Menu configuration mode (qemu or uboot)
+        #[arg(value_enum)]
+        mode: Option<MenuConfigMode>,
+    },
 }
 
 #[derive(Args, Debug)]
@@ -148,9 +153,8 @@ async fn main() -> Result<()> {
                 }
             }
         }
-        SubCommands::Menuconfig => {
-            let build_config = ctx.perpare_build_config(None, true).await?;
-            println!("Build configuration: {:?}", build_config);
+        SubCommands::Menuconfig { mode } => {
+            MenuConfigHandler::handle_menuconfig(&mut ctx, mode).await?;
         }
     }
 

ostool/src/menuconfig.rs

@@ -0,0 +1,97 @@
+use anyhow::Result;
+use clap::ValueEnum;
+use log::info;
+use tokio::fs;
+
+use crate::ctx::AppContext;
+use crate::run::qemu::QemuConfig;
+use crate::run::uboot::UbootConfig;
+
+#[derive(ValueEnum, Clone, Debug)]
+pub enum MenuConfigMode {
+    Qemu,
+    Uboot,
+}
+
+pub struct MenuConfigHandler;
+
+impl MenuConfigHandler {
+    pub async fn handle_menuconfig(
+        ctx: &mut AppContext,
+        mode: Option<MenuConfigMode>,
+    ) -> Result<()> {
+        match mode {
+            Some(MenuConfigMode::Qemu) => {
+                Self::handle_qemu_config(ctx).await?;
+            }
+            Some(MenuConfigMode::Uboot) => {
+                Self::handle_uboot_config(ctx).await?;
+            }
+            None => {
+                // 默认模式：显示当前构建配置
+                Self::handle_default_config(ctx).await?;
+            }
+        }
+        Ok(())
+    }
+
+    async fn handle_default_config(ctx: &mut AppContext) -> Result<()> {
+        ctx.perpare_build_config(None, true).await?;
+
+        Ok(())
+    }
+
+    async fn handle_qemu_config(ctx: &mut AppContext) -> Result<()> {
+        info!("配置 QEMU 运行参数");
+        let config_path = ctx.workspace_folder.join(".qemu.toml");
+        if config_path.exists() {
+            println!("\n当前 U-Boot 配置文件: {}", config_path.display());
+            // 这里可以读取并显示当前的 U-Boot 配置
+        } else {
+            println!("\n未找到 U-Boot 配置文件，将使用默认配置");
+        }
+
+        let config = jkconfig::run::<QemuConfig>(config_path, true, &[]).await?;
+
+        if let Some(c) = config {
+            fs::write(
+                ctx.value_replace_with_var(ctx.workspace_folder.join(".qemu.toml")),
+                toml::to_string_pretty(&c)?,
+            )
+            .await?;
+            println!("\nQEMU 配置已保存到 .qemu.toml");
+        } else {
+            println!("\n未更改 QEMU 配置");
+        }
+
+        Ok(())
+    }
+
+    async fn handle_uboot_config(ctx: &mut AppContext) -> Result<()> {
+        info!("配置 U-Boot 运行参数");
+
+        println!("=== U-Boot 配置模式 ===");
+
+        // 检查是否存在 U-Boot 配置文件
+        let uboot_config_path = ctx.workspace_folder.join(".uboot.toml");
+        if uboot_config_path.exists() {
+            println!("\n当前 U-Boot 配置文件: {}", uboot_config_path.display());
+            // 这里可以读取并显示当前的 U-Boot 配置
+        } else {
+            println!("\n未找到 U-Boot 配置文件，将使用默认配置");
+        }
+        let config = jkconfig::run::<UbootConfig>(uboot_config_path, true, &[]).await?;
+        if let Some(c) = config {
+            fs::write(
+                ctx.value_replace_with_var(ctx.workspace_folder.join(".uboot.toml")),
+                toml::to_string_pretty(&c)?,
+            )
+            .await?;
+            println!("\nU-Boot 配置已保存到 .uboot.toml");
+        } else {
+            println!("\n未更改 U-Boot 配置");
+        }
+
+        Ok(())
+    }
+}

test-build.toml

@@ -0,0 +1,9 @@
+[system]
+# 使用 Cargo 系统
+
+[system.cargo]
+target = "x86_64-unknown-none"
+package = "test-kernel"
+features = []
+log = "Info"
+to_bin = true