optimize getUserFolder for the common case

nextcloud · Aug 25, 2016 · fb88d66 · fb88d66
1 parent 2693ae8
commit fb88d66
Showing 1 changed file with 6 additions and 11 deletions.
diff --git a/lib/private/Files/Node/Root.php b/lib/private/Files/Node/Root.php
@@ -341,22 +341,17 @@ public function getName() {
  public function getUserFolder($userId) {
  if (!$this->userFolderCache->hasKey($userId)) {
  \OC\Files\Filesystem::initMountPoints($userId);
- $dir = '/' . $userId;
- $folder = null;
 
  try {
- $folder = $this->get($dir);
+ $folder = $this->get('/' . $userId . '/files');
  } catch (NotFoundException $e) {
- $folder = $this->newFolder($dir);
- }
-
- $dir = '/files';
- try {
- $folder = $folder->get($dir);
- } catch (NotFoundException $e) {
- $folder = $folder->newFolder($dir);
+ if (!$this->nodeExists('/' . $userId)) {
+ $this->newFolder('/' . $userId);
+ }
+ $folder = $this->newFolder('/' . $userId . '/files');
  \OC_Util::copySkeleton($userId, $folder);
  }
+
  $this->userFolderCache->set($userId, $folder);
  }