fic/server
Archived
1
0
Fork 0
Code Issues Pull requests 10 Releases Wiki Activity

Make go vet -strictshadow mostly happy

Browse source
This commit is contained in:
nemunaire 2019-01-17 16:55:54 +01:00
parent 75463dcebb
commit 8749a7c164
7 changed files with 38 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

8
backend/choices.go
View file

@ -18,20 +18,20 @@ func treatWantChoices(pathname string, team fic.Team) {
if cnt_raw, err := ioutil.ReadFile(pathname); err != nil {
log.Println("[ERR]", err)
} else if err := json.Unmarshal(cnt_raw, &ask); err != nil {
} else if err = json.Unmarshal(cnt_raw, &ask); err != nil {
log.Println("[ERR]", err)
} else if ask.FlagId == 0 {
log.Println("[WRN] Invalid content in wantChoices file: ", pathname)
os.Remove(pathname)
} else if flag, err := fic.GetFlagKey(ask.FlagId); err != nil {
log.Println("[ERR]", err)
} else if err := team.DisplayChoices(flag); err != nil {
} else if err = team.DisplayChoices(flag); err != nil {
log.Println("[ERR]", err)
} else {
if err := genTeamMyFile(team); err != nil {
if err = genTeamMyFile(team); err != nil {
log.Println("my-", team.Id, ".json generation error: ", err)
}
if err := os.Remove(pathname); err != nil {
if err = os.Remove(pathname); err != nil {
log.Println("[ERR]", err)
}
}

24
backend/generation.go
View file

@ -26,7 +26,7 @@ func genTeamMyFile(team fic.Team) error {
return err
} else if j, err := json.Marshal(my); err != nil {
return err
} else if err := ioutil.WriteFile(path.Join(dirPath, "my.json"), j, 0666); err != nil {
} else if err = ioutil.WriteFile(path.Join(dirPath, "my.json"), j, 0666); err != nil {
return err
}
@ -36,7 +36,7 @@ func genTeamMyFile(team fic.Team) error {
return err
} else if j, err := json.Marshal(my); err != nil {
return err
} else if err := ioutil.WriteFile(path.Join(dirPath, "wait.json"), j, 0666); err != nil {
} else if err = ioutil.WriteFile(path.Join(dirPath, "wait.json"), j, 0666); err != nil {
return err
}
}
@ -58,7 +58,7 @@ func genMyPublicFile() error {
return err
} else if j, err := json.Marshal(my); err != nil {
return err
} else if err := ioutil.WriteFile(path.Join(dirPath, "my.json"), j, 0666); err != nil {
} else if err = ioutil.WriteFile(path.Join(dirPath, "my.json"), j, 0666); err != nil {
return err
}
@ -73,7 +73,7 @@ func genEventsFile() error {
return err
} else if j, err := json.Marshal(evts); err != nil {
return err
} else if err := ioutil.WriteFile(path.Join(TeamsDir, "events.json"), j, 0666); err != nil {
} else if err = ioutil.WriteFile(path.Join(TeamsDir, "events.json"), j, 0666); err != nil {
return err
}
@ -86,7 +86,7 @@ func genTeamsFile() error {
return err
} else if j, err := json.Marshal(teams); err != nil {
return err
} else if err := ioutil.WriteFile(path.Join(TeamsDir, "teams.json"), j, 0666); err != nil {
} else if err = ioutil.WriteFile(path.Join(TeamsDir, "teams.json"), j, 0666); err != nil {
return err
}
@ -99,7 +99,7 @@ func genThemesFile() error {
return err
} else if j, err := json.Marshal(themes); err != nil {
return err
} else if err := ioutil.WriteFile(path.Join(TeamsDir, "themes.json"), j, 0666); err != nil {
} else if err = ioutil.WriteFile(path.Join(TeamsDir, "themes.json"), j, 0666); err != nil {
return err
}
@ -109,9 +109,9 @@ func genThemesFile() error {
func genTeamAll(team fic.Team) {
if err := genThemesFile(); err != nil {
log.Println("themes.json generation error: ", err)
} else if err := genTeamsFile(); err != nil {
} else if err = genTeamsFile(); err != nil {
log.Println("teams.json generation error: ", err)
} else if err := genTeamMyFile(team); err != nil {
} else if err = genTeamMyFile(team); err != nil {
log.Println("my.json(", team.Id, ") generation error: ", err)
}
}
@ -119,17 +119,17 @@ func genTeamAll(team fic.Team) {
func genAll() {
if err := genThemesFile(); err != nil {
log.Println("themes.json generation error: ", err)
} else if err := genTeamsFile(); err != nil {
} else if err = genTeamsFile(); err != nil {
log.Println("teams.json generation error: ", err)
} else if err := genEventsFile(); err != nil {
} else if err = genEventsFile(); err != nil {
log.Println("events.json generation error: ", err)
} else if err := genMyPublicFile(); err != nil {
} else if err = genMyPublicFile(); err != nil {
log.Println("MyPublic generation error: ", err)
} else if teams, err := fic.GetTeams(); err != nil {
log.Println("Team retrieval error: ", err)
} else {
for _, team := range(teams) {
if err := genTeamMyFile(team); err != nil {
if err = genTeamMyFile(team); err != nil {
log.Println("Team generation error: ", err)
}
}

12
backend/hint.go
View file

@ -19,14 +19,14 @@ func treatOpeningHint(pathname string, team fic.Team) {
if cnt_raw, err := ioutil.ReadFile(pathname); err != nil {
log.Println("[ERR]", err)
} else if err := json.Unmarshal(cnt_raw, &ask); err != nil {
} else if err = json.Unmarshal(cnt_raw, &ask); err != nil {
log.Println("[ERR]", err)
} else if ask.HintId == 0 {
log.Println("[WRN] Invalid content in hint file: ", pathname)
os.Remove(pathname)
} else if hint, err := fic.GetHint(ask.HintId); err != nil {
log.Println("[ERR]", err)
} else if err := team.OpenHint(hint); err != nil {
} else if err = team.OpenHint(hint); err != nil {
log.Println("[ERR]", err)
} else {
// Write event
@ -36,18 +36,18 @@ func treatOpeningHint(pathname string, team fic.Team) {
log.Println("[WRN]", err)
} else if theme, err := fic.GetTheme(exercice.IdTheme); err != nil {
log.Println("[WRN]", err)
} else if _, err := fic.NewEvent(fmt.Sprintf("L'équipe %s a dévoilé un indice pour le <strong>%d<sup>e</sup></strong> défi %s&nbsp;!", team.Name, lvl, theme.Name), "info"); err != nil {
} else if _, err = fic.NewEvent(fmt.Sprintf("L'équipe %s a dévoilé un indice pour le <strong>%d<sup>e</sup></strong> défi %s&nbsp;!", team.Name, lvl, theme.Name), "info"); err != nil {
log.Println("[WRN] Unable to create event:", err)
}
if err := genTeamMyFile(team); err != nil {
if err = genTeamMyFile(team); err != nil {
log.Println("my-", team.Id, ".json generation error: ", err)
}
if err := genEventsFile(); err != nil {
if err = genEventsFile(); err != nil {
log.Println("events.json generation error: ", err)
}
if err := os.Remove(pathname); err != nil {
if err = os.Remove(pathname); err != nil {
log.Println("[ERR]", err)
}
}