fixup! feat(cli): Enable dynamic completions

Author: alerque

CHANGELOG.md

@@ -1,3 +1,9 @@
+## [unreleased]
+
+### Features
+
+- *(cli)* Enable dynamic completions
+
 ## [0.8.3] - 2024-07-22
 
 ### Bug Fixes

src/bin/git-warp-time.rs

@@ -1,7 +1,7 @@
 // SPDX-FileCopyrightText: © 2021 Caleb Maclennan <[email protected]>
 // SPDX-License-Identifier: GPL-3.0-only
 
-use clap::CommandFactory;
+use clap::{CommandFactory, Parser};
 
 use git_warp_time::cli::Cli;
 use git_warp_time::FileSet;
@@ -40,31 +40,33 @@ type Result<T, E = Error> = std::result::Result<T, E>;
 
 fn main() -> Result<()> {
     let version = option_env!("VERGEN_GIT_DESCRIBE").unwrap_or_else(|| env!("CARGO_PKG_VERSION"));
-    let mut app = Cli::command().version(version);
-    let matches = app.clone().get_matches();
+    let app = Cli::command().version(version);
+    let cli = Cli::parse();
+    let matches = app.get_matches();
     let positionals = matches.get_many::<String>("paths");
     let repo = get_repo().context(NoRepositorySnafu)?;
     let mut opts = git_warp_time::Options::new()
         .dirty(matches.get_flag("dirty"))
         .ignored(matches.get_flag("ignored"))
         .ignore_older(matches.get_flag("ignore_older"))
         .verbose(!matches.get_flag("quiet"));
-    if let Some(completions) =
-        matches.get_one::<clap_complete::dynamic::CompleteCommand>("complete")
-    {
-        completions.complete(&mut app);
-    }
-    if matches.contains_id("paths") {
-        let mut paths: FileSet = FileSet::new();
-        for path in positionals.context(UnableToFormPathSnafu)? {
-            if !Path::new(path).exists() {
-                return PathNotFoundSnafu { path: path.clone() }.fail();
+    //if let Some(completions) =
+    //    matches.get_one::<clap_complete::dynamic::CompleteCommand>("complete")
+    if let Some(completions) = cli.complete {
+        completions.complete(&mut Cli::command());
+    } else {
+        if matches.contains_id("paths") {
+            let mut paths: FileSet = FileSet::new();
+            for path in positionals.context(UnableToFormPathSnafu)? {
+                if !Path::new(path).exists() {
+                    return PathNotFoundSnafu { path: path.clone() }.fail();
+                }
+                let path = resolve_repo_path(&repo, path).context(CouldNotAccessRepositorySnafu)?;
+                paths.insert(path);
             }
-            let path = resolve_repo_path(&repo, path).context(CouldNotAccessRepositorySnafu)?;
-            paths.insert(path);
+            opts = opts.paths(Some(paths));
         }
-        opts = opts.paths(Some(paths));
+        reset_mtimes(repo, opts).context(UnableToResetMTimeSnafu)?;
     }
-    reset_mtimes(repo, opts).context(UnableToResetMTimeSnafu)?;
     Ok(())
 }

src/cli.rs

@@ -11,7 +11,7 @@ use clap_complete::dynamic::{ArgValueCompleter, CompleteCommand, CompletionCandi
 pub struct Cli {
     /// generate completions
     #[command(subcommand)]
-    complete: Option<CompleteCommand>,
+    pub complete: Option<CompleteCommand>,
 
     /// Include files tracked by Git but modifications in the working tee
     #[clap(short, long)]
@@ -29,14 +29,11 @@ pub struct Cli {
     #[clap(short, long)]
     pub quiet: bool,
 
-    /// Test
+    /// Optional list of paths to operate on instead of default which is all files tracked by Git
+    //#[clap(value_hint = clap::ValueHint::FilePath)]
     #[clap(add = ArgValueCompleter::new(|| { vec![
             CompletionCandidate::new("foo"),
             CompletionCandidate::new("bar"),
             CompletionCandidate::new("baz")] }))]
-    pub bag: String,
-
-    /// Optional list of paths to operate on instead of default which is all files tracked by Git
-    #[clap(value_hint = clap::ValueHint::FilePath)]
     pub paths: Vec<String>,
 }