From 7fbea88cf55af9b3354b4a1334e49c38d0d920fc Mon Sep 17 00:00:00 2001
From: Paul Buetow <paul@buetow.org>
Date: Sat, 18 Sep 2021 13:16:36 +0300
Subject: additional flags can be interpreted as file list

---
 TODO.md           |  3 +++
 cmd/dcat/main.go  | 10 ++++++++++
 cmd/dgrep/main.go | 10 ++++++++++
 cmd/dmap/main.go  | 12 +++++++++++-
 cmd/dtail/main.go | 10 ++++++++++
 5 files changed, 44 insertions(+), 1 deletion(-)

diff --git a/TODO.md b/TODO.md
index f21fa71..d4f8312 100644
--- a/TODO.md
+++ b/TODO.md
@@ -17,3 +17,6 @@ This is a loose list of what to do. Maybe for the next releae or maybe for a lat
 [ ] Update animated gifs
 [x] Fix dmap so that it always reads to the end of file
 [ ] Add more default fields to the default MAPREDUCE format.
+[x] By default connect to localhost
+[x] Can use additional args as file lists
+[ ] Document the two things above
diff --git a/cmd/dcat/main.go b/cmd/dcat/main.go
index 1732c26..2ac773a 100644
--- a/cmd/dcat/main.go
+++ b/cmd/dcat/main.go
@@ -4,6 +4,7 @@ import (
 	"context"
 	"flag"
 	"os"
+	"strings"
 
 	"github.com/mimecast/dtail/internal/clients"
 	"github.com/mimecast/dtail/internal/config"
@@ -40,6 +41,15 @@ func main() {
 
 	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
diff --git a/cmd/dgrep/main.go b/cmd/dgrep/main.go
index f32be34..35b2236 100644
--- a/cmd/dgrep/main.go
+++ b/cmd/dgrep/main.go
@@ -4,6 +4,7 @@ import (
 	"context"
 	"flag"
 	"os"
+	"strings"
 
 	"github.com/mimecast/dtail/internal/clients"
 	"github.com/mimecast/dtail/internal/config"
@@ -44,6 +45,15 @@ func main() {
 
 	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
diff --git a/cmd/dmap/main.go b/cmd/dmap/main.go
index f99be52..ab710ac 100644
--- a/cmd/dmap/main.go
+++ b/cmd/dmap/main.go
@@ -4,6 +4,7 @@ import (
 	"context"
 	"flag"
 	"os"
+	"strings"
 
 	"github.com/mimecast/dtail/internal/clients"
 	"github.com/mimecast/dtail/internal/config"
@@ -47,6 +48,15 @@ func main() {
 
 	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
@@ -65,7 +75,7 @@ func main() {
 
 	client, err := clients.NewMaprClient(args, queryStr, clients.DefaultMode)
 	if err != nil {
-		panic(err)
+		logger.FatalExit(err)
 	}
 
 	status := client.Start(ctx, signal.InterruptCh(ctx))
diff --git a/cmd/dtail/main.go b/cmd/dtail/main.go
index b41e9bb..3c3443f 100644
--- a/cmd/dtail/main.go
+++ b/cmd/dtail/main.go
@@ -8,6 +8,7 @@ import (
 	_ "net/http"
 	_ "net/http/pprof"
 	"os"
+	"strings"
 	"time"
 
 	"github.com/mimecast/dtail/internal/clients"
@@ -62,6 +63,15 @@ func main() {
 
 	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, ",")
+	}
+
 	if grep != "" {
 		args.RegexStr = grep
 	}
-- 
cgit v1.2.3