Added a universal msg output function.

nats-io · Mar 24, 2023 · 8707f44 · 8707f44
1 parent 14e7089
commit 8707f44
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 33 deletions.
diff --git a/cli/filter_data_through_cmd.go b/cli/filter_data_through_cmd.go
@@ -9,7 +9,25 @@ import (
 	"text/template"
 )
 
-func filterDataThroughCmd(data []byte, filter string, subject, stream string) ([]byte, error) {
+func outPutMSGBody(data []byte, filter, subject, stream string) {
+	if len(data) == 0 {
+		fmt.Println("nil body")
+		return
+	}
+
+	data, err := filterDataThroughCmd(data, filter, subject, stream)
+	if err != nil {
+		fmt.Printf("%s\nError while translating msg body: %s\n\n", data, err.Error())
+		return
+	}
+	output := string(data)
+	fmt.Println(output)
+	if !strings.HasSuffix(output, "\n") {
+		fmt.Println()
+	}
+}
+
+func filterDataThroughCmd(data []byte, filter, subject, stream string) ([]byte, error) {
 	if filter == "" {
 		return data, nil
 	}

diff --git a/cli/stream_command.go b/cli/stream_command.go
@@ -703,20 +703,7 @@ func (c *streamCmd) viewAction(_ *fisk.ParseContext) error {
 			}
 
 			fmt.Println()
-			if len(msg.Data) == 0 {
-				fmt.Println("nil body")
-			} else {
-				data, err := filterDataThroughCmd(msg.Data, c.vwTranslate, msg.Subject, meta.Stream())
-				if err != nil {
-					fmt.Printf("%s\nError while translating msg body: %s\n\n", data, err.Error())
-				} else {
-					fmt.Println(string(data))
-					if !strings.HasSuffix(string(data), "\n") {
-						fmt.Println()
-					}
-				}
-			}
-
+			outPutMSGBody(msg.Data, c.vwTranslate, msg.Subject, meta.Stream())
 		}
 
 		if last {
@@ -2711,14 +2698,7 @@ func (c *streamCmd) getAction(_ *fisk.ParseContext) (err error) {
 		}
 		fmt.Println()
 	}
-
-	data, err := filterDataThroughCmd(item.Data, c.vwTranslate, item.Subject, c.stream)
-	if err != nil {
-		fmt.Printf("%s\nError while translating msg body: %s\n\n", data, err.Error())
-	} else {
-		fmt.Println(string(data))
-		fmt.Println()
-	}
+	outPutMSGBody(item.Data, c.vwTranslate, item.Subject, c.stream)
 	return nil
 }
 

diff --git a/cli/sub_command.go b/cli/sub_command.go
@@ -458,15 +458,6 @@ func prettyPrintMsg(msg *nats.Msg, headersOnly bool, filter string) {
 	}
 
 	if !headersOnly {
-		data, err := filterDataThroughCmd(msg.Data, filter, msg.Subject, "")
-		if err != nil {
-			fmt.Printf("%s\nError while translating msg body: %s\n\n", data, err.Error())
-			return
-		}
-		output := string(data)
-		fmt.Println(output)
-		if !strings.HasSuffix(output, "\n") {
-			fmt.Println()
-		}
+		outPutMSGBody(msg.Data, filter, msg.Subject, "")
 	}
 }