Only delete if copy succeeded

owncloud · Jan 15, 2015 · 12ca5d3 · 12ca5d3
1 parent 01ef533
commit 12ca5d3
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 9 deletions.
diff --git a/lib/private/files/storage/common.php b/lib/private/files/storage/common.php
@@ -455,7 +455,7 @@ public function getDirectDownload($path) {
 	 * @param \OCP\Files\Storage $sourceStorage
 	 * @param string $sourceInternalPath
 	 * @param string $targetInternalPath
-	 * @return bool true on success, false if the cross storage copy is not possible
+	 * @return bool
 	 */
 	public function copyFromStorage(\OCP\Files\Storage $sourceStorage, $sourceInternalPath, $targetInternalPath) {
 		if ($sourceStorage->is_dir($sourceInternalPath)) {
@@ -482,14 +482,17 @@ public function copyFromStorage(\OCP\Files\Storage $sourceStorage, $sourceIntern
 	 * @param \OCP\Files\Storage $sourceStorage
 	 * @param string $sourceInternalPath
 	 * @param string $targetInternalPath
-	 * @return bool true on success, false if the cross storage copy is not possible
+	 * @return bool
 	 */
 	public function moveFromStorage(\OCP\Files\Storage $sourceStorage, $sourceInternalPath, $targetInternalPath) {
-		$this->copyFromStorage($sourceStorage, $sourceInternalPath, $targetInternalPath);
-		if ($sourceStorage->is_dir($sourceInternalPath)) {
-			$sourceStorage->rmdir($sourceInternalPath);
-		} else {
-			$sourceStorage->unlink($sourceInternalPath);
+		$result = $this->copyFromStorage($sourceStorage, $sourceInternalPath, $targetInternalPath);
+		if($result) {
+			if ($sourceStorage->is_dir($sourceInternalPath)) {
+				$sourceStorage->rmdir($sourceInternalPath);
+			} else {
+				$sourceStorage->unlink($sourceInternalPath);
+			}
 		}
+		return $result;
 	}
 }
diff --git a/lib/public/files/storage.php b/lib/public/files/storage.php
@@ -350,15 +350,15 @@ public function getDirectDownload($path);
 	 * @param \OCP\Files\Storage $sourceStorage
 	 * @param string $sourceInternalPath
 	 * @param string $targetInternalPath
-	 * @return bool true on success, false if the cross storage copy is not possible
+	 * @return bool
 	 */
 	public function copyFromStorage(\OCP\Files\Storage $sourceStorage, $sourceInternalPath, $targetInternalPath);
 
 	/**
 	 * @param \OCP\Files\Storage $sourceStorage
 	 * @param string $sourceInternalPath
 	 * @param string $targetInternalPath
-	 * @return bool true on success, false if the cross storage copy is not possible
+	 * @return bool
 	 */
 	public function moveFromStorage(\OCP\Files\Storage $sourceStorage, $sourceInternalPath, $targetInternalPath);
 }