feat(info): show score properly

crispgm · Jul 17, 2024 · 68208eb · 68208eb
1 parent 5d381eb
commit 68208eb
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 6 deletions.
diff --git a/cmd/kicker-cli/cmd/event_info.go b/cmd/kicker-cli/cmd/event_info.go
@@ -8,6 +8,7 @@ import (
 	"github.com/spf13/cobra"
 
 	"github.com/crispgm/kicker-cli/internal/entity"
+	"github.com/crispgm/kicker-cli/pkg/ktool/model"
 )
 
 var showScore bool
@@ -35,20 +36,20 @@ var eventInfoCmd = &cobra.Command{
 		table := initEventInfoHeader()
 		t, r := loadAndShowEventInfo(&table, instance.DataPath(), instance.Conf.Players, e)
 		_ = pterm.DefaultTable.WithHasHeader(!globalNoHeaders).WithData(table).WithBoxed(!globalNoBoxes).Render()
-		table = showGames(r.PreliminaryRounds)
+		table = showGames(r.PreliminaryRounds, t.Options)
 		if len(table) > 0 {
 			pterm.Println("Rounds:")
 			_ = pterm.DefaultTable.WithHasHeader(false).WithData(table).WithBoxed(!globalNoBoxes).Render()
 		}
 		sort.SliceStable(r.LoserBracket, func(i, j int) bool {
 			return true
 		})
-		table = showGames(r.LoserBracket)
+		table = showGames(r.LoserBracket, t.Options)
 		if len(table) > 0 {
 			pterm.Println("Loser Bracket:")
 			_ = pterm.DefaultTable.WithHasHeader(false).WithData(table).WithBoxed(!globalNoBoxes).Render()
 		}
-		table = showGames(r.WinnerBracket)
+		table = showGames(r.WinnerBracket, t.Options)
 		if len(table) > 0 {
 			pterm.Println("Winner Bracket:")
 			_ = pterm.DefaultTable.WithHasHeader(false).WithData(table).WithBoxed(!globalNoBoxes).Render()
@@ -62,14 +63,14 @@ var eventInfoCmd = &cobra.Command{
 	},
 }
 
-func showGames(games []entity.Game) [][]string {
+func showGames(games []entity.Game, options model.Options) [][]string {
 	var table [][]string
 	if len(games) == 0 {
 		return table
 	}
 	numOfSets := len(games[0].Sets)
-	if numOfSets == 1 {
-		showScore = true
+	if numOfSets == 1 && options.FastInput {
+		showScore = false
 	}
 
 	if showScore {

diff --git a/internal/converter/converter.go b/internal/converter/converter.go
@@ -341,6 +341,8 @@ func (c Converter) convertPlayToGame(
 					game.Point2++
 				} else {
 					// draw
+					game.Point1++
+					game.Point2++
 				}
 			}
 			break // only support one discipline right now

diff --git a/pkg/ktool/model/knockoff.go b/pkg/ktool/model/knockoff.go
@@ -7,6 +7,12 @@ type KnockOff struct {
 	Levels     []Level `json:"levels"`
 	LeftLevels []Level `json:"leftLevels"`
 	Third      Level   `json:"third"`
+
+	Options    Options `json:"options"`
+	ThirdPlace bool    `json:"thirdPlace"`
+	Double     bool    `json:"double"`
+	Size       int     `json:"size"`
+	Finished   bool    `json:"bool"`
 }
 
 // Level .

diff --git a/pkg/ktool/model/tournament.go b/pkg/ktool/model/tournament.go
@@ -38,6 +38,7 @@ type Options struct {
 	NumPoints  int    `json:"numPoints"`
 	NumSets    int    `json:"numSets"`
 	TwoAhead   bool   `json:"twoAhead"`
+	FastInput  bool   `json:"fastInput"`
 	Draw       bool   `json:"draw"`
 	PointsWin  int    `json:"pointsWin"`
 	PointsDraw int    `json:"pointsDraw"`