Merge pull request #712 from icenine451/cooker-0.8.0b-icenine451

Cooker 0.8.0b icenine451

functions/functions.sh

@@ -265,6 +265,8 @@ dir_prep() {
 
 check_bios_files() {
   # This function validates all the BIOS files listed in the $bios_checklist and adds the results to an array called bios_checked_list which can be used elsewhere
+  # There is a "basic" and "expert" mode which outputs different levels of data
+  # USAGE: check_bios_files "mode"
   
   rm -f "$godot_bios_files_checked" # Godot data transfer temp files
   touch "$godot_bios_files_checked"
@@ -281,8 +283,13 @@ check_bios_files() {
           bios_hash_matched="Yes"
         fi
       fi
-      bios_checked_list=("${bios_checked_list[@]}" "$bios_file" "$bios_system" "$bios_file_found" "$bios_hash_matched" "$bios_desc")
+      if [[ "$1" == "basic" ]]; then
-      echo "$bios_file"^"$bios_system"^"$bios_file_found"^"$bios_hash_matched"^"$bios_desc" >> "$godot_bios_files_checked" # Godot data transfer temp file
+        bios_checked_list=("${bios_checked_list[@]}" "$bios_file" "$bios_system" "$bios_file_found" "$bios_hash_matched" "$bios_desc")
+        echo "$bios_file"^"$bios_system"^"$bios_file_found"^"$bios_hash_matched"^"$bios_desc" >> "$godot_bios_files_checked" # Godot data transfer temp file
+      else
+        bios_checked_list=("${bios_checked_list[@]}" "$bios_file" "$bios_system" "$bios_file_found" "$bios_hash_matched" "$bios_desc" "$bios_subdir" "$bios_hash")
+        echo "$bios_file"^"$bios_system"^"$bios_file_found"^"$bios_hash_matched"^"$bios_desc"^"$bios_subdir"^"$bios_hash" >> "$godot_bios_files_checked" # Godot data transfer temp file
+      fi
   done < $bios_checklist
 }
 

functions/global.sh

@@ -49,7 +49,7 @@ pretty_system_names_reference_list="$emuconfigs/defaults/retrodeck/reference_lis
 
 # Godot data transfer temp files
 
-godot_bios_files_checked="var/config/retrodeck/godot/godot_bios_files_checked.tmp"
+godot_bios_files_checked="/var/config/retrodeck/godot/godot_bios_files_checked.tmp"
 
 # Config files for emulators with single config files
 

tools/configurator.sh

@@ -66,6 +66,7 @@ source /app/libexec/global.sh
 #     - Troubleshooting
 #       - Backup: RetroDECK Userdata
 #       - Check & Verify: BIOS
+#       - Check & Verify: BIOS - Expert Mode
 #       - Check & Verify: Multi-file structure
 #       - RetroDECK: Reset
 #         - Reset Specific Emulator
@@ -885,6 +886,7 @@ configurator_retrodeck_troubleshooting_dialog() {
   --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" \
+  "Check & Verify: BIOS Files - Expert Mode" "Show information about common BIOS files, with additional information useful for troubleshooting" \
   "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" )
 
@@ -911,6 +913,10 @@ configurator_retrodeck_troubleshooting_dialog() {
     configurator_check_bios_files
   ;;
 
+  "Check & Verify: BIOS Files - Expert Mode" )
+    configurator_check_bios_files_expert_mode
+  ;;
+
   "Check & Verify: Multi-file structure" )
     configurator_check_multifile_game_structure
   ;;
@@ -930,7 +936,7 @@ 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\nThere may be additional BIOS files that will function with the emulators that are not checked.\n\nSome more advanced emulators such as Yuzu will have additional methods for verifiying the BIOS files are in working order."
   bios_checked_list=()
 
-  check_bios_files
+  check_bios_files "basic"
 
   zenity --list --title="RetroDECK Configurator Utility - Check & Verify: BIOS Files" --cancel-label="Back" \
   --window-icon="/app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg" --width=1200 --height=720 \
@@ -944,6 +950,26 @@ configurator_check_bios_files() {
   configurator_retrodeck_troubleshooting_dialog
 }
 
+configurator_check_bios_files_expert_mode() {
+  configurator_generic_dialog "RetroDECK Configurator - Check & Verify: BIOS Files - Expert Mode" "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\nThere may be additional BIOS files that will function with the emulators that are not checked.\n\nSome more advanced emulators such as Yuzu will have additional methods for verifiying the BIOS files are in working order."
+  bios_checked_list=()
+
+  check_bios_files "expert"
+
+  zenity --list --title="RetroDECK Configurator Utility - Check & Verify: BIOS 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 "System" \
+  --column "BIOS File Found" \
+  --column "BIOS Hash Match" \
+  --column "BIOS File Description" \
+  --column "BIOS File Subdirectory" \
+  --column "BIOS File Hash" \
+  "${bios_checked_list[@]}"
+
+  configurator_retrodeck_troubleshooting_dialog
+}
+
 configurator_check_multifile_game_structure() {
   local folder_games=($(find $roms_folder -maxdepth 2 -mindepth 2 -type d ! -name "*.m3u" ! -name "*.ps3"))
   if [[ ${#folder_games[@]} -gt 1 ]]; then