[bugfix] Fix duration formatting and match duration on restarts

Author: g3force

internal/app/controller/engine.go

@@ -9,11 +9,10 @@ import (
 )
 
 type Engine struct {
-	State          *State
-	MatchTimeStart time.Time
-	StageTimes     map[Stage]time.Duration
-	config         ConfigGame
-	StateHistory   []State
+	State        *State
+	StageTimes   map[Stage]time.Duration
+	config       ConfigGame
+	StateHistory []State
 }
 
 func NewEngine(config ConfigGame) (e Engine) {
@@ -29,17 +28,14 @@ func (e *Engine) ResetGame() {
 	e.State.TeamState[TeamYellow].TimeoutTimeLeft = e.config.Normal.TimeoutDuration
 	e.State.TeamState[TeamBlue].TimeoutsLeft = e.config.Normal.Timeouts
 	e.State.TeamState[TeamYellow].TimeoutsLeft = e.config.Normal.Timeouts
-
-	e.MatchTimeStart = time.Unix(0, 0)
-
 }
 
 // Tick updates the times of the state and removes cards, if necessary
 func (e *Engine) Tick(delta time.Duration) {
 	e.updateTimes(delta)
 
-	if e.MatchTimeStart.After(time.Unix(0, 0)) {
-		e.State.MatchDuration = time.Now().Sub(e.MatchTimeStart)
+	if e.State.MatchTimeStart.After(time.Unix(0, 0)) {
+		e.State.MatchDuration = time.Now().Sub(e.State.MatchTimeStart)
 	}
 }
 
@@ -231,7 +227,7 @@ func (e *Engine) updateStage(stage Stage) (cmd *EventCommand) {
 	}
 
 	if stage == StageFirstHalf {
-		e.MatchTimeStart = time.Now()
+		e.State.MatchTimeStart = time.Now()
 	}
 
 	if stage == StageOvertimeFirstHalfPre {

internal/app/controller/state.go

@@ -165,6 +165,7 @@ type State struct {
 	GameStateFor     *Team              `json:"gameStateForTeam"`
 	StageTimeElapsed time.Duration      `json:"gameTimeElapsed"`
 	StageTimeLeft    time.Duration      `json:"gameTimeLeft"`
+	MatchTimeStart   time.Time          `json:"matchTimeStart"`
 	MatchDuration    time.Duration      `json:"matchDuration"`
 	TeamState        map[Team]*TeamInfo `json:"teamState"`
 }
@@ -175,10 +176,10 @@ func NewState() (s *State) {
 	s.Stage = StagePreGame
 	s.GameState = GameStateHalted
 
-	// for some reason, the UI does not reset times correctly if duration is zero, so set it to 1ns
-	s.StageTimeLeft = 1
-	s.StageTimeElapsed = 1
-	s.MatchDuration = 1
+	s.StageTimeLeft = 0
+	s.StageTimeElapsed = 0
+	s.MatchDuration = 0
+	s.MatchTimeStart = time.Unix(0, 0)
 
 	s.TeamState = map[Team]*TeamInfo{}
 	s.TeamState[TeamYellow] = new(TeamInfo)

ui/src/TimestampFormatter.js

@@ -13,8 +13,17 @@ const formatNsDuration = function (timestamp) {
     return sign + padWithZero(minutes) + ':' + padWithZero(fullSeconds);
 };
 
+const isNumeric = function (n) {
+    return !isNaN(parseFloat(n)) && isFinite(n);
+};
+
 const process = function (el, binding) {
-    const timestamp = binding.value || el.innerHTML;
+    let timestamp;
+    if (isNumeric(binding.value)) {
+        timestamp = binding.value;
+    } else {
+        timestamp = el.innerHTML;
+    }
     if (!isNaN(timestamp)) {
         el.innerHTML = formatNsDuration(timestamp);
     }