(.*).*") - teamsCsv := re.FindStringSubmatch(string(body))[1] - - // Parse the tab-separated data. - reader := csv.NewReader(strings.NewReader(teamsCsv)) - reader.Comma = '\t' - reader.FieldsPerRecord = -1 - officialTeamInfo = make(map[int][]string) - reader.Read() // Ignore header line. - for { - fields, err := reader.Read() - if err == io.EOF { - break - } else if err != nil { - return nil, err - } - teamNumber, err := strconv.Atoi(fields[1]) - if err != nil { - return nil, err - } - officialTeamInfo[teamNumber] = fields - } - } - - teamData, ok := officialTeamInfo[teamId] + // Create the team variable that stores the result var team Team - if ok { - rookieYear, _ := strconv.Atoi(teamData[8]) - team = Team{Id: teamId, Name: html.UnescapeString(teamData[2]), Nickname: html.UnescapeString(teamData[7]), - City: html.UnescapeString(teamData[4]), StateProv: html.UnescapeString(teamData[5]), - Country: html.UnescapeString(teamData[6]), RookieYear: rookieYear, - RobotName: html.UnescapeString(teamData[9])} + + // If team info download is enabled, download the current teams data (caching isn't easy with the new paging system in the api) + if eventSettings.TBADownloadEnabled { + var tbaTeam *TbaTeam = getTeamFromTba(teamId) + + // Check if the result is valid. If a team is not found, just return a basic team + if tbaTeam == nil { + team = Team{Id: teamId} + return &team, nil + } + + var recentAwards []TbaAward + if eventSettings.TBAAwardsDownloadEnabled { + recentAwards = getTeamAwardsFromTba(teamId) + } + + var accomplishmentsBuffer bytes.Buffer + + // Generate accomplishments string + for _, award := range recentAwards { + if time.Now().Year()-award.Year <= 2 { + accomplishmentsBuffer.WriteString(fmt.Sprint(award.Year, " - ", award.Name, "\n")) + } + } + + // Use those variables to make a team object + team = Team{Id: teamId, Name: tbaTeam.Name, Nickname: tbaTeam.Nickname, + City: tbaTeam.Locality, StateProv: tbaTeam.Reigon, + Country: tbaTeam.Country, RookieYear: tbaTeam.RookieYear, Accomplishments: accomplishmentsBuffer.String()} } else { - // If no team data exists, just fill in the team number. + // If team grab is disabled, just use the team number team = Team{Id: teamId} } + + // Return the team object return &team, nil } diff --git a/tba.go b/tba.go index dbacc86..380bc6d 100644 --- a/tba.go +++ b/tba.go @@ -17,6 +17,8 @@ import ( var tbaBaseUrl = "http://www.thebluealliance.com" +// MODELS + type TbaMatch struct { CompLevel string `json:"comp_level"` MatchNumber int `json:"match_number"` @@ -48,6 +50,63 @@ type TbaRanking struct { Played int `json:"played"` } +type TbaTeam struct { + Website string `json:"website"` + Name string `json:"name"` + Locality string `json:"locality"` + RookieYear int `json:"rookie_year"` + Reigon string `json:"region"` + TeamNumber int `json:"team_number"` + Location string `json:"location"` + Key string `json:"key"` + Country string `json:"country_name"` + Nickname string `json:"nickname"` +} + +type TbaAward struct { + Name string `json:"name"` + EventKey string `json:"event_key"` + Year int `json:"year"` + AwardType int `json:"award_type"` +} + +// DATA RETRIEVAL +func getTeamFromTba(teamNumber int) *TbaTeam { + url := fmt.Sprint("/api/v2/team/", string(getTbaTeam(teamNumber))) + resp, _ := getTbaRequest(url) + + // Get the response and handle errors + defer resp.Body.Close() + body, err := ioutil.ReadAll(resp.Body) + if err != nil { + return nil + } + + var teamData TbaTeam + json.Unmarshal(body, &teamData) + + return &teamData +} + +func getTeamAwardsFromTba(teamNumber int) []TbaAward { + url := fmt.Sprint("/api/v2/team/", string(getTbaTeam(teamNumber)), "/history/awards") + resp, _ := getTbaRequest(url) + + // Get the response and handle errors + defer resp.Body.Close() + body, err := ioutil.ReadAll(resp.Body) + if err != nil { + return nil + } + + var awardData []TbaAward + json.Unmarshal(body, &awardData) + + return awardData +} + +// PUBLISHING + // Uploads the event team list to The Blue Alliance. func PublishTeams() error { teams, err := db.GetAllTeams() @@ -153,7 +212,7 @@ func PublishRankings() error { } // Build a JSON object of TBA-format rankings. - breakdowns := []string{"QA", "Coopertition", "Auto", "Container", "Tote", "Litter"} + breakdowns := []string{"QS", "Assist", "Auto", "T&C", "G&F", "wins", "losses", "ties"} tbaRankings := make([]TbaRanking, len(rankings)) for i, ranking := range rankings { tbaRankings[i] = TbaRanking{getTbaTeam(ranking.TeamId), ranking.Rank, ranking.QualificationAverage, @@ -213,6 +272,8 @@ func getTbaTeam(team int) string { return fmt.Sprintf("frc%d", team) } +// HELPERS + // Signs the request and sends it to the TBA API. func postTbaRequest(resource string, body []byte) (*http.Response, error) { path := fmt.Sprintf("/api/trusted/v1/event/%s/%s/update", eventSettings.TbaEventCode, resource) @@ -227,3 +288,15 @@ func postTbaRequest(resource string, body []byte) (*http.Response, error) { request.Header.Add("X-TBA-Auth-Sig", signature) return client.Do(request) } + +// Sends a GET request to the TBA API +func getTbaRequest(path string) (*http.Response, error) { + // Make an HTTP GET request with the TBA auth headers + client := &http.Client{} + req, err := http.NewRequest("GET", fmt.Sprint(tbaBaseUrl, path), nil) + if err != nil { + return nil, err + } + req.Header.Set("X-TBA-App-Id", "cheesy-arena:cheesy-fms:v0.1") + return client.Do(req) +} diff --git a/templates/base.html b/templates/base.html index be4eb75..752f70e 100644 --- a/templates/base.html +++ b/templates/base.html @@ -17,14 +17,22 @@ +