RGBCube/uutils-coreutils
1
Fork 0
mirror of https://github.com/RGBCube/uutils-coreutils synced 2025-07-29 12:07:46 +00:00
Code Issues Activity

ls: refactor the code

Browse source
This commit is contained in:
Sylvestre Ledru 2023-12-17 16:26:21 +01:00
parent 69f723a263
commit a3c7359056
1 changed files with 19 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

38
src/uu/ls/src/ls.rs
View file

@ -3248,6 +3248,19 @@ impl StyleManager {
} }
} }
fn apply_style_based_on_metadata(
path: &PathData,
md_option: Option<&Metadata>,
ls_colors: &LsColors,
style_manager: &mut StyleManager,
name: &str,
) -> String {
match ls_colors.style_for_path_with_metadata(&path.p_buf, md_option) {
Some(style) => style_manager.apply_style(style, name),
None => name.to_owned(),
}
}
/// Colors the provided name based on the style determined for the given path /// Colors the provided name based on the style determined for the given path
/// This function is quite long because it tries to leverage DirEntry to avoid /// This function is quite long because it tries to leverage DirEntry to avoid
/// unnecessary calls to stat() /// unnecessary calls to stat()
@ -3276,30 +3289,17 @@ fn color_name(
// use the optional target_symlink // use the optional target_symlink
// Use fn get_metadata instead of md() here and above because ls // Use fn get_metadata instead of md() here and above because ls
// should not exit with an err, if we are unable to obtain the target_metadata // should not exit with an err, if we are unable to obtain the target_metadata
let target = target_symlink.unwrap_or(path); let target = target_symlink.unwrap_or(path);
let md = match get_metadata_with_deref_opt(target.p_buf.as_path(), path.must_dereference) { let md = get_metadata_with_deref_opt(target.p_buf.as_path(), path.must_dereference)
Ok(md) => md, .unwrap_or_else(|_| target.get_metadata(out).unwrap().clone());
Err(_) => target.get_metadata(out).unwrap().clone(),
}; apply_style_based_on_metadata(path, Some(&md), ls_colors, style_manager, &name)
return match ls_colors.style_for_path_with_metadata(&path.p_buf, Some(&md)) {
Some(style) => style_manager.apply_style(style, &name),
None => name,
};
} else { } else {
let md_option = path.get_metadata(out); let md_option = path.get_metadata(out);
let symlink_metadata = path.p_buf.symlink_metadata().ok(); let symlink_metadata = path.p_buf.symlink_metadata().ok();
let md = md_option.or(symlink_metadata.as_ref());
let md = if md_option.is_some() { apply_style_based_on_metadata(path, md, ls_colors, style_manager, &name)
md_option
} else {
symlink_metadata.as_ref()
};
return match ls_colors.style_for_path_with_metadata(&path.p_buf, md) {
Some(style) => style_manager.apply_style(style, &name),
None => name,
};
} }
} }