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

ServerDataLoader - remove fallbacks to not gzziped files

This commit is contained in:
Dawid Wysokiński 2021-07-13 16:43:19 +02:00
parent 6456a82235
commit ef3e1dd459
1 changed files with 4 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
tw/twdataloader/server_data_loader.go
View File

@ -91,13 +91,9 @@ func (d *ServerDataLoader) LoadOD(tribe bool) (map[int]*twmodel.OpponentsDefeate
continue
}
lines, err := d.getCSVData(formattedURL, true)
if err != nil {
//fallback to not gzipped file
lines, err = d.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 := d.parseODLine(line)
if err != nil {
@ -166,12 +162,9 @@ func (d *ServerDataLoader) parsePlayerLine(line []string) (*twmodel.Player, erro
func (d *ServerDataLoader) LoadPlayers() ([]*twmodel.Player, error) {
formattedURL := d.baseURL + EndpointPlayer
lines, err := d.getCSVData(formattedURL, true)
if err != nil {
lines, err = d.getCSVData(d.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 (d *ServerDataLoader) parseTribeLine(line []string) (*twmodel.Tribe, error)
func (d *ServerDataLoader) LoadTribes() ([]*twmodel.Tribe, error) {
formattedURL := d.baseURL + EndpointTribe
lines, err := d.getCSVData(formattedURL, true)
if err != nil {
lines, err = d.getCSVData(d.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 := d.parseTribeLine(line)
@ -291,12 +281,9 @@ func (d *ServerDataLoader) parseVillageLine(line []string) (*twmodel.Village, er
func (d *ServerDataLoader) LoadVillages() ([]*twmodel.Village, error) {
formattedURL := d.baseURL + EndpointVillage
lines, err := d.getCSVData(formattedURL, true)
if err != nil {
lines, err = d.getCSVData(d.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 := d.parseVillageLine(line)
@ -351,9 +338,6 @@ func (d *ServerDataLoader) LoadEnnoblements(cfg *LoadEnnoblementsConfig) ([]*twm
compressed = false
}
lines, err := d.getCSVData(formattedURL, compressed)
if err != nil && compressed {
lines, err = d.getCSVData(d.baseURL+EndpointConquerNotGzipped, false)
}
if err != nil {
return nil, errors.Wrapf(err, "couldn't load data, formattedURL %s", formattedURL)
}