Completely replace cfg::Table with toml::Table + helper functions; parse Tables from CLI and config.toml

Author: manpat

toybox-cfg/Cargo.toml

@@ -7,7 +7,7 @@ edition.workspace = true
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-toml = "0.8.10"
+toml = {version="0.8.10", features=["preserve_order"]}
 anyhow.workspace = true
 tracing.workspace = true
 log.workspace = true

toybox-cfg/src/lib.rs

@@ -1,10 +1,9 @@
 
 pub mod prelude {}
 
-pub mod table;
-use table::{Table, Value};
+mod table;
+use toml::{Table, Value};
 
-use std::path::{PathBuf};
 use tracing::instrument;
 
 use toybox_vfs::{Vfs, PathKind};
@@ -27,8 +26,6 @@ pub struct Config {
 	/// Combined config with overrides applied.
 	// TODO(pat.m): this is basically a cache but maybe I don't need this
 	resolved: Table,
-
-	save_path: PathBuf,
 }
 
 impl Config {
@@ -38,14 +35,15 @@ impl Config {
 		let mut config = Self::default();
 
 		if vfs.path_exists(PathKind::Config, "config.toml") {
-			config.base = Table::from_file(vfs, PathKind::Config, "config.toml")?;
+			config.base = table::load_from_vfs(vfs, PathKind::Config, "config.toml")?;
+
 		} else {
-			log::info!("Couldn't load config - writing defaults to {}", config.save_path.display());
+			log::info!("Couldn't load config - writing defaults to '{}'", vfs.local_data_root().display());
 			// TODO(pat.m): defaults?
-			config.base.save_to_file(vfs, PathKind::Config, "config.toml")?;
+			table::save_to_vfs(&config.base, vfs, PathKind::Config, "config.toml")?;
 		}
 
-		config.arguments = Table::from_cli()?;
+		config.arguments = table::load_from_cli()?;
 
 		// TODO(pat.m): resolve
 
@@ -57,17 +55,19 @@ impl Config {
 	#[instrument(skip_all, name="cfg Config::save")]
 	pub fn save(&self, vfs: &Vfs) -> anyhow::Result<()> {
 		// TODO(pat.m): extra resolve? 
-		self.base.save_to_file(vfs, PathKind::Config, "config.toml")
+		table::save_to_vfs(&self.base, vfs, PathKind::Config, "config.toml")
 	}
 
 	#[instrument(skip_all, name="cfg Config::commit")]
 	pub fn commit(&mut self) {
-		self.base.merge_from(&self.preview);
-		self.arguments.remove_values_in(&self.preview);
+		// self.base.merge_from(&self.preview);
+		// self.arguments.remove_values_in(&self.preview);
 
 		// TODO(pat.m): this may not be needed if preview config is automatically added to resolved
 		self.preview = Table::new();
 		self.resolved = Table::new();
+
+		todo!();
 	}
 
 	#[instrument(skip_all, name="cfg Config::revert")]
@@ -83,24 +83,34 @@ impl Config {
 		// 	return Some(value)
 		// }
 
-		if let Some(value) = self.preview.get_value(key) {
+		if let Some(value) = table::get_value(&self.preview, key) {
 			// self.resolved.set_value(key, value.clone());
 			return Some(value)
 		}
 
-		if let Some(value) = self.arguments.get_value(key) {
+		if let Some(value) = table::get_value(&self.arguments, key) {
 			// self.resolved.set_value(key, value.clone());
 			return Some(value)
 		}
 
-		if let Some(value) = self.base.get_value(key) {
+		if let Some(value) = table::get_value(&self.base, key) {
 			// self.resolved.set_value(key, value.clone());
 			return Some(value)
 		}
 
 		None
 	}
 
+	pub fn get_bool(&self, key: &str) -> Option<bool> {
+		self.get_value(key)
+			.and_then(Value::as_bool)
+	}
+
+	pub fn get_string(&self, key: &str) -> Option<&str> {
+		self.get_value(key)
+			.and_then(Value::as_str)
+	}
+
 	// pub fn get_value_or(&mut self, key: &str, default: impl Into<Value>) -> &Value {
 	// }
 }

toybox-cfg/src/table.rs

@@ -1,117 +1,70 @@
-use std::collections::HashMap;
 use std::path::Path;
 
+use toml::{Table, Value};
 use toybox_vfs::{Vfs, PathKind};
 
+// 	/// Copy or replace values present in `other`
+// 	pub fn merge_from(&mut self, _other: &Table) {
+// 		todo!()
+// 	}
 
-#[derive(Debug, Clone, Default)]
-pub struct Table {
-    data: HashMap<String, Value>,
-}
-
-
-impl Table {
-	pub fn new() -> Table {
-		Table::default()
-	}
-
-	pub fn from_file(vfs: &Vfs, kind: PathKind, path: impl AsRef<Path>) -> anyhow::Result<Table> {
-		let data = vfs.load_string(kind, path)?;
-		let raw: toml::Table = toml::from_str(&data)?;
-		let _ = dbg!(raw);
+// 	/// Recursively remove values from this table that are present in `other`
+// 	pub fn remove_values_in(&mut self, _other: &Table) {
+// 		todo!()
+// 	}
 
-		Ok(Table::default())
-	}
 
-	pub fn from_cli() -> anyhow::Result<Table> {
-		let mut args = std::env::args();
-		let _ = args.next(); // skip first arg
 
-		let _ = dbg!(args);
-
-		Ok(Table::default())
-	}
-
-	pub fn save_to_file(&self, vfs: &Vfs, kind: PathKind, path: impl AsRef<Path>) -> anyhow::Result<()> {
-		let toml = self.to_toml();
-		let string = toml::to_string_pretty(&toml)?;
-		vfs.save_data(kind, path, &string)
-	}
+pub fn load_from_vfs(vfs: &Vfs, kind: PathKind, path: impl AsRef<Path>) -> anyhow::Result<Table> {
+	let data = vfs.load_string(kind, path)?;
+	toml::from_str(&data).map_err(Into::into)
+}
 
-	/// Copy or replace values present in `other`
-	pub fn merge_from(&mut self, _other: &Table) {
-		todo!()
-	}
+pub fn load_from_cli() -> anyhow::Result<Table> {
+	let mut args = std::env::args();
+	let _ = args.next(); // skip first arg
 
-	/// Recursively remove values from this table that are present in `other`
-	pub fn remove_values_in(&mut self, _other: &Table) {
-		todo!()
-	}
+	let mut table = Table::default();
 
-	pub fn get_value(&self, key: &str) -> Option<&Value> {
-		if let Some((key, tail)) = key.split_once('.') {
-			let subtable = self.data.get(key)?
-				.as_table()?;
+	for arg in args {
+		let Some((key, value_str)) = arg.split_once('=') else {
+			log::warn!("Failed to parse CLI argument: '{arg}'");
+			continue
+		};
 
-			subtable.get_value(tail)
-		} else {
-			self.data.get(key)
-		}
+		set_value(&mut table, key.trim(), Value::String(value_str.trim().into()));
 	}
 
-	pub fn set_value(&mut self, key: &str, value: Value) {
-		if let Some((key, tail)) = key.split_once('.') {
-			let subtable = self.data.entry(key.into())
-				.or_insert(Value::Table(Default::default()))
-				.as_table_mut()
-				.expect("Trying to add value to non-table value");
-
-			subtable.set_value(tail, value);
-
-		} else {
-			self.data.insert(key.into(), value);
-		}
-	}
+	Ok(table)
+}
 
-	fn to_toml(&self) -> toml::Table {
-		let mut tbl = toml::Table::new();
+pub fn save_to_vfs(table: &Table, vfs: &Vfs, kind: PathKind, path: impl AsRef<Path>) -> anyhow::Result<()> {
+	let string = toml::to_string_pretty(table)?;
+	vfs.save_data(kind, path, &string)
+}
 
-		for (key, value) in self.data.iter() {
-			let value = match value {
-				Value::String(string) => toml::Value::String(string.clone()),
-				Value::Table(table) => toml::Value::Table(table.to_toml()),
-				Value::Bool(b) => toml::Value::Boolean(*b),
-			};
+pub fn get_value<'t>(table: &'t Table, key: &str) -> Option<&'t Value> {
+	if let Some((key, tail)) = key.split_once('.') {
+		let subtable = table.get(key)?
+			.as_table()?;
 
-			tbl.insert(key.clone(), value);
-		}
+		get_value(subtable, tail)
 
-		tbl
+	} else {
+		table.get(key)
 	}
 }
 
+pub fn set_value(table: &mut Table, key: &str, value: Value) {
+	if let Some((key, tail)) = key.split_once('.') {
+		let subtable = table.entry(key)
+			.or_insert(Value::Table(Default::default()))
+			.as_table_mut()
+			.expect("Trying to add value to non-table value");
 
+		set_value(subtable, tail, value);
 
-
-#[derive(Debug, Clone)]
-pub enum Value {
-	String(String),
-	Table(Table),
-	Bool(bool),
-}
-
-impl Value {
-	pub fn as_table(&self) -> Option<&Table> {
-		match self {
-			Value::Table(tbl) => Some(tbl),
-			_ => None
-		}
-	}
-	
-	pub fn as_table_mut(&mut self) -> Option<&mut Table> {
-		match self {
-			Value::Table(tbl) => Some(tbl),
-			_ => None
-		}
+	} else {
+		table.insert(key.into(), value);
 	}
 }