Merge pull request #27 from koinos/more-polish

Check terminal for unicode support

Author: sgerbino

cmd/cli-wallet/interactive/interactive.go

@@ -2,6 +2,8 @@ package interactive
 
 import (
 	"fmt"
+	"os"
+	"strings"
 
 	"github.com/c-bata/go-prompt"
 	"github.com/koinos/koinos-cli-wallet/internal/wallet"
@@ -13,6 +15,12 @@ type KoinosPrompt struct {
 	execEnv            *wallet.ExecutionEnvironment
 	gPrompt            *prompt.Prompt
 	commandSuggestions []prompt.Suggest
+	unicodeSupport     bool
+
+	onlineDisplay  string
+	offlineDisplay string
+	openDisplay    string
+	closeDisplay   string
 }
 
 // NewKoinosPrompt creates a new interactive prompt object
@@ -32,20 +40,37 @@ func NewKoinosPrompt(parser *wallet.CommandParser, execEnv *wallet.ExecutionEnvi
 		kp.commandSuggestions = append(kp.commandSuggestions, prompt.Suggest{Text: cmd.Name, Description: cmd.Description})
 	}
 
+	// Check for terminal unicode support
+	lang := strings.ToUpper(os.Getenv("LANG"))
+	kp.unicodeSupport = strings.Contains(lang, "UTF")
+
+	// Setup status characters
+	if kp.unicodeSupport {
+		kp.onlineDisplay = "🟢"
+		kp.offlineDisplay = "🔴"
+		kp.closeDisplay = "🔐"
+		kp.openDisplay = "🔓"
+	} else {
+		kp.onlineDisplay = "(online)"
+		kp.offlineDisplay = "(offline)"
+		kp.closeDisplay = "(locked)"
+		kp.openDisplay = "(unlocked)"
+	}
+
 	return kp
 }
 
 func (kp *KoinosPrompt) changeLivePrefix() (string, bool) {
 	// Calculate online status
-	onlineStatus := "🔴"
+	onlineStatus := kp.offlineDisplay
 	if kp.execEnv.IsOnline() {
-		onlineStatus = "🟢"
+		onlineStatus = kp.onlineDisplay
 	}
 
 	// Calculate wallet status
-	walletStatus := "🔐"
+	walletStatus := kp.closeDisplay
 	if kp.execEnv.IsWalletOpen() {
-		walletStatus = "🔓"
+		walletStatus = kp.openDisplay
 	}
 
 	return fmt.Sprintf("%s %s > ", onlineStatus, walletStatus), true
@@ -69,7 +94,7 @@ func (kp *KoinosPrompt) executor(input string) {
 
 // Run runs interactive mode
 func (kp *KoinosPrompt) Run() {
-	fmt.Println("Koinos CLI Wallet")
+	fmt.Println(fmt.Sprintf("Koinos CLI Wallet %s", wallet.Version))
 	fmt.Println("Type \"list\" for a list of commands, \"help <command>\" for help on a specific command.")
 	kp.gPrompt.Run()
 }

cmd/cli-wallet/main.go

@@ -2,6 +2,7 @@ package main
 
 import (
 	"fmt"
+	"os"
 
 	"github.com/joho/godotenv"
 	"github.com/koinos/koinos-cli-wallet/cmd/cli-wallet/interactive"
@@ -13,6 +14,7 @@ import (
 const (
 	rpcOption     = "rpc"
 	executeOption = "execute"
+	versionOption = "version"
 )
 
 // Default options
@@ -31,9 +33,15 @@ func main() {
 	// Setup command line options
 	rpcAddress := flag.StringP(rpcOption, "r", rpcDefault, "RPC server URL")
 	executeCmd := flag.StringP(executeOption, "x", executeDefault, "Command to execute")
+	versionCmd := flag.BoolP(versionOption, "v", false, "Display the version")
 
 	flag.Parse()
 
+	if *versionCmd {
+		fmt.Println(wallet.Version)
+		os.Exit(0)
+	}
+
 	// Setup client
 	var client *wallet.KoinosRPCClient
 	if *rpcAddress != "" {

internal/wallet/commands.go

@@ -76,8 +76,8 @@ func (cs *CommandSet) List(pretty bool) []string {
 
 	// If pretty output add descriptions
 	o := make([]string, 0)
-	for i, name := range names {
-		o = append(o, fmt.Sprintf("%*s - %s", -longest, name, cs.Commands[i].Description))
+	for _, name := range names {
+		o = append(o, fmt.Sprintf("%*s - %s", -longest, name, cs.Name2Command[name].Description))
 	}
 
 	return o

internal/wallet/util.go

@@ -17,6 +17,11 @@ import (
 	"github.com/ybbus/jsonrpc/v2"
 )
 
+const (
+	// Version number (this should probably not live here)
+	Version = "v0.1.2"
+)
+
 // SignTransaction signs the transaction with the given key
 func SignTransaction(key []byte, tx *types.Transaction) error {
 	privateKey, _ := btcec.PrivKeyFromBytes(btcec.S256(), key)