Merge pull request #288 from fgimian/completions

Add the ability to generate shell completions

Author: Byron

Cargo.lock

@@ -30,6 +30,7 @@ trash-move = ["trash"]
 
 [dependencies]
 clap = { version = "4.0.29", features = ["derive"] }
+clap_complete = "4.5.54"
 jwalk = "0.8.1"
 byte-unit = "4"
 atty = "0.2.11"

Cargo.toml

@@ -148,12 +148,14 @@ fn output_colored_path(
     let size_width = byte_format.width();
     let path = path.as_ref().display();
 
-    let errors = (num_errors != 0)
-        .then(|| {
-            let plural_s = if num_errors > 1 { "s" } else { "" };
-            format!("  <{num_errors} IO Error{plural_s}>")
-        })
-        .unwrap_or_default();
+    let errors = if num_errors != 0 {
+        format!(
+            "  <{num_errors} IO Error{plural_s}>",
+            plural_s = if num_errors > 1 { "s" } else { "" }
+        )
+    } else {
+        "".into()
+    };
 
     if let Some(color) = path_color {
         writeln!(out, "{size:>size_width$} {}{errors}", path.color(color))

src/aggregate.rs

@@ -474,8 +474,7 @@ impl MarkPane {
 
 pub fn calculate_size_and_count(marked: &EntryMarkMap) -> (u128, u64) {
     let entries: Vec<&EntryMark> = marked
-        .iter()
-        .map(|(_k, v)| v)
+        .values()
         .sorted_by(|a, b| Ord::cmp(&a.path, &b.path))
         .collect();
 

src/interactive/widgets/mark.rs

@@ -1,6 +1,6 @@
 #![forbid(rust_2018_idioms, unsafe_code)]
 use anyhow::Result;
-use clap::Parser;
+use clap::{CommandFactory as _, Parser};
 use dua::{canonicalize_ignore_dirs, TraversalSorting};
 use log::info;
 use simplelog::{Config, LevelFilter, WriteLogger};
@@ -141,6 +141,12 @@ fn main() -> Result<()> {
             }
             res
         }
+        Some(Completions { shell }) => {
+            let mut cmd = options::Args::command();
+            let dua = cmd.get_name().to_string();
+            clap_complete::generate(shell, &mut cmd, dua, &mut io::stdout());
+            return Ok(());
+        }
         None => {
             let stdout = io::stdout();
             let stdout_locked = stdout.lock();

src/main.rs

@@ -1,3 +1,4 @@
+use clap_complete::Shell;
 use dua::ByteFormat as LibraryByteFormat;
 use std::path::PathBuf;
 
@@ -123,4 +124,9 @@ pub enum Command {
         #[clap(value_parser)]
         input: Vec<PathBuf>,
     },
+    /// Generate shell completions
+    Completions {
+        /// The shell to generate a completions-script for
+        shell: Shell,
+    },
 }