Mirrors/coreutils
2
0
Fork 0
mirror of https://github.com/uutils/coreutils synced 2024-12-14 07:12:44 +00:00
Code Issues Projects Releases Packages Wiki Activity

dircolors: move the FILE_ATTRIBUTE_CODES datastructures and use it

Browse source
This commit is contained in:
Sylvestre Ledru 2023-12-02 11:00:55 +01:00
parent 13a4c9114c
commit 0e8c171c80
5 changed files with 273 additions and 233 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/uu/dircolors/Cargo.toml
View file

@ -16,7 +16,7 @@ path = "src/dircolors.rs"
[dependencies]
clap = { workspace = true }
uucore = { workspace = true }
uucore = { workspace = true, features = ["colors"] }
[[bin]]
name = "dircolors"

43
src/uu/dircolors/src/dircolors.rs
View file

@ -12,6 +12,7 @@ use std::io::{BufRead, BufReader};
use std::path::Path;
use clap::{crate_version, Arg, ArgAction, Command};
use uucore::colors::FILE_ATTRIBUTE_CODES;
use uucore::display::Quotable;
use uucore::error::{UResult, USimpleError, UUsageError};
use uucore::{help_about, help_section, help_usage};
@ -276,7 +277,6 @@ enum ParseState {
Pass,
}
use std::collections::HashMap;
use uucore::{format_usage, parse_glob};
#[allow(clippy::cognitive_complexity)]
@ -294,45 +294,6 @@ where
OutputFmt::Unknown => unreachable!(),
}
let mut table: HashMap<&str, &str> = HashMap::with_capacity(48);
table.insert("normal", "no");
table.insert("norm", "no");
table.insert("file", "fi");
table.insert("reset", "rs");
table.insert("dir", "di");
table.insert("lnk", "ln");
table.insert("link", "ln");
table.insert("symlink", "ln");
table.insert("orphan", "or");
table.insert("missing", "mi");
table.insert("fifo", "pi");
table.insert("pipe", "pi");
table.insert("sock", "so");
table.insert("blk", "bd");
table.insert("block", "bd");
table.insert("chr", "cd");
table.insert("char", "cd");
table.insert("door", "do");
table.insert("exec", "ex");
table.insert("left", "lc");
table.insert("leftcode", "lc");
table.insert("right", "rc");
table.insert("rightcode", "rc");
table.insert("end", "ec");
table.insert("endcode", "ec");
table.insert("suid", "su");
table.insert("setuid", "su");
table.insert("sgid", "sg");
table.insert("setgid", "sg");
table.insert("sticky", "st");
table.insert("other_writable", "ow");
table.insert("owr", "ow");
table.insert("sticky_other_writable", "tw");
table.insert("owt", "tw");
table.insert("capability", "ca");
table.insert("multihardlink", "mh");
table.insert("clrtoeol", "cl");
let term = env::var("TERM").unwrap_or_else(|_| "none".to_owned());
let term = term.as_str();
@ -384,7 +345,7 @@ where
}
} else if lower == "options" || lower == "color" || lower == "eightbit" {
// Slackware only. Ignore
} else if let Some(s) = table.get(lower.as_str()) {
} else if let Some(s) = FILE_ATTRIBUTE_CODES.get(lower.as_str()) {
if *fmt == OutputFmt::Display {
result.push_str(format!("\x1b[{val}m{s}\t{val}\x1b[0m\n").as_str());
} else {

1
src/uucore/Cargo.toml
View file

@ -72,6 +72,7 @@ windows-sys = { workspace = true, optional = true, default-features = false, fea
default = []
# * non-default features
backup-control = []
colors = []
encoding = ["data-encoding", "data-encoding-macro", "z85", "thiserror"]
entries = ["libc"]
fs = ["dunce", "libc", "winapi-util", "windows-sys"]

458
src/uucore/src/lib/features/colors.rs
View file

@ -3,6 +3,9 @@
// For the full copyright and license information, please view the LICENSE
// file that was distributed with this source code.
use once_cell::sync::Lazy;
use std::collections::HashMap;
/* The keywords COLOR, OPTIONS, and EIGHTBIT (honored by the
* slackware version of dircolors) are recognized but ignored.
* Global config options can be specified before TERM or COLORTERM entries
@ -11,33 +14,41 @@
* COLORTERM ?*
*/
static TERMS: &[&str] = &[
"Eterm",
"ansi",
"*color*",
"con[0-9]*x[0-9]*",
"cons25",
"console",
"cygwin",
"*direct*",
"dtterm",
"gnome",
"hurd",
"jfbterm",
"konsole",
"kterm",
"linux",
"linux-c",
"mlterm",
"putty",
"rxvt*",
"screen*",
"st",
"terminator",
"tmux*",
"vt100",
"xterm*",
];
pub static TERMS: Lazy<HashMap<&str, &str>> = Lazy::new(|| {
let mut m = HashMap::new();
[
"Eterm",
"ansi",
"*color*",
"con[0-9]*x[0-9]*",
"cons25",
"console",
"cygwin",
"*direct*",
"dtterm",
"gnome",
"hurd",
"jfbterm",
"konsole",
"kterm",
"linux",
"linux-c",
"mlterm",
"putty",
"rxvt*",
"screen*",
"st",
"terminator",
"tmux*",
"vt100",
"xterm*",
]
.iter()
.for_each(|&term| {
m.insert(term, "");
});
m
});
/*
# Below are the color init strings for the basic file types.
@ -53,173 +64,238 @@ static TERMS: &[&str] = &[
#NORMAL 00 # no color code at all
#FILE 00 # regular file: use no color at all
*/
static FILE_TYPES: &[(&str, &str)] = &[
("RESET", "0"), // reset to "normal" color
("DIR", "01;34"), // directory
("LINK", "01;36"), // symbolic link
("MULTIHARDLINK", "00"), // regular file with more than one link
("FIFO", "40;33"), // pipe
("SOCK", "01;35"), // socket
("DOOR", "01;35"), // door
("BLK", "40;33;01"), // block device driver
("CHR", "40;33;01"), // character device driver
("ORPHAN", "40;31;01"), // symlink to nonexistent file, or non-stat'able file
("MISSING", "00"), // ... and the files they point to
("SETUID", "37;41"), // file that is setuid (u+s)
("SETGID", "30;43"), // file that is setgid (g+s)
("CAPABILITY", "00"), // file with capability
("STICKY_OTHER_WRITABLE", "30;42"), // dir that is sticky and other-writable (+t,o+w)
("OTHER_WRITABLE", "34;42"), // dir that is other-writable (o+w) and not sticky
("STICKY", "37;44"), // dir with the sticky bit set (+t) and not other-writable
("EXEC", "01;32"), // files with execute permission
];
// FILE_TYPES with Lazy initialization
pub static FILE_TYPES: Lazy<HashMap<&str, &str>> = Lazy::new(|| {
let mut m = HashMap::new();
[
("RESET", "0"), // reset to "normal" color
("DIR", "01;34"), // directory
("LINK", "01;36"), // symbolic link
("MULTIHARDLINK", "00"), // regular file with more than one link
("FIFO", "40;33"), // pipe
("SOCK", "01;35"), // socket
("DOOR", "01;35"), // door
("BLK", "40;33;01"), // block device driver
("CHR", "40;33;01"), // character device driver
("ORPHAN", "40;31;01"), // symlink to nonexistent file, or non-stat'able file
("MISSING", "00"), // ... and the files they point to
("SETUID", "37;41"), // file that is setuid (u+s)
("SETGID", "30;43"), // file that is setgid (g+s)
("CAPABILITY", "00"), // file with capability
("STICKY_OTHER_WRITABLE", "30;42"), // dir that is sticky and other-writable (+t,o+w)
("OTHER_WRITABLE", "34;42"), // dir that is other-writable (o+w) and not sticky
("STICKY", "37;44"), // dir with the sticky bit set (+t) and not other-writable
("EXEC", "01;32"), // files with execute permission
]
.iter()
.for_each(|&(k, v)| {
m.insert(k, v);
});
m
});
/*
# List any file extensions like '.gz' or '.tar' that you would like ls
# to color below. Put the extension, a space, and the color init string.
# (and any comments you want to add after a '#')
*/
static FILE_COLORS: &[(&str, &str)] = &[
// Executables (Windows)
(".cmd", "01;32"),
(".exe", "01;32"),
(".com", "01;32"),
(".btm", "01;32"),
(".bat", "01;32"),
(".sh", "01;32"),
(".csh", "01;32"),
// Archives or compressed
(".tar", "01;31"),
(".tgz", "01;31"),
(".arc", "01;31"),
(".arj", "01;31"),
(".taz", "01;31"),
(".lha", "01;31"),
(".lz4", "01;31"),
(".lzh", "01;31"),
(".lzma", "01;31"),
(".tlz", "01;31"),
(".txz", "01;31"),
(".tzo", "01;31"),
(".t7z", "01;31"),
(".zip", "01;31"),
(".z", "01;31"),
(".dz", "01;31"),
(".gz", "01;31"),
(".lrz", "01;31"),
(".lz", "01;31"),
(".lzo", "01;31"),
(".xz", "01;31"),
(".zst", "01;31"),
(".tzst", "01;31"),
(".bz2", "01;31"),
(".bz", "01;31"),
(".tbz", "01;31"),
(".tbz2", "01;31"),
(".tz", "01;31"),
(".deb", "01;31"),
(".rpm", "01;31"),
(".jar", "01;31"),
(".war", "01;31"),
(".ear", "01;31"),
(".sar", "01;31"),
(".rar", "01;31"),
(".alz", "01;31"),
(".ace", "01;31"),
(".zoo", "01;31"),
(".cpio", "01;31"),
(".7z", "01;31"),
(".rz", "01;31"),
(".cab", "01;31"),
(".wim", "01;31"),
(".swm", "01;31"),
(".dwm", "01;31"),
(".esd", "01;31"),
// Image formats
(".avif", "01;35"),
(".jpg", "01;35"),
(".jpeg", "01;35"),
(".mjpg", "01;35"),
(".mjpeg", "01;35"),
(".gif", "01;35"),
(".bmp", "01;35"),
(".pbm", "01;35"),
(".pgm", "01;35"),
(".ppm", "01;35"),
(".tga", "01;35"),
(".xbm", "01;35"),
(".xpm", "01;35"),
(".tif", "01;35"),
(".tiff", "01;35"),
(".png", "01;35"),
(".svg", "01;35"),
(".svgz", "01;35"),
(".mng", "01;35"),
(".pcx", "01;35"),
(".mov", "01;35"),
(".mpg", "01;35"),
(".mpeg", "01;35"),
(".m2v", "01;35"),
(".mkv", "01;35"),
(".webm", "01;35"),
(".webp", "01;35"),
(".ogm", "01;35"),
(".mp4", "01;35"),
(".m4v", "01;35"),
(".mp4v", "01;35"),
(".vob", "01;35"),
(".qt", "01;35"),
(".nuv", "01;35"),
(".wmv", "01;35"),
(".asf", "01;35"),
(".rm", "01;35"),
(".rmvb", "01;35"),
(".flc", "01;35"),
(".avi", "01;35"),
(".fli", "01;35"),
(".flv", "01;35"),
(".gl", "01;35"),
(".dl", "01;35"),
(".xcf", "01;35"),
(".xwd", "01;35"),
(".yuv", "01;35"),
(".cgm", "01;35"),
(".emf", "01;35"),
(".ogv", "01;35"),
(".ogx", "01;35"),
// Audio formats
(".aac", "00;36"),
(".au", "00;36"),
(".flac", "00;36"),
(".m4a", "00;36"),
(".mid", "00;36"),
(".midi", "00;36"),
(".mka", "00;36"),
(".mp3", "00;36"),
(".mpc", "00;36"),
(".ogg", "00;36"),
(".ra", "00;36"),
(".wav", "00;36"),
(".oga", "00;36"),
(".opus", "00;36"),
(".spx", "00;36"),
(".xspf", "00;36"),
// Backup files
("*~", "00;90"),
("*#", "00;90"),
(".bak", "00;90"),
(".old", "00;90"),
(".orig", "00;90"),
(".part", "00;90"),
(".rej", "00;90"),
(".swp", "00;90"),
(".tmp", "00;90"),
(".dpkg-dist", "00;90"),
(".dpkg-old", "00;90"),
(".ucf-dist", "00;90"),
(".ucf-new", "00;90"),
(".ucf-old", "00;90"),
(".rpmnew", "00;90"),
(".rpmorig", "00;90"),
(".rpmsave", "00;90"),
];
pub static FILE_COLORS: Lazy<HashMap<&str, &str>> = Lazy::new(|| {
let mut m = HashMap::new();
[
// Executables (Windows)
(".cmd", "01;32"),
(".exe", "01;32"),
(".com", "01;32"),
(".btm", "01;32"),
(".bat", "01;32"),
(".sh", "01;32"),
(".csh", "01;32"),
// Archives or compressed
(".tar", "01;31"),
(".tgz", "01;31"),
(".arc", "01;31"),
(".arj", "01;31"),
(".taz", "01;31"),
(".lha", "01;31"),
(".lz4", "01;31"),
(".lzh", "01;31"),
(".lzma", "01;31"),
(".tlz", "01;31"),
(".txz", "01;31"),
(".tzo", "01;31"),
(".t7z", "01;31"),
(".zip", "01;31"),
(".z", "01;31"),
(".dz", "01;31"),
(".gz", "01;31"),
(".lrz", "01;31"),
(".lz", "01;31"),
(".lzo", "01;31"),
(".xz", "01;31"),
(".zst", "01;31"),
(".tzst", "01;31"),
(".bz2", "01;31"),
(".bz", "01;31"),
(".tbz", "01;31"),
(".tbz2", "01;31"),
(".tz", "01;31"),
(".deb", "01;31"),
(".rpm", "01;31"),
(".jar", "01;31"),
(".war", "01;31"),
(".ear", "01;31"),
(".sar", "01;31"),
(".rar", "01;31"),
(".alz", "01;31"),
(".ace", "01;31"),
(".zoo", "01;31"),
(".cpio", "01;31"),
(".7z", "01;31"),
(".rz", "01;31"),
(".cab", "01;31"),
(".wim", "01;31"),
(".swm", "01;31"),
(".dwm", "01;31"),
(".esd", "01;31"),
// Image formats
(".avif", "01;35"),
(".jpg", "01;35"),
(".jpeg", "01;35"),
(".mjpg", "01;35"),
(".mjpeg", "01;35"),
(".gif", "01;35"),
(".bmp", "01;35"),
(".pbm", "01;35"),
(".pgm", "01;35"),
(".ppm", "01;35"),
(".tga", "01;35"),
(".xbm", "01;35"),
(".xpm", "01;35"),
(".tif", "01;35"),
(".tiff", "01;35"),
(".png", "01;35"),
(".svg", "01;35"),
(".svgz", "01;35"),
(".mng", "01;35"),
(".pcx", "01;35"),
(".mov", "01;35"),
(".mpg", "01;35"),
(".mpeg", "01;35"),
(".m2v", "01;35"),
(".mkv", "01;35"),
(".webm", "01;35"),
(".webp", "01;35"),
(".ogm", "01;35"),
(".mp4", "01;35"),
(".m4v", "01;35"),
(".mp4v", "01;35"),
(".vob", "01;35"),
(".qt", "01;35"),
(".nuv", "01;35"),
(".wmv", "01;35"),
(".asf", "01;35"),
(".rm", "01;35"),
(".rmvb", "01;35"),
(".flc", "01;35"),
(".avi", "01;35"),
(".fli", "01;35"),
(".flv", "01;35"),
(".gl", "01;35"),
(".dl", "01;35"),
(".xcf", "01;35"),
(".xwd", "01;35"),
(".yuv", "01;35"),
(".cgm", "01;35"),
(".emf", "01;35"),
(".ogv", "01;35"),
(".ogx", "01;35"),
// Audio formats
(".aac", "00;36"),
(".au", "00;36"),
(".flac", "00;36"),
(".m4a", "00;36"),
(".mid", "00;36"),
(".midi", "00;36"),
(".mka", "00;36"),
(".mp3", "00;36"),
(".mpc", "00;36"),
(".ogg", "00;36"),
(".ra", "00;36"),
(".wav", "00;36"),
(".oga", "00;36"),
(".opus", "00;36"),
(".spx", "00;36"),
(".xspf", "00;36"),
// Backup files
("*~", "00;90"),
("*#", "00;90"),
(".bak", "00;90"),
(".old", "00;90"),
(".orig", "00;90"),
(".part", "00;90"),
(".rej", "00;90"),
(".swp", "00;90"),
(".tmp", "00;90"),
(".dpkg-dist", "00;90"),
(".dpkg-old", "00;90"),
(".ucf-dist", "00;90"),
(".ucf-new", "00;90"),
(".ucf-old", "00;90"),
(".rpmnew", "00;90"),
(".rpmorig", "00;90"),
(".rpmsave", "00;90"),
]
.iter()
.for_each(|&(k, v)| {
m.insert(k, v);
});
m
});
pub static FILE_ATTRIBUTE_CODES: Lazy<HashMap<&str, &str>> = Lazy::new(|| {
let mut m = HashMap::new();
[
("normal", "no"),
("norm", "no"),
("file", "fi"),
("reset", "rs"),
("dir", "di"),
("lnk", "ln"),
("link", "ln"),
("symlink", "ln"),
("orphan", "or"),
("missing", "mi"),
("fifo", "pi"),
("pipe", "pi"),
("sock", "so"),
("blk", "bd"),
("block", "bd"),
("chr", "cd"),
("char", "cd"),
("door", "do"),
("exec", "ex"),
("left", "lc"),
("leftcode", "lc"),
("right", "rc"),
("rightcode", "rc"),
("end", "ec"),
("endcode", "ec"),
("suid", "su"),
("setuid", "su"),
("sgid", "sg"),
("setgid", "sg"),
("sticky", "st"),
("other_writable", "ow"),
("owr", "ow"),
("sticky_other_writable", "tw"),
("owt", "tw"),
("capability", "ca"),
("multihardlink", "mh"),
("clrtoeol", "cl"),
]
.iter()
.for_each(|&(k, v)| {
m.insert(k, v);
});
m
});

2
src/uucore/src/lib/lib.rs
View file

@ -35,6 +35,8 @@ pub use crate::parser::shortcut_value_parser;
// * feature-gated modules
#[cfg(feature = "backup-control")]
pub use crate::features::backup_control;
#[cfg(feature = "colors")]
pub use crate::features::colors;
#[cfg(feature = "encoding")]
pub use crate::features::encoding;
#[cfg(feature = "format")]