diff --git a/config/retrodeck/reference_lists/features.json b/config/retrodeck/reference_lists/features.json index f9cd535e..977383b3 100644 --- a/config/retrodeck/reference_lists/features.json +++ b/config/retrodeck/reference_lists/features.json @@ -960,8 +960,7 @@ "system": [ "arcade" ], - "launch": "mame", - "launch-args": "-inipath /var/config/mame/ini -rompath $(dirname \"$game\") $game" + "launch": "mame" }, "citra": { "description": "Citra Nintendo 3DS Emulator (via Ponzu)", @@ -997,7 +996,6 @@ "url": "https://retrodeck.readthedocs.io/en/latest/wiki_emulator_guides/pcsx2/pcsx2-guide/", "system": "ps2", "launch": "pcsx2-qt", - "launch-args": "-batch $game", "properties": [ { "ask_to_exit": true, @@ -1010,7 +1008,6 @@ "description": "PlayStation Emulator", "url": "https://retrodeck.readthedocs.io/en/latest/wiki_emulator_guides/duckstation/duckstation-guide/", "launch": "duckstation-qt", - "launch-args": "-batch $game", "system": "psx", "properties": [ { @@ -1037,8 +1034,7 @@ "description": "Vita3K PSVita Emulator", "url": "https://retrodeck.readthedocs.io/en/latest/wiki_emulator_guides/vita3k/vita3k-guide/", "system": "psvita", - "launch": "Vita3K", - "launch-args": "-r $game.psvita" + "launch": "Vita3K" }, "rpcs3": { "name": "RPCS3", @@ -1066,7 +1062,6 @@ "url": "https://retrodeck.readthedocs.io/en/latest/wiki_about/what-is-retrodeck/", "launch": "Yuzu", "system": "switch", - "launch-args": "-f -g $game", "ponzu": true, "abxy_button": true }, @@ -1075,7 +1070,6 @@ "description": "Dolphin Wii and GameCube Emulator", "url": "https://retrodeck.readthedocs.io/en/latest/wiki_emulator_guides/dolphin-primehack/dolphin-primehack-guide/", "launch": "dolphin-emu-wrapper", - "launch-args": "-e $game", "system": [ "gc", "wii" @@ -1095,7 +1089,6 @@ "description": "A fork of Dolphiin to enhance Metroid Prime experience", "url": "https://retrodeck.readthedocs.io/en/latest/wiki_emulator_guides/dolphin-primehack/dolphin-primehack-guide/", "launch": "primehack-wrapper", - "launch-args": "-e $game", "system": [ "wii" ], @@ -1112,7 +1105,6 @@ "url": "https://retrodeck.readthedocs.io/en/latest/wiki_emulator_guides/cemu/cemu-guide/", "system": "wiiu", "launch": "Cemu-wrapper", - "launch-args": "-g $game", "properties": [ { "abxy_button": true, @@ -1125,8 +1117,7 @@ "name": "xemu", "url": "https://retrodeck.readthedocs.io/en/latest/wiki_emulator_guides/xemu/xemu-guide/", "system": "xbox", - "launch": "xemu", - "launch-args": "-dvd_path $game" + "launch": "xemu" }, "es-de": { "description": "ES-DE Emulation Frontend", diff --git a/functions/global.sh b/functions/global.sh index b0a62c0f..0488a22b 100644 --- a/functions/global.sh +++ b/functions/global.sh @@ -18,40 +18,43 @@ source /app/libexec/post_update.sh source /app/libexec/prepare_component.sh source /app/libexec/presets.sh source /app/libexec/configurator_functions.sh +source /app/libexec/run_game.sh # Static variables -rd_conf="/var/config/retrodeck/retrodeck.cfg" # RetroDECK config file path -rd_conf_backup="/var/config/retrodeck/retrodeck.bak" # Backup of RetroDECK config file from update -rd_logs_folder="/var/config/retrodeck/logs" # Static location to write all RetroDECK-related logs -config="/app/retrodeck/config" # folder with all the default emulator configs +rd_conf="/var/config/retrodeck/retrodeck.cfg" # RetroDECK config file path +rd_conf_backup="/var/config/retrodeck/retrodeck.bak" # Backup of RetroDECK config file from update +rd_logs_folder="/var/config/retrodeck/logs" # Static location to write all RetroDECK-related logs +config="/app/retrodeck/config" # folder with all the default emulator configs rd_defaults="$config/retrodeck/retrodeck.cfg" # A default RetroDECK config file -rd_update_patch="/var/config/retrodeck/rd_update.patch" # A static location for the temporary patch file used during retrodeck.cfg updates +rd_update_patch="/var/config/retrodeck/rd_update.patch" # A static location for the temporary patch file used during retrodeck.cfg updates bios_checklist="$config/retrodeck/reference_lists/bios_checklist.cfg" # A config file listing BIOS file information that can be verified input_validation="$config/retrodeck/reference_lists/input_validation.cfg" # A config file listing valid CLI inputs finit_options_list="$config/retrodeck/reference_lists/finit_options_list.cfg" # A config file listing available optional installs during finit -splashscreen_dir="/var/config/ES-DE/resources/graphics/extra_splashes" # The default location of extra splash screens -current_splash_file="/var/config/ES-DE/resources/graphics/splash.svg" # The active splash file that will be shown on boot -default_splash_file="/var/config/ES-DE/resources/graphics/splash-orig.svg" # The default RetroDECK splash screen +splashscreen_dir="/var/config/ES-DE/resources/graphics/extra_splashes" # The default location of extra splash screens +current_splash_file="/var/config/ES-DE/resources/graphics/splash.svg" # The active splash file that will be shown on boot +default_splash_file="/var/config/ES-DE/resources/graphics/splash-orig.svg" # The default RetroDECK splash screen # TODO: instead of this maybe we can iterate the features.json multi_user_emulator_config_dirs="$config/retrodeck/reference_lists/multi_user_emulator_config_dirs.cfg" # A list of emulator config folders that can be safely linked/unlinked entirely in multi-user mode -rd_es_themes="/app/share/es-de/themes" # The directory where themes packaged with RetroDECK are stored -lockfile="/var/config/retrodeck/.lock" # Where the lockfile is located -default_sd="/run/media/mmcblk0p1" # Steam Deck SD default path # A static location for RetroDECK logs to be written -hard_version="$(cat '/app/retrodeck/version')" # hardcoded version (in the readonly filesystem) -rd_repo="https://github.com/RetroDECK/RetroDECK" # The URL of the main RetroDECK GitHub repo -es_themes_list="https://gitlab.com/es-de/themes/themes-list/-/raw/master/themes.json" # The URL of the ES-DE 2.0 themes list -remote_network_target_1="https://flathub.org" # The URL of a common internet target for testing network access -remote_network_target_2="$rd_repo" # The URL of a common internet target for testing network access -remote_network_target_3="https://one.one.one.one" # The URL of a common internet target for testing network access +rd_es_themes="/app/share/es-de/themes" # The directory where themes packaged with RetroDECK are stored +lockfile="/var/config/retrodeck/.lock" # Where the lockfile is located +default_sd="/run/media/mmcblk0p1" # Steam Deck SD default path +hard_version="$(cat '/app/retrodeck/version')" # hardcoded version (in the readonly filesystem) +rd_repo="https://github.com/RetroDECK/RetroDECK" # The URL of the main RetroDECK GitHub repo +es_themes_list="https://gitlab.com/es-de/themes/themes-list/-/raw/master/themes.json" # The URL of the ES-DE 2.0 themes list +remote_network_target_1="https://flathub.org" # The URL of a common internet target for testing network access +remote_network_target_2="$rd_repo" # The URL of a common internet target for testing network access +remote_network_target_3="https://one.one.one.one" # The URL of a common internet target for testing network access helper_files_folder="$config/retrodeck/helper_files" # The parent folder of RetroDECK documentation files for deployment -rd_appdata="/app/share/appdata/net.retrodeck.retrodeck.appdata.xml" # The shipped appdata XML file for this version -rpcs3_firmware="http://dus01.ps3.update.playstation.net/update/ps3/image/us/2024_0227_3694eb3fb8d9915c112e6ab41a60c69f/PS3UPDAT.PUP" -RA_API_URL="https://retroachievements.org/dorequest.php" # API URL for RetroAchievements.org +rd_appdata="/app/share/appdata/net.retrodeck.retrodeck.appdata.xml" # The shipped appdata XML file for this version +rpcs3_firmware="http://dus01.ps3.update.playstation.net/update/ps3/image/us/2024_0227_3694eb3fb8d9915c112e6ab41a60c69f/PS3UPDAT.PUP" # RPCS3 Firmware download location +RA_API_URL="https://retroachievements.org/dorequest.php" # API URL for RetroAchievements.org presets_dir="$config/retrodeck/presets" # Repository for all system preset config files -git_organization_name="RetroDECK" # The name of the organization in our git repository such as GitHub -cooker_repository_name="Cooker" # The name of the cooker repository under RetroDECK organization -main_repository_name="RetroDECK" # The name of the main repository under RetroDECK organization -features="$config/retrodeck/reference_lists/features.json" # A file where all the RetroDECK and component capabilities are kept for querying +git_organization_name="RetroDECK" # The name of the organization in our git repository such as GitHub +cooker_repository_name="Cooker" # The name of the cooker repository under RetroDECK organization +main_repository_name="RetroDECK" # The name of the main repository under RetroDECK organization +features="$config/retrodeck/reference_lists/features.json" # A file where all the RetroDECK and component capabilities are kept for querying +es_systems="/app/share/es-de/resources/systems/linux/es_systems.xml" # ES-DE supported system list +es_find_rules="/app/share/es-de/resources/systems/linux/es_find_rules.xml" # ES-DE emulator find rules # Godot data transfer temp files @@ -81,6 +84,7 @@ es_source_logs="/var/config/ES-DE/logs" raconf="/var/config/retroarch/retroarch.cfg" ra_core_conf="/var/config/retroarch/retroarch-core-options.cfg" ra_scummvm_conf="/var/config/retroarch/system/scummvm.ini" +ra_cores_path="/var/config/retroarch/cores" # CEMU config files diff --git a/functions/other_functions.sh b/functions/other_functions.sh index 53ebf2d4..f8d6a012 100644 --- a/functions/other_functions.sh +++ b/functions/other_functions.sh @@ -890,126 +890,4 @@ start_retrodeck() { ponzu log i "Starting RetroDECK v$version" es-de -} - -run_game() { - - # Initialize variables - emulator="" - system="" - - # Parse options - while getopts ":e:s:" opt; do - case ${opt} in - e ) - emulator=$OPTARG - ;; - s ) - system=$OPTARG - ;; - \? ) - echo "Usage: $0 --run [-e emulator] [-s system] game" - exit 1 - ;; - esac - done - shift $((OPTIND -1)) - - # Check for game argument - if [[ -z "$1" ]]; then - echo "Error: Game file is required." - echo "Usage: $0 --run [-e emulator] [-s system] game" - exit 1 - fi - - game=$1 - - # If no system is provided, extract it from the game path - if [[ -z "$system" ]]; then - system=$(echo "$game" | grep -oP '(?<=roms/)[^/]+') - fi - - log d "Emulator: $emulator" - log d "System: $system" - log d "Game: $game" - - # Query the features JSON for emulators that support the system - local emulators=$(jq -r --arg system "$system" ' - .emulator | to_entries[] | - select( - (.value.system == $system) or - (.value.system[]? == $system) - ) | .key' "$features") - - # Check if the system is handled by RetroArch cores - local retroarch_cores=$(jq -r --arg system "$system" ' - .emulator.retroarch.cores | to_entries[] | - select( - .value.system == $system or - (.value.system[]? == $system) - ) | .key' "$features") - - # if the emulator is given and it's a retroarch core just execute it - if [[ "$emulator" == *"_libretro" ]]; then - local core_path="/var/config/retroarch/cores/$emulator.so" - log d "Running RetroArch core: $core_path" - log d "Command: retroarch -L $core_path \"$game\"" - eval "retroarch -L $core_path \"$game\"" - return 1 - fi - - # If the system is handled by RetroArch cores, add them to the list of emulators - if [[ -n "$retroarch_cores" ]]; then - emulators=$(echo -e "$emulators\n$retroarch_cores") - fi - - local pretty_system=$(jq -r --arg system "$system" '.system[$system].name' "$features") - - # Check if multiple emulators are found and prompt the user to select one with zenity - if [[ $(echo "$emulators" | wc -l) -gt 1 ]]; then - emulator=$(echo "$emulators" | zenity --list --title="Select Emulator" --text="Multiple emulators found for $pretty_system. Select one to run." --column="Emulator") - else - emulator="$emulators" - fi - - # If no emulator was selected, exit - if [[ -z "$emulator" ]]; then - log e "No emulator selected. Exiting." - return 1 - fi - - log d "Run game: selected emulator $emulator" - - # Handle RetroArch core separately - if [[ "$emulator" == *"_libretro" ]]; then - local core_path="/var/config/retroarch/cores/$emulator.so" - log d "Running RetroArch core: $core_path" - log d "Command: retroarch -L $core_path \"$game\"" - eval "retroarch -L $core_path \"$game\"" - else - # Check if launch-override exists - local launch_override=$(jq -r ".emulator.$emulator.\"launch-override\"" "$features") - if [[ "$launch_override" != "null" ]]; then - # Use launch-override - launch_override=${launch_override//\$game/\"$game\"} - log d "Using launch-override: $launch_override" - eval "$launch_override" - else - # Use standard launch and launch-args - local launch_command=$(jq -r ".emulator.$emulator.launch" "$features") - local launch_args=$(jq -r ".emulator.$emulator.\"launch-args\"" "$features") - log d "launch args: $launch_args" - - # Only add launch_args if they are not null - if [[ "$launch_args" != "null" ]]; then - # Replace $game in launch_args with the actual game path, quoting it to handle spaces - launch_args=${launch_args//\$game/\"$game\"} - log d "Command: \"$launch_command $launch_args\"" - eval "$launch_command $launch_args" - else - log d "Command: \"$launch_command\"" - eval "$launch_command \"$game\"" - fi - fi - fi } \ No newline at end of file diff --git a/functions/run_game.sh b/functions/run_game.sh new file mode 100755 index 00000000..8f084a05 --- /dev/null +++ b/functions/run_game.sh @@ -0,0 +1,351 @@ +#!/bin/bash + +run_game() { + # Initialize variables + emulator="" + system="" + manual_mode=false + + # Parse options for system, emulator, and manual mode + while getopts ":e:s:m" opt; do + case ${opt} in + e) + emulator=$OPTARG # Emulator provided via -e + ;; + s) + system=$OPTARG # System provided via -s + ;; + m) + manual_mode=true # Manual mode enabled via -m + log i "Run game: manual mode enabled" + ;; + \?) + echo "Usage: $0 start [-e emulator] [-s system] [-m] game" + exit 1 + ;; + esac + done + shift $((OPTIND - 1)) + + # 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" + exit 1 + fi + + game=$1 + + if [[ -d "$game" ]]; then + log d "$(basename "$game") is a directory, parsing it like a \"directory as a file\"" + game="$game/$(basename "$game")" + log d "Actual file is in \"$game\"" + fi + + game_basename="./$(basename "$game")" + + # Step 1: System Recognition + if [[ -z "$system" ]]; then + # Automatically detect system from game path + system=$(echo "$game" | grep -oP '(?<=roms/)[^/]+') + if [[ -z "$system" ]]; then + log e "Failed to detect system from game path." + exit 1 + fi + fi + + # Step 2: Emulator Definition + if [[ -n "$emulator" ]]; then + log d "Emulator provided via command-line: $emulator" + elif [[ "$manual_mode" = true ]]; then + log d "Manual mode: showing Zenity emulator selection" + emulator=$(show_zenity_emulator_list "$system") + if [[ -z "$emulator" ]]; then + log e "No emulator selected in manual mode." + exit 1 + fi + else + log d "Automatically searching for an emulator for system: $system" + + # Check for in the game block in gamelist.xml + altemulator=$(xmllint --recover --xpath "string(//game[path='$game_basename']/altemulator)" "$rdhome/ES-DE/gamelists/$system/gamelist.xml" 2>/dev/null) + + if [[ -n "$altemulator" ]]; then + + log d "Found for game: $altemulator" + emulator=$(xmllint --recover --xpath "string(//command[@label=\"$altemulator\"])" "$es_systems" 2>/dev/null) + + else # if no altemulator is found we search if a global one is set + + log d "No altemulator found in the game entry, searching for alternativeEmulator to check if a global emulator is set for the system $system" + alternative_emulator=$(xmllint --recover --xpath 'string(//alternativeEmulator/label)' "$rdhome/ES-DE/gamelists/$system/gamelist.xml" 2>/dev/null) + log d "Alternate emulator found in header: $alternative_emulator" + emulator=$(xmllint --recover --xpath "string(//system[platform='$system']/command[@label=\"$alternative_emulator\"])" "$es_systems" 2>/dev/null) + + fi + + # Fallback to first available emulator in es_systems.xml if no found + if [[ -z "$emulator" ]]; then + log d "No alternate emulator found, using first available emulator in es_systems.xml" + emulator=$(xmllint --recover --xpath "string(//system[name='$system']/command[1])" "$es_systems") + fi + + if [[ -z "$emulator" ]]; then + log e "No valid emulator found for system: $system" + exit 1 + fi + fi + + # Step 3: Construct and Run the Command + log i "-------------------------------------------" + log i " RetroDECK is now booting the game" + log i " Game path: \"$game\"" + log i " Recognized system: $system" + log i " Given emulator: $emulator" + log i "-------------------------------------------" + + # Now pass the final constructed command to substitute_placeholders function + final_command=$(substitute_placeholders "$emulator") + + # Log and execute the command + log i "Launching game with command: $final_command" + eval "$final_command" +} + + +# Assume this function handles showing the Zenity list of emulators for manual mode +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 +} + +# Function to extract commands from es_systems.xml and present them in Zenity +find_system_commands() { + local system_name=$system + # Use xmllint to extract the system commands from the XML + system_section=$(xmllint --xpath "//system[name='$system_name']" "$es_systems" 2>/dev/null) + + if [ -z "$system_section" ]; then + log e "System not found: $system_name" + exit 1 + fi + + # Extract commands and labels + commands=$(echo "$system_section" | xmllint --xpath "//command" - 2>/dev/null) + + # Prepare Zenity command list + command_list=() + while IFS= read -r line; do + label=$(echo "$line" | sed -n 's/.*label="\([^"]*\)".*/\1/p') + command=$(echo "$line" | sed -n 's/.*]*>\(.*\)<\/command>.*/\1/p') + + # Substitute placeholders in the command + command=$(substitute_placeholders "$command") + + # Add label and command to Zenity list (label first, command second) + command_list+=("$label" "$command") + done <<< "$commands" + + # Check if there's only one command + if [ ${#command_list[@]} -eq 2 ]; then + log d "Only one command found for $system_name, running it directly: ${command_list[1]}" + selected_command="${command_list[1]}" + else + # Show the list with Zenity and return the **command** (second column) selected + selected_command=$(zenity --list \ + --title="Select an emulator for $system_name" \ + --column="Emulator" --column="Hidden Command" "${command_list[@]}" \ + --width=800 --height=400 --print-column=2 --hide-column=2) + fi + + echo "$selected_command" +} + +# Function to substitute placeholders in the command +substitute_placeholders() { + local cmd="$1" + log d "Substitute placeholder: working on $cmd" + local rom_path="$game" + local rom_dir=$(dirname "$rom_path") + + # Strip all file extensions from the base name + local base_name=$(basename "$rom_path") + base_name="${base_name%%.*}" + + local file_name=$(basename "$rom_path") + local rom_raw="$rom_path" + local rom_dir_raw="$rom_dir" + local es_path="" + local emulator_path="" + + # Manually replace %EMULATOR_*% placeholders + while [[ "$cmd" =~ (%EMULATOR_[A-Z0-9_]+%) ]]; do + placeholder="${BASH_REMATCH[1]}" + emulator_path=$(replace_emulator_placeholder "$placeholder") + cmd="${cmd//$placeholder/$emulator_path}" + done + + # Substitute %BASENAME% and other placeholders + cmd="${cmd//"%BASENAME%"/"'$base_name'"}" + cmd="${cmd//"%FILENAME%"/"'$file_name'"}" + cmd="${cmd//"%ROMRAW%"/"'$rom_raw'"}" + cmd="${cmd//"%ROMPATH%"/"'$rom_dir'"}" + + # Ensure paths are quoted correctly + cmd="${cmd//"%ROM%"/"'$rom_path'"}" + cmd="${cmd//"%GAMEDIR%"/"'$rom_dir'"}" + cmd="${cmd//"%GAMEDIRRAW%"/"'$rom_dir_raw'"}" + cmd="${cmd//"%CORE_RETROARCH%"/"$ra_cores_path"}" + + log d "Command after placeholders substitutions: $cmd" + + # Now handle %INJECT% after %BASENAME% has been substituted + cmd=$(handle_inject_placeholder "$cmd") + + echo "$cmd" +} + +# Function to replace %EMULATOR_SOMETHING% with the actual path of the emulator +replace_emulator_placeholder() { + local placeholder=$1 + # Extract emulator name from placeholder without changing case + local emulator_name="${placeholder//"%EMULATOR_"/}" # Extract emulator name after %EMULATOR_ + emulator_name="${emulator_name//"%"/}" # Remove the trailing % + + # Use the find_emulator function to get the emulator path using the correct casing + local emulator_exec=$(find_emulator "$emulator_name") + + if [[ -z "$emulator_exec" ]]; then + log e "Emulator '$emulator_name' not found." + exit 1 + fi + echo "$emulator_exec" +} + +# Function to handle the %INJECT% placeholder +handle_inject_placeholder() { + local cmd="$1" + local rom_dir=$(dirname "$game") # Get the ROM directory based on the game path + + # Find and process all occurrences of %INJECT%='something'.extension + while [[ "$cmd" =~ (%INJECT%=\'([^\']+)\')(.[^ ]+)? ]]; do + inject_file="${BASH_REMATCH[2]}" # Extract the quoted file name + extension="${BASH_REMATCH[3]}" # Extract the extension (if any) + inject_file_full_path="$rom_dir/$inject_file$extension" # Form the full path + + log d "Found inject part: %INJECT%='$inject_file'$extension" + + # Check if the file exists + if [[ -f "$inject_file_full_path" ]]; then + # Read the content of the file and replace newlines with spaces + inject_content=$(cat "$inject_file_full_path" | tr '\n' ' ') + log i "File \"$inject_file_full_path\" found. Replacing %INJECT% with content." + + # Escape special characters in the inject part for the replacement + escaped_inject_part=$(printf '%s' "%INJECT%='$inject_file'$extension" | sed 's/[]\/$*.^[]/\\&/g') + + # Replace the entire %INJECT%=...'something'.extension part with the file content + cmd=$(echo "$cmd" | sed "s|$escaped_inject_part|$inject_content|g") + + log d "Replaced cmd: $cmd" + else + log e "File \"$inject_file_full_path\" not found. Removing %INJECT% placeholder." + + # Use sed to remove the entire %INJECT%=...'something'.extension + escaped_inject_part=$(printf '%s' "%INJECT%='$inject_file'$extension" | sed 's/[]\/$*.^[]/\\&/g') + cmd=$(echo "$cmd" | sed "s|$escaped_inject_part||g") + + log d "sedded cmd: $cmd" + fi + done + + log d "Returning the command with injected content: $cmd" + echo "$cmd" +} + +# Function to get the first available emulator in the list +get_first_emulator() { + local system_name=$system + system_section=$(xmllint --xpath "//system[name='$system_name']" "$es_systems" 2>/dev/null) + + if [ -z "$system_section" ]; then + log e "System not found: $system_name" + exit 1 + fi + + # Extract the first command and use it as the selected emulator + first_command=$(echo "$system_section" | xmllint --xpath "string(//command[1])" - 2>/dev/null) + + if [[ -n "$first_command" ]]; then + # Substitute placeholders in the command + first_command=$(substitute_placeholders "$first_command") + log d "Automatically selected the first emulator: $first_command" + echo "$first_command" + else + log e "No command found for the system: $system_name" + return 1 + fi +} + +find_emulator() { + local emulator_name="$1" + found_path="" + + # Search the es_find_rules.xml file for the emulator + emulator_section=$(xmllint --xpath "//emulator[@name='$emulator_name']" "$es_find_rules" 2>/dev/null) + + if [ -z "$emulator_section" ]; then + log e "Find emulator: emulator not found: $emulator_name" + return 1 + fi + + # Search systempath entries + while IFS= read -r line; do + command_path=$(echo "$line" | sed -n 's/.*\(.*\)<\/entry>.*/\1/p') + if [ -x "$(command -v $command_path)" ]; then + found_path=$command_path + break + fi + done <<< "$(echo "$emulator_section" | xmllint --xpath "//rule[@type='systempath']/entry" - 2>/dev/null)" + + # If not found, search staticpath entries + if [ -z "$found_path" ]; then + while IFS= read -r line; do + command_path=$(eval echo "$line" | sed -n 's/.*\(.*\)<\/entry>.*/\1/p') + if [ -x "$command_path" ]; then + found_path=$command_path + break + fi + done <<< "$(echo "$emulator_section" | xmllint --xpath "//rule[@type='staticpath']/entry" - 2>/dev/null)" + fi + + if [ -z "$found_path" ]; then + log e "Find emulator: no valid path found for emulator: $emulator_name" + return 1 + else + log d "Find emulator: found emulator \"$found_path\"" + echo "$found_path" + return 0 + fi +} + +# Function to find the emulator name from the label in es_systems.xml +find_emulator_name_from_label() { + local label="$1" + + # Search for the emulator matching the label in the es_systems.xml file + extracted_emulator_name=$(xmllint --recover --xpath "string(//system[name='$system']/command[@label='$label']/text())" "$es_systems" 2>/dev/null | sed 's/%//g' | sed 's/EMULATOR_//g' | cut -d' ' -f1) + log d "Found emulator from label: $extracted_emulator_name" + + emulator_command=$(find_emulator "$extracted_emulator_name") + + if [[ -n "$emulator_command" ]]; then + echo "$emulator_command" + else + log e "Found emulator from label: emulator name not found for label: $label" + return 1 + fi +} diff --git a/retrodeck.sh b/retrodeck.sh index e76f8df0..146371f4 100644 --- a/retrodeck.sh +++ b/retrodeck.sh @@ -28,11 +28,15 @@ Arguments: --info-msg \t Print paths and config informations --configurator \t Starts the RetroDECK Configurator --compress-one \t Compresses target file to a compatible format - --compress-all \t Compresses all supported games into a compatible format.\n\t\t\t\t\t\t Available formats are \"chd\", \"zip\", \"rvz\" and \"all\". + --compress-all \t Compresses all supported games into a compatible format.\n\t\t\t\t\t\t Available formats are \"chd\", \"zip\", \"rvz\" and \"all\" --reset-component \t Reset one or more component or emulator configs to the default values --reset-retrodeck \t Starts the initial RetroDECK installer (backup your data first!) - --run [-s ] [-e ] \t Run a game from cli, if no system is defined it will deducted from the path.\n\t\t\t\t\t\t For example --run ~/retrodeck/roms/system/game.ext will be run with the system "system".\n\t\t\t\t\t\t Optionally -e (emulator) and -s (system) can be passed as arguments. + start [-e emulator] [-s system] [-m] \t Start a game from cli using the default emulator or\n\t\t\t\t\t\t\t the one defined in ES-DE for game or system + \t start arguments: + \t \t-e (emulator)\t Run the game with the defined emulator (optional) + \t \t-s (system)\t Force the game running with the defined system, for example running a gb game on gba (optional) + \t \t-m (manual)\t Manual mode: show the list of available emulator to chose from (optional) For flatpak run specific options please run: flatpak run -h @@ -44,8 +48,8 @@ https://retrodeck.net echo "RetroDECK v$version" exit ;; - --run*) - shift # Remove --run + start*) + shift # Remove "start" run_game "$@" exit ;;