fix nil-map assignment

logic.go → game/game.go

@@ -1,4 +1,4 @@
-package main
+package game
 
 import (
 	"crypto/rand"
@@ -53,18 +53,19 @@ type logic struct {
 }
 
 func (g *logic) simonSays(ctx app.Context, sequence []int64) {
-	go func() {
+	fmt.Println(sequence)
+	ctx.Async(func() {
 		<-time.After(200 * time.Millisecond)
 		for _, btnIndex := range sequence {
 			ctx.NewAction(fmt.Sprintf(ui.EventPlayButton, btnIndex))
 			<-time.After(time.Second)
 		}
 		g.state = gameStatePlayerSays
 		ctx.NewActionWithValue(ui.EventStateChange, "Repeat what Simon said...")
-	}()
+	})
 }
 
-func (g *logic) handleNewGame(ctx app.Context, a app.Action) {
+func (g *logic) HandleNewGame(ctx app.Context, a app.Action) {
 	d, ok := a.Value.(storage.Difficulty)
 	if !ok {
 		fmt.Println("wrong type")
@@ -79,7 +80,7 @@ func (g *logic) handleNewGame(ctx app.Context, a app.Action) {
 	g.simonSays(ctx, g.sequence)
 }
 
-func (g *logic) handleClick(ctx app.Context, a app.Action) {
+func (g *logic) HandleClick(ctx app.Context, a app.Action) {
 	if g.state != gameStatePlayerSays {
 		return
 	}

main.go

@@ -6,6 +6,7 @@ import (
 	"net/http"
 	"time"
 
+	"github.com/jan-xyz/simon-says/game"
 	"github.com/jan-xyz/simon-says/ui"
 	"github.com/maxence-charriere/go-app/v9/pkg/app"
 )
@@ -14,15 +15,15 @@ func main() {
 	serve := flag.Bool("serve", false, "set to serve instead of generating resources")
 	flag.Parse()
 
-	l := NewLogic()
+	l := game.NewLogic()
 	// TODO: abstract storage behind useful API
 	// TODO: calculate statistics
 	// TODO: for endless mode add histogram of how far you got.
 	// TODO: add tests
 	// TODO: add dependabot
 	// TODO: add linter
-	app.Handle(ui.EventClick, l.handleClick)
-	app.Handle(ui.EventNewGame, l.handleNewGame)
+	app.Handle(ui.EventClick, l.HandleClick)
+	app.Handle(ui.EventNewGame, l.HandleNewGame)
 
 	g := ui.NewUI()
 	app.Route("/", g)

storage/scores.go

@@ -1,8 +1,6 @@
 package storage
 
 import (
-	"reflect"
-
 	"github.com/maxence-charriere/go-app/v9/pkg/app"
 )
 
@@ -30,6 +28,14 @@ type Score struct {
 	Loss int
 }
 
+func newScores() Scores {
+	return Scores{Basic: map[Difficulty]Score{
+		Easy:   {},
+		Medium: {},
+		Hard:   {},
+	}, Endless: map[int]int{}}
+}
+
 func IncrementEasyLoss(ctx app.Context) {
 	IncrementLoss(ctx, Easy)
 }
@@ -43,15 +49,8 @@ func IncrementHardLoss(ctx app.Context) {
 }
 
 func IncrementLoss(ctx app.Context, d Difficulty) {
-	s := Scores{}
+	s := newScores()
 	ctx.LocalStorage().Get(localStorageScores, &s)
-	if reflect.DeepEqual(s, &Scores{}) {
-		s = Scores{Basic: map[Difficulty]Score{
-			Easy:   {},
-			Medium: {},
-			Hard:   {},
-		}, Endless: map[int]int{}}
-	}
 	if d != Endless {
 		f := s.Basic[d]
 		f.Loss++
@@ -62,15 +61,8 @@ func IncrementLoss(ctx app.Context, d Difficulty) {
 }
 
 func UpdateEndless(ctx app.Context, stage int) {
-	s := Scores{}
+	s := newScores()
 	ctx.LocalStorage().Get(localStorageScores, &s)
-	if reflect.DeepEqual(s, &Scores{}) {
-		s = Scores{Basic: map[Difficulty]Score{
-			Easy:   {},
-			Medium: {},
-			Hard:   {},
-		}, Endless: map[int]int{}}
-	}
 	s.Endless[stage]++
 	ctx.LocalStorage().Set(localStorageScores, s)
 	ctx.NewActionWithValue(EventScoreUpdate, s)
@@ -89,15 +81,8 @@ func IncrementHardWin(ctx app.Context) {
 }
 
 func IncrementWin(ctx app.Context, d Difficulty) {
-	s := Scores{}
+	s := newScores()
 	ctx.LocalStorage().Get(localStorageScores, &s)
-	if reflect.DeepEqual(s, &Scores{}) {
-		s = Scores{Basic: map[Difficulty]Score{
-			Easy:   {},
-			Medium: {},
-			Hard:   {},
-		}, Endless: map[int]int{}}
-	}
 	f := s.Basic[d]
 	f.Win++
 	s.Basic[d] = f
@@ -106,14 +91,7 @@ func IncrementWin(ctx app.Context, d Difficulty) {
 }
 
 func LoadScores(ctx app.Context) Scores {
-	s := Scores{}
+	s := newScores()
 	ctx.LocalStorage().Get(localStorageScores, &s)
-	if reflect.DeepEqual(s, &Scores{}) {
-		s = Scores{Basic: map[Difficulty]Score{
-			Easy:   {},
-			Medium: {},
-			Hard:   {},
-		}, Endless: map[int]int{}}
-	}
 	return s
 }