Merge pull request #9 from fiatjaf/spaces-newlines

quoting and unquoting strings, printing empty lines correctly and handling `"`

Author: karlseguin

commands/commands.go

@@ -6,7 +6,7 @@ var (
 	OK        = []byte("ok")
 	TRUE      = []byte("true")
 	FALSE     = []byte("false")
-	SCAN_MORE = []byte(`"it" for more`)
+	SCAN_MORE = []byte(`'it' for more`)
 
 	units = []string{"KB", "MB", "GB", "TB", "PB"}
 )

commands/help.go

@@ -2,7 +2,7 @@ package commands
 
 import "lmdb-cli/core"
 
-var helpText = []byte(`
+var helpText = `
   del KEY        - removes the key/value
   get KEY FORMAT - gets the value. FORMAT is optional or 'json' or 'hex'
   set KEY        - creates or overwrites the key with the specified value
@@ -20,12 +20,11 @@ var helpText = []byte(`
 
   exit           - exits the program
                   (aliases: quit, CTRL-C)
-`)
+`
 
-type Help struct {
-}
+type Help struct{}
 
 func (cmd Help) Execute(context *core.Context, input []byte) (err error) {
-	context.Output(helpText)
+	context.OutputString(helpText)
 	return nil
 }

commands/parser.go

@@ -4,14 +4,14 @@ import (
 	"bytes"
 	"encoding/hex"
 	"errors"
+	"strconv"
 	"unicode"
 )
 
 const (
 	STATE_NONE int = iota
 	STATE_WORD
 	STATE_QUOTE
-	STATE_ESCAPED
 )
 
 var (
@@ -45,6 +45,7 @@ func parse(in []byte) [][]byte {
 				arg = arg[2 : 2+n]
 			}
 		}
+
 		results = append(results, arg)
 	}
 
@@ -53,13 +54,11 @@ func parse(in []byte) [][]byte {
 		case STATE_NONE:
 			if isQuote(b) {
 				state = STATE_QUOTE
+				arg = append(arg, '"')
 			} else if !isWhiteSpace(b) {
 				arg = append(arg, b)
 				state = STATE_WORD
 			}
-		case STATE_ESCAPED:
-			arg = append(arg, b)
-			state = STATE_QUOTE
 		case STATE_WORD:
 			if isWhiteSpace(b) {
 				pushArg()
@@ -69,9 +68,12 @@ func parse(in []byte) [][]byte {
 				arg = append(arg, b)
 			}
 		case STATE_QUOTE:
-			if b == '\\' {
-				state = STATE_ESCAPED
-			} else if isQuote(b) {
+			if isQuote(b) {
+				arg = append(arg, '"')
+				unquoted, err := strconv.Unquote(string(arg))
+				if err == nil {
+					arg = []byte(unquoted)
+				}
 				pushArg()
 				arg = make([]byte, 0)
 				state = STATE_NONE

core/context.go

@@ -6,6 +6,7 @@ import (
 	"io"
 	"log"
 	"path"
+	"strconv"
 
 	"github.com/bmatsuo/lmdb-go/lmdb"
 )
@@ -156,15 +157,29 @@ func (c *Context) Close() {
 	c.Env.Close()
 }
 
+func (c *Context) OutputString(data string) {
+	c.writer.Write([]byte(data))
+}
+
 func (c *Context) Output(data []byte) {
+	if len(data) == 0 {
+		c.writer.Write([]byte{'\n'})
+		return
+	}
+
 	n := len(data)
 	readableCharacters := 0
 	for _, b := range data {
-		if b >= 33 && b <= 126 {
+		if b >= 32 && b <= 126 || b == 10 {
 			readableCharacters++
 		}
 	}
 	if readableCharacters > n*2/3 {
+		sdata := string(data)
+		quoted := strconv.QuoteToASCII(sdata)
+		if quoted[1:len(quoted)-1] != sdata {
+			data = []byte(quoted)
+		}
 		c.writer.Write(data)
 	} else {
 		c.writer.Write([]byte("0x" + hex.EncodeToString(data)))