chore: Move state/SRAM path funcs into console package

This fixes Ebiten being included in `gonesutil` builds
gabe565 · Oct 3, 2024 · cb0f7f6 · cb0f7f6
1 parent 84f8e73
commit cb0f7f6
Show file tree

Hide file tree

Showing 7 changed files with 26 additions and 26 deletions.
diff --git a/internal/cartridge/path_js.go b/internal/cartridge/path_js.go
diff --git a/internal/cartridge/path.go → internal/console/path.go b/internal/cartridge/path.go → internal/console/path.go
@@ -1,6 +1,6 @@
 //go:build !js
 
-package cartridge
+package console
 
 import (
 	"fmt"
@@ -9,22 +9,22 @@ import (
 	"github.com/gabe565/gones/internal/config"
 )
 
-func (c *Cartridge) SRAMPath() (string, error) {
+func (c *Console) SRAMPath() (string, error) {
 	sramDir, err := config.GetSRAMDir()
 	if err != nil {
 		return "", err
 	}
 
-	sramName := c.hash + ".sav"
+	sramName := c.Cartridge.Hash() + ".sav"
 	return filepath.Join(sramDir, sramName), nil
 }
 
-func (c *Cartridge) StatePath(num uint8) (string, error) {
+func (c *Console) StatePath(num uint8) (string, error) {
 	statesDir, err := config.GetStatesDir()
 	if err != nil {
 		return "", err
 	}
 
-	stateName := fmt.Sprintf("%s.%d.state.gz", c.hash, num)
+	stateName := fmt.Sprintf("%s.%d.state.gz", c.Cartridge.Hash(), num)
 	return filepath.Join(statesDir, stateName), nil
 }
diff --git a/internal/console/path_js.go b/internal/console/path_js.go
@@ -0,0 +1,13 @@
+package console
+
+import (
+	"fmt"
+)
+
+func (c *Console) SRAMPath() (string, error) {
+	return fmt.Sprintf("%s.sav", c.Cartridge.Hash()), nil
+}
+
+func (c *Console) StatePath(num uint8) (string, error) {
+	return fmt.Sprintf("%s.%d.state.gz", c.Cartridge.Hash(), num), nil
+}
diff --git a/internal/console/savestate.go b/internal/console/savestate.go
@@ -10,7 +10,7 @@ import (
 )
 
 func (c *Console) SaveStateNum(num uint8, createUndo bool) error {
-	path, err := c.Cartridge.StatePath(num)
+	path, err := c.StatePath(num)
 	if err != nil {
 		return err
 	}
@@ -54,7 +54,7 @@ func (c *Console) SaveStateNum(num uint8, createUndo bool) error {
 }
 
 func (c *Console) LoadStateNum(num uint8) error {
-	path, err := c.Cartridge.StatePath(num)
+	path, err := c.StatePath(num)
 	if err != nil {
 		return err
 	}

diff --git a/internal/console/savestate_js.go b/internal/console/savestate_js.go
@@ -9,7 +9,7 @@ import (
 )
 
 func (c *Console) SaveStateNum(num uint8, createUndo bool) error {
-	path, err := c.Cartridge.StatePath(num)
+	path, err := c.StatePath(num)
 	if err != nil {
 		return err
 	}
@@ -42,7 +42,7 @@ func (c *Console) SaveStateNum(num uint8, createUndo bool) error {
 }
 
 func (c *Console) LoadStateNum(num uint8) error {
-	path, err := c.Cartridge.StatePath(num)
+	path, err := c.StatePath(num)
 	if err != nil {
 		return err
 	}

diff --git a/internal/console/sram.go b/internal/console/sram.go
@@ -14,7 +14,7 @@ func (c *Console) SaveSRAM() error {
 		return nil
 	}
 
-	path, err := c.Cartridge.SRAMPath()
+	path, err := c.SRAMPath()
 	if err != nil {
 		return err
 	}
@@ -37,7 +37,7 @@ func (c *Console) LoadSRAM() error {
 		return nil
 	}
 
-	path, err := c.Cartridge.SRAMPath()
+	path, err := c.SRAMPath()
 	if err != nil {
 		return err
 	}

diff --git a/internal/console/sram_js.go b/internal/console/sram_js.go
@@ -12,7 +12,7 @@ func (c *Console) SaveSRAM() error {
 		return nil
 	}
 
-	path, err := c.Cartridge.SRAMPath()
+	path, err := c.SRAMPath()
 	if err != nil {
 		return err
 	}
@@ -30,7 +30,7 @@ func (c *Console) LoadSRAM() error {
 		return nil
 	}
 
-	path, err := c.Cartridge.SRAMPath()
+	path, err := c.SRAMPath()
 	if err != nil {
 		return err
 	}