Xargon/RetroDECK
1
0
Fork 0
mirror of https://github.com/RetroDECK/RetroDECK.git synced 2025-03-06 14:27:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #709 from icenine451/cooker-0.8.0b-icenine451

Browse source 
Cooker 0.8.0b icenine451
This commit is contained in:
icenine451 2024-02-27 12:00:11 -05:00 committed by GitHub
parent e44e860ca1 41b57ff053
commit d21b4575cb
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
11 changed files with 43 additions and 49 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
emu-configs/defaults/retrodeck/presets/gb_presets.cfg
View file

@ -10,3 +10,4 @@ change^borders^input_overlay_enable^true^^/var/config/retroarch/config/Gambatte/
change^borders^input_overlay_scale_landscape^1.205000^^/var/config/retroarch/config/Gambatte/gb.cfg^$emuconfigs/retroarch/retroarch.cfg
change^borders^input_overlay_y_offset_landscape^0.005000^^/var/config/retroarch/config/Gambatte/gb.cfg^$emuconfigs/retroarch/retroarch.cfg
enable^abxy_button_swap^/var/config/retroarch/config/remaps/Gambatte/gb.rmp
change^rewind^rewind_enable^true^^/var/config/retroarch/config/Gambatte/gb.cfg^$emuconfigs/retroarch/retroarch.cfg

1
emu-configs/defaults/retrodeck/presets/gba_presets.cfg
View file

@ -10,3 +10,4 @@ change^borders^input_overlay_aspect_adjust_landscape^0.110000^^/var/config/retro
change^borders^input_overlay_scale_landscape^1.2150000^^/var/config/retroarch/config/mGBA/gba.cfg^$emuconfigs/retroarch/retroarch.cfg
change^borders^input_overlay_y_offset_landscape^0.020000^^/var/config/retroarch/config/mGBA/gba.cfg^$emuconfigs/retroarch/retroarch.cfg
enable^abxy_button_swap^/var/config/retroarch/config/remaps/Gambatte/gbc.rmp
change^rewind^rewind_enable^true^^/var/config/retroarch/config/mGBA/gba.cfg^$emuconfigs/retroarch/retroarch.cfg

1
emu-configs/defaults/retrodeck/presets/gbc_presets.cfg
View file

@ -10,3 +10,4 @@ change^borders^input_overlay_enable^true^^/var/config/retroarch/config/Gambatte/
change^borders^input_overlay_scale_landscape^1.205000^^/var/config/retroarch/config/Gambatte/gbc.cfg^$emuconfigs/retroarch/retroarch.cfg
change^borders^input_overlay_y_offset_landscape^-0.040000^^/var/config/retroarch/config/Gambatte/gbc.cfg^$emuconfigs/retroarch/retroarch.cfg
enable^abxy_button_swap^/var/config/retroarch/config/remaps/Gambatte/gbc.rmp
change^rewind^rewind_enable^true^^/var/config/retroarch/config/Gambatte/gbc.cfg^$emuconfigs/retroarch/retroarch.cfg

1
emu-configs/defaults/retrodeck/presets/genesis_presets.cfg
View file

@ -4,3 +4,4 @@ change^borders^input_overlay_aspect_adjust_landscape^0.100000^^/var/config/retro
change^borders^input_overlay_enable^true^^/var/config/retroarch/config/Genesis Plus GX/genesis.cfg^$emuconfigs/retroarch/retroarch.cfg
change^borders^input_overlay_scale_landscape^1.040000^^/var/config/retroarch/config/Genesis Plus GX/genesis.cfg^$emuconfigs/retroarch/retroarch.cfg
change^widescreen^aspect_ratio_index^24^^/var/config/retroarch/config/Genesis Plus GX/genesis.cfg^$emuconfigs/retroarch/retroarch.cfg
change^rewind^rewind_enable^true^^/var/config/retroarch/config/Genesis Plus GX/genesis.cfg^$emuconfigs/retroarch/retroarch.cfg

1
emu-configs/defaults/retrodeck/presets/gg_presets.cfg
View file

@ -9,3 +9,4 @@ change^borders^input_overlay_aspect_adjust_landscape^0.110000^^/var/config/retro
change^borders^input_overlay_enable^true^^/var/config/retroarch/config/Genesis Plus GX/gg.cfg^$emuconfigs/retroarch/retroarch.cfg
change^borders^input_overlay_scale_landscape^1.350000^^/var/config/retroarch/config/Genesis Plus GX/gg.cfg^$emuconfigs/retroarch/retroarch.cfg
change^borders^input_overlay_y_offset_landscape^0.020000^^/var/config/retroarch/config/Genesis Plus GX/gg.cfg^$emuconfigs/retroarch/retroarch.cfg
change^rewind^rewind_enable^true^^/var/config/retroarch/config/Genesis Plus GX/gg.cfg^$emuconfigs/retroarch/retroarch.cfg

1
emu-configs/defaults/retrodeck/presets/snes_presets.cfg
View file

@ -5,3 +5,4 @@ change^borders^input_overlay_scale_landscape^1.050000^^/var/config/retroarch/con
change^borders^input_overlay_enable^true^^/var/config/retroarch/config/Snes9x/snes.cfg^$emuconfigs/retroarch/retroarch.cfg
change^widescreen^aspect_ratio_index^24^^/var/config/retroarch/config/Snes9x/snes.cfg^$emuconfigs/retroarch/retroarch.cfg
enable^abxy_button_swap^/var/config/retroarch/config/remaps/Snes9x/snes.rmp
change^rewind^rewind_enable^true^^/var/config/retroarch/config/Snes9x/snes.cfg^$emuconfigs/retroarch/retroarch.cfg

3
emu-configs/defaults/retrodeck/reference_lists/compression_targets.cfg
View file

@ -6,13 +6,14 @@ megacd
neogeocd
pcenginecd
pcfx
psp
psx
ps2
saturn
saturnjp
segacd
tg-cd
[cso]
psp
[rvz]
gc
wii

8
emu-configs/defaults/retrodeck/retrodeck.cfg
View file

@ -39,6 +39,14 @@ duckstation=false
pcsx2=false
retroarch=false
[rewind]
gb=false
gba=false
gbc=false
genesis=false
gg=false
snes=false
[borders]
gb=false
gba=false

10
functions/compression.sh
View file

@ -10,15 +10,13 @@ compress_game() {
local dest_file=$(dirname "$(realpath "$file")")"/""$filename_no_extension"
if [[ "$1" == "chd" ]]; then
if [[ "$3" == "psp" ]]; then
echo "Put createdvd or maxcso here" # TODO
else
/app/bin/chdman createcd -i "$source_file" -o "$dest_file".chd
fi
/app/bin/chdman createcd -i "$source_file" -o "$dest_file".chd
elif [[ "$1" == "zip" ]]; then
zip -jq9 "$dest_file".zip "$source_file"
elif [[ "$1" == "rvz" ]]; then
dolphin-tool convert -f rvz -b 131072 -c zstd -l 5 -i "$source_file" -o "$dest_file.rvz"
elif [[ "$1" == "cso" ]]; then
echo "TODO: maxcso command"
fi
}
@ -34,6 +32,8 @@ find_compatible_compression_format() {
echo "zip"
elif echo "$normalized_filename" | grep -qE '\.iso|\.gcm' && [[ $(sed -n '/^\[/{h;d};/\b'"$system"'\b/{g;s/\[\(.*\)\]/\1/p;q};' $compression_targets) == "rvz" ]]; then
echo "rvz"
elif echo "$normalized_filename" | grep -qE '\.iso' && [[ $(sed -n '/^\[/{h;d};/\b'"$system"'\b/{g;s/\[\(.*\)\]/\1/p;q};' $compression_targets) == "cso" ]]; then
echo "cso"
else
# If no compatible format can be found for the input file
echo "none"

18
functions/patching.sh
View file

@ -53,9 +53,13 @@ set_setting_value() {
fi
;;
"mame" ) # This only works for mame .ini files, not the .cfg XML files
local mame_current_value=$(get_setting_value $1 "$setting_name_to_change" $4)
sed -i '\^\^'"$setting_name_to_change"'\s^s^'"$mame_current_value"'^'"$setting_value_to_change"'^' "$1"
"mame" ) # In this option, $current_section_name is the <system name> in the .cfg file.
local mame_current_value=$(get_setting_value "$1" "$setting_name_to_change" "$4" "$current_section_name")
if [[ "$1" =~ (.ini)$ ]]; then # If this is a MAME .ini file
sed -i '\^\^'"$setting_name_to_change"'\s^s^'"$mame_current_value"'^'"$setting_value_to_change"'^' "$1"
elif [[ "$1" =~ (.cfg)$ ]]; then # If this is an XML-based MAME .cfg file
sed -i '\^\<system name=\"'"$current_section_name"'\">^,\^<\/system>^s^'"$mame_current_value"'^'"$setting_value_to_change"'^' "$1"
fi
;;
"es_settings" )
@ -141,8 +145,12 @@ get_setting_value() {
fi
;;
"mame" ) # This only works for mame .ini files, not the .cfg XML files
echo $(sed -n '\^\^'"$current_setting_name"'\s^p' "$1" | awk '{print $2}')
"mame" ) # In this option, $current_section_name is the <system name> in the .cfg file.
if [[ "$1" =~ (.ini)$ ]]; then # If this is a MAME .ini file
echo $(sed -n '\^\^'"$current_setting_name"'\s^p' "$1" | awk '{print $2}')
elif [[ "$1" =~ (.cfg)$ ]]; then # If this is an XML-based MAME .cfg file
echo $(xml sel -t -v "/mameconfig/system[@name='$current_section_name']//*[@type='$current_setting_name']//*" -v "text()" -n "$1")
fi
;;
"es_settings" )

47
tools/configurator.sh
View file

@ -16,10 +16,10 @@ source /app/libexec/global.sh
# - RetroAchievements: Login
# - RetroAchievements: Logout
# - RetroAchievements: Hardcore Mode
# - Rewind
# - Swap A/B and X/Y Buttons
# - RetroArch: Presets & Settings
# - Borders: Enable/Disable
# - Rewind: Enable/Disable
# - Wii & GameCube: Presets & Settings
# - Dolphin Textures: Universal Dynamic Input
# - Primehack Textures: Universal Dynamic Input
@ -200,7 +200,8 @@ configurator_global_presets_and_settings_dialog() {
"Ask-to-Exit: Enable/Disable" "Enable or disable emulators confirming when quitting in supported systems" \
"RetroAchievements: Login" "Log into the RetroAchievements service in supported systems" \
"RetroAchievements: Logout" "Disable RetroAchievements service in ALL supported systems" \
"RetroAchievements: Hardcore Mode" "Enable RetroAchievements hardcore mode (no cheats, rewind, save states etc.) in supported emulators" \
"RetroAchievements: Hardcore Mode" "Enable RetroAchievements hardcore mode (no cheats, rewind, save states etc.) in supported systems" \
"Rewind" "Enable or disable the rewind function in supported systems" \
"Swap A/B and X/Y Buttons" "Enable or disable a swapped A/B and X/Y button layout in supported systems" )
case $choice in
@ -243,6 +244,11 @@ configurator_global_presets_and_settings_dialog() {
configurator_global_presets_and_settings_dialog
;;
"Rewind" )
change_preset_dialog "rewind"
configurator_global_presets_and_settings_dialog
;;
"Swap A/B and X/Y Buttons" )
change_preset_dialog "abxy_button_swap"
configurator_global_presets_and_settings_dialog
@ -259,8 +265,7 @@ configurator_retroarch_presets_and_settings_dialog() {
choice=$(zenity --list --title="RetroDECK Configurator Utility - RetroArch: Presets & Settings" --cancel-label="Back" \
--window-icon="/app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg" --width=1200 --height=720 \
--column="Choice" --column="Action" \
"Borders: Enable/Disable" "Enable or disable borders in supported systems" \
"Rewind: Enable/Disable" "Enable or disable the Rewind function in RetroArch." )
"Borders: Enable/Disable" "Enable or disable borders in supported systems" )
case $choice in
@ -269,10 +274,6 @@ configurator_retroarch_presets_and_settings_dialog() {
configurator_retroarch_presets_and_settings_dialog
;;
"Rewind: Enable/Disable" )
configurator_retroarch_rewind_dialog
;;
"" ) # No selection made or Back button clicked
configurator_presets_and_settings_dialog
;;
@ -280,36 +281,6 @@ configurator_retroarch_presets_and_settings_dialog() {
esac
}
configurator_retroarch_rewind_dialog() {
if [[ $(get_setting_value "$raconf" rewind_enable retroarch) == "true" ]]; then
zenity --question \
--no-wrap --window-icon="/app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg" \
--title "RetroDECK Configurator - RetroArch Rewind" \
--text="Rewind is currently enabled. Do you want to disable it?."
if [ $? == 0 ]
then
set_setting_value "$raconf" "rewind_enable" "false" retroarch
configurator_process_complete_dialog "disabling Rewind"
else
configurator_retroarch_presets_and_settings_dialog
fi
else
zenity --question \
--no-wrap --window-icon="/app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg" \
--title "RetroDECK Configurator - RetroArch Rewind" \
--text="Rewind is currently disabled, do you want to enable it?\n\nNOTE:\nThis may impact performance on some more demanding systems."
if [ $? == 0 ]
then
set_setting_value "$raconf" "rewind_enable" "true" retroarch
configurator_process_complete_dialog "enabling Rewind"
else
configurator_retroarch_presets_and_settings_dialog
fi
fi
}
configurator_wii_and_gamecube_presets_and_settings_dialog() {
choice=$(zenity --list --title="RetroDECK Configurator Utility - Wii & GameCube: Presets & Settings" --cancel-label="Back" \
--window-icon="/app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg" --width=1200 --height=720 \