,
+ // 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 number_of_file_churns: 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,
+ number_of_file_churns: 3usize,
+ no_merges: false,
+ include_hidden: false,
+ iso_time: false,
+ number_separator: NumberSeparator::default(),
+ no_bold: false,
+ true_color: When::Auto,
+ nerd_fonts: false,
+ }
+ }
+}
+
+impl ConfigOptions {
+ pub fn read(path: P) -> Self
+ // Is it even should panic?
+ where
+ P: AsRef,
+ {
+ let contents = fs::read_to_string(path);
+ match contents {
+ Err(_) => Self::default(),
+ Ok(contents) => {
+ // I wish to print exact error here, like syntax errors
+ toml::from_str(&contents).unwrap()
+ }
+ }
+ }
+
+ pub fn write(self, path: P) -> Result<()>
+ // I believe user would like to generate config with CLI flags
+ // I mean to write disabled_fields with --disabled-fields flag
+ where
+ P: AsRef,
+ {
+ // I dont think this can panic so i simply unwrapped it
+ let contents = toml::to_string(&self).unwrap();
+ let dir = path
+ .as_ref()
+ .parent()
+ .with_context(|| format!("'{}' is not a path!", path.as_ref().display()));
+ fs::create_dir_all(dir?)?;
+ match fs::write(&path, contents) {
+ Ok(_) => println!("Created default config at {}", path.as_ref().display()),
+ Err(e) => eprintln!(
+ "Failed to write default config at {}: {}",
+ path.as_ref().display(),
+ e
+ ),
+ }
+ Ok(())
+ }
+}
diff --git a/src/info/git/mod.rs b/src/info/git/mod.rs
index 035e0a9c1..8c2065513 100644
--- a/src/info/git/mod.rs
+++ b/src/info/git/mod.rs
@@ -22,14 +22,14 @@ pub mod sig;
pub fn traverse_commit_graph(
repo: &gix::Repository,
no_bots: Option,
- min_churn_pool_size: Option,
+ max_churn_pool_size: Option,
no_merges: bool,
) -> Result {
let mut time_of_most_recent_commit = None;
let mut time_of_first_commit = None;
let mut number_of_commits_by_signature: HashMap = HashMap::new();
let mailmap = repo.open_mailmap();
- let is_traversal_complete = Arc::new(AtomicBool::default());
+ let has_commit_graph_traversal_ended = Arc::new(AtomicBool::default());
let total_number_of_commits = Arc::new(AtomicUsize::default());
let num_threads = std::thread::available_parallelism()
@@ -51,9 +51,9 @@ pub fn traverse_commit_graph(
repo,
&mailmap,
no_bots.clone(),
- &is_traversal_complete,
+ &has_commit_graph_traversal_ended,
&total_number_of_commits,
- min_churn_pool_size,
+ max_churn_pool_size,
)?;
let author_threads = can_use_author_threads
@@ -104,7 +104,7 @@ pub fn traverse_commit_graph(
}
total_number_of_commits.store(count, Ordering::SeqCst);
- is_traversal_complete.store(true, Ordering::SeqCst);
+ has_commit_graph_traversal_ended.store(true, Ordering::SeqCst);
drop(churn_tx);
@@ -174,7 +174,7 @@ fn get_churn_channel(
repo: &gix::Repository,
mailmap: &gix::mailmap::Snapshot,
bot_regex_pattern: Option,
- is_traversal_complete: &Arc,
+ has_commit_graph_traversal_ended: &Arc,
total_number_of_commits: &Arc,
max_churn_pool_size: Option,
) -> Result<(JoinHandle>, Sender)> {
@@ -183,29 +183,29 @@ fn get_churn_channel(
let repo = repo.clone();
let mailmap = mailmap.clone();
let bot_regex_pattern = bot_regex_pattern.clone();
- let is_traversal_complete = is_traversal_complete.clone();
+ let has_commit_graph_traversal_ended = has_commit_graph_traversal_ended.clone();
let total_number_of_commits = total_number_of_commits.clone();
move || -> Result<_> {
let mut number_of_commits_by_file_path = NumberOfCommitsByFilepath::new();
- let mut diffs_computed = 0;
+ let mut number_of_diffs_computed = 0;
while let Ok(commit_id) = rx.recv() {
let commit = repo.find_object(commit_id)?.into_commit();
if is_bot_commit(&commit, &mailmap, bot_regex_pattern.as_ref())? {
continue;
}
compute_diff_with_parent(&mut number_of_commits_by_file_path, &commit, &repo)?;
- diffs_computed += 1;
+ number_of_diffs_computed += 1;
if should_break(
- is_traversal_complete.load(Ordering::Relaxed),
+ has_commit_graph_traversal_ended.load(Ordering::Relaxed),
total_number_of_commits.load(Ordering::Relaxed),
max_churn_pool_size,
- diffs_computed,
+ number_of_diffs_computed,
) {
break;
}
}
- Ok((number_of_commits_by_file_path, diffs_computed))
+ Ok((number_of_commits_by_file_path, number_of_diffs_computed))
}
});
@@ -213,17 +213,17 @@ fn get_churn_channel(
}
fn should_break(
- is_traversal_complete: bool,
+ has_commit_graph_traversal_ended: bool,
total_number_of_commits: usize,
- min_churn_pool_size_opt: Option,
- diffs_computed: usize,
+ max_churn_pool_size_opt: Option,
+ number_of_diffs_computed: usize,
) -> bool {
- if !is_traversal_complete {
+ if !has_commit_graph_traversal_ended {
return false;
}
- min_churn_pool_size_opt.is_none_or(|min_churn_pool_size| {
- diffs_computed >= min_churn_pool_size.min(total_number_of_commits)
+ max_churn_pool_size_opt.map_or(true, |max_churn_pool_size| {
+ number_of_diffs_computed >= max_churn_pool_size.min(total_number_of_commits)
})
}
diff --git a/src/info/langs/mod.rs b/src/info/langs/mod.rs
index f4b5a2e3f..f723d9921 100644
--- a/src/info/langs/mod.rs
+++ b/src/info/langs/mod.rs
@@ -21,14 +21,8 @@ pub fn get_loc_by_language_sorted(
) -> Result> {
let locs = get_locs(dir, globs_to_exclude, language_types, include_hidden);
- let loc_by_language = get_loc_by_language(&locs).with_context(|| {
- format!(
- "No source code found in the repository at '{}'. \
- Note: Some language types (prose, data) are excluded by default. \
- Consider using the '--type' option to include them.",
- dir.display()
- )
- })?;
+ let loc_by_language =
+ get_loc_by_language(&locs).context("Could not find any source code in this repository")?;
let loc_by_language_sorted = sort_by_loc(loc_by_language);
diff --git a/src/info/license.rs b/src/info/license.rs
index 2713fa85c..20b74d663 100644
--- a/src/info/license.rs
+++ b/src/info/license.rs
@@ -22,8 +22,8 @@ impl Detector {
pub fn new() -> Result {
match Store::from_cache(CACHE_DATA) {
Ok(store) => Ok(Self { store }),
- Err(e) => {
- bail!("Could not initialize the license detector: {}", e)
+ Err(_) => {
+ bail!("Could not initialize the license detector")
}
}
}
diff --git a/src/info/mod.rs b/src/info/mod.rs
index 933f0857d..802292702 100644
--- 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 {
+pub fn build_info(cli_options: &CliOptions, config_options: &ConfigOptions) -> Result {
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 {
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,10 +158,18 @@ pub fn build_info(cli_options: &CliOptions) -> Result {
&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),
)
.context("Failed to traverse Git commit history")?;
- 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(),
@@ -171,16 +183,39 @@ pub fn build_info(cli_options: &CliOptions) -> Result {
);
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())
@@ -193,7 +228,7 @@ pub fn build_info(cli_options: &CliOptions) -> Result {
true_color,
number_of_languages_to_display,
&text_colors,
- cli_options,
+ nerd_fonts,
)
.dependencies(manifest.as_ref(), number_separator)
.authors(
@@ -215,16 +250,26 @@ pub fn build_info(cli_options: &CliOptions) -> Result {
.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),
}
}
@@ -326,7 +371,7 @@ 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(
@@ -334,7 +379,7 @@ impl InfoBuilder {
true_color,
number_of_languages,
text_colors.info,
- cli_options.visuals.nerd_fonts,
+ nerd_fonts,
);
self.info_fields.push(Box::new(languages));
}
@@ -446,6 +491,7 @@ impl InfoBuilder {
fn build(
self,
cli_options: &CliOptions,
+ no_bold: bool,
text_colors: TextColors,
dominant_language: Language,
ascii_colors: Vec,
@@ -457,7 +503,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,
}
}
}
diff --git a/src/info/utils/info_field.rs b/src/info/utils/info_field.rs
index 52d69011c..f8226a03d 100644
--- a/src/info/utils/info_field.rs
+++ b/src/info/utils/info_field.rs
@@ -1,5 +1,6 @@
use crate::{info::utils::get_style, ui::text_colors::TextColors};
use owo_colors::OwoColorize;
+use serde::{Deserialize, Serialize};
use std::fmt;
#[typetag::serialize]
@@ -55,7 +56,7 @@ pub trait InfoField {
}
}
-#[derive(Clone, clap::ValueEnum, Debug, Eq, PartialEq)]
+#[derive(Clone, clap::ValueEnum, Debug, Eq, PartialEq, Serialize, Deserialize)]
pub enum InfoType {
Project,
Description,
@@ -74,6 +75,7 @@ pub enum InfoType {
LinesOfCode,
Size,
License,
+ None,
}
#[cfg(test)]
diff --git a/src/lib.rs b/src/lib.rs
index 24ff2a9fc..06c8ddffb 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -1,4 +1,5 @@
// Lib is present to allow for benchmarks and integration tests
pub mod cli;
+pub mod config;
pub mod info;
pub mod ui;
diff --git a/src/main.rs b/src/main.rs
index 00e3237e4..b2ef0bfa3 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -4,6 +4,7 @@ use anyhow::Result;
use clap::{CommandFactory, Parser};
use human_panic::setup_panic;
use onefetch::cli::{self, CliOptions};
+use onefetch::config::ConfigOptions;
use onefetch::info::build_info;
use onefetch::ui::printer::Printer;
use std::io;
@@ -30,9 +31,25 @@ fn main() -> Result<()> {
return Ok(());
}
- let info = build_info(&cli_options)?;
+ if cli_options.config.generate_config {
+ return ConfigOptions::default().write(
+ &cli_options.config.config_path.unwrap_or(
+ dirs::config_dir()
+ .expect("Could not find config dir!")
+ .join("onefetch/config.toml"),
+ ),
+ );
+ }
+
+ let config_options = ConfigOptions::read(
+ &cli_options.config.config_path.as_ref().unwrap_or(
+ &CliOptions::default().config.config_path.expect("$HOME not found!")
+ ),
+ );
+
+ let info = build_info(&cli_options, &config_options)?;
- let mut printer = Printer::new(io::BufWriter::new(io::stdout()), info, cli_options)?;
+ let mut printer = Printer::new(io::BufWriter::new(io::stdout()), info, cli_options,config_options)?;
printer.print()?;
diff --git a/src/ui/printer.rs b/src/ui/printer.rs
index a5f07b5a0..56f6c32df 100644
--- 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 {
}
impl Printer {
- pub fn new(writer: W, info: Info, cli_options: CliOptions) -> Result {
+ pub fn new(
+ writer: W,
+ info: Info,
+ cli_options: CliOptions,
+ config_options: ConfigOptions,
+ ) -> Result {
let image =
match cli_options.image.image {
Some(p) => Some(image::open(&p).with_context(|| {
@@ -58,7 +64,10 @@ impl Printer {
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,
})
diff --git a/tests/repo.rs b/tests/repo.rs
index 9c0a60512..c715697f7 100644
--- a/tests/repo.rs
+++ b/tests/repo.rs
@@ -1,6 +1,7 @@
use anyhow::Result;
use gix::{open, Repository, ThreadSafeRepository};
-use onefetch::cli::{CliOptions, InfoCliOptions, TextForamttingCliOptions};
+use onefetch::cli::{CliOptions, InfoCliOptions, TextFormattingCliOptions};
+use onefetch::config::ConfigOptions;
use onefetch::info::{build_info, get_work_dir};
fn repo(name: &str) -> Result {
@@ -42,13 +43,14 @@ fn test_repo() -> Result<()> {
churn_pool_size: Some(10),
..Default::default()
},
- text_formatting: TextForamttingCliOptions {
- iso_time: true,
+ text_formatting: TextFormattingCliOptions {
+ iso_time: Some(true),
..Default::default()
},
..Default::default()
};
- let info = build_info(&config)?;
+ let toml = ConfigOptions::default();
+ let info = build_info(&config, &toml)?;
insta::assert_json_snapshot!(
info,
{
@@ -67,7 +69,8 @@ fn test_repo_without_remote() -> Result<()> {
input: repo.path().to_path_buf(),
..Default::default()
};
- let info = build_info(&config);
+ let toml = ConfigOptions::default();
+ let info = build_info(&config, &toml);
assert!(info.is_ok());
Ok(())
@@ -80,7 +83,8 @@ fn test_partial_repo() -> Result<()> {
input: repo.path().to_path_buf(),
..Default::default()
};
- let _info = build_info(&config).expect("no error");
+ let toml = ConfigOptions::default();
+ let _info = build_info(&config, &toml).expect("no error");
Ok(())
}
@@ -91,6 +95,7 @@ fn test_repo_with_pre_epoch_dates() -> Result<()> {
input: repo.path().to_path_buf(),
..Default::default()
};
- let _info = build_info(&config).expect("no error");
+ let toml = ConfigOptions::default();
+ let _info = build_info(&config, &toml).expect("no error");
Ok(())
}