fix user folder init

Signed-off-by: Robin Appelman <robin@icewind.nl>
nextcloud · Apr 26, 2022 · 625ed52 · 625ed52
1 parent 34426c8
commit 625ed52
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/lib/private/Files/ObjectStore/ObjectStoreStorage.php b/lib/private/Files/ObjectStore/ObjectStoreStorage.php
@@ -75,9 +75,13 @@ public function __construct($params) {
 		if (isset($params['objectPrefix'])) {
 			$this->objectPrefix = $params['objectPrefix'];
 		}
-		//initialize cache with root directory in cache
-		if (!$this->is_dir('/')) {
-			$this->mkdir('/');
+
+		// home storage is setup in the SetupManager
+		if (!$this instanceof HomeObjectStoreStorage) {
+			//initialize cache with root directory in cache
+			if (!$this->is_dir('/')) {
+				$this->mkdir('/');
+			}
 		}
 
 		$this->logger = \OC::$server->getLogger();

diff --git a/lib/private/Files/SetupManager.php b/lib/private/Files/SetupManager.php
@@ -239,8 +239,10 @@ private function oneTimeUserSetup(IUser $user) {
 			$this->mountManager->addMount($homeMount);
 
 			if ($homeMount->getStorageRootId() === -1) {
-				$homeMount->getStorage()->mkdir('');
-				$homeMount->getStorage()->getScanner()->scan('');
+				$homeStorage = $homeMount->getStorage();
+				$homeStorage->mkdir('');
+				$homeStorage->mkdir('files');
+				$homeStorage->getScanner()->scan('');
 			}
 
 			$provider = $homeMount->getMountProvider();