Change the string representation of effects to be JSON.

Author: terrorbyte

payload/payload.go

@@ -1,6 +1,7 @@
 package payload
 
 import (
+	"encoding/json"
 	"fmt"
 	"strings"
 	"testing"
@@ -181,12 +182,18 @@ var (
 
 // String representation of the supported payload types.
 func (s Supported) String() string {
-	a := []string{}
-	for effect := range s.Effects {
-		a = append(a, fmt.Sprintf("(%s: %s)", effect.String(), strings.Join(s.Effects[effect], ", ")))
+	tostr := map[string][]string{}
+	for effect, details := range s.Effects {
+		tostr[effect.String()] = details
 	}
+	a, err := json.Marshal(tostr)
+	if err != nil {
+		output.PrintfFrameworkError("Could not marshal payload effects: %s", err.Error())
 
-	return fmt.Sprintf("%s (%s): Effects - %s", s.Type.String(), s.Arch.String(), strings.Join(a, ", "))
+		return ""
+	}
+
+	return fmt.Sprintf("%s (%s) - Effects: %s", s.Type.String(), s.Arch.String(), a)
 }
 
 // String representation of the payload supported architecture.
@@ -447,14 +454,9 @@ func (e Effect) String() string {
 		return "Unknown"
 	case maxKey:
 		return "Unknown"
-	}
+	default:
+		output.PrintFrameworkError("Effect is not recognized.")
 
-	var n []string
-	for key := FileCreate; key < maxKey; key <<= 1 {
-		if e&key != 0 {
-			n = append(n, e.String())
-		}
+		return ""
 	}
-
-	return strings.Join(n, "|")
 }