itRefactor shit - 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 d4209a84c73bef28336b2f1f63b39181f7dfc8da	/scm/scoreboard/commit/d4209a84c73bef28336b2f1f63b39181f7dfc8da.gph	z3bra.org	70
1parent 21e47edfb41eee155915a67d456a48755a070321	/scm/scoreboard/commit/21e47edfb41eee155915a67d456a48755a070321.gph	z3bra.org	70
hAuthor: Willy Goiffon <contact@z3bra.org>	URL:mailto:contact@z3bra.org	z3bra.org	70
iDate:   Tue,  6 Dec 2022 15:42:20 +0100	Err	z3bra.org	70
i	Err	z3bra.org	70
iRefactor shit	Err	z3bra.org	70
i	Err	z3bra.org	70
iDiffstat:	Err	z3bra.org	70
i  M main.go                             |      13 ++++++++++++-	Err	z3bra.org	70
i  M player.go                           |      15 ++++++++++++++-	Err	z3bra.org	70
i  M playerbox.go                        |       6 +++---	Err	z3bra.org	70
i  M ui.go                               |      92 +++++++++++++++++--------------	Err	z3bra.org	70
i	Err	z3bra.org	70
i4 files changed, 80 insertions(+), 46 deletions(-)	Err	z3bra.org	70
i---	Err	z3bra.org	70
1diff --git a/main.go b/main.go	/scm/scoreboard/file/main.go.gph	z3bra.org	70
it@@ -19,6 +19,7 @@ import (	Err	z3bra.org	70
i         "fmt"	Err	z3bra.org	70
i         "os"	Err	z3bra.org	70
i         "regexp"	Err	z3bra.org	70
i+        "strings"	Err	z3bra.org	70
i         "time"	Err	z3bra.org	70
i         "database/sql"	Err	z3bra.org	70
i         "github.com/gdamore/tcell/v2"	Err	z3bra.org	70
it@@ -63,6 +64,16 @@ func usage() {	Err	z3bra.org	70
i         os.Exit(0)	Err	z3bra.org	70
i }	Err	z3bra.org	70
i 	Err	z3bra.org	70
i+	Err	z3bra.org	70
i+func flagid(hash string) int {	Err	z3bra.org	70
i+        for i := 0; i<len(flag_sha256); i++ {	Err	z3bra.org	70
i+                if strings.ToUpper(hash) == flag_sha256[i] {	Err	z3bra.org	70
i+                        return i	Err	z3bra.org	70
i+                }	Err	z3bra.org	70
i+        }	Err	z3bra.org	70
i+        return -1	Err	z3bra.org	70
i+}	Err	z3bra.org	70
i+	Err	z3bra.org	70
i func pageToken() tview.Primitive {	Err	z3bra.org	70
i         input := tview.NewInputField().	Err	z3bra.org	70
i                 SetLabel("TOKEN ").	Err	z3bra.org	70
it@@ -100,7 +111,7 @@ func pageBoard() tview.Primitive {	Err	z3bra.org	70
i         cyboard.SetupFrame()	Err	z3bra.org	70
i         cyboard.DrawBoard()	Err	z3bra.org	70
i 	Err	z3bra.org	70
i-        return center(30, 20, cyboard.frame)	Err	z3bra.org	70
i+        return center(28, 19, cyboard.frame)	Err	z3bra.org	70
i }	Err	z3bra.org	70
i 	Err	z3bra.org	70
i func main() {	Err	z3bra.org	70
1diff --git a/player.go b/player.go	/scm/scoreboard/file/player.go.gph	z3bra.org	70
it@@ -88,6 +88,19 @@ func (p *Player) FlagRank() int {	Err	z3bra.org	70
i         return count	Err	z3bra.org	70
i }	Err	z3bra.org	70
i 	Err	z3bra.org	70
i+func (p *Player) FlagStr() string {	Err	z3bra.org	70
i+        var str [5]byte	Err	z3bra.org	70
i+        for i:=0; i <len(str); i++ {	Err	z3bra.org	70
i+                if i < p.flag {	Err	z3bra.org	70
i+                        str[i] = 'X'	Err	z3bra.org	70
i+                } else {	Err	z3bra.org	70
i+                        str[i] = '.'	Err	z3bra.org	70
i+                }	Err	z3bra.org	70
i+        }	Err	z3bra.org	70
i+	Err	z3bra.org	70
i+        return fmt.Sprintf("%s", str)	Err	z3bra.org	70
i+}	Err	z3bra.org	70
i+	Err	z3bra.org	70
i func (p *Player) Exists() bool {	Err	z3bra.org	70
i         forbidden := []string{"KKK", "WGS"}	Err	z3bra.org	70
i         for i := 0; i<len(forbidden); i++ {	Err	z3bra.org	70
it@@ -111,7 +124,7 @@ func (p *Player) Exists() bool {	Err	z3bra.org	70
i 	Err	z3bra.org	70
i func (p *Player) Submit(flag int) error {	Err	z3bra.org	70
i         if flag <= p.flag {	Err	z3bra.org	70
i-                return errors.New("Flag already submitted")	Err	z3bra.org	70
i+                return errors.New(fmt.Sprintf("Flag already set for %s", p.name))	Err	z3bra.org	70
i         }	Err	z3bra.org	70
i 	Err	z3bra.org	70
i         if flag != p.flag + 1 {	Err	z3bra.org	70
1diff --git a/playerbox.go b/playerbox.go	/scm/scoreboard/file/playerbox.go.gph	z3bra.org	70
it@@ -72,9 +72,9 @@ func PlayerBoxName(p Player) *tview.TextView {	Err	z3bra.org	70
i                                 p.name = fmt.Sprintf("%3s", playerbox.name)	Err	z3bra.org	70
i                                 if ! p.Exists() {	Err	z3bra.org	70
i                                         p.Register()	Err	z3bra.org	70
i-                                        cyboard.DrawBoard()	Err	z3bra.org	70
i+                                        cyboard.HighlightBoard(p.ScoreRank())	Err	z3bra.org	70
i                                 } else {	Err	z3bra.org	70
i-                                        cyboard.Popup("Error", "Player name unavailable\nPlease pick another one")	Err	z3bra.org	70
i+                                        cyboard.Popup("NOPE", "Player name unavailable\nPlease pick another one")	Err	z3bra.org	70
i                                 }	Err	z3bra.org	70
i                         }	Err	z3bra.org	70
i                 })	Err	z3bra.org	70
it@@ -109,7 +109,7 @@ func PlayerBoxGrid(p Player, rank int) *tview.Grid {	Err	z3bra.org	70
i                 SetRows(1).	Err	z3bra.org	70
i                 AddItem(gridcell(rankstr), 0, 0, 1, 1, 0, 0, false).	Err	z3bra.org	70
i                 AddItem(box, 0, 1, 1, 1, 0, 0, true).	Err	z3bra.org	70
i-                AddItem(gridcell(flag2str(p.flag)), 0, 2, 1, 1, 0, 0, false).	Err	z3bra.org	70
i+                AddItem(gridcell(p.FlagStr()), 0, 2, 1, 1, 0, 0, false).	Err	z3bra.org	70
i                 AddItem(playerbox.score, 0, 3, 1, 1, 0, 0, false)	Err	z3bra.org	70
i 	Err	z3bra.org	70
i         return grid	Err	z3bra.org	70
1diff --git a/ui.go b/ui.go	/scm/scoreboard/file/ui.go.gph	z3bra.org	70
it@@ -8,6 +8,17 @@ import (	Err	z3bra.org	70
i         "github.com/dustin/go-humanize"	Err	z3bra.org	70
i )	Err	z3bra.org	70
i 	Err	z3bra.org	70
i+func center(width, height int, p tview.Primitive) tview.Primitive {	Err	z3bra.org	70
i+        return tview.NewFlex().	Err	z3bra.org	70
i+                AddItem(nil, 0, 1, false).	Err	z3bra.org	70
i+                AddItem(tview.NewFlex().	Err	z3bra.org	70
i+                        SetDirection(tview.FlexRow).	Err	z3bra.org	70
i+                        AddItem(nil, 0, 1, false).	Err	z3bra.org	70
i+                        AddItem(p, height, 1, true).	Err	z3bra.org	70
i+                        AddItem(nil, 0, 1, false), width, 1, true).	Err	z3bra.org	70
i+                AddItem(nil, 0, 1, false)	Err	z3bra.org	70
i+}	Err	z3bra.org	70
i+	Err	z3bra.org	70
i func BoardHeader() *tview.TextView {	Err	z3bra.org	70
i         return tview.NewTextView().	Err	z3bra.org	70
i                 SetDynamicColors(true).	Err	z3bra.org	70
it@@ -22,17 +33,24 @@ func RankTable(offset, limit, rank int, fill bool) *tview.Table {	Err	z3bra.org	70
i                 panic(err)	Err	z3bra.org	70
i         }	Err	z3bra.org	70
i 	Err	z3bra.org	70
i+        newcell := func(text string) *tview.TableCell {	Err	z3bra.org	70
i+                return tview.NewTableCell(text).	Err	z3bra.org	70
i+                        SetTransparency(true).	Err	z3bra.org	70
i+                        SetSelectable(true).	Err	z3bra.org	70
i+                        SetAlign(tview.AlignRight).	Err	z3bra.org	70
i+                        SetExpansion(1)	Err	z3bra.org	70
i+        }	Err	z3bra.org	70
i+	Err	z3bra.org	70
i         t.SetSelectable(true, false).	Err	z3bra.org	70
i                 SetSelectedStyle(tcell.StyleDefault.Reverse(true))	Err	z3bra.org	70
i 	Err	z3bra.org	70
i         for i := 0; i < len(players); i++ {	Err	z3bra.org	70
i                 p := players[i]	Err	z3bra.org	70
i                 rankstr := fmt.Sprintf("%4s", humanize.Ordinal(rank + i + 1))	Err	z3bra.org	70
i-                flagstr := flag2str(p.flag)	Err	z3bra.org	70
i                 scorestr := fmt.Sprintf("%4d", p.score)	Err	z3bra.org	70
i                 t.SetCell(i, 0, newcell(rankstr))	Err	z3bra.org	70
i                 t.SetCell(i, 1, newcell(p.name))	Err	z3bra.org	70
i-                t.SetCell(i, 2, newcell(flagstr))	Err	z3bra.org	70
i+                t.SetCell(i, 2, newcell(p.FlagStr()))	Err	z3bra.org	70
i                 t.SetCell(i, 3, newcell(scorestr))	Err	z3bra.org	70
i         }	Err	z3bra.org	70
i 	Err	z3bra.org	70
it@@ -40,11 +58,10 @@ func RankTable(offset, limit, rank int, fill bool) *tview.Table {	Err	z3bra.org	70
i                 bsize := int(math.Max(float64(BOARD_HEIGHT), float64(limit)))	Err	z3bra.org	70
i                 for i:=t.GetRowCount(); i<bsize; i++ {	Err	z3bra.org	70
i                         rankstr  := fmt.Sprintf("%4s", humanize.Ordinal(rank + i + 1))	Err	z3bra.org	70
i-                        flagstr  := "....."	Err	z3bra.org	70
i                         scorestr := fmt.Sprintf("%4d", 0)	Err	z3bra.org	70
i                         t.SetCell(i, 0, newcell(rankstr).SetTextColor(tcell.ColorGray))	Err	z3bra.org	70
i                         t.SetCell(i, 1, newcell("AAA").SetTextColor(tcell.ColorGray))	Err	z3bra.org	70
i-                        t.SetCell(i, 2, newcell(flagstr).SetTextColor(tcell.ColorGray))	Err	z3bra.org	70
i+                        t.SetCell(i, 2, newcell(".....").SetTextColor(tcell.ColorGray))	Err	z3bra.org	70
i                         t.SetCell(i, 3, newcell(scorestr).SetTextColor(tcell.ColorGray))	Err	z3bra.org	70
i                 }	Err	z3bra.org	70
i         }	Err	z3bra.org	70
it@@ -54,25 +71,26 @@ func RankTable(offset, limit, rank int, fill bool) *tview.Table {	Err	z3bra.org	70
i 	Err	z3bra.org	70
i 	Err	z3bra.org	70
i func (a *Application) SetupFrame() {	Err	z3bra.org	70
i-        cyboard.frame.	Err	z3bra.org	70
i+        a.frame.	Err	z3bra.org	70
i                 SetColumns(BOARD_WIDTH).	Err	z3bra.org	70
i                 SetRows(1, BOARD_HEIGHT).	Err	z3bra.org	70
i                 SetBorders(true)	Err	z3bra.org	70
i 	Err	z3bra.org	70
i-        cyboard.frame.AddItem(BoardHeader(), 0, 0, 1, 1, 1, BOARD_WIDTH, false)	Err	z3bra.org	70
i-        cyboard.frame.AddItem(cyboard.board, 1, 0, 1, 1, BOARD_HEIGHT, BOARD_WIDTH, true)	Err	z3bra.org	70
i+        a.frame.AddItem(BoardHeader(), 0, 0, 1, 1, 1, BOARD_WIDTH, false)	Err	z3bra.org	70
i+        a.frame.AddItem(a.board, 1, 0, 1, 1, BOARD_HEIGHT, BOARD_WIDTH, true)	Err	z3bra.org	70
i }	Err	z3bra.org	70
i 	Err	z3bra.org	70
i func (a *Application) DrawBoard() {	Err	z3bra.org	70
i-        cyboard.board.Clear().	Err	z3bra.org	70
i+        a.board.Clear().	Err	z3bra.org	70
i                 SetDirection(tview.FlexRow).	Err	z3bra.org	70
i                 AddItem(RankTable(0, -1, 0, true), BOARD_HEIGHT, 1, true)	Err	z3bra.org	70
i }	Err	z3bra.org	70
i 	Err	z3bra.org	70
i func (a *Application) HighlightBoard(line int) {	Err	z3bra.org	70
i-        cyboard.board.Clear().	Err	z3bra.org	70
i+        a.board.Clear().	Err	z3bra.org	70
i                 SetDirection(tview.FlexRow).	Err	z3bra.org	70
i                 AddItem(RankTable(0, -1, 0, true).Select(line - 1, 0), BOARD_HEIGHT, 1, true)	Err	z3bra.org	70
i+        a.app.SetFocus(a.board)	Err	z3bra.org	70
i }	Err	z3bra.org	70
i 	Err	z3bra.org	70
i func (a *Application) NewPlayer(rank int) {	Err	z3bra.org	70
it@@ -86,53 +104,45 @@ func (a *Application) NewPlayer(rank int) {	Err	z3bra.org	70
i                 t1_sz = rank - 1	Err	z3bra.org	70
i                 t2_sz = BOARD_HEIGHT - rank - 1	Err	z3bra.org	70
i         }	Err	z3bra.org	70
i-        t1 := RankTable(offset, BOARD_HEIGHT, t1_sz, false).SetSelectable(false, false)	Err	z3bra.org	70
i+        t1 := RankTable(offset, t1_sz, rank - t1_sz - 1, false).SetSelectable(false, false)	Err	z3bra.org	70
i         t2 := RankTable(rank - 1, BOARD_HEIGHT, t2_sz, true).SetSelectable(false, false)	Err	z3bra.org	70
i-        box := PlayerBoxGrid(cyboard.player, rank)	Err	z3bra.org	70
i+        box := PlayerBoxGrid(a.player, rank)	Err	z3bra.org	70
i 	Err	z3bra.org	70
i-        cyboard.board.Clear().	Err	z3bra.org	70
i+        a.board.Clear().	Err	z3bra.org	70
i                 SetDirection(tview.FlexRow).	Err	z3bra.org	70
i-                AddItem(t1, rank-1, 0, false).	Err	z3bra.org	70
i+                AddItem(t1, t1_sz, 0, false).	Err	z3bra.org	70
i                 AddItem(box, 1, 0, true).	Err	z3bra.org	70
i-                AddItem(t2, BOARD_HEIGHT - rank, 0, false)	Err	z3bra.org	70
i+                AddItem(t2, t2_sz, 0, false)	Err	z3bra.org	70
i }	Err	z3bra.org	70
i 	Err	z3bra.org	70
i-func (a *Application) Popup(title, text string) {	Err	z3bra.org	70
i+func popup(title, text string, callback func(key tcell.Key)) tview.Primitive {	Err	z3bra.org	70
i         p := tview.NewTextView().	Err	z3bra.org	70
i                 SetDynamicColors(true).	Err	z3bra.org	70
i                 SetTextAlign(tview.AlignCenter).	Err	z3bra.org	70
i-                SetText("[::b]" + text).	Err	z3bra.org	70
i-                SetDoneFunc(func(key tcell.Key) {	Err	z3bra.org	70
i-                        a.pages.RemovePage("popup")	Err	z3bra.org	70
i-                })	Err	z3bra.org	70
i-	Err	z3bra.org	70
i-        frame := tview.NewFrame(p).	Err	z3bra.org	70
i-                SetBorders(1, 0, 2, 2, 1, 1).	Err	z3bra.org	70
i-                AddText("Press RET", false, tview.AlignRight, tcell.ColorGray)	Err	z3bra.org	70
i+                SetText(fmt.Sprintf("[::b]%s", text)).	Err	z3bra.org	70
i+                SetDoneFunc(callback)	Err	z3bra.org	70
i 	Err	z3bra.org	70
i-        frame.SetBorder(true).SetTitle(title)	Err	z3bra.org	70
i+        popup := tview.NewFrame(p).	Err	z3bra.org	70
i+                SetBorders(7, 0, 0, 0, 1, 1).	Err	z3bra.org	70
i+                AddText("PRESS ENTER", false, tview.AlignRight, tcell.ColorGray)	Err	z3bra.org	70
i 	Err	z3bra.org	70
i-        c := center(30, 8, frame)	Err	z3bra.org	70
i+        popup.SetBorder(true).SetTitle(fmt.Sprintf(" %s ", title))	Err	z3bra.org	70
i 	Err	z3bra.org	70
i-        a.pages.AddAndSwitchToPage("popup", c, true)	Err	z3bra.org	70
i+        return center(28, 19, popup)	Err	z3bra.org	70
i }	Err	z3bra.org	70
i 	Err	z3bra.org	70
i-func (a *Application) Fatal(err error) {	Err	z3bra.org	70
i-        p := tview.NewTextView().	Err	z3bra.org	70
i-                SetDynamicColors(true).	Err	z3bra.org	70
i-                SetTextAlign(tview.AlignCenter).	Err	z3bra.org	70
i-                SetText(fmt.Sprintf("[::b]%s", err)).	Err	z3bra.org	70
i-                SetDoneFunc(func(key tcell.Key) {	Err	z3bra.org	70
i-                        a.app.Stop()	Err	z3bra.org	70
i-                })	Err	z3bra.org	70
i-	Err	z3bra.org	70
i-        frame := tview.NewFrame(p).	Err	z3bra.org	70
i-                SetBorders(1, 0, 2, 2, 1, 1).	Err	z3bra.org	70
i-                AddText("Press RET", false, tview.AlignRight, tcell.ColorGray)	Err	z3bra.org	70
i+func (a *Application) Popup(title, text string) {	Err	z3bra.org	70
i+        p := popup(title, text, func(key tcell.Key) {	Err	z3bra.org	70
i+                a.pages.RemovePage("popup")	Err	z3bra.org	70
i+        })	Err	z3bra.org	70
i 	Err	z3bra.org	70
i-        frame.SetBorder(true).SetTitle(" ERROR ")	Err	z3bra.org	70
i+        a.pages.AddAndSwitchToPage("popup", p, true)	Err	z3bra.org	70
i+}	Err	z3bra.org	70
i 	Err	z3bra.org	70
i-        c := center(30, 8, frame)	Err	z3bra.org	70
i+func (a *Application) Fatal(err error) {	Err	z3bra.org	70
i+        p := popup("ERROR", fmt.Sprintf("%s", err), func(key tcell.Key) {	Err	z3bra.org	70
i+                a.app.Stop()	Err	z3bra.org	70
i+        })	Err	z3bra.org	70
i 	Err	z3bra.org	70
i-        a.pages.AddAndSwitchToPage("fatal", c, true)	Err	z3bra.org	70
i+        a.pages.AddAndSwitchToPage("popup", p, true)	Err	z3bra.org	70
i }	Err	z3bra.org	70
.