Merge pull request #62651 from nextcloud/carl/trashbackend

feat(trash): Add getTrashRootItem to ITrashBackend

Author: CarlSchwan

apps/files_trashbin/lib/Trash/ITrashBackend.php

@@ -35,6 +35,15 @@ public function listTrashRoot(IUser $user): array;
 	 */
 	public function listTrashFolder(ITrashItem $folder): array;
 
+	/**
+	 * Get a specific item in the root of the trashbin
+	 *
+	 * @param IUser $user
+	 * @return ?ITrashItem
+	 * @since 36.0.0
+	 */
+	public function getTrashRootItem(IUser $user, string $name): ?ITrashItem;
+
 	/**
 	 * Restore a trashbin item
 	 *

apps/files_trashbin/lib/Trash/ITrashManager.php

@@ -9,8 +9,6 @@
 
 namespace OCA\Files_Trashbin\Trash;
 
-use OCP\IUser;
-
 interface ITrashManager extends ITrashBackend {
 	/**
 	 * Add a backend for the trashbin
@@ -21,25 +19,6 @@ interface ITrashManager extends ITrashBackend {
 	 */
 	public function registerBackend(string $storageType, ITrashBackend $backend);
 
-	/**
-	 * List all trash items in the root of the trashbin
-	 *
-	 * @param IUser $user
-	 * @return ITrashItem[]
-	 * @since 15.0.0
-	 */
-	#[\Override]
-	public function listTrashRoot(IUser $user): array;
-
-	/**
-	 * Get a specific item in the root of the trashbin
-	 *
-	 * @param IUser $user
-	 * @return ?ITrashItem
-	 * @since 35.0.0
-	 */
-	public function getTrashRootItem(IUser $user, string $name): ?ITrashItem;
-
 	/**
 	 * Temporally prevent files from being moved to the trash
 	 *

apps/files_trashbin/lib/Trash/LegacyTrashBackend.php

@@ -61,6 +61,7 @@ public function listTrashRoot(IUser $user): array {
 		return array_map(fn (FileInfo $fileInfo): ITrashItem => $this->mapTrashItem($fileInfo, $user), $entries);
 	}
 
+	#[\Override]
 	public function getTrashRootItem(IUser $user, string $name): ?ITrashItem {
 		$entry = Helper::getTrashFile('/', $user->getUID(), $name);
 		if ($entry === null) {

apps/files_trashbin/lib/Trash/TrashManager.php

@@ -42,18 +42,9 @@ public function listTrashRoot(IUser $user): array {
 	#[\Override]
 	public function getTrashRootItem(IUser $user, string $name): ?ITrashItem {
 		foreach ($this->getBackends() as $backend) {
-			if (method_exists($backend, 'getTrashRootItem')) {
-				$item = $backend->getTrashRootItem($user, $name);
-				if ($item !== null) {
-					return $item;
-				}
-			} else {
-				$items = $backend->listTrashRoot($user);
-				foreach ($items as $item) {
-					if ($item->getName() === $name) {
-						return $item;
-					}
-				}
+			$item = $backend->getTrashRootItem($user, $name);
+			if ($item !== null) {
+				return $item;
 			}
 		}
 		return null;