Merge bc9272345c into 7b3fce9c6e

config/retrodeck/presets/ppsspp_presets.cfg

@@ -1,5 +1,6 @@
 config_file_format^ppsspp
-change^savestate_auto_load^AutoLoadSaveState^2^General^$ppssppconf^$config/ppssppdl/ppsspp.ini
-change^cheevos^AchievementsEnable^True^Achievements^$ppssppconf^$config/ppssppdl/ppsspp.ini
-change^cheevos^AchievementsUserName^Achievements^$cheevos_username^$ppssppconf^$config/ppssppdl/ppsspp.ini
-change^cheevos_hardcore^AchievementsChallengeMode^True^Achievements^$ppssppconf^$config/ppssppdl/ppsspp.ini
+change^savestate_auto_load^AutoLoadSaveState^2^General^$ppssppconf^$config/ppssppsdl/ppsspp.ini
+change^cheevos^AchievementsEnable^True^Achievements^$ppssppconf^$config/ppssppsdl/ppsspp.ini
+change^cheevos^AchievementsUserName^$cheevos_username^Achievements^$ppssppconf^$config/ppssppsdl/ppsspp.ini
+rewrite^cheevos^^$cheevos_token^^$ppssppcheevosconf^$config/ppssppsdl/ppsspp_retroachievements.dat
+change^cheevos_hardcore^AchievementsChallengeMode^True^Achievements^$ppssppconf^$config/ppssppsdl/ppsspp.ini

config/retrodeck/retrodeck.cfg

@@ -42,11 +42,13 @@ portmaster_reload_esde=true
 duckstation=false
 pcsx2=false
 retroarch=false
+ppsspp=false
 
 [cheevos_hardcore]
 duckstation=false
 pcsx2=false
 retroarch=false
+ppsspp=false
 
 [rewind]
 gb=false

functions/global.sh

@@ -110,10 +110,11 @@ pcsx2gsconf="/var/config/PCSX2/inis/GS.ini" # This file should be deprecated sin
 pcsx2uiconf="/var/config/PCSX2/inis/PCSX2_ui.ini" # This file should be deprecated since moving to PCSX2-QT
 pcsx2vmconf="/var/config/PCSX2/inis/PCSX2_vm.ini" # This file should be deprecated since moving to PCSX2-QT
 
-# PPSSPPDL config files
+# PPSSPP-SDL config files
 
 ppssppconf="/var/config/ppsspp/PSP/SYSTEM/ppsspp.ini"
 ppssppcontrolsconf="/var/config/ppsspp/PSP/SYSTEM/controls.ini"
+ppssppcheevosconf="/var/config/ppsspp/PSP/SYSTEM/ppsspp_retroachievements.dat"
 
 # Primehack config files
 

functions/prepare_component.sh

@@ -523,6 +523,10 @@ prepare_component() {
       dir_prep "$saves_folder/PSP/PPSSPP-SA" "/var/config/ppsspp/PSP/SAVEDATA"
       dir_prep "$states_folder/PSP/PPSSPP-SA" "/var/config/ppsspp/PSP/PPSSPP_STATE"
       dir_prep "$texture_packs_folder/PPSSPP" "/var/config/ppsspp/PSP/TEXTURES"
+
+      # Reset default preset settings
+      set_setting_value "$rd_conf" "ppsspp" "$(get_setting_value "$rd_defaults" "ppsspp" "retrodeck" "cheevos")" "retrodeck" "cheevos"
+      set_setting_value "$rd_conf" "ppsspp" "$(get_setting_value "$rd_defaults" "ppsspp" "retrodeck" "cheevos_hardcore")" "retrodeck" "cheevos_hardcore"
     fi
     if [[ "$action" == "postmove" ]]; then # Run only post-move commands
       set_setting_value "$ppssppconf" "CurrentDirectory" "$roms_folder/psp" "ppsspp" "General"

functions/presets.sh

@@ -210,6 +210,27 @@ build_preset_config() {
               fi
             ;;
 
+           "rewrite" )
+              if [[ "$read_preset" == "$current_preset" ]]; then
+                if [[ "$target_file" = \$* ]]; then # Read current target file and resolve if it is a variable
+                  eval target_file=$target_file
+                fi
+                local read_target_file="$target_file"
+                if [[ "$defaults_file" = \$* ]]; then #Read current defaults file and resolve if it is a variable
+                  eval defaults_file=$defaults_file
+                fi
+                local read_defaults_file="$defaults_file"
+                if [[ "$read_system_enabled" == "true" ]]; then
+                  if [[ "$new_setting_value" = \$* ]]; then
+                    eval new_setting_value=$new_setting_value
+                  fi
+                  echo -n "$new_setting_value" > "$read_target_file"
+                else
+                  cat "$read_defaults_file" > "$read_target_file"
+                fi
+              fi
+            ;;
+
             "enable" )
               if [[ "$read_preset" == "$current_preset" ]]; then
                 if [[ "$read_system_enabled" == "true" ]]; then

tools/configurator.sh

@@ -255,7 +255,7 @@ configurator_global_presets_and_settings_dialog() {
     local cheevos_emulators=$(sed -n '/\[cheevos\]/, /\[/{ /\[cheevos\]/! { /\[/! p } }' $rd_conf | sed '/^$/d')
     for setting_line in $cheevos_emulators; do
       emulator=$(get_setting_name "$setting_line" "retrodeck")
-      set_setting_value "$rdconf" "$emulator" "false" "retrodeck" "cheevos"
+      set_setting_value "$rd_conf" "$emulator" "false" "retrodeck" "cheevos"
       build_preset_config "$emulator" "cheevos"
     done
     configurator_generic_dialog "RetroDECK Configurator Utility - RetroAchievements" "RetroAchievements has been disabled in all supported systems."

tools/configurator/retrodeck.json

@@ -28,12 +28,14 @@
 	"cheevos": {
 		"duckstation": false,
 		"pcsx2": false,
-		"retroarch": false
+		"retroarch": false,
+		"ppsspp": false
 	},
 	"cheevos_hardcore": {
 		"duckstation": false,
 		"pcsx2": false,
-		"retroarch": false
+		"retroarch": false,
+		"ppsspp": false
 	},
 	"options": {
 		"akai_ponzu": false,