From ebfbe99652c88574bf8fdb1de830df5e694cfda9 Mon Sep 17 00:00:00 2001 From: provokateurin Date: Thu, 22 Aug 2024 12:04:31 +0200 Subject: [PATCH] fix(files): Create non-existent parents of mountpoints Signed-off-by: provokateurin --- lib/private/Files/View.php | 9 +++++++++ tests/lib/Files/ViewTest.php | 31 +++++++++++++++++++++++++++++++ 2 files changed, 40 insertions(+) diff --git a/lib/private/Files/View.php b/lib/private/Files/View.php index 0e5e433ccb689..09e2ba39c1098 100644 --- a/lib/private/Files/View.php +++ b/lib/private/Files/View.php @@ -1496,6 +1496,15 @@ public function getDirectoryContent($directory, $mimetype_filter = '', ?\OCP\Fil if ($pos = strpos($relativePath, '/')) { //mountpoint inside subfolder add size to the correct folder $entryName = substr($relativePath, 0, $pos); + + // Create parent folders if the mountpoint is inside a subfolder that doesn't exist yet + if (!isset($files[$entryName]) && $this->mkdir($path . '/' . $entryName) !== false) { + $info = $this->getFileInfo($path . '/' . $entryName); + if ($info !== false) { + $files[$entryName] = $info; + } + } + if (isset($files[$entryName])) { $files[$entryName]->addSubEntry($rootEntry, $mountPoint); } diff --git a/tests/lib/Files/ViewTest.php b/tests/lib/Files/ViewTest.php index 43a25150eafbf..379a8389355ab 100644 --- a/tests/lib/Files/ViewTest.php +++ b/tests/lib/Files/ViewTest.php @@ -2743,4 +2743,35 @@ public function testFopenGone() { $this->assertFalse($cache->inCache('foo.txt')); } + + public function testMountpointParentsCreated() { + $storage1 = $this->getTestStorage(); + Filesystem::mount($storage1, [], '/'); + + $storage2 = $this->getTestStorage(); + Filesystem::mount($storage2, [], '/A/B/C'); + + $rootView = new View(''); + + $folderData = $rootView->getDirectoryContent('/'); + $this->assertCount(4, $folderData); + $this->assertEquals('folder', $folderData[0]['name']); + $this->assertEquals('foo.png', $folderData[1]['name']); + $this->assertEquals('foo.txt', $folderData[2]['name']); + $this->assertEquals('A', $folderData[3]['name']); + + $folderData = $rootView->getDirectoryContent('/A'); + $this->assertCount(1, $folderData); + $this->assertEquals('B', $folderData[0]['name']); + + $folderData = $rootView->getDirectoryContent('/A/B'); + $this->assertCount(1, $folderData); + $this->assertEquals('C', $folderData[0]['name']); + + $folderData = $rootView->getDirectoryContent('/A/B/C'); + $this->assertCount(3, $folderData); + $this->assertEquals('folder', $folderData[0]['name']); + $this->assertEquals('foo.png', $folderData[1]['name']); + $this->assertEquals('foo.txt', $folderData[2]['name']); + } }