Clean up savedata.go

* long blob

* fix continue

* one slot only?

* fallback if there is no slot data yet

* Revert "one slot only?"

This reverts commit 20997e9cd8.

api/account/info.go

@@ -18,11 +18,7 @@
 package account
 
 import (
-	"fmt"
-	"os"
-	"strconv"
-	"time"
-
+	"github.com/pagefaultgames/rogueserver/db"
 	"github.com/pagefaultgames/rogueserver/defs"
 )
 
@@ -33,24 +29,24 @@ type InfoResponse struct {
 
 // /account/info - get account info
 func Info(username string, uuid []byte) (InfoResponse, error) {
-	var latestSave time.Time
-	latestSaveID := -1
-	for id := range defs.SessionSlotCount {
-		fileName := "session"
-		if id != 0 {
-			fileName += strconv.Itoa(id)
-		}
+	response := InfoResponse{Username: username, LastSessionSlot: -1}
 
-		stat, err := os.Stat(fmt.Sprintf("userdata/%x/%s.pzs", uuid, fileName))
+	highest := -1
+	for i := 0; i < defs.SessionSlotCount; i++ {
+		data, err := db.ReadSessionSaveData(uuid, i)
 		if err != nil {
 			continue
 		}
 
-		if stat.ModTime().After(latestSave) {
-			latestSave = stat.ModTime()
-			latestSaveID = id
+		if data.Timestamp > highest {
+			highest = data.Timestamp
+			response.LastSessionSlot = i
 		}
 	}
 
-	return InfoResponse{Username: username, LastSessionSlot: latestSaveID}, nil
+	if response.LastSessionSlot < 0 || response.LastSessionSlot >= defs.SessionSlotCount {
+		response.LastSessionSlot = -1
+	}
+
+	return response, nil
 }

db/db.go

@@ -42,8 +42,8 @@ func Init(username, password, protocol, address, database string) error {
 	if err != nil {
 		panic(err)
 	}
-	tx.Exec("CREATE TABLE IF NOT EXISTS systemSaveData (uuid BINARY(16) PRIMARY KEY, data BLOB, timestamp TIMESTAMP)")
-	tx.Exec("CREATE TABLE IF NOT EXISTS sessionSaveData (uuid BINARY(16), slot TINYINT, data BLOB, timestamp TIMESTAMP, PRIMARY KEY (uuid, slot))")
+	tx.Exec("CREATE TABLE IF NOT EXISTS systemSaveData (uuid BINARY(16) PRIMARY KEY, data LONGBLOB, timestamp TIMESTAMP)")
+	tx.Exec("CREATE TABLE IF NOT EXISTS sessionSaveData (uuid BINARY(16), slot TINYINT, data LONGBLOB, timestamp TIMESTAMP, PRIMARY KEY (uuid, slot))")
 	err = tx.Commit()
 	if err != nil {
 		panic(err)

db/savedata.go

@@ -20,6 +20,7 @@ package db
 import (
 	"bytes"
 	"encoding/gob"
+
 	"github.com/pagefaultgames/rogueserver/defs"
 )
 
@@ -41,46 +42,74 @@ func TryAddDailyRunCompletion(uuid []byte, seed string, mode int) (bool, error)
 }
 
 func ReadSystemSaveData(uuid []byte) (defs.SystemSaveData, error) {
+	var system defs.SystemSaveData
+
 	var data []byte
 	err := handle.QueryRow("SELECT data FROM systemSaveData WHERE uuid = ?", uuid).Scan(&data)
-
-	reader := bytes.NewReader(data)
-	system := defs.SystemSaveData{}
-	err = gob.NewDecoder(reader).Decode(&system)
+	if err != nil {
 		return system, err
 	}
 
-func StoreSystemSaveData(uuid []byte, data defs.SystemSaveData) error {
+	err = gob.NewDecoder(bytes.NewReader(data)).Decode(&system)
+	if err != nil {
+		return system, err
+	}
 
+	return system, nil
+}
+
+func StoreSystemSaveData(uuid []byte, data defs.SystemSaveData) error {
 	var buf bytes.Buffer
 	err := gob.NewEncoder(&buf).Encode(data)
 	if err != nil {
 		return err
 	}
 
-	_, err = handle.Exec("INSERT INTO systemSaveData (uuid, data, timestamp) VALUES (?, ?, UTC_TIMESTAMP()) ON DUPLICATE KEY UPDATE data = VALUES(data), timestamp = VALUES(timestamp)", uuid, buf.Bytes())
-
+	_, err = handle.Exec("REPLACE INTO systemSaveData (uuid, data, timestamp) VALUES (?, ?, UTC_TIMESTAMP())", uuid, buf.Bytes())
+	if err != nil {
 		return err
 	}
 
+	return nil
+}
+
 func DeleteSystemSaveData(uuid []byte) error {
 	_, err := handle.Exec("DELETE FROM systemSaveData WHERE uuid = ?", uuid)
+	if err != nil {
 		return err
 	}
 
+	return nil
+}
+
 func ReadSessionSaveData(uuid []byte, slot int) (defs.SessionSaveData, error) {
+	var session defs.SessionSaveData
+
 	var data []byte
 	err := handle.QueryRow("SELECT data FROM sessionSaveData WHERE uuid = ? AND slot = ?", uuid, slot).Scan(&data)
+	if err != nil {
+		return session, err
+	}
 
-	reader := bytes.NewReader(data)
-	save := defs.SessionSaveData{}
-	err = gob.NewDecoder(reader).Decode(&save)
+	err = gob.NewDecoder(bytes.NewReader(data)).Decode(&session)
+	if err != nil {
+		return session, err
+	}
 
-	return save, err
+	return session, nil
+}
+
+func GetLatestSessionSaveDataSlot(uuid []byte) (int, error) {
+	var slot int
+	err := handle.QueryRow("SELECT slot FROM sessionSaveData WHERE uuid = ? ORDER BY timestamp DESC, slot ASC LIMIT 1", uuid).Scan(&slot)
+	if err != nil {
+		return -1, err
+	}
+
+	return slot, nil
 }
 
 func StoreSessionSaveData(uuid []byte, data defs.SessionSaveData, slot int) error {
-
 	var buf bytes.Buffer
 	err := gob.NewEncoder(&buf).Encode(data)
 	if err != nil {
@@ -88,11 +117,18 @@ func StoreSessionSaveData(uuid []byte, data defs.SessionSaveData, slot int) erro
 	}
 
 	_, err = handle.Exec("REPLACE INTO sessionSaveData (uuid, slot, data, timestamp) VALUES (?, ?, ?, UTC_TIMESTAMP())", uuid, slot, buf.Bytes())
-
+	if err != nil {
 		return err
 	}
 
+	return nil
+}
+
 func DeleteSessionSaveData(uuid []byte, slot int) error {
 	_, err := handle.Exec("DELETE FROM sessionSaveData WHERE uuid = ? AND slot = ?", uuid, slot)
+	if err != nil {
 		return err
 	}
+
+	return nil
+}