nextcloud / server

lib/public/Files/Mount/IMountPoint.php

Indentation +95 added lines, -95 removed lines

@@ -28,111 +28,111 @@
  * @since 8.0.0
  */
 interface IMountPoint {
-	/**
-	 * get complete path to the mount point
-	 *
-	 * @return string
-	 * @since 8.0.0
-	 */
-	public function getMountPoint();
+    /**
+     * get complete path to the mount point
+     *
+     * @return string
+     * @since 8.0.0
+     */
+    public function getMountPoint();
 
-	/**
-	 * Set the mountpoint
-	 *
-	 * @param string $mountPoint new mount point
-	 * @since 8.0.0
-	 */
-	public function setMountPoint($mountPoint);
+    /**
+     * Set the mountpoint
+     *
+     * @param string $mountPoint new mount point
+     * @since 8.0.0
+     */
+    public function setMountPoint($mountPoint);
 
-	/**
-	 * Get the storage that is mounted
-	 *
-	 * @return \OCP\Files\Storage\IStorage|null
-	 * @since 8.0.0
-	 */
-	public function getStorage();
+    /**
+     * Get the storage that is mounted
+     *
+     * @return \OCP\Files\Storage\IStorage|null
+     * @since 8.0.0
+     */
+    public function getStorage();
 
-	/**
-	 * Get the id of the storages
-	 *
-	 * @return string|null
-	 * @since 8.0.0
-	 */
-	public function getStorageId();
+    /**
+     * Get the id of the storages
+     *
+     * @return string|null
+     * @since 8.0.0
+     */
+    public function getStorageId();
 
-	/**
-	 * Get the id of the storages
-	 *
-	 * @return int|null
-	 * @since 9.1.0
-	 */
-	public function getNumericStorageId();
+    /**
+     * Get the id of the storages
+     *
+     * @return int|null
+     * @since 9.1.0
+     */
+    public function getNumericStorageId();
 
-	/**
-	 * Get the path relative to the mountpoint
-	 *
-	 * @param string $path absolute path to a file or folder
-	 * @return string
-	 * @since 8.0.0
-	 */
-	public function getInternalPath($path);
+    /**
+     * Get the path relative to the mountpoint
+     *
+     * @param string $path absolute path to a file or folder
+     * @return string
+     * @since 8.0.0
+     */
+    public function getInternalPath($path);
 
-	/**
-	 * Apply a storage wrapper to the mounted storage
-	 *
-	 * @param callable $wrapper
-	 * @since 8.0.0
-	 */
-	public function wrapStorage($wrapper);
+    /**
+     * Apply a storage wrapper to the mounted storage
+     *
+     * @param callable $wrapper
+     * @since 8.0.0
+     */
+    public function wrapStorage($wrapper);
 
-	/**
-	 * Get a mount option
-	 *
-	 * @param string $name Name of the mount option to get
-	 * @param mixed $default Default value for the mount option
-	 * @return mixed
-	 * @since 8.0.0
-	 */
-	public function getOption($name, $default);
+    /**
+     * Get a mount option
+     *
+     * @param string $name Name of the mount option to get
+     * @param mixed $default Default value for the mount option
+     * @return mixed
+     * @since 8.0.0
+     */
+    public function getOption($name, $default);
 
-	/**
-	 * Get all options for the mount
-	 *
-	 * @return array
-	 * @since 8.1.0
-	 */
-	public function getOptions();
+    /**
+     * Get all options for the mount
+     *
+     * @return array
+     * @since 8.1.0
+     */
+    public function getOptions();
 
-	/**
-	 * Get the file id of the root of the storage
-	 *
-	 * @return int
-	 * @since 9.1.0
-	 */
-	public function getStorageRootId();
+    /**
+     * Get the file id of the root of the storage
+     *
+     * @return int
+     * @since 9.1.0
+     */
+    public function getStorageRootId();
 
-	/**
-	 * Get the id of the configured mount
-	 *
-	 * @return int|null mount id or null if not applicable
-	 * @since 9.1.0
-	 */
-	public function getMountId();
+    /**
+     * Get the id of the configured mount
+     *
+     * @return int|null mount id or null if not applicable
+     * @since 9.1.0
+     */
+    public function getMountId();
 
-	/**
-	 * Get the type of mount point, used to distinguish things like shares and external storage
-	 * in the web interface
-	 *
-	 * @return string
-	 * @since 12.0.0
-	 */
-	public function getMountType();
+    /**
+     * Get the type of mount point, used to distinguish things like shares and external storage
+     * in the web interface
+     *
+     * @return string
+     * @since 12.0.0
+     */
+    public function getMountType();
 
-	/**
-	 * Get the class of the mount provider that this mount originates from
-	 *
-	 * @return string
-	 * @since 24.0.0
-	 */
-	public function getMountProvider(): string;
+    /**
+     * Get the class of the mount provider that this mount originates from
+     *
+     * @return string
+     * @since 24.0.0
+     */
+    public function getMountProvider(): string;
 }

lib/private/Files/Mount/Manager.php

Indentation +188 added lines, -188 removed lines

@@ -38,192 +38,192 @@
 use OCP\Files\NotFoundException;
 
 class Manager implements IMountManager {
-	/** @var MountPoint[] */
-	private array $mounts = [];
-	/** @var CappedMemoryCache<IMountPoint> */
-	private CappedMemoryCache $pathCache;
-	/** @var CappedMemoryCache<IMountPoint[]> */
-	private CappedMemoryCache $inPathCache;
-	private SetupManager $setupManager;
-
-	public function __construct(SetupManagerFactory $setupManagerFactory) {
-		$this->pathCache = new CappedMemoryCache();
-		$this->inPathCache = new CappedMemoryCache();
-		$this->setupManager = $setupManagerFactory->create($this);
-	}
-
-	/**
-	 * @param IMountPoint $mount
-	 */
-	public function addMount(IMountPoint $mount) {
-		$this->mounts[$mount->getMountPoint()] = $mount;
-		$this->pathCache->clear();
-		$this->inPathCache->clear();
-	}
-
-	/**
-	 * @param string $mountPoint
-	 */
-	public function removeMount(string $mountPoint) {
-		$mountPoint = Filesystem::normalizePath($mountPoint);
-		if (\strlen($mountPoint) > 1) {
-			$mountPoint .= '/';
-		}
-		unset($this->mounts[$mountPoint]);
-		$this->pathCache->clear();
-		$this->inPathCache->clear();
-	}
-
-	/**
-	 * @param string $mountPoint
-	 * @param string $target
-	 */
-	public function moveMount(string $mountPoint, string $target) {
-		$this->mounts[$target] = $this->mounts[$mountPoint];
-		unset($this->mounts[$mountPoint]);
-		$this->pathCache->clear();
-		$this->inPathCache->clear();
-	}
-
-	/**
-	 * Find the mount for $path
-	 *
-	 * @param string $path
-	 * @return IMountPoint
-	 */
-	public function find(string $path): IMountPoint {
-		$this->setupManager->setupForPath($path);
-		$path = Filesystem::normalizePath($path);
-
-		if (isset($this->pathCache[$path])) {
-			return $this->pathCache[$path];
-		}
-
-		$current = $path;
-		while (true) {
-			$mountPoint = $current . '/';
-			if (isset($this->mounts[$mountPoint])) {
-				$this->pathCache[$path] = $this->mounts[$mountPoint];
-				return $this->mounts[$mountPoint];
-			} elseif ($current === '') {
-				break;
-			}
-
-			$current = dirname($current);
-			if ($current === '.' || $current === '/') {
-				$current = '';
-			}
-		}
-
-		throw new NotFoundException("No mount for path " . $path . " existing mounts: " . implode(",", array_keys($this->mounts)));
-	}
-
-	/**
-	 * Find all mounts in $path
-	 *
-	 * @param string $path
-	 * @return IMountPoint[]
-	 */
-	public function findIn(string $path): array {
-		$this->setupManager->setupForPath($path, true);
-		$path = $this->formatPath($path);
-
-		if (isset($this->inPathCache[$path])) {
-			return $this->inPathCache[$path];
-		}
-
-		$result = [];
-		$pathLength = \strlen($path);
-		$mountPoints = array_keys($this->mounts);
-		foreach ($mountPoints as $mountPoint) {
-			if (substr($mountPoint, 0, $pathLength) === $path && \strlen($mountPoint) > $pathLength) {
-				$result[] = $this->mounts[$mountPoint];
-			}
-		}
-
-		$this->inPathCache[$path] = $result;
-		return $result;
-	}
-
-	public function clear() {
-		$this->mounts = [];
-		$this->pathCache->clear();
-		$this->inPathCache->clear();
-	}
-
-	/**
-	 * Find mounts by storage id
-	 *
-	 * @param string $id
-	 * @return IMountPoint[]
-	 */
-	public function findByStorageId(string $id): array {
-		if (\strlen($id) > 64) {
-			$id = md5($id);
-		}
-		$result = [];
-		foreach ($this->mounts as $mount) {
-			if ($mount->getStorageId() === $id) {
-				$result[] = $mount;
-			}
-		}
-		return $result;
-	}
-
-	/**
-	 * @return IMountPoint[]
-	 */
-	public function getAll(): array {
-		return $this->mounts;
-	}
-
-	/**
-	 * Find mounts by numeric storage id
-	 *
-	 * @param int $id
-	 * @return IMountPoint[]
-	 */
-	public function findByNumericId(int $id): array {
-		$result = [];
-		foreach ($this->mounts as $mount) {
-			if ($mount->getNumericStorageId() === $id) {
-				$result[] = $mount;
-			}
-		}
-		return $result;
-	}
-
-	/**
-	 * @param string $path
-	 * @return string
-	 */
-	private function formatPath(string $path): string {
-		$path = Filesystem::normalizePath($path);
-		if (\strlen($path) > 1) {
-			$path .= '/';
-		}
-		return $path;
-	}
-
-	public function getSetupManager(): SetupManager {
-		return $this->setupManager;
-	}
-
-	/**
-	 * Return all mounts in a path from a specific mount provider
-	 *
-	 * @param string $path
-	 * @param string[] $mountProviders
-	 * @return MountPoint[]
-	 */
-	public function getMountsByMountProvider(string $path, array $mountProviders) {
-		$this->getSetupManager()->setupForProvider($path, $mountProviders);
-		if (in_array('', $mountProviders)) {
-			return $this->mounts;
-		} else {
-			return array_filter($this->mounts, function ($mount) use ($mountProviders) {
-				return in_array($mount->getMountProvider(), $mountProviders);
-			});
-		}
-	}
+    /** @var MountPoint[] */
+    private array $mounts = [];
+    /** @var CappedMemoryCache<IMountPoint> */
+    private CappedMemoryCache $pathCache;
+    /** @var CappedMemoryCache<IMountPoint[]> */
+    private CappedMemoryCache $inPathCache;
+    private SetupManager $setupManager;
+
+    public function __construct(SetupManagerFactory $setupManagerFactory) {
+        $this->pathCache = new CappedMemoryCache();
+        $this->inPathCache = new CappedMemoryCache();
+        $this->setupManager = $setupManagerFactory->create($this);
+    }
+
+    /**
+     * @param IMountPoint $mount
+     */
+    public function addMount(IMountPoint $mount) {
+        $this->mounts[$mount->getMountPoint()] = $mount;
+        $this->pathCache->clear();
+        $this->inPathCache->clear();
+    }
+
+    /**
+     * @param string $mountPoint
+     */
+    public function removeMount(string $mountPoint) {
+        $mountPoint = Filesystem::normalizePath($mountPoint);
+        if (\strlen($mountPoint) > 1) {
+            $mountPoint .= '/';
+        }
+        unset($this->mounts[$mountPoint]);
+        $this->pathCache->clear();
+        $this->inPathCache->clear();
+    }
+
+    /**
+     * @param string $mountPoint
+     * @param string $target
+     */
+    public function moveMount(string $mountPoint, string $target) {
+        $this->mounts[$target] = $this->mounts[$mountPoint];
+        unset($this->mounts[$mountPoint]);
+        $this->pathCache->clear();
+        $this->inPathCache->clear();
+    }
+
+    /**
+     * Find the mount for $path
+     *
+     * @param string $path
+     * @return IMountPoint
+     */
+    public function find(string $path): IMountPoint {
+        $this->setupManager->setupForPath($path);
+        $path = Filesystem::normalizePath($path);
+
+        if (isset($this->pathCache[$path])) {
+            return $this->pathCache[$path];
+        }
+
+        $current = $path;
+        while (true) {
+            $mountPoint = $current . '/';
+            if (isset($this->mounts[$mountPoint])) {
+                $this->pathCache[$path] = $this->mounts[$mountPoint];
+                return $this->mounts[$mountPoint];
+            } elseif ($current === '') {
+                break;
+            }
+
+            $current = dirname($current);
+            if ($current === '.' || $current === '/') {
+                $current = '';
+            }
+        }
+
+        throw new NotFoundException("No mount for path " . $path . " existing mounts: " . implode(",", array_keys($this->mounts)));
+    }
+
+    /**
+     * Find all mounts in $path
+     *
+     * @param string $path
+     * @return IMountPoint[]
+     */
+    public function findIn(string $path): array {
+        $this->setupManager->setupForPath($path, true);
+        $path = $this->formatPath($path);
+
+        if (isset($this->inPathCache[$path])) {
+            return $this->inPathCache[$path];
+        }
+
+        $result = [];
+        $pathLength = \strlen($path);
+        $mountPoints = array_keys($this->mounts);
+        foreach ($mountPoints as $mountPoint) {
+            if (substr($mountPoint, 0, $pathLength) === $path && \strlen($mountPoint) > $pathLength) {
+                $result[] = $this->mounts[$mountPoint];
+            }
+        }
+
+        $this->inPathCache[$path] = $result;
+        return $result;
+    }
+
+    public function clear() {
+        $this->mounts = [];
+        $this->pathCache->clear();
+        $this->inPathCache->clear();
+    }
+
+    /**
+     * Find mounts by storage id
+     *
+     * @param string $id
+     * @return IMountPoint[]
+     */
+    public function findByStorageId(string $id): array {
+        if (\strlen($id) > 64) {
+            $id = md5($id);
+        }
+        $result = [];
+        foreach ($this->mounts as $mount) {
+            if ($mount->getStorageId() === $id) {
+                $result[] = $mount;
+            }
+        }
+        return $result;
+    }
+
+    /**
+     * @return IMountPoint[]
+     */
+    public function getAll(): array {
+        return $this->mounts;
+    }
+
+    /**
+     * Find mounts by numeric storage id
+     *
+     * @param int $id
+     * @return IMountPoint[]
+     */
+    public function findByNumericId(int $id): array {
+        $result = [];
+        foreach ($this->mounts as $mount) {
+            if ($mount->getNumericStorageId() === $id) {
+                $result[] = $mount;
+            }
+        }
+        return $result;
+    }
+
+    /**
+     * @param string $path
+     * @return string
+     */
+    private function formatPath(string $path): string {
+        $path = Filesystem::normalizePath($path);
+        if (\strlen($path) > 1) {
+            $path .= '/';
+        }
+        return $path;
+    }
+
+    public function getSetupManager(): SetupManager {
+        return $this->setupManager;
+    }
+
+    /**
+     * Return all mounts in a path from a specific mount provider
+     *
+     * @param string $path
+     * @param string[] $mountProviders
+     * @return MountPoint[]
+     */
+    public function getMountsByMountProvider(string $path, array $mountProviders) {
+        $this->getSetupManager()->setupForProvider($path, $mountProviders);
+        if (in_array('', $mountProviders)) {
+            return $this->mounts;
+        } else {
+            return array_filter($this->mounts, function ($mount) use ($mountProviders) {
+                return in_array($mount->getMountProvider(), $mountProviders);
+            });
+        }
+    }
 }

lib/private/Files/Mount/MountPoint.php

Indentation +250 added lines, -250 removed lines

@@ -38,279 +38,279 @@
 use Psr\Log\LoggerInterface;
 
 class MountPoint implements IMountPoint {
-	/**
-	 * @var \OC\Files\Storage\Storage|null $storage
-	 */
-	protected $storage = null;
-	protected $class;
-	protected $storageId;
-	protected $numericStorageId = null;
-	protected $rootId = null;
+    /**
+     * @var \OC\Files\Storage\Storage|null $storage
+     */
+    protected $storage = null;
+    protected $class;
+    protected $storageId;
+    protected $numericStorageId = null;
+    protected $rootId = null;
 
-	/**
-	 * Configuration options for the storage backend
-	 *
-	 * @var array
-	 */
-	protected $arguments = [];
-	protected $mountPoint;
+    /**
+     * Configuration options for the storage backend
+     *
+     * @var array
+     */
+    protected $arguments = [];
+    protected $mountPoint;
 
-	/**
-	 * Mount specific options
-	 *
-	 * @var array
-	 */
-	protected $mountOptions = [];
+    /**
+     * Mount specific options
+     *
+     * @var array
+     */
+    protected $mountOptions = [];
 
-	/**
-	 * @var \OC\Files\Storage\StorageFactory $loader
-	 */
-	private $loader;
+    /**
+     * @var \OC\Files\Storage\StorageFactory $loader
+     */
+    private $loader;
 
-	/**
-	 * Specified whether the storage is invalid after failing to
-	 * instantiate it.
-	 *
-	 * @var bool
-	 */
-	private $invalidStorage = false;
+    /**
+     * Specified whether the storage is invalid after failing to
+     * instantiate it.
+     *
+     * @var bool
+     */
+    private $invalidStorage = false;
 
-	/** @var int|null */
-	protected $mountId;
+    /** @var int|null */
+    protected $mountId;
 
-	/** @var string */
-	protected $mountProvider;
+    /** @var string */
+    protected $mountProvider;
 
-	/**
-	 * @param string|\OC\Files\Storage\Storage $storage
-	 * @param string $mountpoint
-	 * @param array $arguments (optional) configuration for the storage backend
-	 * @param \OCP\Files\Storage\IStorageFactory $loader
-	 * @param array $mountOptions mount specific options
-	 * @param int|null $mountId
-	 * @param string|null $mountProvider
-	 * @throws \Exception
-	 */
-	public function __construct(
-		$storage,
-		string $mountpoint,
-		array $arguments = null,
-		IStorageFactory $loader = null,
-		array $mountOptions = null,
-		int $mountId = null,
-		string $mountProvider = null
-	) {
-		if (is_null($arguments)) {
-			$arguments = [];
-		}
-		if (is_null($loader)) {
-			$this->loader = new StorageFactory();
-		} else {
-			$this->loader = $loader;
-		}
+    /**
+     * @param string|\OC\Files\Storage\Storage $storage
+     * @param string $mountpoint
+     * @param array $arguments (optional) configuration for the storage backend
+     * @param \OCP\Files\Storage\IStorageFactory $loader
+     * @param array $mountOptions mount specific options
+     * @param int|null $mountId
+     * @param string|null $mountProvider
+     * @throws \Exception
+     */
+    public function __construct(
+        $storage,
+        string $mountpoint,
+        array $arguments = null,
+        IStorageFactory $loader = null,
+        array $mountOptions = null,
+        int $mountId = null,
+        string $mountProvider = null
+    ) {
+        if (is_null($arguments)) {
+            $arguments = [];
+        }
+        if (is_null($loader)) {
+            $this->loader = new StorageFactory();
+        } else {
+            $this->loader = $loader;
+        }
 
-		if (!is_null($mountOptions)) {
-			$this->mountOptions = $mountOptions;
-		}
+        if (!is_null($mountOptions)) {
+            $this->mountOptions = $mountOptions;
+        }
 
-		$mountpoint = $this->formatPath($mountpoint);
-		$this->mountPoint = $mountpoint;
-		$this->mountId = $mountId;
-		if ($storage instanceof Storage) {
-			$this->class = get_class($storage);
-			$this->storage = $this->loader->wrap($this, $storage);
-		} else {
-			// Update old classes to new namespace
-			if (strpos($storage, 'OC_Filestorage_') !== false) {
-				$storage = '\OC\Files\Storage\\' . substr($storage, 15);
-			}
-			$this->class = $storage;
-			$this->arguments = $arguments;
-		}
-		if ($mountProvider) {
-			if (strlen($mountProvider) > 128) {
-				throw new \Exception("Mount provider $mountProvider name exceeds the limit of 128 characters");
-			}
-		}
-		$this->mountProvider = $mountProvider ?? '';
-	}
+        $mountpoint = $this->formatPath($mountpoint);
+        $this->mountPoint = $mountpoint;
+        $this->mountId = $mountId;
+        if ($storage instanceof Storage) {
+            $this->class = get_class($storage);
+            $this->storage = $this->loader->wrap($this, $storage);
+        } else {
+            // Update old classes to new namespace
+            if (strpos($storage, 'OC_Filestorage_') !== false) {
+                $storage = '\OC\Files\Storage\\' . substr($storage, 15);
+            }
+            $this->class = $storage;
+            $this->arguments = $arguments;
+        }
+        if ($mountProvider) {
+            if (strlen($mountProvider) > 128) {
+                throw new \Exception("Mount provider $mountProvider name exceeds the limit of 128 characters");
+            }
+        }
+        $this->mountProvider = $mountProvider ?? '';
+    }
 
-	/**
-	 * get complete path to the mount point, relative to data/
-	 *
-	 * @return string
-	 */
-	public function getMountPoint() {
-		return $this->mountPoint;
-	}
+    /**
+     * get complete path to the mount point, relative to data/
+     *
+     * @return string
+     */
+    public function getMountPoint() {
+        return $this->mountPoint;
+    }
 
-	/**
-	 * Sets the mount point path, relative to data/
-	 *
-	 * @param string $mountPoint new mount point
-	 */
-	public function setMountPoint($mountPoint) {
-		$this->mountPoint = $this->formatPath($mountPoint);
-	}
+    /**
+     * Sets the mount point path, relative to data/
+     *
+     * @param string $mountPoint new mount point
+     */
+    public function setMountPoint($mountPoint) {
+        $this->mountPoint = $this->formatPath($mountPoint);
+    }
 
-	/**
-	 * create the storage that is mounted
-	 */
-	private function createStorage() {
-		if ($this->invalidStorage) {
-			return;
-		}
+    /**
+     * create the storage that is mounted
+     */
+    private function createStorage() {
+        if ($this->invalidStorage) {
+            return;
+        }
 
-		if (class_exists($this->class)) {
-			try {
-				$class = $this->class;
-				// prevent recursion by setting the storage before applying wrappers
-				$this->storage = new $class($this->arguments);
-				$this->storage = $this->loader->wrap($this, $this->storage);
-			} catch (\Exception $exception) {
-				$this->storage = null;
-				$this->invalidStorage = true;
-				if ($this->mountPoint === '/') {
-					// the root storage could not be initialized, show the user!
-					throw new \Exception('The root storage could not be initialized. Please contact your local administrator.', $exception->getCode(), $exception);
-				} else {
-					\OC::$server->get(LoggerInterface::class)->error($exception->getMessage(), ['exception' => $exception]);
-				}
-				return;
-			}
-		} else {
-			\OC::$server->get(LoggerInterface::class)->error('Storage backend ' . $this->class . ' not found', ['app' => 'core']);
-			$this->invalidStorage = true;
-			return;
-		}
-	}
+        if (class_exists($this->class)) {
+            try {
+                $class = $this->class;
+                // prevent recursion by setting the storage before applying wrappers
+                $this->storage = new $class($this->arguments);
+                $this->storage = $this->loader->wrap($this, $this->storage);
+            } catch (\Exception $exception) {
+                $this->storage = null;
+                $this->invalidStorage = true;
+                if ($this->mountPoint === '/') {
+                    // the root storage could not be initialized, show the user!
+                    throw new \Exception('The root storage could not be initialized. Please contact your local administrator.', $exception->getCode(), $exception);
+                } else {
+                    \OC::$server->get(LoggerInterface::class)->error($exception->getMessage(), ['exception' => $exception]);
+                }
+                return;
+            }
+        } else {
+            \OC::$server->get(LoggerInterface::class)->error('Storage backend ' . $this->class . ' not found', ['app' => 'core']);
+            $this->invalidStorage = true;
+            return;
+        }
+    }
 
-	/**
-	 * @return \OC\Files\Storage\Storage|null
-	 */
-	public function getStorage() {
-		if (is_null($this->storage)) {
-			$this->createStorage();
-		}
-		return $this->storage;
-	}
+    /**
+     * @return \OC\Files\Storage\Storage|null
+     */
+    public function getStorage() {
+        if (is_null($this->storage)) {
+            $this->createStorage();
+        }
+        return $this->storage;
+    }
 
-	/**
-	 * @return string|null
-	 */
-	public function getStorageId() {
-		if (!$this->storageId) {
-			$storage = $this->getStorage();
-			if (is_null($storage)) {
-				return null;
-			}
-			$this->storageId = $storage->getId();
-			if (strlen($this->storageId) > 64) {
-				$this->storageId = md5($this->storageId);
-			}
-		}
-		return $this->storageId;
-	}
+    /**
+     * @return string|null
+     */
+    public function getStorageId() {
+        if (!$this->storageId) {
+            $storage = $this->getStorage();
+            if (is_null($storage)) {
+                return null;
+            }
+            $this->storageId = $storage->getId();
+            if (strlen($this->storageId) > 64) {
+                $this->storageId = md5($this->storageId);
+            }
+        }
+        return $this->storageId;
+    }
 
-	/**
-	 * @return int
-	 */
-	public function getNumericStorageId() {
-		if (is_null($this->numericStorageId)) {
-			$storage = $this->getStorage();
-			if (is_null($storage)) {
-				return -1;
-			}
-			$this->numericStorageId = $storage->getStorageCache()->getNumericId();
-		}
-		return $this->numericStorageId;
-	}
+    /**
+     * @return int
+     */
+    public function getNumericStorageId() {
+        if (is_null($this->numericStorageId)) {
+            $storage = $this->getStorage();
+            if (is_null($storage)) {
+                return -1;
+            }
+            $this->numericStorageId = $storage->getStorageCache()->getNumericId();
+        }
+        return $this->numericStorageId;
+    }
 
-	/**
-	 * @param string $path
-	 * @return string
-	 */
-	public function getInternalPath($path) {
-		$path = Filesystem::normalizePath($path, true, false, true);
-		if ($this->mountPoint === $path or $this->mountPoint . '/' === $path) {
-			$internalPath = '';
-		} else {
-			$internalPath = substr($path, strlen($this->mountPoint));
-		}
-		// substr returns false instead of an empty string, we always want a string
-		return (string)$internalPath;
-	}
+    /**
+     * @param string $path
+     * @return string
+     */
+    public function getInternalPath($path) {
+        $path = Filesystem::normalizePath($path, true, false, true);
+        if ($this->mountPoint === $path or $this->mountPoint . '/' === $path) {
+            $internalPath = '';
+        } else {
+            $internalPath = substr($path, strlen($this->mountPoint));
+        }
+        // substr returns false instead of an empty string, we always want a string
+        return (string)$internalPath;
+    }
 
-	/**
-	 * @param string $path
-	 * @return string
-	 */
-	private function formatPath($path) {
-		$path = Filesystem::normalizePath($path);
-		if (strlen($path) > 1) {
-			$path .= '/';
-		}
-		return $path;
-	}
+    /**
+     * @param string $path
+     * @return string
+     */
+    private function formatPath($path) {
+        $path = Filesystem::normalizePath($path);
+        if (strlen($path) > 1) {
+            $path .= '/';
+        }
+        return $path;
+    }
 
-	/**
-	 * @param callable $wrapper
-	 */
-	public function wrapStorage($wrapper) {
-		$storage = $this->getStorage();
-		// storage can be null if it couldn't be initialized
-		if ($storage != null) {
-			$this->storage = $wrapper($this->mountPoint, $storage, $this);
-		}
-	}
+    /**
+     * @param callable $wrapper
+     */
+    public function wrapStorage($wrapper) {
+        $storage = $this->getStorage();
+        // storage can be null if it couldn't be initialized
+        if ($storage != null) {
+            $this->storage = $wrapper($this->mountPoint, $storage, $this);
+        }
+    }
 
-	/**
-	 * Get a mount option
-	 *
-	 * @param string $name Name of the mount option to get
-	 * @param mixed $default Default value for the mount option
-	 * @return mixed
-	 */
-	public function getOption($name, $default) {
-		return isset($this->mountOptions[$name]) ? $this->mountOptions[$name] : $default;
-	}
+    /**
+     * Get a mount option
+     *
+     * @param string $name Name of the mount option to get
+     * @param mixed $default Default value for the mount option
+     * @return mixed
+     */
+    public function getOption($name, $default) {
+        return isset($this->mountOptions[$name]) ? $this->mountOptions[$name] : $default;
+    }
 
-	/**
-	 * Get all options for the mount
-	 *
-	 * @return array
-	 */
-	public function getOptions() {
-		return $this->mountOptions;
-	}
+    /**
+     * Get all options for the mount
+     *
+     * @return array
+     */
+    public function getOptions() {
+        return $this->mountOptions;
+    }
 
-	/**
-	 * Get the file id of the root of the storage
-	 *
-	 * @return int
-	 */
-	public function getStorageRootId() {
-		if (is_null($this->rootId) || $this->rootId === -1) {
-			$storage = $this->getStorage();
-			// if we can't create the storage return -1 as root id, this is then handled the same as if the root isn't scanned yet
-			if ($storage === null) {
-				$this->rootId = -1;
-			} else {
-				$this->rootId = (int)$storage->getCache()->getId('');
-			}
-		}
-		return $this->rootId;
-	}
+    /**
+     * Get the file id of the root of the storage
+     *
+     * @return int
+     */
+    public function getStorageRootId() {
+        if (is_null($this->rootId) || $this->rootId === -1) {
+            $storage = $this->getStorage();
+            // if we can't create the storage return -1 as root id, this is then handled the same as if the root isn't scanned yet
+            if ($storage === null) {
+                $this->rootId = -1;
+            } else {
+                $this->rootId = (int)$storage->getCache()->getId('');
+            }
+        }
+        return $this->rootId;
+    }
 
-	public function getMountId() {
-		return $this->mountId;
-	}
+    public function getMountId() {
+        return $this->mountId;
+    }
 
-	public function getMountType() {
-		return '';
-	}
+    public function getMountType() {
+        return '';
+    }
 
-	public function getMountProvider(): string {
-		return $this->mountProvider;
-	}
+    public function getMountProvider(): string {
+        return $this->mountProvider;
+    }
 }