Merge pull request #31836 from nextcloud/backport/31734/stable23

[stable23] dont re-query fileinfo when getting dav quota
nextcloud · Apr 14, 2022 · ee9ac5b · ee9ac5b
2 parents eee279d + 3da4542
commit ee9ac5b
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 12 deletions.
diff --git a/apps/dav/lib/Connector/Sabre/Directory.php b/apps/dav/lib/Connector/Sabre/Directory.php
@@ -327,8 +327,7 @@ public function getQuotaInfo() {
 			return $this->quotaInfo;
 		}
 		try {
-			$info = $this->fileView->getFileInfo($this->path, false);
-			$storageInfo = \OC_Helper::getStorageInfo($this->info->getPath(), $info);
+			$storageInfo = \OC_Helper::getStorageInfo($this->info->getPath(), $this->info, false);
 			if ($storageInfo['quota'] === \OCP\Files\FileInfo::SPACE_UNLIMITED) {
 				$free = \OCP\Files\FileInfo::SPACE_UNLIMITED;
 			} else {

diff --git a/apps/dav/tests/unit/Connector/Sabre/DirectoryTest.php b/apps/dav/tests/unit/Connector/Sabre/DirectoryTest.php
@@ -299,10 +299,6 @@ public function testGetQuotaInfoUnlimited() {
 			->method('getMountPoint')
 			->willReturn($mountPoint);
 
-		$this->view->expects($this->once())
-			->method('getFileInfo')
-			->willReturn($this->info);
-
 		$mountPoint->method('getMountPoint')
 			->willReturn('/user/files/mymountpoint');
 
@@ -344,10 +340,6 @@ public function testGetQuotaInfoSpecific() {
 		$mountPoint->method('getMountPoint')
 			->willReturn('/user/files/mymountpoint');
 
-		$this->view->expects($this->once())
-			->method('getFileInfo')
-			->willReturn($this->info);
-
 		$dir = new Directory($this->view, $this->info);
 		$this->assertEquals([200, 800], $dir->getQuotaInfo()); //200 used, 800 free
 	}

diff --git a/lib/private/legacy/OC_Helper.php b/lib/private/legacy/OC_Helper.php
@@ -485,7 +485,7 @@ public static function findBinaryPath($program) {
 	 * @return array
 	 * @throws \OCP\Files\NotFoundException
 	 */
-	public static function getStorageInfo($path, $rootInfo = null) {
+	public static function getStorageInfo($path, $rootInfo = null, $includeMountPoints = true) {
 		// return storage info without adding mount points
 		$includeExtStorage = \OC::$server->getSystemConfig()->getValue('quota_include_external_storage', false);
 
@@ -495,7 +495,7 @@ public static function getStorageInfo($path, $rootInfo = null) {
 		if (!$rootInfo instanceof \OCP\Files\FileInfo) {
 			throw new \OCP\Files\NotFoundException();
 		}
-		$used = $rootInfo->getSize();
+		$used = $rootInfo->getSize($includeMountPoints);
 		if ($used < 0) {
 			$used = 0;
 		}