- adding decode flag to server view command - more idiomatic naming for db funcs
This commit is contained in:
@@ -32,7 +32,7 @@ var runCmd = &cobra.Command{
|
||||
}
|
||||
defer db.Close()
|
||||
|
||||
crun, err := db.GetCmd(cname)
|
||||
crun, err := db.Cmd(cname)
|
||||
if err != nil {
|
||||
if err.Error() == ErrInit {
|
||||
fmt.Println(ErrInitRsp)
|
||||
|
||||
@@ -20,7 +20,7 @@ var viewCmd = &cobra.Command{
|
||||
cobra.CheckErr(err)
|
||||
defer db.Close()
|
||||
|
||||
ts, err := db.GetAllCmds()
|
||||
ts, err := db.AllCmds()
|
||||
if err != nil {
|
||||
if err.Error() == ErrInit {
|
||||
fmt.Println(ErrInitRsp)
|
||||
|
||||
@@ -4,12 +4,15 @@ Copyright © 2025 Jake jake.young.dev@gmail.com
|
||||
package server
|
||||
|
||||
import (
|
||||
"encoding/base64"
|
||||
"fmt"
|
||||
|
||||
"code.jakeyoungdev.com/jake/mctl/database"
|
||||
"github.com/spf13/cobra"
|
||||
)
|
||||
|
||||
var decode bool
|
||||
|
||||
var viewCmd = &cobra.Command{
|
||||
Use: "view",
|
||||
Example: "mctl server view",
|
||||
@@ -17,29 +20,69 @@ var viewCmd = &cobra.Command{
|
||||
SilenceUsage: true,
|
||||
Run: func(cmd *cobra.Command, args []string) {
|
||||
db, err := database.New()
|
||||
cobra.CheckErr(err)
|
||||
if err != nil {
|
||||
fmt.Println(err)
|
||||
return
|
||||
}
|
||||
defer db.Close()
|
||||
|
||||
ts, err := db.GetAllServers()
|
||||
if len(args) > 0 {
|
||||
srvName := args[0]
|
||||
s, err := db.Server(srvName)
|
||||
if err != nil {
|
||||
fmt.Println(err)
|
||||
return
|
||||
}
|
||||
fmt.Println("-----")
|
||||
fmt.Printf("Name: %s\n", s.Name)
|
||||
fmt.Printf("Address: %s\n", s.Server)
|
||||
fmt.Printf("Port: %d\n", s.Port)
|
||||
if decode {
|
||||
pwb, err := base64.StdEncoding.DecodeString(s.Password)
|
||||
if err != nil {
|
||||
fmt.Println(err)
|
||||
return
|
||||
}
|
||||
fmt.Printf("Password: %s\n", string(pwb))
|
||||
} else {
|
||||
fmt.Println("Password: [REDACTED]")
|
||||
}
|
||||
fmt.Printf("Default: %t\n", s.Active)
|
||||
return
|
||||
}
|
||||
|
||||
ts, err := db.AllServers()
|
||||
if err != nil {
|
||||
if err.Error() == ErrInit {
|
||||
fmt.Println(ErrInitRsp)
|
||||
return
|
||||
} else {
|
||||
fmt.Println(err)
|
||||
return
|
||||
}
|
||||
}
|
||||
cobra.CheckErr(err)
|
||||
|
||||
for _, s := range ts {
|
||||
fmt.Println("-----")
|
||||
fmt.Printf("Name: %s\n", s.Name)
|
||||
fmt.Printf("Address: %s\n", s.Server)
|
||||
fmt.Printf("Port: %d\n", s.Port)
|
||||
fmt.Println("Password: [REDACTED]")
|
||||
if decode {
|
||||
pwb, err := base64.StdEncoding.DecodeString(s.Password)
|
||||
if err != nil {
|
||||
fmt.Println(err)
|
||||
return
|
||||
}
|
||||
fmt.Printf("Password: %s\n", string(pwb))
|
||||
} else {
|
||||
fmt.Println("Password: [REDACTED]")
|
||||
}
|
||||
fmt.Printf("Default: %t\n", s.Active)
|
||||
}
|
||||
},
|
||||
}
|
||||
|
||||
func init() {
|
||||
viewCmd.Flags().BoolVarP(&decode, "decode", "d", false, "decodes server passwords")
|
||||
ServerCmd.AddCommand(viewCmd)
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user