Skip to content
This repository has been archived by the owner on Jun 8, 2024. It is now read-only.

Commit

Permalink
fix(global config): renamed default-config to typstfmt
Browse files Browse the repository at this point in the history
It is better to name global config the same way as the local config.
This way any local config can quickly become a global config (without
renaming the file).
  • Loading branch information
Andrew15-5 committed Oct 30, 2023
1 parent b45cab0 commit 237ac18
Showing 1 changed file with 9 additions and 5 deletions.
14 changes: 9 additions & 5 deletions src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ use typstfmt_lib::{format, Config};

const VERSION: &str = env!("TYPSTFMT_VERSION");
const CONFIG_FILE_NAME: &str = "typstfmt.toml";
const CONFY_APP_NAME: &str = "typstfmt";
const GLOBAL_CONFIG_BASE_NAME: &str = "typstfmt";
const HELP: &str = r#"Format Typst code
usage: typstfmt [options] [file...]
Expand Down Expand Up @@ -154,8 +156,9 @@ fn main() -> Result<(), lexopt::Error> {
return Ok(());
}
Long("get-global-config-path") => {
let config_path = confy::get_configuration_file_path("typstfmt", None)
.unwrap_or_else(|e| panic!("Error loading global configuration file: {e}"));
let config_path =
confy::get_configuration_file_path(CONFY_APP_NAME, GLOBAL_CONFIG_BASE_NAME)
.unwrap_or_else(|e| panic!("Error loading global configuration file: {e}"));
println!("{}", config_path.display());
return Ok(());
}
Expand Down Expand Up @@ -220,9 +223,10 @@ fn main() -> Result<(), lexopt::Error> {
});
Config::from_toml(&buf).unwrap_or_else(|e| panic!("Config file invalid: {e}.\nYou'll maybe have to delete it and use -C to create a default config file."))
} else {
let config_path = confy::get_configuration_file_path("typstfmt", None)
.unwrap_or_else(|e| panic!("Error loading global configuration file: {e}"));
confy::load("typstfmt", None).unwrap_or_else(|e| {
let config_path =
confy::get_configuration_file_path(CONFY_APP_NAME, GLOBAL_CONFIG_BASE_NAME)
.unwrap_or_else(|e| panic!("Error loading global configuration file: {e}"));
confy::load(CONFY_APP_NAME, GLOBAL_CONFIG_BASE_NAME).unwrap_or_else(|e| {
panic!(
"Error loading global configuration file at {}: {e}",
config_path.display()
Expand Down

0 comments on commit 237ac18

Please sign in to comment.