From faf642c31d69ce66dbba6e4aaef2e1641f4bbf87 Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Wed, 1 Jul 2015 15:57:04 +0200 Subject: [PATCH 1/3] expose the mount manager in the public api --- lib/private/files/filesystem.php | 4 +- lib/private/files/mount/manager.php | 3 +- lib/private/server.php | 10 +++ lib/public/files/mount/imountmanager.php | 83 ++++++++++++++++++++++++ lib/public/iservercontainer.php | 6 ++ 5 files changed, 103 insertions(+), 3 deletions(-) create mode 100644 lib/public/files/mount/imountmanager.php diff --git a/lib/private/files/filesystem.php b/lib/private/files/filesystem.php index 90019b649c..babf1c7d4e 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 0a606daaf1..e57794d5ae 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 6a65895cd6..47ff01466f 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 0000000000..ed7c9bf633 --- /dev/null +++ b/lib/public/files/mount/imountmanager.php @@ -0,0 +1,83 @@ + + * + * @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 + * + */ + +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 97ca7f13aa..ef6c604495 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(); } From 207ce35ee99e72682b505d3f9d05ab61a6aa9524 Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Wed, 1 Jul 2015 16:07:57 +0200 Subject: [PATCH 2/3] phpdoc --- lib/public/files/mount/imountmanager.php | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/lib/public/files/mount/imountmanager.php b/lib/public/files/mount/imountmanager.php index ed7c9bf633..96ec1e11ad 100644 --- a/lib/public/files/mount/imountmanager.php +++ b/lib/public/files/mount/imountmanager.php @@ -21,21 +21,35 @@ namespace OCP\Files\Mount; +/** + * Interface IMountManager + * + * Manages all mounted storages in the system + */ interface IMountManager { /** + * Add a new mount + * * @param \OCP\Files\Mount\IMountPoint $mount + * @since 8.2.0 */ public function addMount(IMountPoint $mount); /** + * Remove a mount + * * @param string $mountPoint + * @since 8.2.0 */ public function removeMount($mountPoint); /** + * Change the location of a mount + * * @param string $mountPoint * @param string $target + * @since 8.2.0 */ public function moveMount($mountPoint, $target); @@ -44,6 +58,7 @@ interface IMountManager { * * @param string $path * @return \OCP\Files\Mount\IMountPoint + * @since 8.2.0 */ public function find($path); @@ -52,11 +67,14 @@ interface IMountManager { * * @param string $path * @return \OCP\Files\Mount\IMountPoint[] + * @since 8.2.0 */ public function findIn($path); /** * Remove all registered mounts + * + * @since 8.2.0 */ public function clear(); @@ -65,11 +83,13 @@ interface IMountManager { * * @param string $id * @return \OCP\Files\Mount\IMountPoint[] + * @since 8.2.0 */ public function findByStorageId($id); /** * @return \OCP\Files\Mount\IMountPoint[] + * @since 8.2.0 */ public function getAll(); @@ -78,6 +98,7 @@ interface IMountManager { * * @param int $id * @return \OCP\Files\Mount\IMountPoint[] + * @since 8.2.0 */ public function findByNumericId($id); } From 57945dbc4b0144bdebeda5cf15a168556118e9e3 Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Wed, 1 Jul 2015 16:13:33 +0200 Subject: [PATCH 3/3] fix typehinting --- lib/private/files/mount/manager.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/private/files/mount/manager.php b/lib/private/files/mount/manager.php index e57794d5ae..d5bd4d7ddf 100644 --- a/lib/private/files/mount/manager.php +++ b/lib/private/files/mount/manager.php @@ -26,6 +26,7 @@ namespace OC\Files\Mount; use \OC\Files\Filesystem; use OCP\Files\Mount\IMountManager; +use OCP\Files\Mount\IMountPoint; class Manager implements IMountManager { /** @@ -34,9 +35,9 @@ class Manager implements IMountManager { private $mounts = array(); /** - * @param MountPoint $mount + * @param IMountPoint $mount */ - public function addMount(MountPoint $mount) { + public function addMount(IMountPoint $mount) { $this->mounts[$mount->getMountPoint()] = $mount; }