Add getMountPoint to FileInfo

6 files changed, 66 insertions, 17 deletions

diff --git a/lib/private/connector/sabre/directory.php b/lib/private/connector/sabre/directory.php
index ec5f82f9daa..bbe0f3452a7 100644
--- a/lib/private/connector/sabre/directory.php
+++ b/lib/private/connector/sabre/directory.php
@@ -72,7 +72,7 @@ class OC_Connector_Sabre_Directory extends OC_Connector_Sabre_Node
 
 			$path = $this->fileView->getAbsolutePath($this->path) . '/' . $name;
 			// using a dummy FileInfo is acceptable here since it will be refreshed after the put is complete
-			$info = new \OC\Files\FileInfo($path, null, null, array());
+			$info = new \OC\Files\FileInfo($path, null, null, array(), null);
 			$node = new OC_Connector_Sabre_File($this->fileView, $info);
 			return $node->put($data);
 		} catch (\OCP\Files\StorageNotAvailableException $e) {
diff --git a/lib/private/connector/sabre/objecttree.php b/lib/private/connector/sabre/objecttree.php
index 14a55b5cada..d2759d7a3ba 100644
--- a/lib/private/connector/sabre/objecttree.php
+++ b/lib/private/connector/sabre/objecttree.php
@@ -71,7 +71,9 @@ class ObjectTree extends \Sabre\DAV\ObjectTree {
 		if (pathinfo($path, PATHINFO_EXTENSION) === 'part') {
 			// read from storage
 			$absPath = $this->fileView->getAbsolutePath($path);
-			list($storage, $internalPath) = Filesystem::resolvePath('/' . $absPath);
+			$mount = $this->fileView->getMount($path);
+			$storage = $mount->getStorage();
+			$internalPath = $mount->getInternalPath($absPath);
 			if ($storage) {
 				/**
 				 * @var \OC\Files\Storage\Storage $storage
@@ -79,7 +81,7 @@ class ObjectTree extends \Sabre\DAV\ObjectTree {
 				$scanner = $storage->getScanner($internalPath);
 				// get data directly
 				$data = $scanner->getData($internalPath);
-				$info = new FileInfo($absPath, $storage, $internalPath, $data);
+				$info = new FileInfo($absPath, $storage, $internalPath, $data, $mount);
 			} else {
 				$info = null;
 			}
diff --git a/lib/private/files/fileinfo.php b/lib/private/files/fileinfo.php
index 8bab51f0737..e4a397dcca2 100644
--- a/lib/private/files/fileinfo.php
+++ b/lib/private/files/fileinfo.php
@@ -30,14 +30,23 @@ class FileInfo implements \OCP\Files\FileInfo, \ArrayAccess {
 	private $internalPath;
 
 	/**
+	 * @var \OCP\Files\Mount\IMountPoint
+	 */
+	private $mount;
+
+	/**
 	 * @param string|boolean $path
 	 * @param Storage\Storage $storage
+	 * @param string $internalPath
+	 * @param array $data
+	 * @param \OCP\Files\Mount\IMountPoint $mount
 	 */
-	public function __construct($path, $storage, $internalPath, $data) {
+	public function __construct($path, $storage, $internalPath, $data, $mount) {
 		$this->path = $path;
 		$this->storage = $storage;
 		$this->internalPath = $internalPath;
 		$this->data = $data;
+		$this->mount = $mount;
 	}
 
 	public function offsetSet($offset, $value) {
@@ -208,6 +217,7 @@ class FileInfo implements \OCP\Files\FileInfo, \ArrayAccess {
 
 	/**
 	 * Check if a file or folder is shared
+	 *
 	 * @return bool
 	 */
 	public function isShared() {
@@ -229,4 +239,13 @@ class FileInfo implements \OCP\Files\FileInfo, \ArrayAccess {
 
 		return false;
 	}
+
+	/**
+	 * Get the mountpoint the file belongs to
+	 *
+	 * @return \OCP\Files\Mount\IMountPoint
+	 */
+	public function getMountPoint() {
+		return $this->mount;
+	}
 }
diff --git a/lib/private/files/node/node.php b/lib/private/files/node/node.php
index 87d4a4b9156..17907a53044 100644
--- a/lib/private/files/node/node.php
+++ b/lib/private/files/node/node.php
@@ -288,4 +288,8 @@ class Node implements \OCP\Files\Node, FileInfo {
 	public function isEncrypted() {
 		return $this->getFileInfo()->isEncrypted();
 	}
+
+	public function getMountPoint() {
+		return $this->getFileInfo()->getMountPoint();
+	}
 }
diff --git a/lib/private/files/view.php b/lib/private/files/view.php
index c01763cdad3..40789621df7 100644
--- a/lib/private/files/view.php
+++ b/lib/private/files/view.php
@@ -113,6 +113,19 @@ class View {
 	}
 
 	/**
+	 * get the mountpoint of the storage object for a path
+	 * ( note: because a storage is not always mounted inside the fakeroot, the
+	 * returned mountpoint is relative to the absolute root of the filesystem
+	 * and doesn't take the chroot into account )
+	 *
+	 * @param string $path
+	 * @return \OCP\Files\Mount\IMountPoint
+	 */
+	public function getMount($path) {
+		return Filesystem::getMountManager()->find($this->getAbsolutePath($path));
+	}
+
+	/**
 	 * resolve a path to a storage and internal path
 	 *
 	 * @param string $path
@@ -938,7 +951,7 @@ class View {
 
 		$data = \OC_FileProxy::runPostProxies('getFileInfo', $path, $data);
 
-		return new FileInfo($path, $storage, $internalPath, $data);
+		return new FileInfo($path, $storage, $internalPath, $data, $mount);
 	}
 
 	/**
@@ -955,8 +968,10 @@ class View {
 			return $result;
 		}
 		$path = $this->getAbsolutePath($directory);
-		/** @var \OC\Files\Storage\Storage $storage */
-		list($storage, $internalPath) = $this->resolvePath($directory);
+		$path = Filesystem::normalizePath($path);
+		$mount = $this->getMount($directory);
+		$storage = $mount->getStorage();
+		$internalPath = $mount->getInternalPath($path);
 		if ($storage) {
 			$cache = $storage->getCache($internalPath);
 			$user = \OC_User::getUser();
@@ -990,7 +1005,7 @@ class View {
 				if (\OCP\Util::isSharingDisabledForUser()) {
 					$content['permissions'] = $content['permissions'] & ~\OCP\Constants::PERMISSION_SHARE;
 				}
-				$files[] = new FileInfo($path . '/' . $content['name'], $storage, $content['path'], $content);
+				$files[] = new FileInfo($path . '/' . $content['name'], $storage, $content['path'], $content, $mount);
 			}
 
 			//add a folder for any mountpoint in this directory and add the sizes of other mountpoints to the folders
@@ -998,7 +1013,7 @@ class View {
 			$dirLength = strlen($path);
 			foreach ($mounts as $mount) {
 				$mountPoint = $mount->getMountPoint();
-				$subStorage = Filesystem::getStorage($mountPoint);
+				$subStorage = $mount->getStorage();
 				if ($subStorage) {
 					$subCache = $subStorage->getCache('');
 
@@ -1044,7 +1059,7 @@ class View {
 								$content['permissions'] = $content['permissions'] & ~\OCP\Constants::PERMISSION_SHARE;
 							}
 
-							$files[] = new FileInfo($path . '/' . $rootEntry['name'], $subStorage, '', $rootEntry);
+							$files[] = new FileInfo($path . '/' . $rootEntry['name'], $subStorage, '', $rootEntry, $mount);
 						}
 					}
 				}
@@ -1154,8 +1169,9 @@ class View {
 		$files = array();
 		$rootLength = strlen($this->fakeRoot);
 
-		$mountPoint = Filesystem::getMountPoint($this->fakeRoot);
-		$storage = Filesystem::getStorage($mountPoint);
+		$mount = $this->getMount('');
+		$mountPoint = $mount->getMountPoint();
+		$storage = $mount->getStorage();
 		if ($storage) {
 			$cache = $storage->getCache('');
 
@@ -1165,13 +1181,14 @@ class View {
 					$internalPath = $result['path'];
 					$path = $mountPoint . $result['path'];
 					$result['path'] = substr($mountPoint . $result['path'], $rootLength);
-					$files[] = new FileInfo($path, $storage, $internalPath, $result);
+					$files[] = new FileInfo($path, $storage, $internalPath, $result, $mount);
 				}
 			}
 
-			$mountPoints = Filesystem::getMountPoints($this->fakeRoot);
-			foreach ($mountPoints as $mountPoint) {
-				$storage = Filesystem::getStorage($mountPoint);
+			$mounts = Filesystem::getMountManager()->findIn($this->fakeRoot);
+			foreach ($mounts as $mount) {
+				$mountPoint = $mount->getMountPoint();
+				$storage = $mount->getStorage();
 				if ($storage) {
 					$cache = $storage->getCache('');
 
@@ -1182,7 +1199,7 @@ class View {
 							$internalPath = $result['path'];
 							$result['path'] = rtrim($relativeMountPoint . $result['path'], '/');
 							$path = rtrim($mountPoint . $internalPath, '/');
-							$files[] = new FileInfo($path, $storage, $internalPath, $result);
+							$files[] = new FileInfo($path, $storage, $internalPath, $result, $mount);
 						}
 					}
 				}
diff --git a/lib/public/files/fileinfo.php b/lib/public/files/fileinfo.php
index 3a407ed67ca..ec68ed475c5 100644
--- a/lib/public/files/fileinfo.php
+++ b/lib/public/files/fileinfo.php
@@ -169,4 +169,11 @@ interface FileInfo {
 	 * @return bool
 	 */
 	public function isMounted();
+
+	/**
+	 * Get the mountpoint the file belongs to
+	 *
+	 * @return \OCP\Files\Mount\IMountPoint
+	 */
+	public function getMountPoint();
 }