upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-05-19 08:25:56 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

Merge pull request #54971 from nextcloud/backport/54950/stable31

Browse source 
[stable31] fix(files_trashbin): Fix size propagation when moving file to trash
This commit is contained in:
Andy Scherzinger 2025-09-10 08:31:27 +02:00 committed by GitHub
commit 808cb1f72c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 26 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -293,8 +293,9 @@ class Trashbin implements IEventListener {
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) {

24
apps/files_trashbin/tests/TrashbinTest.php
View file

@ -19,7 +19,9 @@ use OCA\Files_Trashbin\Trashbin;
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;
/**
@ -664,6 +666,28 @@ class TrashbinTest extends \Test\TestCase {
}
}
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