Mirrors/coreutils
2
0
Fork 0
mirror of https://github.com/uutils/coreutils synced 2024-11-16 09:48:03 +00:00
Code Issues Projects Releases Packages Wiki Activity

ls: implement --group-directories-first

Browse source
This commit is contained in:
Thomas Queiroz 2022-05-21 02:55:45 -03:00
parent 9db0a877aa
commit 55a68bca80
No known key found for this signature in database
GPG key ID: 229D2DDF7ECA5F8F
1 changed files with 31 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -140,6 +140,7 @@ pub mod options {
pub static HIDE: &str = "hide"; pub static HIDE: &str = "hide";
pub static IGNORE: &str = "ignore"; pub static IGNORE: &str = "ignore";
pub static CONTEXT: &str = "context"; pub static CONTEXT: &str = "context";
pub static GROUP_DIRECTORIES_FIRST: &str = "group-directories-first";
} }
const DEFAULT_TERM_WIDTH: u16 = 80; const DEFAULT_TERM_WIDTH: u16 = 80;
@ -330,6 +331,7 @@ pub struct Config {
time_style: TimeStyle, time_style: TimeStyle,
context: bool, context: bool,
selinux_supported: bool, selinux_supported: bool,
group_directories_first: bool,
} }
// Fields that can be removed or added to the long format // Fields that can be removed or added to the long format
@ -780,6 +782,7 @@ impl Config {
false false
} }
}, },
group_directories_first: options.is_present(options::GROUP_DIRECTORIES_FIRST),
}) })
} }
} }
@ -1397,6 +1400,12 @@ pub fn uu_app<'a>() -> Command<'a> {
.long(options::CONTEXT) .long(options::CONTEXT)
.help(CONTEXT_HELP_TEXT), .help(CONTEXT_HELP_TEXT),
) )
.arg(
Arg::new(options::GROUP_DIRECTORIES_FIRST)
.long(options::GROUP_DIRECTORIES_FIRST)
.help("group directories before files; can be augmented with \
a --sort option, but any use of --sort=none (-U) disables grouping"),
)
// Positional arguments // Positional arguments
.arg( .arg(
Arg::new(options::PATHS) Arg::new(options::PATHS)
@ -1635,6 +1644,28 @@ fn sort_entries(entries: &mut [PathData], config: &Config, out: &mut BufWriter<S
if config.reverse { if config.reverse {
entries.reverse(); entries.reverse();
} }
if config.group_directories_first && config.sort != Sort::None {
entries.sort_by_key(|p| {
let md = {
// We will always try to deref symlinks to group directories, so PathData.md
// is not always useful.
if p.must_dereference {
p.md.get()
} else {
None
}
};
!match md {
None | Some(None) => {
// If it metadata cannot be determined, treat as a file.
get_metadata(p.p_buf.as_path(), true).map_or_else(|_| false, |m| m.is_dir())
}
Some(Some(m)) => m.is_dir(),
}
});
}
} }
fn is_hidden(file_path: &DirEntry) -> bool { fn is_hidden(file_path: &DirEntry) -> bool {