Git/gitea-tea
1
0
Fork 0
mirror of https://gitea.com/gitea/tea.git synced 2024-11-22 02:21:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

tea comment: handle piped stdin (#322)

Browse Source 
fixes #321

Co-authored-by: Norwin Roosen <git@nroo.de>
Reviewed-on: https://gitea.com/gitea/tea/pulls/322
Reviewed-by: 6543 <6543@obermui.de>
Reviewed-by: Andrew Thornton <art27@cantab.net>
Co-authored-by: Norwin <noerw@noreply.gitea.io>
Co-committed-by: Norwin <noerw@noreply.gitea.io>
This commit is contained in:
Norwin 2021-03-01 01:47:36 +08:00 committed by Andrew Thornton
parent b5c670ebf8
commit 9c8321f2e0
2 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
cmd/comment.go
View File

@ -6,6 +6,7 @@ package cmd
import ( import (
"fmt" "fmt"
"io/ioutil"
"strings" "strings"
"code.gitea.io/tea/modules/interact" "code.gitea.io/tea/modules/interact"
@ -45,12 +46,23 @@ func runAddComment(cmd *cli.Context) error {
} }
body := strings.Join(ctx.Args().Tail(), " ") body := strings.Join(ctx.Args().Tail(), " ")
if len(body) == 0 { if interact.IsStdinPiped() {
// custom solution until https://github.com/AlecAivazis/survey/issues/328 is fixed
if bodyStdin, err := ioutil.ReadAll(ctx.App.Reader); err != nil {
return err
} else if len(bodyStdin) != 0 {
body = strings.Join([]string{body, string(bodyStdin)}, "\n\n")
}
} else if len(body) == 0 {
if body, err = interact.PromptMultiline("Content"); err != nil { if body, err = interact.PromptMultiline("Content"); err != nil {
return err return err
} }
} }
if len(body) == 0 {
return fmt.Errorf("No comment body provided")
}
client := ctx.Login.Client() client := ctx.Login.Client()
comment, _, err := client.CreateIssueComment(ctx.Owner, ctx.Repo, idx, gitea.CreateIssueCommentOption{ comment, _, err := client.CreateIssueComment(ctx.Owner, ctx.Repo, idx, gitea.CreateIssueCommentOption{
Body: body, Body: body,

9
modules/interact/comments.go
View File

@ -26,7 +26,7 @@ func ShowCommentsMaybeInteractive(ctx *context.TeaContext, idx int64, totalComme
return err return err
} }
print.Comments(comments) print.Comments(comments)
} else if isInteractive() && !ctx.IsSet("comments") { } else if IsInteractive() && !ctx.IsSet("comments") {
// if we're interactive, but --comments hasn't been explicitly set to false // if we're interactive, but --comments hasn't been explicitly set to false
if err := ShowCommentsPaginated(ctx, idx, totalComments); err != nil { if err := ShowCommentsPaginated(ctx, idx, totalComments); err != nil {
fmt.Printf("error while loading comments: %v\n", err) fmt.Printf("error while loading comments: %v\n", err)
@ -70,6 +70,11 @@ func ShowCommentsPaginated(ctx *context.TeaContext, idx int64, totalComments int
} }
// IsInteractive checks if the output is piped, but NOT if the session is run interactively.. // IsInteractive checks if the output is piped, but NOT if the session is run interactively..
func isInteractive() bool { func IsInteractive() bool {
return terminal.IsTerminal(int(os.Stdout.Fd())) return terminal.IsTerminal(int(os.Stdout.Fd()))
} }
// IsStdinPiped checks if stdin is piped
func IsStdinPiped() bool {
return !terminal.IsTerminal(int(os.Stdin.Fd()))
}