Change printing logic and split format

hahwul · Feb 12, 2021 · f84ca85 · f84ca85
1 parent 33cec92
commit f84ca85
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 17 deletions.
diff --git a/pkg/gee/gee.go b/pkg/gee/gee.go
@@ -45,10 +45,6 @@ func Gee(options model.Options) {
 		if regexBool {
 			linec, line := StringProc(l, stdLine, options)
 
-			// Prefix and Suffix
-			line = options.Prefix + line + options.Suffix
-			linec = options.Prefix + linec + options.Suffix
-
 			// Print to Stdout
 			StdPrint(linec, options)
 

diff --git a/pkg/gee/string.go b/pkg/gee/string.go
@@ -53,8 +53,8 @@ func StringProc(l string, stdLine int, options model.Options) (string, string) {
 	}
 	switch options.Format {
 	case "json":
-		returnString = "{\"line\":\"[" + returnString + "\"\"]\"}\n"
-		returnPlainString = "{\"line\":\"[" + returnPlainString + "\"\"]\"}\n"
+		returnString = "{\"line\":[" + returnString + "\"\"]}\n"
+		returnPlainString = "{\"line\":[" + returnPlainString + "\"\"]}\n"
 	case "md-table":
 		returnString = "|" + returnString + "\n"
 		returnPlainString = "|" + returnPlainString + "\n"
@@ -69,25 +69,26 @@ func toFormat(str string, options model.Options) string {
 	var returnString string
 	switch options.Format {
 	case "json":
-		returnString = str + ","
+		returnString = "\"" + setFix(str, options) + "\","
 	case "md-table":
-		returnString = str + "|"
+		returnString = setFix(str+"|", options)
 	case "html-table":
-		returnString = "<td>" + str + "</td>"
+		returnString = "<td>" + setFix(str, options) + "</td>"
 	default:
-		returnString = strings.Replace(str, "\n", "", -1) + "\n"
+		returnString = setFix(str, options) + "\n"
 	}
 	return returnString
 }
 
-func toJSON() {
-
+func setFix(str string, options model.Options) string {
+	pf := setPrefix(strings.Replace(str, "\n", "", -1), options)
+	sf := setSuffix(pf, options)
+	return sf
 }
 
-func toMarkdownTable() {
-
+func setPrefix(str string, options model.Options) string {
+	return options.Prefix + str
 }
-
-func toHTMLTable() {
-
+func setSuffix(str string, options model.Options) string {
+	return options.Suffix + str
 }