From d6860e734e0325c7a58910ec5cc2763de95d8a2a Mon Sep 17 00:00:00 2001 From: icenine451 Date: Thu, 20 Jun 2024 13:27:51 -0400 Subject: [PATCH 1/7] Correct null return on system name prettification - Add RPCS3 to system name prettification reference list --- .../defaults/retrodeck/reference_lists/pretty_system_names.cfg | 3 ++- functions/other_functions.sh | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/emu-configs/defaults/retrodeck/reference_lists/pretty_system_names.cfg b/emu-configs/defaults/retrodeck/reference_lists/pretty_system_names.cfg index e668911a..9eec0818 100644 --- a/emu-configs/defaults/retrodeck/reference_lists/pretty_system_names.cfg +++ b/emu-configs/defaults/retrodeck/reference_lists/pretty_system_names.cfg @@ -1,3 +1,4 @@ +citra^Citra (Nintendo 3DS Standalone Emulator, via Ponzu) dolphin^Dolphin (GameCube / Wii Standalone Emulator) duckstation^Duckstation (Sony Playstation Standalone Emulator) gb^Nintendo GameBoy @@ -11,7 +12,7 @@ ppsspp^PPSSPP (Sony PSP Standalone Emulator) primehack^Primehack (Metroid Prime Standalone Emulator) psx_ra^Sony Playstation (RetroArch Core) retroarch^RetroArch (Multi-emulator Frontend) +rpcs3^RPCS3 (Sony Playstation 3 Standalone Emulator) ryujinx^Ryujinx (Nintendo Switch Standalone Emulator) snes^Nintendo Super Nintendo yuzu^Yuzu (Nintendo Switch Standalone Emulator, via Ponzu) -citra^Citra (Nintendo 3DS Standalone Emulator, via Ponzu) \ No newline at end of file diff --git a/functions/other_functions.sh b/functions/other_functions.sh index 2c6f9947..2a93a561 100644 --- a/functions/other_functions.sh +++ b/functions/other_functions.sh @@ -313,7 +313,7 @@ make_name_pretty() { if [[ ! -z "$system" ]]; then IFS='^' read -r internal_name pretty_name < <(echo "$system") else - pretty_name="$system" + pretty_name="$1" fi echo "$pretty_name" } From 92f0c227f491fef8dbe8f92ce2017163bdee60fa Mon Sep 17 00:00:00 2001 From: icenine451 Date: Thu, 20 Jun 2024 13:37:02 -0400 Subject: [PATCH 2/7] User preset settings were being lost during rdconf expansion --- functions/other_functions.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/functions/other_functions.sh b/functions/other_functions.sh index 2a93a561..764fd8eb 100644 --- a/functions/other_functions.sh +++ b/functions/other_functions.sh @@ -153,7 +153,6 @@ update_rd_conf() { # STAGE 2: To handle presets sections that use duplicate setting names - mv -f $rd_conf $rd_conf_backup # Backup config file agiain before update but after Stage 1 expansion generate_single_patch $rd_defaults $rd_conf_backup $rd_update_patch retrodeck # Create a patch file for differences between defaults and current user settings sed -i '/change^^version/d' $rd_update_patch # Remove version line from temporary patch file deploy_single_patch $rd_defaults $rd_update_patch $rd_conf # Re-apply user settings to defaults file From 284e8d5cc19fb3ccdfe0506c26a3d608bb633c7e Mon Sep 17 00:00:00 2001 From: icenine451 Date: Thu, 20 Jun 2024 13:44:24 -0400 Subject: [PATCH 3/7] Remove unneeded sourcing from dialogs.sh --- functions/dialogs.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/functions/dialogs.sh b/functions/dialogs.sh index 3772c7e9..36418f61 100644 --- a/functions/dialogs.sh +++ b/functions/dialogs.sh @@ -1,7 +1,5 @@ #!/bin/bash -source /app/libexec/functions.sh - # Dialog colors purple="#a864fc" blue="#6fbfff" From d6748e567d9131bdf043d8c3373dd26aac75fac7 Mon Sep 17 00:00:00 2001 From: icenine451 Date: Thu, 20 Jun 2024 13:45:38 -0400 Subject: [PATCH 4/7] Fix sourcing typo in global.sh --- functions/global.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/functions/global.sh b/functions/global.sh index 5ae8c08d..3c5edbc3 100644 --- a/functions/global.sh +++ b/functions/global.sh @@ -13,7 +13,7 @@ source /app/libexec/framework.sh source /app/libexec/post_update.sh source /app/libexec/prepare_component.sh source /app/libexec/presets.sh -source /app/libexec/configurator_fuctions.sh +source /app/libexec/configurator_functions.sh # Static variables rd_conf="/var/config/retrodeck/retrodeck.cfg" # RetroDECK config file path From 3dd31d1c0470eca537a5f50469e405d5fa80e38f Mon Sep 17 00:00:00 2001 From: icenine451 Date: Thu, 20 Jun 2024 13:48:40 -0400 Subject: [PATCH 5/7] Fix confusing complete dialog from cancelling empty ROM folder removal --- tools/configurator.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/configurator.sh b/tools/configurator.sh index 4c0d9278..d92c6f30 100644 --- a/tools/configurator.sh +++ b/tools/configurator.sh @@ -609,14 +609,15 @@ configurator_retrodeck_tools_dialog() { log i "Removing empty folder $folder" rm -f "$folder" done + configurator_generic_dialog "RetroDECK Configurator - Remove 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 -f "$folder" done + configurator_generic_dialog "RetroDECK Configurator - Remove Empty ROM Folders" "The removal process is complete." fi - configurator_generic_dialog "RetroDECK Configurator - Remove Empty ROM Folders" "The removal process is complete." configurator_retrodeck_tools_dialog ;; From 9357db8863d8f79c894c4c6dceb515186a733851 Mon Sep 17 00:00:00 2001 From: icenine451 Date: Thu, 20 Jun 2024 13:50:54 -0400 Subject: [PATCH 6/7] Add progress dialog to finding empty rom folder process --- tools/configurator.sh | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/tools/configurator.sh b/tools/configurator.sh index d92c6f30..d794f096 100644 --- a/tools/configurator.sh +++ b/tools/configurator.sh @@ -591,8 +591,16 @@ configurator_retrodeck_tools_dialog() { "Tool: Remove Empty ROM Folders" ) log i "Configurator: opening \"$choice\" menu" - find_empty_rom_folders - + ( + find_empty_rom_folders + ) | + zenity --progress --no-cancel --pulsate --auto-close \ + --icon-name=net.retrodeck.retrodeck \ + --window-icon="/app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg" \ + --title="Finding Empty ROM Folders" \ + --width=400 --height=200 \ + --text="Finding empty ROM folders, please be patient.\n\n" + choice=$(zenity \ --list --width=1200 --height=720 --title "RetroDECK Configurator - RetroDECK: Remove Empty ROM Folders" \ --checklist --hide-column=3 --ok-label="Remove Selected" --extra-button="Remove All" \ From 858b4f16ab240a3808136626359e12a9a2423efa Mon Sep 17 00:00:00 2001 From: icenine451 Date: Thu, 20 Jun 2024 13:53:41 -0400 Subject: [PATCH 7/7] Fix incorrect rm command from removal of empty rom folders --- tools/configurator.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/configurator.sh b/tools/configurator.sh index d794f096..876fb622 100644 --- a/tools/configurator.sh +++ b/tools/configurator.sh @@ -615,13 +615,13 @@ configurator_retrodeck_tools_dialog() { IFS="," read -ra folders_to_remove <<< "$choice" for folder in "${folders_to_remove[@]}"; do log i "Removing empty folder $folder" - rm -f "$folder" + rm -rf "$folder" done configurator_generic_dialog "RetroDECK Configurator - Remove 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 -f "$folder" + rm -rf "$folder" done configurator_generic_dialog "RetroDECK Configurator - Remove Empty ROM Folders" "The removal process is complete." fi