almost last

Author: Sk7Str1p3

src/cli.rs

@@ -10,7 +10,7 @@ use num_format::CustomFormat;
 use onefetch_image::ImageProtocol;
 use onefetch_manifest::ManifestType;
 use regex::Regex;
-use serde::Serialize;
+use serde::{Deserialize, Serialize};
 use std::env;
 use std::io;
 use std::path::PathBuf;
@@ -59,13 +59,13 @@ pub struct InfoCliOptions {
     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,
@@ -268,8 +268,8 @@ impl Default for CliOptions {
 impl Default for InfoCliOptions {
     fn default() -> Self {
         InfoCliOptions {
-            number_of_authors: 3,
-            number_of_languages: 6,
+            number_of_authors: Some(3),
+            number_of_languages: Some(6),
             number_of_file_churns: 3,
             churn_pool_size: Option::default(),
             exclude: Vec::default(),
@@ -366,15 +366,17 @@ pub fn print_completions<G: Generator>(gen: G, cmd: &mut Command) {
     generate(gen, cmd, cmd.get_name().to_string(), &mut io::stdout());
 }
 
-#[derive(clap::ValueEnum, Clone, PartialEq, Eq, Debug)]
+#[derive(clap::ValueEnum, Clone, PartialEq, Eq, Debug, Serialize, Deserialize, Default)]
 pub enum When {
+    #[default]
     Auto,
     Never,
     Always,
 }
 
-#[derive(clap::ValueEnum, Clone, PartialEq, Eq, Debug, Serialize, Copy)]
+#[derive(clap::ValueEnum, Clone, PartialEq, Eq, Debug, Deserialize, Serialize, Copy, Default)]
 pub enum NumberSeparator {
+    #[default]
     Plain,
     Comma,
     Space,

src/config.rs

@@ -2,18 +2,57 @@ use anyhow::Result;
 use serde::{Deserialize, Serialize};
 use std::{fs, path::Path};
 
-use crate::info::utils::info_field::InfoType;
+use crate::{
+    cli::{NumberSeparator, When},
+    info::utils::info_field::InfoType,
+};
 
 #[derive(Serialize, Deserialize)]
 pub struct ConfigOptions {
+    // THIS IS JUST A RAW, REALLY WIP CONFIG STRUCTURE
     #[serde(default)]
     pub disabled_fields: Vec<InfoType>,
+    // Lol is this really will turn into comment?
+    /// Or maybe this?
+    #[serde(default)]
+    pub no_title: bool,
+    #[serde(default)]
+    pub number_of_authors: usize,
+    #[serde(default)]
+    pub number_of_languages: usize,
+    #[serde(default)]
+    pub churn_pool_size: usize,
+    #[serde(default)]
+    pub no_merges: bool,
+    #[serde(default)]
+    pub include_hidden: bool,
+    #[serde(default)]
+    pub iso_time: bool,
+    #[serde(default)]
+    pub number_separator: NumberSeparator,
+    #[serde(default)]
+    pub no_bold: bool,
+    #[serde(default)]
+    pub true_color: When,
+    #[serde(default)]
+    pub nerd_fonts: bool,
 }
 
 impl Default for ConfigOptions {
     fn default() -> Self {
         Self {
             disabled_fields: vec![],
+            no_title: false,
+            number_of_authors: 3usize,
+            number_of_languages: 6usize,
+            churn_pool_size: 3usize,
+            no_merges: false,
+            include_hidden: false,
+            iso_time: false,
+            number_separator: NumberSeparator::Plain,
+            no_bold: false,
+            true_color: When::Auto,
+            nerd_fonts: false,
         }
     }
 }

src/info/mod.rs

@@ -173,8 +173,15 @@ pub fn build_info(cli_options: &CliOptions, config_options: &ConfigOptions) -> R
     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_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;
     let globs_to_exclude = &cli_options.info.exclude;
     let show_email = cli_options.info.email;
@@ -227,7 +234,7 @@ impl InfoBuilder {
                 .disabled_fields
                 .clone()
                 .unwrap_or(config_options.disabled_fields.clone()),
-            no_title: cli_options.info.no_title,
+            no_title: cli_options.info.no_title.unwrap_or(config_options.no_title),
         }
     }
 

src/info/utils/info_field.rs

@@ -75,6 +75,7 @@ pub enum InfoType {
     LinesOfCode,
     Size,
     License,
+    None,
 }
 
 #[cfg(test)]