laantungir/amethyst
1
0
Fork 0
mirror of https://github.com/vitorpamplona/amethyst.git synced 2026-08-12 01:07:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

extract duplicated string literals into named constants

Browse Source
This commit is contained in:
davotoula
2026-04-29 09:59:27 +02:00
parent 3332d8b530
commit fdcd83e0c6
5 changed files with 39 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cli/src/main/kotlin/com/vitorpamplona/amethyst/cli/Output.kt
+5 -3
View File
@@ -44,6 +44,8 @@ import java.time.format.DateTimeFormatter
* - paints the result with ANSI colour when stdout is a TTY (disabled
* by `NO_COLOR`, forced on by `CLICOLOR_FORCE`).
*/
private const val EMPTY_LABEL = "(empty)"
object Output {
enum class Mode { TEXT, JSON }
@@ -137,7 +139,7 @@ object Output {
.append(coloredKey)
.append(":")
.append(padding)
out.append(' ').append(color.dim("(empty)")).append('\n')
out.append(' ').append(color.dim(EMPTY_LABEL)).append('\n')
} else {
out.append(prefix).append(coloredKey).append(":\n")
renderMapBody(out, v, "$prefix ", color)
@@ -190,7 +192,7 @@ object Output {
.append(prefix)
.append(dash)
.append(' ')
.append(color.dim("(empty)"))
.append(color.dim(EMPTY_LABEL))
.append('\n')
continue
}
@@ -224,7 +226,7 @@ object Output {
.append(':')
.append(rPad)
.append(' ')
.append(color.dim("(empty)"))
.append(color.dim(EMPTY_LABEL))
.append('\n')
} else {
out.append("$prefix ").append(color.bold(rKey)).append(":\n")
cli/src/main/kotlin/com/vitorpamplona/amethyst/cli/secrets/SecretStore.kt
+5 -4
View File
@@ -211,6 +211,7 @@ internal object MacosKeychainBackend : SecretBackend {
internal object SecretServiceBackend : SecretBackend {
const val BACKEND_ID = "secret-service"
private const val SERVICE_ATTR = "amy-nostr"
private const val SECRET_TOOL_BIN = "secret-tool"
override val name: String = "keychain:$BACKEND_ID"
@@ -224,7 +225,7 @@ internal object SecretServiceBackend : SecretBackend {
) {
return false
}
return which("secret-tool") != null
return which(SECRET_TOOL_BIN) != null
}
override fun store(
@@ -233,7 +234,7 @@ internal object SecretServiceBackend : SecretBackend {
): IdentitySecret {
val res =
runProc(
"secret-tool",
SECRET_TOOL_BIN,
"store",
"--label=amy Nostr identity ${pubKeyHex.take(8)}",
"service",
@@ -250,7 +251,7 @@ internal object SecretServiceBackend : SecretBackend {
override fun resolve(secret: IdentitySecret): String {
require(secret is IdentitySecret.Keychain)
val res = runProc("secret-tool", "lookup", "service", secret.service, "account", secret.account)
val res = runProc(SECRET_TOOL_BIN, "lookup", "service", secret.service, "account", secret.account)
if (res.exit != 0 || res.stdout.isBlank()) {
throw RuntimeException("secret-tool lookup failed (exit=${res.exit}): ${res.stderr.trim()}")
}
@@ -259,7 +260,7 @@ internal object SecretServiceBackend : SecretBackend {
override fun delete(secret: IdentitySecret) {
require(secret is IdentitySecret.Keychain)
runProc("secret-tool", "clear", "service", secret.service, "account", secret.account)
runProc(SECRET_TOOL_BIN, "clear", "service", secret.service, "account", secret.account)
}
private fun which(cmd: String): File? {