Modified code to delete all types of files which have not failed

Impaler343 · Impaler343 · commit 47c9f773b30d · 2024-03-10T07:14:13.000Z
Minor extension handling

Checking if file exists before deleting
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -320,32 +320,35 @@ jobs:
 
       - name: Cleanup non-failed image files
         run: |
-          # Handle -expected.png files
-          find ./result_images -type f -name "*-expected.png" | while read file; do
-            dir=$(dirname "$file")
-            if [[ $dir == *"test_compare_images"* ]]; then
-              continue
-            fi
-            base=${file%-expected.png}
-            echo "${base}-failed-diff.png"
-            if [[ ! -e "${base}-failed-diff.png" ]]; then
-              rm "$file"
-            fi
-          done
+          function remove_files() {
+              local extension=$1
+              find ./result_images -type f -name "*-expected*.$extension" | while read file; do
+                  if [[ $file == *"-expected_pdf"* ]]; then
+                      base=${file%-expected_pdf.$extension}_pdf
+                  elif [[ $file == *"-expected_eps"* ]]; then
+                      base=${file%-expected_eps.$extension}_eps
+                  elif [[ $file == *"-expected_svg"* ]]; then
+                      base=${file%-expected_svg.$extension}_svg
+                  else
+                      base=${file%-expected.$extension}
+                  fi
+                  if [[ ! -e "${base}-failed-diff.$extension" ]]; then
+                      if [[ -e "$file" ]]; then
+                          rm "$file"
+                          echo "Removed $file"
+                      fi
+                      if [[ -e "${base}.$extension" ]]; then
+                          rm "${base}.$extension"
+                      fi
+                      echo "Removed $file"
+                  fi
+              done
+          }
 
-          # Handle .png files, excluding those ending with -failed-diff.png and -expected.png
-          find ./result_images -type f -name "*.png" ! -name "*-failed-diff.png" ! -name "*-expected.png" \
-          | while read file; do
-            dir=$(dirname "$file")
-            if [[ $dir == *"test_compare_images"* ]]; then
-              continue
-            fi
-            base=${file%.png}
-            echo "${base}-failed-diff.png"
-            if [[ ! -e "${base}-failed-diff.png" ]]; then
-              rm "$file"
-            fi
-          done
+          remove_files "png"; remove_files "svg"; remove_files "pdf"; remove_files "eps";
+
+          find "./result_images"/* -type d -empty -delete
+          echo "Removed empty directories under result_images."
 
       - name: Filter C coverage
         run: |
