Xargon/RetroDECK
1
0
Fork 0
mirror of https://github.com/RetroDECK/RetroDECK.git synced 2025-03-06 14:27:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Simplify Configurator single-file compression process

Browse source
This commit is contained in:
icenine451 2024-02-22 14:49:08 -05:00
parent a13d3f4bd2
commit 100d08a231
1 changed files with 16 additions and 24 deletions

40
tools/configurator.sh
View file

@ -691,33 +691,24 @@ configurator_compression_tool_dialog() {
configurator_compress_single_game_dialog() { configurator_compress_single_game_dialog() {
local file=$(file_browse "Game to compress") local file=$(file_browse "Game to compress")
if [[ ! -z "$file" ]]; then if [[ ! -z "$file" ]]; then
local system=$(echo "$file" | grep -oE "$roms_folder/[^/]+" | grep -oE "[^/]+$")
local compatible_compression_format=$(find_compatible_compression_format "$file") local compatible_compression_format=$(find_compatible_compression_format "$file")
if [[ ! $compatible_compression_format == "none" ]]; then if [[ ! $compatible_compression_format == "none" ]]; then
local post_compression_cleanup=$(configurator_compression_cleanup_dialog) local post_compression_cleanup=$(configurator_compression_cleanup_dialog)
( (
if [[ $compatible_compression_format == "chd" ]]; then echo "# Compressing $(basename "$file") to $compatible_compression_format format"
if [[ $(validate_for_chd "$file") == "true" ]]; then compress_game "$compatible_compression_format" "$file" "$system"
echo "# Compressing $(basename "$file") to $compatible_compression_format format" if [[ $post_compression_cleanup == "true" ]]; then # Remove file(s) if requested
compress_game "chd" "$file" if [[ "$file" == *".cue" ]]; then
if [[ $post_compression_cleanup == "true" ]]; then # Remove file(s) if requested local cue_bin_files=$(grep -o -P "(?<=FILE \").*(?=\".*$)" "$file")
if [[ "$file" == *".cue" ]]; then local file_path=$(dirname "$(realpath "$file")")
local cue_bin_files=$(grep -o -P "(?<=FILE \").*(?=\".*$)" "$file") while IFS= read -r line
local file_path=$(dirname "$(realpath "$file")") do
while IFS= read -r line rm -f "$file_path/$line"
do done < <(printf '%s\n' "$cue_bin_files")
rm -f "$file_path/$line" rm -f $(realpath "$file")
done < <(printf '%s\n' "$cue_bin_files") else
rm -f "$file" rm -f "$(realpath "$file")"
else
rm -f "$file"
fi
fi
fi
else
echo "# Compressing $(basename "$file") to $compatible_compression_format format"
compress_game "$compatible_compression_format" "$file"
if [[ $post_compression_cleanup == "true" ]]; then # Remove file(s) if requested
rm -f "$file"
fi fi
fi fi
) | ) |
@ -817,12 +808,13 @@ configurator_compress_multiple_games_dialog() {
local post_compression_cleanup=$(configurator_compression_cleanup_dialog) local post_compression_cleanup=$(configurator_compression_cleanup_dialog)
( (
for file in "${games_to_compress[@]}"; do 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") local compression_format=$(find_compatible_compression_format "$file")
echo "# Compressing $(basename "$file") into $compression_format format" # Update Zenity dialog text echo "# Compressing $(basename "$file") into $compression_format format" # Update Zenity dialog text
progress=$(( 100 - (( 100 / "$total_games_to_compress" ) * "$games_left_to_compress" ))) progress=$(( 100 - (( 100 / "$total_games_to_compress" ) * "$games_left_to_compress" )))
echo $progress echo $progress
games_left_to_compress=$((games_left_to_compress-1)) games_left_to_compress=$((games_left_to_compress-1))
compress_game "$compression_format" "$file" compress_game "$compression_format" "$file" "$system"
if [[ $post_compression_cleanup == "true" ]]; then # Remove file(s) if requested if [[ $post_compression_cleanup == "true" ]]; then # Remove file(s) if requested
if [[ "$file" == *".cue" ]]; then if [[ "$file" == *".cue" ]]; then
local cue_bin_files=$(grep -o -P "(?<=FILE \").*(?=\".*$)" "$file") local cue_bin_files=$(grep -o -P "(?<=FILE \").*(?=\".*$)" "$file")