From d560bd18cd7dab1fb5754e165cd9878bf260f37f Mon Sep 17 00:00:00 2001
From: XargonWan <XargonWan@gmail.com>
Date: Tue, 4 Feb 2025 16:01:04 +0900
Subject: [PATCH] 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" \