Skip to content

feat(trash): Add getTrashRootItem to ITrashBackend #62651

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
CarlSchwan wants to merge 1 commit into
base: master
Choose a base branch
from
+13 −33
Open

feat(trash): Add getTrashRootItem to ITrashBackend #62651

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions apps/files_trashbin/lib/Trash/ITrashBackend.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 35.0.0
*/
public function getTrashRootItem(IUser $user, string $name): ?ITrashItem;

/**
* Restore a trashbin item
*
Expand Down
21 changes: 0 additions & 21 deletions apps/files_trashbin/lib/Trash/ITrashManager.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,6 @@

namespace OCA\Files_Trashbin\Trash;

use OCP\IUser;

interface ITrashManager extends ITrashBackend {
/**
* Add a backend for the trashbin
Expand All @@ -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
*
Expand Down
1 change: 1 addition & 0 deletions apps/files_trashbin/lib/Trash/LegacyTrashBackend.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,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) {
Expand Down
15 changes: 3 additions & 12 deletions apps/files_trashbin/lib/Trash/TrashManager.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Loading