mirror of
https://github.com/RetroDECK/RetroDECK.git
synced 2025-04-10 19:15:12 +00:00
GAME_COMPRESSOR: refactored (messages to be refined)
This commit is contained in:
parent
6b7aa7b651
commit
87dd303efe
|
|
@ -131,84 +131,94 @@ validate_for_chd() {
|
|||
}
|
||||
|
||||
find_compatible_games() {
|
||||
# The function takes the following arguments, which alter what files are compressed:
|
||||
# "everything" - Compresses all games found into their compatible formats
|
||||
# "all" - Compresses a list of user-chosen files into their compatible formats
|
||||
# "chd" or "zip" or "rvz" - Compresses a list of user-chosen files into the given format
|
||||
# Supported parameters:
|
||||
# "everything" - All games found (regardless of format)
|
||||
# "all" - Only user-chosen games (later selected via checklist)
|
||||
# "chd", "zip", "rvz" - Only games matching that compression type
|
||||
|
||||
log d "Started function with parameters: $1"
|
||||
|
||||
if [[ -f "$godot_compression_compatible_games" ]]; then
|
||||
rm -f "$godot_compression_compatible_games" # Godot data transfer temp files
|
||||
fi
|
||||
touch "$godot_compression_compatible_games"
|
||||
|
||||
compressable_games_list=()
|
||||
all_compressable_games=()
|
||||
games_to_compress=()
|
||||
target_selection="$1"
|
||||
log d "Started find_compatible_games with parameter: $1"
|
||||
local output_file="${godot_compression_compatible_games}"
|
||||
[ -f "$output_file" ] && rm -f "$output_file"
|
||||
touch "$output_file"
|
||||
|
||||
local target_selection="$1"
|
||||
local compression_format
|
||||
if [[ "$1" == "everything" ]]; then
|
||||
local compression_format="all"
|
||||
compression_format="all"
|
||||
else
|
||||
local compression_format="$1"
|
||||
compression_format="$1"
|
||||
fi
|
||||
|
||||
if [[ $compression_format == "all" ]]; then
|
||||
local compressable_systems_list=$(jq -r '.compression_targets | to_entries[] | .value[]' $features)
|
||||
local compressable_systems_list
|
||||
if [[ "$compression_format" == "all" ]]; then
|
||||
compressable_systems_list=$(jq -r '.compression_targets | to_entries[] | .value[]' "$features")
|
||||
log d "compressable_systems_list: $compressable_systems_list"
|
||||
else
|
||||
local compressable_systems_list=$(jq -r '.compression_targets["'"$compression_format"'"][]' $features)
|
||||
compressable_systems_list=$(jq -r '.compression_targets["'"$compression_format"'"][]' "$features")
|
||||
log d "compressable_systems_list: $compressable_systems_list"
|
||||
fi
|
||||
|
||||
log d "Finding compatible games for compression $1"
|
||||
log d "Finding compatible games for compression ($1)"
|
||||
log d "compression_targets: $compression_targets"
|
||||
|
||||
while IFS= read -r system
|
||||
do
|
||||
while IFS= read -r system; do
|
||||
log d "Checking system: $system"
|
||||
local compression_candidates
|
||||
compression_candidates=$(find "$roms_folder/$system" -type f -not -iname "*.txt")
|
||||
if [[ ! -z $compression_candidates ]]; then
|
||||
while IFS= read -r game
|
||||
do
|
||||
if [[ -n "$compression_candidates" ]]; then
|
||||
while IFS= read -r game; do
|
||||
log d "Checking game: $game"
|
||||
local compatible_compression_format=$(find_compatible_compression_format "$game")
|
||||
if [[ $compression_format == "chd" ]]; then
|
||||
if [[ $compatible_compression_format == "chd" && ! -f "$(echo ${game%.*}.chd)" ]]; then
|
||||
log d "Game $game is compatible with CHD compression"
|
||||
all_compressable_games=("${all_compressable_games[@]}" "$game")
|
||||
compressable_games_list=("${compressable_games_list[@]}" "${game#$roms_folder}" "$game")
|
||||
echo "${game}"^"$compatible_compression_format" >> "$godot_compression_compatible_games"
|
||||
fi
|
||||
elif [[ $compression_format == "zip" ]]; then
|
||||
if [[ $compatible_compression_format == "zip" && ! -f "$(echo ${game%.*}.zip)" ]]; then
|
||||
log d "Game $game is compatible with ZIP compression"
|
||||
all_compressable_games=("${all_compressable_games[@]}" "$game")
|
||||
compressable_games_list=("${compressable_games_list[@]}" "${game#$roms_folder}" "$game")
|
||||
echo "${game}"^"$compatible_compression_format" >> "$godot_compression_compatible_games"
|
||||
fi
|
||||
elif [[ $compression_format == "rvz" ]]; then
|
||||
if [[ $compatible_compression_format == "rvz" && ! -f "$(echo ${game%.*}.rvz)" ]]; then
|
||||
log d "Game $game is compatible with RVZ compression"
|
||||
all_compressable_games=("${all_compressable_games[@]}" "$game")
|
||||
compressable_games_list=("${compressable_games_list[@]}" "${game#$roms_folder}" "$game")
|
||||
echo "${game}"^"$compatible_compression_format" >> "$godot_compression_compatible_games"
|
||||
fi
|
||||
elif [[ $compression_format == "all" ]]; then
|
||||
if [[ ! $compatible_compression_format == "none" ]]; then
|
||||
log d "Game $game is compatible with $compatible_compression_format compression"
|
||||
all_compressable_games=("${all_compressable_games[@]}" "$game")
|
||||
compressable_games_list=("${compressable_games_list[@]}" "${game#$roms_folder}" "$game")
|
||||
echo "${game}"^"$compatible_compression_format" >> "$godot_compression_compatible_games"
|
||||
fi
|
||||
fi
|
||||
local compatible_compression_format
|
||||
compatible_compression_format=$(find_compatible_compression_format "$game")
|
||||
local file_ext="${game##*.}"
|
||||
case "$compression_format" in
|
||||
"chd")
|
||||
if [[ "$compatible_compression_format" == "chd" ]]; then
|
||||
if [[ "$file_ext" == "chd" ]]; then
|
||||
log d "Skipping $game because it is already a CHD file."
|
||||
elif [[ ! -f "${game%.*}.chd" ]]; then
|
||||
log d "Game $game is compatible with CHD compression"
|
||||
echo "${game}^chd" >> "$output_file"
|
||||
fi
|
||||
fi
|
||||
;;
|
||||
"zip")
|
||||
if [[ "$compatible_compression_format" == "zip" ]]; then
|
||||
if [[ "$file_ext" == "zip" ]]; then
|
||||
log d "Skipping $game because it is already a ZIP file."
|
||||
elif [[ ! -f "${game%.*}.zip" ]]; then
|
||||
log d "Game $game is compatible with ZIP compression"
|
||||
echo "${game}^zip" >> "$output_file"
|
||||
fi
|
||||
fi
|
||||
;;
|
||||
"rvz")
|
||||
if [[ "$compatible_compression_format" == "rvz" ]]; then
|
||||
if [[ "$file_ext" == "rvz" ]]; then
|
||||
log d "Skipping $game because it is already an RVZ file."
|
||||
elif [[ ! -f "${game%.*}.rvz" ]]; then
|
||||
log d "Game $game is compatible with RVZ compression"
|
||||
echo "${game}^rvz" >> "$output_file"
|
||||
fi
|
||||
fi
|
||||
;;
|
||||
"all")
|
||||
if [[ "$compatible_compression_format" != "none" ]]; then
|
||||
if [[ "$file_ext" == "$compatible_compression_format" ]]; then
|
||||
log d "Skipping $game because it is already in $compatible_compression_format format."
|
||||
else
|
||||
log d "Game $game is compatible with $compatible_compression_format compression"
|
||||
echo "${game}^${compatible_compression_format}" >> "$output_file"
|
||||
fi
|
||||
fi
|
||||
;;
|
||||
esac
|
||||
done < <(printf '%s\n' "$compression_candidates")
|
||||
fi
|
||||
done < <(printf '%s\n' "$compressable_systems_list")
|
||||
|
||||
log d "compressable_games:\n${all_compressable_games[@]}"
|
||||
echo "${all_compressable_games[@]}"
|
||||
log d "Compatible games have been written to $output_file"
|
||||
cat "$output_file"
|
||||
}
|
||||
|
||||
cli_compress_single_game() {
|
||||
|
|
|
|||
|
|
@ -736,90 +736,122 @@ configurator_compress_single_game_dialog() {
|
|||
}
|
||||
|
||||
configurator_compress_multiple_games_dialog() {
|
||||
# This dialog will display any games it finds to be compressable, from the systems listed under each compression type in features.json
|
||||
|
||||
log d "Starting to compress \"$1\""
|
||||
local output_file="${godot_compression_compatible_games}"
|
||||
[ -f "$output_file" ] && rm -f "$output_file"
|
||||
touch "$output_file"
|
||||
|
||||
# Create a temporary file for the final output and a named pipe for the progress messages.
|
||||
temp_output=$(mktemp)
|
||||
pipe=$(mktemp -u)
|
||||
mkfifo "$pipe"
|
||||
## --- SEARCH PHASE WITH LOADING SCREEN ---
|
||||
local progress_pipe
|
||||
progress_pipe=$(mktemp -u)
|
||||
mkfifo "$progress_pipe"
|
||||
|
||||
# Run find_compatible_games in the background.
|
||||
# Its output is tee'd to both the temp file (for capturing later) and the named pipe (for Zenity).
|
||||
( find_compatible_games "$1" | tee "$temp_output" > "$pipe" ) &
|
||||
# Launch find_compatible_games in the background (its output goes to the file)
|
||||
find_compatible_games "$1" > "$output_file" &
|
||||
local finder_pid=$!
|
||||
|
||||
# Launch a background process that writes loading messages until the search completes.
|
||||
(
|
||||
while kill -0 "$finder_pid" 2>/dev/null; do
|
||||
echo "# Loading: Searching for compatible games..."
|
||||
sleep 1
|
||||
done
|
||||
echo "100"
|
||||
) > "$progress_pipe" &
|
||||
local progress_writer_pid=$!
|
||||
|
||||
# While the background process runs, show the progress dialog.
|
||||
rd_zenity --progress --pulsate --auto-close \
|
||||
--window-icon="/app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg" \
|
||||
--title="RetroDECK Configurator Utility - Searching for Compressable Games" \
|
||||
--text="Searching for compressable games, please wait..." < "$pipe"
|
||||
--text="Searching for compressable games, please wait..." < "$progress_pipe"
|
||||
|
||||
# Wait for the background process to complete.
|
||||
wait
|
||||
wait "$finder_pid"
|
||||
wait "$progress_writer_pid"
|
||||
rm "$progress_pipe"
|
||||
|
||||
# Now capture the final output.
|
||||
all_compressable_games=($(cat "$temp_output"))
|
||||
if [[ -s "$output_file" ]]; then
|
||||
mapfile -t all_compressable_games < "$output_file"
|
||||
log d "Found the following games to compress: ${all_compressable_games[*]}"
|
||||
else
|
||||
configurator_generic_dialog "RetroDECK Configurator - Compression Tool" "No compressable files were found."
|
||||
return
|
||||
fi
|
||||
|
||||
# Clean up temporary files.
|
||||
rm "$temp_output" "$pipe"
|
||||
local games_to_compress=()
|
||||
if [[ "$1" != "everything" ]]; then
|
||||
local checklist_entries=()
|
||||
for line in "${all_compressable_games[@]}"; do
|
||||
IFS="^" read -r game comp <<< "$line"
|
||||
local short_game="${game#$roms_folder}"
|
||||
checklist_entries+=( "TRUE" "$short_game" "$game" )
|
||||
done
|
||||
|
||||
log d "Found the following games to compress:\n${all_compressable_games[@]}"
|
||||
local choice
|
||||
choice=$(rd_zenity \
|
||||
--list --width=1200 --height=720 --title "RetroDECK Configurator - Compression Tool" \
|
||||
--checklist --hide-column=3 --ok-label="Compress Selected" --extra-button="Compress All" \
|
||||
--separator="," --print-column=3 \
|
||||
--text="Choose which games to compress:" \
|
||||
--column "Compress?" \
|
||||
--column "Game" \
|
||||
--column "Game Full Path" \
|
||||
"${checklist_entries[@]}")
|
||||
|
||||
if [[ ! $(echo "${#all_compressable_games[@]}") == "0" ]]; then
|
||||
if [[ ! "$target_selection" == "everything" ]]; then
|
||||
choice=$(rd_zenity \
|
||||
--list --width=1200 --height=720 --title "RetroDECK Configurator - RetroDECK: Compression Tool" \
|
||||
--checklist --hide-column=3 --ok-label="Compress Selected" --extra-button="Compress All" \
|
||||
--separator="," --print-column=3 \
|
||||
--text="Choose which games to compress:" \
|
||||
--column "Compress?" \
|
||||
--column "Game" \
|
||||
--column "Game Full Path" \
|
||||
"${compressable_games_list[@]}")
|
||||
|
||||
local rc=$?
|
||||
if [[ $rc == "0" && ! -z $choice ]]; then
|
||||
IFS="," read -ra games_to_compress <<< "$choice"
|
||||
local total_games_to_compress=${#games_to_compress[@]}
|
||||
local games_left_to_compress=$total_games_to_compress
|
||||
elif [[ ! -z $choice ]]; then
|
||||
games_to_compress=("${all_compressable_games[@]}")
|
||||
local total_games_to_compress=${#all_compressable_games[@]}
|
||||
local games_left_to_compress=$total_games_to_compress
|
||||
fi
|
||||
else
|
||||
local rc=$?
|
||||
if [[ $rc == 0 && -n "$choice" ]]; then
|
||||
IFS="," read -ra games_to_compress <<< "$choice"
|
||||
elif [[ -n "$choice" ]]; then
|
||||
games_to_compress=("${all_compressable_games[@]}")
|
||||
local total_games_to_compress=${#all_compressable_games[@]}
|
||||
local games_left_to_compress=$total_games_to_compress
|
||||
else
|
||||
return
|
||||
fi
|
||||
else
|
||||
configurator_generic_dialog "RetroDECK Configurator - RetroDECK: Compression Tool" "No compressable files were found."
|
||||
games_to_compress=("${all_compressable_games[@]}")
|
||||
fi
|
||||
|
||||
if [[ ! $(echo "${#games_to_compress[@]}") == "0" ]]; then
|
||||
local post_compression_cleanup=$(configurator_compression_cleanup_dialog)
|
||||
(
|
||||
for file in "${games_to_compress[@]}"; do
|
||||
local system=$(echo "$file" | grep -oE "$roms_folder/[^/]+" | grep -oE "[^/]+$")
|
||||
local compression_format=$(find_compatible_compression_format "$file")
|
||||
echo "# Compressing $(basename "$file") into $compression_format format" # Update Zenity dialog text
|
||||
log i "Compressing $(basename "$file") into $compression_format format"
|
||||
progress=$(( 100 - (( 100 / "$total_games_to_compress" ) * "$games_left_to_compress" )))
|
||||
echo $progress
|
||||
games_left_to_compress=$((games_left_to_compress-1))
|
||||
log i "Games left to compress: $games_left_to_compress"
|
||||
compress_game "$compression_format" "$file" "$system"
|
||||
local total_games=${#games_to_compress[@]}
|
||||
local games_left=$total_games
|
||||
|
||||
## --- COMPRESSION PHASE WITH PROGRESS SCREEN ---
|
||||
local comp_pipe
|
||||
comp_pipe=$(mktemp -u)
|
||||
mkfifo "$comp_pipe"
|
||||
|
||||
(
|
||||
for game_line in "${games_to_compress[@]}"; do
|
||||
IFS="^" read -r game compression_format <<< "$game_line"
|
||||
local system
|
||||
system=$(echo "$game" | grep -oE "$roms_folder/[^/]+" | grep -oE "[^/]+$")
|
||||
log i "Compressing $(basename "$game") into $compression_format format"
|
||||
|
||||
# Launch the compression in the background.
|
||||
compress_game "$compression_format" "$game" "$system" &
|
||||
local comp_pid=$!
|
||||
|
||||
# While the compression is in progress, write a status message every second.
|
||||
while kill -0 "$comp_pid" 2>/dev/null; do
|
||||
echo "# Compressing $(basename "$game") into $compression_format format"
|
||||
sleep 1
|
||||
done
|
||||
|
||||
# When finished, update the progress percentage.
|
||||
local progress=$(( 100 - (( 100 / total_games ) * games_left) ))
|
||||
echo "$progress"
|
||||
games_left=$(( games_left - 1 ))
|
||||
done
|
||||
) |
|
||||
rd_zenity --icon-name=net.retrodeck.retrodeck --progress --no-cancel --auto-close \
|
||||
--window-icon="/app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg" \
|
||||
--title "RetroDECK Configurator Utility - Compression in Progress"
|
||||
configurator_generic_dialog "RetroDECK Configurator - RetroDECK: Compression Tool" "The compression process is complete!"
|
||||
configurator_compression_tool_dialog
|
||||
else
|
||||
configurator_compression_tool_dialog
|
||||
fi
|
||||
echo "100"
|
||||
) > "$comp_pipe" &
|
||||
local comp_pid_group=$!
|
||||
|
||||
rd_zenity --icon-name=net.retrodeck.retrodeck --progress --no-cancel --auto-close \
|
||||
--window-icon="/app/share/icons/hicolor/scalable/apps/net.retrodeck/retrodeck.svg" \
|
||||
--title "RetroDECK Configurator Utility - Compression in Progress" < "$comp_pipe"
|
||||
|
||||
wait "$comp_pid_group"
|
||||
rm "$comp_pipe"
|
||||
|
||||
configurator_generic_dialog "RetroDECK Configurator - Compression Tool" "The compression process is complete!"
|
||||
configurator_compression_tool_dialog
|
||||
}
|
||||
|
||||
configurator_compression_cleanup_dialog() {
|
||||
|
|
|
|||
Loading…
Reference in a new issue