Fix cli args merging (#49)

* fixed cli arg prioritization * fixed multiple versions and target input over cli args --------- Co-authored-by: Petr Gadorek <[email protected]>
espressif · Sep 20, 2024 · 6c79f8c · 6c79f8c
1 parent 1340297
commit 6c79f8c
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 18 deletions.
diff --git a/eim_config.toml b/eim_config.toml
diff --git a/src/cli_args/mod.rs b/src/cli_args/mod.rs
@@ -1,12 +1,13 @@
 use clap::builder::styling::{AnsiColor, Color, Style, Styles};
 use clap::{arg, command, ColorChoice, Parser};
-use config::{Config, ConfigError, File};
+use config::{Config, ConfigError, File, ValueKind};
 use idf_im_lib::get_log_directory;
 use log::{debug, info, LevelFilter};
 use serde::{Deserialize, Serialize};
 use std::fs::OpenOptions;
 use std::io::Write;
 use std::path::PathBuf;
+use toml::value::Array;
 
 use log4rs::{
     append::{console::ConsoleAppender, file::FileAppender},
@@ -61,13 +62,27 @@ fn custom_styles() -> Styles {
     styles = custom_styles()
 )]
 pub struct Cli {
+    #[arg(
+        short,
+        long,
+        help = "Base Path to which all the files and folder will be installed"
+    )]
+    path: Option<String>,
     #[arg(short, long, value_name = "FILE")]
     config: Option<PathBuf>,
 
-    #[arg(short, long)]
+    #[arg(
+        short,
+        long,
+        help = "You can provide multiple targets separated by comma"
+    )]
     target: Option<String>,
 
-    #[arg(short, long)]
+    #[arg(
+        short,
+        long,
+        help = "you can provide multiple versions of ESP-IDF separated by comma"
+    )]
     idf_versions: Option<String>,
 
     #[arg(long)]
@@ -144,17 +159,15 @@ impl Settings {
 
         builder = builder.add_source(config::Environment::with_prefix("ESP").separator("_"));
 
-        let mut cfg = builder.build()?;
-
         for (key, value) in cli.into_iter() {
             if let Some(v) = value {
                 if key != "config" {
                     debug!("Setting {} to {:?}", key, v);
-                    cfg.set(&key, v)?;
+                    builder = builder.set_override(key, v)?;
                 }
             }
         }
-
+        let cfg = builder.build()?;
         cfg.try_deserialize()
     }
 
@@ -246,6 +259,7 @@ impl IntoIterator for Cli {
 
     fn into_iter(self) -> Self::IntoIter {
         vec![
+            ("path".to_string(), self.path.map(Into::into)),
             (
                 "config".to_string(),
                 self.config.map(|p| p.to_str().unwrap().into()),
@@ -260,7 +274,7 @@ impl IntoIterator for Cli {
                     .map(|s| s.split(',').collect::<Vec<&str>>().into()),
             ),
             (
-                "idf_version".to_string(),
+                "idf_versions".to_string(),
                 self.idf_versions
                     .map(|s| s.split(',').collect::<Vec<&str>>().into()),
             ),