last one

Author: Sk7Str1p3

src/cli.rs

@@ -67,8 +67,8 @@ pub struct InfoCliOptions {
     #[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)]
@@ -270,7 +270,7 @@ impl Default for InfoCliOptions {
         InfoCliOptions {
             number_of_authors: Some(3),
             number_of_languages: Some(6),
-            number_of_file_churns: 3,
+            number_of_file_churns: Some(3),
             churn_pool_size: Option::default(),
             exclude: Vec::default(),
             no_bots: Option::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,7 +418,7 @@ mod test {
             input: PathBuf::from("/tmp/folder"),
             info: InfoCliOptions {
                 number_of_authors: 4,
-                no_merges: true,
+                no_merges: Some(true),
                 disabled_fields: vec![InfoType::Version, InfoType::URL].into(),
                 ..Default::default()
             },

src/config.rs

@@ -21,7 +21,7 @@ pub struct ConfigOptions {
     #[serde(default)]
     pub number_of_languages: usize,
     #[serde(default)]
-    pub churn_pool_size: usize,
+    pub number_of_file_churns: usize,
     #[serde(default)]
     pub no_merges: bool,
     #[serde(default)]
@@ -45,11 +45,11 @@ impl Default for ConfigOptions {
             no_title: false,
             number_of_authors: 3usize,
             number_of_languages: 6usize,
-            churn_pool_size: 3usize,
+            number_of_file_churns: 3usize,
             no_merges: false,
             include_hidden: false,
             iso_time: false,
-            number_separator: NumberSeparator::Plain,
+            number_separator: NumberSeparator::default(),
             no_bold: false,
             true_color: When::Auto,
             nerd_fonts: false,

src/info/mod.rs

@@ -127,7 +127,10 @@ pub fn build_info(cli_options: &CliOptions, config_options: &ConfigOptions) -> R
     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(
@@ -154,9 +157,17 @@ pub fn build_info(cli_options: &CliOptions, config_options: &ConfigOptions) -> R
         &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(),
@@ -170,9 +181,18 @@ pub fn build_info(cli_options: &CliOptions, config_options: &ConfigOptions) -> R
     );
 
     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 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
@@ -182,9 +202,16 @@ pub fn build_info(cli_options: &CliOptions, config_options: &ConfigOptions) -> R
         .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;
+    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, config_options)
         .title(&repo, no_bold, &text_colors)
@@ -199,7 +226,7 @@ pub fn build_info(cli_options: &CliOptions, config_options: &ConfigOptions) -> R
             true_color,
             number_of_languages_to_display,
             &text_colors,
-            cli_options,
+            nerd_fonts,
         )
         .dependencies(manifest.as_ref(), number_separator)
         .authors(
@@ -221,7 +248,13 @@ pub fn build_info(cli_options: &CliOptions, config_options: &ConfigOptions) -> R
         .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 {
@@ -336,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));
         }
@@ -456,6 +489,7 @@ impl InfoBuilder {
     fn build(
         self,
         cli_options: &CliOptions,
+        no_bold: bool,
         text_colors: TextColors,
         dominant_language: Language,
         ascii_colors: Vec<DynColors>,
@@ -467,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,
         }
     }
 }