Detect if STDIN is terminal and print hint

Signed-off-by: eternal-flame-AD <[email protected]>
gotify · Aug 5, 2024 · 3b4f0d8 · 3b4f0d8
1 parent fca4b2c
commit 3b4f0d8
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 4 deletions.
diff --git a/command/read.go b/command/read.go
@@ -3,23 +3,37 @@ package command
 import (
  "bufio"
  "errors"
+ "fmt"
  "io"
+ "os"
+ "runtime"
  "strings"
 
  "github.com/gotify/cli/v2/utils"
+ "github.com/mattn/go-isatty"
 )
 
 func readMessage(args []string, r io.Reader, output chan<- string, splitOnNull bool) {
  defer close(output)
 
- switch {
- case len(args) > 0:
+ if len(args) > 0 {
  if utils.ProbeStdin(r) {
  utils.Exit1With("message is set via arguments and stdin, use only one of them")
  }
 
  output <- strings.Join(args, " ")
- case splitOnNull:
+ return
+ }
+
+ if isatty.IsTerminal(os.Stdin.Fd()) {
+ eofKey := "Ctrl+D"
+ if runtime.GOOS == "windows" {
+ eofKey = "Ctrl+Z"
+ }
+ fmt.Fprintf(os.Stderr, "Enter your message, press Enter and then %s to finish:\n", eofKey)
+ }
+
+ if splitOnNull {
  read := bufio.NewReader(r)
  for {
  s, err := read.ReadString('\x00')
@@ -37,7 +51,7 @@ func readMessage(args []string, r io.Reader, output chan<- string, splitOnNull b
  }
  }
  }
- default:
+ } else {
  bytes, err := io.ReadAll(r)
  if err != nil {
  utils.Exit1With("cannot read", err)

diff --git a/go.mod b/go.mod
@@ -27,6 +27,7 @@ require (
  github.com/google/uuid v1.6.0 // indirect
  github.com/josharian/intern v1.0.0 // indirect
  github.com/mailru/easyjson v0.7.7 // indirect
+ github.com/mattn/go-isatty v0.0.20 // indirect
  github.com/mitchellh/mapstructure v1.5.0 // indirect
  github.com/oklog/ulid v1.3.1 // indirect
  github.com/opentracing/opentracing-go v1.2.0 // indirect

diff --git a/go.sum b/go.sum
@@ -61,6 +61,8 @@ github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
 github.com/mailru/easyjson v0.0.0-20180823135443-60711f1a8329/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
 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/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
 github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY=
 github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
@@ -94,6 +96,7 @@ golang.org/x/net v0.0.0-20181005035420-146acd28ed58/go.mod h1:mL1N/T3taQHkDXs73r
 golang.org/x/sync v0.6.0 h1:5BMeUDZ7vkXGfEr1x9B4bRcTH4lpkTkpdh0T/J+qjbQ=
 golang.org/x/sync v0.6.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
 golang.org/x/sys v0.0.0-20211025201205-69cdffdb9359/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.21.0 h1:rF+pYz3DAGSQAxAu1CbC7catZg4ebC4UIeIhKxBZvws=
 golang.org/x/sys v0.21.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/term v0.21.0 h1:WVXCp+/EBEHOj53Rvu+7KiT/iElMrO8ACK16SMZ3jaA=