itMake board editable in-place - 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 7689f88f24595ca9afe38cecab41bfc4e3c29473	/scm/scoreboard/commit/7689f88f24595ca9afe38cecab41bfc4e3c29473.gph	z3bra.org	70
1parent 54deea3d092677422021864f23df5cb091f0a0ec	/scm/scoreboard/commit/54deea3d092677422021864f23df5cb091f0a0ec.gph	z3bra.org	70
hAuthor: Willy Goiffon <contact@z3bra.org>	URL:mailto:contact@z3bra.org	z3bra.org	70
iDate:   Mon,  5 Dec 2022 13:11:10 +0100	Err	z3bra.org	70
i	Err	z3bra.org	70
iMake board editable in-place	Err	z3bra.org	70
i	Err	z3bra.org	70
iDiffstat:	Err	z3bra.org	70
i  M db.go                               |      58 +++++++++++++++++++++++++------	Err	z3bra.org	70
i  M main.go                             |     173 +++++++------------------------	Err	z3bra.org	70
i  M mkfile                              |       2 +-	Err	z3bra.org	70
i  M playerbox.go                        |      12 ++++++------	Err	z3bra.org	70
i  A ui.go                               |      86 ++++++++++++++++++++++++++++++	Err	z3bra.org	70
i  M util.go                             |       2 +-	Err	z3bra.org	70
i	Err	z3bra.org	70
i6 files changed, 178 insertions(+), 155 deletions(-)	Err	z3bra.org	70
i---	Err	z3bra.org	70
1diff --git a/db.go b/db.go	/scm/scoreboard/file/db.go.gph	z3bra.org	70
it@@ -38,15 +38,39 @@ const (	Err	z3bra.org	70
i         `	Err	z3bra.org	70
i )	Err	z3bra.org	70
i 	Err	z3bra.org	70
i-func db_count() int {	Err	z3bra.org	70
i+	Err	z3bra.org	70
i+func (a *Application) db_init(file string) error {	Err	z3bra.org	70
i+        var err error	Err	z3bra.org	70
i+	Err	z3bra.org	70
i+        // open database	Err	z3bra.org	70
i+        a.db, err = sql.Open("sqlite", file)	Err	z3bra.org	70
i+        if err != nil {	Err	z3bra.org	70
i+                return err	Err	z3bra.org	70
i+        }	Err	z3bra.org	70
i+	Err	z3bra.org	70
i+        // create schema if needed	Err	z3bra.org	70
i+        _, err = a.db.Exec(DB_CREATE)	Err	z3bra.org	70
i+        if err != nil {	Err	z3bra.org	70
i+                return err	Err	z3bra.org	70
i+        }	Err	z3bra.org	70
i+        /*	Err	z3bra.org	70
i+        _, err = a.db.Exec(DB_FILL)	Err	z3bra.org	70
i+        if err != nil {	Err	z3bra.org	70
i+                panic(err)	Err	z3bra.org	70
i+        }	Err	z3bra.org	70
i+        //*/	Err	z3bra.org	70
i+        return nil	Err	z3bra.org	70
i+}	Err	z3bra.org	70
i+	Err	z3bra.org	70
i+func (a *Application) db_count() int {	Err	z3bra.org	70
i         var count int	Err	z3bra.org	70
i         query := `SELECT count(id) FROM score;`	Err	z3bra.org	70
i-        row := db.QueryRow(query)	Err	z3bra.org	70
i+        row := a.db.QueryRow(query)	Err	z3bra.org	70
i         row.Scan(&count)	Err	z3bra.org	70
i         return count	Err	z3bra.org	70
i }	Err	z3bra.org	70
i 	Err	z3bra.org	70
i-func db_rank(score int, ts int64) int {	Err	z3bra.org	70
i+func (a *Application) db_rank(score int, ts int64) int {	Err	z3bra.org	70
i         var rank int	Err	z3bra.org	70
i         query := `SELECT	Err	z3bra.org	70
i           count(id)	Err	z3bra.org	70
it@@ -55,12 +79,26 @@ func db_rank(score int, ts int64) int {	Err	z3bra.org	70
i             score >= ?	Err	z3bra.org	70
i         ;`	Err	z3bra.org	70
i 	Err	z3bra.org	70
i-        row := db.QueryRow(query, score)	Err	z3bra.org	70
i+        row := a.db.QueryRow(query, score)	Err	z3bra.org	70
i         row.Scan(&rank)	Err	z3bra.org	70
i         return rank + 1	Err	z3bra.org	70
i }	Err	z3bra.org	70
i 	Err	z3bra.org	70
i-func db_ranked(offset, limit int) ([]Player, error) {	Err	z3bra.org	70
i+func (a *Application) db_count_flag(flag int) int {	Err	z3bra.org	70
i+        var count int	Err	z3bra.org	70
i+        query := `SELECT	Err	z3bra.org	70
i+          count(id)	Err	z3bra.org	70
i+          FROM score	Err	z3bra.org	70
i+          WHERE	Err	z3bra.org	70
i+            flags >= ?	Err	z3bra.org	70
i+        ;`	Err	z3bra.org	70
i+	Err	z3bra.org	70
i+        row := a.db.QueryRow(query, flag)	Err	z3bra.org	70
i+        row.Scan(&count)	Err	z3bra.org	70
i+        return count	Err	z3bra.org	70
i+}	Err	z3bra.org	70
i+	Err	z3bra.org	70
i+func (a *Application) db_ranked(offset, limit int) ([]Player, error) {	Err	z3bra.org	70
i         query := `SELECT	Err	z3bra.org	70
i           id,name,token,flag,score	Err	z3bra.org	70
i           FROM score	Err	z3bra.org	70
it@@ -71,7 +109,7 @@ func db_ranked(offset, limit int) ([]Player, error) {	Err	z3bra.org	70
i           OFFSET ?	Err	z3bra.org	70
i         ;`	Err	z3bra.org	70
i 	Err	z3bra.org	70
i-        rows, err := db.Query(query, limit, offset)	Err	z3bra.org	70
i+        rows, err := a.db.Query(query, limit, offset)	Err	z3bra.org	70
i         if err != nil {	Err	z3bra.org	70
i                 return nil, err	Err	z3bra.org	70
i         }	Err	z3bra.org	70
it@@ -89,11 +127,11 @@ func db_ranked(offset, limit int) ([]Player, error) {	Err	z3bra.org	70
i         return players, nil	Err	z3bra.org	70
i }	Err	z3bra.org	70
i 	Err	z3bra.org	70
i-func db_player(id int) *Player {	Err	z3bra.org	70
i+func (a *Application) db_player(id int) *Player {	Err	z3bra.org	70
i         var p Player	Err	z3bra.org	70
i         query := `SELECT id,name,token,flag,score,ts FROM score WHERE id = ?`	Err	z3bra.org	70
i 	Err	z3bra.org	70
i-        row := db.QueryRow(query, p.id)	Err	z3bra.org	70
i+        row := a.db.QueryRow(query, p.id)	Err	z3bra.org	70
i         err := row.Scan(&p.id, &p.name, &p.token, &p.flags, &p.score)	Err	z3bra.org	70
i         if err == sql.ErrNoRows {	Err	z3bra.org	70
i                 return nil	Err	z3bra.org	70
it@@ -102,9 +140,9 @@ func db_player(id int) *Player {	Err	z3bra.org	70
i         return &p	Err	z3bra.org	70
i }	Err	z3bra.org	70
i 	Err	z3bra.org	70
i-func db_save(p Player) int64 {	Err	z3bra.org	70
i+func (a *Application) db_save(p Player) int64 {	Err	z3bra.org	70
i         query := `INSERT INTO score(name,token,flag,score,ts) VALUES(?,?,?,?,?);`	Err	z3bra.org	70
i-        r, err := db.Exec(query, p.name, p.token, p.flags, p.score, p.ts)	Err	z3bra.org	70
i+        r, err := a.db.Exec(query, p.name, p.token, p.flags, p.score, p.ts)	Err	z3bra.org	70
i         if err != nil {	Err	z3bra.org	70
i                 panic(err)	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@@ -17,21 +17,20 @@ package main	Err	z3bra.org	70
i import (	Err	z3bra.org	70
i         "flag"	Err	z3bra.org	70
i         "fmt"	Err	z3bra.org	70
i-        "math"	Err	z3bra.org	70
i         "os"	Err	z3bra.org	70
i         "regexp"	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
i         "github.com/rivo/tview"	Err	z3bra.org	70
i-        "github.com/dustin/go-humanize"	Err	z3bra.org	70
i         //"golang.org/x/crypto/argon2"	Err	z3bra.org	70
i 	Err	z3bra.org	70
i         _ "modernc.org/sqlite"	Err	z3bra.org	70
i )	Err	z3bra.org	70
i 	Err	z3bra.org	70
i const (	Err	z3bra.org	70
i-        BOARD_SIZE int = 15	Err	z3bra.org	70
i+        BOARD_WIDTH int = 26	Err	z3bra.org	70
i+        BOARD_HEIGHT int = 15	Err	z3bra.org	70
i         DB string = "leaderboard.db"	Err	z3bra.org	70
i )	Err	z3bra.org	70
i 	Err	z3bra.org	70
it@@ -45,10 +44,12 @@ type Player struct {	Err	z3bra.org	70
i }	Err	z3bra.org	70
i 	Err	z3bra.org	70
i type Application struct {	Err	z3bra.org	70
i+        db *sql.DB	Err	z3bra.org	70
i         app *tview.Application	Err	z3bra.org	70
i         pages *tview.Pages	Err	z3bra.org	70
i         frame *tview.Grid	Err	z3bra.org	70
i-        board *tview.Grid	Err	z3bra.org	70
i+        board *tview.Flex	Err	z3bra.org	70
i+        player Player	Err	z3bra.org	70
i }	Err	z3bra.org	70
i 	Err	z3bra.org	70
i var flag_sha256 = [...]string {	Err	z3bra.org	70
it@@ -59,20 +60,12 @@ var flag_sha256 = [...]string {	Err	z3bra.org	70
i         "8CB250A66D4301244699186CA723E11AFA806C64466789AB14B7027A2F928BF8", // egg.png	Err	z3bra.org	70
i         "F6A4071C9C0DDCCB53FC1CDCA38E32CF10551F75AA48996A9341842A7EF2591B"} // salt.png	Err	z3bra.org	70
i 	Err	z3bra.org	70
i-//var Application {	Err	z3bra.org	70
i-//        app: tview.NewApplication(),	Err	z3bra.org	70
i-//        frame: BoardFrame(26, 15),	Err	z3bra.org	70
i-//        pages: tview.NewPages(),	Err	z3bra.org	70
i-//        board: tview.NewTable(),	Err	z3bra.org	70
i-//}	Err	z3bra.org	70
i 	Err	z3bra.org	70
i-var app = tview.NewApplication()	Err	z3bra.org	70
i-var pages = tview.NewPages()	Err	z3bra.org	70
i-var db *sql.DB	Err	z3bra.org	70
i-var player = Player{	Err	z3bra.org	70
i-        score: 100,	Err	z3bra.org	70
i-        flags:  1,	Err	z3bra.org	70
i-        ts:  time.Now().Unix(),	Err	z3bra.org	70
i+var cyboard = Application{	Err	z3bra.org	70
i+        app: tview.NewApplication(),	Err	z3bra.org	70
i+        pages: tview.NewPages(),	Err	z3bra.org	70
i+        frame: tview.NewGrid(),	Err	z3bra.org	70
i+        board: tview.NewFlex(),	Err	z3bra.org	70
i }	Err	z3bra.org	70
i 	Err	z3bra.org	70
i func usage() {	Err	z3bra.org	70
it@@ -80,41 +73,6 @@ 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-func RankTable(t *tview.Table, offset, limit, rank int, fill bool) (*tview.Table) {	Err	z3bra.org	70
i-        players, err := db_ranked(offset, limit)	Err	z3bra.org	70
i-        if err != nil {	Err	z3bra.org	70
i-                panic(err)	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))	Err	z3bra.org	70
i-                flagstr := flag2str(p.flags)	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, 3, newcell(scorestr))	Err	z3bra.org	70
i-        }	Err	z3bra.org	70
i-	Err	z3bra.org	70
i-        if fill == true {	Err	z3bra.org	70
i-                for i:=t.GetRowCount(); i<limit; i++ {	Err	z3bra.org	70
i-                        rankstr  := fmt.Sprintf("%4s", humanize.Ordinal(rank + i))	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, 3, newcell(scorestr).SetTextColor(tcell.ColorGray))	Err	z3bra.org	70
i-                }	Err	z3bra.org	70
i-        }	Err	z3bra.org	70
i-	Err	z3bra.org	70
i-        return t	Err	z3bra.org	70
i-}	Err	z3bra.org	70
i-	Err	z3bra.org	70
i func pageFlag() tview.Primitive {	Err	z3bra.org	70
i         input := tview.NewInputField().	Err	z3bra.org	70
i                 SetLabel("SHA256(flag) ").	Err	z3bra.org	70
it@@ -132,9 +90,9 @@ func pageFlag() tview.Primitive {	Err	z3bra.org	70
i         input.SetDoneFunc(func(key tcell.Key) {	Err	z3bra.org	70
i                         switch flagid(input.GetText()) {	Err	z3bra.org	70
i                         case 0,1,2,3,4:	Err	z3bra.org	70
i-                                pages.SwitchToPage("score")	Err	z3bra.org	70
i+                                cyboard.pages.SwitchToPage("score")	Err	z3bra.org	70
i                         default:	Err	z3bra.org	70
i-                                app.Stop()	Err	z3bra.org	70
i+                                cyboard.app.Stop()	Err	z3bra.org	70
i                                 fmt.Println("Incorrect flag")	Err	z3bra.org	70
i                         }	Err	z3bra.org	70
i                 })	Err	z3bra.org	70
it@@ -142,68 +100,14 @@ func pageFlag() tview.Primitive {	Err	z3bra.org	70
i         return center(40, 1, input)	Err	z3bra.org	70
i }	Err	z3bra.org	70
i 	Err	z3bra.org	70
i-func pageScore() tview.Primitive {	Err	z3bra.org	70
i-        board := tview.NewGrid().	Err	z3bra.org	70
i-                SetColumns(26).	Err	z3bra.org	70
i-                SetRows(1, BOARD_SIZE).	Err	z3bra.org	70
i-                SetBorders(true)	Err	z3bra.org	70
i-	Err	z3bra.org	70
i-        header := tview.NewTextView().	Err	z3bra.org	70
i-                SetDynamicColors(true).	Err	z3bra.org	70
i-                SetTextAlign(tview.AlignRight).	Err	z3bra.org	70
i-                SetText("[::b] RANK  NAME  FLAGS  SCORE ")	Err	z3bra.org	70
i-	Err	z3bra.org	70
i-        //count := db_count()	Err	z3bra.org	70
i-        rank := db_rank(player.score, player.ts)	Err	z3bra.org	70
i-	Err	z3bra.org	70
i-        grid := PlayerBoxGrid(player, rank)	Err	z3bra.org	70
i-	Err	z3bra.org	70
i-        //if (count < BOARD_SIZE - 1) {	Err	z3bra.org	70
i-                t1 := tview.NewTable()	Err	z3bra.org	70
i-                t2 := tview.NewTable()	Err	z3bra.org	70
i-                RankTable(t1, 0, rank-1, 1, false)	Err	z3bra.org	70
i-                RankTable(t2, rank, BOARD_SIZE - rank, rank + 1, true)	Err	z3bra.org	70
i-        //}	Err	z3bra.org	70
i-	Err	z3bra.org	70
i-        table := tview.NewFlex().	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(grid, 1, 0, true).	Err	z3bra.org	70
i-                AddItem(t2, BOARD_SIZE - rank - 1, 0, false)	Err	z3bra.org	70
i-	Err	z3bra.org	70
i-        board.AddItem(header, 0, 0, 1, 1, 1, 26, false)	Err	z3bra.org	70
i-        board.AddItem(table, 1, 0, 1, 1, 1, 26, true)	Err	z3bra.org	70
i-	Err	z3bra.org	70
i-        return center(30, 20, board)	Err	z3bra.org	70
i-}	Err	z3bra.org	70
i-	Err	z3bra.org	70
i func pageBoard() tview.Primitive {	Err	z3bra.org	70
i-        bsize := int(math.Max(float64(db_count()), float64(BOARD_SIZE)))	Err	z3bra.org	70
i-        board := tview.NewGrid().	Err	z3bra.org	70
i-                SetColumns(26).	Err	z3bra.org	70
i-                SetRows(1, bsize).	Err	z3bra.org	70
i-                SetBorders(true)	Err	z3bra.org	70
i-	Err	z3bra.org	70
i-        header := tview.NewTextView().	Err	z3bra.org	70
i-                SetDynamicColors(true).	Err	z3bra.org	70
i-                SetTextAlign(tview.AlignRight).	Err	z3bra.org	70
i-                SetText("[::b] RANK  NAME  FLAGS  SCORE ")	Err	z3bra.org	70
i-	Err	z3bra.org	70
i-        rank := db_rank(player.score, time.Now().Unix())	Err	z3bra.org	70
i-	Err	z3bra.org	70
i-        table := tview.NewTable()	Err	z3bra.org	70
i-        RankTable(table, 0, bsize, 1, true)	Err	z3bra.org	70
i-        table.SetOffset(rank, 0)	Err	z3bra.org	70
i-	Err	z3bra.org	70
i-        board.AddItem(header, 0, 0, 1, 1, 1, 26, false)	Err	z3bra.org	70
i-        board.AddItem(table, 1, 0, 1, 1, 1, 26, true)	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, board)	Err	z3bra.org	70
i+        return center(30, 20, cyboard.frame)	Err	z3bra.org	70
i }	Err	z3bra.org	70
i 	Err	z3bra.org	70
i func main() {	Err	z3bra.org	70
i-        var err error	Err	z3bra.org	70
i-	Err	z3bra.org	70
i         cmd := "board"	Err	z3bra.org	70
i 	Err	z3bra.org	70
i         flag.Parse()	Err	z3bra.org	70
it@@ -227,51 +131,46 @@ func main() {	Err	z3bra.org	70
i         tview.Styles.GraphicsColor            = tcell.ColorDefault	Err	z3bra.org	70
i         tview.Styles.PrimaryTextColor         = tcell.ColorDefault	Err	z3bra.org	70
i 	Err	z3bra.org	70
i-        // open database	Err	z3bra.org	70
i-        db, err = sql.Open("sqlite", DB)	Err	z3bra.org	70
i-        if err != nil {	Err	z3bra.org	70
i-                panic(err)	Err	z3bra.org	70
i-        }	Err	z3bra.org	70
i-        defer db.Close()	Err	z3bra.org	70
i+        cyboard.db_init(DB)	Err	z3bra.org	70
i+        defer cyboard.db.Close()	Err	z3bra.org	70
i 	Err	z3bra.org	70
i-        // create schema if needed	Err	z3bra.org	70
i-        _, err = db.Exec(DB_CREATE)	Err	z3bra.org	70
i-        if err != nil {	Err	z3bra.org	70
i-                panic(err)	Err	z3bra.org	70
i-        }	Err	z3bra.org	70
i-        //_, err = db.Exec(DB_FILL)	Err	z3bra.org	70
i-        //if err != nil {	Err	z3bra.org	70
i-        //        panic(err)	Err	z3bra.org	70
i-        //}	Err	z3bra.org	70
i-        pages.SetBackgroundColor(tcell.ColorDefault)	Err	z3bra.org	70
i+        cyboard.pages.SetBackgroundColor(tcell.ColorDefault)	Err	z3bra.org	70
i 	Err	z3bra.org	70
i-        pages.AddPage("flag",   pageFlag(), true, false)	Err	z3bra.org	70
i-        pages.AddPage("score",  pageScore(), true, false)	Err	z3bra.org	70
i-        pages.AddPage("board",  pageBoard(), true, false)	Err	z3bra.org	70
i+        cyboard.pages.AddPage("flag",   pageFlag(), true, false)	Err	z3bra.org	70
i+        cyboard.pages.AddPage("board",  pageBoard(), true, false)	Err	z3bra.org	70
i 	Err	z3bra.org	70
i         switch cmd {	Err	z3bra.org	70
i-        case "prompt":	Err	z3bra.org	70
i-                pages.ShowPage("flag")	Err	z3bra.org	70
i         case "flag":	Err	z3bra.org	70
i                 if (len(args) < 2) {	Err	z3bra.org	70
i                         usage()	Err	z3bra.org	70
i                 }	Err	z3bra.org	70
i                 switch flagid(args[1]) {	Err	z3bra.org	70
i                 case 0:	Err	z3bra.org	70
i-                        if db_count() < 10 {	Err	z3bra.org	70
i-                                player.score += 10 - db_count()	Err	z3bra.org	70
i+                        cyboard.player.flags = 1	Err	z3bra.org	70
i+                        cyboard.player.score = 100	Err	z3bra.org	70
i+                        cyboard.player.ts = time.Now().Unix()	Err	z3bra.org	70
i+	Err	z3bra.org	70
i+                        /* Bonus points for the first 10 players to get first flag */	Err	z3bra.org	70
i+                        n := cyboard.db_count()	Err	z3bra.org	70
i+                        if n < 10 {	Err	z3bra.org	70
i+                                cyboard.player.score += 10 - n	Err	z3bra.org	70
i                         }	Err	z3bra.org	70
i-                        pages.SwitchToPage("score")	Err	z3bra.org	70
i+	Err	z3bra.org	70
i+                        rank := cyboard.db_rank(cyboard.player.score, cyboard.player.ts)	Err	z3bra.org	70
i+	Err	z3bra.org	70
i+                        cyboard.NewPlayer(rank)	Err	z3bra.org	70
i+                        cyboard.pages.SwitchToPage("board")	Err	z3bra.org	70
i                 //case 1,2,3,4:	Err	z3bra.org	70
i                 //        pages.ShowPage("token")	Err	z3bra.org	70
i                 default:	Err	z3bra.org	70
i                         fmt.Println("Incorrect flag")	Err	z3bra.org	70
i                 }	Err	z3bra.org	70
i         default:	Err	z3bra.org	70
i-                pages.SwitchToPage("board")	Err	z3bra.org	70
i+                cyboard.DrawBoard()	Err	z3bra.org	70
i+                cyboard.pages.SwitchToPage("board")	Err	z3bra.org	70
i         }	Err	z3bra.org	70
i 	Err	z3bra.org	70
i-        if err := app.SetRoot(pages, true).EnableMouse(true).Run(); err != nil {	Err	z3bra.org	70
i+        if err := cyboard.app.SetRoot(cyboard.pages, true).EnableMouse(true).Run(); err != nil {	Err	z3bra.org	70
i                 panic(err)	Err	z3bra.org	70
i         }	Err	z3bra.org	70
i }	Err	z3bra.org	70
1diff --git a/mkfile b/mkfile	/scm/scoreboard/file/mkfile.gph	z3bra.org	70
it@@ -1,4 +1,4 @@	Err	z3bra.org	70
i GO = go	Err	z3bra.org	70
i 	Err	z3bra.org	70
i-scoreboard: main.go db.go playerbox.go util.go	Err	z3bra.org	70
i+scoreboard: main.go db.go playerbox.go util.go ui.go	Err	z3bra.org	70
i         ${GO} build	Err	z3bra.org	70
1diff --git a/playerbox.go b/playerbox.go	/scm/scoreboard/file/playerbox.go.gph	z3bra.org	70
it@@ -24,7 +24,7 @@ func boxtext (b PlayerBox) string {	Err	z3bra.org	70
i         for i:=0; i<3; i++ {	Err	z3bra.org	70
i                 b.name[i] = charlist[b.char[i]]	Err	z3bra.org	70
i                 if i == b.cur {	Err	z3bra.org	70
i-                        str = fmt.Sprintf("%s[::r]%c[::-]", str, b.name[i])	Err	z3bra.org	70
i+                        str = fmt.Sprintf("%s[::rl]%c[::-]", str, b.name[i])	Err	z3bra.org	70
i                 } else {	Err	z3bra.org	70
i                         str = fmt.Sprintf("%s%c", str, b.name[i])	Err	z3bra.org	70
i                 }	Err	z3bra.org	70
it@@ -65,18 +65,18 @@ func PlayerBoxName(p Player) *tview.TextView {	Err	z3bra.org	70
i                 SetTextAlign(tview.AlignRight).	Err	z3bra.org	70
i                 SetText(boxtext(playerbox)).	Err	z3bra.org	70
i                 SetChangedFunc(func() {	Err	z3bra.org	70
i-                        app.Draw()	Err	z3bra.org	70
i+                        cyboard.app.Draw()	Err	z3bra.org	70
i                 }).	Err	z3bra.org	70
i                 SetDoneFunc(func(key tcell.Key) {	Err	z3bra.org	70
i                         if key == tcell.KeyEnter {	Err	z3bra.org	70
i                                 p.name = fmt.Sprintf("%3s", playerbox.name)	Err	z3bra.org	70
i-                                db_save(p)	Err	z3bra.org	70
i-                                pages.SwitchToPage("board")	Err	z3bra.org	70
i+                                cyboard.db_save(p)	Err	z3bra.org	70
i+                                cyboard.pages.SwitchToPage("board")	Err	z3bra.org	70
i                         }	Err	z3bra.org	70
i                 })	Err	z3bra.org	70
i 	Err	z3bra.org	70
i         v.Focus(func(p tview.Primitive) {	Err	z3bra.org	70
i-                v.SetText(fmt.Sprintf("%4d ", player.score))	Err	z3bra.org	70
i+                v.SetText(fmt.Sprintf("%4d ", cyboard.player.score))	Err	z3bra.org	70
i         })	Err	z3bra.org	70
i 	Err	z3bra.org	70
i         v.SetInputCapture(manipulatebox)	Err	z3bra.org	70
it@@ -89,7 +89,7 @@ func PlayerBoxGrid(p Player, rank int) *tview.Grid {	Err	z3bra.org	70
i                 return tview.NewTextView().	Err	z3bra.org	70
i                         SetDynamicColors(true).	Err	z3bra.org	70
i                         SetTextAlign(tview.AlignRight).	Err	z3bra.org	70
i-                        SetText(fmt.Sprintf("[::l]%s",text))	Err	z3bra.org	70
i+                        SetText(fmt.Sprintf("[::b]%s",text))	Err	z3bra.org	70
i         }	Err	z3bra.org	70
i 	Err	z3bra.org	70
i         rankstr := humanize.Ordinal(rank)	Err	z3bra.org	70
1diff --git a/ui.go b/ui.go	/scm/scoreboard/file/ui.go.gph	z3bra.org	70
it@@ -0,0 +1,86 @@	Err	z3bra.org	70
i+package main	Err	z3bra.org	70
i+	Err	z3bra.org	70
i+import (	Err	z3bra.org	70
i+        "fmt"	Err	z3bra.org	70
i+        "math"	Err	z3bra.org	70
i+        "github.com/gdamore/tcell/v2"	Err	z3bra.org	70
i+        "github.com/rivo/tview"	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 BoardHeader() *tview.TextView {	Err	z3bra.org	70
i+        return tview.NewTextView().	Err	z3bra.org	70
i+                SetDynamicColors(true).	Err	z3bra.org	70
i+                SetTextAlign(tview.AlignRight).	Err	z3bra.org	70
i+                SetText("[::b] RANK  NAME  FLAGS  SCORE ")	Err	z3bra.org	70
i+}	Err	z3bra.org	70
i+	Err	z3bra.org	70
i+func RankTable(offset, limit, rank int, fill bool) *tview.Table {	Err	z3bra.org	70
i+        t := tview.NewTable()	Err	z3bra.org	70
i+        if limit < 0 {	Err	z3bra.org	70
i+                limit = cyboard.db_count()	Err	z3bra.org	70
i+        }	Err	z3bra.org	70
i+        players, err := cyboard.db_ranked(offset, limit)	Err	z3bra.org	70
i+        if err != nil {	Err	z3bra.org	70
i+                panic(err)	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.flags)	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, 3, newcell(scorestr))	Err	z3bra.org	70
i+        }	Err	z3bra.org	70
i+	Err	z3bra.org	70
i+        if fill == true {	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, 3, newcell(scorestr).SetTextColor(tcell.ColorGray))	Err	z3bra.org	70
i+                }	Err	z3bra.org	70
i+        }	Err	z3bra.org	70
i+	Err	z3bra.org	70
i+        return t	Err	z3bra.org	70
i+}	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+                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+}	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+                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) NewPlayer(rank int) {	Err	z3bra.org	70
i+        t1 := RankTable(0, BOARD_HEIGHT, 0, false).SetSelectable(false, false)	Err	z3bra.org	70
i+        t2 := RankTable(rank - 1, BOARD_HEIGHT, rank, true).SetSelectable(false, false)	Err	z3bra.org	70
i+        box := PlayerBoxGrid(cyboard.player, rank)	Err	z3bra.org	70
i+	Err	z3bra.org	70
i+        cyboard.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(box, 1, 0, true).	Err	z3bra.org	70
i+                AddItem(t2, BOARD_HEIGHT - rank, 0, false)	Err	z3bra.org	70
i+}	Err	z3bra.org	70
i+	Err	z3bra.org	70
1diff --git a/util.go b/util.go	/scm/scoreboard/file/util.go.gph	z3bra.org	70
it@@ -43,7 +43,7 @@ func flag2str(n int) string {	Err	z3bra.org	70
i func newcell(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(false).	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
.