refactor: parse CLI into settings partial

src/cli/mod.rs

@@ -1,8 +1,9 @@
 use crate::cli::self_update::SelfUpdate;
 use clap::{FromArgMatches, Subcommand};
 use color_eyre::Result;
+use confique::Partial;
 
-use crate::config::Config;
+use crate::config::{Config, SettingsPartial};
 
 mod activate;
 mod alias;
@@ -194,26 +195,13 @@
         )
     }
 
-    pub fn run(self, mut config: Config, args: &Vec<String>) -> Result<()> {
+    pub fn run(self, config: Config, args: &Vec<String>) -> Result<()> {
         debug!("{}", &args.join(" "));
         if args[1..] == ["-v"] {
             // normally this would be considered --verbose
             return version::Version {}.run(config);
         }
         let matches = self.command.get_matches_from(args);
-        if let Some(true) = matches.get_one::<bool>("yes") {
-            config.settings.yes = true;
-        }
-        if let Some(true) = matches.get_one::<bool>("quiet") {
-            config.settings.quiet = true;
-        }
-        if *matches.get_one::<u8>("verbose").unwrap() > 0 {
-            config.settings.verbose = true;
-        }
-        if config.settings.raw {
-            config.settings.jobs = 1;
-            config.settings.verbose = true;
-        }
         if let Some((command, sub_m)) = matches.subcommand() {
             if command == "self-update" {
                 return SelfUpdate::from_arg_matches(sub_m)?.run(config);
@@ -223,6 +211,27 @@
         let cmd = Commands::from_arg_matches(&matches)?;
         cmd.run(config)
     }
+
+    pub fn settings(self, args: &Vec<String>) -> SettingsPartial {
+        let mut s = SettingsPartial::empty();
+        if let Ok(m) = self.command.try_get_matches_from(args) {
+            if let Some(true) = m.get_one::<bool>("yes") {
+                s.yes = Some(true);
+            }
+            if let Some(true) = m.get_one::<bool>("quiet") {
+                s.quiet = Some(true);
+            }
+            if *m.get_one::<u8>("verbose").unwrap() > 0 {
+                s.verbose = Some(true);
+            }
+        }
+        // if let Some(true) = m.get_one::<bool>("trace") {
+        //     s.log_level = Some(true);
+        // }
+        // TODO: log_level/debug/trace
+
+        s
+    }
 }
 
 impl Default for Cli {

src/config/config_file/rtx_toml.rs

@@ -90,14 +90,9 @@
         match v.as_str() {
             Some(filename) => {
                 let path = self.path.parent().unwrap().join(filename);
-                let dotenv = match dotenvy::from_path_iter(&path) {
-                    Ok(dotenv) => dotenv,
-                    Err(e) => Err(eyre!(
-                        "failed to parse dotenv file: {}\n{:#}",
-                        path.display(),
-                        e
-                    ))?,
-                };
+                let dotenv = dotenvy::from_path_iter(&path).wrap_err_with(|| {
+                    eyre!("failed to parse dotenv file: {}", display_path(&path))
+                })?;
                 for item in dotenv {
                     let (k, v) = item?;
                     self.env.insert(k, v);

src/config/mod.rs

@@ -11,7 +11,7 @@ use itertools::Itertools;
 use once_cell::sync::OnceCell;
 use rayon::prelude::*;
 
-pub use settings::Settings;
+pub use settings::{Settings, SettingsPartial};
 
 use crate::config::config_file::legacy_version::LegacyVersionFile;
 use crate::config::config_file::rtx_toml::RtxToml;
@@ -68,7 +68,11 @@ impl Config {
         for cf in config_files.values() {
             settings = settings.preloaded(cf.settings()?);
         }
-        let settings = settings.load()?;
+        let mut settings = settings.load()?;
+        if settings.raw {
+            settings.verbose = true;
+            settings.jobs = 1;
+        }
         trace!("Settings: {:#?}", settings);
 
         let legacy_files = load_legacy_files(&settings, &plugins);

src/config/settings.rs

@@ -1,6 +1,7 @@
 use confique::env::parse::{list_by_colon, list_by_comma};
 use confique::{Builder, Config, Partial};
 
+use crate::cli::Cli;
 use log::LevelFilter;
 use serde_derive::{Deserialize, Serialize};
 use std::collections::{BTreeMap, BTreeSet};
@@ -56,21 +57,23 @@ impl Default for Settings {
 impl Settings {
     pub fn default_builder() -> Builder<Self> {
         let mut p = SettingsPartial::empty();
+        let args = env::ARGS.read().unwrap();
         if *env::CI {
             p.yes = Some(true);
         }
         if *env::RTX_LOG_LEVEL < LevelFilter::Info {
             p.verbose = Some(true);
         }
-        for arg in &*env::ARGS.read().unwrap() {
+        for arg in &*args {
             if arg == "--" {
                 break;
             }
             if arg == "--raw" {
                 p.raw = Some(true);
             }
         }
-        Self::builder().preloaded(p).env()
+        let cli = Cli::new().settings(&args);
+        Self::builder().preloaded(cli).preloaded(p).env()
     }
 
     pub fn to_index_map(&self) -> BTreeMap<String, String> {