From ba5b373fa069f2ea0951f8988109b762c185d72c Mon Sep 17 00:00:00 2001 From: Felipe Martin Date: Thu, 19 Nov 2020 20:27:37 +0100 Subject: [PATCH] Helper method for HTTP requests --- pkg/helpers/http.go | 20 ++++++++++++++++++++ pkg/providers/steam/steam.go | 19 ++++--------------- 2 files changed, 24 insertions(+), 15 deletions(-) create mode 100644 pkg/helpers/http.go diff --git a/pkg/helpers/http.go b/pkg/helpers/http.go new file mode 100644 index 0000000..720f3aa --- /dev/null +++ b/pkg/helpers/http.go @@ -0,0 +1,20 @@ +package helpers + +import ( + "net/http" + "net/url" +) + +func DoRequest(method string, requestURL string) (*http.Response, error) { + parsedURL, _ := url.Parse(requestURL) + request := http.Request{ + Method: method, + URL: parsedURL, + Header: map[string][]string{ + "User-Agent": {"github.com/fmartingr/games-screenshot-manager"}, + }, + ProtoMajor: 2, + ProtoMinor: 1, + } + return http.DefaultClient.Do(&request) +} diff --git a/pkg/providers/steam/steam.go b/pkg/providers/steam/steam.go index eba4f7c..e8f6d03 100644 --- a/pkg/providers/steam/steam.go +++ b/pkg/providers/steam/steam.go @@ -5,8 +5,6 @@ import ( "errors" "io/ioutil" "log" - "net/http" - "net/url" "os" "path/filepath" "runtime" @@ -18,6 +16,7 @@ import ( ) const providerName string = "steam" +const gameListURL string = "https://api.steampowered.com/ISteamApps/GetAppList/v2/" type SteamApp struct { AppID uint64 `json:"appid"` @@ -57,19 +56,9 @@ func getBasePathForOS() string { return path } -func GetSteamAppsList(c chan SteamAppList) { +func getSteamAppList(c chan SteamAppList) { log.Println("Updating steam game list...") - steamGetAppListURL, _ := url.Parse("https://api.steampowered.com/ISteamApps/GetAppList/v2/") - request := http.Request{ - Method: "GET", - URL: steamGetAppListURL, - Header: map[string][]string{ - "User-Agent": {"games-screenshot-manager/0.0.1"}, - }, - ProtoMajor: 2, - ProtoMinor: 1, - } - response, err := http.DefaultClient.Do(&request) + response, err := helpers.DoRequest("GET", gameListURL) if err != nil { panic(err) } @@ -160,7 +149,7 @@ func GetScreenshotsForGame(user string, game *games.Game) { func GetGames() []games.Game { var localGames []games.Game c := make(chan SteamAppList) - go GetSteamAppsList(c) + go getSteamAppList(c) users := GuessUsers() steamApps := <-c for _, userID := range users {