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

Merge branch 'master' into feat/add-tests 

# Conflicts:
#	tw/twdataloader/server_data_loader.go
This commit is contained in:
Dawid Wysokiński 2021-07-13 16:46:46 +02:00
parent 4613155d5d ef3e1dd459
commit 3a2ea77dd7
1 changed files with 5 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
tw/twdataloader/server_data_loader.go
View File

@ -91,13 +91,9 @@ func (dl *ServerDataLoader) LoadOD(tribe bool) (map[int]*twmodel.OpponentsDefeat
continue
}
lines, err := dl.getCSVData(formattedURL, true)
if err != nil {
//fallback to not gzipped file
lines, err = dl.getCSVData(strings.ReplaceAll(formattedURL, ".gz", ""), false)
if err != nil {
return nil, errors.Wrapf(err, "couldn't load data, formattedURL %s", formattedURL)
}
}
for _, line := range lines {
parsed, err := dl.parseODLine(line)
if err != nil {
@ -166,12 +162,9 @@ func (dl *ServerDataLoader) parsePlayerLine(line []string) (*twmodel.Player, err
func (dl *ServerDataLoader) LoadPlayers() ([]*twmodel.Player, error) {
formattedURL := dl.baseURL + EndpointPlayer
lines, err := dl.getCSVData(formattedURL, true)
if err != nil {
lines, err = dl.getCSVData(dl.baseURL+EndpointPlayerNotGzipped, false)
if err != nil {
return nil, errors.Wrapf(err, "couldn't load data, url %s", formattedURL)
}
}
var players []*twmodel.Player
for _, line := range lines {
@ -234,12 +227,9 @@ func (dl *ServerDataLoader) parseTribeLine(line []string) (*twmodel.Tribe, error
func (dl *ServerDataLoader) LoadTribes() ([]*twmodel.Tribe, error) {
formattedURL := dl.baseURL + EndpointTribe
lines, err := dl.getCSVData(formattedURL, true)
if err != nil {
lines, err = dl.getCSVData(dl.baseURL+EndpointTribeNotGzipped, false)
if err != nil {
return nil, errors.Wrapf(err, "couldn't load data, url %s", formattedURL)
}
}
var tribes []*twmodel.Tribe
for _, line := range lines {
tribe, err := dl.parseTribeLine(line)
@ -291,12 +281,9 @@ func (dl *ServerDataLoader) parseVillageLine(line []string) (*twmodel.Village, e
func (dl *ServerDataLoader) LoadVillages() ([]*twmodel.Village, error) {
formattedURL := dl.baseURL + EndpointVillage
lines, err := dl.getCSVData(formattedURL, true)
if err != nil {
lines, err = dl.getCSVData(dl.baseURL+EndpointVillageNotGzipped, false)
if err != nil {
return nil, errors.Wrapf(err, "couldn't load data, formattedURL %s", formattedURL)
}
}
var villages []*twmodel.Village
for _, line := range lines {
village, err := dl.parseVillageLine(line)
@ -350,10 +337,7 @@ func (dl *ServerDataLoader) LoadEnnoblements(cfg *LoadEnnoblementsConfig) ([]*tw
formattedURL = dl.baseURL + fmt.Sprintf(EndpointGetConquer, cfg.EnnobledAtGT.Unix())
compressed = false
}
lines, err := dl.getCSVData(formattedURL, compressed)
if err != nil && compressed {
lines, err = dl.getCSVData(dl.baseURL+EndpointConquerNotGzipped, false)
}
lines, err := d.getCSVData(formattedURL, compressed)
if err != nil {
return nil, errors.Wrapf(err, "couldn't load data, formattedURL %s", formattedURL)
}