Add TOML parsing

2026-06-08 22:38:01 -06:00 · 2025-12-17 10:20:50 -07:00
parent 3ba5577b87
commit f8acdfb2dd
7 changed files with 210 additions and 36 deletions
@@ -496,6 +496,12 @@ version = "1.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "92773504d58c093f6de2459af4af33faa518c13451eb8f2b5698ed3d36e7c813"

+[[package]]
+name = "equivalent"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f"
+
 [[package]]
 name = "find-msvc-tools"
 version = "0.1.5"
@@ -602,6 +608,12 @@ dependencies = [
 "wasip2",
 ]

+[[package]]
+name = "hashbrown"
+version = "0.16.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "841d1cc9bed7f9236f321df977030373f4a4163ae1a7dbfe1a51a2c1a51d9100"
+
 [[package]]
 name = "headers"
 version = "0.4.1"
@@ -759,6 +771,16 @@ dependencies = [
 "cc",
 ]

+[[package]]
+name = "indexmap"
+version = "2.12.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0ad4bb2b565bca0645f4d68c5c9af97fba094e9791da685bf83cb5f3ce74acf2"
+dependencies = [
+ "equivalent",
+ "hashbrown",
+]
+
 [[package]]
 name = "inout"
 version = "0.1.4"
@@ -1205,6 +1227,15 @@ dependencies = [
 "serde_core",
 ]

+[[package]]
+name = "serde_spanned"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f8bbf91e5a4d6315eee45e704372590b30e260ee83af6639d64557f51b067776"
+dependencies = [
+ "serde_core",
+]
+
 [[package]]
 name = "serde_urlencoded"
 version = "0.7.1"
@@ -1454,6 +1485,45 @@ dependencies = [
 "syn 2.0.111",
 ]

+[[package]]
+name = "toml"
+version = "0.9.9+spec-1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "eb5238e643fc34a1d5d7e753e1532a91912d74b63b92b3ea51fde8d1b7bc79dd"
+dependencies = [
+ "indexmap",
+ "serde_core",
+ "serde_spanned",
+ "toml_datetime",
+ "toml_parser",
+ "toml_writer",
+ "winnow",
+]
+
+[[package]]
+name = "toml_datetime"
+version = "0.7.4+spec-1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fe3cea6b2aa3b910092f6abd4053ea464fab5f9c170ba5e9a6aead16ec4af2b6"
+dependencies = [
+ "serde_core",
+]
+
+[[package]]
+name = "toml_parser"
+version = "1.0.5+spec-1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4c03bee5ce3696f31250db0bbaff18bc43301ce0e8db2ed1f07cbb2acf89984c"
+dependencies = [
+ "winnow",
+]
+
+[[package]]
+name = "toml_writer"
+version = "1.0.5+spec-1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a9cd6190959dce0994aa8970cd32ab116d1851ead27e866039acaf2524ce44fa"
+
 [[package]]
 name = "tower"
 version = "0.5.2"
@@ -1570,6 +1640,7 @@ dependencies = [
 "sled",
 "static_init",
 "tokio",
+ "toml",
 "unshell-lib",
 "unshell-obfuscate",
 ]
@@ -1828,6 +1899,12 @@ version = "0.53.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d6bbff5f0aada427a1e5a6da5f1f98158182f26556f345ac9e04d36d0ebed650"

+[[package]]
+name = "winnow"
+version = "0.7.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5a5364e9d77fcdeeaa6062ced926ee3381faa2ee02d3eb83a5c27a8825540829"
+
 [[package]]
 name = "wit-bindgen"
 version = "0.46.0"
@@ -22,3 +22,4 @@ chrono = "0.4.42"
 static_init = "1.0.4"
 clap = {version = "4.5.53", features = ["derive"]}
 sled = "0.34.7"
+toml = "0.9.9"
@@ -1 +1,97 @@
+use std::{
+    collections::HashMap,
+    error::Error,
+    fs,
+    path::{Path, PathBuf},
+};

+use unshell_lib::debug;
+
+#[derive(Debug, Clone, serde::Deserialize, serde::Serialize)]
+pub struct ComponentMetadata {
+    name: String,
+    description: Option<String>,
+    version: Option<String>,
+    authors: Option<Vec<String>>,
+
+    // Struct to contain build information
+    build_config: BuildConfig,
+
+    // Other components that can be pointed to by this component
+    #[serde(default)]
+    child_components: Vec<PathBuf>,
+    // config: Option<HashMap<String, ConfigStructField>>,
+}
+
+#[derive(Debug, Clone, serde::Deserialize, serde::Serialize)]
+struct BuildConfig {
+    // Cargo feature list of a component
+    // (Name, Description)
+    #[serde(default)]
+    features: HashMap<String, String>,
+}
+
+#[derive(Debug, Clone, serde::Deserialize, serde::Serialize)]
+enum ConfigStructField {
+    Header(String),
+    Text(String),
+    String {
+        // Default value of string edit in struct
+        #[serde(default)]
+        default: String,
+        max_length: Option<usize>,
+        // Display string edit as password
+        #[serde(default)]
+        protected: Option<bool>,
+    },
+    Integer {
+        // Default value of integer in struct
+        #[serde(default)]
+        default: i32,
+        min: Option<i32>,
+        max: Option<i32>,
+    },
+    // Checkbox
+    // Dropdown
+    // Collapsing header
+    // Slider
+    // ...
+}
+
+pub fn load_config(path: &PathBuf) -> Result<Vec<ComponentMetadata>, Box<dyn Error>> {
+    let path_absolute = fs::canonicalize(path.clone())?;
+    debug!("Loading data from path: `{}`", path_absolute);
+
+    // Read string as path
+    let config_str = fs::read_to_string(path.clone())?;
+
+    // Load config from String
+    let config = toml::from_str::<ComponentMetadata>(&config_str)?;
+
+    if config.child_components.is_empty() {
+        Ok(vec![config])
+    } else {
+        let parent_path = path_absolute.parent().expect("Path must have parent");
+
+        let mut config_vec = vec![];
+
+        // Load each child component
+        for component_path in &config.child_components {
+            let path = Path::join(parent_path, component_path);
+            let mut config = load_config(&path)?;
+            config_vec.append(&mut config);
+        }
+
+        config_vec.insert(0, config);
+
+        Ok(config_vec)
+    }
+}
+
+// pub fn parse_toml() -> ComponentMetadata {
+//     let data = include_str!("../../test.toml");
+
+//     let config = toml::from_str(data).unwrap();
+
+//     config
+// }
@@ -19,6 +19,10 @@ pub struct Args {
    /// Name of database folder
    #[clap(short, long, default_value_t = DATABASE_NAME.clone())]
    database_name: String,
+
+    /// Load config from path
+    #[clap(short, long, value_parser)]
+    pub config: Option<Vec<String>>,
 }

 #[tokio::main]
@@ -1,22 +1,18 @@
 mod database;
 mod manager;

-use std::sync::{Arc, Mutex};
-
-use unshell_lib::module::Manager;
-
-use crate::SERVER_CONFIG;
-
 #[derive(Clone)]
 pub struct Server {
-    pub manager: Arc<Mutex<Manager>>,
+    pub config: Vec<crate::config::ComponentMetadata>,
+    // pub manager: Arc<Mutex<Manager>>,
    pub db: sled::Db,
 }

 impl Server {
    pub fn new(database: String) -> Self {
        Self {
-            manager: Manager::start(&SERVER_CONFIG, Vec::new()),
+            config: Vec::new(),
+            // manager: Manager::start(&SERVER_CONFIG, Vec::new()),
            db: sled::open(database).expect("Failed to open database"),
        }
    }
@@ -25,6 +21,6 @@ impl Server {
 impl Drop for Server {
    fn drop(&mut self) {
        self.db.flush().expect("Failed to flush database on drop");
-        Manager::join(self.manager.clone());
+        // Manager::join(self.manager.clone());
    }
 }