Workaround AV software making File.renameTo() not work.

asvitkine · Dec 26, 2021 · 4e7ba96 · 4e7ba96
1 parent e621583
commit 4e7ba96
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 13 deletions.
diff --git a/src/impsave/SaveDb.java b/src/impsave/SaveDb.java
@@ -15,7 +15,6 @@
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipInputStream;
 
-import javax.swing.JOptionPane;
 import javax.swing.SwingUtilities;
 
 import crockford.CrockfordBase32;
@@ -327,16 +326,6 @@ private String generateBackupSuffix() {
 		return ".old" + new CrockfordBase32().encodeToString(arr);
 	}
 
-	private static void renameFileOrDie(File from, File to) {
-		try {
-			from.renameTo(to);
-		} catch (Exception e) {
-			e.printStackTrace();
-			JOptionPane.showMessageDialog(null, "Could not rename file: " + from + " to: " + to);
-			System.exit(-1);
-		}
-	}
-
 	private void updateGameFileCache(GameFileContents game) {
 		gameFileCache.put(new File(saveFolder + "/" + game.filePath), game);
 	}
@@ -352,8 +341,8 @@ private void load() {
 		} catch (Exception e) {
 			System.out.println("Error loading file: " + file);
 			File backupFile = Utils.addFileNameSuffix(file, generateBackupSuffix());
-			System.out.println("Renaming existing file to: " + backupFile);
-			renameFileOrDie(file, backupFile);
+			System.out.println("Backing up existing file to: " + backupFile);
+			Utils.copyFile(file, backupFile);
 			savedGames = new SavedGames();
 		}
 

diff --git a/src/impsave/Utils.java b/src/impsave/Utils.java
@@ -1,5 +1,6 @@
 package impsave;
 
+import java.io.Closeable;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
@@ -69,6 +70,32 @@ public static void copy(InputStream in, OutputStream out) throws IOException {
         }
 	}
 
+	private static void close(Closeable in) {
+		if (in != null) {
+			try {
+				in.close();
+			} catch (IOException e) {
+				e.printStackTrace();
+			}
+		}
+	}
+
+	public static void copyFile(File from, File to) {
+		FileInputStream in = null;
+		FileOutputStream out = null;
+		try {
+			in = new FileInputStream(from);
+			out = new FileOutputStream(to);
+			copy(in, new FileOutputStream(to));
+			out.flush();
+		} catch (Exception e) {
+			e.printStackTrace();
+		} finally {
+			close(in);
+			close(out);
+		}
+	}
+
 	public static File addFileNameSuffix(File file, String suffix) {
 		String name = file.getName();
 		int dotIndex = name.lastIndexOf('.');