diff options
| -rw-r--r-- | lib/private/files/filesystem.php | 4 | ||||
| -rw-r--r-- | lib/private/files/mount/manager.php | 3 | ||||
| -rw-r--r-- | lib/private/server.php | 10 | ||||
| -rw-r--r-- | lib/public/files/mount/imountmanager.php | 83 | ||||
| -rw-r--r-- | lib/public/iservercontainer.php | 6 |
5 files changed, 103 insertions, 3 deletions
diff --git a/lib/private/files/filesystem.php b/lib/private/files/filesystem.php index 90019b649c4..babf1c7d4ea 100644 --- a/lib/private/files/filesystem.php +++ b/lib/private/files/filesystem.php @@ -343,7 +343,7 @@ class Filesystem { self::$defaultInstance = new View($root); if (!self::$mounts) { - self::$mounts = new Mount\Manager(); + self::$mounts = \OC::$server->getMountManager(); } //load custom mount config @@ -356,7 +356,7 @@ class Filesystem { static public function initMountManager() { if (!self::$mounts) { - self::$mounts = new Mount\Manager(); + self::$mounts = \OC::$server->getMountManager(); } } diff --git a/lib/private/files/mount/manager.php b/lib/private/files/mount/manager.php index 0a606daaf1f..e57794d5aef 100644 --- a/lib/private/files/mount/manager.php +++ b/lib/private/files/mount/manager.php @@ -25,8 +25,9 @@ namespace OC\Files\Mount; use \OC\Files\Filesystem; +use OCP\Files\Mount\IMountManager; -class Manager { +class Manager implements IMountManager { /** * @var MountPoint[] */ diff --git a/lib/private/server.php b/lib/private/server.php index 6a65895cd69..47ff01466fd 100644 --- a/lib/private/server.php +++ b/lib/private/server.php @@ -439,6 +439,9 @@ class Server extends SimpleContainer implements IServerContainer { } return new NoopLockingProvider(); }); + $this->registerService('MountManager', function () { + return new \OC\Files\Mount\Manager(); + }); } /** @@ -939,4 +942,11 @@ class Server extends SimpleContainer implements IServerContainer { public function getLockingProvider() { return $this->query('LockingProvider'); } + + /** + * @return \OCP\Files\Mount\IMountManager + **/ + function getMountManager() { + return $this->query('MountManager'); + } } diff --git a/lib/public/files/mount/imountmanager.php b/lib/public/files/mount/imountmanager.php new file mode 100644 index 00000000000..ed7c9bf633f --- /dev/null +++ b/lib/public/files/mount/imountmanager.php @@ -0,0 +1,83 @@ +<?php +/** + * @author Robin Appelman <icewind@owncloud.com> + * + * @copyright Copyright (c) 2015, ownCloud, Inc. + * @license AGPL-3.0 + * + * This code is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License, version 3, + * as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License, version 3, + * along with this program. If not, see <http://www.gnu.org/licenses/> + * + */ + +namespace OCP\Files\Mount; + +interface IMountManager { + + /** + * @param \OCP\Files\Mount\IMountPoint $mount + */ + public function addMount(IMountPoint $mount); + + /** + * @param string $mountPoint + */ + public function removeMount($mountPoint); + + /** + * @param string $mountPoint + * @param string $target + */ + public function moveMount($mountPoint, $target); + + /** + * Find the mount for $path + * + * @param string $path + * @return \OCP\Files\Mount\IMountPoint + */ + public function find($path); + + /** + * Find all mounts in $path + * + * @param string $path + * @return \OCP\Files\Mount\IMountPoint[] + */ + public function findIn($path); + + /** + * Remove all registered mounts + */ + public function clear(); + + /** + * Find mounts by storage id + * + * @param string $id + * @return \OCP\Files\Mount\IMountPoint[] + */ + public function findByStorageId($id); + + /** + * @return \OCP\Files\Mount\IMountPoint[] + */ + public function getAll(); + + /** + * Find mounts by numeric storage id + * + * @param int $id + * @return \OCP\Files\Mount\IMountPoint[] + */ + public function findByNumericId($id); +} diff --git a/lib/public/iservercontainer.php b/lib/public/iservercontainer.php index 97ca7f13aa6..ef6c6044951 100644 --- a/lib/public/iservercontainer.php +++ b/lib/public/iservercontainer.php @@ -422,4 +422,10 @@ interface IServerContainer { * @since 8.1.0 */ public function getLockingProvider(); + + /** + * @return \OCP\Files\Mount\IMountManager + * @since 8.2.0 + */ + public function getMountManager(); } |