Merge pull request #1543 from nextcloud/fix-slow-capabilities

Fix slow capabilities

Author: juliusknorr

lib/AppInfo/Capabilities.php

@@ -26,7 +26,7 @@ public function getCapabilities(): array {
 			Application::APP_ID => [
 				'api_version' => Application::$API_VERSIONS,
 				'version' => $this->appManager->getAppVersion(Application::APP_ID),
-				'notes_path' => $this->userId !== null && $this->userId !== ' ' ? $this->noteUtil->getNotesFolderUserPath($this->userId) : null,
+				'notes_path' => $this->userId !== null && $this->userId !== ' ' ? $this->noteUtil->getNotesFolderUserPath($this->userId, true) : null,
 			],
 		];
 	}

lib/Service/NoteUtil.php

@@ -183,16 +183,14 @@ public function getOrCreateFolder(string $path, bool $create = true) : Folder {
 		return $folder;
 	}
 
-	public function getNotesFolderUserPath(string $userId): ?string {
-		/** @psalm-suppress MissingDependency */
-		$userFolder = $this->getRoot()->getUserFolder($userId);
+	public function getNotesFolderUserPath(string $userId, bool $saveInitial = false): ?string {
 		try {
-			$nodesFolder = $this->getOrCreateNotesFolder($userId, false);
+			$notesFolder = $this->settingsService->get($userId, 'notesPath', $saveInitial);
+			return $notesFolder;
 		} catch (NotesFolderException $e) {
 			$this->util->logger->debug("Failed to get notes folder for user $userId: " . $e->getMessage());
 			return null;
 		}
-		return $userFolder->getRelativePath($nodesFolder->getPath());
 	}
 
 	public function getOrCreateNotesFolder(string $userId, bool $create = true) : Folder {

lib/Service/SettingsService.php

@@ -112,6 +112,9 @@ public function set(string $uid, array $settings, bool $writeDefaults = false) :
 			if ($value !== null && array_key_exists($name, $this->attrs)) {
 				$settings[$name] = $value = $this->attrs[$name]['validate']($value);
 			}
+			if ($name === 'notesPath' && $value !== null) {
+				continue;
+			}
 			$default = is_callable($this->attrs[$name]['default']) ? $this->attrs[$name]['default']($uid) : $this->attrs[$name]['default'];
 			if (!$writeDefaults && (!array_key_exists($name, $this->attrs)
 				|| $value === null
@@ -169,8 +172,8 @@ public function getAll(string $uid, $saveInitial = false) : \stdClass {
 	/**
 	 * @throws \OCP\PreConditionNotMetException
 	 */
-	public function get(string $uid, string $name) : string {
-		$settings = $this->getAll($uid);
+	public function get(string $uid, string $name, bool $saveInitial = false) : string {
+		$settings = $this->getAll($uid, $saveInitial);
 		if (property_exists($settings, $name)) {
 			return $settings->{$name};
 		} else {