itUse player struct to construct the badge/flag strings - scoreboard - Interactive scoreboard for CTF-like games Err z3bra.org 70 hgit clone git://git.z3bra.org/scoreboard.git URL:git://git.z3bra.org/scoreboard.git z3bra.org 70 1Log /scm/scoreboard/log.gph z3bra.org 70 1Files /scm/scoreboard/files.gph z3bra.org 70 1Refs /scm/scoreboard/refs.gph z3bra.org 70 i--- Err z3bra.org 70 1commit d3aeebcb5ccad3ef7c0d1febb9525189d90ed1c0 /scm/scoreboard/commit/d3aeebcb5ccad3ef7c0d1febb9525189d90ed1c0.gph z3bra.org 70 1parent 7c6f4cba8dd3a4237b4af377832f24c60c6c794d /scm/scoreboard/commit/7c6f4cba8dd3a4237b4af377832f24c60c6c794d.gph z3bra.org 70 hAuthor: Willy Goiffon URL:mailto:contact@z3bra.org z3bra.org 70 iDate: Tue, 1 Oct 2024 15:47:57 +0200 Err z3bra.org 70 i Err z3bra.org 70 iUse player struct to construct the badge/flag strings Err z3bra.org 70 i Err z3bra.org 70 iDiffstat: Err z3bra.org 70 i M player.go | 26 ++------------------------ Err z3bra.org 70 i Err z3bra.org 70 i1 file changed, 2 insertions(+), 24 deletions(-) Err z3bra.org 70 i--- Err z3bra.org 70 1diff --git a/player.go b/player.go /scm/scoreboard/file/player.go.gph z3bra.org 70 it@@ -169,6 +169,7 @@ func (p *Player) FlagStr() string { Err z3bra.org 70 i func (p *Player) FlagsStr() string { Err z3bra.org 70 i var flaglist strings.Builder Err z3bra.org 70 i Err z3bra.org 70 i+ flaglist.WriteString("[-::-]") Err z3bra.org 70 i for _, f := range p.flags { Err z3bra.org 70 i flaglist.WriteString(fmt.Sprintf("%s %s\n", f.badge, f.value)) Err z3bra.org 70 i } Err z3bra.org 70 it@@ -181,7 +182,6 @@ func (p *Player) FlagsStr() string { Err z3bra.org 70 i } Err z3bra.org 70 i return false Err z3bra.org 70 i } Err z3bra.org 70 i- flaglist.WriteString("[::-][::d]") Err z3bra.org 70 i for _, r := range scoreboard.flag_ref { Err z3bra.org 70 i if !hasflag(p.flags, r) { Err z3bra.org 70 i flaglist.WriteString(fmt.Sprintf("[::d]%s %64s[::-]\n", r.badge, "")) Err z3bra.org 70 it@@ -194,30 +194,8 @@ func (p *Player) FlagsStr() string { Err z3bra.org 70 i func (p *Player) BadgeStr() string { Err z3bra.org 70 i var badges strings.Builder Err z3bra.org 70 i Err z3bra.org 70 i- var flags []Flag Err z3bra.org 70 i- Err z3bra.org 70 i- query := `SELECT Err z3bra.org 70 i- flag.badge, flag.value, flag.score Err z3bra.org 70 i- FROM flag Err z3bra.org 70 i- INNER JOIN score ON score.flag = flag.value Err z3bra.org 70 i- WHERE score.name = ?;` Err z3bra.org 70 i- Err z3bra.org 70 i- rows, err := p.db.Query(query, p.name) Err z3bra.org 70 i- if err != nil { Err z3bra.org 70 i- return "" Err z3bra.org 70 i- } Err z3bra.org 70 i- Err z3bra.org 70 i- for rows.Next() { Err z3bra.org 70 i- var f Flag Err z3bra.org 70 i- err := rows.Scan(&f.badge, &f.value, &f.score) Err z3bra.org 70 i- if err != nil { Err z3bra.org 70 i- return "" Err z3bra.org 70 i- } Err z3bra.org 70 i- flags = append(flags, f) Err z3bra.org 70 i- } Err z3bra.org 70 i- Err z3bra.org 70 i badges.WriteString("[-::-]\n") Err z3bra.org 70 i- for n, f := range flags { Err z3bra.org 70 i+ for n, f := range p.flags { Err z3bra.org 70 i if n > 0 && n % 8 == 0 { Err z3bra.org 70 i badges.WriteString("\n") Err z3bra.org 70 i } Err z3bra.org 70 .