Merge pull request #78 from solidiquis/bug/config-level-option

fix issue where level wasn't being read from config
solidiquis · Mar 15, 2023 · 62a6331 · 62a6331
2 parents 0683e7b + 650e86d
commit 62a6331
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 7 deletions.
diff --git a/src/render/context/mod.rs b/src/render/context/mod.rs
@@ -3,7 +3,7 @@ use super::{
     order::SortType,
 };
 use clap::{
-    parser::ValueSource, ArgMatches, CommandFactory, Error as ClapError, FromArgMatches, Parser,
+    parser::ValueSource, ArgMatches, CommandFactory, Error as ClapError, FromArgMatches, Id, Parser,
 };
 use ignore::overrides::{Override, OverrideBuilder};
 use std::{
@@ -154,22 +154,28 @@ impl Context {
                 }
             };
 
-            for id in user_args.ids() {
-                let id_str = id.as_str();
+            let mut ids = user_args.ids().map(Id::as_str).collect::<Vec<&str>>();
 
+            ids.extend(config_args.ids().map(Id::as_str).collect::<Vec<&str>>());
+
+            ids = crate::utils::uniq(ids);
+
+            for id in ids {
                 // Don't look at me... my shame..
-                if id_str == "Context" {
+                if id == "Context" {
                     continue;
                 }
 
-                if let Some(user_arg) = user_args.value_source(id_str) {
+                if let Some(user_arg) = user_args.value_source(id) {
                     match user_arg {
                         // prioritize the user arg if user provided a command line argument
-                        ValueSource::CommandLine => pick_args_from(id_str, &user_args),
+                        ValueSource::CommandLine => pick_args_from(id, &user_args),
 
                         // otherwise prioritize argument from the config
-                        _ => pick_args_from(id_str, &config_args),
+                        _ => pick_args_from(id, &config_args),
                     }
+                } else {
+                    pick_args_from(id, &config_args)
                 }
             }
 

diff --git a/src/utils.rs b/src/utils.rs
@@ -1,4 +1,7 @@
+use std::{borrow::ToOwned, cmp::Eq, collections::HashSet, hash::Hash};
+
 #[macro_export]
+/// Ruby-like way to crate a hashmap.
 macro_rules! hash {
     ( $( $k:expr => $v:expr ),* ) => {
         {
@@ -8,3 +11,17 @@ macro_rules! hash {
         }
     };
 }
+
+/// Ensure every item in a `Vec` is unique.
+pub fn uniq<T: Eq + Hash + ToOwned>(items: Vec<T>) -> Vec<T>
+where
+    T: Eq + Hash + ToOwned,
+    <T as ToOwned>::Owned: Hash + Eq,
+{
+    let mut set = HashSet::new();
+
+    items
+        .into_iter()
+        .filter(|item| set.insert(item.to_owned()))
+        .collect::<Vec<T>>()
+}