Merge branch 'master' into feat/add-tests
# Conflicts: # tw/twdataloader/server_data_loader.go
This commit is contained in:
commit
3a2ea77dd7
|
@ -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)
|
||||
}
|
||||
|
|
Reference in New Issue