fix: missing protocol scheme in VersionDataloader
This commit is contained in:
parent
5030d62000
commit
8763e0013d
|
@ -6,6 +6,7 @@ import (
|
||||||
"io"
|
"io"
|
||||||
"net/http"
|
"net/http"
|
||||||
"net/http/httptest"
|
"net/http/httptest"
|
||||||
|
"strings"
|
||||||
"time"
|
"time"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
@ -164,3 +165,11 @@ func createWriteCompressedStringHandler(resp string) http.HandlerFunc {
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func buildURL(base, endpoint string) string {
|
||||||
|
url := base + endpoint
|
||||||
|
if !strings.HasPrefix(url, "http") {
|
||||||
|
url = "https://" + url
|
||||||
|
}
|
||||||
|
return url
|
||||||
|
}
|
||||||
|
|
|
@ -73,16 +73,16 @@ func (dl *ServerDataLoader) parseODLine(line []string) (*parsedODLine, error) {
|
||||||
func (dl *ServerDataLoader) LoadOD(tribe bool) (map[int]*twmodel.OpponentsDefeated, error) {
|
func (dl *ServerDataLoader) LoadOD(tribe bool) (map[int]*twmodel.OpponentsDefeated, error) {
|
||||||
m := make(map[int]*twmodel.OpponentsDefeated)
|
m := make(map[int]*twmodel.OpponentsDefeated)
|
||||||
formattedURLs := []string{
|
formattedURLs := []string{
|
||||||
dl.baseURL + EndpointKillAll,
|
buildURL(dl.baseURL, EndpointKillAll),
|
||||||
dl.baseURL + EndpointKillAtt,
|
buildURL(dl.baseURL, EndpointKillAtt),
|
||||||
dl.baseURL + EndpointKillDef,
|
buildURL(dl.baseURL, EndpointKillDef),
|
||||||
dl.baseURL + EndpointKillSup,
|
buildURL(dl.baseURL, EndpointKillSup),
|
||||||
}
|
}
|
||||||
if tribe {
|
if tribe {
|
||||||
formattedURLs = []string{
|
formattedURLs = []string{
|
||||||
dl.baseURL + EndpointKillAllTribe,
|
buildURL(dl.baseURL, EndpointKillAllTribe),
|
||||||
dl.baseURL + EndpointKillAttTribe,
|
buildURL(dl.baseURL, EndpointKillAttTribe),
|
||||||
dl.baseURL + EndpointKillDefTribe,
|
buildURL(dl.baseURL, EndpointKillDefTribe),
|
||||||
"",
|
"",
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -160,7 +160,7 @@ func (dl *ServerDataLoader) parsePlayerLine(line []string) (*twmodel.Player, err
|
||||||
}
|
}
|
||||||
|
|
||||||
func (dl *ServerDataLoader) LoadPlayers() ([]*twmodel.Player, error) {
|
func (dl *ServerDataLoader) LoadPlayers() ([]*twmodel.Player, error) {
|
||||||
formattedURL := dl.baseURL + EndpointPlayer
|
formattedURL := buildURL(dl.baseURL, EndpointPlayer)
|
||||||
lines, err := dl.getCSVData(formattedURL, true)
|
lines, err := dl.getCSVData(formattedURL, true)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, errors.Wrapf(err, "couldn't load data, url %s", formattedURL)
|
return nil, errors.Wrapf(err, "couldn't load data, url %s", formattedURL)
|
||||||
|
@ -225,7 +225,7 @@ func (dl *ServerDataLoader) parseTribeLine(line []string) (*twmodel.Tribe, error
|
||||||
}
|
}
|
||||||
|
|
||||||
func (dl *ServerDataLoader) LoadTribes() ([]*twmodel.Tribe, error) {
|
func (dl *ServerDataLoader) LoadTribes() ([]*twmodel.Tribe, error) {
|
||||||
formattedURL := dl.baseURL + EndpointTribe
|
formattedURL := buildURL(dl.baseURL, EndpointTribe)
|
||||||
lines, err := dl.getCSVData(formattedURL, true)
|
lines, err := dl.getCSVData(formattedURL, true)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, errors.Wrapf(err, "couldn't load data, url %s", formattedURL)
|
return nil, errors.Wrapf(err, "couldn't load data, url %s", formattedURL)
|
||||||
|
@ -279,7 +279,7 @@ func (dl *ServerDataLoader) parseVillageLine(line []string) (*twmodel.Village, e
|
||||||
}
|
}
|
||||||
|
|
||||||
func (dl *ServerDataLoader) LoadVillages() ([]*twmodel.Village, error) {
|
func (dl *ServerDataLoader) LoadVillages() ([]*twmodel.Village, error) {
|
||||||
formattedURL := dl.baseURL + EndpointVillage
|
formattedURL := buildURL(dl.baseURL, EndpointVillage)
|
||||||
lines, err := dl.getCSVData(formattedURL, true)
|
lines, err := dl.getCSVData(formattedURL, true)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, errors.Wrapf(err, "couldn't load data, formattedURL %s", formattedURL)
|
return nil, errors.Wrapf(err, "couldn't load data, formattedURL %s", formattedURL)
|
||||||
|
@ -331,10 +331,10 @@ func (dl *ServerDataLoader) LoadEnnoblements(cfg *LoadEnnoblementsConfig) ([]*tw
|
||||||
cfg = &LoadEnnoblementsConfig{}
|
cfg = &LoadEnnoblementsConfig{}
|
||||||
}
|
}
|
||||||
yesterdaysDate := time.Now().Add(-23 * time.Hour)
|
yesterdaysDate := time.Now().Add(-23 * time.Hour)
|
||||||
formattedURL := dl.baseURL + EndpointConquer
|
formattedURL := buildURL(dl.baseURL, EndpointConquer)
|
||||||
compressed := true
|
compressed := true
|
||||||
if cfg.EnnobledAtGT.After(yesterdaysDate) || cfg.EnnobledAtGT.Equal(yesterdaysDate) {
|
if cfg.EnnobledAtGT.After(yesterdaysDate) || cfg.EnnobledAtGT.Equal(yesterdaysDate) {
|
||||||
formattedURL = dl.baseURL + fmt.Sprintf(EndpointGetConquer, cfg.EnnobledAtGT.Unix())
|
formattedURL = buildURL(dl.baseURL, fmt.Sprintf(EndpointGetConquer, cfg.EnnobledAtGT.Unix()))
|
||||||
compressed = false
|
compressed = false
|
||||||
}
|
}
|
||||||
lines, err := dl.getCSVData(formattedURL, compressed)
|
lines, err := dl.getCSVData(formattedURL, compressed)
|
||||||
|
@ -356,7 +356,7 @@ func (dl *ServerDataLoader) LoadEnnoblements(cfg *LoadEnnoblementsConfig) ([]*tw
|
||||||
}
|
}
|
||||||
|
|
||||||
func (dl *ServerDataLoader) GetConfig() (*twmodel.ServerConfig, error) {
|
func (dl *ServerDataLoader) GetConfig() (*twmodel.ServerConfig, error) {
|
||||||
formattedURL := dl.baseURL + EndpointConfig
|
formattedURL := buildURL(dl.baseURL, EndpointConfig)
|
||||||
cfg := &twmodel.ServerConfig{}
|
cfg := &twmodel.ServerConfig{}
|
||||||
err := dl.getXML(formattedURL, cfg)
|
err := dl.getXML(formattedURL, cfg)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
@ -366,7 +366,7 @@ func (dl *ServerDataLoader) GetConfig() (*twmodel.ServerConfig, error) {
|
||||||
}
|
}
|
||||||
|
|
||||||
func (dl *ServerDataLoader) GetBuildingConfig() (*twmodel.BuildingConfig, error) {
|
func (dl *ServerDataLoader) GetBuildingConfig() (*twmodel.BuildingConfig, error) {
|
||||||
formattedURL := dl.baseURL + EndpointBuildingConfig
|
formattedURL := buildURL(dl.baseURL, EndpointBuildingConfig)
|
||||||
cfg := &twmodel.BuildingConfig{}
|
cfg := &twmodel.BuildingConfig{}
|
||||||
err := dl.getXML(formattedURL, cfg)
|
err := dl.getXML(formattedURL, cfg)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
@ -376,7 +376,7 @@ func (dl *ServerDataLoader) GetBuildingConfig() (*twmodel.BuildingConfig, error)
|
||||||
}
|
}
|
||||||
|
|
||||||
func (dl *ServerDataLoader) GetUnitConfig() (*twmodel.UnitConfig, error) {
|
func (dl *ServerDataLoader) GetUnitConfig() (*twmodel.UnitConfig, error) {
|
||||||
formattedURL := dl.baseURL + EndpointUnitConfig
|
formattedURL := buildURL(dl.baseURL, EndpointUnitConfig)
|
||||||
cfg := &twmodel.UnitConfig{}
|
cfg := &twmodel.UnitConfig{}
|
||||||
err := dl.getXML(formattedURL, cfg)
|
err := dl.getXML(formattedURL, cfg)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
|
|
@ -40,7 +40,7 @@ func NewVersionDataLoader(cfg *VersionDataLoaderConfig) *VersionDataLoader {
|
||||||
}
|
}
|
||||||
|
|
||||||
func (dl *VersionDataLoader) LoadServers() ([]*Server, error) {
|
func (dl *VersionDataLoader) LoadServers() ([]*Server, error) {
|
||||||
resp, err := dl.client.Get(dl.host + EndpointGetServers)
|
resp, err := dl.client.Get(buildURL(dl.host, EndpointGetServers))
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, errors.Wrap(err, "couldn't load servers")
|
return nil, errors.Wrap(err, "couldn't load servers")
|
||||||
}
|
}
|
||||||
|
|
Reference in New Issue