Encode mock setup in a function

derricw · Jun 2, 2020 · 62c05fe · 62c05fe
1 parent d7c2135
commit 62c05fe
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 27 deletions.
diff --git a/cmd/conv.go b/cmd/conv.go
@@ -2,7 +2,6 @@ package cmd
 
 import (
 	"fmt"
-	"io/ioutil"
 
 	"github.com/derricw/siggo/model"
 	"github.com/derricw/siggo/signal"
@@ -31,15 +30,12 @@ var convCmd = &cobra.Command{
 		}
 
 		var signalAPI model.SignalAPI = signal.NewSignal(cfg.UserNumber)
-		if Mock != "" {
-			b, err := ioutil.ReadFile(Mock)
-			if err != nil {
-				log.Fatalf("couldn't open mock data")
-			}
-			signalAPI = signal.NewMockSignal(cfg.UserNumber, b)
+		if mock != "" {
+			signalAPI = setupMock(mock, cfg)
 		}
+
 		s := model.NewSiggo(signalAPI, cfg)
-		if Mock != "" {
+		if mock != "" {
 			s.Receive()
 		}
 

diff --git a/cmd/receive.go b/cmd/receive.go
@@ -1,8 +1,6 @@
 package cmd
 
 import (
-	"io/ioutil"
-
 	"github.com/derricw/siggo/model"
 	"github.com/derricw/siggo/signal"
 	log "github.com/sirupsen/logrus"
@@ -22,16 +20,15 @@ var receiveCmd = &cobra.Command{
 		if err != nil {
 			log.Fatalf("failed to read config @ %s", model.DefaultConfigPath())
 		}
+		initLogging(cfg)
+
 		if cfg.UserNumber == "" {
 			log.Fatalf("no user phone number configured @ %s", model.DefaultConfigPath())
 		}
+
 		var signalAPI model.SignalAPI = signal.NewSignal(cfg.UserNumber)
-		if Mock != "" {
-			b, err := ioutil.ReadFile(Mock)
-			if err != nil {
-				log.Fatalf("couldn't open mock data")
-			}
-			signalAPI = signal.NewMockSignal(cfg.UserNumber, b)
+		if mock != "" {
+			signalAPI = setupMock(mock, cfg)
 		}
 
 		s := model.NewSiggo(signalAPI, cfg)

diff --git a/cmd/root.go b/cmd/root.go
@@ -15,15 +15,15 @@ import (
 )
 
 var (
-	Mock  string
-	Debug bool
+	mock  string
+	debug bool
 )
 
 const defaultLogPath = "/tmp/siggo.log"
 
 func init() {
-	rootCmd.PersistentFlags().StringVarP(&Mock, "mock", "m", "", "mock mode (uses example data)")
-	rootCmd.PersistentFlags().BoolVarP(&Debug, "debug", "d", false, "debug logging")
+	rootCmd.PersistentFlags().StringVarP(&mock, "mock", "m", "", "mock mode (uses example data)")
+	rootCmd.PersistentFlags().BoolVarP(&debug, "debug", "d", false, "debug logging")
 }
 
 func initLogging(cfg *model.Config) {
@@ -34,12 +34,20 @@ func initLogging(cfg *model.Config) {
 	if err != nil {
 		log.Fatalf("error creating log file: %v %v", cfg.LogFilePath, err)
 	}
-	if Debug {
+	if debug {
 		log.SetLevel(log.DebugLevel)
 	}
 	log.SetOutput(logFile)
 }
 
+func setupMock(mockFileName string, cfg *model.Config) *signal.MockSignal {
+	b, err := ioutil.ReadFile(mock)
+	if err != nil {
+		log.Fatalf("couldn't open mock data: %v %v", mock, err)
+	}
+	return signal.NewMockSignal(cfg.UserNumber, b)
+}
+
 var rootCmd = &cobra.Command{
 	Use:   "siggo",
 	Short: "siggo is a terminal gui for signal-cli",
@@ -57,12 +65,8 @@ var rootCmd = &cobra.Command{
 		}
 
 		var signalAPI model.SignalAPI = signal.NewSignal(cfg.UserNumber)
-		if Mock != "" {
-			b, err := ioutil.ReadFile(Mock)
-			if err != nil {
-				log.Fatal("couldn't open mock data")
-			}
-			signalAPI = signal.NewMockSignal(cfg.UserNumber, b)
+		if mock != "" {
+			signalAPI = setupMock(mock, cfg)
 		}
 
 		s := model.NewSiggo(signalAPI, cfg)