fix select statement

fix select statement
Make trashbin api modules

Apps can register trashbin backends for specific storages,
allowing them to modify trashbin behavior for storages

The old trashbin implementation has been wrapped in a "legacy" backend,
for future work this can be replaced with a new backend that better handles
shares while still keeping the legacy backend around to keep existing trash
from being accessible

Signed-off-by: Robin Appelman <robin@icewind.nl>

1 files changed, 102 insertions, 0 deletions

diff --git a/apps/files_trashbin/lib/Trash/LegacyTrashBackend.php b/apps/files_trashbin/lib/Trash/LegacyTrashBackend.php
new file mode 100644
index 00000000000..210c84228f7
--- /dev/null
+++ b/apps/files_trashbin/lib/Trash/LegacyTrashBackend.php
@@ -0,0 +1,102 @@
+<?php
+/**
+ * @copyright Copyright (c) 2018 Robin Appelman <robin@icewind.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\Trash;
+
+use OC\Files\Filesystem;
+use OC\Files\View;
+use OCA\Files_Trashbin\Helper;
+use OCA\Files_Trashbin\Storage;
+use OCA\Files_Trashbin\Trashbin;
+use OCP\Files\FileInfo;
+use OCP\Files\Storage\IStorage;
+use OCP\IUser;
+
+class LegacyTrashBackend implements ITrashBackend {
+	/** @var array */
+	private $deletedFiles = [];
+
+	/**
+	 * @param array $items
+	 * @param IUser $user
+	 * @param ITrashItem $parent
+	 * @return ITrashItem[]
+	 */
+	private function mapTrashItems(array $items, IUser $user, ITrashItem $parent = null): array {
+		$parentTrashPath = ($parent instanceof ITrashItem) ? $parent->getTrashPath() : '';
+		$isRoot = $parent === null;
+		return array_map(function (FileInfo $file) use ($parent, $parentTrashPath, $isRoot, $user) {
+			return new TrashItem(
+				$this,
+				$isRoot ? $file['extraData'] : $parent->getOriginalLocation($user) . '/' . $file->getName(),
+				$file->getMTime(),
+				$parentTrashPath . '/' . $file->getName() . ($isRoot ? '.d' . $file->getMtime() : ''),
+				$file
+			);
+		}, $items);
+	}
+
+	public function listTrashRoot(IUser $user): array {
+		$entries = Helper::getTrashFiles('/', $user->getUID());
+		return $this->mapTrashItems($entries, $user, null);
+	}
+
+	public function listTrashFolder(IUser $user, ITrashItem $folder): array {
+		$entries = Helper::getTrashFiles($folder->getTrashPath(), $user->getUID());
+		return $this->mapTrashItems($entries, $user, $folder);
+	}
+
+	public function restoreItem(ITrashItem $item) {
+		Trashbin::restore($item->getTrashPath(), $item->getName(), $item->isRootItem() ? $item->getDeletedTime() : null);
+	}
+
+	public function removeItem(IUser $user, ITrashItem $item) {
+		if ($item->isRootItem()) {
+			$path = substr($item->getTrashPath(), 0, -strlen('.d' . $item->getDeletedTime()));
+			Trashbin::delete($path, $user->getUID(), $item->getDeletedTime());
+		} else {
+			Trashbin::delete($item->getTrashPath(), $user->getUID(), null);
+		}
+
+	}
+
+	public function moveToTrash(IStorage $storage, string $internalPath) {
+		if (!$storage instanceof Storage) {
+			return false;
+		}
+		$normalized = Filesystem::normalizePath($storage->getMountPoint() . '/' . $internalPath, true, false, true);
+		$view = Filesystem::getView();
+		if (!isset($this->deletedFiles[$normalized]) && $view instanceof View) {
+			$this->deletedFiles[$normalized] = $normalized;
+			if ($filesPath = $view->getRelativePath($normalized)) {
+				$filesPath = trim($filesPath, '/');
+				$result = \OCA\Files_Trashbin\Trashbin::move2trash($filesPath);
+			} else {
+				$result = false;
+			}
+			unset($this->deletedFiles[$normalized]);
+		} else {
+			$result = false;
+		}
+
+		return $result;
+	}
+}