commit 7c7bea7b0706f9d29d0f79a3d2fb34bb495976f5
parent 649f97ee18ba6b720d2490abdb35238e2cea1a15
Author: Sean Enck <sean@ttypty.com>
Date: Fri, 6 Dec 2024 20:44:18 -0500
cleaning up some toml entries
Diffstat:
4 files changed, 43 insertions(+), 35 deletions(-)
diff --git a/internal/config/config.toml b/internal/config/config.toml
@@ -13,13 +13,13 @@ completion = ""
enabled = true
[clip]
-copy = []
-paste = []
-max = 0
+copy_command = []
+paste_command = []
+timeout = 0
osc52 = false
enabled = true
-[hook]
+[hooks]
enabled = true
directory = ""
@@ -27,22 +27,22 @@ directory = ""
mode = ""
hash_length = 0
-[keys]
-file = ""
-mode = ""
-key = ""
+[credentials]
+key_file = ""
+password_mode = ""
+password = []
[pwgen]
enabled = true
-chars = ""
+characters = ""
count = 0
template = ""
title = true
-wordlist = []
+words_command = []
[totp]
enabled = true
attribute = ""
-between = []
-format = ""
-max = 0
+color_windows = []
+otp_format = ""
+timeout = 0
diff --git a/internal/config/toml.go b/internal/config/toml.go
@@ -33,20 +33,28 @@ var (
//go:embed "config.toml"
ExampleTOML string
redirects = map[string]string{
- "HOOK_DIRECTORY": EnvHookDir.Key(),
- "HOOK_ENABLED": EnvNoHooks.Key(),
- "JSON_MODE": EnvJSONDataOutput.Key(),
- "JSON_HASH_LENGTH": EnvHashLength.Key(),
- "KEYS_FILE": EnvKeyFile.Key(),
- "KEYS_MODE": EnvKeyMode.Key(),
- "KEYS_KEY": envKey.Key(),
- "CLIP_ENABLED": EnvNoClip.Key(),
- "COLOR_ENABLED": EnvNoColor.Key(),
- "PWGEN_ENABLED": EnvNoPasswordGen.Key(),
- "TOTP_ENABLED": EnvNoTOTP.Key(),
- "TOTP_ATTRIBUTE": EnvTOTPToken.Key(),
- "DEFAULTS_MODTIME": EnvModTime.Key(),
- "DEFAULTS_COMPLETION": EnvDefaultCompletion.Key(),
+ "HOOKS_DIRECTORY": EnvHookDir.Key(),
+ "HOOKS_ENABLED": EnvNoHooks.Key(),
+ "JSON_MODE": EnvJSONDataOutput.Key(),
+ "JSON_HASH_LENGTH": EnvHashLength.Key(),
+ "CREDENTIALS_KEY_FILE": EnvKeyFile.Key(),
+ "CREDENTIALS_PASSWORD_MODE": EnvKeyMode.Key(),
+ "CREDENTIALS_PASSWORD": envKey.Key(),
+ "CLIP_ENABLED": EnvNoClip.Key(),
+ "COLOR_ENABLED": EnvNoColor.Key(),
+ "PWGEN_ENABLED": EnvNoPasswordGen.Key(),
+ "TOTP_ENABLED": EnvNoTOTP.Key(),
+ "TOTP_ATTRIBUTE": EnvTOTPToken.Key(),
+ "TOTP_OTP_FORMAT": EnvFormatTOTP.Key(),
+ "TOTP_COLOR_WINDOWS": EnvTOTPColorBetween.Key(),
+ "TOTP_TIMEOUT": EnvMaxTOTP.Key(),
+ "DEFAULTS_MODTIME": EnvModTime.Key(),
+ "DEFAULTS_COMPLETION": EnvDefaultCompletion.Key(),
+ "PWGEN_WORDS_COMMAND": EnvPasswordGenWordList.Key(),
+ "CLIP_COPY_COMMAND": EnvClipCopy.Key(),
+ "CLIP_PASTE_COMMAND": EnvClipPaste.Key(),
+ "CLIP_TIMEOUT": EnvClipMax.Key(),
+ "PWGEN_CHARACTERS": EnvPasswordGenChars.Key(),
}
arrayTypes = []string{
EnvClipCopy.Key(),
diff --git a/internal/config/toml_test.go b/internal/config/toml_test.go
@@ -132,7 +132,7 @@ copy = "'xyz/$TEST' s"
func TestRedirect(t *testing.T) {
data := `include = []
-[hook]
+[hooks]
directory = "xyz"
`
r := strings.NewReader(data)
diff --git a/tests/run.sh b/tests/run.sh
@@ -224,18 +224,18 @@ store = "$LOCKBOX_STORE"
interactive = false
[clip]
-copy = [$(echo "$LOCKBOX_CLIP_COPY" | sed 's/ /", "/g;s/^/"/g;s/$/"/g')]
-copy = [$(echo "$LOCKBOX_CLIP_PASTE" | sed 's/ /", "/g;s/^/"/g;s/$/"/g')]
-max = $LOCKBOX_CLIP_MAX
+copy_command = [$(echo "$LOCKBOX_CLIP_COPY" | sed 's/ /", "/g;s/^/"/g;s/$/"/g')]
+copy_command = [$(echo "$LOCKBOX_CLIP_PASTE" | sed 's/ /", "/g;s/^/"/g;s/$/"/g')]
+timeout = $LOCKBOX_CLIP_MAX
[json]
mode = "$LOCKBOX_JSON_DATA"
hash_length = $LOCKBOX_JSON_DATA_HASH_LENGTH
-[keys]
-file = "$LOCKBOX_KEYFILE"
-mode = "$LOCKBOX_KEYMODE"
-key = "$LOCKBOX_KEY"
+[credentials]
+key_file = "$LOCKBOX_KEYFILE"
+password_mode = "$LOCKBOX_KEYMODE"
+password = "$LOCKBOX_KEY"
EOF
} > "$TOML"
_unset
