Merge pull request #842 from nextcloud/fix/trash_restore_target

Make sure that the target we try to restore to doesn't exist yet

1 files changed, 27 insertions, 0 deletions

diff --git a/lib/Trash/TrashBackend.php b/lib/Trash/TrashBackend.php
index dd57384b..94933d3c 100644
--- a/lib/Trash/TrashBackend.php
+++ b/lib/Trash/TrashBackend.php
@@ -115,6 +115,33 @@ class TrashBackend implements ITrashBackend {
 		if ($parent !== '' && !$targetFolder->nodeExists($parent)) {
 			$originalLocation = basename($originalLocation);
 		}
+
+		if ($targetFolder->nodeExists($originalLocation)) {
+			$info = pathinfo($originalLocation);
+			$i = 1;
+
+			$gen = function($info, $i): string {
+				$target = $info['dirname'];
+				if ($target === '.') {
+					$target = '';
+				}
+
+				$target .= $info['filename'];
+				$target .= ' (' . $i . ')';
+
+				if (isset($info['extension'])) {
+					$target .= $info['extension'];
+				}
+
+				return $target;
+			};
+
+			do {
+				$originalLocation = $gen($info, $i);
+				$i++;
+			} while($targetFolder->nodeExists($originalLocation));
+		}
+
 		$targetLocation = $targetFolder->getInternalPath() . '/' . $originalLocation;
 		$targetFolder->getStorage()->moveFromStorage($trashStorage, $node->getInternalPath(), $targetLocation);
 		$targetFolder->getStorage()->getCache()->moveFromCache($trashStorage->getCache(), $node->getInternalPath(), $targetLocation);