Fixing move used in deletion to not fail if original did not exist

syncany-lib/src/main/java/org/syncany/plugins/StorageMoveException.java

@@ -0,0 +1,38 @@
+/*
+ * Syncany, www.syncany.org
+ * Copyright (C) 2011-2014 Philipp C. Heckel <philipp.heckel@gmail.com> 
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.syncany.plugins;
+
+/**
+ * @author pim-arch
+ *
+ */
+public class StorageMoveException extends StorageException {
+	private static final long serialVersionUID = 8929643336708862710L;
+
+	public StorageMoveException(Throwable cause) {
+        super(cause);
+    }
+
+    public StorageMoveException(String message, Throwable cause) {
+        super(message, cause);
+    }
+
+    public StorageMoveException(String message) {
+        super(message);
+    }
+}

syncany-lib/src/main/java/org/syncany/plugins/local/LocalTransferManager.java

@@ -33,6 +33,7 @@
 import org.apache.commons.io.FileExistsException;
 import org.apache.commons.io.FileUtils;
 import org.syncany.plugins.StorageException;
+import org.syncany.plugins.StorageMoveException;
 import org.syncany.plugins.transfer.AbstractTransferManager;
 import org.syncany.plugins.transfer.TransferManager;
 import org.syncany.plugins.transfer.files.ActionRemoteFile;
@@ -145,6 +146,10 @@ public void move(RemoteFile sourceFile, RemoteFile targetFile) throws StorageExc
 
 		File sourceRemoteFile = getRemoteFile(sourceFile);
 		File targetRemoteFile = getRemoteFile(targetFile);
+
+		if (!sourceRemoteFile.exists()) {
+			throw new StorageMoveException("Unable to move file " + sourceFile + " because it does not exist.");
+		}
 
 		try {
 			FileUtils.moveFile(sourceRemoteFile, targetRemoteFile);

syncany-lib/src/main/java/org/syncany/plugins/transfer/RemoteTransaction.java

@@ -28,6 +28,7 @@
 import org.simpleframework.xml.core.Persister;
 import org.syncany.config.Config;
 import org.syncany.plugins.StorageException;
+import org.syncany.plugins.StorageMoveException;
 import org.syncany.plugins.transfer.files.RemoteFile;
 import org.syncany.plugins.transfer.files.TempRemoteFile;
 import org.syncany.plugins.transfer.files.TransactionRemoteFile;
@@ -114,7 +115,12 @@ public void commit() throws StorageException {
 			else if (action.getType().equals(ActionTO.TYPE_DELETE)) {
 				RemoteFile remoteFile = action.getRemoteFile();
 				logger.log(Level.INFO, "- Moving {0} to temp. file {1} ...", new Object[] { remoteFile, tempRemoteFile });
-				transferManager.move(remoteFile, tempRemoteFile);
+				try {
+					transferManager.move(remoteFile, tempRemoteFile);
+				}
+				catch (StorageMoveException e) {
+					logger.log(Level.INFO, "- Move to delete file failed because the remoteFile does not exist.", e);
+				}
 			}
 		}