Fix build

go.mod

@@ -1,12 +1,12 @@
 module github.com/rwinkhart/MUTN
 
-go 1.26.0
+go 1.26.4
 
 require (
 	github.com/charmbracelet/glamour v0.7.0
-	github.com/rwinkhart/go-boilerplate v0.3.1
-	github.com/rwinkhart/libmutton v0.5.0
-	golang.org/x/term v0.40.0
+	github.com/rwinkhart/go-boilerplate v0.3.2-0.20260530010204-f70ff83e1ea1
+	github.com/rwinkhart/libmutton v0.5.1-0.20260529233337-726153b9be84
+	golang.org/x/term v0.43.0
 )
 
 require (
@@ -17,9 +17,9 @@ require (
 	github.com/clipperhouse/uax29/v2 v2.7.0 // indirect
 	github.com/gorilla/css v1.0.1 // indirect
 	github.com/kr/fs v0.1.0 // indirect
-	github.com/lucasb-eyer/go-colorful v1.3.0 // indirect
-	github.com/mattn/go-isatty v0.0.20 // indirect
-	github.com/mattn/go-runewidth v0.0.20 // indirect
+	github.com/lucasb-eyer/go-colorful v1.4.0 // indirect
+	github.com/mattn/go-isatty v0.0.22 // indirect
+	github.com/mattn/go-runewidth v0.0.24 // indirect
 	github.com/microcosm-cc/bluemonday v1.0.27 // indirect
 	github.com/muesli/reflow v0.3.0 // indirect
 	github.com/muesli/termenv v0.16.0 // indirect
@@ -28,17 +28,17 @@ require (
 	github.com/pquerna/otp v1.5.0 // indirect
 	github.com/rivo/uniseg v0.4.7 // indirect
 	github.com/rwinkhart/go-highlite v0.1.1 // indirect
-	github.com/rwinkhart/peercred-mini v0.1.4 // indirect
-	github.com/rwinkhart/rcw v0.3.0 // indirect
-	github.com/yuin/goldmark v1.7.16 // indirect
+	github.com/rwinkhart/peercred-mini v0.1.5 // indirect
+	github.com/rwinkhart/rcw v0.3.1 // indirect
+	github.com/yuin/goldmark v1.8.2 // indirect
 	github.com/yuin/goldmark-emoji v1.0.6 // indirect
-	golang.org/x/crypto v0.48.0 // indirect
-	golang.org/x/net v0.50.0 // indirect
-	golang.org/x/sys v0.41.0 // indirect
+	golang.org/x/crypto v0.52.0 // indirect
+	golang.org/x/net v0.55.0 // indirect
+	golang.org/x/sys v0.45.0 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 )
 
-replace golang.org/x/sys => github.com/rwinkhart/sys v0.41.0
+replace golang.org/x/sys => github.com/rwinkhart/sys v0.45.0
 
 replace github.com/Microsoft/go-winio => github.com/rwinkhart/go-winio v0.1.1
 

go.sum

@@ -14,14 +14,14 @@ github.com/gorilla/css v1.0.1 h1:ntNaBIghp6JmvWnxbZKANoLyuXTPZ4cAMlo6RyhlbO8=
 github.com/gorilla/css v1.0.1/go.mod h1:BvnYkspnSzMmwRK+b8/xgNPLiIuNZr6vbZBTPQ2A3b0=
 github.com/kr/fs v0.1.0 h1:Jskdu9ieNAYnjxsi0LbQp1ulIKZV1LAFgK1tWhpZgl8=
 github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg=
-github.com/lucasb-eyer/go-colorful v1.3.0 h1:2/yBRLdWBZKrf7gB40FoiKfAWYQ0lqNcbuQwVHXptag=
-github.com/lucasb-eyer/go-colorful v1.3.0/go.mod h1:R4dSotOR9KMtayYi1e77YzuveK+i7ruzyGqttikkLy0=
-github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
-github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
+github.com/lucasb-eyer/go-colorful v1.4.0 h1:UtrWVfLdarDgc44HcS7pYloGHJUjHV/4FwW4TvVgFr4=
+github.com/lucasb-eyer/go-colorful v1.4.0/go.mod h1:R4dSotOR9KMtayYi1e77YzuveK+i7ruzyGqttikkLy0=
+github.com/mattn/go-isatty v0.0.22 h1:j8l17JJ9i6VGPUFUYoTUKPSgKe/83EYU2zBC7YNKMw4=
+github.com/mattn/go-isatty v0.0.22/go.mod h1:ZXfXG4SQHsB/w3ZeOYbR0PrPwLy+n6xiMrJlRFqopa4=
 github.com/mattn/go-runewidth v0.0.9/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI=
 github.com/mattn/go-runewidth v0.0.12/go.mod h1:RAqKPSqVFrSLVXbA8x7dzmKdmGzieGRCM46jaSJTDAk=
-github.com/mattn/go-runewidth v0.0.20 h1:WcT52H91ZUAwy8+HUkdM3THM6gXqXuLJi9O3rjcQQaQ=
-github.com/mattn/go-runewidth v0.0.20/go.mod h1:XBkDxAl56ILZc9knddidhrOlY5R/pDhgLpndooCuJAs=
+github.com/mattn/go-runewidth v0.0.24 h1:cpokDiIn0MGnhdHwuWnJBITySJ20QyNGnY2kR/ay2DU=
+github.com/mattn/go-runewidth v0.0.24/go.mod h1:XBkDxAl56ILZc9knddidhrOlY5R/pDhgLpndooCuJAs=
 github.com/microcosm-cc/bluemonday v1.0.27 h1:MpEUotklkwCSLeH+Qdx1VJgNqLlpY2KXwXFM08ygZfk=
 github.com/microcosm-cc/bluemonday v1.0.27/go.mod h1:jFi9vgW+H7c3V0lb6nR74Ib/DIB5OBs92Dimizgw2cA=
 github.com/muesli/reflow v0.3.0 h1:IFsN6K9NfGtjeggFP+68I4chLZV2yIKsXJFNZ+eWh6s=
@@ -42,34 +42,34 @@ 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.3.1 h1:vkVRuptO2s1yPzzwpvtiiB0c/hPB6yr0p1mzZ2Myb9E=
-github.com/rwinkhart/go-boilerplate v0.3.1/go.mod h1:ES13A2r9fnCVfyezwMBgY/RgA4pOIudOUXz3Jk/ikes=
+github.com/rwinkhart/go-boilerplate v0.3.2-0.20260530010204-f70ff83e1ea1 h1:qZA/GmgDHUQavxOFUHoZUX+q7T20a/4ptpjn8kz6tlk=
+github.com/rwinkhart/go-boilerplate v0.3.2-0.20260530010204-f70ff83e1ea1/go.mod h1:xqejLI6vJc5k9HzrnJC2We5E1Ae570GP9dNp9GaY6co=
 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.1 h1:kAJKiqneR7cUR01Wn5/doAAV4kOGTEGPug4oinXc5N4=
 github.com/rwinkhart/go-winio v0.1.1/go.mod h1:ZWa7ssZJT30CCDGJ7fk/2SBTq9BIQrrVjrcss0UW2s0=
-github.com/rwinkhart/libmutton v0.5.0 h1:Du/o5Hyb26uE6lubqBISN/ZF9JZ5oObHVveQjAqrP0E=
-github.com/rwinkhart/libmutton v0.5.0/go.mod h1:peh8A1f3gnaF97m8J06U28JloKv04Kw8WtFCH+Pcq6s=
-github.com/rwinkhart/peercred-mini v0.1.4 h1:93+phjLknvJadEd2cu/ZPPWdfRSPOwFJzDBEn4ZtWVc=
-github.com/rwinkhart/peercred-mini v0.1.4/go.mod h1:E8eApo/izzmq4nGGR+kpJ0ZLAXjofnVRMGCeVMPQ/Ik=
-github.com/rwinkhart/rcw v0.3.0 h1:OdgA++IGcDrZqN6FzyYnzbz04fL8Q1MHvlgPjhtgJM4=
-github.com/rwinkhart/rcw v0.3.0/go.mod h1:UUY7kSku6kV2X1RWPUcK0Re+rQ6RvngWI8DVZJ11cqk=
-github.com/rwinkhart/sys v0.41.0 h1:pHB6HphVC132UXYZ6yeOk62abqgl+pyl5ZZnsk4iUKg=
-github.com/rwinkhart/sys v0.41.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
+github.com/rwinkhart/libmutton v0.5.1-0.20260529233337-726153b9be84 h1:UQmK0fhaiXh/gPv7Wj4ZoUcWLelI3MwhMWw2ThJDW6I=
+github.com/rwinkhart/libmutton v0.5.1-0.20260529233337-726153b9be84/go.mod h1:l2w6vnhRC+ra7/d4qoZ0nDil7qwvH7YCjRWBjrk9LYg=
+github.com/rwinkhart/peercred-mini v0.1.5 h1:9sBR0ascteCJfzfhv7Gq/juqu7OOU+AphiEIG1+LcWA=
+github.com/rwinkhart/peercred-mini v0.1.5/go.mod h1:C73IeDteQwsKp1+PDdUBj4FC6dTziAJNbQsVDZSWE+M=
+github.com/rwinkhart/rcw v0.3.1 h1:qmozfcoEm71ttA8YSoH96y42Z2sFhCvY45GGtFPWVhg=
+github.com/rwinkhart/rcw v0.3.1/go.mod h1:TreA2OUl64v2UprL4xpXdDM7w8lJNzQ544rUIl8omtI=
+github.com/rwinkhart/sys v0.45.0 h1:HXZL0SuyToqKkvakaUuRAdH8sPUHelfO6q4PQRpL26Q=
+github.com/rwinkhart/sys v0.45.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
 github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
-github.com/yuin/goldmark v1.7.16 h1:n+CJdUxaFMiDUNnWC3dMWCIQJSkxH4uz3ZwQBkAlVNE=
-github.com/yuin/goldmark v1.7.16/go.mod h1:ip/1k0VRfGynBgxOz0yCqHrbZXhcjxyuS66Brc7iBKg=
+github.com/yuin/goldmark v1.8.2 h1:kEGpgqJXdgbkhcOgBxkC0X0PmoPG1ZyoZ117rDVp4zE=
+github.com/yuin/goldmark v1.8.2/go.mod h1:ip/1k0VRfGynBgxOz0yCqHrbZXhcjxyuS66Brc7iBKg=
 github.com/yuin/goldmark-emoji v1.0.6 h1:QWfF2FYaXwL74tfGOW5izeiZepUDroDJfWubQI9HTHs=
 github.com/yuin/goldmark-emoji v1.0.6/go.mod h1:ukxJDKFpdFb5x0a5HqbdlcKtebh086iJpI31LTKmWuA=
-golang.org/x/crypto v0.48.0 h1:/VRzVqiRSggnhY7gNRxPauEQ5Drw9haKdM0jqfcCFts=
-golang.org/x/crypto v0.48.0/go.mod h1:r0kV5h3qnFPlQnBSrULhlsRfryS2pmewsg+XfMgkVos=
-golang.org/x/net v0.50.0 h1:ucWh9eiCGyDR3vtzso0WMQinm2Dnt8cFMuQa9K33J60=
-golang.org/x/net v0.50.0/go.mod h1:UgoSli3F/pBgdJBHCTc+tp3gmrU4XswgGRgtnwWTfyM=
-golang.org/x/term v0.40.0 h1:36e4zGLqU4yhjlmxEaagx2KuYbJq3EwY8K943ZsHcvg=
-golang.org/x/term v0.40.0/go.mod h1:w2P8uVp06p2iyKKuvXIm7N/y0UCRt3UfJTfZ7oOpglM=
+golang.org/x/crypto v0.52.0 h1:RMs7fP2rXdep0CftQlK8Uf+kibLm7qkCcradZWYz988=
+golang.org/x/crypto v0.52.0/go.mod h1:1QgfPxDqh0T2M/elOJtp9RvuR95kVjir0e6/BvEmGbc=
+golang.org/x/net v0.55.0 h1:bcvxaJn3e1U6InsFWt1JUq1aSjnRxLzT2rtD2KfkDF8=
+golang.org/x/net v0.55.0/go.mod h1:L5U2KuzuOe1lY7Z+aWVIKK6qEeJXnXV9yzGA+WCHJww=
+golang.org/x/term v0.43.0 h1:S4RLU2sB31O/NCl+zFN9Aru9A/Cq2aqKpTZJ6B+DwT4=
+golang.org/x/term v0.43.0/go.mod h1:lrhlHNdQJHO+1qVYiHfFKVuVioJIheAc3fBSMFYEIsk=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=

src/cli/copyMenu.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"os"
 	"os/signal"
-	"slices"
+	"strings"
 	"syscall"
 	"time"
 
@@ -39,14 +39,18 @@ func CopyMenu(vanityPath string, decSlice []string, oldPassword []byte) {
 	}
 
 	// determine populated fields in entry
-	var fieldStrings = []string{"Username", "Password", "TOTP Code", "URL", "Note (first line)"}
-	var indices = []int{1, 0, 2, 3, 4}
-	var fieldOptions []string
-	for i := range indices {
-		if len(decSlice) > indices[i] && decSlice[indices[i]] != "" {
-			fieldOptions = append(fieldOptions, fieldStrings[i])
-			if indices[i] == 0 && oldPassword != nil {
-				fieldOptions = append(fieldOptions, "Old Password")
+	var allStrings = [5]string{"Username", "Password", "TOTP Code", "URL", "Note (first line)"}
+	var allIndices = [5]int{1, 0, 2, 3, 4}
+	var allRunes = [5]rune{'u', 'p', 't', 'l', 'n'}
+	var fieldStrings []string
+	var fieldRunes []rune
+	for i := range allIndices {
+		if len(decSlice) > allIndices[i] && decSlice[allIndices[i]] != "" {
+			fieldStrings = append(fieldStrings, allStrings[i])
+			fieldRunes = append(fieldRunes, allRunes[i])
+			if allIndices[i] == 0 && oldPassword != nil {
+				fieldStrings = append(fieldStrings, "Old Password")
+				fieldRunes = append(fieldRunes, 'b')
 			}
 		}
 	}
@@ -54,7 +58,7 @@ func CopyMenu(vanityPath string, decSlice []string, oldPassword []byte) {
 	// if notes are included, preview them
 	if len(decSlice) > 4 {
 		EntryReader(vanityPath, append([]string{"", "", "", ""}, decSlice[4:]...), true)
-		if len(fieldOptions) < 1 { // if notes are the only thing included, exit
+		if len(fieldStrings) < 1 { // if notes are the only thing included, exit
 			fmt.Printf("\r%sNo copyable fields present, exiting copy menu...%s\n", back.AnsiWarning, back.AnsiReset)
 			os.Exit(0)
 		}
@@ -93,25 +97,23 @@ func CopyMenu(vanityPath string, decSlice []string, oldPassword []byte) {
 	}()
 
 	// copy selected field to clipboard
-	var choice int
-	var selectedField string
+	var runesToIndices = map[rune]int{'u': 1, 'p': 0, 't': 2, 'l': 3, 'n': 4}
+	var selectedField rune
 	for {
 		fmt.Println()
-		if selectedField != "" {
-			choice = front.InputMenuGen("Field to copy:", fieldOptions)
+		if selectedField != 0 {
+			selectedField = front.InputMenuGenWithRuneInputs("Field to copy:", fieldStrings, fieldRunes)
 		} else {
-			choice = front.InputMenuGen("Field to copy (exiting in 5 seconds):", fieldOptions)
+			selectedField = front.InputMenuGenWithRuneInputs("Field to copy (exiting in 5 seconds):", fieldStrings, fieldRunes)
 			selectedChan <- true
 		}
-		selectedField = fieldOptions[choice-1]
-		if selectedField == "Old Password" {
+
+		switch selectedField {
+		case 'b': // old password
 			if err = clip.CopyBytes(false, oldPassword); err != nil {
 				other.PrintError("Failed to copy old password to clipboard: "+err.Error(), global.ErrorClipboard)
 			}
-			continue
-		}
-		choice = indices[slices.Index(fieldStrings, selectedField)]
-		if choice == 2 {
+		case 't': // TOTP
 			fmt.Println(back.AnsiWarning + "[Starting]" + back.AnsiReset + " TOTP clipboard refresher")
 			errorChan := make(chan error, 1)
 			done := make(chan bool)
@@ -129,8 +131,11 @@ func CopyMenu(vanityPath string, decSlice []string, oldPassword []byte) {
 			}
 			close(done)
 			fmt.Println(back.AnsiBlue + "[Stopped]" + back.AnsiReset + " TOTP clipboard refresher")
-		} else {
-			if err = clip.CopyBytes(false, []byte(decSlice[choice])); err != nil {
+		case 'n': // notes
+			decSlice[4] = strings.TrimRight(decSlice[4], " ")
+			fallthrough
+		default:
+			if err = clip.CopyBytes(false, []byte(decSlice[runesToIndices[selectedField]])); err != nil {
 				other.PrintError("Failed to copy field to clipboard: "+err.Error(), global.ErrorClipboard)
 			}
 		}

src/cli/edit.go

@@ -37,7 +37,9 @@ func EditEntryField(realPath string, field int) {
 	var oldPassword []byte
 	switch field {
 	case 0:
-		oldPassword = []byte(decSlice[field])
+		if decSlice[0] != "" {
+			oldPassword = []byte(decSlice[0])
+		}
 		decSlice[field] = string(front.InputSecret("Password:"))
 	case 1:
 		decSlice[field] = front.Input("Username:")
@@ -75,7 +77,10 @@ func GenUpdate(realPath string) {
 	}
 
 	// generate a new password
-	oldPassword := []byte(decSlice[0])
+	var oldPassword []byte
+	if decSlice[0] != "" {
+		oldPassword = []byte(decSlice[0])
+	}
 	decSlice[0] = string(inputPasswordGen())
 
 	// write and preview the modified entry