Merge pull request #17291 from owncloud/mount-manager-public
expose the mount manager in the public api
This commit is contained in:
commit
f70791653c
|
@ -343,7 +343,7 @@ class Filesystem {
|
||||||
self::$defaultInstance = new View($root);
|
self::$defaultInstance = new View($root);
|
||||||
|
|
||||||
if (!self::$mounts) {
|
if (!self::$mounts) {
|
||||||
self::$mounts = new Mount\Manager();
|
self::$mounts = \OC::$server->getMountManager();
|
||||||
}
|
}
|
||||||
|
|
||||||
//load custom mount config
|
//load custom mount config
|
||||||
|
@ -356,7 +356,7 @@ class Filesystem {
|
||||||
|
|
||||||
static public function initMountManager() {
|
static public function initMountManager() {
|
||||||
if (!self::$mounts) {
|
if (!self::$mounts) {
|
||||||
self::$mounts = new Mount\Manager();
|
self::$mounts = \OC::$server->getMountManager();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -25,17 +25,19 @@
|
||||||
namespace OC\Files\Mount;
|
namespace OC\Files\Mount;
|
||||||
|
|
||||||
use \OC\Files\Filesystem;
|
use \OC\Files\Filesystem;
|
||||||
|
use OCP\Files\Mount\IMountManager;
|
||||||
|
use OCP\Files\Mount\IMountPoint;
|
||||||
|
|
||||||
class Manager {
|
class Manager implements IMountManager {
|
||||||
/**
|
/**
|
||||||
* @var MountPoint[]
|
* @var MountPoint[]
|
||||||
*/
|
*/
|
||||||
private $mounts = array();
|
private $mounts = array();
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @param MountPoint $mount
|
* @param IMountPoint $mount
|
||||||
*/
|
*/
|
||||||
public function addMount(MountPoint $mount) {
|
public function addMount(IMountPoint $mount) {
|
||||||
$this->mounts[$mount->getMountPoint()] = $mount;
|
$this->mounts[$mount->getMountPoint()] = $mount;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -441,6 +441,9 @@ class Server extends SimpleContainer implements IServerContainer {
|
||||||
}
|
}
|
||||||
return new NoopLockingProvider();
|
return new NoopLockingProvider();
|
||||||
});
|
});
|
||||||
|
$this->registerService('MountManager', function () {
|
||||||
|
return new \OC\Files\Mount\Manager();
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -941,4 +944,11 @@ class Server extends SimpleContainer implements IServerContainer {
|
||||||
public function getLockingProvider() {
|
public function getLockingProvider() {
|
||||||
return $this->query('LockingProvider');
|
return $this->query('LockingProvider');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @return \OCP\Files\Mount\IMountManager
|
||||||
|
**/
|
||||||
|
function getMountManager() {
|
||||||
|
return $this->query('MountManager');
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -0,0 +1,104 @@
|
||||||
|
<?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
|
||||||
|
*
|
||||||
|
* 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);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Find the mount for $path
|
||||||
|
*
|
||||||
|
* @param string $path
|
||||||
|
* @return \OCP\Files\Mount\IMountPoint
|
||||||
|
* @since 8.2.0
|
||||||
|
*/
|
||||||
|
public function find($path);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Find all mounts in $path
|
||||||
|
*
|
||||||
|
* @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();
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Find mounts by storage id
|
||||||
|
*
|
||||||
|
* @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();
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Find mounts by numeric storage id
|
||||||
|
*
|
||||||
|
* @param int $id
|
||||||
|
* @return \OCP\Files\Mount\IMountPoint[]
|
||||||
|
* @since 8.2.0
|
||||||
|
*/
|
||||||
|
public function findByNumericId($id);
|
||||||
|
}
|
|
@ -422,4 +422,10 @@ interface IServerContainer {
|
||||||
* @since 8.1.0
|
* @since 8.1.0
|
||||||
*/
|
*/
|
||||||
public function getLockingProvider();
|
public function getLockingProvider();
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @return \OCP\Files\Mount\IMountManager
|
||||||
|
* @since 8.2.0
|
||||||
|
*/
|
||||||
|
public function getMountManager();
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue