Merge pull request #47750 from nextcloud/backport/47417/stable29

2 files changed, 40 insertions, 0 deletions

diff --git a/lib/private/Files/View.php b/lib/private/Files/View.php
index 0de515d8481..efe3bcf5abc 100644
--- a/lib/private/Files/View.php
+++ b/lib/private/Files/View.php
@@ -1531,6 +1531,15 @@ class View {
 					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 f67c4e9642b..16568e74a06 100644
--- a/tests/lib/Files/ViewTest.php
+++ b/tests/lib/Files/ViewTest.php
@@ -2743,4 +2743,35 @@ class ViewTest extends \Test\TestCase {
 
 		$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']);
+	}
 }