MirroredRepos/bat
1
0
Fork 0
mirror of https://github.com/sharkdp/bat.git synced 2025-09-01 19:02:22 +01:00
Code Issues Releases Wiki Activity

Move config-dir and cache-dir from 'bat cache' to 'bat'

Browse Source
This commit is contained in:
sharkdp
2019-02-07 22:37:12 +01:00
committed by David Peter
parent cff01d81fa
commit e09499b3df
4 changed files with 27 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/clap_app.rs
View File

@@ -349,6 +349,18 @@ pub fn build_app(interactive_output: bool) -> ClapApp<'static, 'static> {
.hidden(true)
.help("Show path to the configuration file."),
)
.arg(
Arg::with_name("config-dir")
.long("config-dir")
.hidden(true)
.help("Show bat's configuration directory."),
)
.arg(
Arg::with_name("cache-dir")
.long("cache-dir")
.hidden(true)
.help("Show bat's cache directory."),
)
.subcommand(
SubCommand::with_name("cache")
.about("Modify the syntax-definition and theme cache")
@@ -368,20 +380,9 @@ pub fn build_app(interactive_output: bool) -> ClapApp<'static, 'static> {
.short("c")
.help("Remove the cached syntax definitions and themes."),
)
.arg(
Arg::with_name("config-dir")
.long("config-dir")
.short("d")
.help("Show bat's configuration directory."),
)
.arg(
Arg::with_name("cache-dir")
.long("cache-dir")
.help("Show bat's cache directory."),
)
.group(
ArgGroup::with_name("cache-actions")
.args(&["build", "clear", "config-dir", "cache-dir"])
.args(&["build", "clear"])
.required(arg_group_required),
)
.arg(

10
src/main.rs
View File

@@ -96,10 +96,6 @@ fn run_cache_subcommand(matches: &clap::ArgMatches) -> Result<()> {
assets.save(target_dir)?;
} else if matches.is_present("clear") {
clear_assets();
} else if matches.is_present("config-dir") {
writeln!(io::stdout(), "{}", config_dir())?;
} else if matches.is_present("cache-dir") {
writeln!(io::stdout(), "{}", cache_dir())?;
}
Ok(())
@@ -234,6 +230,12 @@ fn run() -> Result<bool> {
} else if app.matches.is_present("config-file") {
println!("{}", config_file().to_string_lossy());
Ok(true)
} else if app.matches.is_present("config-dir") {
writeln!(io::stdout(), "{}", config_dir())?;
Ok(true)
} else if app.matches.is_present("cache-dir") {
writeln!(io::stdout(), "{}", cache_dir())?;
Ok(true)
} else {
run_controller(&config)