From 4a9499d752a6e54bc72c75149335715b6ea912c2 Mon Sep 17 00:00:00 2001
From: Laurent Clouet <4409640-laurent.clouet@users.noreply.gitlab.com>
Date: Wed, 28 Feb 2024 11:31:23 +0000
Subject: [PATCH] Fix: really delete file

---
 src/main/java/com/sheepit/client/Client.java |  6 ++----
 src/main/java/com/sheepit/client/Utils.java  | 21 ++++++++++++++++++++
 2 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/sheepit/client/Client.java b/src/main/java/com/sheepit/client/Client.java
index 2dfd35b..7a27a18 100644
--- a/src/main/java/com/sheepit/client/Client.java
+++ b/src/main/java/com/sheepit/client/Client.java
@@ -1012,13 +1012,11 @@ import okhttp3.HttpUrl;
 		}
 		
 		// we can remove the frame file
-		File frame = new File(ajob.getOutputImagePath());
-		frame.delete();
+		Utils.deleteFile(new File(ajob.getOutputImagePath()));
 		ajob.setOutputImagePath(null);
 		
 		if (ajob.getPreviewImagePath() != null) {
-			frame = new File(ajob.getPreviewImagePath());
-			frame.delete();
+			Utils.deleteFile(new File(ajob.getPreviewImagePath()));
 			ajob.setPreviewImagePath(null);
 		}
 		
diff --git a/src/main/java/com/sheepit/client/Utils.java b/src/main/java/com/sheepit/client/Utils.java
index 8919cbd..3071222 100644
--- a/src/main/java/com/sheepit/client/Utils.java
+++ b/src/main/java/com/sheepit/client/Utils.java
@@ -376,4 +376,25 @@ public class Utils {
 		
 		return String.format("%.2f%s", (bytes / divider), suffix);
 	}
+	
+	/**
+	 * Sometimes on Windows, delete of file return false for no obvious reason.
+	 * Wait a bit and try again
+	 */
+	public static boolean deleteFile(File file) {
+		if (file.delete() == false) {
+			// maybe the system was busy
+			try {
+				Thread.sleep(4000);
+			}
+			catch (InterruptedException e) {
+			}
+			System.gc();
+			if (file.delete() == false) {
+				file.deleteOnExit(); // nothing more can be done...
+				return false;
+			}
+		}
+		return true;
+	}
 }