fixing flag parsing error handling (#266)

Author: digitalghost-dev

cli.go

@@ -159,14 +159,11 @@ func runCLI(args []string) int {
 	case exists:
 		return cmdFunc()
 	default:
-		errMessage := styling.ErrorBorder.Render(
-			styling.ErrorColor.Render("✖ Error!"),
-			fmt.Sprintf("\n\t%-15s", fmt.Sprintf("'%s' is not a valid command.\n", cmdArg)),
-			styling.StyleBold.Render("\nCommands:"),
-			renderCommandList(),
-			fmt.Sprintf("\n\nAlso run %s for more info!", styling.StyleBold.Render("poke-cli -h")),
-		)
-		output.WriteString(errMessage)
+		msg := fmt.Sprintf("\t%-15s", fmt.Sprintf("'%s' is not a valid command.\n", cmdArg)) +
+			styling.StyleBold.Render("\nCommands:") +
+			renderCommandList() +
+			fmt.Sprintf("\n\nAlso run %s for more info!", styling.StyleBold.Render("poke-cli -h"))
+		output.WriteString(utils.FormatError(msg))
 
 		fmt.Println(output.String())
 

cmd/ability/ability.go

@@ -1,6 +1,7 @@
 package ability
 
 import (
+	"errors"
 	"flag"
 	"fmt"
 	"os"
@@ -48,9 +49,10 @@ func AbilityCommand() (string, error) {
 	abilityName := strings.ToLower(args[2])
 
 	if err := af.FlagSet.Parse(args[3:]); err != nil {
+		if errors.Is(err, flag.ErrHelp) {
+			return output.String(), nil
+		}
 		fmt.Fprintf(&output, "error parsing flags: %v\n", err)
-		af.FlagSet.Usage()
-
 		return output.String(), err
 	}
 

cmd/pokemon/pokemon.go

@@ -2,6 +2,7 @@ package pokemon
 
 import (
 	"bytes"
+	"errors"
 	"flag"
 	"fmt"
 	"io"
@@ -61,8 +62,10 @@ func PokemonCommand() (string, error) {
 	pokemonName := strings.ToLower(args[2])
 
 	if err := pf.FlagSet.Parse(args[3:]); err != nil {
-		fmt.Printf("error parsing flags: %v\n", err)
-		pf.FlagSet.Usage()
+		if errors.Is(err, flag.ErrHelp) {
+			return output.String(), nil
+		}
+		fmt.Fprintf(&output, "error parsing flags: %v\n", err)
 		return output.String(), err
 	}
 

cmd/tcg/tcg.go

@@ -1,6 +1,7 @@
 package tcg
 
 import (
+	"errors"
 	"flag"
 	"fmt"
 	"os"
@@ -33,15 +34,16 @@ func TcgCommand() (string, error) {
 		return output.String(), nil
 	}
 
-	flag.Parse()
-
 	if err := utils.ValidateArgs(os.Args, utils.Validator{MaxArgs: 3, CmdName: "tcg", RequireName: false, HasFlags: true}); err != nil {
 		output.WriteString(err.Error())
 		return output.String(), err
 	}
 
 	tf := flags.SetupTcgFlagSet()
 	if err := tf.FlagSet.Parse(os.Args[2:]); err != nil {
+		if errors.Is(err, flag.ErrHelp) {
+			return output.String(), nil
+		}
 		fmt.Fprintf(&output, "error parsing flags: %v\n", err)
 		return output.String(), err
 	}

flags/abilityflagset.go

@@ -20,7 +20,7 @@ type AbilityFlags struct {
 
 func SetupAbilityFlagSet() *AbilityFlags {
 	af := &AbilityFlags{}
-	af.FlagSet = flag.NewFlagSet("abilityFlags", flag.ExitOnError)
+	af.FlagSet = flag.NewFlagSet("abilityFlags", flag.ContinueOnError)
 
 	af.Pokemon = af.FlagSet.Bool("pokemon", false, "List all Pokémon with chosen ability")
 	af.ShortPokemon = af.FlagSet.Bool("p", false, "List all Pokémon with chosen ability")

flags/pokemonflagset.go

@@ -59,7 +59,7 @@ func header(header string) string {
 
 func SetupPokemonFlagSet() *PokemonFlags {
 	pf := &PokemonFlags{}
-	pf.FlagSet = flag.NewFlagSet("pokeFlags", flag.ExitOnError)
+	pf.FlagSet = flag.NewFlagSet("pokeFlags", flag.ContinueOnError)
 
 	pf.Abilities = pf.FlagSet.Bool("abilities", false, "Print the Pokémon's abilities")
 	pf.ShortAbilities = pf.FlagSet.Bool("a", false, "Print the Pokémon's abilities")