Refactor some code for scraping thebluealliance.com in the background
I want to make it so that the match list is imported automatically.
Right now we have to manually refresh the match list as elimination
matches happen.
This patch refactors the ranking scraping code so that we can add a
match list scraper easily in a future patch.
I made a few things generic so that it'll be easier to reuse the code
for more things later.
Signed-off-by: Philipp Schrader <philipp.schrader@gmail.com>
Change-Id: Ia8164b62deceddeda683ac3080e99e0fe1b5904a
diff --git a/scouting/scraping/scrape.go b/scouting/scraping/scrape.go
index 625157a..b905465 100644
--- a/scouting/scraping/scrape.go
+++ b/scouting/scraping/scrape.go
@@ -89,36 +89,17 @@
return bodyBytes, nil
}
-// Return all matches in event according to TBA
-func AllMatches(year int32, eventCode, configPath string) ([]Match, error) {
- bodyBytes, err := getJson(year, eventCode, configPath, "matches")
-
+func GetAllData[T interface{}](year int32, eventCode, configPath string, category string) (T, error) {
+ var result T
+ bodyBytes, err := getJson(year, eventCode, configPath, category)
if err != nil {
- return nil, err
+ return result, err
}
- var matches []Match
- // Unmarshal json into go usable format.
- if err := json.Unmarshal([]byte(bodyBytes), &matches); err != nil {
- return nil, errors.New(fmt.Sprint("Failed to parse JSON received from TBA: ", err))
+ // Unmarshal the JSON data into the in-memory format.
+ if err = json.Unmarshal([]byte(bodyBytes), &result); err != nil {
+ return result, errors.New(fmt.Sprint("Failed to parse ", category, " JSON received from TBA: ", err))
}
- return matches, nil
-}
-
-// Return event rankings according to TBA
-func AllRankings(year int32, eventCode, configPath string) (EventRanking, error) {
- bodyBytes, err := getJson(year, eventCode, configPath, "rankings")
-
- if err != nil {
- return EventRanking{}, err
- }
-
- var rankings EventRanking
- // Unmarshal json into go usable format.
- if err := json.Unmarshal([]byte(bodyBytes), &rankings); err != nil {
- return EventRanking{}, errors.New(fmt.Sprint("Failed to parse JSON received from TBA: ", err))
- }
-
- return rankings, nil
+ return result, nil
}