twhelp
/
shared
Archived
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

use buildURL for fallbacks

This commit is contained in:
Dawid Wysokiński 2021-07-17 11:44:29 +02:00
parent e9473847ca
commit 6efa1a4f61
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tw/twdataloader/server_data_loader.go
View File

@ -166,7 +166,7 @@ func (dl *ServerDataLoader) LoadPlayers() ([]*twmodel.Player, error) {
formattedURL := buildURL(dl.baseURL, EndpointPlayer)
lines, err := dl.getCSVData(formattedURL, true)
if err != nil {
lines, err = dl.getCSVData(strings.ReplaceAll(formattedURL, ".gz", ""), false)
lines, err = dl.getCSVData(buildURL(dl.baseURL, EndpointPlayerNotGzipped), false)
if err != nil {
return nil, errors.Wrapf(err, "couldn't load data, formattedURL %s", formattedURL)
}
@ -234,7 +234,7 @@ func (dl *ServerDataLoader) LoadTribes() ([]*twmodel.Tribe, error) {
formattedURL := buildURL(dl.baseURL, EndpointTribe)
lines, err := dl.getCSVData(formattedURL, true)
if err != nil {
lines, err = dl.getCSVData(dl.baseURL+EndpointTribeNotGzipped, false)
lines, err = dl.getCSVData(buildURL(dl.baseURL, EndpointTribeNotGzipped), false)
if err != nil {
return nil, errors.Wrapf(err, "couldn't load data, url %s", formattedURL)
}
@ -291,7 +291,7 @@ func (dl *ServerDataLoader) LoadVillages() ([]*twmodel.Village, error) {
formattedURL := buildURL(dl.baseURL, EndpointVillage)
lines, err := dl.getCSVData(formattedURL, true)
if err != nil {
lines, err = dl.getCSVData(dl.baseURL+EndpointVillageNotGzipped, false)
lines, err = dl.getCSVData(buildURL(dl.baseURL, EndpointVillageNotGzipped), false)
if err != nil {
return nil, errors.Wrapf(err, "couldn't load data, formattedURL %s", formattedURL)
}
@ -351,7 +351,7 @@ func (dl *ServerDataLoader) LoadEnnoblements(cfg *LoadEnnoblementsConfig) ([]*tw
}
lines, err := dl.getCSVData(formattedURL, compressed)
if err != nil && compressed {
lines, err = dl.getCSVData(dl.baseURL+EndpointConquerNotGzipped, false)
lines, err = dl.getCSVData(buildURL(dl.baseURL, EndpointConquerNotGzipped), false)
}
if err != nil {
return nil, errors.Wrapf(err, "couldn't load data, formattedURL %s", formattedURL)