Skip to content

[stable31] fix(files_trashbin): Fix size propagation when moving file to trash #54971

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

Merged
AndyScherzinger merged 1 commit into from
Sep 10, 2025
Merged

[stable31] fix(files_trashbin): Fix size propagation when moving file to trash #54971

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
fix(files_trashbin): Fix size propagation when moving file to trash 
Signed-off-by: provokateurin <[email protected]>
  • Loading branch information
@provokateurin
provokateurin committed Sep 10, 2025
commit b0a27e4dc4b3d96b6744ddb343d6deff4aa79197
3 changes: 2 additions & 1 deletion apps/files_trashbin/lib/Trashbin.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -293,8 +293,9 @@ public static function move2trash($file_path, $ownerOnly = false) {
try {
$moveSuccessful = true;

$inCache = $sourceStorage->getCache()->inCache($sourceInternalPath);
$trashStorage->moveFromStorage($sourceStorage, $sourceInternalPath, $trashInternalPath);
if ($sourceStorage->getCache()->inCache($sourceInternalPath)) {
if ($inCache) {
$trashStorage->getUpdater()->renameFromStorage($sourceStorage, $sourceInternalPath, $trashInternalPath);
}
} catch (CopyRecursiveException $e) {
Expand Down
24 changes: 24 additions & 0 deletions apps/files_trashbin/tests/TrashbinTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,9 @@
use OCP\AppFramework\Utility\ITimeFactory;
use OCP\Constants;
use OCP\Files\FileInfo;
use OCP\Files\IRootFolder;
use OCP\IConfig;
use OCP\Server;
use OCP\Share\IShare;

/**
Expand Down Expand Up @@ -664,6 +666,28 @@ public function testRestoreFileIntoReadOnlySourceFolder(): void {
}
}

public function testTrashSizePropagation(): void {
$view = new View('/' . self::TEST_TRASHBIN_USER1 . '/files_trashbin/files');

$userFolder = Server::get(IRootFolder::class)->getUserFolder(self::TEST_TRASHBIN_USER1);
$file1 = $userFolder->newFile('foo.txt');
$file1->putContent('1');

$this->assertTrue($userFolder->nodeExists('foo.txt'));
$file1->delete();
$this->assertFalse($userFolder->nodeExists('foo.txt'));
$this->assertEquals(1, $view->getFileInfo('')->getSize());

$folder = $userFolder->newFolder('bar');
$file2 = $folder->newFile('baz.txt');
$file2->putContent('22');

$this->assertTrue($userFolder->nodeExists('bar'));
$folder->delete();
$this->assertFalse($userFolder->nodeExists('bar'));
$this->assertEquals(3, $view->getFileInfo('')->getSize());
}

/**
* @param string $user
* @param bool $create
Expand Down
Loading