From 3bdec5df962c8b95655494fc538be6081c900811 Mon Sep 17 00:00:00 2001
From: XargonWan <XargonWan@gmail.com>
Date: Mon, 8 Jan 2024 14:34:32 +0100
Subject: [PATCH] RPCS3: fix for wrong save folder [skip ci]

---
 functions/post_update.sh      | 12 ++++++++++++
 functions/prepare_emulator.sh |  2 +-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/functions/post_update.sh b/functions/post_update.sh
index b025ed57..464f4f7d 100644
--- a/functions/post_update.sh
+++ b/functions/post_update.sh
@@ -277,5 +277,17 @@ post_update() {
     else
       log i "The .logs folder does not exist, continuing."
     fi
+
+    # The save folder of rpcs3 was inverted so we're moving the saves into the real one
+    echo "RPCS3 saves needs to be migrated, executing."
+    mv "$saves_folder/ps3/rpcs3" "$saves_folder/ps3/rpcs3.bak"
+    mkdir -p "$saves_folder/ps3/rpcs3"
+    mv -v "$saves_folder/ps3/rpcs3.bak"/* "$saves_folder/ps3/rpcs3"
+    mv -v "$bios_folder/rpcs3/dev_hdd0/home/00000001/savedata"/* "$saves_folder/ps3/rpcs3"
+    mv -v "$saves_folder/ps3/rpcs3.bak" "$rdhome/backups/saves/ps3/rpcs3"
+    echo "RPCS3 saves migration completed, a backup was made here: \"$rdhome/backups/saves/ps3/rpcs3\"."
+    source /app/libexec/functions.sh
+    dir_prep "$saves_folder/ps3/rpcs3" "$bios_folder/rpcs3/dev_hdd0/home/00000001/savedata"
+
   fi
 }
diff --git a/functions/prepare_emulator.sh b/functions/prepare_emulator.sh
index 2a0b81e0..93deda18 100644
--- a/functions/prepare_emulator.sh
+++ b/functions/prepare_emulator.sh
@@ -522,7 +522,7 @@ prepare_emulator() {
         # This is an unfortunate one-off because set_setting_value does not currently support settings with $ in the name.
         sed -i 's^\^$(EmulatorDir): .*^$(EmulatorDir): '"$bios_folder/rpcs3/"'^' "$rpcs3vfsconf"
         set_setting_value "$rpcs3vfsconf" "/games/" "$roms_folder/ps3/" "rpcs3"
-        dir_prep "$bios_folder/rpcs3/dev_hdd0/home/00000001/savedata" "$saves_folder/ps3/rpcs3"
+        dir_prep "$saves_folder/ps3/rpcs3" "$bios_folder/rpcs3/dev_hdd0/home/00000001/savedata"
       fi
       # Shared actions
       mkdir -p "$bios_folder/rpcs3/dev_hdd0"