From 8749a7c164c22b4d504798839673f01cc15cbcf9 Mon Sep 17 00:00:00 2001 From: Pierre-Olivier Mercier Date: Thu, 17 Jan 2019 16:55:54 +0100 Subject: [PATCH] Make go vet -strictshadow mostly happy --- admin/main.go | 17 ++++++++++------- backend/choices.go | 8 ++++---- backend/generation.go | 24 ++++++++++++------------ backend/hint.go | 12 ++++++------ frontend/main.go | 2 +- frontend/resolution.go | 2 +- frontend/save.go | 8 ++++---- 7 files changed, 38 insertions(+), 35 deletions(-) diff --git a/admin/main.go b/admin/main.go index 3b23a70b..2e801b60 100644 --- a/admin/main.go +++ b/admin/main.go @@ -164,7 +164,7 @@ func main() { // Initialize settings and load them if !settings.ExistsSettings(path.Join(settings.SettingsDir, settings.SettingsFile)) { - if err := settings.SaveSettings(path.Join(settings.SettingsDir, settings.SettingsFile), settings.FICSettings{ + if err = settings.SaveSettings(path.Join(settings.SettingsDir, settings.SettingsFile), settings.FICSettings{ Title: "Challenge FIC", Authors: "Laboratoire SRS, ÉPITA", FirstBlood: fic.FirstBlood, @@ -177,21 +177,24 @@ func main() { }); err != nil { log.Fatal("Unable to initialize settings.json:", err) } - } else if config, err := settings.ReadSettings(path.Join(settings.SettingsDir, settings.SettingsFile)); err != nil { - log.Fatal("Unable to read settings.json:", err) } else { - api.ApplySettings(config) + var config settings.FICSettings + if config, err = settings.ReadSettings(path.Join(settings.SettingsDir, settings.SettingsFile)); err != nil { + log.Fatal("Unable to read settings.json:", err) + } else { + api.ApplySettings(config) + } } // Database connection log.Println("Opening database...") - if err := fic.DBInit(*dsn); err != nil { + if err = fic.DBInit(*dsn); err != nil { log.Fatal("Cannot open the database: ", err) } defer fic.DBClose() log.Println("Creating database...") - if err := fic.DBCreate(); err != nil { + if err = fic.DBCreate(); err != nil { log.Fatal("Cannot create database: ", err) } @@ -201,7 +204,7 @@ func main() { log.Println("Unable to open index.html: ", err) } else if indexTmpl, err := template.New("index").Parse(indextpl); err != nil { log.Println("Cannot create template: ", err) - } else if err := indexTmpl.Execute(file, map[string]string{"urlbase": path.Clean(path.Join(*baseURL + "/", "nuke"))[:len(path.Clean(path.Join(*baseURL + "/", "nuke"))) - 4]}); err != nil { + } else if err = indexTmpl.Execute(file, map[string]string{"urlbase": path.Clean(path.Join(*baseURL + "/", "nuke"))[:len(path.Clean(path.Join(*baseURL + "/", "nuke"))) - 4]}); err != nil { log.Println("An error occurs during template execution: ", err) } diff --git a/backend/choices.go b/backend/choices.go index 92ba0759..441d06bc 100644 --- a/backend/choices.go +++ b/backend/choices.go @@ -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) } } diff --git a/backend/generation.go b/backend/generation.go index ea9389fc..d2019ee6 100644 --- a/backend/generation.go +++ b/backend/generation.go @@ -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) } } diff --git a/backend/hint.go b/backend/hint.go index 524deb44..66306fdf 100644 --- a/backend/hint.go +++ b/backend/hint.go @@ -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 %de défi %s !", 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 %de défi %s !", 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) } } diff --git a/frontend/main.go b/frontend/main.go index b5d1fb08..c82798ba 100644 --- a/frontend/main.go +++ b/frontend/main.go @@ -34,7 +34,7 @@ func main() { log.Println("Creating submission directory...") if _, err := os.Stat(TmpSubmissionDir); os.IsNotExist(err) { - if err := os.MkdirAll(TmpSubmissionDir, 0700); err != nil { + if err = os.MkdirAll(TmpSubmissionDir, 0700); err != nil { log.Fatal("Unable to create submission directory: ", err) } } diff --git a/frontend/resolution.go b/frontend/resolution.go index b50a9307..b75ec796 100644 --- a/frontend/resolution.go +++ b/frontend/resolution.go @@ -40,7 +40,7 @@ func (s ResolutionHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) { if resolutionTmpl, err := template.New("resolution").Parse(resolutiontpl); err != nil { log.Println("Cannot create template: ", err) - } else if err := resolutionTmpl.Execute(w, path.Join("/vids/", r.URL.Path)); err != nil { + } else if err = resolutionTmpl.Execute(w, path.Join("/vids/", r.URL.Path)); err != nil { log.Println("An error occurs during template execution: ", err) } } diff --git a/frontend/save.go b/frontend/save.go index 9c2e103c..ee51a6c0 100644 --- a/frontend/save.go +++ b/frontend/save.go @@ -24,7 +24,7 @@ func saveTeamFile(p string, w http.ResponseWriter, r *http.Request) bool { // Previous submission not treated http.Error(w, "{\"errmsg\":\"Du calme ! une requête est déjà en cours de traitement.\"}", http.StatusPaymentRequired) return false - } else if err := saveFile(path.Join(SubmissionDir, p), r); err != nil { + } else if err = saveFile(path.Join(SubmissionDir, p), r); err != nil { log.Println("Unable to handle submission file:", err) http.Error(w, "{\"errmsg\":\"Internal server error. Please retry in few seconds.\"}", http.StatusInternalServerError) return false @@ -35,7 +35,7 @@ func saveTeamFile(p string, w http.ResponseWriter, r *http.Request) bool { func saveFile(p string, r *http.Request) error { dirname := path.Dir(p) if _, err := os.Stat(dirname); os.IsNotExist(err) { - if err := os.MkdirAll(dirname, 0755); err != nil { + if err = os.MkdirAll(dirname, 0755); err != nil { return err } } @@ -48,13 +48,13 @@ func saveFile(p string, r *http.Request) error { writer := bufio.NewWriter(tmpfile) reader := bufio.NewReader(r.Body) - if _, err := reader.WriteTo(writer); err != nil { + if _, err = reader.WriteTo(writer); err != nil { return err } writer.Flush() tmpfile.Close() - if err := os.Rename(tmpfile.Name(), p); err != nil { + if err = os.Rename(tmpfile.Name(), p); err != nil { log.Println("[ERROR] Unable to move file: ", err) return err }