refactor: load/save state as ptr

This commit is contained in:
Ilia Denisov
2026-01-12 19:30:50 +02:00
parent ac60bb3020
commit 4451850f22
18 changed files with 71 additions and 57 deletions
+15 -15
View File
@@ -18,11 +18,11 @@ const (
statePath = "state.json"
)
func (r *repo) SaveTurn(t uint, g game.Game) error {
func (r *repo) SaveTurn(t uint, g *game.Game) error {
return saveTurn(r.s, t, g)
}
func saveTurn(s Storage, t uint, g game.Game) error {
func saveTurn(s Storage, t uint, g *game.Game) error {
path := fmt.Sprintf("%03d/state.json", t)
exist, err := s.Exists(path)
if err != nil {
@@ -42,46 +42,46 @@ func saveTurn(s Storage, t uint, g game.Game) error {
return saveState(s, g) // FIXME: either save it here, or in tre repo controller
}
func saveRace(s Storage, g game.Game, i int) {
func saveRace(s Storage, g *game.Game, i int) {
}
func (r *repo) SaveState(g game.Game) error {
func (r *repo) SaveState(g *game.Game) error {
return saveState(r.s, g)
}
func saveState(s Storage, g game.Game) error {
func saveState(s Storage, g *game.Game) error {
if err := s.Write(statePath, g); err != nil {
return NewStorageError(err)
}
return nil
}
func (r *repo) LoadState() (game.Game, error) {
func (r *repo) LoadState() (*game.Game, error) {
return loadState(r.s, true)
}
func (r *repo) LoadStateSafe() (game.Game, error) {
func (r *repo) LoadStateSafe() (*game.Game, error) {
return loadState(r.s, false)
}
func loadState(s Storage, locked bool) (game.Game, error) {
var g game.Game
func loadState(s Storage, locked bool) (*game.Game, error) {
var g *game.Game = new(game.Game)
path := statePath
exist, err := s.Exists(path)
if err != nil {
return g, NewStorageError(err)
return nil, NewStorageError(err)
}
if !exist {
return g, NewGameNotInitializedError()
return nil, NewGameNotInitializedError()
}
if locked {
if err := s.Read(path, &g); err != nil {
return g, NewStorageError(err)
if err := s.Read(path, g); err != nil {
return nil, NewStorageError(err)
}
} else {
if err := s.ReadSafe(path, &g); err != nil {
return g, NewStorageError(err)
if err := s.ReadSafe(path, g); err != nil {
return nil, NewStorageError(err)
}
}
return g, nil