From 7bb34e235244dab451e814e2bfe0c9c8e4f641f3 Mon Sep 17 00:00:00 2001
From: XargonWan <XargonWan@gmail.com>
Date: Wed, 29 Jan 2025 15:24:56 +0900
Subject: [PATCH] RUN_GAME: fixed -e -s -m argument recognition

---
 functions/run_game.sh | 22 ++++++++++++++++++----
 retrodeck.sh          | 38 ++++++++++++++++++++++++--------------
 2 files changed, 42 insertions(+), 18 deletions(-)

diff --git a/functions/run_game.sh b/functions/run_game.sh
index cb919e8d..98200730 100755
--- a/functions/run_game.sh
+++ b/functions/run_game.sh
@@ -20,7 +20,7 @@ run_game() {
                 log i "Run game: manual mode enabled"
                 ;;
             \?)
-                echo "Usage: $0 start [-e emulator] [-s system] [-m] game"
+                echo "Usage: $0 [-e emulator] [-s system] [-m] game"
                 exit 1
                 ;;
         esac
@@ -30,7 +30,7 @@ run_game() {
     # Check for game argument
     if [[ -z "$1" ]]; then
         log e "Game path is required."
-        log i "Usage: $0 start [-e emulator] [-s system] [-m] game"
+        log i "Usage: $0 [-e emulator] [-s system] [-m] game"
         exit 1
     fi
 
@@ -151,8 +151,10 @@ show_zenity_emulator_list() {
     local system="$1"
     # Example logic to retrieve and show Zenity list of emulators for the system
     # This would extract available emulators for the system from es_systems.xml and show a Zenity dialog
-    emulators=$(xmllint --xpath "//system[name='$system']/command/@label" "$es_systems" | sed 's/ label=/\n/g' | sed 's/\"//g' | grep -o '[^ ]*')
-    zenity --list --title="Select Emulator" --column="Emulators" $emulators
+    emulators=$(xmllint --xpath "//system[name='$system']/command/@label" "$es_systems" | sed -e 's/ label=/\nlabel=/g' -e 's/\"//g' | grep '^label=' | cut -d= -f2)
+    IFS=$'\n' read -r -d '' -a emulator_array <<< "$emulators"
+    local emulator=$(zenity --list --title="Select Emulator" --column="Emulators" "${emulator_array[@]}")
+    echo "$emulator"
 }
 
 # Function to extract commands from es_systems.xml and present them in Zenity
@@ -414,6 +416,18 @@ find_emulator() {
 
     if [ -z "$found_path" ]; then
         log e "Find emulator: no valid path found for emulator: $emulator_name"
+        # # If no valid path found, fallback to asking the user to choose the emulator
+        # log i "No valid path found for emulator: $emulator_name. Asking user to choose the emulator."
+        # rd_zenity --icon-name=net.retrodeck.retrodeck --info --no-wrap --ok-label="OK" \
+        #     --window-icon="/app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg" \
+        #     --title "RetroDECK - Emulator not found" \
+        #     --text="Emulator \"$emulator_name\" not found.\n\nPlease select it from the list that will appear next."
+        # emulator=$(show_zenity_emulator_list "$system")
+        # if [[ -z "$emulator" ]]; then
+        #     log e "No emulator selected by the user."
+        #     exit 1
+        # fi
+        # echo "$emulator"
         return 1
     else
         log d "Find emulator: found emulator \"$found_path\""
diff --git a/retrodeck.sh b/retrodeck.sh
index 1c2eaadf..4f95e820 100644
--- a/retrodeck.sh
+++ b/retrodeck.sh
@@ -12,12 +12,8 @@ resettable_components=$(jq -r '
 # uses sed to create, a, list, like, this
 pretty_resettable_components=$(echo "$resettable_components" | sed 's/|/, /g')
 
-# Arguments section
 
-for i in "$@"; do
-  case $i in
-    -h*|--help*)
-      echo "RetroDECK v""$version"
+show_cli_help() {
       echo -e "
       Usage:
 flatpak run [FLATPAK-RUN-OPTION] net.retrodeck-retrodeck [ARGUMENTS]
@@ -44,6 +40,15 @@ For flatpak run specific options please run: flatpak run -h
 
 https://retrodeck.net
 "
+}
+
+# Arguments section
+
+for i in "$@"; do
+  case $i in
+    -h*|--help*)
+      echo "RetroDECK v""$version"
+      show_cli_help
       exit
       ;;
     --version*|-v*)
@@ -117,21 +122,26 @@ https://retrodeck.net
         exit
       fi
       ;;
-    -*|--*)
-      echo "Unknown option $i"
-      exit 1
-      ;;
     *)
       # Assume unknown arguments are game start arguments
       if [ -f "$i" ]; then
-          echo "Attempting to start the game: $i"
-          run_game "$@"
-          exit
+        log i "Attempting to start the game: $i"
+        run_game "$@"
+        exit
+      elif [[ "$i" == "-e" || "$i" == "-s" || "$i" == "-m" ]]; then
+        log i "Game start option detected: $i"
+        run_game "$@"
+        exit
       else
-          echo "Command or File '$i' not found. Ignoring argument and continuing..."
-          break # Continue with the main program
+        log i "Command or File '$i' not found. Ignoring argument and continuing..."
+        break # Continue with the main program
       fi
       ;;
+    -*|--*)
+      log i "Unknown option $i"
+      show_cli_help
+      exit 1
+      ;;
   esac
 done