KittyPatch/kitty
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Use pager even for usage + error

Browse Source
This commit is contained in:
Kovid Goyal 2022-08-15 13:58:16 +05:30
parent c04b002d4e
commit 2a7aa46b77
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 22 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
tools/cli/infrastructure.go
View File

@ -70,6 +70,7 @@ var title_fmt = color.New(color.FgBlue, color.Bold).SprintFunc()
var exe_fmt = color.New(color.FgYellow, color.Bold).SprintFunc() var exe_fmt = color.New(color.FgYellow, color.Bold).SprintFunc()
var opt_fmt = color.New(color.FgGreen).SprintFunc() var opt_fmt = color.New(color.FgGreen).SprintFunc()
var italic_fmt = color.New(color.Italic).SprintFunc() var italic_fmt = color.New(color.Italic).SprintFunc()
var err_fmt = color.New(color.FgHiRed).SprintFunc()
var bold_fmt = color.New(color.Bold).SprintFunc() var bold_fmt = color.New(color.Bold).SprintFunc()
var code_fmt = color.New(color.FgCyan).SprintFunc() var code_fmt = color.New(color.FgCyan).SprintFunc()
var cyan_fmt = color.New(color.FgCyan).SprintFunc() var cyan_fmt = color.New(color.FgCyan).SprintFunc()
@ -236,6 +237,15 @@ func format_with_indent(output io.Writer, text string, indent string, screen_wid
} }
} }
func full_command_name(cmd *cobra.Command) string {
var parent_names []string
cmd.VisitParents(func(p *cobra.Command) {
parent_names = append(parent_names, p.Name())
})
parent_names = append(parent_names, cmd.Name())
return strings.Join(parent_names, " ")
}
func show_usage(cmd *cobra.Command) error { func show_usage(cmd *cobra.Command) error {
ws, tty_size_err := GetTTYSize() ws, tty_size_err := GetTTYSize()
var output strings.Builder var output strings.Builder
@ -248,12 +258,7 @@ func show_usage(cmd *cobra.Command) error {
if idx > -1 { if idx > -1 {
use = use[idx+1:] use = use[idx+1:]
} }
var parent_names []string fmt.Fprintln(&output, title_fmt("Usage")+":", exe_fmt(full_command_name(cmd)), use)
cmd.VisitParents(func(p *cobra.Command) {
parent_names = append(parent_names, p.Name())
})
parent_names = append(parent_names, cmd.Name())
fmt.Fprintln(&output, title_fmt("Usage")+":", exe_fmt(strings.Join(parent_names, " ")), use)
fmt.Fprintln(&output) fmt.Fprintln(&output)
if len(cmd.Long) > 0 { if len(cmd.Long) > 0 {
format_with_indent(&output, cmd.Long, "", screen_width) format_with_indent(&output, cmd.Long, "", screen_width)
@ -311,7 +316,11 @@ func show_usage(cmd *cobra.Command) error {
fmt.Fprintln(&output) fmt.Fprintln(&output)
}) })
} }
if cmd.Annotations["usage-suffix"] != "" {
fmt.Fprintln(&output, cmd.Annotations["usage-suffix"])
} else {
fmt.Fprintln(&output, italic_fmt(RootCmd.Name()), opt_fmt(RootCmd.Version), "created by", title_fmt("Kovid Goyal")) fmt.Fprintln(&output, italic_fmt(RootCmd.Name()), opt_fmt(RootCmd.Version), "created by", title_fmt("Kovid Goyal"))
}
output_text := output.String() output_text := output.String()
if stdout_is_terminal && cmd.Annotations["allow-pager"] != "no" { if stdout_is_terminal && cmd.Annotations["allow-pager"] != "no" {
pager := exec.Command("less", "-iRXF"); pager := exec.Command("less", "-iRXF");
@ -333,10 +342,13 @@ func CreateCommand(cmd *cobra.Command) *cobra.Command {
return cmd return cmd
} }
func SubCommandRequired(cmd *cobra.Command, args []string) { func UsageAndError(cmd *cobra.Command, err string) {
cmd.Annotations["allow-pager"] = "no" cmd.Annotations["usage-suffix"] = err
cmd.Usage() cmd.Usage()
fmt.Fprintln(os.Stderr, color.RedString("\nNo command specified for "+cmd.Name())) }
func SubCommandRequired(cmd *cobra.Command, args []string) {
UsageAndError(cmd, "No command specified: " + exe_fmt(full_command_name(cmd)) + err_fmt(" add-a-command-here"))
os.Exit(1) os.Exit(1)
} }