(refactor) cmd refactor

main.go

@@ -15,26 +15,16 @@ import (
 //go:embed all:frontend/dist/*
 var publicDir embed.FS
 
-type sliceFlags []string
-
-func (i *sliceFlags) String() string {
-	return "my string representation"
-}
-func (i *sliceFlags) Set(value string) error {
-	*i = append(*i, value)
-	return nil
-}
-
 type Flags struct {
 	host        string
 	port        int64
 	cors        int64
 	every       int64
 	limit       int
 	baseURL     string
-	filePaths   sliceFlags
-	sshPaths    sliceFlags
-	dockerPaths sliceFlags
+	filePaths   pkg.SliceFlags
+	sshPaths    pkg.SliceFlags
+	dockerPaths pkg.SliceFlags
 	access      bool
 	open        bool
 	version     bool
@@ -47,7 +37,6 @@ var version = "dev"
 func main() {
 	pkg.SetupLoggingStdout()
 	flags()
-	wantsVersion()
 
 	if pkg.IsInputFromPipe() {
 		tmpFile, err := os.Create(pkg.GetTmpFileNameForSTDIN())
@@ -65,16 +54,16 @@ func main() {
 			}
 		}(tmpFile)
 	}
-	defaultFilePaths()
+	setFilePaths()
 
 	go watchFilePaths(f.every)
 	slog.Info("Flags", "host", f.host, "port", f.port, "baseURL", f.baseURL, "open", f.open, "cors", f.cors, "access", f.access)
 
 	if f.open {
 		pkg.OpenBrowser(fmt.Sprintf("http://%s:%d%s", f.host, f.port, f.baseURL))
 	}
-	defer cleanup()
-	pkg.HandleCltrC(cleanup)
+	defer pkg.Cleanup()
+	pkg.HandleCltrC(pkg.Cleanup)
 
 	err := pkg.NewEcho(func(o *pkg.EchoOptions) error {
 		o.Host = f.host
@@ -91,9 +80,9 @@ func main() {
 	}
 }
 
-func defaultFilePaths() {
+func setFilePaths() {
 	if len(os.Args) > 1 {
-		filePaths := sliceFlags{}
+		filePaths := pkg.SliceFlags{}
 		for _, arg := range os.Args[1:] {
 			if strings.HasPrefix(arg, "-") {
 				filePaths = []string{}
@@ -193,19 +182,7 @@ func updateGlobalFilePaths() {
 		}
 	}
 
-	pkg.GlobalFilePaths = uniqueFileInfos(fileInfos)
-}
-
-func cleanup() {
-	slog.Info("cleaning up")
-	if pkg.GlobalPipeTmpFilePath != "" {
-		err := os.Remove(pkg.GlobalPipeTmpFilePath)
-		if err != nil {
-			slog.Error("removing temp file", pkg.GlobalPipeTmpFilePath, err)
-			return
-		}
-		slog.Info("temp file removed", "path", pkg.GlobalPipeTmpFilePath)
-	}
+	pkg.GlobalFilePaths = pkg.UniqueFileInfos(fileInfos)
 }
 
 func watchFilePaths(seconds int64) {
@@ -220,19 +197,6 @@ func watchFilePaths(seconds int64) {
 	}
 }
 
-func uniqueFileInfos(fileInfos []pkg.FileInfo) []pkg.FileInfo {
-	keys := make(map[string]bool)
-	list := []pkg.FileInfo{}
-	for _, entry := range fileInfos {
-		key := entry.FilePath + entry.Type + entry.Host
-		if _, value := keys[key]; !value {
-			keys[key] = true
-			list = append(list, entry)
-		}
-	}
-	return list
-}
-
 func flags() {
 	flag.Var(&f.filePaths, "f", "full path pattern to the log file")
 	flag.Var(&f.sshPaths, "s", "full ssh path pattern to the log file")
@@ -248,10 +212,14 @@ func flags() {
 	flag.StringVar(&f.baseURL, "base-url", "/", "base url with slash")
 
 	flag.Parse()
+	wantsVersion()
 }
 
 func wantsVersion() {
-	if f.version {
+	if len(os.Args) == 2 &&
+		(os.Args[1] == "-version" || os.Args[1] == "--version" ||
+			os.Args[1] == "-v" || os.Args[1] == "--v" ||
+			os.Args[1] == "version") || f.version {
 		fmt.Println(version)
 		os.Exit(0)
 	}

pkg/files.go

@@ -370,3 +370,23 @@ func sshFilesByPattern(pattern string, config *SSHConfig) ([]string, error) {
 	filePaths := buf.String()
 	return strings.Split(strings.TrimSpace(filePaths), "\n"), nil
 }
+
+func UniqueFileInfos(fileInfos []FileInfo) []FileInfo {
+	keys := make(map[string]bool)
+	list := []FileInfo{}
+	for _, entry := range fileInfos {
+		key := entry.FilePath + entry.Type + entry.Host
+		if _, value := keys[key]; !value {
+			keys[key] = true
+			list = append(list, entry)
+		}
+	}
+	return list
+}
+
+// func UniqueFileInfos(fileInfos []FileInfo) []FileInfo {
+// 	eq := func(a, b FileInfo) bool {
+// 		return a.FilePath == b.FilePath && a.Type == b.Type && a.Host == b.Host
+// 	}
+// 	return slices.CompactFunc(fileInfos, eq)
+// }

pkg/slices.go

@@ -0,0 +1,14 @@
+package pkg
+
+type SliceFlags []string
+
+// provide a String() method on the type so we can use it with flag.Var
+func (i *SliceFlags) String() string {
+	return ""
+}
+
+// provide a Set() method on the type so we can use it with flag.Var
+func (i *SliceFlags) Set(value string) error {
+	*i = append(*i, value)
+	return nil
+}

pkg/system.go

@@ -123,3 +123,15 @@ func HandleCltrC(f func()) {
 		os.Exit(1)
 	}()
 }
+
+func Cleanup() {
+	if GlobalPipeTmpFilePath == "" {
+		return
+	}
+	err := os.Remove(GlobalPipeTmpFilePath)
+	if err != nil {
+		slog.Error("removing temp file", GlobalPipeTmpFilePath, err)
+		return
+	}
+	slog.Info("temp file removed", "path", GlobalPipeTmpFilePath)
+}

pkg/system_test.go

@@ -46,3 +46,17 @@ func TestIsInputFromPipe(t *testing.T) {
 		t.Error("Expected IsInputFromPipe to return true")
 	}
 }
+
+// func TestUniqueFileInfos(t *testing.T)
+// {
+// 	GlobalFilePaths = []FileInfo{
+// 		{FilePath: "/tmp/file1"},
+// 		{FilePath: "/tmp/file2"},
+// 		{FilePath: "/tmp/file1"},
+// 	}
+
+// 	uniqueFileInfos := UniqueFileInfos(GlobalFilePaths)
+// 	if len(uniqueFileInfos) != 2 {
+// 		t.Errorf("Expected 2 unique file infos, got %d", len(uniqueFileInfos))
+// 	}
+// }