From 187b8be2fa0baccc9f1455e195f8d5ba492a9e80 Mon Sep 17 00:00:00 2001 From: "andy.boot" Date: Sat, 21 Jan 2023 17:32:10 +0000 Subject: [PATCH] fix: only-dir flag conflicts with types If showing file types we can't limit output to directories only --- completions/_dust | 8 ++++---- src/cli.rs | 2 ++ 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/completions/_dust b/completions/_dust index 5ad53b7..a73c891 100644 --- a/completions/_dust +++ b/completions/_dust @@ -52,14 +52,14 @@ _dust() { '--filecount[Directory '\''size'\'' is number of child files/dirs not disk size]' \ '-i[Do not display hidden files]' \ '--ignore_hidden[Do not display hidden files]' \ -'(-d --depth)-t[show only these file types]' \ -'(-d --depth)--file_types[show only these file types]' \ +'(-d --depth -D --only-dir)-t[show only these file types]' \ +'(-d --depth -D --only-dir)--file_types[show only these file types]' \ '-H[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.]' \ '--no-progress[Disable the progress indication.]' \ -'(-F --only-file)-D[Only directories will be displayed.]' \ -'(-F --only-file)--only-dir[Only directories will be displayed.]' \ +'(-F --only-file -t --file_types)-D[Only directories will be displayed.]' \ +'(-F --only-file -t --file_types)--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:' \ diff --git a/src/cli.rs b/src/cli.rs index 8737aed..0bd1f9b 100644 --- a/src/cli.rs +++ b/src/cli.rs @@ -124,6 +124,7 @@ pub fn build_cli() -> Command<'static> { .short('t') .long("file_types") .conflicts_with("depth") + .conflicts_with("only_dir") .help("show only these file types"), ) .arg( @@ -151,6 +152,7 @@ pub fn build_cli() -> Command<'static> { .short('D') .long("only-dir") .conflicts_with("only_file") + .conflicts_with("types") .help("Only directories will be displayed."), ) .arg(