diff --git a/go.mod b/go.mod index 2e81d0e..c17c776 100644 --- a/go.mod +++ b/go.mod @@ -4,8 +4,8 @@ go 1.25.4 require ( github.com/charmbracelet/glamour v0.7.0 - github.com/rwinkhart/go-boilerplate v0.1.0 - github.com/rwinkhart/libmutton v0.4.3-0.20251110052016-75ad2afcfb6c + github.com/rwinkhart/go-boilerplate v0.1.1-0.20251110055016-10ee4f91fcb6 + github.com/rwinkhart/libmutton v0.4.3-0.20251110060205-b39a40407f9c golang.org/x/term v0.36.0 ) diff --git a/go.sum b/go.sum index 8745205..4490d3b 100644 --- a/go.sum +++ b/go.sum @@ -40,14 +40,14 @@ github.com/rivo/uniseg v0.4.7 h1:WUdvkW8uEhrYfLC4ZzdpI2ztxP1I582+49Oc5Mq64VQ= github.com/rivo/uniseg v0.4.7/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88= github.com/rwinkhart/glamour-temp-MUTN v0.7.2 h1:/CBexwkGdL8HuZjO7M0zzjGHaHCr9/r4XTOtUJa+pPE= github.com/rwinkhart/glamour-temp-MUTN v0.7.2/go.mod h1:DN/eJaNQ5h7dgxzfmWFo7By+b82CKEUdNaY6z4R4v3c= -github.com/rwinkhart/go-boilerplate v0.1.0 h1:EzlVj6R7Bxtl79Nl7R5zRcg6s+Cf2FAqGIzR4giWTQg= -github.com/rwinkhart/go-boilerplate v0.1.0/go.mod h1:cnzIF45I0FCOvE4YIB+26pLCUx2kWyY2llKYZruNaRY= +github.com/rwinkhart/go-boilerplate v0.1.1-0.20251110055016-10ee4f91fcb6 h1:tGGtw5Wr4laDrU7Ooe95g4E+O6c+oY18atamcMPaMY8= +github.com/rwinkhart/go-boilerplate v0.1.1-0.20251110055016-10ee4f91fcb6/go.mod h1:cnzIF45I0FCOvE4YIB+26pLCUx2kWyY2llKYZruNaRY= github.com/rwinkhart/go-highlite v0.1.1 h1:9TxbRhYVfD/3YaEgNk1BtEiZ0t8/5mxDUZqNMXHodT0= github.com/rwinkhart/go-highlite v0.1.1/go.mod h1:mWLMtCWcyV0BG4NeyPyAUGMjPvI0ds6vXmUq89QwBFA= github.com/rwinkhart/go-winio v0.1.0 h1:b72agLW+dETGmhR3VbcbwnStfgKfc5AfgJOXBJDkaHg= github.com/rwinkhart/go-winio v0.1.0/go.mod h1:ZWa7ssZJT30CCDGJ7fk/2SBTq9BIQrrVjrcss0UW2s0= -github.com/rwinkhart/libmutton v0.4.3-0.20251110052016-75ad2afcfb6c h1:99VhU1ORwoPguHJsymPKSbVmqRgow45QYyqnpcViFPM= -github.com/rwinkhart/libmutton v0.4.3-0.20251110052016-75ad2afcfb6c/go.mod h1:ZXDCjk1Wec5UJK8ID9AF+jqicWoZmMGzuaPw1Unu3HQ= +github.com/rwinkhart/libmutton v0.4.3-0.20251110060205-b39a40407f9c h1:TBqmP2Yjd2bRZuTVfGw8Ek1s98FjiSPJC0gh4ghLuQo= +github.com/rwinkhart/libmutton v0.4.3-0.20251110060205-b39a40407f9c/go.mod h1:+hO+DEZXR9etMK/8U3kR/R1gIMc+XEPV8iJEN//vBGI= github.com/rwinkhart/peercred-mini v0.1.2 h1:4cGWDbv0whvLeVvbUdx84V/9p+2fS+DEXgrA1KxlRFo= github.com/rwinkhart/peercred-mini v0.1.2/go.mod h1:LLHG7YshHEpbpJJP+Il9nx2dnGj5O3VGE32rWmflj0c= github.com/rwinkhart/rcw v0.2.3 h1:g1rVaspZnZM8nWupeSdVO827di4ORMZnczw6iXyo01Y= diff --git a/src/cli/copyMenu.go b/src/cli/copyMenu.go index 4411788..46cd1e4 100644 --- a/src/cli/copyMenu.go +++ b/src/cli/copyMenu.go @@ -12,7 +12,6 @@ import ( "github.com/rwinkhart/libmutton/clip" "github.com/rwinkhart/libmutton/crypt" "github.com/rwinkhart/libmutton/global" - "github.com/rwinkhart/libmutton/synccommon" ) // CopyMenu decrypts an entry and allows the user to @@ -64,7 +63,7 @@ func CopyMenu(targetLocation string) { choice = 4 } if choice == 2 { - fmt.Println(ansiEmptyDirectoryWarning + "[Starting]" + back.AnsiReset + " TOTP clipboard refresher") + fmt.Println(back.AnsiWarning + "[Starting]" + back.AnsiReset + " TOTP clipboard refresher") errorChan := make(chan error) done := make(chan bool) go clip.TOTPCopier(decSlice[2], 0, errorChan, done) @@ -73,7 +72,7 @@ func CopyMenu(targetLocation string) { if err != nil { other.PrintError("Failed to copy TOTP token: "+err.Error(), global.ErrorClipboard) } - fmt.Println(synccommon.AnsiDownload + "[Started]" + back.AnsiReset + " TOTP clipboard refresher") + fmt.Println(back.AnsiGreen + "[Started]" + back.AnsiReset + " TOTP clipboard refresher") // block until the user sends "q" for { input := front.Input("Service will run until 'q' is entered:") @@ -82,7 +81,7 @@ func CopyMenu(targetLocation string) { } } close(done) - fmt.Print(synccommon.AnsiUpload + "\n[Stopped]" + back.AnsiReset + " TOTP clipboard refresher\n\n") + fmt.Print(back.AnsiBlue + "\n[Stopped]" + back.AnsiReset + " TOTP clipboard refresher\n\n") } else { err := clip.CopyString(true, decSlice[choice]) if err != nil { diff --git a/src/cli/entryList.go b/src/cli/entryList.go index 3964710..464a2b2 100644 --- a/src/cli/entryList.go +++ b/src/cli/entryList.go @@ -12,9 +12,8 @@ import ( // ANSI color constants used only in this file const ( - ansiAlternateEntryColor = "\033[38;5;8m" - ansiDirectoryHeader = "\033[38;5;7;48;5;8m" - ansiEmptyDirectoryWarning = "\033[38;5;3m" + ansiAlternateEntryColor = "\033[38;5;8m" + ansiDirectoryHeader = "\033[38;5;7;48;5;8m" ) // determineIndentation calculates and returns the final visual indentation multiplier (needed to adjust indentation for skipped parent directories); also subtracts "old" text from directory header. @@ -145,7 +144,7 @@ func EntryListGen() { skippedDirList[i] = false // the directory header is being printed, indicate that it is not being skipped indent, vanityDirectory = determineIndentation(skippedDirList, dirList, i) // calculate the final indentation multiplier fmt.Printf("\n\n"+strings.Repeat(" ", indent*2)+ansiDirectoryHeader+"%s/"+back.AnsiReset+"\n", vanityDirectory) - fmt.Print(strings.Repeat(" ", indent*2) + ansiEmptyDirectoryWarning + "-empty directory-" + back.AnsiReset) + fmt.Print(strings.Repeat(" ", indent*2) + back.AnsiWarning + "-empty directory-" + back.AnsiReset) } else { // warn if the only thing that exists is the root-level directory fmt.Print("\n\nNothing's here! For help creating your first entry, run \"mutn help\".") } diff --git a/src/cli/entryReader.go b/src/cli/entryReader.go index 25af67d..a090581 100644 --- a/src/cli/entryReader.go +++ b/src/cli/entryReader.go @@ -28,7 +28,7 @@ fieldLoop: if !hideSecrets { fmt.Print(ansiDirectoryHeader + "Password:" + back.AnsiReset + "\n" + ansiShownPassword + decryptedEntry[0] + back.AnsiReset + "\n\n") } else { - fmt.Print(ansiDirectoryHeader + "Password:" + back.AnsiReset + "\n" + ansiEmptyDirectoryWarning + "End command in \"show\" or \"-s\" to view" + back.AnsiReset + "\n\n") + fmt.Print(ansiDirectoryHeader + "Password:" + back.AnsiReset + "\n" + back.AnsiWarning + "End command in \"show\" or \"-s\" to view" + back.AnsiReset + "\n\n") } } case 1: @@ -42,7 +42,7 @@ fieldLoop: if !hideSecrets { fmt.Print(ansiDirectoryHeader + "TOTP Secret:" + back.AnsiReset + "\n" + ansiShownPassword + decryptedEntry[2] + back.AnsiReset + "\n\n") } else { - fmt.Print(ansiDirectoryHeader + "TOTP Secret:" + back.AnsiReset + "\n" + ansiEmptyDirectoryWarning + "End command in \"show\" or \"-s\" to view" + back.AnsiReset + "\n\n") + fmt.Print(ansiDirectoryHeader + "TOTP Secret:" + back.AnsiReset + "\n" + back.AnsiWarning + "End command in \"show\" or \"-s\" to view" + back.AnsiReset + "\n\n") } } case 3: