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

Factor into a helper function; adapt to print_entry_uncolorized.

This commit is contained in:
Nathan Moreau 2019-04-12 02:11:55 +02:00 committed by David Peter
parent 29bf9d731d
commit e3af9b0307
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/output.rs
View File

@ -10,6 +10,7 @@ use crate::exit_codes::ExitCode;
use crate::internal::opts::FdOptions;
use lscolors::{LsColors, Style};
use std::borrow::Cow;
use std::io::{self, StdoutLock, Write};
use std::path::{Component, Path, PathBuf};
use std::process;
@ -52,6 +53,13 @@ pub fn print_entry(
}
}
fn replace_path_separator<'a>(config: &FdOptions, str: Cow<'a, str>) -> Cow<'a, str> {
match &config.path_separator {
None => str,
Some(sep) => Cow::from(str.replace(std::path::MAIN_SEPARATOR, &sep)),
}
}
fn print_entry_colorized(
stdout: &mut StdoutLock,
path: &Path,
@ -68,14 +76,8 @@ fn print_entry_colorized(
.unwrap_or(default_style);
let path_string = component.to_string_lossy();
match &config.path_separator {
None => write!(stdout, "{}", style.paint(path_string))?,
Some(sep) => {
let path_string = path_string.replace(std::path::MAIN_SEPARATOR, &sep);
write!(stdout, "{}", style.paint(path_string))?
}
}
let path_string = replace_path_separator(&config, path_string);
write!(stdout, "{}", style.paint(path_string))?;
if wants_to_quit.load(Ordering::Relaxed) {
writeln!(stdout)?;
@ -98,5 +100,6 @@ fn print_entry_uncolorized(
let separator = if config.null_separator { "\0" } else { "\n" };
let path_str = path.to_string_lossy();
let path_str = replace_path_separator(&config, path_str);
write!(stdout, "{}{}", path_str, separator)
}