beenull/himalaya
1
0
Fork 0
mirror of https://github.com/soywod/himalaya.git synced 2024-07-08 10:35:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

make completion cmd a subcommand of shell args

Browse source
This commit is contained in:
Clément DOUIN 2021-04-15 13:24:18 +02:00
parent f6e70a63d4
commit aad74add52
No known key found for this signature in database
GPG key ID: 69C9B9CFFDEE2DEF
2 changed files with 25 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
README.md
View file

@ -241,21 +241,24 @@ systemctl --user start himalaya.service
## Completions ## Completions
```sh ```sh
# For bash shells Generates the completion script for the given shell
himalaya bash-completions
# For zsh shells USAGE:
himalaya zsh-completions himalaya completion <shell>
# For fish shells FLAGS:
himalaya fish-completions -h, --help Prints help information
-V, --version Prints version information
ARGS:
<shell> [possible values: bash, zsh, fish]
``` ```
Those commands print the generated scripts to the stdout. You will have The command prints the generated script to the stdout. You will have
to manually save and source them. For example: to manually save and source them. For example:
```sh ```sh
himalaya bash-completions > himalaya-completions.bash himalaya completion bash > himalaya-completions.bash
``` ```
```sh ```sh

35
src/completion/cli.rs
View file

@ -1,34 +1,27 @@
use clap::{self, App, ArgMatches, SubCommand}; use clap::{self, App, Arg, ArgMatches, Shell, SubCommand};
use error_chain::error_chain; use error_chain::error_chain;
use std::io; use std::io;
error_chain! {} error_chain! {}
pub fn completion_subcmds<'a>() -> Vec<App<'a, 'a>> { pub fn completion_subcmds<'a>() -> Vec<App<'a, 'a>> {
vec![ vec![SubCommand::with_name("completion")
SubCommand::with_name("bash-completions").about("Generates bash completions script"), .about("Generates the completion script for the given shell")
SubCommand::with_name("zsh-completions").about("Generates zsh completions script"), .args(&[Arg::with_name("shell")
SubCommand::with_name("fish-completions").about("Generates fish completions script"), .possible_values(&["bash", "zsh", "fish"])
] .required(true)])]
} }
pub fn completion_matches(mut app: App, matches: &ArgMatches) -> Result<bool> { pub fn completion_matches(mut app: App, matches: &ArgMatches) -> Result<bool> {
use clap::Shell::*; if let Some(matches) = matches.subcommand_matches("completion") {
let shell = match matches.value_of("shell").unwrap() {
if matches.is_present("bash-completions") { "fish" => Shell::Fish,
app.gen_completions_to("himalaya", Bash, &mut io::stdout()); "zsh" => Shell::Zsh,
"bash" | _ => Shell::Bash,
};
app.gen_completions_to("himalaya", shell, &mut io::stdout());
return Ok(true); return Ok(true);
} };
if matches.is_present("zsh-completions") {
app.gen_completions_to("himalaya", Zsh, &mut io::stdout());
return Ok(true);
}
if matches.is_present("fish-completions") {
app.gen_completions_to("himalaya", Fish, &mut io::stdout());
return Ok(true);
}
Ok(false) Ok(false)
} }