fix: Use new getOrCreate method and fix code issues

Signed-off-by: Côme Chilliet <[email protected]>

Author: come-nc

lib/private/Files/Node/LazyUserFolder.php

@@ -19,7 +19,6 @@
 use OCP\IConfig;
 use OCP\IUser;
 use OCP\Server;
-use Psr\Log\LoggerInterface;
 
 class LazyUserFolder extends LazyFolder implements IUserFolder {
 	private string $path;
@@ -48,19 +47,8 @@ public function __construct(
 			$rootFolder,
 			function () use ($user): UserFolder {
 				$root = $this->getRootFolder();
-				if (!$root->nodeExists('/' . $user->getUID())) {
-					$parent = $root->newFolder('/' . $user->getUID());
-				} else {
-					$parent = $root->get('/' . $user->getUID());
-				}
-				if (!($parent instanceof Folder)) {
-					$e = new \RuntimeException();
-					\OCP\Server::get(LoggerInterface::class)->error('User root storage is not a folder: ' . $this->path, [
-						'exception' => $e,
-					]);
-					throw $e;
-				}
-				$realFolder = $root->newFolder('/' . $user->getUID() . '/files');
+				$parent = $root->getOrCreateFolder('/' . $user->getUID(), maxRetries: 1);
+				$realFolder = $root->getOrCreateFolder('/' . $user->getUID() . '/files', maxRetries: 1);
 				return new UserFolder(
 					$root,
 					new View($parent->getPath()),

lib/private/Files/Node/Root.php

@@ -346,31 +346,17 @@ public function getUserFolder($userId) {
 
 		if (!$this->userFolderCache->hasKey($userId)) {
 			if ($this->mountManager->getSetupManager()->isSetupComplete($userObject)) {
-				try {
-					$folder = $this->get('/' . $userId . '/files');
-					if (!$folder instanceof \OCP\Files\Folder) {
-						throw new \Exception("Account folder for \"$userId\" exists as a file");
-					}
-				} catch (NotFoundException $e) {
-					if (!$this->nodeExists('/' . $userId)) {
-						$parent = $this->newFolder('/' . $userId);
-					} else {
-						$parent = $this->get('/' . $userId);
-						if (!$parent instanceof \OCP\Files\Folder) {
-							throw new \Exception("Account folder for \"$userId\" exists as a file");
-						}
-					}
-					$realFolder = $this->newFolder('/' . $userId . '/files');
-					$folder = new UserFolder(
-						$this->root,
-						$this->view,
-						$realFolder->getPath(),
-						$parent,
-						Server::get(IConfig::class),
-						$userObject,
-						$this->cacheFactory,
-					);
-				}
+				$parent = $this->getOrCreateFolder('/' . $userId, maxRetries: 1);
+				$realFolder = $this->getOrCreateFolder('/' . $userId . '/files', maxRetries: 1);
+				$folder = new UserFolder(
+					$this,
+					$this->view,
+					$realFolder->getPath(),
+					$parent,
+					Server::get(IConfig::class),
+					$userObject,
+					$this->cacheFactory,
+				);
 			} else {
 				$folder = new LazyUserFolder($this, $userObject, $this->mountManager, $this->useDefaultHomeFoldersPermissions);
 			}

lib/private/Files/Node/UserFolder.php

@@ -9,6 +9,7 @@
 
 use OC\Files\Storage\Wrapper\Quota;
 use OC\Files\View;
+use OCP\Files\Folder as IFolder;
 use OCP\Files\IRootFolder;
 use OCP\Files\IUserFolder;
 use OCP\ICacheFactory;
@@ -24,7 +25,7 @@ public function __construct(
 		IRootFolder $root,
 		View $view,
 		string $path,
-		Folder $parent,
+		IFolder $parent,
 		protected IConfig $config,
 		protected IUser $user,
 		protected ICacheFactory $cacheFactory,