Improved Config Deserialization

Cargo.toml

@@ -20,3 +20,5 @@ anyhow = "1.0.100"
 clap = { version = "4.5.52", features = ["derive"] }
 num-bigint = "0.4.6"
 num-traits = "0.2.19"
+config = "0.15.19"
+serde = { version = "1.0.228", features = ["derive"] }

data/sample_config.toml

@@ -1,18 +1,20 @@
-[GenericChannel]
-id = 0
-
+[General]
+can_id = 0
+    [GenericChannel]
+    Variables = [
+        {id=1, value = 5}
+    ]
+
+
     [GenericChannel.GenericReqData]
     channel_mask = "0b11111111111"
     data = "0x12387168743618723648761283648"
-
+    
     [GenericChannel.GenericRequestNodeInfo]
     firmware_version = "0x0110101"
     channel_mask = "0b11111111111"
     channel_type = "0x01"
+    data = "0xFFEEAABBCCDDEEFF"
 
     [GenericChannel.GenericReqFlashClear]
-    status = 1
-
-    [GenericChannel.variables]
-    var1 = {id=1, value = 5}
-
+    status = 1

src/config/channels/generic_channel_config.rs

@@ -0,0 +1,39 @@
+use crate::config::config_representation::Variable;
+use crate::config::serde_binary_deserialize::deserialize_prefixed_biguint;
+use crate::config::serde_binary_deserialize::deserialize_prefixed_u32;
+use crate::protocol::channels::FlashStatus;
+use num_bigint::BigUint;
+use serde::Deserialize;
+
+#[derive(Deserialize)]
+#[serde(rename_all = "PascalCase")]
+pub struct GenericChannelConfig {
+    pub generic_request_data: Option<GenericReqdata>,
+    pub generic_request_node_info: Option<GenericRequestNodeInfo>,
+    pub generic_request_flash_clear: Option<GenericReqFlashClear>,
+    pub variables: Option<Vec<Variable>>,
+}
+
+#[derive(Deserialize)]
+pub struct GenericReqdata {
+    #[serde(deserialize_with = "deserialize_prefixed_u32")]
+    channel_mask: u32,
+    #[serde(deserialize_with = "deserialize_prefixed_biguint")]
+    data: BigUint,
+}
+
+#[derive(Deserialize)]
+pub struct GenericRequestNodeInfo {
+    #[serde(deserialize_with = "deserialize_prefixed_u32")]
+    firmware_version: u32,
+    #[serde(deserialize_with = "deserialize_prefixed_u32")]
+    channel_mask: u32,
+    #[serde(deserialize_with = "deserialize_prefixed_biguint")]
+    //TODO change to Option<BigUint> if needed(probably should..) -> implement deserialize for Option<BigUint>
+    data: BigUint,
+}
+
+#[derive(Deserialize)]
+pub struct GenericReqFlashClear {
+    status: FlashStatus,
+}

src/config/channels/mod.rs

@@ -0,0 +1 @@
+pub mod generic_channel_config;

src/config/config_loader.rs

@@ -1,18 +1,13 @@
-use crate::config::channel_parser::parse_generic_command_arguments;
-use crate::config::state_storage::StateStorage;
+use crate::config::config_representation::EmulatorConfig;
 use anyhow::{Context, Result};
-use std::path::Path;
-use toml::Table;
+use config::{Config, File};
 
-pub fn load_config(path: &Path) -> Result<StateStorage> {
-    let config_data = std::fs::read_to_string(path)
-        .with_context(|| format!("Failed to read config file {}", path.display()))?;
-    let config: Table = toml::from_str(&config_data)
-        .with_context(|| format!("Failed to parse config file {}", path.display()))?;
+pub fn load_config(path: &str) -> Result<EmulatorConfig> {
+    let config = Config::builder()
+        .add_source(File::with_name(path))
+        .build()?;
 
-    let mut state_storage = StateStorage::new();
-    parse_generic_command_arguments(&config, &mut state_storage)
-        .with_context(|| format!("Error parsing config file {}", path.display()))?;
-
-    Ok(state_storage)
+    config
+        .try_deserialize()
+        .with_context(|| format!("Failed to deserialize config from {}", path))
 }

src/config/config_representation.rs

@@ -0,0 +1,61 @@
+use crate::config::channels::generic_channel_config::GenericChannelConfig;
+use crate::config::serde_binary_deserialize::{deserialize_prefixed_u32, deserialize_prefixed_u8};
+use serde::{Deserialize, Serialize};
+
+#[derive(Serialize, Deserialize)]
+pub struct Variable {
+    #[serde(deserialize_with = "deserialize_prefixed_u8")]
+    pub id: u8,
+    #[serde(deserialize_with = "deserialize_prefixed_u32")]
+    pub value: u32,
+}
+#[derive(Deserialize)]
+#[serde(rename_all = "PascalCase")]
+pub struct EmulatorConfig {
+    pub general: GeneralSettings,
+    pub generic_channel: Option<GenericChannelConfig>,
+}
+
+#[derive(Deserialize)]
+pub struct GeneralSettings {
+    #[serde(deserialize_with = "deserialize_prefixed_u8")]
+    pub can_id: u8,
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use config::Config;
+    #[test]
+    pub fn test_load_config() {
+        let config = r#"
+    [General]
+can_id = 0
+[GenericChannel]
+    Variables = [
+        {id=1, value = 5}
+    ]
+
+
+    [GenericChannel.GenericReqData]
+    channel_mask = "0b11111111111"
+    data = "0x12387168743618723648761283648"
+
+    [GenericChannel.GenericRequestNodeInfo]
+    firmware_version = "0x0110101"
+    channel_mask = "0b11111111111"
+    channel_type = "0x01"
+    data = "0xFFEEAABBCCDDEEFF"
+
+    [GenericChannel.GenericReqFlashClear]
+    status = 1
+    "#;
+
+        let config = Config::builder()
+            .add_source(config::File::from_str(config, config::FileFormat::Toml))
+            .build()
+            .unwrap();
+
+        let emu_config: EmulatorConfig = config.try_deserialize().unwrap();
+    }
+}

src/config/mod.rs

@@ -1,3 +1,7 @@
 mod channel_parser;
 pub mod config_loader;
 pub mod state_storage;
+
+pub mod channels;
+pub mod config_representation;
+mod serde_binary_deserialize;