mirror of
https://github.com/bootandy/dust.git
synced 2025-12-12 23:59:58 -08:00
feature: --files-only -F
Add feature to only show files skipping directories.
This commit is contained in:
@@ -58,8 +58,10 @@ _dust() {
|
|||||||
'--si[print sizes in powers of 1000 (e.g., 1.1G)]' \
|
'--si[print sizes in powers of 1000 (e.g., 1.1G)]' \
|
||||||
'-P[Disable the progress indication.]' \
|
'-P[Disable the progress indication.]' \
|
||||||
'--no-progress[Disable the progress indication.]' \
|
'--no-progress[Disable the progress indication.]' \
|
||||||
'-D[Only directories will be displayed.]' \
|
'(-F --only-file)-D[Only directories will be displayed.]' \
|
||||||
'--only-dir[Only directories will be displayed.]' \
|
'(-F --only-file)--only-dir[Only directories will be displayed.]' \
|
||||||
|
'(-D --only-dir)-F[Only files will be displayed. (Finds your largest files)]' \
|
||||||
|
'(-D --only-dir)--only-file[Only files will be displayed. (Finds your largest files)]' \
|
||||||
'*::inputs:' \
|
'*::inputs:' \
|
||||||
&& ret=0
|
&& ret=0
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -66,6 +66,8 @@ Register-ArgumentCompleter -Native -CommandName 'dust' -ScriptBlock {
|
|||||||
[CompletionResult]::new('--no-progress', 'no-progress', [CompletionResultType]::ParameterName, 'Disable the progress indication.')
|
[CompletionResult]::new('--no-progress', 'no-progress', [CompletionResultType]::ParameterName, 'Disable the progress indication.')
|
||||||
[CompletionResult]::new('-D', 'D', [CompletionResultType]::ParameterName, 'Only directories will be displayed.')
|
[CompletionResult]::new('-D', 'D', [CompletionResultType]::ParameterName, 'Only directories will be displayed.')
|
||||||
[CompletionResult]::new('--only-dir', 'only-dir', [CompletionResultType]::ParameterName, 'Only directories will be displayed.')
|
[CompletionResult]::new('--only-dir', 'only-dir', [CompletionResultType]::ParameterName, 'Only directories will be displayed.')
|
||||||
|
[CompletionResult]::new('-F', 'F', [CompletionResultType]::ParameterName, 'Only files will be displayed. (Finds your largest files)')
|
||||||
|
[CompletionResult]::new('--only-file', 'only-file', [CompletionResultType]::ParameterName, 'Only files will be displayed. (Finds your largest files)')
|
||||||
break
|
break
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
|||||||
@@ -19,7 +19,7 @@ _dust() {
|
|||||||
|
|
||||||
case "${cmd}" in
|
case "${cmd}" in
|
||||||
dust)
|
dust)
|
||||||
opts="-h -V -d -n -p -X -L -x -s -r -c -b -z -f -i -v -e -t -w -H -P -D --help --version --depth --number-of-lines --full-paths --ignore-directory --dereference-links --limit-filesystem --apparent-size --reverse --no-colors --no-percent-bars --min-size --skip-total --filecount --ignore_hidden --invert-filter --filter --file_types --terminal_width --si --no-progress --only-dir <inputs>..."
|
opts="-h -V -d -n -p -X -L -x -s -r -c -b -z -f -i -v -e -t -w -H -P -D -F --help --version --depth --number-of-lines --full-paths --ignore-directory --dereference-links --limit-filesystem --apparent-size --reverse --no-colors --no-percent-bars --min-size --skip-total --filecount --ignore_hidden --invert-filter --filter --file_types --terminal_width --si --no-progress --only-dir --only-file <inputs>..."
|
||||||
if [[ ${cur} == -* || ${COMP_CWORD} -eq 1 ]] ; then
|
if [[ ${cur} == -* || ${COMP_CWORD} -eq 1 ]] ; then
|
||||||
COMPREPLY=( $(compgen -W "${opts}" -- "${cur}") )
|
COMPREPLY=( $(compgen -W "${opts}" -- "${cur}") )
|
||||||
return 0
|
return 0
|
||||||
|
|||||||
@@ -63,6 +63,8 @@ set edit:completion:arg-completer[dust] = {|@words|
|
|||||||
cand --no-progress 'Disable the progress indication.'
|
cand --no-progress 'Disable the progress indication.'
|
||||||
cand -D 'Only directories will be displayed.'
|
cand -D 'Only directories will be displayed.'
|
||||||
cand --only-dir 'Only directories will be displayed.'
|
cand --only-dir 'Only directories will be displayed.'
|
||||||
|
cand -F 'Only files will be displayed. (Finds your largest files)'
|
||||||
|
cand --only-file 'Only files will be displayed. (Finds your largest files)'
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
$completions[$command]
|
$completions[$command]
|
||||||
|
|||||||
@@ -21,3 +21,4 @@ complete -c dust -s t -l file_types -d 'show only these file types'
|
|||||||
complete -c dust -s H -l si -d 'print sizes in powers of 1000 (e.g., 1.1G)'
|
complete -c dust -s H -l si -d 'print sizes in powers of 1000 (e.g., 1.1G)'
|
||||||
complete -c dust -s P -l no-progress -d 'Disable the progress indication.'
|
complete -c dust -s P -l no-progress -d 'Disable the progress indication.'
|
||||||
complete -c dust -s D -l only-dir -d 'Only directories will be displayed.'
|
complete -c dust -s D -l only-dir -d 'Only directories will be displayed.'
|
||||||
|
complete -c dust -s F -l only-file -d 'Only files will be displayed. (Finds your largest files)'
|
||||||
|
|||||||
@@ -4,7 +4,7 @@
|
|||||||
.SH NAME
|
.SH NAME
|
||||||
Dust \- Like du but more intuitive
|
Dust \- Like du but more intuitive
|
||||||
.SH SYNOPSIS
|
.SH SYNOPSIS
|
||||||
\fBDust\fR [\fB\-h\fR|\fB\-\-help\fR] [\fB\-V\fR|\fB\-\-version\fR] [\fB\-d\fR|\fB\-\-depth\fR] [\fB\-n\fR|\fB\-\-number\-of\-lines\fR] [\fB\-p\fR|\fB\-\-full\-paths\fR] [\fB\-X\fR|\fB\-\-ignore\-directory\fR] [\fB\-L\fR|\fB\-\-dereference\-links\fR] [\fB\-x\fR|\fB\-\-limit\-filesystem\fR] [\fB\-s\fR|\fB\-\-apparent\-size\fR] [\fB\-r\fR|\fB\-\-reverse\fR] [\fB\-c\fR|\fB\-\-no\-colors\fR] [\fB\-b\fR|\fB\-\-no\-percent\-bars\fR] [\fB\-z\fR|\fB\-\-min\-size\fR] [\fB\-\-skip\-total\fR] [\fB\-f\fR|\fB\-\-filecount\fR] [\fB\-i\fR|\fB\-\-ignore_hidden\fR] [\fB\-v\fR|\fB\-\-invert\-filter\fR] [\fB\-e\fR|\fB\-\-filter\fR] [\fB\-t\fR|\fB\-\-file_types\fR] [\fB\-w\fR|\fB\-\-terminal_width\fR] [\fB\-H\fR|\fB\-\-si\fR] [\fB\-P\fR|\fB\-\-no\-progress\fR] [\fB\-D\fR|\fB\-\-only\-dir\fR] [\fIinputs\fR]
|
\fBDust\fR [\fB\-h\fR|\fB\-\-help\fR] [\fB\-V\fR|\fB\-\-version\fR] [\fB\-d\fR|\fB\-\-depth\fR] [\fB\-n\fR|\fB\-\-number\-of\-lines\fR] [\fB\-p\fR|\fB\-\-full\-paths\fR] [\fB\-X\fR|\fB\-\-ignore\-directory\fR] [\fB\-L\fR|\fB\-\-dereference\-links\fR] [\fB\-x\fR|\fB\-\-limit\-filesystem\fR] [\fB\-s\fR|\fB\-\-apparent\-size\fR] [\fB\-r\fR|\fB\-\-reverse\fR] [\fB\-c\fR|\fB\-\-no\-colors\fR] [\fB\-b\fR|\fB\-\-no\-percent\-bars\fR] [\fB\-z\fR|\fB\-\-min\-size\fR] [\fB\-\-skip\-total\fR] [\fB\-f\fR|\fB\-\-filecount\fR] [\fB\-i\fR|\fB\-\-ignore_hidden\fR] [\fB\-v\fR|\fB\-\-invert\-filter\fR] [\fB\-e\fR|\fB\-\-filter\fR] [\fB\-t\fR|\fB\-\-file_types\fR] [\fB\-w\fR|\fB\-\-terminal_width\fR] [\fB\-H\fR|\fB\-\-si\fR] [\fB\-P\fR|\fB\-\-no\-progress\fR] [\fB\-D\fR|\fB\-\-only\-dir\fR] [\fB\-F\fR|\fB\-\-only\-file\fR] [\fIinputs\fR]
|
||||||
.SH DESCRIPTION
|
.SH DESCRIPTION
|
||||||
Like du but more intuitive
|
Like du but more intuitive
|
||||||
.SH OPTIONS
|
.SH OPTIONS
|
||||||
@@ -78,6 +78,9 @@ Disable the progress indication.
|
|||||||
\fB\-D\fR, \fB\-\-only\-dir\fR
|
\fB\-D\fR, \fB\-\-only\-dir\fR
|
||||||
Only directories will be displayed.
|
Only directories will be displayed.
|
||||||
.TP
|
.TP
|
||||||
|
\fB\-F\fR, \fB\-\-only\-file\fR
|
||||||
|
Only files will be displayed. (Finds your largest files)
|
||||||
|
.TP
|
||||||
[\fIinputs\fR]
|
[\fIinputs\fR]
|
||||||
|
|
||||||
.SH VERSION
|
.SH VERSION
|
||||||
|
|||||||
10
src/cli.rs
10
src/cli.rs
@@ -146,11 +146,19 @@ pub fn build_cli() -> Command<'static> {
|
|||||||
.long("no-progress")
|
.long("no-progress")
|
||||||
.help("Disable the progress indication."),
|
.help("Disable the progress indication."),
|
||||||
)
|
)
|
||||||
.arg(Arg::new("inputs").multiple_occurrences(true))
|
|
||||||
.arg(
|
.arg(
|
||||||
Arg::new("only_dir")
|
Arg::new("only_dir")
|
||||||
.short('D')
|
.short('D')
|
||||||
.long("only-dir")
|
.long("only-dir")
|
||||||
|
.conflicts_with("only_file")
|
||||||
.help("Only directories will be displayed."),
|
.help("Only directories will be displayed."),
|
||||||
)
|
)
|
||||||
|
.arg(
|
||||||
|
Arg::new("only_file")
|
||||||
|
.short('F')
|
||||||
|
.long("only-file")
|
||||||
|
.conflicts_with("only_dir")
|
||||||
|
.help("Only files will be displayed. (Finds your largest files)"),
|
||||||
|
)
|
||||||
|
.arg(Arg::new("inputs").multiple_occurrences(true))
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -20,6 +20,7 @@ pub struct Config {
|
|||||||
pub iso: Option<bool>,
|
pub iso: Option<bool>,
|
||||||
pub min_size: Option<String>,
|
pub min_size: Option<String>,
|
||||||
pub only_dir: Option<bool>,
|
pub only_dir: Option<bool>,
|
||||||
|
pub only_file: Option<bool>,
|
||||||
pub disable_progress: Option<bool>,
|
pub disable_progress: Option<bool>,
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -37,7 +38,10 @@ impl Config {
|
|||||||
Some(true) == self.ignore_hidden || options.is_present("ignore_hidden")
|
Some(true) == self.ignore_hidden || options.is_present("ignore_hidden")
|
||||||
}
|
}
|
||||||
pub fn get_full_paths(&self, options: &ArgMatches) -> bool {
|
pub fn get_full_paths(&self, options: &ArgMatches) -> bool {
|
||||||
Some(true) == self.display_full_paths || options.is_present("display_full_paths")
|
// If we are only showing files, always show full paths
|
||||||
|
Some(true) == self.display_full_paths
|
||||||
|
|| options.is_present("display_full_paths")
|
||||||
|
|| self.get_only_file(options)
|
||||||
}
|
}
|
||||||
pub fn get_reverse(&self, options: &ArgMatches) -> bool {
|
pub fn get_reverse(&self, options: &ArgMatches) -> bool {
|
||||||
Some(true) == self.reverse || options.is_present("reverse")
|
Some(true) == self.reverse || options.is_present("reverse")
|
||||||
@@ -69,6 +73,9 @@ impl Config {
|
|||||||
pub fn get_only_dir(&self, options: &ArgMatches) -> bool {
|
pub fn get_only_dir(&self, options: &ArgMatches) -> bool {
|
||||||
Some(true) == self.only_dir || options.is_present("only_dir")
|
Some(true) == self.only_dir || options.is_present("only_dir")
|
||||||
}
|
}
|
||||||
|
pub fn get_only_file(&self, options: &ArgMatches) -> bool {
|
||||||
|
Some(true) == self.only_file || options.is_present("only_file")
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
fn convert_min_size(input: &str, iso: bool) -> Option<usize> {
|
fn convert_min_size(input: &str, iso: bool) -> Option<usize> {
|
||||||
|
|||||||
@@ -1,13 +1,14 @@
|
|||||||
use crate::display_node::DisplayNode;
|
use crate::display_node::DisplayNode;
|
||||||
use crate::node::Node;
|
use crate::node::Node;
|
||||||
use std::collections::BinaryHeap;
|
use std::collections::BinaryHeap;
|
||||||
use std::collections::HashSet;
|
use std::collections::HashMap;
|
||||||
use std::path::Path;
|
use std::path::Path;
|
||||||
use std::path::PathBuf;
|
use std::path::PathBuf;
|
||||||
|
|
||||||
pub struct AggregateData {
|
pub struct AggregateData {
|
||||||
pub min_size: Option<usize>,
|
pub min_size: Option<usize>,
|
||||||
pub only_dir: bool,
|
pub only_dir: bool,
|
||||||
|
pub only_file: bool,
|
||||||
pub number_of_lines: usize,
|
pub number_of_lines: usize,
|
||||||
pub depth: usize,
|
pub depth: usize,
|
||||||
pub using_a_filter: bool,
|
pub using_a_filter: bool,
|
||||||
@@ -38,31 +39,34 @@ pub fn get_biggest(top_level_nodes: Vec<Node>, display_data: AggregateData) -> O
|
|||||||
heap = add_children(&display_data, &root, heap);
|
heap = add_children(&display_data, &root, heap);
|
||||||
}
|
}
|
||||||
|
|
||||||
let nol = display_data.number_of_lines;
|
fill_remaining_lines(heap, &root, display_data)
|
||||||
let remaining = nol.saturating_sub(number_top_level_nodes);
|
|
||||||
fill_remaining_lines(heap, &root, remaining, display_data)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn fill_remaining_lines<'a>(
|
pub fn fill_remaining_lines<'a>(
|
||||||
mut heap: BinaryHeap<&'a Node>,
|
mut heap: BinaryHeap<&'a Node>,
|
||||||
root: &'a Node,
|
root: &'a Node,
|
||||||
remaining_lines: usize,
|
|
||||||
display_data: AggregateData,
|
display_data: AggregateData,
|
||||||
) -> Option<DisplayNode> {
|
) -> Option<DisplayNode> {
|
||||||
let mut allowed_nodes = HashSet::new();
|
let mut allowed_nodes = HashMap::new();
|
||||||
allowed_nodes.insert(root.name.as_path());
|
|
||||||
|
|
||||||
for _ in 0..remaining_lines {
|
while allowed_nodes.len() < display_data.number_of_lines {
|
||||||
let line = heap.pop();
|
let line = heap.pop();
|
||||||
match line {
|
match line {
|
||||||
Some(line) => {
|
Some(line) => {
|
||||||
allowed_nodes.insert(line.name.as_path());
|
if !display_data.only_file || line.children.is_empty() {
|
||||||
|
allowed_nodes.insert(line.name.as_path(), line);
|
||||||
|
}
|
||||||
heap = add_children(&display_data, line, heap);
|
heap = add_children(&display_data, line, heap);
|
||||||
}
|
}
|
||||||
None => break,
|
None => break,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
recursive_rebuilder(&allowed_nodes, root)
|
|
||||||
|
if display_data.only_file {
|
||||||
|
flat_rebuilder(allowed_nodes, root)
|
||||||
|
} else {
|
||||||
|
recursive_rebuilder(&allowed_nodes, root)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
fn add_children<'a>(
|
fn add_children<'a>(
|
||||||
@@ -101,19 +105,39 @@ fn always_add_children<'a>(
|
|||||||
heap
|
heap
|
||||||
}
|
}
|
||||||
|
|
||||||
fn recursive_rebuilder(allowed_nodes: &HashSet<&Path>, current: &Node) -> Option<DisplayNode> {
|
// Finds children of current, if in allowed_nodes adds them as children to new DisplayNode
|
||||||
let mut new_children: Vec<_> = current
|
fn recursive_rebuilder(
|
||||||
|
allowed_nodes: &HashMap<&Path, &Node>,
|
||||||
|
current: &Node,
|
||||||
|
) -> Option<DisplayNode> {
|
||||||
|
let new_children: Vec<_> = current
|
||||||
.children
|
.children
|
||||||
.iter()
|
.iter()
|
||||||
.filter(|c| allowed_nodes.contains(c.name.as_path()))
|
.filter(|c| allowed_nodes.contains_key(c.name.as_path()))
|
||||||
.filter_map(|c| recursive_rebuilder(allowed_nodes, c))
|
.filter_map(|c| recursive_rebuilder(allowed_nodes, c))
|
||||||
.collect();
|
.collect();
|
||||||
|
|
||||||
new_children.sort_by(|lhs, rhs| lhs.cmp(rhs).reverse());
|
Some(build_node(new_children, current))
|
||||||
|
}
|
||||||
|
|
||||||
Some(DisplayNode {
|
// Applies all allowed nodes as children to current node
|
||||||
|
fn flat_rebuilder(allowed_nodes: HashMap<&Path, &Node>, current: &Node) -> Option<DisplayNode> {
|
||||||
|
let new_children: Vec<DisplayNode> = allowed_nodes
|
||||||
|
.into_values()
|
||||||
|
.map(|v| DisplayNode {
|
||||||
|
name: v.name.clone(),
|
||||||
|
size: v.size,
|
||||||
|
children: vec![],
|
||||||
|
})
|
||||||
|
.collect::<Vec<DisplayNode>>();
|
||||||
|
Some(build_node(new_children, current))
|
||||||
|
}
|
||||||
|
|
||||||
|
fn build_node(mut new_children: Vec<DisplayNode>, current: &Node) -> DisplayNode {
|
||||||
|
new_children.sort_by(|lhs, rhs| lhs.cmp(rhs).reverse());
|
||||||
|
DisplayNode {
|
||||||
name: current.name.clone(),
|
name: current.name.clone(),
|
||||||
size: current.size,
|
size: current.size,
|
||||||
children: new_children,
|
children: new_children,
|
||||||
})
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -199,6 +199,7 @@ fn main() {
|
|||||||
let agg_data = AggregateData {
|
let agg_data = AggregateData {
|
||||||
min_size: config.get_min_size(&options, iso),
|
min_size: config.get_min_size(&options, iso),
|
||||||
only_dir: config.get_only_dir(&options),
|
only_dir: config.get_only_dir(&options),
|
||||||
|
only_file: config.get_only_file(&options),
|
||||||
number_of_lines,
|
number_of_lines,
|
||||||
depth,
|
depth,
|
||||||
using_a_filter: options.values_of("filter").is_some()
|
using_a_filter: options.values_of("filter").is_some()
|
||||||
|
|||||||
@@ -117,6 +117,15 @@ pub fn test_show_files_by_type() {
|
|||||||
assert!(output.contains("┌─┴ (total)"));
|
assert!(output.contains("┌─┴ (total)"));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
#[cfg(target_family = "unix")]
|
||||||
|
pub fn test_show_files_only() {
|
||||||
|
let output = build_command(vec!["-c", "-F", "tests/test_dir"]);
|
||||||
|
assert!(output.contains("tests/test_dir/many/a_file"));
|
||||||
|
assert!(output.contains("tests/test_dir/many/hello_file"));
|
||||||
|
assert!(!output.contains("tests/test_dir/many "));
|
||||||
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
pub fn test_output_skip_total() {
|
pub fn test_output_skip_total() {
|
||||||
let output = build_command(vec![
|
let output = build_command(vec![
|
||||||
|
|||||||
Reference in New Issue
Block a user