Add special restore folder

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>

9 files changed, 145 insertions, 4 deletions

diff --git a/apps/files_trashbin/composer/composer/autoload_classmap.php b/apps/files_trashbin/composer/composer/autoload_classmap.php
index ad1d3db37ec..fee5a3abb06 100644
--- a/apps/files_trashbin/composer/composer/autoload_classmap.php
+++ b/apps/files_trashbin/composer/composer/autoload_classmap.php
@@ -18,6 +18,8 @@ return array(
     'OCA\\Files_Trashbin\\Expiration' => $baseDir . '/../lib/Expiration.php',
     'OCA\\Files_Trashbin\\Helper' => $baseDir . '/../lib/Helper.php',
     'OCA\\Files_Trashbin\\Hooks' => $baseDir . '/../lib/Hooks.php',
+    'OCA\\Files_Trashbin\\Sabre\\ITrash' => $baseDir . '/../lib/Sabre/ITrash.php',
+    'OCA\\Files_Trashbin\\Sabre\\RestoreFolder' => $baseDir . '/../lib/Sabre/RestoreFolder.php',
     'OCA\\Files_Trashbin\\Sabre\\RootCollection' => $baseDir . '/../lib/Sabre/RootCollection.php',
     'OCA\\Files_Trashbin\\Sabre\\TrashFile' => $baseDir . '/../lib/Sabre/TrashFile.php',
     'OCA\\Files_Trashbin\\Sabre\\TrashFolder' => $baseDir . '/../lib/Sabre/TrashFolder.php',
diff --git a/apps/files_trashbin/composer/composer/autoload_static.php b/apps/files_trashbin/composer/composer/autoload_static.php
index badea42dec6..9b37b8955a8 100644
--- a/apps/files_trashbin/composer/composer/autoload_static.php
+++ b/apps/files_trashbin/composer/composer/autoload_static.php
@@ -33,6 +33,8 @@ class ComposerStaticInitFiles_Trashbin
         'OCA\\Files_Trashbin\\Expiration' => __DIR__ . '/..' . '/../lib/Expiration.php',
         'OCA\\Files_Trashbin\\Helper' => __DIR__ . '/..' . '/../lib/Helper.php',
         'OCA\\Files_Trashbin\\Hooks' => __DIR__ . '/..' . '/../lib/Hooks.php',
+        'OCA\\Files_Trashbin\\Sabre\\ITrash' => __DIR__ . '/..' . '/../lib/Sabre/ITrash.php',
+        'OCA\\Files_Trashbin\\Sabre\\RestoreFolder' => __DIR__ . '/..' . '/../lib/Sabre/RestoreFolder.php',
         'OCA\\Files_Trashbin\\Sabre\\RootCollection' => __DIR__ . '/..' . '/../lib/Sabre/RootCollection.php',
         'OCA\\Files_Trashbin\\Sabre\\TrashFile' => __DIR__ . '/..' . '/../lib/Sabre/TrashFile.php',
         'OCA\\Files_Trashbin\\Sabre\\TrashFolder' => __DIR__ . '/..' . '/../lib/Sabre/TrashFolder.php',
diff --git a/apps/files_trashbin/lib/Sabre/ITrash.php b/apps/files_trashbin/lib/Sabre/ITrash.php
new file mode 100644
index 00000000000..1c44334ffce
--- /dev/null
+++ b/apps/files_trashbin/lib/Sabre/ITrash.php
@@ -0,0 +1,27 @@
+<?php
+/**
+ * @copyright 2018, Roeland Jago Douma <roeland@famdouma.nl>
+ *
+ * @author Roeland Jago Douma <roeland@famdouma.nl>
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+namespace OCA\Files_Trashbin\Sabre;
+
+interface ITrash {
+	public function restore(): bool;
+}
diff --git a/apps/files_trashbin/lib/Sabre/RestoreFolder.php b/apps/files_trashbin/lib/Sabre/RestoreFolder.php
new file mode 100644
index 00000000000..b2416b1aeb0
--- /dev/null
+++ b/apps/files_trashbin/lib/Sabre/RestoreFolder.php
@@ -0,0 +1,86 @@
+<?php
+declare(strict_types=1);
+/**
+ * @copyright 2018, Roeland Jago Douma <roeland@famdouma.nl>
+ *
+ * @author Roeland Jago Douma <roeland@famdouma.nl>
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+namespace OCA\Files_Trashbin\Sabre;
+
+use Sabre\DAV\Exception\Forbidden;
+use Sabre\DAV\ICollection;
+use Sabre\DAV\IMoveTarget;
+use Sabre\DAV\INode;
+
+
+class RestoreFolder implements ICollection, IMoveTarget {
+
+	/** @var string */
+	protected $userId;
+
+	public function __construct(string $userId) {
+		$this->userId = $userId;
+	}
+
+	public function createFile($name, $data = null) {
+		throw new Forbidden();
+	}
+
+	public function createDirectory($name) {
+		throw new Forbidden();
+	}
+
+	public function getChild($name) {
+		return null;
+	}
+
+	public function delete() {
+		throw new Forbidden();
+	}
+
+	public function getName() {
+		return 'restore';
+	}
+
+	public function setName($name) {
+		throw new Forbidden();
+	}
+
+	public function getLastModified() {
+		return 0;
+	}
+
+	public function getChildren() {
+		return [];
+	}
+
+	public function childExists($name) {
+		return false;
+	}
+
+	function moveInto($targetName, $sourcePath, INode $sourceNode) {
+		if (!($sourceNode instanceof ITrash)) {
+			return false;
+		}
+
+		return $sourceNode->restore();
+	}
+
+}
diff --git a/apps/files_trashbin/lib/Sabre/TrashFile.php b/apps/files_trashbin/lib/Sabre/TrashFile.php
index 39b788a2e2c..3e801a27579 100644
--- a/apps/files_trashbin/lib/Sabre/TrashFile.php
+++ b/apps/files_trashbin/lib/Sabre/TrashFile.php
@@ -26,7 +26,7 @@ use OCP\Files\FileInfo;
 use Sabre\DAV\Exception\Forbidden;
 use Sabre\DAV\IFile;
 
-class TrashFile implements IFile {
+class TrashFile implements IFile, ITrash {
 	/** @var string */
 	private $userId;
 
@@ -74,4 +74,8 @@ class TrashFile implements IFile {
 		return $this->data->getMtime();
 	}
 
+	public function restore(): bool {
+		return \OCA\Files_Trashbin\Trashbin::restore($this->getName(), $this->data->getName(), $this->getLastModified());
+	}
+
 }
diff --git a/apps/files_trashbin/lib/Sabre/TrashFolder.php b/apps/files_trashbin/lib/Sabre/TrashFolder.php
index 2f97a73ebfd..ebe7f7d4871 100644
--- a/apps/files_trashbin/lib/Sabre/TrashFolder.php
+++ b/apps/files_trashbin/lib/Sabre/TrashFolder.php
@@ -26,7 +26,7 @@ use OCP\Files\FileInfo;
 use Sabre\DAV\Exception\Forbidden;
 use Sabre\DAV\ICollection;
 
-class TrashFolder implements ICollection {
+class TrashFolder implements ICollection, ITrash {
 	/** @var string */
 	private $userId;
 
@@ -99,4 +99,10 @@ class TrashFolder implements ICollection {
 	public function getLastModified() {
 		return $this->data->getMtime();
 	}
+
+	public function restore(): bool {
+		return \OCA\Files_Trashbin\Trashbin::restore($this->getName(), $this->data->getName(), $this->getLastModified());
+	}
+
+
 }
diff --git a/apps/files_trashbin/lib/Sabre/TrashFolderFile.php b/apps/files_trashbin/lib/Sabre/TrashFolderFile.php
index 5a9133f3adb..b927d0a0870 100644
--- a/apps/files_trashbin/lib/Sabre/TrashFolderFile.php
+++ b/apps/files_trashbin/lib/Sabre/TrashFolderFile.php
@@ -26,7 +26,7 @@ use OCP\Files\FileInfo;
 use Sabre\DAV\Exception\Forbidden;
 use Sabre\DAV\IFile;
 
-class TrashFolderFile implements IFile {
+class TrashFolderFile implements IFile, ITrash {
 	/** @var string */
 	private $root;
 
@@ -78,4 +78,8 @@ class TrashFolderFile implements IFile {
 		return $this->data->getMtime();
 	}
 
+	public function restore(): bool {
+		return \OCA\Files_Trashbin\Trashbin::restore($this->root . '/' . $this->getName(), $this->data->getName(), null);
+	}
+
 }
diff --git a/apps/files_trashbin/lib/Sabre/TrashFolderFolder.php b/apps/files_trashbin/lib/Sabre/TrashFolderFolder.php
index 21c121c7d46..efd208a1d8d 100644
--- a/apps/files_trashbin/lib/Sabre/TrashFolderFolder.php
+++ b/apps/files_trashbin/lib/Sabre/TrashFolderFolder.php
@@ -26,7 +26,7 @@ use OCP\Files\FileInfo;
 use Sabre\DAV\Exception\Forbidden;
 use Sabre\DAV\ICollection;
 
-class TrashFolderFolder implements ICollection {
+class TrashFolderFolder implements ICollection, ITrash {
 
 	/** @var string */
 	private $root;
@@ -107,4 +107,8 @@ class TrashFolderFolder implements ICollection {
 		return $this->data->getMtime();
 	}
 
+	public function restore(): bool {
+		return \OCA\Files_Trashbin\Trashbin::restore($this->root . '/' . $this->getName(), $this->data->getName(), null);
+	}
+
 }
diff --git a/apps/files_trashbin/lib/Sabre/TrashHome.php b/apps/files_trashbin/lib/Sabre/TrashHome.php
index 9c460dbba20..0a04755afcb 100644
--- a/apps/files_trashbin/lib/Sabre/TrashHome.php
+++ b/apps/files_trashbin/lib/Sabre/TrashHome.php
@@ -67,6 +67,10 @@ class TrashHome implements ICollection {
 	public function getChild($name) {
 		list(,$userId) = \Sabre\Uri\split($this->principalInfo['uri']);
 
+		if ($name === 'restore') {
+			return new RestoreFolder($userId);
+		}
+
 		$entries = \OCA\Files_Trashbin\Helper::getTrashFiles('/', $userId);
 
 		foreach ($entries as $entry) {
@@ -93,6 +97,8 @@ class TrashHome implements ICollection {
 			return new TrashFile($userId, $entry);
 		}, $entries);
 
+		$children[] = new RestoreFolder($userId);
+
 		return $children;
 	}