cleanup(trash): Port deletion code of Trashbin to node based API

Instead of using a mix of View and Node based file system manipulation,
use the 'new' node based API everywhere.

Replace the hooks used in the admin_audit related to the deletion to new
typed event that expose the deleted nodes.

And remove old calculateSize to get the size of the deleted folder and
instead rely on the Node::getSize information.

Signed-off-by: Carl Schwan <[email protected]>

Author: Carl Schwan

apps/admin_audit/lib/Actions/Trashbin.php

@@ -7,16 +7,19 @@
  */
 namespace OCA\AdminAudit\Actions;
 
+use OCA\Files_Trashbin\Events\BeforeNodeDeletedEvent;
+use OCA\Files_Trashbin\Events\NodeRestoredEvent;
+
 class Trashbin extends Action {
-	public function delete(array $params): void {
+	public function delete(BeforeNodeDeletedEvent $beforeNodeDeletedEvent): void {
 		$this->log('File "%s" deleted from trash bin.',
-			['path' => $params['path']], ['path']
+			['path' => $beforeNodeDeletedEvent->getSource()->getPath()], ['path']
 		);
 	}
 
-	public function restore(array $params): void {
+	public function restore(NodeRestoredEvent $nodeRestoredEvent): void {
 		$this->log('File "%s" restored from trash bin.',
-			['path' => $params['filePath']], ['path']
+			['path' => $nodeRestoredEvent->getTarget()], ['path']
 		);
 	}
 }

apps/admin_audit/lib/AppInfo/Application.php

@@ -27,6 +27,8 @@
 use OCA\AdminAudit\Listener\SecurityEventListener;
 use OCA\AdminAudit\Listener\SharingEventListener;
 use OCA\AdminAudit\Listener\UserManagementEventListener;
+use OCA\Files_Trashbin\Events\NodeRestoredEvent;
+use OCA\Files_Trashbin\Events\BeforeNodeDeletedEvent as TrashbinBeforeNodeDeletedEvent;
 use OCA\Files_Versions\Events\VersionRestoredEvent;
 use OCP\App\Events\AppDisableEvent;
 use OCP\App\Events\AppEnableEvent;
@@ -44,6 +46,7 @@
 use OCP\Files\Events\Node\BeforeNodeReadEvent;
 use OCP\Files\Events\Node\NodeCopiedEvent;
 use OCP\Files\Events\Node\NodeCreatedEvent;
+use OCP\Files\Events\Node\NodeDeletedEvent;
 use OCP\Files\Events\Node\NodeRenamedEvent;
 use OCP\Files\Events\Node\NodeWrittenEvent;
 use OCP\Group\Events\GroupCreatedEvent;
@@ -217,9 +220,20 @@ private function versionsHooks(IAuditLogger $logger): void {
 		Util::connectHook('\OCP\Versions', 'delete', $versionsActions, 'delete');
 	}
 
-	private function trashbinHooks(IAuditLogger $logger): void {
+	private function trashbinHooks(IAuditLogger $logger, IEventDispatcher $eventDispatcher): void {
 		$trashActions = new Trashbin($logger);
-		Util::connectHook('\OCP\Trashbin', 'preDelete', $trashActions, 'delete');
-		Util::connectHook('\OCA\Files_Trashbin\Trashbin', 'post_restore', $trashActions, 'restore');
+
+		$eventDispatcher->addListener(TrashbinBeforeNodeDeletedEvent::class,
+			function (TrashbinBeforeNodeDeletedEvent $event) use ($trashActions): void {
+				$trashActions->delete($event);
+			}
+		);
+
+		$eventDispatcher->addListener(
+			NodeRestoredEvent::class,
+			function (NodeRestoredEvent $event) use ($trashActions): void {
+				$trashActions->restore($event);
+			}
+		);
 	}
 }

apps/files_trashbin/composer/composer/autoload_classmap.php

@@ -16,8 +16,12 @@
     'OCA\\Files_Trashbin\\Command\\RestoreAllFiles' => $baseDir . '/../lib/Command/RestoreAllFiles.php',
     'OCA\\Files_Trashbin\\Command\\Size' => $baseDir . '/../lib/Command/Size.php',
     'OCA\\Files_Trashbin\\Controller\\PreviewController' => $baseDir . '/../lib/Controller/PreviewController.php',
+    'OCA\\Files_Trashbin\\Events\\BeforeDeleteAllEvent' => $baseDir . '/../lib/Events/BeforeDeleteAllEvent.php',
+    'OCA\\Files_Trashbin\\Events\\BeforeNodeDeletedEvent' => $baseDir . '/../lib/Events/BeforeNodeDeletedEvent.php',
     'OCA\\Files_Trashbin\\Events\\BeforeNodeRestoredEvent' => $baseDir . '/../lib/Events/BeforeNodeRestoredEvent.php',
+    'OCA\\Files_Trashbin\\Events\\DeleteAllEvent' => $baseDir . '/../lib/Events/DeleteAllEvent.php',
     'OCA\\Files_Trashbin\\Events\\MoveToTrashEvent' => $baseDir . '/../lib/Events/MoveToTrashEvent.php',
+    'OCA\\Files_Trashbin\\Events\\NodeDeletedEvent' => $baseDir . '/../lib/Events/NodeDeletedEvent.php',
     'OCA\\Files_Trashbin\\Events\\NodeRestoredEvent' => $baseDir . '/../lib/Events/NodeRestoredEvent.php',
     'OCA\\Files_Trashbin\\Exceptions\\CopyRecursiveException' => $baseDir . '/../lib/Exceptions/CopyRecursiveException.php',
     'OCA\\Files_Trashbin\\Expiration' => $baseDir . '/../lib/Expiration.php',

apps/files_trashbin/composer/composer/autoload_static.php

@@ -31,8 +31,12 @@ class ComposerStaticInitFiles_Trashbin
         'OCA\\Files_Trashbin\\Command\\RestoreAllFiles' => __DIR__ . '/..' . '/../lib/Command/RestoreAllFiles.php',
         'OCA\\Files_Trashbin\\Command\\Size' => __DIR__ . '/..' . '/../lib/Command/Size.php',
         'OCA\\Files_Trashbin\\Controller\\PreviewController' => __DIR__ . '/..' . '/../lib/Controller/PreviewController.php',
+        'OCA\\Files_Trashbin\\Events\\BeforeDeleteAllEvent' => __DIR__ . '/..' . '/../lib/Events/BeforeDeleteAllEvent.php',
+        'OCA\\Files_Trashbin\\Events\\BeforeNodeDeletedEvent' => __DIR__ . '/..' . '/../lib/Events/BeforeNodeDeletedEvent.php',
         'OCA\\Files_Trashbin\\Events\\BeforeNodeRestoredEvent' => __DIR__ . '/..' . '/../lib/Events/BeforeNodeRestoredEvent.php',
+        'OCA\\Files_Trashbin\\Events\\DeleteAllEvent' => __DIR__ . '/..' . '/../lib/Events/DeleteAllEvent.php',
         'OCA\\Files_Trashbin\\Events\\MoveToTrashEvent' => __DIR__ . '/..' . '/../lib/Events/MoveToTrashEvent.php',
+        'OCA\\Files_Trashbin\\Events\\NodeDeletedEvent' => __DIR__ . '/..' . '/../lib/Events/NodeDeletedEvent.php',
         'OCA\\Files_Trashbin\\Events\\NodeRestoredEvent' => __DIR__ . '/..' . '/../lib/Events/NodeRestoredEvent.php',
         'OCA\\Files_Trashbin\\Exceptions\\CopyRecursiveException' => __DIR__ . '/..' . '/../lib/Exceptions/CopyRecursiveException.php',
         'OCA\\Files_Trashbin\\Expiration' => __DIR__ . '/..' . '/../lib/Expiration.php',

apps/files_trashbin/lib/Events/BeforeDeleteAllEvent.php

@@ -0,0 +1,31 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * SPDX-FileCopyrightText: 2025 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
+namespace OCA\Files_Trashbin\Events;
+
+use OCP\EventDispatcher\Event;
+use OCP\Files\Node;
+
+/**
+ * Event send before emptying the trash.
+ * @since 32.0.0
+ */
+class BeforeDeleteAllEvent extends Event {
+
+	/**
+	 * @param Node[] $deletedNodes
+	 */
+	public function __construct(private readonly array $deletedNodes) {
+	}
+
+	/** @return Node[] */
+	public function getDeletedNodes(): array {
+		return $this->deletedNodes;
+	}
+}

apps/files_trashbin/lib/Events/BeforeNodeDeletedEvent.php

@@ -0,0 +1,25 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * SPDX-FileCopyrightText: 2025 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+namespace OCA\Files_Trashbin\Events;
+
+use OCP\EventDispatcher\Event;
+use OCP\Files\Node;
+
+/**
+ * Event send before a node is deleted definitively.
+ * @since 32.0.0
+ */
+class BeforeNodeDeletedEvent extends Event {
+	public function __construct(private readonly Node $source) {
+	}
+
+	public function getSource(): Node {
+		return $this->source;
+	}
+}

apps/files_trashbin/lib/Events/DeleteAllEvent.php

@@ -0,0 +1,31 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * SPDX-FileCopyrightText: 2025 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
+namespace OCA\Files_Trashbin\Events;
+
+use OCP\EventDispatcher\Event;
+use OCP\Files\Node;
+
+/**
+ * Event send before emptying the trash.
+ * @since 32.0.0
+ */
+class DeleteAllEvent extends Event {
+
+	/**
+	 * @param Node[] $deletedNodes
+	 */
+	public function __construct(private readonly array $deletedNodes) {
+	}
+
+	/** @return Node[] */
+	public function getDeletedNodes(): array {
+		return $this->deletedNodes;
+	}
+}

apps/files_trashbin/lib/Events/NodeDeletedEvent.php

@@ -0,0 +1,25 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * SPDX-FileCopyrightText: 2025 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+namespace OCA\Files_Trashbin\Events;
+
+use OCP\EventDispatcher\Event;
+use OCP\Files\Node;
+
+/**
+ * Event send before a node is deleted definitively.
+ * @since 32.0.0
+ */
+class NodeDeletedEvent extends Event {
+	public function __construct(private Node $source) {
+	}
+
+	public function getSource(): Node {
+		return $this->source;
+	}
+}

apps/files_trashbin/lib/Sabre/TrashRoot.php

@@ -19,7 +19,6 @@
 use Sabre\DAV\ICollection;
 
 class TrashRoot implements ICollection {
-
 	public function __construct(
 		private IUser $user,
 		private ITrashManager $trashManager,
@@ -31,7 +30,7 @@ public function delete() {
 			throw new Forbidden('Not allowed to delete items from the trash bin');
 		}
 
-		Trashbin::deleteAll();
+		Trashbin::deleteAll($this->user);
 		foreach ($this->trashManager->listTrashRoot($this->user) as $trashItem) {
 			$this->trashManager->removeItem($trashItem);
 		}