From 8deda023431aa02346ea61a90a7ab0863cff0e67 Mon Sep 17 00:00:00 2001 From: icenine451 Date: Thu, 27 Jun 2024 08:52:14 -0400 Subject: [PATCH 1/4] Remove unnessecary file removal dialog --- functions/compression.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/functions/compression.sh b/functions/compression.sh index ccb5a44c..c0d1b169 100644 --- a/functions/compression.sh +++ b/functions/compression.sh @@ -46,7 +46,6 @@ compress_game() { fi else log i "Compressed file ${file%.*}.$compatible_compression_format not found, skipping original file deletion" - configurator_generic_dialog "RetroDECK Configurator - RetroDECK: Compression Tool" "A compressed version of the file was not found, skipping deletion." fi fi } From d08d027db69d91150677073954dc36194fc0d6bc Mon Sep 17 00:00:00 2001 From: icenine451 Date: Thu, 27 Jun 2024 08:52:41 -0400 Subject: [PATCH 2/4] Fix compressed file detection for removal validation --- functions/compression.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/functions/compression.sh b/functions/compression.sh index c0d1b169..fed37ab8 100644 --- a/functions/compression.sh +++ b/functions/compression.sh @@ -28,7 +28,7 @@ compress_game() { fi if [[ $post_compression_cleanup == "true" ]]; then # Remove file(s) if requested - if [[ -f "${file%.*}.$compatible_compression_format" ]]; then + if [[ -f "${file%.*}.$1" ]]; then log i "Performing post-compression file cleanup" if [[ "$file" == *".cue" ]]; then local cue_bin_files=$(grep -o -P "(?<=FILE \").*(?=\".*$)" "$file") @@ -45,7 +45,7 @@ compress_game() { rm -f "$(realpath "$file")" fi else - log i "Compressed file ${file%.*}.$compatible_compression_format not found, skipping original file deletion" + log i "Compressed file ${file%.*}.$1 not found, skipping original file deletion" fi fi } From 2472254b09588f80fd880e8fb9ecade5ce9b8ad5 Mon Sep 17 00:00:00 2001 From: icenine451 Date: Thu, 27 Jun 2024 08:53:12 -0400 Subject: [PATCH 3/4] Fix compression logging handling spaces in files --- functions/compression.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/functions/compression.sh b/functions/compression.sh index fed37ab8..4b0bcdd8 100644 --- a/functions/compression.sh +++ b/functions/compression.sh @@ -38,10 +38,10 @@ compress_game() { log i "Removing file $file_path/$line" rm -f "$file_path/$line" done < <(printf '%s\n' "$cue_bin_files") - log i "Removing file $(realpath $file)" + log i "Removing file $(realpath "$file")" rm -f $(realpath "$file") else - log i "Removing file $(realpath $file)" + log i "Removing file $(realpath "$file")" rm -f "$(realpath "$file")" fi else From 31d3ab64cc3901c45c241fde3037dc23972bf11b Mon Sep 17 00:00:00 2001 From: icenine451 Date: Thu, 27 Jun 2024 08:59:07 -0400 Subject: [PATCH 4/4] Add backup reminder dialog to empty rom folder removal process --- tools/configurator.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/configurator.sh b/tools/configurator.sh index 2cdb24cd..a860222a 100644 --- a/tools/configurator.sh +++ b/tools/configurator.sh @@ -587,6 +587,7 @@ configurator_retrodeck_tools_dialog() { "Tool: Remove Empty ROM Folders" ) log i "Configurator: opening \"$choice\" menu" + configurator_generic_dialog "RetroDECK Configurator - Remove Empty ROM Folders" "Before removing any identified empty ROM folders,\nplease make sure your ROM collection is backed up, just in case!" configurator_generic_dialog "RetroDECK Configurator - Remove Empty ROM Folders" "Searching for empty rom folders, please be patient..." find_empty_rom_folders