filifa
/
mlblive
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

factor flag error handling into function

This commit is contained in:
filifa 2024-07-28 23:10:50 -05:00
parent 68b3268054
commit b856ae50fb
3 changed files with 13 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cmd/leagueflag.go
View File

@ -16,8 +16,6 @@ this program. If not, see <http://www.gnu.org/licenses/>.
package cmd
import (
"errors"
"sort"
"strings"
"scm.dairydemon.net/filifa/mlblive/cmd/internal/statsapi"
@ -56,10 +54,8 @@ func (t *leagueFlag) Set(v string) error {
_, ok := leagueIDs[v]
if !ok {
allowed := allowedFlags(leagueIDs)
sort.Strings(allowed)
allowedList := strings.Join(allowed, ", ")
err = errors.New("league must be one of " + allowedList)
allowed := keys(leagueIDs)
err = flagValueError("league", allowed)
} else {
*t = leagueFlag(v)
}

8
cmd/sportflag.go
View File

@ -16,8 +16,6 @@ this program. If not, see <http://www.gnu.org/licenses/>.
package cmd
import (
"errors"
"sort"
"strings"
"scm.dairydemon.net/filifa/mlblive/cmd/internal/statsapi"
@ -61,10 +59,8 @@ func (t *sportFlag) Set(v string) error {
_, ok := sportIDs[v]
if !ok {
allowed := allowedFlags(sportIDs)
sort.Strings(allowed)
allowedList := strings.Join(allowed, ", ")
err = errors.New("sport must be one of " + allowedList)
allowed := keys(sportIDs)
err = flagValueError("sport", allowed)
} else {
*t = sportFlag(v)
}

14
cmd/teamflag.go
View File

@ -56,7 +56,7 @@ var teamIDs = map[string]statsapi.TeamID{
"mil": statsapi.MIL,
}
func allowedFlags[V any](m map[string]V) []string {
func keys[V any](m map[string]V) []string {
keys := make([]string, len(m))
i := 0
@ -68,6 +68,12 @@ func allowedFlags[V any](m map[string]V) []string {
return keys
}
func flagValueError(name string, allowed []string) error {
sort.Strings(allowed)
allowedList := strings.Join(allowed, ", ")
return errors.New(name + " must be one of " + allowedList)
}
type teamFlag string
func (t *teamFlag) String() string {
@ -85,10 +91,8 @@ func (t *teamFlag) Set(v string) error {
_, ok := teamIDs[v]
if !ok {
allowed := allowedFlags(teamIDs)
sort.Strings(allowed)
allowedList := strings.Join(allowed, ", ")
err = errors.New("team must be one of " + allowedList)
allowed := keys(teamIDs)
err = flagValueError("team", allowed)
} else {
*t = teamFlag(v)
}