Robot
/
fd
mirror of https://github.com/sharkdp/fd.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Only parse dir_colors if output is colored, closes #21

This commit is contained in:
sharkdp 2017-05-15 21:41:31 +02:00
parent bb63a4c6d7
commit f9cb3326c8
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/main.rs
View File

@ -233,9 +233,17 @@ fn main() {
};
let current_dir = current_dir_buf.as_path();
let ext_styles = env::home_dir()
.map(|h| h.join(".dir_colors"))
.and_then(|path| parse_dircolors(&path).ok());
let colored_output = !matches.opt_present("no-color") &&
stdout_isatty();
let ext_styles =
if colored_output {
env::home_dir()
.map(|h| h.join(".dir_colors"))
.and_then(|path| parse_dircolors(&path).ok())
} else {
None
};
let config = FdOptions {
// The search will be case-sensitive if the command line flag is set or
@ -244,8 +252,7 @@ fn main() {
pattern.chars().any(char::is_uppercase),
search_full_path: !matches.opt_present("filename"),
search_hidden: matches.opt_present("hidden"),
colored: !matches.opt_present("no-color") &&
stdout_isatty(),
colored: colored_output,
follow_links: matches.opt_present("follow"),
max_depth:
matches.opt_str("max-depth")