dearsky/ntfy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Small cosmetic fixes

Browse Source
This commit is contained in:
srevn
2025-07-06 16:31:03 +03:00
parent 04aff72631
commit 9ed96e5d8b
1 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
cmd/publish.go
View File

@@ -255,16 +255,14 @@ func parseTopicMessageCommand(c *cli.Context) (topic string, message string, com
if c.String("message") != "" { if c.String("message") != "" {
message = c.String("message") message = c.String("message")
} }
if message == "" && isStdinRedirected() {
// If no message provided and stdin has data, read from stdin var bytes []byte
if message == "" && stdinHasData() { bytes, err = io.ReadAll(c.App.Reader)
var stdinBytes []byte
stdinBytes, err = io.ReadAll(c.App.Reader)
if err != nil { if err != nil {
log.Debug("Failed to read from stdin: %v", err) log.Debug("Failed to read from stdin: %s", err.Error())
return return
} }
message = strings.TrimSpace(string(stdinBytes)) message = strings.TrimSpace(string(bytes))
} }
return return
} }
@@ -325,10 +323,10 @@ func runAndWaitForCommand(command []string) (message string, err error) {
return fmt.Sprintf("Command succeeded after %s: %s", runtime, prettyCmd), nil return fmt.Sprintf("Command succeeded after %s: %s", runtime, prettyCmd), nil
} }
func stdinHasData() bool { func isStdinRedirected() bool {
stat, err := os.Stdin.Stat() stat, err := os.Stdin.Stat()
if err != nil { if err != nil {
log.Debug("Failed to stat stdin: %v", err) log.Debug("Failed to stat stdin: %s", err.Error())
return false return false
} }
return (stat.Mode() & os.ModeCharDevice) == 0 return (stat.Mode() & os.ModeCharDevice) == 0