Skip to content

Feature: allow user to disable info fields with flag --disable #82

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Oct 14, 2019
Merged

Feature: allow user to disable info fields with flag --disable #82

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
40ae2bd
Merge changes from fork parent
ktsuench Oct 14, 2019
fb62e9d
added feature to disable info fields from showing in output
ktsuench Oct 14, 2019
006d7e8
changed behaviour of --disable flag
ktsuench Oct 14, 2019
1dc797c
Revert "changed behaviour of --disable flag"
ktsuench Oct 14, 2019
450a651
updated behaviour of --disable flag to not error out on unrecognized …
ktsuench Oct 14, 2019
149c3e4
updated --disable flag behaviour by removing use of vec.contains and …
ktsuench Oct 14, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
213 changes: 156 additions & 57 deletions src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ use std::{
result,
str::FromStr,
};
use strum::{IntoEnumIterator, EnumCount};

type Result<T> = result::Result<T, Error>;

Expand All @@ -45,6 +46,7 @@ struct Info {
license: String,
custom_logo: Language,
custom_colors: Vec<String>,
disable_fields: InfoFieldOn,
}

impl fmt::Display for Info {
Expand All @@ -55,35 +57,43 @@ impl fmt::Display for Info {
None => Color::White,
};

writeln!(
buffer,
"{}{}",
"Project: ".color(color).bold(),
self.project_name
)?;
if !self.disable_fields.project {
writeln!(
buffer,
"{}{}",
"Project: ".color(color).bold(),
self.project_name
)?;
}

writeln!(
buffer,
"{}{}",
"HEAD: ".color(color).bold(),
self.current_commit
)?;
if !self.disable_fields.head {
writeln!(
buffer,
"{}{}",
"HEAD: ".color(color).bold(),
self.current_commit
)?;
}

writeln!(
buffer,
"{}{}",
"Version: ".color(color).bold(),
self.version
)?;
if !self.disable_fields.version {
writeln!(
buffer,
"{}{}",
"Version: ".color(color).bold(),
self.version
)?;
}

writeln!(
buffer,
"{}{}",
"Created: ".color(color).bold(),
self.creation_date
)?;
if !self.disable_fields.created {
writeln!(
buffer,
"{}{}",
"Created: ".color(color).bold(),
self.creation_date
)?;
}

if !self.languages.is_empty() {
if !self.disable_fields.languages && !self.languages.is_empty() {
if self.languages.len() > 1 {
let title = "Languages: ";
let pad = " ".repeat(title.len());
Expand All @@ -108,7 +118,7 @@ impl fmt::Display for Info {
};
}

if !self.authors.is_empty() {
if !self.disable_fields.authors && !self.authors.is_empty() {
let title = if self.authors.len() > 1 {
"Authors: "
} else {
Expand All @@ -124,38 +134,54 @@ impl fmt::Display for Info {
}
}

writeln!(
buffer,
"{}{}",
"Last change: ".color(color).bold(),
self.last_change
)?;
if !self.disable_fields.last_change {
writeln!(
buffer,
"{}{}",
"Last change: ".color(color).bold(),
self.last_change
)?;
}

writeln!(buffer, "{}{}", "Repo: ".color(color).bold(), self.repo)?;
writeln!(
buffer,
"{}{}",
"Commits: ".color(color).bold(),
self.commits
)?;
writeln!(
buffer,
"{}{}",
"Lines of code: ".color(color).bold(),
self.number_of_lines
)?;
writeln!(
buffer,
"{}{}",
"Size: ".color(color).bold(),
self.repo_size
)?;
writeln!(
buffer,
"{}{}",
"License: ".color(color).bold(),
self.license
)?;
if !self.disable_fields.repo {
writeln!(buffer, "{}{}", "Repo: ".color(color).bold(), self.repo)?;
}

if !self.disable_fields.commits {
writeln!(
buffer,
"{}{}",
"Commits: ".color(color).bold(),
self.commits
)?;
}

if !self.disable_fields.lines_of_code {
writeln!(
buffer,
"{}{}",
"Lines of code: ".color(color).bold(),
self.number_of_lines
)?;
}

if !self.disable_fields.size {
writeln!(
buffer,
"{}{}",
"Size: ".color(color).bold(),
self.repo_size
)?;
}

if !self.disable_fields.license {
writeln!(
buffer,
"{}{}",
"License: ".color(color).bold(),
self.license
)?;
}

writeln!(
buffer,
Expand Down Expand Up @@ -294,6 +320,40 @@ impl fmt::Display for CommitInfo {
}
}

#[derive(Default)]
struct InfoFieldOn {
project: bool,
head: bool,
version: bool,
created: bool,
languages: bool,
authors: bool,
last_change: bool,
repo: bool,
commits: bool,
lines_of_code: bool,
size: bool,
license: bool,
}

#[derive(PartialEq, Eq, EnumString, EnumCount, EnumIter, IntoStaticStr)]
#[strum(serialize_all = "snake_case")]
enum InfoFields {
Project,
HEAD,
Version,
Created,
Languages,
Authors,
LastChange,
Repo,
Commits,
LinesOfCode,
Size,
License,
UnrecognizedField,
}

#[derive(PartialEq, Eq, Hash, Clone, EnumString)]
#[strum(serialize_all = "lowercase")]
enum Language {
Expand Down Expand Up @@ -400,6 +460,19 @@ fn main() -> Result<()> {
.takes_value(true)
.default_value("")
.help("Overrides showing the dominant language ascii logo"))
.arg(Arg::with_name("disable_field")
.long("disable")
.multiple(true)
.takes_value(true)
.case_insensitive(true)
.default_value("")
.hide_default_value(true)
.help(&format!("Disable fields to show\nPossible values: {:?}",
&InfoFields::iter()
.take(InfoFields::count() - 1)
.map(|field| field.into())
.collect::<Vec<&str>>()
.as_slice())))
.arg(Arg::with_name("colors")
.short("c")
.long("colors")
Expand Down Expand Up @@ -452,6 +525,31 @@ Possible values: [{0}{1}{2}{3}{4}{5}{6}{7}{8}{9}{10}{11}{12}{13}{14}{15}]",
.unwrap()
.to_lowercase())
.unwrap_or(Language::Unknown);
let mut disable_fields = InfoFieldOn { ..Default::default() };

matches.values_of("disable_field")
.unwrap()
.map(String::from)
.for_each(|field: String| {
let item = InfoFields::from_str(field.to_lowercase().as_str())
.unwrap_or(InfoFields::UnrecognizedField);

match item {
InfoFields::Project => disable_fields.project = true,
InfoFields::HEAD => disable_fields.head = true,
InfoFields::Version => disable_fields.version = true,
InfoFields::Created => disable_fields.created = true,
InfoFields::Languages => disable_fields.languages = true,
InfoFields::Authors => disable_fields.authors = true,
InfoFields::LastChange => disable_fields.last_change = true,
InfoFields::Repo => disable_fields.repo = true,
InfoFields::Commits => disable_fields.commits = true,
InfoFields::LinesOfCode => disable_fields.lines_of_code = true,
InfoFields::Size => disable_fields.size = true,
InfoFields::License => disable_fields.license = true,
_ => (),
}
});

let tokei_langs = project_languages(&dir);
let languages_stat = get_languages_stat(&tokei_langs).ok_or(Error::SourceCodeNotFound)?;
Expand Down Expand Up @@ -489,6 +587,7 @@ Possible values: [{0}{1}{2}{3}{4}{5}{6}{7}{8}{9}{10}{11}{12}{13}{14}{15}]",
license: project_license(&dir)?,
custom_logo,
custom_colors,
disable_fields,
};

println!("{}", info);
Expand Down