add spartan mode

1 files changed, 9 insertions, 19 deletions

diff --git a/cmd/dmap/main.go b/cmd/dmap/main.go
index ab710ac..4525503 100644
--- a/cmd/dmap/main.go
+++ b/cmd/dmap/main.go
@@ -4,7 +4,6 @@ import (
 	"context"
 	"flag"
 	"os"
-	"strings"
 
 	"github.com/mimecast/dtail/internal/clients"
 	"github.com/mimecast/dtail/internal/config"
@@ -20,7 +19,6 @@ func main() {
 	var cfgFile string
 	var debugEnable bool
 	var displayVersion bool
-	var noColor bool
 	var queryStr string
 	var sshPort int
 
@@ -30,11 +28,12 @@ func main() {
 
 	userName := user.Name()
 
+	flag.BoolVar(&args.Quiet, "quiet", false, "Quiet output mode")
+	flag.BoolVar(&args.Spartan, "spartan", false, "Spartan output mode")
 	flag.BoolVar(&args.TrustAllHosts, "trustAllHosts", false, "Auto trust all unknown host keys")
 	flag.BoolVar(&debugEnable, "debug", false, "Activate debug messages")
 	flag.BoolVar(&displayVersion, "version", false, "Display version")
-	flag.BoolVar(&noColor, "noColor", false, "Disable ANSII terminal colors")
-	flag.BoolVar(&args.Quiet, "quiet", false, "Quiet output mode")
+	flag.BoolVar(&args.NoColor, "noColor", false, "Disable ANSII terminal colors")
 	flag.IntVar(&args.ConnectionsPerCPU, "cpc", 10, "How many connections established per CPU core concurrently")
 	flag.IntVar(&args.Timeout, "timeout", 0, "Max time dtail server will collect data until disconnection")
 	flag.IntVar(&sshPort, "port", 2222, "SSH server port")
@@ -47,25 +46,16 @@ func main() {
 	flag.StringVar(&queryStr, "query", "", "Map reduce query")
 
 	flag.Parse()
-
-	if args.What == "" {
-		// Interpret additional args as file list.
-		var files []string
-		for _, file := range flag.Args() {
-			files = append(files, file)
-		}
-		args.What = strings.Join(files, ",")
-	}
-
-	config.Read(cfgFile, sshPort)
-	if noColor {
-		config.Client.TermColorsEnable = false
-	}
+	args.Transform(flag.Args())
+	config.Read(cfgFile, sshPort, args.NoColor)
+	args.TransformAfterConfigFile()
 
 	if displayVersion {
 		version.PrintAndExit()
 	}
-	version.Print()
+	if !args.Spartan {
+		version.Print()
+	}
 
 	ctx := context.TODO()
 	logger.Start(ctx, logger.Modes{