total match count in title

This commit is contained in:
UmairShahzad 2020-02-20 01:54:51 +05:00
parent 94ef4bb377
commit bb0fe46db6
7 changed files with 78 additions and 63 deletions

View file

@ -16,7 +16,6 @@ import (
"github.com/cli/cli/pkg/githubtemplate"
"github.com/cli/cli/utils"
"github.com/spf13/cobra"
"github.com/spf13/pflag"
)
func init() {
@ -108,31 +107,15 @@ func issueList(cmd *cobra.Command, args []string) error {
return err
}
issues, err := api.IssueList(apiClient, *baseRepo, state, labels, assignee, limit)
issuesData, err := api.IssueList(apiClient, *baseRepo, state, labels, assignee, limit)
if err != nil {
return err
}
issues := issuesData.Issues
issueCount := issuesData.TotalCount
title := func (msg string) string {
return fmt.Sprintf("\n%s in %s\n\n", msg, ghrepo.FullName(*baseRepo))
}
if len(issues) == 0 {
colorErr := colorableErr(cmd) // Send to stderr because otherwise when piping this command it would seem like the "no open issues" message is actually an issue
msg := "There are no open issues"
userSetFlags := false
cmd.Flags().Visit(func(f *pflag.Flag) {
userSetFlags = true
})
if userSetFlags {
msg = "No issues match your search"
}
fmt.Fprintf(colorErr, title(msg))
return nil
}
fmt.Fprintf(colorableErr(cmd), title(utils.Pluralize(len(issues), "issue")))
title := utils.GetTitle(cmd, "issue", limit, issueCount, baseRepo)
fmt.Fprintf(colorableErr(cmd), title)
out := cmd.OutOrStdout()
table := utils.NewTablePrinter(out)

View file

@ -13,7 +13,6 @@ import (
"github.com/cli/cli/internal/ghrepo"
"github.com/cli/cli/utils"
"github.com/spf13/cobra"
"github.com/spf13/pflag"
)
func init() {
@ -135,7 +134,6 @@ func prList(cmd *cobra.Command, args []string) error {
return err
}
limit, err := cmd.Flags().GetInt("limit")
if err != nil {
return err
@ -186,32 +184,17 @@ func prList(cmd *cobra.Command, args []string) error {
params["assignee"] = assignee
}
prs, err := api.PullRequestList(apiClient, params, limit)
prsData, err := api.PullRequestList(apiClient, params, limit)
if err != nil {
return err
}
title := func (msg string) string {
return fmt.Sprintf("\n%s in %s\n\n", msg, ghrepo.FullName(*baseRepo))
}
prs := prsData.PullRequests
prCount := prsData.TotalCount
if len(prs) == 0 {
colorErr := colorableErr(cmd) // Send to stderr because otherwise when piping this command it would seem like the "no open prs" message is acually a pr
msg := "There are no open pull requests"
title := utils.GetTitle(cmd, "pull request", limit, prCount, baseRepo)
fmt.Fprintf(colorableErr(cmd), title)
userSetFlags := false
cmd.Flags().Visit(func(f *pflag.Flag) {
userSetFlags = true
})
if userSetFlags {
msg = "No pull requests match your search"
}
fmt.Fprintf(colorErr, title(msg))
return nil
}
fmt.Fprintf(colorableErr(cmd), title(utils.Pluralize(len(prs), "pull request")))
table := utils.NewTablePrinter(cmd.OutOrStdout())
for _, pr := range prs {
prNum := strconv.Itoa(pr.Number)