studio/tuwunel
2
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Support dot paths for -O/--option command-line args. (fixes #162) (fixes #167)

Browse Source 
Signed-off-by: Jason Volk <jason@zemos.net>
This commit is contained in:
Jason Volk
2025-09-22 20:29:19 +00:00
parent bffb7f89c8
commit 7cf246eb73
1 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/clap.rs
View File

@@ -179,11 +179,11 @@ pub(crate) fn update(mut config: Figment, args: &Args) -> Result<Figment> {
// All other individual overrides can go last in case we have options which // All other individual overrides can go last in case we have options which
// set multiple conf items at once and the user still needs granular overrides. // set multiple conf items at once and the user still needs granular overrides.
for option in &args.option { for option in &args.option {
let (key, val) = option let (path, val) = option
.split_once('=') .split_once('=')
.ok_or_else(|| err!("Missing '=' in -O/--option: {option:?}"))?; .ok_or_else(|| err!("Missing '=' in -O/--option: {option:?}"))?;
if key.is_empty() { if path.is_empty() {
return Err!("Missing key= in -O/--option: {option:?}"); return Err!("Missing key= in -O/--option: {option:?}");
} }
@@ -193,12 +193,9 @@ pub(crate) fn update(mut config: Figment, args: &Args) -> Result<Figment> {
// The value has to pass for what would appear as a line in the TOML file. // The value has to pass for what would appear as a line in the TOML file.
let val = toml::from_str::<FigmentValue>(option)?; let val = toml::from_str::<FigmentValue>(option)?;
let FigmentValue::Dict(_, val) = val else {
panic!("Unexpected Figment Value: {val:#?}");
};
// Figment::merge() overrides existing // Figment::merge() overrides existing
config = config.merge((key, val[key].clone())); config = config.merge((path, val.find(path)));
} }
Ok(config) Ok(config)