upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-04-23 23:27:46 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 67

Merge pull request #53752 from nextcloud/trasbin-event-fixes

Browse source 
fix: fix trashbin restore events
This commit is contained in:
John Molakvoæ 2025-08-19 21:17:06 +02:00 committed by GitHub
commit 92e71d23f2
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 16 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
apps/files_trashbin/lib/Trashbin.php
View file

@ -7,7 +7,6 @@
*/
namespace OCA\Files_Trashbin;
use Exception;
use OC\Files\Cache\Cache;
use OC\Files\Cache\CacheEntry;
use OC\Files\Cache\CacheQueryBuilder;
@ -459,6 +458,9 @@ class Trashbin implements IEventListener {
*/
public static function restore($file, $filename, $timestamp) {
$user = OC_User::getUser();
if (!$user) {
throw new \Exception('Tried to restore a file while not logged in');
}
$view = new View('/' . $user);
$location = '';
@ -495,8 +497,8 @@ class Trashbin implements IEventListener {
$sourcePath = Filesystem::normalizePath($file);
$targetPath = Filesystem::normalizePath('/' . $location . '/' . $uniqueFilename);
$sourceNode = self::getNodeForPath($sourcePath);
$targetNode = self::getNodeForPath($targetPath);
$sourceNode = self::getNodeForPath($user, $sourcePath);
$targetNode = self::getNodeForPath($user, $targetPath, 'files');
$run = true;
$event = new BeforeNodeRestoredEvent($sourceNode, $targetNode, $run);
$dispatcher = Server::get(IEventDispatcher::class);
@ -516,8 +518,8 @@ class Trashbin implements IEventListener {
$view->chroot($fakeRoot);
Util::emitHook('\OCA\Files_Trashbin\Trashbin', 'post_restore', ['filePath' => $targetPath, 'trashPath' => $sourcePath]);
$sourceNode = self::getNodeForPath($sourcePath);
$targetNode = self::getNodeForPath($targetPath);
$sourceNode = self::getNodeForPath($user, $sourcePath);
$targetNode = self::getNodeForPath($user, $targetPath, 'files');
$event = new NodeRestoredEvent($sourceNode, $targetNode);
$dispatcher = Server::get(IEventDispatcher::class);
$dispatcher->dispatchTyped($event);
@ -1163,27 +1165,20 @@ class Trashbin implements IEventListener {
return $trashFilename;
}
private static function getNodeForPath(string $path): Node {
$user = OC_User::getUser();
private static function getNodeForPath(string $user, string $path, string $baseDir = 'files_trashbin/files'): Node {
$rootFolder = Server::get(IRootFolder::class);
$path = ltrim($path, '/');
if ($user !== false) {
$userFolder = $rootFolder->getUserFolder($user);
/** @var Folder */
$trashFolder = $userFolder->getParent()->get('files_trashbin/files');
try {
return $trashFolder->get($path);
} catch (NotFoundException $ex) {
}
$userFolder = $rootFolder->getUserFolder($user);
/** @var Folder $trashFolder */
$trashFolder = $userFolder->getParent()->get($baseDir);
try {
return $trashFolder->get($path);
} catch (NotFoundException $ex) {
}
$view = Server::get(View::class);
$fsView = Filesystem::getView();
if ($fsView === null) {
throw new Exception('View should not be null');
}
$fullPath = $fsView->getAbsolutePath($path);
$fullPath = '/' . $user . '/' . $baseDir . '/' . $path;
if (Filesystem::is_dir($path)) {
return new NonExistingFolder($rootFolder, $view, $fullPath);