Skip to content
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

Jump to bottom

Bump clap from 3.2.22 to 4.0.8 #791

Merged
merged 3 commits into from
Oct 6, 2022
Merged

Bump clap from 3.2.22 to 4.0.8 #791

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b61f580
Bump clap from 3.2.22 to 4.0.8
dependabot[bot] Oct 3, 2022
9d8c85c
replace deprecated syntax
o2sh Oct 5, 2022
d88fa46
fix color resolution possible_values
o2sh Oct 6, 2022
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
34 changes: 13 additions & 21 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 7 additions & 5 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,15 @@ anyhow = "1.0.59"
askalono = "0.4.6"
byte-unit = "4.0.14"
bytecount = "0.6.3"
clap = { version = "3.2.22", features = ["derive"] }
clap_complete = "3.2.5"
clap = { version = "4.0.8", features = ["derive"] }
clap_complete = "4.0.2"
color_quant = "1.1.0"
git-features-for-configuration-only = { package = "git-features", version = "0.22.4", features = ["zlib-ng-compat"] }
git-features-for-configuration-only = { package = "git-features", version = "0.22.4", features = [
"zlib-ng-compat",
] }
git-repository = { version = "0.23.1", default-features = false, features = [
"max-performance-safe",
"unstable",
"max-performance-safe",
"unstable",
] }
git2 = { version = "0.15.0", default-features = false }
image = "0.24.3"
Expand Down
80 changes: 40 additions & 40 deletions src/cli.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ use crate::info::langs::language::{Language, LanguageType};
use crate::ui::image_backends::ImageProtocol;
use crate::ui::printer::SerializationFormat;
use anyhow::Result;
use clap::AppSettings;
use clap::{Command, Parser, ValueHint};
use clap::builder::PossibleValuesParser;
use clap::{value_parser, Command, Parser, ValueHint};
use clap_complete::{generate, Generator, Shell};
use regex::Regex;
use std::env;
Expand All @@ -14,12 +14,13 @@ use std::path::PathBuf;
use std::str::FromStr;
use strum::IntoEnumIterator;

static COLOR_RESOLUTIONS: [&str; 5] = ["16", "32", "64", "128", "256"];
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
static COLOR_RESOLUTIONS: [&str; 5] = ["16", "32", "64", "128", "256"];
const COLOR_RESOLUTIONS: [&str; 5] = ["16", "32", "64", "128", "256"];

I think this can be const.

Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good point 👍


#[derive(Clone, Debug, Parser, PartialEq, Eq)]
#[clap(version, about, long_about = None, rename_all = "kebab-case")]
#[clap(global_setting(AppSettings::DeriveDisplayOrder))]
#[command(version, about, long_about = None, rename_all = "kebab-case")]
pub struct Config {
/// Run as if onefetch was started in <input> instead of the current working directory
#[clap(default_value = ".", hide_default_value = true, value_hint = ValueHint::DirPath)]
#[arg(default_value = ".", hide_default_value = true, value_hint = ValueHint::DirPath)]
pub input: PathBuf,
/// Takes a non-empty STRING as input to replace the ASCII logo
///
Expand All @@ -28,87 +29,87 @@ pub struct Config {
/// For example:
///
/// '--ascii-input "$(fortune | cowsay -W 25)'
#[clap(long, value_name = "STRING", value_hint = ValueHint::CommandString)]
#[arg(long, value_name = "STRING", value_hint = ValueHint::CommandString)]
pub ascii_input: Option<String>,
/// Which LANGUAGE's ascii art to print
#[clap(
#[arg(
long,
short,
value_name = "LANGUAGE",
arg_enum,
value_enum,
hide_possible_values = true
)]
pub ascii_language: Option<Language>,
/// Colors (X X X...) to print the ascii art
#[clap(
#[arg(
long,
multiple_values = true,
num_args = 1..,
value_name = "X",
short = 'c',
value_parser = clap::value_parser!(u8).range(..16),
value_parser = value_parser!(u8).range(..16),
)]
pub ascii_colors: Vec<u8>,
/// Allows you to disable FIELD(s) from appearing in the output
#[clap(
#[arg(
long,
short,
multiple_values = true,
num_args = 1..,
hide_possible_values = true,
arg_enum,
value_enum,
value_name = "FIELD"
)]
pub disabled_fields: Vec<InfoType>,
/// Path to the IMAGE file
#[clap(long, short, value_hint = ValueHint::FilePath)]
#[arg(long, short, value_hint = ValueHint::FilePath)]
pub image: Option<PathBuf>,
/// Which image protocol to use
#[clap(long, arg_enum, requires = "image")]
#[arg(long, value_enum, requires = "image")]
pub image_protocol: Option<ImageProtocol>,
/// VALUE of color resolution to use with SIXEL backend
#[clap(
#[arg(
long,
value_name = "VALUE",
requires = "image",
default_value_t = 16usize,
possible_values = ["16", "32", "64", "128", "256"],
//value_parser = PossibleValuesParser::new(COLOR_RESOLUTIONS)
)]
pub color_resolution: usize,
/// Turns off bold formatting
#[clap(long)]
#[arg(long)]
pub no_bold: bool,
/// Ignores merge commits
#[clap(long)]
#[arg(long)]
pub no_merges: bool,
/// Hides the color palette
#[clap(long)]
#[arg(long)]
pub no_color_palette: bool,
/// NUM of authors to be shown
#[clap(long, short, default_value_t = 3usize, value_name = "NUM")]
#[arg(long, short, default_value_t = 3usize, value_name = "NUM")]
pub number_of_authors: usize,
/// gnore all files & directories matching EXCLUDE
#[clap(long, multiple_values = true, short, value_hint = ValueHint::AnyPath)]
#[arg(long, short, num_args = 1.., value_hint = ValueHint::AnyPath)]
pub exclude: Vec<PathBuf>,
/// Exclude [bot] commits. Use <REGEX> to override the default pattern
#[clap(long, value_name = "REGEX")]
#[arg(long, value_name = "REGEX")]
pub no_bots: Option<Option<MyRegex>>,
/// Prints out supported languages
#[clap(long, short)]
#[arg(long, short)]
pub languages: bool,
/// Prints out supported package managers
#[clap(long, short)]
#[arg(long, short)]
pub package_managers: bool,
/// Outputs Onefetch in a specific format
#[clap(long, short, value_name = "FORMAT", arg_enum)]
#[arg(long, short, value_name = "FORMAT", value_enum)]
pub output: Option<SerializationFormat>,
/// Specify when to use true color
///
/// If set to auto: true color will be enabled if supported by the terminal
#[clap(long, default_value = "auto", value_name = "WHEN", arg_enum)]
#[arg(long, default_value = "auto", value_name = "WHEN", value_enum)]
pub true_color: When,
/// Specify when to show the logo
///
/// If set to auto: the logo will be hidden if the terminal's width < 95
#[clap(long, default_value = "always", value_name = "WHEN", arg_enum)]
#[arg(long, default_value = "always", value_name = "WHEN", value_enum)]
pub show_logo: When,
/// Changes the text colors (X X X...)
///
Expand All @@ -117,35 +118,34 @@ pub struct Config {
/// For example:
///
/// '--text-colors 9 10 11 12 13 14'
#[clap(
#[arg(
long,
short = 't',
multiple_values = true,
value_name = "X",
value_parser = clap::value_parser!(u8).range(..16),
max_values = 6
value_parser = value_parser!(u8).range(..16),
num_args = 1..=6
)]
pub text_colors: Vec<u8>,
/// Use ISO 8601 formatted timestamps
#[clap(long, short = 'z')]
#[arg(long, short = 'z')]
pub iso_time: bool,
/// Show the email address of each author
#[clap(long, short = 'E')]
#[arg(long, short = 'E')]
pub email: bool,
/// Count hidden files and directories
#[clap(long)]
#[arg(long)]
pub include_hidden: bool,
/// Filters output by language type
#[clap(
#[arg(
long,
multiple_values = true,
num_args = 1..,
default_values = &["programming", "markup"],
short = 'T',
arg_enum,
value_enum,
)]
pub r#type: Vec<LanguageType>,
/// If provided, outputs the completion file for given SHELL
#[clap(long = "generate", value_name = "SHELL", arg_enum)]
#[arg(long = "generate", value_name = "SHELL", value_enum)]
pub completion: Option<Shell>,
}

Expand Down