From 197e894d53646cf6e62994968d050e7202345ea5 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Mon, 3 Feb 2025 16:32:47 +0900 Subject: [PATCH 001/123] Cooker v0.9.1b init [skip ci] --- net.retrodeck.retrodeck.metainfo.xml | 6 ++++++ net.retrodeck.retrodeck.yml | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/net.retrodeck.retrodeck.metainfo.xml b/net.retrodeck.retrodeck.metainfo.xml index 587bc20e..63c7502f 100644 --- a/net.retrodeck.retrodeck.metainfo.xml +++ b/net.retrodeck.retrodeck.metainfo.xml @@ -67,6 +67,12 @@ GPL-3.0 CC0-1.0 + + https://github.com/RetroDECK/RetroDECK/releases/tag/0.9.0b + +

Welcome to RetroDECK cooker-0.9.1b

+ + https://github.com/RetroDECK/RetroDECK/releases/tag/0.9.0b diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml index a80ffce5..3323e5c4 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -86,7 +86,7 @@ modules: # VERSION INITIALIZATION # on main please update this with the version variable, eg: VERSION=0.8.0b # on cooker will be VERSION=cooker-0.9.0b for example - VERSION=0.9.0b + VERSION=cooker-0.9.1b git checkout ${GITHUB_REF_NAME} mkdir -p ${FLATPAK_DEST}/retrodeck/ From d560bd18cd7dab1fb5754e165cd9878bf260f37f Mon Sep 17 00:00:00 2001 From: XargonWan Date: Tue, 4 Feb 2025 16:01:04 +0900 Subject: [PATCH 002/123] UNIVERSAL_DYNAMIC_INPUT: added more logging + variabilized path (in doing) --- functions/global.sh | 2 ++ tools/configurator.sh | 18 ++++++++++-------- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/functions/global.sh b/functions/global.sh index b36abb37..b10a606e 100644 --- a/functions/global.sh +++ b/functions/global.sh @@ -107,6 +107,7 @@ dolphingcpadconf="/var/config/dolphin-emu/GCPadNew.ini" dolphingfxconf="/var/config/dolphin-emu/GFX.ini" dolphinhkconf="/var/config/dolphin-emu/Hotkeys.ini" dolphinqtconf="/var/config/dolphin-emu/Qt.ini" +dolphinDynamicInputTexturesPath="/var/data/dolphin-emu/Load/DynamicInputTextures" # PCSX2 config files @@ -127,6 +128,7 @@ primehackgcpadconf="/var/config/primehack/GCPadNew.ini" primehackgfxconf="/var/config/primehack/GFX.ini" primehackhkconf="/var/config/primehack/Hotkeys.ini" primehackqtconf="/var/config/primehack/Qt.ini" +primehackDynamicInputTexturesPath="/var/data/primehack/Load/DynamicInputTextures" # RPCS3 config files diff --git a/tools/configurator.sh b/tools/configurator.sh index b3ce586c..c9a02338 100755 --- a/tools/configurator.sh +++ b/tools/configurator.sh @@ -345,7 +345,7 @@ configurator_wii_and_gamecube_presets_and_settings_dialog() { } configurator_dolphin_input_textures_dialog() { - if [[ -d "/var/data/dolphin-emu/Load/DynamicInputTextures" ]]; then + if [[ -d "w" ]]; then rd_zenity --question \ --no-wrap --window-icon="/app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg" \ --title "RetroDECK Configurator - Dolphin Textures: Universal Dynamic Input" \ @@ -354,7 +354,7 @@ configurator_dolphin_input_textures_dialog() { if [ $? == 0 ] then # set_setting_value $dolphingfxconf "HiresTextures" "False" dolphin # TODO: Break out a preset for texture packs so this can be enabled and disabled independently. - rm -rf "/var/data/dolphin-emu/Load/DynamicInputTextures" + rm -rf "$dolphinDynamicInputTexturesPath" && log d "Dolphin custom input textures folder deleted: $dolphinDynamicInputTexturesPath" configurator_process_complete_dialog "disabling Dolphin custom input textures" else configurator_wii_and_gamecube_presets_and_settings_dialog @@ -369,8 +369,8 @@ configurator_dolphin_input_textures_dialog() { then set_setting_value $dolphingfxconf "HiresTextures" "True" dolphin ( - mkdir "/var/data/dolphin-emu/Load/DynamicInputTextures" - rsync -rlD --mkpath "/app/retrodeck/extras/DynamicInputTextures/" "/var/data/dolphin-emu/Load/DynamicInputTextures/" + mkdir -p "$dolphinDynamicInputTexturesPath" && log d "Dolphin custom input textures folder created: $dolphinDynamicInputTexturesPath" + rsync -rlD --mkpath "/app/retrodeck/extras/DynamicInputTextures/" "$dolphinDynamicInputTexturesPath/" && log d "Dolphin custom input textures folder populated: $dolphinDynamicInputTexturesPath" ) | rd_zenity --icon-name=net.retrodeck.retrodeck --progress --no-cancel --pulsate --auto-close \ --window-icon="/app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg" \ @@ -383,7 +383,7 @@ configurator_dolphin_input_textures_dialog() { } configurator_primehack_input_textures_dialog() { - if [[ -d "/var/data/primehack/Load/DynamicInputTextures" ]]; then + if [[ -d "$primehackDynamicInputTexturesPath" ]]; then rd_zenity --question \ --no-wrap --window-icon="/app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg" \ --title "RetroDECK Configurator - Dolphin Custom Input Textures" \ @@ -391,8 +391,9 @@ configurator_primehack_input_textures_dialog() { if [ $? == 0 ] then + # TODO: unify this in a single function # set_setting_value $primehackgfxconf "HiresTextures" "False" primehack # TODO: Break out a preset for texture packs so this can be enabled and disabled independently. - rm -rf "/var/data/primehack/Load/DynamicInputTextures" + rm -rf "$primehackDynamicInputTexturesPath" && log d "Primehack custom input textures folder deleted: $primehackDynamicInputTexturesPath" configurator_process_complete_dialog "disabling Primehack custom input textures" else configurator_wii_and_gamecube_presets_and_settings_dialog @@ -407,8 +408,9 @@ configurator_primehack_input_textures_dialog() { then set_setting_value $primehackgfxconf "HiresTextures" "True" primehack ( - mkdir "/var/data/primehack/Load/DynamicInputTextures" - rsync -rlD --mkpath "/app/retrodeck/extras/DynamicInputTextures/" "/var/data/primehack/Load/DynamicInputTextures/" + # TODO: unify this in a single function + mkdir "$primehackDynamicInputTexturesPath" && log d "Primehack custom input textures folder created: $primehackDynamicInputTexturesPath" + rsync -rlD --mkpath "/app/retrodeck/extras/DynamicInputTextures/" "$primehackDynamicInputTexturesPath/" && log d "Primehack custom input textures folder populated: $primehackDynamicInputTexturesPath" ) | rd_zenity --icon-name=net.retrodeck.retrodeck --progress --no-cancel --pulsate --auto-close \ --window-icon="/app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg" \ From 47c03b040c7d0ddabc809781906daaa814038799 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Wed, 5 Feb 2025 09:35:47 +0900 Subject: [PATCH 003/123] RETROARCH: fixed a bug where the cores were not updated --- functions/other_functions.sh | 16 ++++++++++++++++ functions/post_update.sh | 1 + functions/prepare_component.sh | 5 ++--- net.retrodeck.retrodeck.metainfo.xml | 5 ++++- 4 files changed, 23 insertions(+), 4 deletions(-) diff --git a/functions/other_functions.sh b/functions/other_functions.sh index 3d3939a7..69c95e55 100644 --- a/functions/other_functions.sh +++ b/functions/other_functions.sh @@ -973,3 +973,19 @@ convert_to_markdown() { -e 's|||g' \ -e '/<[^>]*>/d' > "$output_file" # Remove any other XML tags and output to .md file } + +# This function updates RetroArch by synchronizing shaders, cores, and border overlays. +# It should be called whenever RetroArch is reset or updated. +retroarch_updater(){ + + log i "Running RetroArch updater" + + # Copy shaders from the application share directory to the RetroArch configuration directory + cp -rf /app/share/libretro/shaders /var/config/retroarch/ && log d "RetroArch shaders updated correctly" + + # Synchronize cores from the application share directory to the RetroArch cores directory + rsync -rlD --mkpath "/app/share/libretro/cores/" "/var/config/retroarch/cores/" && log d "RetroArch cores updated correctly" + + # Synchronize border overlays from the RetroDeck configuration directory to the RetroArch overlays directory + rsync -rlD --mkpath "/app/retrodeck/config/retroarch/borders/" "/var/config/retroarch/overlays/borders/" && log d "RetroArch overlays and borders updated correctly" +} diff --git a/functions/post_update.sh b/functions/post_update.sh index 47eb3de4..c50fae4d 100644 --- a/functions/post_update.sh +++ b/functions/post_update.sh @@ -570,6 +570,7 @@ post_update() { install_retrodeck_controller_profile fi + retroarch_updater update_splashscreens deploy_helper_files build_retrodeck_current_presets diff --git a/functions/prepare_component.sh b/functions/prepare_component.sh index 3d05b4fc..792065c1 100644 --- a/functions/prepare_component.sh +++ b/functions/prepare_component.sh @@ -124,15 +124,12 @@ prepare_component() { dir_prep "$bios_folder" "/var/config/retroarch/system" dir_prep "$rdhome/logs/retroarch" "/var/config/retroarch/logs" create_dir /var/config/retroarch/shaders/ - cp -rf /app/share/libretro/shaders /var/config/retroarch/ dir_prep "$rdhome/shaders/retroarch" "/var/config/retroarch/shaders" - rsync -rlD --mkpath "/app/share/libretro/cores/" "/var/config/retroarch/cores/" cp -fv $config/retroarch/retroarch.cfg /var/config/retroarch/ cp -fv $config/retroarch/retroarch-core-options.cfg /var/config/retroarch/ rsync -rlD --mkpath "$config/retroarch/core-overrides/" "/var/config/retroarch/config/" rsync -rlD --mkpath "$config/retrodeck/presets/remaps/" "/var/config/retroarch/config/remaps/" dir_prep "$borders_folder" "/var/config/retroarch/overlays/borders" - rsync -rlD --mkpath "/app/retrodeck/config/retroarch/borders/" "/var/config/retroarch/overlays/borders/" set_setting_value "$raconf" "savefile_directory" "$saves_folder" "retroarch" set_setting_value "$raconf" "savestate_directory" "$states_folder" "retroarch" set_setting_value "$raconf" "screenshot_directory" "$screenshots_folder" "retroarch" @@ -146,6 +143,8 @@ prepare_component() { create_dir "$bios_folder/Mupen64plus" create_dir "$bios_folder/quasi88" + retroarch_updater + # FBNEO log i "--------------------------------" log i "Prepearing FBNEO_LIBRETRO" diff --git a/net.retrodeck.retrodeck.metainfo.xml b/net.retrodeck.retrodeck.metainfo.xml index 5790e5aa..88777fe6 100644 --- a/net.retrodeck.retrodeck.metainfo.xml +++ b/net.retrodeck.retrodeck.metainfo.xml @@ -63,7 +63,10 @@ https://github.com/RetroDECK/RetroDECK/releases/tag/0.9.0b -

Welcome to RetroDECK cooker-0.9.1b

+

Bug fixes:

+
    +
  • RETROARCH: Fixed a bug where the cores were not updated along with RetroArch itself
    • +
From 1f45f0656a3cb77d31e8530d46506ae0e18b2d6d Mon Sep 17 00:00:00 2001 From: XargonWan Date: Wed, 5 Feb 2025 10:01:19 +0900 Subject: [PATCH 004/123] MANIFEST: fixed missing Universal Dynamic Input module --- net.retrodeck.retrodeck.metainfo.xml | 1 + net.retrodeck.retrodeck.yml | 11 +++++++++++ 2 files changed, 12 insertions(+) diff --git a/net.retrodeck.retrodeck.metainfo.xml b/net.retrodeck.retrodeck.metainfo.xml index 88777fe6..3f406719 100644 --- a/net.retrodeck.retrodeck.metainfo.xml +++ b/net.retrodeck.retrodeck.metainfo.xml @@ -66,6 +66,7 @@

Bug fixes:

  • RETROARCH: Fixed a bug where the cores were not updated along with RetroArch itself
    • +
  • DOLPHIN and PRIMEHACK: Fixed a bug where the Universal Dynamic Input was missing from the build
 diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml index 3323e5c4..77c5ba9b 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -431,6 +431,17 @@ modules: url: https://github.com/RetroDECK/io.github.shiiion.primehack/releases/latest/download/RetroDECK-primehack-Artifact.tar.gz sha256: RETRODECKPRIMEHACKLATEST + # Universal Dynamic Input for Dolphin and Primehack + - name: universal_dynamic_input + buildsystem: simple + build-commands: + - mkdir -p ${FLATPAK_DEST}/retrodeck/extras/DynamicInputTextures + - cp -r * ${FLATPAK_DEST}/retrodeck/extras/DynamicInputTextures/ + sources: + - type: git + url: https://github.com/Venomalia/UniversalDynamicInput.git + commit: UNIVERSALDYNAMICINPUTCOMMITPLACEHOLDER + # RPCS3 # https://rpcs3.net/download From 9e5eece8f159304ad9f7c3f545e589e5975220d0 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Wed, 5 Feb 2025 10:03:00 +0900 Subject: [PATCH 005/123] RETROARCH: restored a line in post_update instead of retroarch_updater --- functions/other_functions.sh | 3 --- functions/prepare_component.sh | 1 + 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/functions/other_functions.sh b/functions/other_functions.sh index 69c95e55..1ddb8eac 100644 --- a/functions/other_functions.sh +++ b/functions/other_functions.sh @@ -979,9 +979,6 @@ convert_to_markdown() { retroarch_updater(){ log i "Running RetroArch updater" - - # Copy shaders from the application share directory to the RetroArch configuration directory - cp -rf /app/share/libretro/shaders /var/config/retroarch/ && log d "RetroArch shaders updated correctly" # Synchronize cores from the application share directory to the RetroArch cores directory rsync -rlD --mkpath "/app/share/libretro/cores/" "/var/config/retroarch/cores/" && log d "RetroArch cores updated correctly" diff --git a/functions/prepare_component.sh b/functions/prepare_component.sh index 792065c1..5bcc5048 100644 --- a/functions/prepare_component.sh +++ b/functions/prepare_component.sh @@ -124,6 +124,7 @@ prepare_component() { dir_prep "$bios_folder" "/var/config/retroarch/system" dir_prep "$rdhome/logs/retroarch" "/var/config/retroarch/logs" create_dir /var/config/retroarch/shaders/ + cp -rf /app/share/libretro/shaders /var/config/retroarch/ dir_prep "$rdhome/shaders/retroarch" "/var/config/retroarch/shaders" cp -fv $config/retroarch/retroarch.cfg /var/config/retroarch/ cp -fv $config/retroarch/retroarch-core-options.cfg /var/config/retroarch/ From 1427a0395a38a8fee8da131dd80445f0b1f9a238 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Wed, 5 Feb 2025 10:03:26 +0900 Subject: [PATCH 006/123] CLI: fixed --test-upgrade command --- retrodeck.sh | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/retrodeck.sh b/retrodeck.sh index f335204a..ed07bf20 100644 --- a/retrodeck.sh +++ b/retrodeck.sh @@ -124,14 +124,20 @@ for i in "$@"; do fi ;; --test-upgrade*) + if [[ "$2" =~ ^.+ ]]; then echo "You are about to test upgrading RetroDECK from version $2 to $hard_version" read -p "Enter 'y' to continue, 'n' to start RetroDECK normally: " response if [[ $response == [yY] ]]; then version="$2" - shift + logging_level="debug" # Temporarily enable debug + shift 2 else shift fi + else + echo "Error: Invalid format. Usage: --test-upgrade " + exit 1 + fi ;; *) # Assume unknown arguments are game start arguments From a192f54e2abee4469aba0ea7d7e05b040991b226 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Wed, 5 Feb 2025 11:11:45 +0900 Subject: [PATCH 007/123] PORTMASTER: added the possibility to hide it from ES-DE --- config/retrodeck/retrodeck.cfg | 1 + functions/other_functions.sh | 24 ++++++++++++ net.retrodeck.retrodeck.metainfo.xml | 1 + tools/configurator.sh | 57 +++++++++++++++++++++++++--- 4 files changed, 77 insertions(+), 6 deletions(-) diff --git a/config/retrodeck/retrodeck.cfg b/config/retrodeck/retrodeck.cfg index d7abe7a1..48843fa5 100644 --- a/config/retrodeck/retrodeck.cfg +++ b/config/retrodeck/retrodeck.cfg @@ -37,6 +37,7 @@ font=1 cheevos_login=false logging_level=info portmaster_reload_esde=true +portmaster_show=true [cheevos] duckstation=false diff --git a/functions/other_functions.sh b/functions/other_functions.sh index 1ddb8eac..6e893469 100644 --- a/functions/other_functions.sh +++ b/functions/other_functions.sh @@ -953,6 +953,16 @@ start_retrodeck() { get_steam_user # get steam user info splash_screen # Check if today has a surprise splashscreen and load it if so ponzu + + log d "Checking if PortMaster should be shown" + if [[ $(get_setting_value "$rd_conf" "portmaster_show" "retrodeck" "options") == "false" ]]; then + log d "Assuring that PortMaster is hidden on ES-DE" + portmaster_show "false" + else + log d "Assuring that PortMaster is shown on ES-DE" + portmaster_show "true" + fi + log i "Starting RetroDECK v$version" es-de } @@ -986,3 +996,17 @@ retroarch_updater(){ # Synchronize border overlays from the RetroDeck configuration directory to the RetroArch overlays directory rsync -rlD --mkpath "/app/retrodeck/config/retroarch/borders/" "/var/config/retroarch/overlays/borders/" && log d "RetroArch overlays and borders updated correctly" } + +portmaster_show(){ + log d "Setting PortMaster visibility in ES-DE" + if [ "$1" = "true" ]; then + log d "\"$roms_folder/portmaster/PortMaster.sh\" is not found, installing it" + install -Dm755 "/var/data/PortMaster/PortMaster.sh" "$roms_folder/portmaster/PortMaster.sh" && log d "PortMaster is correctly showing in ES-DE" + set_setting_value $rd_conf "portmaster_show" "true" retrodeck "options" + elif [ "$1" = "false" ]; then + rm -rf "$roms_folder/portmaster/PortMaster.sh" && log d "PortMaster is correctly hidden in ES-DE" + set_setting_value $rd_conf "portmaster_show" "false" retrodeck "options" + else + log e "\"$1\" is not a valid choice, quitting" + fi +} diff --git a/net.retrodeck.retrodeck.metainfo.xml b/net.retrodeck.retrodeck.metainfo.xml index 3f406719..b41b81b0 100644 --- a/net.retrodeck.retrodeck.metainfo.xml +++ b/net.retrodeck.retrodeck.metainfo.xml @@ -67,6 +67,7 @@
  • RETROARCH: Fixed a bug where the cores were not updated along with RetroArch itself
  • DOLPHIN and PRIMEHACK: Fixed a bug where the Universal Dynamic Input was missing from the build
    • +
  • PORTMASTER: added the ability to hide PortMaster from ES-DE
 diff --git a/tools/configurator.sh b/tools/configurator.sh index b3ce586c..26baaaae 100755 --- a/tools/configurator.sh +++ b/tools/configurator.sh @@ -67,6 +67,7 @@ source /app/libexec/global.sh # - Install: PS3 firmware # - Install: PS Vita firmware # - RetroDECK: Change Update Setting +# - PortMaster: hide/show # - Troubleshooting # - Backup: RetroDECK Userdata # - Check & Verify: BIOS @@ -590,6 +591,7 @@ configurator_retrodeck_tools_dialog() { "Install: PS3 Firmware" "Download and install PS3 firmware for use with the RPCS3 emulator" "Install: PS Vita Firmware" "Download and install PS Vita firmware for use with the Vita3K emulator" "RetroDECK: Change Update Setting" "Enable or disable online checks for new versions of RetroDECK" + "PortMaster: hide/show" "Hide or show PortMaster in ES-DE" ) if [[ $(get_setting_value "$rd_conf" "kiroi_ponzu" "retrodeck" "options") == "true" ]]; then @@ -712,13 +714,18 @@ configurator_retrodeck_tools_dialog() { configurator_online_update_setting_dialog ;; -"Ponzu - Remove Yuzu" ) - ponzu_remove "yuzu" -;; + "PortMaster: hide/show" ) + log i "Configurator: opening \"$choice\" menu" + configurator_portmaster_toggle_dialog + ;; -"Ponzu - Remove Citra" ) - ponzu_remove "citra" -;; + "Ponzu - Remove Yuzu" ) + ponzu_remove "yuzu" + ;; + + "Ponzu - Remove Citra" ) + ponzu_remove "citra" + ;; "" ) # No selection made or Back button clicked log i "Configurator: going back" @@ -980,6 +987,44 @@ configurator_online_update_setting_dialog() { fi } +configurator_portmaster_toggle_dialog(){ + + if [[ $(get_setting_value "$rd_conf" "portmaster_show" "retrodeck" "options") == "true" ]]; then + rd_zenity --question \ + --no-wrap --window-icon="/app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg" \ + --title "RetroDECK Configurator - PortMaster Visibility" \ + --text="PortMaster is currently visible in ES-DE. Do you want to hide it?\n\nPlease note that the installed games will still be visible." + + if [ $? == 0 ] # User clicked "Yes" + then + portmaster_show "false" + rd_zenity --info \ + --no-wrap --window-icon="/app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg" \ + --title "RetroDECK Configurator - PortMaster Visibility" \ + --text="PortMaster is now hidden in ES-DE.\nPlease refresh your game list or restart RetroDECK to see the changes.\n\nIn order to launch PortMaster, you can access it from:\nConfigurator -> Open Emulator or Component -> PortMaster." + else # User clicked "Cancel" + configurator_retrodeck_tools_dialog + fi + else + rd_zenity --question \ + --no-wrap --window-icon="/app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg" \ + --title "RetroDECK Configurator - PortMaster Visibility" \ + --text="PortMaster is currently hidden in ES-DE. Do you want to show it?" + + if [ $? == 0 ] # User clicked "Yes" + then + portmaster_show "true" + rd_zenity --info \ + --no-wrap --window-icon="/app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg" \ + --title "RetroDECK Configurator - PortMaster Visibility" \ + --text="PortMaster is now visible in ES-DE.\nPlease refresh your game list or restart RetroDECK to see the changes." + else # User clicked "Cancel" + configurator_retrodeck_tools_dialog + fi + fi + configurator_retrodeck_tools_dialog +} + configurator_retrodeck_troubleshooting_dialog() { choice=$(rd_zenity --list --title="RetroDECK Configurator Utility - RetroDECK: Troubleshooting" --cancel-label="Back" \ --window-icon="/app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg" --width=1200 --height=720 \ From 8c4d8f56366e0dd73f8e15b62a57f11f81231074 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Wed, 5 Feb 2025 11:12:05 +0900 Subject: [PATCH 008/123] FRAMEWORK: comments and logging --- functions/050_save_migration.sh | 3 +++ functions/post_update.sh | 11 ++++++++++- tools/retrodeck_function_wrapper.sh | 2 ++ 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/functions/050_save_migration.sh b/functions/050_save_migration.sh index 4eaf7dc0..02db6b8f 100644 --- a/functions/050_save_migration.sh +++ b/functions/050_save_migration.sh @@ -1,6 +1,9 @@ #!/bin/bash save_migration() { + + log i "Executing 0.5.0b save migration" + # Finding existing ROMs folder if [ -d "$default_sd/retrodeck" ] then diff --git a/functions/post_update.sh b/functions/post_update.sh index c50fae4d..47996b93 100644 --- a/functions/post_update.sh +++ b/functions/post_update.sh @@ -6,6 +6,7 @@ post_update() { log i "Executing post-update script" if [[ $(check_version_is_older_than "0.5.0b") == "true" ]]; then # If updating from prior to save sorting change at 0.5.0b + log d "Version is older than 0.5.0b, executing save migration" save_migration fi @@ -520,7 +521,7 @@ post_update() { set_setting_value "$primehackgfxconf" "AspectRatio" "0" "dolphin" "Settings" fi - # --- ALWAYS EXECUTED --- + # --- ALWAYS EXECUTED IN 0.9.0b --- # New components preparation log i "New components were added in this version, initializing them" @@ -555,6 +556,12 @@ post_update() { fi # end of 0.9.0b + if [[ $(check_version_is_older_than "0.9.1b") == "true" ]]; then + + log d "Nothing to do here" + + fi # end of 0.9.1b + # The following commands are run every time. if [[ -d "/var/data/dolphin-emu/Load/DynamicInputTextures" ]]; then # Refresh installed textures if they have been enabled @@ -590,4 +597,6 @@ post_update() { else changelog_dialog "$version" fi + + log i "Upgrade process completed successfully." } diff --git a/tools/retrodeck_function_wrapper.sh b/tools/retrodeck_function_wrapper.sh index 03659d84..a05fac27 100755 --- a/tools/retrodeck_function_wrapper.sh +++ b/tools/retrodeck_function_wrapper.sh @@ -1,5 +1,7 @@ #!/bin/bash +# TODO: is this function still needed? + # This wrapper will run a single RetroDECK function with any number of arguments # USAGE: /bin/bash retrodeck_function_wrapper.sh ... From 03ef887e724fb6e8ac2232f5c6421e06fc8cded1 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Wed, 5 Feb 2025 11:32:37 +0900 Subject: [PATCH 009/123] RUFFLE: fixed wrong log --- config/ruffle/ruffle-rdwrapper.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/ruffle/ruffle-rdwrapper.sh b/config/ruffle/ruffle-rdwrapper.sh index 6bd2e654..9e1d6649 100644 --- a/config/ruffle/ruffle-rdwrapper.sh +++ b/config/ruffle/ruffle-rdwrapper.sh @@ -16,7 +16,7 @@ if [[ $(check_desktop_mode) == "true" ]]; then log d "ruffle --graphics vulkan $static_invoke $@" ruffle --graphics vulkan $static_invoke "$@" else - log d "Running Ruffle in Desktop Mode" + log d "Running Ruffle in Gaming Mode" log d "ruffle --graphics gl --no-gui $static_invoke $@" ruffle --graphics gl --no-gui $static_invoke "$@" fi \ No newline at end of file From 2a44f69fa8981efb8ed6327d52a9d0116472e8ba Mon Sep 17 00:00:00 2001 From: XargonWan Date: Wed, 5 Feb 2025 13:30:35 +0900 Subject: [PATCH 010/123] FRAMEWORK: more logging --- functions/global.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/functions/global.sh b/functions/global.sh index b36abb37..3afb79b5 100644 --- a/functions/global.sh +++ b/functions/global.sh @@ -11,6 +11,7 @@ rd_logs_folder="/var/config/retrodeck/logs" # Static location to write all Retro source /app/libexec/logger.sh rotate_logs +log d "Debug mode enabled" log i "Initializing RetroDECK" log i "Running on $XDG_SESSION_DESKTOP, $XDG_SESSION_TYPE" if [[ -n $container ]]; then From 0e070cd53091264210412870c1dcd846c1f4316e Mon Sep 17 00:00:00 2001 From: XargonWan Date: Wed, 5 Feb 2025 13:40:20 +0900 Subject: [PATCH 011/123] CONFIGURATOR: restructured --- tools/configurator.sh | 260 ++++++++++++++++-------------------------- 1 file changed, 96 insertions(+), 164 deletions(-) diff --git a/tools/configurator.sh b/tools/configurator.sh index 26baaaae..adb64bd0 100755 --- a/tools/configurator.sh +++ b/tools/configurator.sh @@ -9,21 +9,18 @@ source /app/libexec/global.sh # Configurator Option Tree # Welcome -# - Presets & Settings -# - Global: Presets & Settings -# - Widescreen: Enable/Disable -# - Ask-To-Exit: Enable/Disable -# - Quick Resume: Enable/Disable +# - Settings +# - Borders +# - Widescreen +# - Ask-To-Exit +# - Quick Resume # - RetroAchievements: Login # - RetroAchievements: Logout # - RetroAchievements: Hardcore Mode -# - Rewind: Enable/Disable -# - Swap A/B and X/Y Buttons: Enable/Disable -# - RetroArch: Presets & Settings -# - Borders: Enable/Disable -# - Wii & GameCube: Presets & Settings -# - Dolphin Textures: Universal Dynamic Input -# - Primehack Textures: Universal Dynamic Input +# - Rewind +# - Swap A/B and X/Y Buttons +# - Toggle Universal Dynamic Input for Dolphin +# - Toggle Universal Dynamic Input for Primehack # - Open Emulator or Component (Behind one-time power user warning dialog) # - RetroArch # - Cemu @@ -43,7 +40,7 @@ source /app/libexec/global.sh # - XEMU # - Yuzu # - Tools -# - Tool: Move Folders +# - Data Migration # - Move all of RetroDECK # - Move ROMs folder # - Move BIOS folder @@ -54,9 +51,9 @@ source /app/libexec/global.sh # - Move Screenshots folder # - Move Mods folder # - Move Texture Packs folder -# - Tool: Remove Empty ROM Folders -# - Tool: Rebuild All ROM Folders -# - Tool: Compress Games +# - Clean Empty ROM Folders +# - Rebuild All ROM Folders +# - Games Compressor # - Compress Single Game # - Compress Multiple Games - CHD # - Compress Multiple Games - ZIP @@ -66,13 +63,13 @@ source /app/libexec/global.sh # - Install: RetroDECK Controller Layouts # - Install: PS3 firmware # - Install: PS Vita firmware -# - RetroDECK: Change Update Setting +# - Toggle Update Notify # - PortMaster: hide/show # - Troubleshooting # - Backup: RetroDECK Userdata -# - Check & Verify: BIOS +# - BIOS Checker Tool # - Check & Verify: Multi-file structure -# - RetroDECK: Reset +# - Reset Component # - Reset Emulator or Engine # - Reset RetroArch # - Reset Cemu @@ -94,9 +91,9 @@ source /app/libexec/global.sh # - Reset XEMU # - Reset Yuzu # - Reset All Emulators -# - Reset EmulationStation DE +# - Reset ES-DE # - Reset RetroDECK -# - RetroDECK: About +# - About RetroDECK # - RetroDECK Version History # - Full changelog # - Version-specific changelogs @@ -113,20 +110,17 @@ source /app/libexec/global.sh configurator_welcome_dialog() { log i "Configurator: opening welcome dialog" + welcome_menu_options=( + "Settings" "Here you will find various presets, tweaks and settings to customize your RetroDECK experience" + "Open Emulator or Component" "Launch and configure each emulator or component's settings (for advanced users)" + "Tools" "Games Compressor, move RetroDECK and install optional features" + "Troubleshooting" "Backup data, perform BIOS / multi-disc file checks and emulator resets" + "Steam Sync" "Sync all favorited games with Steam" + "About RetroDECK" "Show additional information about RetroDECK" + ) + if [[ $developer_options == "true" ]]; then - welcome_menu_options=("Presets & Settings" "Here you will find various presets, tweaks and settings to customize your RetroDECK experience" \ - "Open Emulator or Component" "Launch and configure each emulator or component's settings (for advanced users)" \ - "RetroDECK: Tools" "Compress games, move RetroDECK and install optional features" \ - "RetroDECK: Troubleshooting" "Backup data, perform BIOS / multi-disc file checks and emulator resets" \ - "RetroDECK: About" "Show additional information about RetroDECK" \ - "Developer Options" "Welcome to the DANGER ZONE") - else - welcome_menu_options=("Presets & Settings" "Here you find various presets, tweaks and settings to customize your RetroDECK experience" \ - "Open Emulator or Component" "Launch and configure each emulator or component's settings (for advanced users)" \ - "RetroDECK: Tools" "Compress games, move RetroDECK and install optional features" \ - "RetroDECK: Troubleshooting" "Backup data, perform BIOS / multi-disc file checks checks and emulator resets" \ - "RetroDECK: About" "Show additional information about RetroDECK" \ - "Steam Sync" "Sync all favorited games with Steam" ) + welcome_menu_options+=("Developer Options" "Welcome to the DANGER ZONE") fi choice=$(rd_zenity --list --title="RetroDECK Configurator Utility" --cancel-label="Quit" \ @@ -136,9 +130,9 @@ configurator_welcome_dialog() { case $choice in - "Presets & Settings" ) + "Settings" ) log i "Configurator: opening \"$choice\" menu" - configurator_presets_and_settings_dialog + configurator_global_presets_and_settings_dialog ;; "Open Emulator or Component" ) @@ -146,18 +140,18 @@ configurator_welcome_dialog() { configurator_power_user_warning_dialog ;; - "RetroDECK: Tools" ) + "Tools" ) log i "Configurator: opening \"$choice\" menu" configurator_retrodeck_tools_dialog ;; - "RetroDECK: Troubleshooting" ) + "Troubleshooting" ) log i "Configurator: opening \"$choice\" menu" # Call the troubleshooting dialog to return to the previous menu after checking BIOS files configurator_retrodeck_troubleshooting_dialog ;; - "RetroDECK: About" ) + "About RetroDECK" ) log i "Configurator: opening \"$choice\" menu" configurator_about_retrodeck_dialog ;; @@ -180,67 +174,44 @@ configurator_welcome_dialog() { esac } -configurator_presets_and_settings_dialog() { - choice=$(rd_zenity --list --title="RetroDECK Configurator Utility - 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" \ - "Global: Presets & Settings" "Here you find presets and settings that that span over multiple emulators" \ - "RetroArch: Presets & Settings" "Here you find presets and settings for RetroArch and its cores" \ - "Wii & GameCube: Presets & Settings" "Here you find presets and settings for Dolphin and Primehack" ) - - case $choice in - - "Global: Presets & Settings" ) - log i "Configurator: opening \"$choice\" menu" - configurator_global_presets_and_settings_dialog - ;; - - "RetroArch: Presets & Settings" ) - log i "Configurator: opening \"$choice\" menu" - configurator_retroarch_presets_and_settings_dialog - ;; - - "Wii & GameCube: Presets & Settings" ) - log i "Configurator: opening \"$choice\" menu" - configurator_wii_and_gamecube_presets_and_settings_dialog - ;; - - "" ) # No selection made or Back button clicked - log i "Configurator: going back" - configurator_welcome_dialog - ;; - - esac -} - configurator_global_presets_and_settings_dialog() { choice=$(rd_zenity --list --title="RetroDECK Configurator Utility - Global: 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" \ - "Widescreen: Enable/Disable" "Enable or disable widescreen in supported systems" \ - "Ask-to-Exit: Enable/Disable" "Enable or disable emulators confirming attempts to quit in supported systems" \ - "Quick Resume: Enable/Disable" "Enable or disable save state auto-save/load in supported systems" \ + "Borders" "Enable or disable borders in supported systems" \ + "Widescreen" "Enable or disable widescreen in supported systems" \ + "Ask-to-Exit" "Enable or disable emulators confirming attempts to quit in supported systems" \ + "Quick Resume" "Enable or disable save state auto-save/load 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" \ "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 systems" \ - "Rewind: Enable/Disable" "Enable or disable the rewind function in supported systems" \ - "Swap A/B and X/Y Buttons: Enable/Disable" "Enable or disable a swapped A/B and X/Y button layout in supported systems" ) + "Toggle Universal Dynamic Input for Dolphin" "Enable or disable universal dynamic input textures for Dolphin" \ + "Toggle Universal Dynamic Input for Primehack" "Enable or disable universal dynamic input textures for Primehack" + ) case $choice in - "Widescreen: Enable/Disable" ) + "Borders" ) + log i "Configurator: opening \"$choice\" menu" + change_preset_dialog "borders" + configurator_global_presets_and_settings_dialog + ;; + + "Widescreen" ) log i "Configurator: opening \"$choice\" menu" change_preset_dialog "widescreen" configurator_global_presets_and_settings_dialog ;; - "Ask-to-Exit: Enable/Disable" ) + "Ask-to-Exit" ) log i "Configurator: opening \"$choice\" menu" change_preset_dialog "ask_to_exit" configurator_global_presets_and_settings_dialog ;; - "Quick Resume: Enable/Disable" ) + "Quick Resume" ) change_preset_dialog "quick_resume" configurator_global_presets_and_settings_dialog ;; @@ -274,72 +245,33 @@ configurator_global_presets_and_settings_dialog() { configurator_global_presets_and_settings_dialog ;; - "Rewind: Enable/Disable" ) + "Rewind" ) log i "Configurator: opening \"$choice\" menu" change_preset_dialog "rewind" configurator_global_presets_and_settings_dialog ;; - "Swap A/B and X/Y Buttons: Enable/Disable" ) + "Swap A/B and X/Y Buttons" ) log i "Configurator: opening \"$choice\" menu" change_preset_dialog "abxy_button_swap" configurator_global_presets_and_settings_dialog ;; - "" ) # No selection made or Back button clicked - log i "Configurator: going back" - configurator_presets_and_settings_dialog - ;; - - esac -} - -configurator_retroarch_presets_and_settings_dialog() { - choice=$(rd_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" ) - - case $choice in - - "Borders: Enable/Disable" ) - log i "Configurator: opening \"$choice\" menu" - change_preset_dialog "borders" - configurator_retroarch_presets_and_settings_dialog - ;; - - "" ) # No selection made or Back button clicked - log i "Configurator: going back" - configurator_presets_and_settings_dialog - ;; - - esac -} - -configurator_wii_and_gamecube_presets_and_settings_dialog() { - choice=$(rd_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 \ - --column="Choice" --column="Action" \ - "Dolphin Textures: Universal Dynamic Input" "Enable/Disable Venomalia's Universal Dynamic Input Textures for Dolphin" \ - "Primehack Textures: Universal Dynamic Input" "Enable/Disable: Venomalia's Universal Dynamic Input Textures for Primehack") - - case $choice in - - "Dolphin Textures: Universal Dynamic Input" ) + "Toggle Universal Dynamic Input for Dolphin" ) log i "Configurator: opening \"$choice\" menu" configurator_dolphin_input_textures_dialog ;; - "Primehack Textures: Universal Dynamic Input" ) + "Toggle Universal Dynamic Input for Primehack" ) log i "Configurator: opening \"$choice\" menu" configurator_primehack_input_textures_dialog ;; "" ) # No selection made or Back button clicked log i "Configurator: going back" - configurator_presets_and_settings_dialog + configurator_welcome_dialog ;; esac @@ -349,7 +281,7 @@ configurator_dolphin_input_textures_dialog() { if [[ -d "/var/data/dolphin-emu/Load/DynamicInputTextures" ]]; then rd_zenity --question \ --no-wrap --window-icon="/app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg" \ - --title "RetroDECK Configurator - Dolphin Textures: Universal Dynamic Input" \ + --title "RetroDECK Configurator - Toggle Universal Dynamic Input for Dolphin" \ --text="Custom input textures are currently enabled. Do you want to disable them?" if [ $? == 0 ] @@ -358,12 +290,12 @@ configurator_dolphin_input_textures_dialog() { rm -rf "/var/data/dolphin-emu/Load/DynamicInputTextures" configurator_process_complete_dialog "disabling Dolphin custom input textures" else - configurator_wii_and_gamecube_presets_and_settings_dialog + configurator_global_presets_and_settings_dialog fi else rd_zenity --question \ --no-wrap --window-icon="/app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg" \ - --title "RetroDECK Configurator - Dolphin Textures: Universal Dynamic Input" \ + --title "RetroDECK Configurator - Toggle Universal Dynamic Input for Dolphin" \ --text="Custom input textures are currently disabled. Do you want to enable them?\n\nThis process may take several minutes to complete." if [ $? == 0 ] @@ -378,7 +310,7 @@ configurator_dolphin_input_textures_dialog() { --title "RetroDECK Configurator Utility - Dolphin Custom Input Textures Install" configurator_process_complete_dialog "enabling Dolphin custom input textures" else - configurator_wii_and_gamecube_presets_and_settings_dialog + configurator_global_presets_and_settings_dialog fi fi } @@ -396,7 +328,7 @@ configurator_primehack_input_textures_dialog() { rm -rf "/var/data/primehack/Load/DynamicInputTextures" configurator_process_complete_dialog "disabling Primehack custom input textures" else - configurator_wii_and_gamecube_presets_and_settings_dialog + configurator_global_presets_and_settings_dialog fi else rd_zenity --question \ @@ -416,7 +348,7 @@ configurator_primehack_input_textures_dialog() { --title "RetroDECK Configurator Utility - Primehack Custom Input Textures Install" configurator_process_complete_dialog "enabling Primehack custom input textures" else - configurator_wii_and_gamecube_presets_and_settings_dialog + configurator_global_presets_and_settings_dialog fi fi } @@ -583,14 +515,14 @@ configurator_open_emulator_dialog() { configurator_retrodeck_tools_dialog() { local choices=( - "Tool: Move Folders" "Move RetroDECK folders between internal/SD card or to a custom location" - "Tool: Remove Empty ROM Folders" "Remove some or all of the empty ROM folders" - "Tool: Rebuild All ROM Folders" "Rebuild any missing default ROM folders" - "Tool: Compress Games" "Compress games for systems that support it" + "Data Migration" "Move RetroDECK folders between internal/SD card or to a custom location" + "Clean Empty ROM Folders" "Remove some or all of the empty ROM folders" + "Rebuild All ROM Folders" "Rebuild any missing default ROM folders" + "Games Compressor" "Games Compressor for systems that support it" "Install: RetroDECK Controller Layouts" "Install the custom RetroDECK controller layouts on Steam" "Install: PS3 Firmware" "Download and install PS3 firmware for use with the RPCS3 emulator" "Install: PS Vita Firmware" "Download and install PS Vita firmware for use with the Vita3K emulator" - "RetroDECK: Change Update Setting" "Enable or disable online checks for new versions of RetroDECK" + "Toggle Update Notify" "Enable or disable online checks for new versions of RetroDECK" "PortMaster: hide/show" "Hide or show PortMaster in ES-DE" ) @@ -601,27 +533,27 @@ configurator_retrodeck_tools_dialog() { choices+=("Ponzu - Remove Citra" "Run Ponzu to remove Citra from RetroDECK. Configurations and saves will be mantained.") fi - choice=$(rd_zenity --list --title="RetroDECK Configurator Utility - RetroDECK: Tools" --cancel-label="Back" \ + choice=$(rd_zenity --list --title="RetroDECK Configurator Utility - Tools" --cancel-label="Back" \ --window-icon="/app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg" --width=1200 --height=720 \ --column="Choice" --column="Action" \ "${choices[@]}") case $choice in - "Tool: Move Folders" ) + "Data Migration" ) log i "Configurator: opening \"$choice\" menu" configurator_retrodeck_move_tool_dialog ;; - "Tool: Remove Empty ROM Folders" ) + "Clean Empty ROM Folders" ) log i "Configurator: opening \"$choice\" menu" - configurator_generic_dialog "RetroDECK Configurator - Remove Empty ROM Folders" "Before removing any identified empty ROM folders,\nplease make sure your ROM collection is backed up, just in case!" - configurator_generic_dialog "RetroDECK Configurator - Remove Empty ROM Folders" "Searching for empty rom folders, please be patient..." + configurator_generic_dialog "RetroDECK Configurator - Clean Empty ROM Folders" "Before removing any identified empty ROM folders,\nplease make sure your ROM collection is backed up, just in case!" + configurator_generic_dialog "RetroDECK Configurator - Clean Empty ROM Folders" "Searching for empty rom folders, please be patient..." find_empty_rom_folders choice=$(rd_zenity \ - --list --width=1200 --height=720 --title "RetroDECK Configurator - RetroDECK: Remove Empty ROM Folders" \ + --list --width=1200 --height=720 --title "RetroDECK Configurator - RetroDECK: Clean Empty ROM Folders" \ --checklist --hide-column=3 --ok-label="Remove Selected" --extra-button="Remove All" \ --separator="," --print-column=2 \ --text="Choose which ROM folders to remove:" \ @@ -636,26 +568,26 @@ configurator_retrodeck_tools_dialog() { log i "Removing empty folder $folder" rm -rf "$folder" done - configurator_generic_dialog "RetroDECK Configurator - Remove Empty ROM Folders" "The removal process is complete." + configurator_generic_dialog "RetroDECK Configurator - Clean Empty ROM Folders" "The removal process is complete." elif [[ ! -z $choice ]]; then # User clicked "Remove All" for folder in "${all_empty_folders[@]}"; do log i "Removing empty folder $folder" rm -rf "$folder" done - configurator_generic_dialog "RetroDECK Configurator - Remove Empty ROM Folders" "The removal process is complete." + configurator_generic_dialog "RetroDECK Configurator - Clean Empty ROM Folders" "The removal process is complete." fi configurator_retrodeck_tools_dialog ;; - "Tool: Rebuild All ROM Folders" ) + "Rebuild All ROM Folders" ) log i "Configurator: opening \"$choice\" menu" es-de --create-system-dirs configurator_generic_dialog "RetroDECK Configurator - Rebuild All ROM Folders" "The rebuilding process is complete.\n\nAll missing default ROM folders will now exist in $roms_folder" configurator_retrodeck_tools_dialog ;; - "Tool: Compress Games" ) + "Games Compressor" ) log i "Configurator: opening \"$choice\" menu" configurator_generic_dialog "RetroDECK Configurator - Compression Tool" "Depending on your library and compression choices, the process can sometimes take a long time.\nPlease be patient once it is started!" configurator_compression_tool_dialog @@ -709,9 +641,9 @@ configurator_retrodeck_tools_dialog() { fi ;; - "RetroDECK: Change Update Setting" ) + "Toggle Update Notify" ) log i "Configurator: opening \"$choice\" menu" - configurator_online_update_setting_dialog + configurator_update_notify_dialog ;; "PortMaster: hide/show" ) @@ -959,7 +891,7 @@ configurator_compression_cleanup_dialog() { fi } -configurator_online_update_setting_dialog() { +configurator_update_notify_dialog() { if [[ $(get_setting_value $rd_conf "update_check" retrodeck "options") == "true" ]]; then rd_zenity --question \ --no-wrap --window-icon="/app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg" \ @@ -1026,13 +958,13 @@ configurator_portmaster_toggle_dialog(){ } configurator_retrodeck_troubleshooting_dialog() { - choice=$(rd_zenity --list --title="RetroDECK Configurator Utility - RetroDECK: Troubleshooting" --cancel-label="Back" \ + choice=$(rd_zenity --list --title="RetroDECK Configurator Utility - Troubleshooting" --cancel-label="Back" \ --window-icon="/app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg" --width=1200 --height=720 \ --column="Choice" --column="Action" \ "Backup: RetroDECK Userdata" "Compress and backup important RetroDECK user data folders" \ - "Check & Verify: BIOS Files" "Show information about common BIOS files" \ + "BIOS Checker Tool Files" "Show information about common BIOS files" \ "Check & Verify: Multi-file structure" "Verify the proper structure of multi-file or multi-disc games" \ - "RetroDECK: Reset" "Reset specific parts or all of RetroDECK" ) + "Reset Component" "Reset specific parts or all of RetroDECK" ) case $choice in @@ -1054,7 +986,7 @@ configurator_retrodeck_troubleshooting_dialog() { configurator_retrodeck_troubleshooting_dialog ;; - "Check & Verify: BIOS Files" ) + "BIOS Checker Tool Files" ) log i "Configurator: opening \"$choice\" menu" configurator_check_bios_files ;; @@ -1064,7 +996,7 @@ configurator_retrodeck_troubleshooting_dialog() { configurator_check_multifile_game_structure ;; - "RetroDECK: Reset" ) + "Reset Component" ) log i "Configurator: opening \"$choice\" menu" configurator_reset_dialog ;; @@ -1082,7 +1014,7 @@ configurator_retrodeck_troubleshooting_dialog() { # verifies their MD5 hashes if provided, and displays the results in a Zenity dialog. configurator_check_bios_files() { - configurator_generic_dialog "RetroDECK Configurator - Check & Verify: BIOS Files" "This check will look for BIOS files that RetroDECK has identified as working.\n\nNot all BIOS files are required for games to work, please check the BIOS description for more information on its purpose.\n\nBIOS files not known to this tool could still function.\n\nSome more advanced emulators such as Ryujinx will have additional methods to verify that the BIOS files are in working order." + configurator_generic_dialog "RetroDECK Configurator - BIOS Checker Tool Files" "This check will look for BIOS files that RetroDECK has identified as working.\n\nNot all BIOS files are required for games to work, please check the BIOS description for more information on its purpose.\n\nBIOS files not known to this tool could still function.\n\nSome more advanced emulators such as Ryujinx will have additional methods to verify that the BIOS files are in working order." log d "Starting BIOS check in mode: $mode" @@ -1158,7 +1090,7 @@ configurator_check_bios_files() { log d "Finished checking BIOS files" IFS="^" # Set the Internal Field Separator to ^ to split the bios_checked_list array - rd_zenity --list --title="RetroDECK Configurator Utility - Check & Verify: BIOS Files" --cancel-label="Back" \ + rd_zenity --list --title="RetroDECK Configurator Utility - BIOS Checker Tool Files" --cancel-label="Back" \ --window-icon="/app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg" --width=1200 --height=720 \ --column "BIOS File Name" \ --column "Systems" \ @@ -1204,7 +1136,7 @@ configurator_reset_dialog() { "Reset RetroDECK" "Reset RetroDECK to default settings" ) - choice=$(rd_zenity --list --title="RetroDECK Configurator Utility - RetroDECK: Reset" --cancel-label="Back" \ + choice=$(rd_zenity --list --title="RetroDECK Configurator Utility - Reset Component" --cancel-label="Back" \ --window-icon="/app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg" --width=1200 --height=720 \ --column="Choice" --column="Action" \ "${choices[@]}") @@ -1256,11 +1188,11 @@ configurator_reset_dialog() { prepare_component "reset" "$component_to_reset" "configurator" configurator_process_complete_dialog "resetting $component_to_reset" else - configurator_generic_dialog "RetroDeck Configurator - RetroDECK: Reset" "Reset process cancelled." + configurator_generic_dialog "RetroDeck Configurator - Reset Component" "Reset process cancelled." configurator_reset_dialog fi else - configurator_generic_dialog "RetroDeck Configurator - RetroDECK: Reset" "Resetting this emulator requires active network access.\nPlease try again when you are connected to an Internet-capable network.\n\nReset process cancelled." + configurator_generic_dialog "RetroDeck Configurator - Reset Component" "Resetting this emulator requires active network access.\nPlease try again when you are connected to an Internet-capable network.\n\nReset process cancelled." configurator_reset_dialog fi ;; @@ -1270,7 +1202,7 @@ configurator_reset_dialog() { prepare_component "reset" "$component_to_reset" "configurator" configurator_process_complete_dialog "resetting $component_to_reset" else - configurator_generic_dialog "RetroDeck Configurator - RetroDECK: Reset" "Reset process cancelled." + configurator_generic_dialog "RetroDeck Configurator - Reset Component" "Reset process cancelled." configurator_reset_dialog fi ;; @@ -1299,7 +1231,7 @@ configurator_reset_dialog() { prepare_component "reset" "$component_to_reset" "configurator" configurator_process_complete_dialog "resetting $component_to_reset" else - configurator_generic_dialog "RetroDeck Configurator - RetroDECK: Reset" "Reset process cancelled." + configurator_generic_dialog "RetroDeck Configurator - Reset Component" "Reset process cancelled." configurator_reset_dialog fi ;; @@ -1324,11 +1256,11 @@ configurator_reset_dialog() { --text="RetroDECK is finishing the reset process, please wait." configurator_process_complete_dialog "resetting all emulators" else - configurator_generic_dialog "RetroDeck Configurator - RetroDECK: Reset" "Reset process cancelled." + configurator_generic_dialog "RetroDeck Configurator - Reset Component" "Reset process cancelled." configurator_reset_dialog fi else - configurator_generic_dialog "RetroDeck Configurator - RetroDECK: Reset" "Resetting all emulators requires active network access.\nPlease try again when you are connected to an Internet-capable network.\n\nReset process cancelled." + configurator_generic_dialog "RetroDeck Configurator - Reset Component" "Resetting all emulators requires active network access.\nPlease try again when you are connected to an Internet-capable network.\n\nReset process cancelled." configurator_reset_dialog fi ;; @@ -1344,7 +1276,7 @@ configurator_reset_dialog() { rm -f "$rd_conf" configurator_process_complete_dialog "resetting RetroDECK" else - configurator_generic_dialog "RetroDeck Configurator - RetroDECK: Reset" "Reset process cancelled." + configurator_generic_dialog "RetroDeck Configurator - Reset Component" "Reset process cancelled." configurator_reset_dialog fi ;; @@ -1357,7 +1289,7 @@ configurator_reset_dialog() { } configurator_about_retrodeck_dialog() { - choice=$(rd_zenity --list --title="RetroDECK Configurator Utility - RetroDECK: About" --cancel-label="Back" \ + choice=$(rd_zenity --list --title="RetroDECK Configurator Utility - About RetroDECK" --cancel-label="Back" \ --window-icon="/app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg" --width=1200 --height=720 \ --column="Choice" --column="Description" \ "Version History" "View the version changelogs for RetroDECK" \ From 493d4bddf10d09af6b68e1e4a1710e63f499794a Mon Sep 17 00:00:00 2001 From: XargonWan Date: Wed, 5 Feb 2025 14:25:55 +0900 Subject: [PATCH 012/123] FEATURES: temprary added psx_ra as we're using that in the presets --- config/retrodeck/reference_lists/features.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/config/retrodeck/reference_lists/features.json b/config/retrodeck/reference_lists/features.json index a477a1d6..88fce296 100644 --- a/config/retrodeck/reference_lists/features.json +++ b/config/retrodeck/reference_lists/features.json @@ -683,6 +683,9 @@ "psx": { "name": "Sony PlayStation" }, + "psx_ra": { + "name": "Sony PlayStation" + }, "pv1000": { "name": "Casio PV-1000" }, From 9b3c8ba4f7ab9f20c3ec58fc973fd9d151918029 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Wed, 5 Feb 2025 14:27:55 +0900 Subject: [PATCH 013/123] CONFIGURATOR: specified that borders are only supported for RA now --- tools/configurator.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/configurator.sh b/tools/configurator.sh index adb64bd0..8275466b 100755 --- a/tools/configurator.sh +++ b/tools/configurator.sh @@ -178,7 +178,7 @@ configurator_global_presets_and_settings_dialog() { choice=$(rd_zenity --list --title="RetroDECK Configurator Utility - Global: 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 or disable borders in supported systems" \ + "Borders" "Enable or disable borders in supported systems (only RetroArch is supported at this moment)" \ "Widescreen" "Enable or disable widescreen in supported systems" \ "Ask-to-Exit" "Enable or disable emulators confirming attempts to quit in supported systems" \ "Quick Resume" "Enable or disable save state auto-save/load in supported systems" \ From 2f5039a553d91617918f3be7bfb23a790056c4dc Mon Sep 17 00:00:00 2001 From: XargonWan Date: Wed, 5 Feb 2025 14:29:07 +0900 Subject: [PATCH 014/123] METAINFO: updated --- net.retrodeck.retrodeck.metainfo.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/net.retrodeck.retrodeck.metainfo.xml b/net.retrodeck.retrodeck.metainfo.xml index b41b81b0..8ef9df12 100644 --- a/net.retrodeck.retrodeck.metainfo.xml +++ b/net.retrodeck.retrodeck.metainfo.xml @@ -60,11 +60,12 @@ GPL-3.0 CC0-1.0 - + https://github.com/RetroDECK/RetroDECK/releases/tag/0.9.0b

Bug fixes: