feat: always get cache entry data when getting cached mounts

lib/private/Files/Config/CachedMountFileInfo.php

@@ -9,23 +9,70 @@
 
 namespace OC\Files\Config;
 
+use OCP\Files\Cache\ICacheEntry;
 use OCP\Files\Config\ICachedMountFileInfo;
+use OCP\Files\Config\ICachedMountInfo;
+use OCP\Files\Node;
 use OCP\IUser;
 
-class CachedMountFileInfo extends CachedMountInfo implements ICachedMountFileInfo {
+class CachedMountFileInfo implements ICachedMountFileInfo {
 	public function __construct(
-		IUser $user,
-		int $storageId,
-		int $rootId,
-		string $mountPoint,
-		?int $mountId,
-		string $mountProvider,
-		string $rootInternalPath,
-		private string $internalPath,
+		private readonly ICachedMountInfo $mountInfo,
+		private readonly string $internalPath,
 	) {
-		parent::__construct($user, $storageId, $rootId, $mountPoint, $mountProvider, $mountId, $rootInternalPath);
 	}
 
+	#[\Override]
+	public function getUser(): IUser {
+		return $this->mountInfo->getUser();
+	}
+
+	#[\Override]
+	public function getStorageId(): int {
+		return $this->mountInfo->getStorageId();
+	}
+
+	#[\Override]
+	public function getRootId(): int {
+		return $this->mountInfo->getRootId();
+	}
+
+	#[\Override]
+	public function getMountPointNode(): ?Node {
+		return $this->mountInfo->getMountPointNode();
+	}
+
+	#[\Override]
+	public function getMountPoint(): string {
+		return $this->mountInfo->getMountPoint();
+	}
+
+	#[\Override]
+	public function getMountId(): ?int {
+		return $this->mountInfo->getMountId();
+	}
+
+	#[\Override]
+	public function getRootInternalPath(): string {
+		return $this->mountInfo->getRootInternalPath();
+	}
+
+	#[\Override]
+	public function getMountProvider(): string {
+		return $this->mountInfo->getMountProvider();
+	}
+
+	#[\Override]
+	public function getKey(): string {
+		return $this->mountInfo->getKey();
+	}
+
+	#[\Override]
+	public function getRootCacheEntry(): ICacheEntry {
+		return $this->mountInfo->getRootCacheEntry();
+	}
+
+
 	#[\Override]
 	public function getInternalPath(): string {
 		if ($this->getRootInternalPath()) {

lib/private/Files/Config/CachedMountInfo.php

@@ -9,6 +9,7 @@
 namespace OC\Files\Config;
 
 use OC\Files\Filesystem;
+use OCP\Files\Cache\ICacheEntry;
 use OCP\Files\Config\ICachedMountInfo;
 use OCP\Files\IRootFolder;
 use OCP\Files\Node;
@@ -25,7 +26,7 @@
 		protected string $mountPoint,
 		protected string $mountProvider,
 		protected ?int $mountId = null,
-		protected string $rootInternalPath = '',
+		protected ICacheEntry $rootCacheEntry,
 	) {
 		if (strlen($this->mountProvider) > 128) {
 			throw new \Exception("Mount provider $this->mountProvider name exceeds the limit of 128 characters");
@@ -60,7 +61,6 @@
 	#[\Override]
 	public function getMountPointNode(): ?Node {
 		// TODO injection etc
-		Filesystem::initMountPoints($this->getUser()->getUID());
 		$userFolder = Server::get(IRootFolder::class)->getUserFolder($this->getUser()->getUID());
 		return $userFolder->getParent()->getFirstNodeById($this->getRootId());
 	}
@@ -91,7 +91,7 @@
 	 */
 	#[\Override]
 	public function getRootInternalPath(): string {
-		return $this->rootInternalPath;
+		return $this->getRootCacheEntry()->getPath();
 	}
 
 	#[\Override]
@@ -103,4 +103,13 @@
 	public function getKey(): string {
 		return $this->key;
 	}
+
+	/**
+	 * Get the cached file data for the root of the mount
+	 *
+	 * @return ICacheEntry
+	 */
+	public function getRootCacheEntry(): ICacheEntry {
+		return $this->rootCacheEntry;
+	}
 }

lib/private/Files/Config/LazyStorageMountInfo.php

@@ -8,49 +8,54 @@
 
 namespace OC\Files\Config;
 
+use OCP\Files\Cache\ICacheEntry;
+use OCP\Files\Config\ICachedMountInfo;
+use OCP\Files\IRootFolder;
 use OCP\Files\Mount\IMountPoint;
+use OCP\Files\Node;
 use OCP\IUser;
+use OCP\Server;
+
+class LazyStorageMountInfo implements ICachedMountInfo {
+	private ?string $key = null;
+	private ?int $storageId = null;
+	private ?int $rootId = null;
+	private ?ICacheEntry $rootCacheEntry = null;
 
-class LazyStorageMountInfo extends CachedMountInfo {
 	public function __construct(
-		IUser $user,
-		private IMountPoint $mount,
+		private readonly IUser $user,
+		private readonly IMountPoint $mount,
 	) {
-		parent::__construct($user, 0, 0, '', '');
-		$this->key = '';
 	}
 
 	/**
 	 * @return int the numeric storage id of the mount
 	 */
 	#[\Override]
 	public function getStorageId(): int {
-		if (!$this->storageId) {
+		if ($this->storageId === null) {
 			$this->storageId = $this->mount->getNumericStorageId();
 		}
-		return parent::getStorageId();
+		return $this->storageId;
 	}
 
 	/**
 	 * @return int the fileid of the root of the mount
 	 */
 	#[\Override]
 	public function getRootId(): int {
-		if (!$this->rootId) {
+		if ($this->rootId === null) {
 			$this->rootId = $this->mount->getStorageRootId();
 		}
-		return parent::getRootId();
+		return $this->rootId;
 	}
 
 	/**
 	 * @return string the mount point of the mount for the user
 	 */
 	#[\Override]
 	public function getMountPoint(): string {
-		if (!$this->mountPoint) {
-			$this->mountPoint = $this->mount->getMountPoint();
-		}
-		return parent::getMountPoint();
+		return $this->mount->getMountPoint();
 	}
 
 	#[\Override]
@@ -75,9 +80,27 @@
 
 	#[\Override]
 	public function getKey(): string {
-		if (!$this->key) {
+		if ($this->key === null) {
 			$this->key = $this->getRootId() . '::' . $this->getMountPoint();
 		}
 		return $this->key;
 	}
+
+	public function getUser(): IUser {
+		return $this->user;
+	}
+
+	public function getMountPointNode(): ?Node {
+		$userFolder = Server::get(IRootFolder::class)->getUserFolder($this->getUser()->getUID());
+		return $userFolder->getParent()->getFirstNodeById($this->getRootId());
+	}
+
+	public function getRootCacheEntry(): ICacheEntry {
+		if ($this->rootCacheEntry === null) {
+			$this->rootCacheEntry = $this->mount->getStorage()->getCache()->get();
+		}
+		return $this->rootCacheEntry;
+	}
+
+
 }