Skip to content

Commit c943f65

Browse files
moving flag.Parse() after help flag check
1 parent b66ce30 commit c943f65

File tree

10 files changed

+20
-29
lines changed

10 files changed

+20
-29
lines changed

cmd/ability/ability.go

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,13 +33,12 @@ func AbilityCommand() (string, error) {
3333

3434
args := os.Args
3535

36-
flag.Parse()
37-
38-
// Handle help flag
3936
if utils.CheckHelpFlag(&output, flag.Usage) {
4037
return output.String(), nil
4138
}
4239

40+
flag.Parse()
41+
4342
if err := utils.ValidateAbilityArgs(args); err != nil {
4443
output.WriteString(err.Error())
4544
return output.String(), err

cmd/berry/berry.go

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,12 @@ func BerryCommand() (string, error) {
3030
output.WriteString(helpMessage)
3131
}
3232

33-
flag.Parse()
34-
35-
// Handle help flag
3633
if utils.CheckHelpFlag(&output, flag.Usage) {
3734
return output.String(), nil
3835
}
3936

37+
flag.Parse()
38+
4039
// Validate arguments
4140
if err := utils.ValidateBerryArgs(os.Args); err != nil {
4241
output.WriteString(err.Error())

cmd/card/card.go

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,12 @@ func CardCommand() (string, error) {
2626
output.WriteString(helpMessage)
2727
}
2828

29-
flag.Parse()
30-
31-
// Handle help flag
3229
if utils.CheckHelpFlag(&output, flag.Usage) {
3330
return output.String(), nil
3431
}
3532

33+
flag.Parse()
34+
3635
// Validate arguments
3736
if err := utils.ValidateCardArgs(os.Args); err != nil {
3837
output.WriteString(err.Error())

cmd/item/item.go

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,13 +31,12 @@ func ItemCommand() (string, error) {
3131

3232
args := os.Args
3333

34-
flag.Parse()
35-
36-
// Handle help flag
3734
if utils.CheckHelpFlag(&output, flag.Usage) {
3835
return output.String(), nil
3936
}
4037

38+
flag.Parse()
39+
4140
if err := utils.ValidateItemArgs(os.Args); err != nil {
4241
output.WriteString(err.Error())
4342
return output.String(), err

cmd/move/move.go

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,13 +32,12 @@ func MoveCommand() (string, error) {
3232
output.WriteString(helpMessage)
3333
}
3434

35-
flag.Parse()
36-
37-
// Handle help flag
3835
if utils.CheckHelpFlag(&output, flag.Usage) {
3936
return output.String(), nil
4037
}
4138

39+
flag.Parse()
40+
4241
if err := utils.ValidateMoveArgs(os.Args); err != nil {
4342
output.WriteString(err.Error())
4443
return output.String(), err

cmd/natures/natures.go

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,12 @@ func NaturesCommand() (string, error) {
2424
output.WriteString(helpMessage)
2525
}
2626

27-
flag.Parse()
28-
29-
// Handle help flag
3027
if utils.CheckHelpFlag(&output, flag.Usage) {
3128
return output.String(), nil
3229
}
3330

31+
flag.Parse()
32+
3433
if err := utils.ValidateNaturesArgs(os.Args); err != nil {
3534
output.WriteString(err.Error())
3635
return output.String(), err

cmd/pokemon/pokemon.go

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,13 +49,12 @@ func PokemonCommand() (string, error) {
4949

5050
args := os.Args
5151

52-
flag.Parse()
53-
54-
// Handle help flag
5552
if utils.CheckHelpFlag(&output, flag.Usage) {
5653
return output.String(), nil
5754
}
5855

56+
flag.Parse()
57+
5958
err := utils.ValidatePokemonArgs(args)
6059
if err != nil {
6160
output.WriteString(err.Error()) // This is the styled error

cmd/search/search.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,13 @@ func SearchCommand() error {
2525
fmt.Println(helpMessage)
2626
}
2727

28-
flag.Parse()
29-
3028
if len(os.Args) == 3 && (os.Args[2] == "-h" || os.Args[2] == "--help") {
3129
flag.Usage()
3230
return nil
3331
}
3432

33+
flag.Parse()
34+
3535
if err := utils.ValidateSearchArgs(os.Args); err != nil {
3636
fmt.Println(err.Error())
3737
return err

cmd/speed/speed.go

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -105,13 +105,12 @@ func SpeedCommand() (string, error) {
105105
output.WriteString(helpMessage)
106106
}
107107

108-
flag.Parse()
109-
110-
// Handle help flag
111108
if utils.CheckHelpFlag(&output, flag.Usage) {
112109
return output.String(), nil
113110
}
114111

112+
flag.Parse()
113+
115114
// Validate arguments
116115
if err := utils.ValidateSpeedArgs(os.Args); err != nil {
117116
output.WriteString(err.Error())

cmd/types/types.go

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,12 @@ func TypesCommand() (string, error) {
2828
output.WriteString(helpMessage)
2929
}
3030

31-
flag.Parse()
32-
33-
// Handle help flag
3431
if utils.CheckHelpFlag(&output, flag.Usage) {
3532
return output.String(), nil
3633
}
3734

35+
flag.Parse()
36+
3837
// Validate arguments
3938
if err := utils.ValidateTypesArgs(os.Args); err != nil {
4039
output.WriteString(err.Error())

0 commit comments

Comments
 (0)