Allow deleting savestates (#436)

menu/scene.go

@@ -232,16 +232,36 @@ func askQuitConfirmation(cb func()) {
 	}
 }
 
-// Displays a confirmation dialog before deleting a playlist entry
-func askDeleteConfirmation(cb func()) {
+// Displays a confirmation dialog before deleting a playlist game entry
+func askDeleteGameConfirmation(cb func()) {
 	menu.Push(buildYesNoDialog(
 		"Confirm before deleting",
-		"You are about to delete a menu entry.",
+		"You are about to delete a game entry.",
 		"Games and game data won't be removed.", func() {
 			cb()
 		}))
 }
 
+// Displays a confirmation dialog before deleting a playlist
+func askDeletePlaylistConfirmation(cb func()) {
+	menu.Push(buildYesNoDialog(
+		"Confirm before deleting",
+		"You are about to delete a playlist.",
+		"Games and game data won't be removed.", func() {
+			cb()
+		}))
+}
+
+// Displays a confirmation dialog before deleting a savestate
+func askDeleteSavestateConfirmation(cb func()) {
+	menu.Push(buildYesNoDialog(
+		"Confirm before deleting",
+		"You are about to delete a savestate.",
+		"This action is irreversible.", func() {
+			cb()
+		}))
+}
+
 func genericDrawHintBar() {
 	w, h := menu.GetFramebufferSize()
 	menu.DrawRect(0, float32(h)-70*menu.ratio, float32(w), 70*menu.ratio, 0, lightGrey)

menu/scene_history.go

@@ -30,7 +30,7 @@ func buildHistory() Scene {
 			system:     game.System,
 			tags:       tags,
 			callbackOK: func() { loadHistoryEntry(&list, game) },
-			callbackX:  func() { askDeleteConfirmation(func() { deleteHistoryEntry(&list, game) }) },
+			callbackX:  func() { askDeleteGameConfirmation(func() { deleteHistoryEntry(&list, game) }) },
 		})
 	}
 

menu/scene_playlist.go

@@ -33,7 +33,7 @@ func buildPlaylist(path string) Scene {
 			tags:       tags,
 			icon:       utils.FileName(path) + "-content",
 			callbackOK: func() { loadPlaylistEntry(&list, list.label, game) },
-			callbackX:  func() { askDeleteConfirmation(func() { deletePlaylistEntry(&list, path, game) }) },
+			callbackX:  func() { askDeleteGameConfirmation(func() { deletePlaylistEntry(&list, path, game) }) },
 		})
 	}
 

menu/scene_savestates.go

@@ -1,6 +1,7 @@
 package menu
 
 import (
+	"os"
 	"path/filepath"
 	"sort"
 	"strings"
@@ -60,6 +61,7 @@ func buildSavestates() Scene {
 					ntf.DisplayAndLog(ntf.Success, "Menu", "State loaded.")
 				}
 			},
+			callbackX: func() { askDeleteSavestateConfirmation(func() { deleteSavestateEntry(&list, path) }) },
 		})
 	}
 
@@ -88,6 +90,30 @@ func (s *sceneSavestates) update(dt float32) {
 	genericInput(&s.entry, dt)
 }
 
+func removeSavestateEntry(s []entry, path string) []entry {
+	l := []entry{}
+	for _, e := range s {
+		if e.path != path {
+			l = append(l, e)
+		}
+	}
+
+	return l
+}
+
+func deleteSavestateEntry(list *sceneSavestates, path string) {
+	err := os.Remove(path)
+	if err != nil {
+		ntf.DisplayAndLog(ntf.Error, "Menu", "Could not delete savestate: %s", err.Error())
+		return
+	}
+	list.children = removeSavestateEntry(list.children, path)
+	if list.ptr >= len(list.children) {
+		list.ptr = len(list.children) - 1
+	}
+	genericAnimate(&list.entry)
+}
+
 // Override rendering
 func (s *sceneSavestates) render() {
 	list := &s.entry
@@ -140,7 +166,7 @@ func (s *sceneSavestates) drawHintBar() {
 
 	ptr := menu.stack[len(menu.stack)-1].Entry().ptr
 
-	_, upDown, _, a, b, _, _, _, _, guide := hintIcons()
+	_, upDown, _, a, b, x, _, _, _, guide := hintIcons()
 
 	var stack float32
 	if state.CoreRunning {
@@ -153,4 +179,9 @@ func (s *sceneSavestates) drawHintBar() {
 	} else {
 		stackHint(&stack, a, "LOAD", h)
 	}
+
+	list := menu.stack[len(menu.stack)-1].Entry()
+	if list.children[list.ptr].callbackX != nil {
+		stackHint(&stack, x, "DELETE", h)
+	}
 }

menu/scene_tabs.go

@@ -149,7 +149,7 @@ func getPlaylists() []entry {
 			callbackOK: func() {
 				menu.Push(buildPlaylist(path))
 			},
-			callbackX: func() { askDeleteConfirmation(func() { deletePlaylist(path) }) },
+			callbackX: func() { askDeletePlaylistConfirmation(func() { deletePlaylist(path) }) },
 		})
 	}
 	return pls