open.source/espanso
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add a command line option to print the default configuration file path, useful to rapidly edit the configs.

Browse Source
This commit is contained in:
Federico Terzi 2019-11-08 22:20:32 +01:00
parent 6ce80139fa
commit fddc4980c0
2 changed files with 32 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/config/mod.rs
View File

@ -36,7 +36,7 @@ pub(crate) mod runtime;
const DEFAULT_CONFIG_FILE_CONTENT : &str = include_str!("../res/config.yml"); const DEFAULT_CONFIG_FILE_CONTENT : &str = include_str!("../res/config.yml");
const DEFAULT_CONFIG_FILE_NAME : &str = "default.yml"; pub const DEFAULT_CONFIG_FILE_NAME : &str = "default.yml";
const USER_CONFIGS_FOLDER_NAME: &str = "user"; const USER_CONFIGS_FOLDER_NAME: &str = "user";
// Default values for primitives // Default values for primitives

39
src/main.rs
View File

@ -116,8 +116,16 @@ fn main() {
.subcommand(SubCommand::with_name("status") .subcommand(SubCommand::with_name("status")
.about("Check if the espanso daemon is running or not.")) .about("Check if the espanso daemon is running or not."))
.subcommand(SubCommand::with_name("path") .subcommand(SubCommand::with_name("path")
.about("Prints all the current espanso directory paths, to easily locate configuration and data paths.")) .about("Prints all the current espanso directory paths, to easily locate configuration and data paths.")
.subcommand(SubCommand::with_name("config")
.about("Print the current config folder path."))
.subcommand(SubCommand::with_name("packages")
.about("Print the current packages folder path."))
.subcommand(SubCommand::with_name("data")
.about("Print the current data folder path."))
.subcommand(SubCommand::with_name("default")
.about("Print the default configuration file path."))
)
// Package manager // Package manager
.subcommand(SubCommand::with_name("package") .subcommand(SubCommand::with_name("package")
.about("Espanso package manager commands") .about("Espanso package manager commands")
@ -214,8 +222,8 @@ fn main() {
return; return;
} }
if matches.subcommand_matches("path").is_some() { if let Some(matches) = matches.subcommand_matches("path") {
path_main(config_set); path_main(config_set, matches);
return; return;
} }
@ -821,10 +829,25 @@ fn list_package_main(_config_set: ConfigSet, matches: &ArgMatches) {
} }
} }
fn path_main(_config_set: ConfigSet) { fn path_main(_config_set: ConfigSet, matches: &ArgMatches) {
println!("Config: {}", crate::context::get_config_dir().to_string_lossy()); let config = crate::context::get_config_dir();
println!("Packages: {}", crate::context::get_package_dir().to_string_lossy()); let packages = crate::context::get_package_dir();
println!("Data: {}", crate::context::get_data_dir().to_string_lossy()); let data = crate::context::get_data_dir();
if matches.subcommand_matches("config").is_some() {
println!("{}", config.to_string_lossy());
}else if matches.subcommand_matches("packages").is_some() {
println!("{}", packages.to_string_lossy());
}else if matches.subcommand_matches("data").is_some() {
println!("{}", data.to_string_lossy());
}else if matches.subcommand_matches("default").is_some() {
let default_file = config.join(crate::config::DEFAULT_CONFIG_FILE_NAME);
println!("{}", default_file.to_string_lossy());
}else{
println!("Config: {}", config.to_string_lossy());
println!("Packages: {}", packages.to_string_lossy());
println!("Data: {}", data.to_string_lossy());
}
} }