feat: 添加日志功能支持，更新相关结构体和回调逻辑

ZR233 · ZR233 · commit 2358e62df11d · 2025-11-11T18:17:51.000+08:00
diff --git a/jkconfig/Cargo.toml b/jkconfig/Cargo.toml
@@ -42,6 +42,7 @@ tower-http = {version = "0.6", features = ["fs", "cors"], optional = true}
 [features]
 default = ["web"]
 web = ["axum", "tokio", "tower", "tower-http", "chrono"]
+logging = []
 
 [dev-dependencies]
 env_logger = "0.11"
diff --git a/jkconfig/src/data/app_data.rs b/jkconfig/src/data/app_data.rs
@@ -7,16 +7,26 @@ use std::{
 };
 
 use anyhow::bail;
+use cursive::Cursive;
 
 use crate::data::{menu::MenuRoot, types::ElementType};
 
+pub type FeaturesCallback = Arc<dyn Fn() -> Vec<String> + Send + Sync>;
+
+#[derive(Clone)]
+pub struct ElemHock {
+    pub path: String,
+    pub callback: Arc<dyn Fn(&mut Cursive, &str) + Send + Sync>,
+}
+
 #[derive(Clone)]
 pub struct AppData {
     pub root: MenuRoot,
     pub current_key: Vec<String>,
     pub needs_save: bool,
     pub config: PathBuf,
     pub temp_data: Option<(String, serde_json::Value)>,
+    pub elem_hocks: Vec<ElemHock>,
     pub features_callback: Option<Arc<dyn Fn() -> Vec<String> + Send + Sync>>,
     pub depend_features_callback:
         Option<Arc<dyn Fn() -> HashMap<String, Vec<String>> + Send + Sync>>,
@@ -45,10 +55,7 @@ impl AppData {
         config: Option<impl AsRef<Path>>,
         schema: Option<impl AsRef<Path>>,
     ) -> anyhow::Result<Self> {
-        let mut init_value_path = PathBuf::from(DEFAULT_CONFIG_PATH);
-        if let Some(cfg) = config {
-            init_value_path = cfg.as_ref().to_path_buf();
-        }
+        let init_value_path = Self::init_value_path(config);
 
         let schema_path = if let Some(sch) = schema {
             sch.as_ref().to_path_buf()
@@ -62,8 +69,24 @@ impl AppData {
 
         let schema_content = fs::read_to_string(&schema_path)?;
         let schema_json: serde_json::Value = serde_json::from_str(&schema_content)?;
+        Self::new_with_schema(Some(init_value_path), &schema_json)
+    }
+
+    fn init_value_path(config: Option<impl AsRef<Path>>) -> PathBuf {
+        let mut init_value_path = PathBuf::from(DEFAULT_CONFIG_PATH);
+        if let Some(cfg) = config {
+            init_value_path = cfg.as_ref().to_path_buf();
+        }
+        init_value_path
+    }
+
+    pub fn new_with_schema(
+        config: Option<impl AsRef<Path>>,
+        schema: &serde_json::Value,
+    ) -> anyhow::Result<Self> {
+        let init_value_path = Self::init_value_path(config);
 
-        let mut root = MenuRoot::try_from(&schema_json)?;
+        let mut root = MenuRoot::try_from(schema)?;
 
         if init_value_path.exists() {
             let init_content = fs::read_to_string(&init_value_path)?;
@@ -94,6 +117,7 @@ impl AppData {
             temp_data: None,
             features_callback: None,
             depend_features_callback: None,
+            elem_hocks: Vec::new(),
         })
     }
 
diff --git a/jkconfig/src/lib.rs b/jkconfig/src/lib.rs
@@ -1,5 +1,8 @@
+// #[macro_use]
+// extern crate log;
+
 #[macro_use]
-extern crate log;
+mod log;
 
 pub mod data;
 // UI模块暂时注释掉，使用主程序中的 MenuView
diff --git a/jkconfig/src/log.rs b/jkconfig/src/log.rs
@@ -0,0 +1,35 @@
+// #[cfg(feature = "logging")]
+// macro_rules! debug {
+//     ($($arg:tt)*) => {
+//         log::debug!($($arg)*);
+//     };
+// }
+
+// #[cfg(not(feature = "logging"))]
+// macro_rules! debug {
+//     ($($arg:tt)*) => {};
+// }
+
+#[cfg(feature = "logging")]
+macro_rules! info {
+    ($($arg:tt)*) => {
+        log::info!($($arg)*);
+    };
+}
+
+#[cfg(not(feature = "logging"))]
+macro_rules! info {
+    ($($arg:tt)*) => {};
+}
+
+#[cfg(feature = "logging")]
+macro_rules! warn {
+    ($($arg:tt)*) => {
+        log::warn!($($arg)*);
+    };
+}
+
+#[cfg(not(feature = "logging"))]
+macro_rules! warn {
+    ($($arg:tt)*) => {};
+}
diff --git a/jkconfig/src/ui/components/editors/multi_select_editor.rs b/jkconfig/src/ui/components/editors/multi_select_editor.rs
@@ -4,7 +4,6 @@ use cursive::{
     view::{Nameable, Resizable},
     views::{Dialog, DummyView, LinearLayout, OnEventView, ScrollView, SelectView, TextView},
 };
-use log::info;
 
 use crate::{
     data::{app_data::AppData, item::ItemType, types::ElementType},
diff --git a/jkconfig/src/ui/components/menu.rs b/jkconfig/src/ui/components/menu.rs
@@ -16,8 +16,6 @@ use cursive::{
     view::{IntoBoxedView, Nameable, Resizable, Scrollable},
     views::{Dialog, DummyView, LinearLayout, OnEventView, Panel, SelectView, TextView},
 };
-use log::info;
-// 移除对ostool的依赖导入
 
 use super::editors::*;
 use crate::ui::components::editors::depend_features_editor::show_depend_features_editor;
@@ -632,6 +630,21 @@ fn enter_elem(s: &mut Cursive, elem: &ElementType) {
         path = app.key_string();
     }
 
+    let mut hocked = false;
+    if let Some(app_data) = s.user_data::<AppData>() {
+        for hook in app_data.elem_hocks.iter().cloned() {
+            if hook.path == path {
+                info!("Found hock for path: {}, type: {}", path, elem.struct_name);
+                (hook.callback)(s, &path);
+                hocked = true;
+                break;
+            }
+        }
+    }
+    if hocked {
+        return;
+    }
+
     match elem {
         ElementType::Menu(menu) => {
             info!("Handling Menu: {}", menu.title);
@@ -724,32 +737,34 @@ fn enter_elem(s: &mut Cursive, elem: &ElementType) {
                             create_multi_select_from_array_item(array_item, &enum_item.variants);
 
                         show_multi_select(s, &item.base.title, &multi_select_item);
-                    } else if path == "features.depend_features"
-                        || path == "system.features.depend_features"
-                    {
-                        let app_data = s.user_data::<AppData>().unwrap();
-                        let mut depend_map = std::collections::HashMap::new();
-
-                        if let Some(callback) = &app_data.depend_features_callback {
-                            let get_depend_features = || callback();
-                            if let Ok(features_map) = std::panic::catch_unwind(
-                                std::panic::AssertUnwindSafe(get_depend_features),
-                            ) {
-                                info!("depend_features_callback returned: {:?}", features_map);
-                                depend_map = features_map;
-                            }
-                        } else {
-                            info!("depend_features_callback is not set");
-                        }
-
-                        let depend_names: Vec<String> = depend_map.keys().cloned().collect();
-                        show_depend_features_editor(
-                            s,
-                            &item.base.title,
-                            &depend_names,
-                            &depend_map,
-                        );
-                    } else {
+                    } 
+                    // else if path == "features.depend_features"
+                    //     || path == "system.features.depend_features"
+                    // {
+                    //     let app_data = s.user_data::<AppData>().unwrap();
+                    //     let mut depend_map = std::collections::HashMap::new();
+
+                    //     if let Some(callback) = &app_data.depend_features_callback {
+                    //         let get_depend_features = || callback();
+                    //         if let Ok(features_map) = std::panic::catch_unwind(
+                    //             std::panic::AssertUnwindSafe(get_depend_features),
+                    //         ) {
+                    //             info!("depend_features_callback returned: {:?}", features_map);
+                    //             depend_map = features_map;
+                    //         }
+                    //     } else {
+                    //         info!("depend_features_callback is not set");
+                    //     }
+
+                    //     let depend_names: Vec<String> = depend_map.keys().cloned().collect();
+                    //     show_depend_features_editor(
+                    //         s,
+                    //         &item.base.title,
+                    //         &depend_names,
+                    //         &depend_map,
+                    //     );
+                    // } 
+                    else {
                         show_array_edit(s, &item.base.key(), &item.base.title, &array_item.values);
                     }
                 }
diff --git a/ostool/src/build/config.rs b/ostool/src/build/config.rs
@@ -33,7 +33,7 @@ pub struct Cargo {
     /// package name
     pub package: String,
     /// features to enable
-    pub features: Features,
+    pub features: Vec<String>,
     /// log level feature
     pub log: Option<LogLevel>,
     /// extra cargo .config.toml file
@@ -50,12 +50,6 @@ pub struct Cargo {
     pub to_bin: bool,
 }
 
-#[derive(Default, Debug, Clone, Serialize, Deserialize, JsonSchema, PartialEq)]
-pub struct Features {
-    pub self_features: Vec<String>,
-    pub depend_features: Vec<Depend>,
-}
-
 #[derive(Debug, Clone, Serialize, Deserialize, JsonSchema, PartialEq)]
 pub struct Depend {
     pub name: String,
diff --git a/ostool/src/build/mod.rs b/ostool/src/build/mod.rs
@@ -36,7 +36,7 @@ impl AppContext {
             self.shell_run_cmd(cmd)?;
         }
 
-        let mut features = config.features.self_features.clone();
+        let mut features = config.features.clone();
         if let Some(log_level) = &self.log_level_feature(config) {
             features.push(log_level.to_string());
         }
diff --git a/ostool/src/ctx.rs b/ostool/src/ctx.rs
@@ -80,54 +80,54 @@ impl AppContext {
     pub fn launch_jkconfig_ui(config_path: &Path, schema_path: &Path) -> anyhow::Result<bool> {
         let mut app_data = AppData::new(Some(config_path), Some(schema_path))?;
 
-        app_data.features_callback = Some(std::sync::Arc::new(|| {
-            let mut features = Vec::new();
-
-            if let Ok(metadata) = cargo_metadata::MetadataCommand::new().no_deps().exec() {
-                let workspace_root = metadata.workspace_root.clone();
-                if let Some(current_package) = metadata
-                    .packages
-                    .iter()
-                    .find(|p| p.manifest_path.starts_with(&workspace_root))
-                {
-                    for (feature_name, _) in &current_package.features {
-                        features.push(feature_name.clone());
-                    }
-                }
-            }
-            features
-        }));
-
-        // 设置depend_features_callback以获取依赖项及其features
-        app_data.depend_features_callback = Some(std::sync::Arc::new(|| {
-            let mut depend_features = HashMap::new();
-
-            if let Ok(metadata) = cargo_metadata::MetadataCommand::new().exec() {
-                let workspace_root = metadata.workspace_root.clone();
-                if let Some(current_package) = metadata
-                    .packages
-                    .iter()
-                    .find(|p| p.manifest_path.starts_with(&workspace_root))
-                {
-                    // 遍历所有依赖项
-                    for dependency in &current_package.dependencies {
-                        let dep_name = dependency.name.clone();
-                        let mut dep_features = Vec::new();
-
-                        if let Some(dep_package) =
-                            metadata.packages.iter().find(|p| p.name == dep_name)
-                        {
-                            for (feature_name, _) in &dep_package.features {
-                                dep_features.push(feature_name.clone());
-                            }
-                        }
-
-                        depend_features.insert(dep_name, dep_features);
-                    }
-                }
-            }
-            depend_features
-        }));
+        // app_data.features_callback = Some(std::sync::Arc::new(|| {
+        //     let mut features = Vec::new();
+
+        //     if let Ok(metadata) = cargo_metadata::MetadataCommand::new().no_deps().exec() {
+        //         let workspace_root = metadata.workspace_root.clone();
+        //         if let Some(current_package) = metadata
+        //             .packages
+        //             .iter()
+        //             .find(|p| p.manifest_path.starts_with(&workspace_root))
+        //         {
+        //             for (feature_name, _) in &current_package.features {
+        //                 features.push(feature_name.clone());
+        //             }
+        //         }
+        //     }
+        //     features
+        // }));
+
+        // // 设置depend_features_callback以获取依赖项及其features
+        // app_data.depend_features_callback = Some(std::sync::Arc::new(|| {
+        //     let mut depend_features = HashMap::new();
+
+        //     if let Ok(metadata) = cargo_metadata::MetadataCommand::new().exec() {
+        //         let workspace_root = metadata.workspace_root.clone();
+        //         if let Some(current_package) = metadata
+        //             .packages
+        //             .iter()
+        //             .find(|p| p.manifest_path.starts_with(&workspace_root))
+        //         {
+        //             // 遍历所有依赖项
+        //             for dependency in &current_package.dependencies {
+        //                 let dep_name = dependency.name.clone();
+        //                 let mut dep_features = Vec::new();
+
+        //                 if let Some(dep_package) =
+        //                     metadata.packages.iter().find(|p| p.name == dep_name)
+        //                 {
+        //                     for (feature_name, _) in &dep_package.features {
+        //                         dep_features.push(feature_name.clone());
+        //                     }
+        //                 }
+
+        //                 depend_features.insert(dep_name, dep_features);
+        //             }
+        //         }
+        //     }
+        //     depend_features
+        // }));
 
         run_tui(app_data)?;
 
diff --git a/ostool/src/run/cargo.rs b/ostool/src/run/cargo.rs
@@ -101,7 +101,7 @@ impl CargoRunner {
             ctx.shell_run_cmd(cmd)?;
         }
 
-        let mut features = config.features.self_features.clone();
+        let mut features = config.features.clone();
         if let Some(log_level) = &self.log_level_feature(ctx, &config) {
             features.push(log_level.to_string());
         }

Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ impl AppContext {`
`36`	`36`	`self.shell_run_cmd(cmd)?;`
`37`	`37`	`}`
`38`	`38`
`39`		`- let mut features = config.features.self_features.clone();`
	`39`	`+ let mut features = config.features.clone();`
`40`	`40`	`if let Some(log_level) = &self.log_level_feature(config) {`
`41`	`41`	`features.push(log_level.to_string());`
`42`	`42`	`}`
Original file line number	Diff line number	Diff line change
`@@ -101,7 +101,7 @@ impl CargoRunner {`
`101`	`101`	`ctx.shell_run_cmd(cmd)?;`
`102`	`102`	`}`
`103`	`103`
`104`		`- let mut features = config.features.self_features.clone();`
	`104`	`+ let mut features = config.features.clone();`
`105`	`105`	`if let Some(log_level) = &self.log_level_feature(ctx, &config) {`
`106`	`106`	`features.push(log_level.to_string());`
`107`	`107`	`}`