hotfix: move save data to DB (#2)

* start reading save data from DB

* finish migration code

* remove leftover dir creation

* fix import cycle

* remove more dir creation

* update gitignore

* fix pk

* better table creation

* use REPLACE INTO

* fix typo

api/savedata/clear.go

@@ -18,14 +18,10 @@
 package savedata
 
 import (
-	"encoding/hex"
 	"fmt"
-	"log"
-	"os"
-	"strconv"
-
 	"github.com/pagefaultgames/rogueserver/db"
 	"github.com/pagefaultgames/rogueserver/defs"
+	"log"
 )
 
 type ClearResponse struct {
@@ -66,14 +62,9 @@ func Clear(uuid []byte, slot int, seed string, save defs.SessionSaveData) (Clear
 		}
 	}
 
-	fileName := "session"
-	if slot != 0 {
-		fileName += strconv.Itoa(slot)
-	}
-
-	err = os.Remove(fmt.Sprintf("userdata/%s/%s.pzs", hex.EncodeToString(uuid), fileName))
-	if err != nil && !os.IsNotExist(err) {
-		return response, fmt.Errorf("failed to delete save file: %s", err)
+	err = db.DeleteSessionSaveData(uuid, slot)
+	if err != nil {
+		log.Printf("failed to delete session save data: %s", err)
 	}
 
 	return response, nil

api/savedata/common.go

@@ -18,71 +18,9 @@
 package savedata
 
 import (
-	"encoding/gob"
-	"encoding/hex"
-	"fmt"
-	"os"
-	"strconv"
-
-	"github.com/klauspost/compress/zstd"
 	"github.com/pagefaultgames/rogueserver/defs"
 )
 
-func readSystemSaveData(uuid []byte) (defs.SystemSaveData, error) {
-	var system defs.SystemSaveData
-
-	file, err := os.Open("userdata/" + hex.EncodeToString(uuid) + "/system.pzs")
-	if err != nil {
-		return system, fmt.Errorf("failed to open save file for reading: %s", err)
-	}
-
-	defer file.Close()
-
-	zstdDecoder, err := zstd.NewReader(file)
-	if err != nil {
-		return system, fmt.Errorf("failed to create zstd decoder: %s", err)
-	}
-
-	defer zstdDecoder.Close()
-
-	err = gob.NewDecoder(zstdDecoder).Decode(&system)
-	if err != nil {
-		return system, fmt.Errorf("failed to deserialize save: %s", err)
-	}
-
-	return system, nil
-}
-
-func readSessionSaveData(uuid []byte, slotID int) (defs.SessionSaveData, error) {
-	var session defs.SessionSaveData
-
-	fileName := "session"
-	if slotID != 0 {
-		fileName += strconv.Itoa(slotID)
-	}
-
-	file, err := os.Open(fmt.Sprintf("userdata/%s/%s.pzs", hex.EncodeToString(uuid), fileName))
-	if err != nil {
-		return session, fmt.Errorf("failed to open save file for reading: %s", err)
-	}
-
-	defer file.Close()
-
-	zstdDecoder, err := zstd.NewReader(file)
-	if err != nil {
-		return session, fmt.Errorf("failed to create zstd decoder: %s", err)
-	}
-
-	defer zstdDecoder.Close()
-
-	err = gob.NewDecoder(zstdDecoder).Decode(&session)
-	if err != nil {
-		return session, fmt.Errorf("failed to deserialize save: %s", err)
-	}
-
-	return session, nil
-}
-
 func validateSessionCompleted(session defs.SessionSaveData) bool {
 	switch session.GameMode {
 	case 0:

api/savedata/delete.go

@@ -19,12 +19,9 @@ package savedata
 
 import (
 	"fmt"
-	"log"
-	"os"
-	"strconv"
-
 	"github.com/pagefaultgames/rogueserver/db"
 	"github.com/pagefaultgames/rogueserver/defs"
+	"log"
 )
 
 // /savedata/delete - delete save data
@@ -36,27 +33,14 @@ func Delete(uuid []byte, datatype, slot int) error {
 
 	switch datatype {
 	case 0: // System
-		err := os.Remove(fmt.Sprintf("userdata/%x/system.pzs", uuid))
-		if err != nil && !os.IsNotExist(err) {
-			return fmt.Errorf("failed to delete save file: %s", err)
-		}
+		return db.DeleteSystemSaveData(uuid)
 	case 1: // Session
 		if slot < 0 || slot >= defs.SessionSlotCount {
 			return fmt.Errorf("slot id %d out of range", slot)
 		}
 
-		fileName := "session"
-		if slot != 0 {
-			fileName += strconv.Itoa(slot)
-		}
-
-		err = os.Remove(fmt.Sprintf("userdata/%x/%s.pzs", uuid, fileName))
-		if err != nil && !os.IsNotExist(err) {
-			return fmt.Errorf("failed to delete save file: %s", err)
-		}
+		return db.DeleteSessionSaveData(uuid, slot)
 	default:
 		return fmt.Errorf("invalid data type")
 	}
-
-	return nil
 }

api/savedata/get.go

@@ -29,7 +29,11 @@ import (
 func Get(uuid []byte, datatype, slot int) (any, error) {
 	switch datatype {
 	case 0: // System
-		system, err := readSystemSaveData(uuid)
+		if slot != 0 {
+			return nil, fmt.Errorf("invalid slot id for system data")
+		}
+
+		system, err := db.ReadSystemSaveData(uuid)
 		if err != nil {
 			return nil, err
 		}
@@ -49,7 +53,7 @@ func Get(uuid []byte, datatype, slot int) (any, error) {
 			return nil, fmt.Errorf("slot id %d out of range", slot)
 		}
 
-		session, err := readSessionSaveData(uuid, slot)
+		session, err := db.ReadSessionSaveData(uuid, slot)
 		if err != nil {
 			return nil, err
 		}

api/savedata/update.go

@@ -18,11 +18,8 @@
 package savedata
 
 import (
-	"bytes"
-	"encoding/gob"
 	"fmt"
 	"log"
-	"os"
 	"strconv"
 
 	"github.com/klauspost/compress/zstd"
@@ -39,13 +36,6 @@ func Update(uuid []byte, slot int, save any) error {
 		log.Print("failed to update account last activity")
 	}
 
-	// ideally should have been done at account creation
-	err = os.MkdirAll(fmt.Sprintf("userdata/%x", uuid), 0755)
-	if err != nil && !os.IsExist(err) {
-		return fmt.Errorf(fmt.Sprintf("failed to create userdata folder: %s", err))
-	}
-
-	var filename string
 	switch save := save.(type) {
 	case defs.SystemSaveData: // System
 		if save.TrainerId == 0 && save.SecretId == 0 {
@@ -61,36 +51,26 @@ func Update(uuid []byte, slot int, save any) error {
 			return fmt.Errorf("failed to update account stats: %s", err)
 		}
 
-		filename = "system"
+		err = db.DeleteClaimedAccountCompensations(uuid)
+		if err != nil {
+			return fmt.Errorf("failed to delete claimed compensations: %s", err)
+		}
+
+		return db.StoreSystemSaveData(uuid, save)
 
-		db.DeleteClaimedAccountCompensations(uuid)
 	case defs.SessionSaveData: // Session
 		if slot < 0 || slot >= defs.SessionSlotCount {
 			return fmt.Errorf("slot id %d out of range", slot)
 		}
 
-		filename = "session"
+		filename := "session"
 		if slot != 0 {
 			filename += strconv.Itoa(slot)
 		}
+
+		return db.StoreSessionSaveData(uuid, save, slot)
+
 	default:
 		return fmt.Errorf("invalid data type")
 	}
-
-	var buf bytes.Buffer
-	err = gob.NewEncoder(&buf).Encode(save)
-	if err != nil {
-		return fmt.Errorf("failed to serialize save: %s", err)
-	}
-
-	if buf.Len() == 0 {
-		return fmt.Errorf("tried to write empty save file")
-	}
-
-	err = os.WriteFile(fmt.Sprintf("userdata/%x/%s.pzs", uuid, filename), zstdEncoder.EncodeAll(buf.Bytes(), nil), 0644)
-	if err != nil {
-		return fmt.Errorf("failed to write save to disk: %s", err)
-	}
-
-	return nil
 }