blobsupport:Move blob parse to internal/osc

Author: glynternet

cmd/oscli/cmd/root.go

@@ -6,6 +6,7 @@ import (
 	"strings"
 
 	"github.com/glynternet/oscli/internal"
+	"github.com/glynternet/oscli/internal/osc"
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
@@ -32,6 +33,8 @@ const (
 var (
 	remoteHost string
 	remotePort uint
+
+	asBlob bool
 )
 
 var rootCmd = &cobra.Command{
@@ -45,6 +48,7 @@ func init() {
 	rootCmd.PersistentFlags().StringVarP(&remoteHost, "remote-host", "r", "", "address to send any messages to")
 	rootCmd.PersistentFlags().UintVar(&remotePort, "remote-port", 9000, "port of the remote host to send any messages to")
 
+	rootCmd.Flags().BoolVar(&asBlob, "as-blob", false, "send all arguments as blobs (in monitor and send subcommands)")
 	rootCmd.PersistentFlags().Float64P(keyMsgFrequency, "m", 25, "frequency to send messages at")
 
 	err := viper.BindPFlags(rootCmd.PersistentFlags())
@@ -77,3 +81,10 @@ func verifyHost(host string) error {
 	_, err := net.LookupHost(host)
 	return errors.Wrapf(err, "looking up host %s on network", host)
 }
+
+func getParser(asBlobs bool) func(string) (interface{}, error) {
+	if asBlobs {
+		return osc.BlobParse
+	}
+	return osc.Parse
+}

cmd/oscli/cmd/send.go

@@ -6,16 +6,13 @@ import (
 	"net"
 
 	"github.com/glynternet/oscli/internal"
-	osc3 "github.com/glynternet/oscli/internal/osc"
 	"github.com/glynternet/oscli/pkg/osc"
 	"github.com/pkg/errors"
 	osc2 "github.com/sander/go-osc/osc"
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
 )
 
-const keyAsBlob = "as-blob"
-
 var cmdSend = &cobra.Command{
 	Use:   "send",
 	Short: "send a single OSC message",
@@ -47,7 +44,7 @@ var cmdSend = &cobra.Command{
 		)
 
 		msg := osc2.NewMessage(msgAddr)
-		parse := getParser(viper.GetBool(keyAsBlob))
+		parse := getParser(asBlob)
 		for _, val := range args[1:] {
 			app, err := parse(val)
 			if err != nil {
@@ -65,23 +62,8 @@ var cmdSend = &cobra.Command{
 	},
 }
 
-type argParser func(arg string) interface{}
-
-// blobParse will convert any string argument to a []byte so that it will be sent
-// as a blob argument
-func blobParse(arg string) (interface{}, error) {
-	return []byte(arg), nil
-}
-
-func getParser(asBlobs bool) func(string) (interface{}, error) {
-	if asBlobs {
-		return blobParse
-	}
-	return osc3.Parse
-}
-
 func init() {
-	cmdSend.Flags().Bool(keyAsBlob, false, "send all arguments as blobs")
+
 	rootCmd.AddCommand(cmdSend)
 	err := viper.BindPFlags(cmdSend.Flags())
 	if err != nil {

internal/osc/parse.go

@@ -30,6 +30,15 @@ func Parse(val string) (interface{}, error) {
 	return val, nil
 }
 
+// BlobParse will convert any string argument to a []byte so that it will be sent
+// as a blob argument
+func BlobParse(val string) (interface{}, error) {
+	if val == "" {
+		return nil, EmptyValueError
+	}
+	return []byte(val), nil
+}
+
 // ParseError is an error type that can be returned when there is an issue with
 // parsing a string value in order to turn it into an osc.Message.
 type ParseError string