From a0ae93a2b21f58c2ab335d560b8cecdb53fa1b8b Mon Sep 17 00:00:00 2001 From: filifa Date: Sun, 14 Jul 2024 19:12:55 -0500 Subject: [PATCH] move teamids map to cmd --- cmd/internal/statsapi/{common.go => teams.go} | 66 ++++++++++--------- cmd/root.go | 36 +++++++++- cmd/teamflag.go | 4 +- 3 files changed, 69 insertions(+), 37 deletions(-) rename cmd/internal/statsapi/{common.go => teams.go} (53%) diff --git a/cmd/internal/statsapi/common.go b/cmd/internal/statsapi/teams.go similarity index 53% rename from cmd/internal/statsapi/common.go rename to cmd/internal/statsapi/teams.go index 0b7bffd..26bbee3 100644 --- a/cmd/internal/statsapi/common.go +++ b/cmd/internal/statsapi/teams.go @@ -15,35 +15,37 @@ this program. If not, see . */ package statsapi -var TeamIds = map[string]int{ - "laa": 108, - "az": 109, - "bal": 110, - "bos": 111, - "chc": 112, - "cin": 113, - "cle": 114, - "col": 115, - "det": 116, - "hou": 117, - "kc": 118, - "lad": 119, - "wsh": 120, - "nym": 121, - "oak": 133, - "pit": 134, - "sd": 135, - "sea": 136, - "sf": 137, - "stl": 138, - "tb": 139, - "tex": 140, - "tor": 141, - "min": 142, - "phi": 143, - "atl": 144, - "cws": 145, - "mia": 146, - "nyy": 147, - "mil": 158, -} +type TeamID int + +const ( + LAA TeamID = 108 + AZ TeamID = 109 + BAL TeamID = 110 + BOS TeamID = 111 + CHC TeamID = 112 + CIN TeamID = 113 + CLE TeamID = 114 + COL TeamID = 115 + DET TeamID = 116 + HOU TeamID = 117 + KC TeamID = 118 + LAD TeamID = 119 + WSH TeamID = 120 + NYM TeamID = 121 + OAK TeamID = 133 + PIT TeamID = 134 + SD TeamID = 135 + SEA TeamID = 136 + SF TeamID = 137 + STL TeamID = 138 + TB TeamID = 139 + TEX TeamID = 140 + TOR TeamID = 141 + MIN TeamID = 142 + PHI TeamID = 143 + ATL TeamID = 144 + CWS TeamID = 145 + MIA TeamID = 146 + NYY TeamID = 147 + MIL TeamID = 158 +) diff --git a/cmd/root.go b/cmd/root.go index a441e3c..eb87d67 100644 --- a/cmd/root.go +++ b/cmd/root.go @@ -29,18 +29,50 @@ import ( ) var Team TeamFlag +var teamIDs = map[string]statsapi.TeamID{ + "laa": statsapi.LAA, + "az": statsapi.AZ, + "bal": statsapi.BAL, + "bos": statsapi.BOS, + "chc": statsapi.CHC, + "cin": statsapi.CIN, + "cle": statsapi.CLE, + "col": statsapi.COL, + "det": statsapi.DET, + "hou": statsapi.HOU, + "kc": statsapi.KC, + "lad": statsapi.LAD, + "wsh": statsapi.WSH, + "nym": statsapi.NYM, + "oak": statsapi.OAK, + "pit": statsapi.PIT, + "sd": statsapi.SD, + "sea": statsapi.SEA, + "sf": statsapi.SF, + "stl": statsapi.STL, + "tb": statsapi.TB, + "tex": statsapi.TEX, + "tor": statsapi.TOR, + "min": statsapi.MIN, + "phi": statsapi.PHI, + "atl": statsapi.ATL, + "cws": statsapi.CWS, + "mia": statsapi.MIA, + "nyy": statsapi.NYY, + "mil": statsapi.MIL, +} func getGamePk() (string, error) { if Team == "" { return "", errors.New("need team ID") } - id, ok := statsapi.TeamIds[string(Team)] + id, ok := teamIDs[string(Team)] if !ok { return "", errors.New("invalid team ID") } - sched, err := statsapi.RequestSchedule("1", strconv.Itoa(id)) + sched, err := statsapi.RequestSchedule("1", strconv.Itoa(int(id))) if err != nil { return "", err } diff --git a/cmd/teamflag.go b/cmd/teamflag.go index 60d5432..e581c6a 100644 --- a/cmd/teamflag.go +++ b/cmd/teamflag.go @@ -2,8 +2,6 @@ package cmd import ( "errors" - - "scm.dairydemon.net/filifa/mlblive/cmd/internal/statsapi" ) type TeamFlag string @@ -14,7 +12,7 @@ func (t *TeamFlag) String() string { func (t *TeamFlag) Set(v string) error { var err error - _, ok := statsapi.TeamIds[v] + _, ok := teamIDs[v] if !ok { err = errors.New("invalid team ID") } else {