Merge pull request drivercraft#18 from Josen-B/main

features: self_features and depend_features displayed and selected in jkconfig ui

Author: ZR233

Cargo.lock

@@ -5,7 +5,6 @@
 use crate::error::Result;
 use crate::fit::config::{ComponentConfig, FitImageConfig};
 use crate::fit::{FdtHeader, FdtToken, FdtTokenUtils, MemReserveEntry, StringTable};
-use crate::hash::{calculate_hashes, default_hash_algorithms};
 
 /// Standard FDT builder that creates U-Boot compatible FIT images
 pub struct StandardFdtBuilder {
@@ -303,30 +302,6 @@ impl StandardFdtBuilder {
         Ok(())
     }
 
-    /// Add hash nodes for component data
-    fn add_hash_nodes(&mut self, data: &[u8]) -> Result<()> {
-        let hash_algorithms = default_hash_algorithms();
-        let hash_results = calculate_hashes(data, &hash_algorithms);
-
-        for (i, hash_result) in hash_results.iter().enumerate() {
-            // Create hash node name (hash-1, hash-2, etc.)
-            let hash_node_name = format!("hash-{}", i + 1);
-            self.begin_node(&hash_node_name)?;
-
-            // Add algorithm property
-            self.add_property_string("algo", hash_result.algorithm_name())?;
-
-            // Add value property - convert hex string to bytes
-            let hash_value = hash_result.value();
-            let hash_bytes = hex::decode(hash_value).unwrap_or_default();
-            self.add_property_data("value", &hash_bytes)?;
-
-            self.end_node()?;
-        }
-
-        Ok(())
-    }
-
     /// Begin a node
     fn begin_node(&mut self, name: &str) -> Result<()> {
         FdtToken::BeginNode.write_to_buffer(&mut self.struct_buffer);

fitimage/src/fit/standard_dt_builder.rs

@@ -23,7 +23,8 @@ anyhow = {workspace = true}
 clap = {workspace = true, features = ["derive"]}
 serde = {workspace = true, features = ["derive"]}
 serde_json = {workspace = true}
-
+schemars = {workspace = true, features = ["derive"]}
+cargo_metadata = "0.23"
 toml = {workspace = true}
 
 # Error handling
@@ -42,6 +43,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"

jkconfig/Cargo.toml

@@ -1,19 +1,35 @@
 use std::{
+    collections::HashMap,
     fs,
     path::{Path, PathBuf},
+    sync::Arc,
     time::SystemTime,
 };
 
 use anyhow::bail;
+use cursive::Cursive;
 
 use crate::data::{menu::MenuRoot, types::ElementType};
 
+pub type FeaturesCallback = Arc<dyn Fn() -> Vec<String> + Send + Sync>;
+
+pub type HockCallback = Arc<dyn Fn(&mut Cursive, &str) + Send + Sync>;
+
+#[derive(Clone)]
+pub struct ElemHock {
+    pub path: String,
+    pub callback: HockCallback,
+}
+
 #[derive(Clone)]
 pub struct AppData {
     pub root: MenuRoot,
     pub current_key: Vec<String>,
     pub needs_save: bool,
     pub config: PathBuf,
+    pub user_data: HashMap<String, String>,
+    pub temp_data: Option<(String, serde_json::Value)>,
+    pub elem_hocks: Vec<ElemHock>,
 }
 
 const DEFAULT_CONFIG_PATH: &str = ".config.toml";
@@ -39,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()
@@ -56,8 +69,60 @@ 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_init_and_schema(
+        init: &str,
+        init_value_path: &Path,
+        schema: &serde_json::Value,
+    ) -> anyhow::Result<Self> {
+        let mut root = MenuRoot::try_from(schema)?;
+
+        if !init.trim().is_empty() {
+            let init_json: serde_json::Value = match init_value_path
+                .extension()
+                .and_then(|s| s.to_str())
+                .unwrap_or("")
+            {
+                "json" => serde_json::from_str(init)?,
+                "toml" => {
+                    let v: toml::Value = toml::from_str(init)?;
+                    serde_json::to_value(v)?
+                }
+                ext => {
+                    bail!("Unsupported config file extension: {ext:?}");
+                }
+            };
+            root.update_by_value(&init_json)?;
+        }
+
+        Ok(AppData {
+            root,
+            current_key: Vec::new(),
+            needs_save: false,
+            config: init_value_path.into(),
+            temp_data: None,
+            elem_hocks: Vec::new(),
+            user_data: HashMap::new(),
+        })
+    }
+
+    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)?;
@@ -85,6 +150,9 @@ impl AppData {
             current_key: Vec::new(),
             needs_save: false,
             config: init_value_path,
+            temp_data: None,
+            elem_hocks: Vec::new(),
+            user_data: HashMap::new(),
         })
     }
 

jkconfig/src/data/app_data.rs

@@ -30,7 +30,7 @@ pub enum ItemType {
     Array(ArrayItem),
 }
 
-#[derive(Debug, Clone)]
+#[derive(Debug, Clone, serde::Serialize, serde::Deserialize)]
 pub struct ArrayItem {
     /// Array element type (e.g., "string", "integer")
     pub element_type: String,

jkconfig/src/data/item.rs

@@ -1,12 +1,17 @@
+// #[macro_use]
+// extern crate log;
+
 #[macro_use]
-extern crate log;
+mod log;
 
 pub mod data;
 // UI模块暂时注释掉，使用主程序中的 MenuView
+pub mod run;
 pub mod ui;
 
 // Web服务器模块（需要web feature）
 #[cfg(feature = "web")]
 pub mod web;
 
+pub use run::*;
 pub use serde_json::Value;

jkconfig/src/lib.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)*) => {};
+}

jkconfig/src/log.rs

@@ -1,12 +1,10 @@
-extern crate log;
-
 use clap::{Parser, Subcommand};
-use cursive::{Cursive, CursiveExt, event::Key, views::Dialog};
+use cursive::{Cursive, CursiveExt, event::Key};
 use std::path::PathBuf;
 
 use jkconfig::{
     data::AppData,
-    ui::{components::menu::menu_view, handle_back, handle_quit},
+    ui::{components::menu::menu_view, handle_back, handle_quit, handle_save},
 };
 
 // mod menu_view;
@@ -106,19 +104,3 @@ fn run_tui(app_data: AppData) -> anyhow::Result<()> {
 
     Ok(())
 }
-
-/// 处理保存 - S键
-fn handle_save(siv: &mut Cursive) {
-    siv.add_layer(
-        Dialog::text("Save and exit?")
-            .title("Save")
-            .button("Ok", |s| {
-                let app = s.user_data::<AppData>().unwrap();
-                app.needs_save = true;
-                s.quit();
-            })
-            .button("Cancel", |s| {
-                s.pop_layer();
-            }),
-    );
-}