better caching in storage stats calculations

Signed-off-by: Robin Appelman <robin@icewind.nl>

diff --git a/lib/private/legacy/OC_Helper.php b/lib/private/legacy/OC_Helper.php
index 07d81933d00092eaba0fdcc8825e30cc9f947498..39672dc6a7211ba9b09f980ef86c2ec9159b33df 100644 (file)
--- a/lib/private/legacy/OC_Helper.php
+++ b/lib/private/legacy/OC_Helper.php
@@ -57,6 +57,8 @@ use Psr\Log\LoggerInterface;
  */
 class OC_Helper {
        private static $templateManager;
+       private static ?ICacheFactory $cacheFactory = null;
+       private static ?bool $quotaIncludeExternalStorage = null;
 
        /**
         * Make a human file size
@@ -462,12 +464,15 @@ class OC_Helper {
         * @throws \OCP\Files\NotFoundException
         */
        public static function getStorageInfo($path, $rootInfo = null, $includeMountPoints = true, $useCache = true) {
-               /** @var ICacheFactory $cacheFactory */
-               $cacheFactory = \OC::$server->get(ICacheFactory::class);
-               $memcache = $cacheFactory->createLocal('storage_info');
+               if (!self::$cacheFactory) {
+                       self::$cacheFactory = \OC::$server->get(ICacheFactory::class);
+               }
+               $memcache = self::$cacheFactory->createLocal('storage_info');
 
                // return storage info without adding mount points
-               $includeExtStorage = \OC::$server->getSystemConfig()->getValue('quota_include_external_storage', false);
+               if (self::$quotaIncludeExternalStorage === null) {
+                       self::$quotaIncludeExternalStorage = \OC::$server->getSystemConfig()->getValue('quota_include_external_storage', false);
+               }
 
                $view = Filesystem::getView();
                if (!$view) {
@@ -484,7 +489,7 @@ class OC_Helper {
                }
 
                if (!$rootInfo) {
-                       $rootInfo = \OC\Files\Filesystem::getFileInfo($path, $includeExtStorage ? 'ext' : false);
+                       $rootInfo = \OC\Files\Filesystem::getFileInfo($path, self::$quotaIncludeExternalStorage ? 'ext' : false);
                }
                if (!$rootInfo instanceof \OCP\Files\FileInfo) {
                        throw new \OCP\Files\NotFoundException();
@@ -498,9 +503,9 @@ class OC_Helper {
                $storage = $mount->getStorage();
                $sourceStorage = $storage;
                if ($storage->instanceOfStorage('\OCA\Files_Sharing\SharedStorage')) {
-                       $includeExtStorage = false;
+                       self::$quotaIncludeExternalStorage = false;
                }
-               if ($includeExtStorage) {
+               if (self::$quotaIncludeExternalStorage) {
                        if ($storage->instanceOfStorage('\OC\Files\Storage\Home')
                                || $storage->instanceOfStorage('\OC\Files\ObjectStore\HomeObjectStoreStorage')
                        ) {