feat: press "q" button to exit follow mode

rogosprojects · Aug 11, 2024 · de82e75 · de82e75
1 parent 165e5f3
commit de82e75
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 4 deletions.
diff --git a/cmd/root.go b/cmd/root.go
@@ -8,12 +8,14 @@ import (
 	"context"
 	"fmt"
 	"io"
+	"log"
 	"os"
 	"path/filepath"
 	"sync"
 	"time"
 
 	"atomicgo.dev/keyboard/keys"
+	"github.com/mattn/go-tty"
 	"github.com/pterm/pterm"
 	"github.com/pterm/pterm/putils"
 	"github.com/spf13/cobra"
@@ -254,7 +256,7 @@ func getPodLogs(pods v1.PodList, logOpts v1.PodLogOptions) {
 		}
 	}
 	if *follow {
-		pterm.Info.Printfln("Press %s to stop streaming logs.", pterm.Green("Ctrl+C"))
+		pterm.Info.Printfln("Press %s to stop streaming logs.", pterm.Green("q"))
 	}
 
 	// wait for all goroutines to finish
@@ -410,7 +412,29 @@ It is designed to be fast and efficient, and can get logs from multiple Pods/Con
 
 // Execute is the entry point for the command
 func Execute() {
+	tty, errTty := tty.Open()
+	if errTty != nil {
+		log.Fatal(errTty)
+	}
+
+	go func() {
+		defer tty.Close()
+		for {
+			r, err := tty.ReadRune()
+			if err != nil {
+				log.Fatal(err)
+			}
+
+			// if pressed q or Q
+			if r == 113 || r == 81 {
+				pterm.Info.Printfln("Exiting...")
+				os.Exit(0)
+			}
+		}
+	}()
+
 	err := rootCmd.Execute()
+
 	if err != nil {
 		os.Exit(1)
 	}

diff --git a/go.mod b/go.mod
@@ -4,6 +4,7 @@ go 1.22.5
 
 require (
 	atomicgo.dev/keyboard v0.2.9
+	github.com/mattn/go-tty v0.0.7
 	github.com/pterm/pterm v0.12.79
 	github.com/spf13/cobra v1.8.1
 	github.com/stretchr/testify v1.9.0
@@ -34,7 +35,8 @@ require (
 	github.com/json-iterator/go v1.1.12 // indirect
 	github.com/lithammer/fuzzysearch v1.1.8 // indirect
 	github.com/mailru/easyjson v0.7.7 // indirect
-	github.com/mattn/go-runewidth v0.0.15 // indirect
+	github.com/mattn/go-isatty v0.0.20 // indirect
+	github.com/mattn/go-runewidth v0.0.16 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
 	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect

diff --git a/go.sum b/go.sum
@@ -83,9 +83,13 @@ github.com/lithammer/fuzzysearch v1.1.8 h1:/HIuJnjHuXS8bKaiTMeeDlW2/AyIWk2brx1V8
 github.com/lithammer/fuzzysearch v1.1.8/go.mod h1:IdqeyBClc3FFqSzYq/MXESsS4S0FsZ5ajtkr5xPLts4=
 github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0=
 github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc=
+github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
+github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
 github.com/mattn/go-runewidth v0.0.13/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=
-github.com/mattn/go-runewidth v0.0.15 h1:UNAjwbU9l54TA3KzvqLGxwWjHmMgBUVhBiTjelZgg3U=
-github.com/mattn/go-runewidth v0.0.15/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=
+github.com/mattn/go-runewidth v0.0.16 h1:E5ScNMtiwvlvB5paMFdw9p4kSQzbXFikJ5SQO6TULQc=
+github.com/mattn/go-runewidth v0.0.16/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=
+github.com/mattn/go-tty v0.0.7 h1:KJ486B6qI8+wBO7kQxYgmmEFDaFEE96JMBQ7h400N8Q=
+github.com/mattn/go-tty v0.0.7/go.mod h1:f2i5ZOvXBU/tCABmLmOfzLz9azMo5wdAaElRNnJKr+k=
 github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
 github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg=
 github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=