cli + config: implement values override

Sk7Str1p3 · Sk7Str1p3 · commit 0a80e4fc4967 · 2025-05-11T16:10:06.000Z
diff --git a/src/cli.rs b/src/cli.rs
@@ -56,19 +56,19 @@ pub struct InfoCliOptions {
         value_enum,
         value_name = "FIELD"
     )]
-    pub disabled_fields: Vec<InfoType>,
+    pub disabled_fields: Option<Vec<InfoType>>,
     /// Hides the title
     #[arg(long)]
-    pub no_title: bool,
+    pub no_title: Option<bool>,
     /// Maximum NUM of authors to be shown
-    #[arg(long, default_value_t = 3usize, value_name = "NUM")]
-    pub number_of_authors: usize,
+    #[arg(long, value_name = "NUM")]
+    pub number_of_authors: Option<usize>,
     /// Maximum NUM of languages to be shown
-    #[arg(long, default_value_t = 6usize, value_name = "NUM")]
-    pub number_of_languages: usize,
+    #[arg(long, value_name = "NUM")]
+    pub number_of_languages: Option<usize>,
     /// Maximum NUM of file churns to be shown
-    #[arg(long, default_value_t = 3usize, value_name = "NUM")]
-    pub number_of_file_churns: usize,
+    #[arg(long, value_name = "NUM")]
+    pub number_of_file_churns: Option<usize>,
     /// Minimum NUM of commits from HEAD used to compute the churn summary
     ///
     /// By default, the actual value is non-deterministic due to time-based computation
@@ -89,7 +89,7 @@ pub struct InfoCliOptions {
     pub no_bots: Option<MyRegex>,
     /// Ignores merge commits
     #[arg(long)]
-    pub no_merges: bool,
+    pub no_merges: Option<bool>,
     /// Show the email address of each author
     #[arg(long, short = 'E')]
     pub email: bool,
@@ -101,7 +101,7 @@ pub struct InfoCliOptions {
     pub hide_token: bool,
     /// Count hidden files and directories
     #[arg(long)]
-    pub include_hidden: bool,
+    pub include_hidden: Option<bool>,
     /// Filters output by language type
     #[arg(
         long,
@@ -147,7 +147,7 @@ pub struct AsciiCliOptions {
     ///
     /// If set to auto: true color will be enabled if supported by the terminal
     #[arg(long, default_value = "auto", value_name = "WHEN", value_enum)]
-    pub true_color: When,
+    pub true_color: Option<When>,
 }
 
 #[derive(Clone, Debug, Args, PartialEq, Eq)]
@@ -191,13 +191,13 @@ pub struct TextFormattingCliOptions {
     pub text_colors: Vec<u8>,
     /// Use ISO 8601 formatted timestamps
     #[arg(long, short = 'z')]
-    pub iso_time: bool,
+    pub iso_time: Option<bool>,
     /// Which thousands SEPARATOR to use
-    #[arg(long, value_name = "SEPARATOR", default_value = "plain", value_enum)]
-    pub number_separator: NumberSeparator,
+    #[arg(long, value_name = "SEPARATOR", value_enum)]
+    pub number_separator: Option<NumberSeparator>,
     /// Turns off bold formatting
     #[arg(long)]
-    pub no_bold: bool,
+    pub no_bold: Option<bool>,
 }
 #[derive(Clone, Debug, Args, PartialEq, Eq, Default)]
 #[command(next_help_heading = "VISUALS")]
@@ -212,7 +212,7 @@ pub struct VisualsCliOptions {
     ///
     /// Replaces language chips with Nerd Font icons
     #[arg(long)]
-    pub nerd_fonts: bool,
+    pub nerd_fonts: Option<bool>,
 }
 
 #[derive(Clone, Debug, Args, PartialEq, Eq)]
@@ -268,9 +268,9 @@ impl Default for CliOptions {
 impl Default for InfoCliOptions {
     fn default() -> Self {
         InfoCliOptions {
-            number_of_authors: 3,
-            number_of_languages: 6,
-            number_of_file_churns: 3,
+            number_of_authors: Some(3),
+            number_of_languages: Some(6),
+            number_of_file_churns: Some(3),
             churn_pool_size: Option::default(),
             exclude: Vec::default(),
             no_bots: Option::default(),
@@ -280,7 +280,7 @@ impl Default for InfoCliOptions {
             hide_token: Default::default(),
             include_hidden: Default::default(),
             r#type: vec![LanguageType::Programming, LanguageType::Markup],
-            disabled_fields: Vec::default(),
+            disabled_fields: Some(Vec::default()),
             no_title: Default::default(),
         }
     }
@@ -291,7 +291,7 @@ impl Default for TextFormattingCliOptions {
         TextFormattingCliOptions {
             text_colors: Default::default(),
             iso_time: Default::default(),
-            number_separator: NumberSeparator::Plain,
+            number_separator: Some(NumberSeparator::Plain),
             no_bold: Default::default(),
         }
     }
@@ -303,7 +303,7 @@ impl Default for AsciiCliOptions {
             ascii_input: Option::default(),
             ascii_colors: Vec::default(),
             ascii_language: Option::default(),
-            true_color: When::Auto,
+            true_color: Some(When::Auto),
         }
     }
 }
@@ -418,8 +418,8 @@ mod test {
             input: PathBuf::from("/tmp/folder"),
             info: InfoCliOptions {
                 number_of_authors: 4,
-                no_merges: true,
-                disabled_fields: vec![InfoType::Version, InfoType::URL],
+                no_merges: Some(true),
+                disabled_fields: vec![InfoType::Version, InfoType::URL].into(),
                 ..Default::default()
             },
             ascii: AsciiCliOptions {
diff --git a/src/info/mod.rs b/src/info/mod.rs
@@ -22,6 +22,7 @@ use self::url::UrlInfo;
 use self::utils::info_field::{InfoField, InfoType};
 use self::version::VersionInfo;
 use crate::cli::{is_truecolor_terminal, CliOptions, NumberSeparator, When};
+use crate::config::ConfigOptions;
 use crate::ui::get_ascii_colors;
 use crate::ui::text_colors::TextColors;
 use anyhow::{Context, Result};
@@ -109,7 +110,7 @@ impl std::fmt::Display for Info {
     }
 }
 
-pub fn build_info(cli_options: &CliOptions) -> Result<Info> {
+pub fn build_info(cli_options: &CliOptions, config_options: &ConfigOptions) -> Result<Info> {
     let mut repo = gix::ThreadSafeRepository::discover_opts(
         &cli_options.input,
         gix::discover::upwards::Options {
@@ -126,7 +127,10 @@ pub fn build_info(cli_options: &CliOptions) -> Result<Info> {
     let loc_by_language_sorted_handle = std::thread::spawn({
         let globs_to_exclude = cli_options.info.exclude.clone();
         let language_types = cli_options.info.r#type.clone();
-        let include_hidden = cli_options.info.include_hidden;
+        let include_hidden = cli_options
+            .info
+            .include_hidden
+            .unwrap_or(config_options.include_hidden);
         let workdir = repo_path.clone();
         move || {
             langs::get_loc_by_language_sorted(
@@ -153,9 +157,17 @@ pub fn build_info(cli_options: &CliOptions) -> Result<Info> {
         &repo,
         cli_options.info.no_bots.clone(),
         cli_options.info.churn_pool_size,
-        cli_options.info.no_merges,
+        cli_options
+            .info
+            .no_merges
+            .unwrap_or(config_options.no_merges),
     )?;
-    let true_color = match cli_options.ascii.true_color {
+    let true_color = match cli_options
+        .ascii
+        .true_color
+        .clone()
+        .unwrap_or(config_options.true_color.clone())
+    {
         When::Always => true,
         When::Never => false,
         When::Auto => is_truecolor_terminal(),
@@ -169,16 +181,39 @@ pub fn build_info(cli_options: &CliOptions) -> Result<Info> {
     );
 
     let text_colors = TextColors::new(&cli_options.text_formatting.text_colors, ascii_colors[0]);
-    let no_bold = cli_options.text_formatting.no_bold;
-    let number_separator = cli_options.text_formatting.number_separator;
-    let iso_time = cli_options.text_formatting.iso_time;
-    let number_of_languages_to_display = cli_options.info.number_of_languages;
-    let number_of_authors_to_display = cli_options.info.number_of_authors;
-    let number_of_file_churns_to_display = cli_options.info.number_of_file_churns;
+    let no_bold = cli_options
+        .text_formatting
+        .no_bold
+        .unwrap_or(config_options.no_bold);
+    let number_separator = cli_options
+        .text_formatting
+        .number_separator
+        .unwrap_or(config_options.number_separator);
+    let iso_time = cli_options
+        .text_formatting
+        .iso_time
+        .unwrap_or(config_options.iso_time);
+    let number_of_languages_to_display = cli_options
+        .info
+        .number_of_languages
+        .unwrap_or(config_options.number_of_languages);
+    // This looks weird i think i should refactor unwrapping
+    let number_of_authors_to_display = cli_options
+        .info
+        .number_of_authors
+        .unwrap_or(config_options.number_of_authors);
+    let number_of_file_churns_to_display = cli_options
+        .info
+        .number_of_file_churns
+        .unwrap_or(config_options.number_of_file_churns);
     let globs_to_exclude = &cli_options.info.exclude;
     let show_email = cli_options.info.email;
+    let nerd_fonts = cli_options
+        .visuals
+        .nerd_fonts
+        .unwrap_or(config_options.nerd_fonts);
 
-    Ok(InfoBuilder::new(cli_options)
+    Ok(InfoBuilder::new(cli_options, config_options)
         .title(&repo, no_bold, &text_colors)
         .project(&repo, &repo_url, manifest.as_ref(), number_separator)?
         .description(manifest.as_ref())
@@ -191,7 +226,7 @@ pub fn build_info(cli_options: &CliOptions) -> Result<Info> {
             true_color,
             number_of_languages_to_display,
             &text_colors,
-            cli_options,
+            nerd_fonts,
         )
         .dependencies(manifest.as_ref(), number_separator)
         .authors(
@@ -213,16 +248,26 @@ pub fn build_info(cli_options: &CliOptions) -> Result<Info> {
         .loc(&loc_by_language, number_separator)
         .size(&repo, number_separator)
         .license(&repo_path, manifest.as_ref())?
-        .build(cli_options, text_colors, dominant_language, ascii_colors))
+        .build(
+            cli_options,
+            no_bold,
+            text_colors,
+            dominant_language,
+            ascii_colors,
+        ))
 }
 
 impl InfoBuilder {
-    fn new(cli_options: &CliOptions) -> Self {
+    fn new(cli_options: &CliOptions, config_options: &ConfigOptions) -> Self {
         Self {
             title: None,
             info_fields: Vec::new(),
-            disabled_fields: cli_options.info.disabled_fields.clone(),
-            no_title: cli_options.info.no_title,
+            disabled_fields: cli_options
+                .info
+                .disabled_fields
+                .clone()
+                .unwrap_or(config_options.disabled_fields.clone()),
+            no_title: cli_options.info.no_title.unwrap_or(config_options.no_title),
         }
     }
 
@@ -324,15 +369,15 @@ impl InfoBuilder {
         true_color: bool,
         number_of_languages: usize,
         text_colors: &TextColors,
-        cli_options: &CliOptions,
+        nerd_fonts: bool,
     ) -> Self {
         if !self.disabled_fields.contains(&InfoType::Languages) {
             let languages = LanguagesInfo::new(
                 loc_by_language,
                 true_color,
                 number_of_languages,
                 text_colors.info,
-                cli_options.visuals.nerd_fonts,
+                nerd_fonts,
             );
             self.info_fields.push(Box::new(languages));
         }
@@ -444,6 +489,7 @@ impl InfoBuilder {
     fn build(
         self,
         cli_options: &CliOptions,
+        no_bold: bool,
         text_colors: TextColors,
         dominant_language: Language,
         ascii_colors: Vec<DynColors>,
@@ -455,7 +501,7 @@ impl InfoBuilder {
             dominant_language,
             ascii_colors,
             no_color_palette: cli_options.visuals.no_color_palette,
-            no_bold: cli_options.text_formatting.no_bold,
+            no_bold: no_bold,
         }
     }
 }
@@ -472,7 +518,7 @@ fn get_manifest(repo_path: &Path) -> Result<Option<Manifest>> {
 
 pub fn get_work_dir(repo: &gix::Repository) -> Result<std::path::PathBuf> {
     Ok(repo
-        .work_dir()
+        .workdir()
         .context("please run onefetch inside of a non-bare git repository")?
         .to_owned())
 }
diff --git a/src/info/utils/info_field.rs b/src/info/utils/info_field.rs
@@ -75,6 +75,7 @@ pub enum InfoType {
     LinesOfCode,
     Size,
     License,
+    None,
 }
 
 #[cfg(test)]
diff --git a/src/ui/printer.rs b/src/ui/printer.rs
@@ -1,4 +1,5 @@
 use crate::cli::CliOptions;
+use crate::config::ConfigOptions;
 use crate::info::Info;
 use crate::ui::Language;
 use anyhow::{Context, Result};
@@ -30,7 +31,12 @@ pub struct Printer<W> {
 }
 
 impl<W: Write> Printer<W> {
-    pub fn new(writer: W, info: Info, cli_options: CliOptions) -> Result<Self> {
+    pub fn new(
+        writer: W,
+        info: Info,
+        cli_options: CliOptions,
+        config_options: ConfigOptions,
+    ) -> Result<Self> {
         let image = match cli_options.image.image {
             Some(p) => Some(image::open(p).context("Could not load the specified image")?),
             None => None,
@@ -55,7 +61,10 @@ impl<W: Write> Printer<W> {
             image,
             image_backend,
             color_resolution: cli_options.image.color_resolution,
-            no_bold: cli_options.text_formatting.no_bold,
+            no_bold: cli_options
+                .text_formatting
+                .no_bold
+                .unwrap_or(config_options.no_bold),
             ascii_input: cli_options.ascii.ascii_input,
             ascii_language: cli_options.ascii.ascii_language,
         })

Original file line number	Diff line number	Diff line change
`@@ -75,6 +75,7 @@ pub enum InfoType {`
`75`	`75`	`LinesOfCode,`
`76`	`76`	`Size,`
`77`	`77`	`License,`
	`78`	`+ None,`
`78`	`79`	`}`
`79`	`80`
`80`	`81`	`#[cfg(test)]`