restructuring display functions to a separate package

open-traffic-generator · Jul 27, 2022 · 01ce33a · 01ce33a
1 parent ef6adb7
commit 01ce33a
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 7 deletions.
diff --git a/cmd/display.go b/cmd/display.go
@@ -24,6 +24,7 @@ package cmd
 import (
 	"fmt"
 
+	"github.com/open-traffic-generator/otgen/display"
 	"github.com/spf13/cobra"
 )
 
@@ -45,12 +46,12 @@ For more information, go to https://github.com/open-traffic-generator/otgen
 	Run: func(cmd *cobra.Command, args []string) {
 		switch displayType {
 		case TYPE_CHARTS:
-			err := chartsFn(cmd, args)
+			err := display.ChartsFn(cmd, args)
 			if err != nil {
 				log.Fatal(err)
 			}
 		case TYPE_TABLE:
-			err := tableFn(cmd, args)
+			err := display.TableFn(cmd, args)
 			if err != nil {
 				log.Fatal(err)
 			}

diff --git a/cmd/charts.go → display/charts.go b/cmd/charts.go → display/charts.go
@@ -1,4 +1,4 @@
-package cmd
+package display
 
 import (
 	"context"
@@ -121,7 +121,7 @@ func (cp *ChartProcessor) Layout(data []DataPoint) error {
 	return cp.cnt.Update("root", co...)
 }
 
-func chartsFn(cmd *cobra.Command, args []string) error {
+func ChartsFn(cmd *cobra.Command, args []string) error {
 	t, err := tcell.New()
 	if err != nil {
 		panic(err)

diff --git a/cmd/table.go → display/table.go b/cmd/table.go → display/table.go
@@ -1,4 +1,4 @@
-package cmd
+package display
 
 import (
 	"fmt"
@@ -71,7 +71,7 @@ func (tp *TableProcessor) Format() string {
 	return tableString.String()
 }
 
-func tableFn(cmd *cobra.Command, args []string) error {
+func TableFn(cmd *cobra.Command, args []string) error {
 	tp := &TableProcessor{
 		headers:  []string{},
 		data:     map[string]map[string]string{},

diff --git a/cmd/utils.go → display/utils.go b/cmd/utils.go → display/utils.go
@@ -1,10 +1,12 @@
-package cmd
+package display
 
 import (
 	"bufio"
 	"encoding/json"
 	"os"
 	"sync"
+
+	log "github.com/sirupsen/logrus"
 )
 
 // TODO: would be nice to make it configurable or automatically determined