Load mount specific options from the mount config

2 files changed, 40 insertions, 2 deletions

diff --git a/lib/private/files/mount/mountpoint.php b/lib/private/files/mount/mountpoint.php
index b2c50f9d881..77a51a17020 100644
--- a/lib/private/files/mount/mountpoint.php
+++ b/lib/private/files/mount/mountpoint.php
@@ -20,10 +20,23 @@ class MountPoint implements IMountPoint {
 	protected $storage = null;
 	protected $class;
 	protected $storageId;
+
+	/**
+	 * Configuration options for the storage backend
+	 *
+	 * @var array
+	 */
 	protected $arguments = array();
 	protected $mountPoint;
 
 	/**
+	 * Mount specific options
+	 *
+	 * @var array
+	 */
+	protected $mountOptions = array();
+
+	/**
 	 * @var \OC\Files\Storage\StorageFactory $loader
 	 */
 	private $loader;
@@ -31,10 +44,11 @@ class MountPoint implements IMountPoint {
 	/**
 	 * @param string|\OC\Files\Storage\Storage $storage
 	 * @param string $mountpoint
-	 * @param array $arguments (optional)\
+	 * @param array $arguments (optional) configuration for the storage backend
 	 * @param \OCP\Files\Storage\IStorageFactory $loader
+	 * @param array $mountOptions mount specific options
 	 */
-	public function __construct($storage, $mountpoint, $arguments = null, $loader = null) {
+	public function __construct($storage, $mountpoint, $arguments = null, $loader = null, $mountOptions = null) {
 		if (is_null($arguments)) {
 			$arguments = array();
 		}
@@ -44,6 +58,10 @@ class MountPoint implements IMountPoint {
 			$this->loader = $loader;
 		}
 
+		if (!is_null($mountOptions)) {
+			$this->mountOptions = $mountOptions;
+		}
+
 		$mountpoint = $this->formatPath($mountpoint);
 		if ($storage instanceof Storage) {
 			$this->class = get_class($storage);
@@ -161,4 +179,15 @@ class MountPoint implements IMountPoint {
 	public function wrapStorage($wrapper) {
 		$this->storage = $wrapper($this->mountPoint, $this->getStorage());
 	}
+
+	/**
+	 * 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;
+	}
 }
diff --git a/lib/public/files/mount/imountpoint.php b/lib/public/files/mount/imountpoint.php
index dac634bae4c..af7819ae160 100644
--- a/lib/public/files/mount/imountpoint.php
+++ b/lib/public/files/mount/imountpoint.php
@@ -55,4 +55,13 @@ interface IMountPoint {
 	 * @param callable $wrapper
 	 */
 	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
+	 */
+	public function getOption($name, $default);
 }