iridium/redsunlib
iridium/redsunlib
2
2
Fork 0
Code Issues 3 Pull Requests Packages Projects Releases 3 Wiki Activity

Accept legacy environment variables

Browse Source
This commit is contained in:
Matthew Esposito 2023-12-26 23:16:36 -05:00
parent 47822d8d6c
commit 457b0bd57e
No known key found for this signature in database
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/config.rs
View File

@ -89,7 +89,12 @@ impl Config {
// This function defines the order of preference - first check for // This function defines the order of preference - first check for
// environment variables with "REDLIB", then check the config, then if // environment variables with "REDLIB", then check the config, then if
// both are `None`, return a `None` via the `map_or_else` function // both are `None`, return a `None` via the `map_or_else` function
let parse = |key: &str| -> Option<String> { var(key).ok().map_or_else(|| get_setting_from_config(key, &config), Some) }; let parse = |key: &str| -> Option<String> {
var(key).ok().map_or_else(
|| var(key.replace("REDLIB_", "LIBREDDIT_")).ok().map_or_else(|| get_setting_from_config(key, &config), Some),
Some,
)
};
Self { Self {
sfw_only: parse("REDLIB_SFW_ONLY"), sfw_only: parse("REDLIB_SFW_ONLY"),
@ -169,6 +174,12 @@ fn test_config() {
assert_eq!(get_setting("REDLIB_DEFAULT_COMMENT_SORT"), Some("best".into())); assert_eq!(get_setting("REDLIB_DEFAULT_COMMENT_SORT"), Some("best".into()));
} }
#[test]
#[sealed_test(env = [("LIBREDDIT_SFW_ONLY", "on")])]
fn test_env_var_legacy() {
assert!(crate::utils::sfw_only())
}
#[test] #[test]
#[sealed_test(env = [("REDLIB_DEFAULT_COMMENT_SORT", "top")])] #[sealed_test(env = [("REDLIB_DEFAULT_COMMENT_SORT", "top")])]
fn test_env_config_precedence() { fn test_env_config_precedence() {