hatter/tiny-encrypt-rs
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

feat: v0.6.50

Browse Source
This commit is contained in:
Hatter Jiang
2025-08-24 23:01:11 +08:00
parent 1741c335db
commit 0ad8f83092
5 changed files with 20 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/util_env.rs
View File

@@ -18,7 +18,7 @@ pub const TINY_ENCRYPT_ENV_NO_DEFAULT_PIN_HINT: &str = "TINY_ENCRYPT_NO_DEFAULT_
pub const TINY_ENCRYPT_ENV_PIN_ENTRY: &str = "TINY_ENCRYPT_PIN_ENTRY";
pub fn get_default_encryption_algorithm() -> Option<&'static str> {
let env_default_algorithm = env::var(TINY_ENCRYPT_ENV_DEFAULT_ALGORITHM).ok();
let env_default_algorithm = rust_util_env::env_var(TINY_ENCRYPT_ENV_DEFAULT_ALGORITHM);
debugging!("Environment variable {} = {:?}", TINY_ENCRYPT_ENV_DEFAULT_ALGORITHM, env_default_algorithm);
if let Some(env_algorithm) = env_default_algorithm {
let lower_default_algorithm = env_algorithm.to_lowercase();
@@ -36,11 +36,11 @@ pub fn get_pin() -> Option<String> {
}
pub fn get_key_id() -> Option<String> {
env::var(TINY_ENCRYPT_ENV_KEY_ID).ok()
rust_util_env::env_var(TINY_ENCRYPT_ENV_KEY_ID)
}
pub fn get_gpg_cmd() -> Option<String> {
env::var(TINY_ENCRYPT_ENV_GPG_COMMAND).ok()
rust_util_env::env_var(TINY_ENCRYPT_ENV_GPG_COMMAND)
}
pub fn get_default_pin_entry() -> Option<String> {
@@ -54,7 +54,7 @@ pub fn get_default_pin_entry() -> Option<String> {
}
pub fn get_pin_entry() -> Option<String> {
env::var(TINY_ENCRYPT_ENV_PIN_ENTRY).ok()
rust_util_env::env_var(TINY_ENCRYPT_ENV_PIN_ENTRY)
}
pub fn get_auto_select_key_ids() -> Option<Vec<String>> {
@@ -66,7 +66,7 @@ pub fn get_auto_compress_file_exts() -> Option<Vec<String>> {
}
pub fn get_default_compress() -> Option<bool> {
env::var(TINY_ENCRYPT_ENV_DEFAULT_COMPRESS).ok().map(|val| util_env::is_on(&val))
rust_util_env::env_var(TINY_ENCRYPT_ENV_DEFAULT_COMPRESS).map(|val| util_env::is_on(&val))
}
pub fn get_no_progress() -> bool {
@@ -82,7 +82,7 @@ pub fn get_use_dialoguer() -> bool {
}
fn get_env_with_split(env_name: &str) -> Option<Vec<String>> {
let val = env::var(env_name).ok();
let val = rust_util_env::env_var(env_name);
debugging!("Environment variable {} = {:?}", env_name, &val);
val.map(|env_values| {
env_values.split(',').map(ToString::to_string).collect::<Vec<_>>()