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

bump github.com/tribalwarshelp/shared

This commit is contained in:
Dawid Wysokiński 2020-06-21 11:27:56 +02:00 committed by Kichiyaki
parent 5509ffded0
commit 1a07278d62
4 changed files with 32 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
cron/update_server_data_handler.go
View File

@ -175,7 +175,7 @@ func (h *updateServerDataHandler) getPlayers(od map[int]*models.OpponentsDefeate
return players, nil
}
func (h *updateServerDataHandler) parseTribeLine(line []string) (*models.Tribe, error) {
func (h *updateServerDataHandler) parseTribeLine(line []string, numberOfVillages int) (*models.Tribe, error) {
if len(line) != 8 {
return nil, fmt.Errorf("Invalid line format (should be id,name,tag,members,villages,points,allpoints,rank)")
}
@ -217,11 +217,12 @@ func (h *updateServerDataHandler) parseTribeLine(line []string) (*models.Tribe,
if err != nil {
return nil, errors.Wrap(err, "tribe.Rank")
}
tribe.Dominance = float64(tribe.TotalVillages) / float64(numberOfVillages)
return tribe, nil
}
func (h *updateServerDataHandler) getTribes(od map[int]*models.OpponentsDefeated) ([]*models.Tribe, error) {
func (h *updateServerDataHandler) getTribes(od map[int]*models.OpponentsDefeated, numberOfVillages int) ([]*models.Tribe, error) {
url := h.baseURL + endpointTribe
lines, err := getCSVData(url, false)
if err != nil {
@ -229,7 +230,7 @@ func (h *updateServerDataHandler) getTribes(od map[int]*models.OpponentsDefeated
}
tribes := []*models.Tribe{}
for _, line := range lines {
tribe, err := h.parseTribeLine(line)
tribe, err := h.parseTribeLine(line, numberOfVillages)
if err != nil {
return nil, errors.Wrapf(err, "unable to parse line, url %s", url)
}
@ -391,18 +392,25 @@ func (h *updateServerDataHandler) update() error {
if err != nil {
return err
}
tribes, err := h.getTribes(tod)
if err != nil {
return err
}
players, err := h.getPlayers(pod)
if err != nil {
return err
}
villages, err := h.getVillages()
if err != nil {
return err
}
numberOfVillages := len(villages)
tribes, err := h.getTribes(tod, numberOfVillages)
if err != nil {
return err
}
numberOfTribes := len(tribes)
players, err := h.getPlayers(pod)
if err != nil {
return err
}
numberOfPlayers := len(players)
cfg, err := h.getConfig()
if err != nil {
return err
@ -415,6 +423,7 @@ func (h *updateServerDataHandler) update() error {
if err != nil {
return err
}
ennoblements, err := h.getEnnoblements()
if err != nil {
return err
@ -437,6 +446,7 @@ func (h *updateServerDataHandler) update() error {
Set("all_points = EXCLUDED.all_points").
Set("rank = EXCLUDED.rank").
Set("exist = EXCLUDED.exist").
Set("dominance = EXCLUDED.dominance").
Apply(attachODSetClauses).
Insert(); err != nil {
return errors.Wrap(err, "cannot insert tribes")
@ -512,6 +522,9 @@ func (h *updateServerDataHandler) update() error {
Set("unit_config = ?", unitCfg).
Set("building_config = ?", buildingCfg).
Set("config = ?", cfg).
Set("number_of_players = ?", numberOfPlayers).
Set("number_of_tribes = ?", numberOfTribes).
Set("number_of_villages = ?", numberOfVillages).
Returning("*").
WherePK().
Update(); err != nil {

1
cron/update_server_history_handler.go
View File

@ -44,6 +44,7 @@ func (h *updateServerHistoryHandler) update() error {
Points: tribe.Points,
AllPoints: tribe.AllPoints,
Rank: tribe.Rank,
Dominance: tribe.Dominance,
})
}

2
go.mod
View File

@ -8,6 +8,6 @@ require (
github.com/joho/godotenv v1.3.0
github.com/pkg/errors v0.9.1
github.com/robfig/cron/v3 v3.0.1
github.com/tribalwarshelp/shared v0.0.0-20200620172120-2529c050265b
github.com/tribalwarshelp/shared v0.0.0-20200621083628-e0fdaa9bdff6
golang.org/x/net v0.0.0-20200528225125-3c3fba18258b // indirect
)

6
go.sum
View File

@ -106,6 +106,12 @@ github.com/tribalwarshelp/shared v0.0.0-20200620153121-bcad77573c9d h1:nyDzPccg/
github.com/tribalwarshelp/shared v0.0.0-20200620153121-bcad77573c9d/go.mod h1:tf+2yTHasV6jAF3V2deZ9slNoCyBzC0fMdTjI7clf6Y=
github.com/tribalwarshelp/shared v0.0.0-20200620172120-2529c050265b h1:uYxRxhuIXIcPLU3/MoKOkOn8/vOKMkM06XHxeEkIebQ=
github.com/tribalwarshelp/shared v0.0.0-20200620172120-2529c050265b/go.mod h1:tf+2yTHasV6jAF3V2deZ9slNoCyBzC0fMdTjI7clf6Y=
github.com/tribalwarshelp/shared v0.0.0-20200621075847-011aa011b979 h1:uiPBr8HQD+rtznz76CuZijQ7bwQ+UsTSTImzlowRBpI=
github.com/tribalwarshelp/shared v0.0.0-20200621075847-011aa011b979/go.mod h1:tf+2yTHasV6jAF3V2deZ9slNoCyBzC0fMdTjI7clf6Y=
github.com/tribalwarshelp/shared v0.0.0-20200621081952-6f187361307e h1:DgRPTSQkydANgYLyHRh4S3sAsGcQkmAHRNVdtwYYyBE=
github.com/tribalwarshelp/shared v0.0.0-20200621081952-6f187361307e/go.mod h1:tf+2yTHasV6jAF3V2deZ9slNoCyBzC0fMdTjI7clf6Y=
github.com/tribalwarshelp/shared v0.0.0-20200621083628-e0fdaa9bdff6 h1:HjOXWkYjCl9cs6Jd0VUByJEPKE8TXVz6CHB88f8wPXk=
github.com/tribalwarshelp/shared v0.0.0-20200621083628-e0fdaa9bdff6/go.mod h1:tf+2yTHasV6jAF3V2deZ9slNoCyBzC0fMdTjI7clf6Y=
github.com/vmihailenco/bufpool v0.1.5/go.mod h1:fL9i/PRTuS7AELqAHwSU1Zf1c70xhkhGe/cD5ud9pJk=
github.com/vmihailenco/bufpool v0.1.11 h1:gOq2WmBrq0i2yW5QJ16ykccQ4wH9UyEsgLm6czKAd94=
github.com/vmihailenco/bufpool v0.1.11/go.mod h1:AFf/MOy3l2CFTKbxwt0mp2MwnqjNEs5H/UxrkA5jxTQ=