Further seperation of mount management logic
This commit is contained in:
parent
bcd9a69033
commit
809b5f81f6
|
@ -44,7 +44,7 @@ class Shared_Cache extends Cache {
|
||||||
$source = \OC_Share_Backend_File::getSource($target);
|
$source = \OC_Share_Backend_File::getSource($target);
|
||||||
if (isset($source['path']) && isset($source['fileOwner'])) {
|
if (isset($source['path']) && isset($source['fileOwner'])) {
|
||||||
\OC\Files\Filesystem::initMountPoints($source['fileOwner']);
|
\OC\Files\Filesystem::initMountPoints($source['fileOwner']);
|
||||||
$mount = \OC\Files\Mount::findByNumericId($source['storage']);
|
$mount = \OC\Files\Filesystem::getMountByNumericId($source['storage']);
|
||||||
if ($mount) {
|
if ($mount) {
|
||||||
$fullPath = $mount->getMountPoint().$source['path'];
|
$fullPath = $mount->getMountPoint().$source['path'];
|
||||||
list($storage, $internalPath) = \OC\Files\Filesystem::resolvePath($fullPath);
|
list($storage, $internalPath) = \OC\Files\Filesystem::resolvePath($fullPath);
|
||||||
|
|
|
@ -71,7 +71,7 @@ class Shared extends \OC\Files\Storage\Common {
|
||||||
if ($source) {
|
if ($source) {
|
||||||
if (!isset($source['fullPath'])) {
|
if (!isset($source['fullPath'])) {
|
||||||
\OC\Files\Filesystem::initMountPoints($source['fileOwner']);
|
\OC\Files\Filesystem::initMountPoints($source['fileOwner']);
|
||||||
$mount = \OC\Files\Mount::findByNumericId($source['storage']);
|
$mount = \OC\Files\Filesystem::getMountByNumericId($source['storage']);
|
||||||
if ($mount) {
|
if ($mount) {
|
||||||
$this->files[$target]['fullPath'] = $mount->getMountPoint().$source['path'];
|
$this->files[$target]['fullPath'] = $mount->getMountPoint().$source['path'];
|
||||||
} else {
|
} else {
|
||||||
|
|
|
@ -34,6 +34,11 @@ const FREE_SPACE_UNKNOWN = -2;
|
||||||
const FREE_SPACE_UNLIMITED = -3;
|
const FREE_SPACE_UNLIMITED = -3;
|
||||||
|
|
||||||
class Filesystem {
|
class Filesystem {
|
||||||
|
/**
|
||||||
|
* @var Mount\Manager $mounts
|
||||||
|
*/
|
||||||
|
private static $mounts;
|
||||||
|
|
||||||
public static $loaded = false;
|
public static $loaded = false;
|
||||||
/**
|
/**
|
||||||
* @var \OC\Files\View $defaultInstance
|
* @var \OC\Files\View $defaultInstance
|
||||||
|
@ -147,7 +152,7 @@ class Filesystem {
|
||||||
* @return string
|
* @return string
|
||||||
*/
|
*/
|
||||||
static public function getMountPoint($path) {
|
static public function getMountPoint($path) {
|
||||||
$mount = Mount::find($path);
|
$mount = self::$mounts->find($path);
|
||||||
if ($mount) {
|
if ($mount) {
|
||||||
return $mount->getMountPoint();
|
return $mount->getMountPoint();
|
||||||
} else {
|
} else {
|
||||||
|
@ -163,7 +168,7 @@ class Filesystem {
|
||||||
*/
|
*/
|
||||||
static public function getMountPoints($path) {
|
static public function getMountPoints($path) {
|
||||||
$result = array();
|
$result = array();
|
||||||
$mounts = Mount::findIn($path);
|
$mounts = self::$mounts->findIn($path);
|
||||||
foreach ($mounts as $mount) {
|
foreach ($mounts as $mount) {
|
||||||
$result[] = $mount->getMountPoint();
|
$result[] = $mount->getMountPoint();
|
||||||
}
|
}
|
||||||
|
@ -177,10 +182,26 @@ class Filesystem {
|
||||||
* @return \OC\Files\Storage\Storage
|
* @return \OC\Files\Storage\Storage
|
||||||
*/
|
*/
|
||||||
public static function getStorage($mountPoint) {
|
public static function getStorage($mountPoint) {
|
||||||
$mount = Mount::find($mountPoint);
|
$mount = self::$mounts->find($mountPoint);
|
||||||
return $mount->getStorage();
|
return $mount->getStorage();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param $id
|
||||||
|
* @return Mount\Mount[]
|
||||||
|
*/
|
||||||
|
public static function getMountByStorageId($id) {
|
||||||
|
return self::$mounts->findByStorageId($id);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param $id
|
||||||
|
* @return Mount\Mount[]
|
||||||
|
*/
|
||||||
|
public static function getMountByNumericId($id) {
|
||||||
|
return self::$mounts->findByStorageId($id);
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* resolve a path to a storage and internal path
|
* resolve a path to a storage and internal path
|
||||||
*
|
*
|
||||||
|
@ -188,7 +209,7 @@ class Filesystem {
|
||||||
* @return array consisting of the storage and the internal path
|
* @return array consisting of the storage and the internal path
|
||||||
*/
|
*/
|
||||||
static public function resolvePath($path) {
|
static public function resolvePath($path) {
|
||||||
$mount = Mount::find($path);
|
$mount = self::$mounts->find($path);
|
||||||
if ($mount) {
|
if ($mount) {
|
||||||
return array($mount->getStorage(), $mount->getInternalPath($path));
|
return array($mount->getStorage(), $mount->getInternalPath($path));
|
||||||
} else {
|
} else {
|
||||||
|
@ -201,6 +222,7 @@ class Filesystem {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
self::$defaultInstance = new View($root);
|
self::$defaultInstance = new View($root);
|
||||||
|
self::$mounts = new Mount\Manager();
|
||||||
|
|
||||||
//load custom mount config
|
//load custom mount config
|
||||||
self::initMountPoints($user);
|
self::initMountPoints($user);
|
||||||
|
@ -210,6 +232,10 @@ class Filesystem {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static public function initMounts(){
|
||||||
|
self::$mounts = new Mount\Manager();
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Initialize system and personal mount points for a user
|
* Initialize system and personal mount points for a user
|
||||||
*
|
*
|
||||||
|
@ -328,7 +354,7 @@ class Filesystem {
|
||||||
* clear all mounts and storage backends
|
* clear all mounts and storage backends
|
||||||
*/
|
*/
|
||||||
public static function clearMounts() {
|
public static function clearMounts() {
|
||||||
Mount::clear();
|
self::$mounts->clear();
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -339,7 +365,8 @@ class Filesystem {
|
||||||
* @param string $mountpoint
|
* @param string $mountpoint
|
||||||
*/
|
*/
|
||||||
static public function mount($class, $arguments, $mountpoint) {
|
static public function mount($class, $arguments, $mountpoint) {
|
||||||
new Mount($class, $mountpoint, $arguments);
|
$mount = new Mount\Mount($class, $mountpoint, $arguments);
|
||||||
|
self::$mounts->addMount($mount);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -0,0 +1,120 @@
|
||||||
|
<?php
|
||||||
|
/**
|
||||||
|
* Copyright (c) 2012 Robin Appelman <icewind@owncloud.com>
|
||||||
|
* This file is licensed under the Affero General Public License version 3 or
|
||||||
|
* later.
|
||||||
|
* See the COPYING-README file.
|
||||||
|
*/
|
||||||
|
|
||||||
|
namespace OC\Files\Mount;
|
||||||
|
|
||||||
|
use \OC\Files\Filesystem;
|
||||||
|
|
||||||
|
class Manager {
|
||||||
|
/**
|
||||||
|
* @var Mount[]
|
||||||
|
*/
|
||||||
|
private $mounts = array();
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param Mount $mount
|
||||||
|
*/
|
||||||
|
public function addMount($mount) {
|
||||||
|
$this->mounts[$mount->getMountPoint()] = $mount;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Find the mount for $path
|
||||||
|
*
|
||||||
|
* @param $path
|
||||||
|
* @return Mount
|
||||||
|
*/
|
||||||
|
public function find($path) {
|
||||||
|
\OC_Util::setupFS();
|
||||||
|
$path = $this->formatPath($path);
|
||||||
|
if (isset($this->mounts[$path])) {
|
||||||
|
return $this->mounts[$path];
|
||||||
|
}
|
||||||
|
|
||||||
|
\OC_Hook::emit('OC_Filesystem', 'get_mountpoint', array('path' => $path));
|
||||||
|
$foundMountPoint = '';
|
||||||
|
$mountPoints = array_keys($this->mounts);
|
||||||
|
foreach ($mountPoints as $mountpoint) {
|
||||||
|
if (strpos($path, $mountpoint) === 0 and strlen($mountpoint) > strlen($foundMountPoint)) {
|
||||||
|
$foundMountPoint = $mountpoint;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (isset($this->mounts[$foundMountPoint])) {
|
||||||
|
return $this->mounts[$foundMountPoint];
|
||||||
|
} else {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Find all mounts in $path
|
||||||
|
*
|
||||||
|
* @param $path
|
||||||
|
* @return Mount[]
|
||||||
|
*/
|
||||||
|
public function findIn($path) {
|
||||||
|
\OC_Util::setupFS();
|
||||||
|
$path = $this->formatPath($path);
|
||||||
|
$result = array();
|
||||||
|
$pathLength = strlen($path);
|
||||||
|
$mountPoints = array_keys($this->mounts);
|
||||||
|
foreach ($mountPoints as $mountPoint) {
|
||||||
|
if (substr($mountPoint, 0, $pathLength) === $path and strlen($mountPoint) > $pathLength) {
|
||||||
|
$result[] = $this->mounts[$mountPoint];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return $result;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function clear() {
|
||||||
|
$this->mounts = array();
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Find mounts by storage id
|
||||||
|
*
|
||||||
|
* @param string $id
|
||||||
|
* @return Mount[]
|
||||||
|
*/
|
||||||
|
public function findByStorageId($id) {
|
||||||
|
\OC_Util::setupFS();
|
||||||
|
if (strlen($id) > 64) {
|
||||||
|
$id = md5($id);
|
||||||
|
}
|
||||||
|
$result = array();
|
||||||
|
foreach ($this->mounts as $mount) {
|
||||||
|
if ($mount->getStorageId() === $id) {
|
||||||
|
$result[] = $mount;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return $result;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Find mounts by numeric storage id
|
||||||
|
*
|
||||||
|
* @param string $id
|
||||||
|
* @return Mount
|
||||||
|
*/
|
||||||
|
public function findByNumericId($id) {
|
||||||
|
$storageId = \OC\Files\Cache\Storage::getStorageId($id);
|
||||||
|
return $this->findByStorageId($storageId);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param string $path
|
||||||
|
* @return string
|
||||||
|
*/
|
||||||
|
private function formatPath($path) {
|
||||||
|
$path = Filesystem::normalizePath($path);
|
||||||
|
if (strlen($path) > 1) {
|
||||||
|
$path .= '/';
|
||||||
|
}
|
||||||
|
return $path;
|
||||||
|
}
|
||||||
|
}
|
|
@ -6,13 +6,12 @@
|
||||||
* See the COPYING-README file.
|
* See the COPYING-README file.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
namespace OC\Files;
|
namespace OC\Files\Mount;
|
||||||
|
|
||||||
|
use \OC\Files\Filesystem;
|
||||||
|
|
||||||
class Mount {
|
class Mount {
|
||||||
/**
|
|
||||||
* @var Mount[]
|
|
||||||
*/
|
|
||||||
static private $mounts = array();
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @var \OC\Files\Storage\Storage $storage
|
* @var \OC\Files\Storage\Storage $storage
|
||||||
|
@ -33,7 +32,7 @@ class Mount {
|
||||||
$arguments = array();
|
$arguments = array();
|
||||||
}
|
}
|
||||||
|
|
||||||
$mountpoint = self::formatPath($mountpoint);
|
$mountpoint = $this->formatPath($mountpoint);
|
||||||
if ($storage instanceof \OC\Files\Storage\Storage) {
|
if ($storage instanceof \OC\Files\Storage\Storage) {
|
||||||
$this->class = get_class($storage);
|
$this->class = get_class($storage);
|
||||||
$this->storage = $storage;
|
$this->storage = $storage;
|
||||||
|
@ -46,8 +45,6 @@ class Mount {
|
||||||
$this->arguments = $arguments;
|
$this->arguments = $arguments;
|
||||||
}
|
}
|
||||||
$this->mountPoint = $mountpoint;
|
$this->mountPoint = $mountpoint;
|
||||||
|
|
||||||
self::$mounts[$this->mountPoint] = $this;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -58,6 +55,8 @@ class Mount {
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
* create the storage that is mounted
|
||||||
|
*
|
||||||
* @return \OC\Files\Storage\Storage
|
* @return \OC\Files\Storage\Storage
|
||||||
*/
|
*/
|
||||||
private function createStorage() {
|
private function createStorage() {
|
||||||
|
@ -121,103 +120,11 @@ class Mount {
|
||||||
* @param string $path
|
* @param string $path
|
||||||
* @return string
|
* @return string
|
||||||
*/
|
*/
|
||||||
private static function formatPath($path) {
|
private function formatPath($path) {
|
||||||
$path = Filesystem::normalizePath($path);
|
$path = Filesystem::normalizePath($path);
|
||||||
if (strlen($path) > 1) {
|
if (strlen($path) > 1) {
|
||||||
$path .= '/';
|
$path .= '/';
|
||||||
}
|
}
|
||||||
return $path;
|
return $path;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Find the mount for $path
|
|
||||||
*
|
|
||||||
* @param $path
|
|
||||||
* @return Mount
|
|
||||||
*/
|
|
||||||
public static function find($path) {
|
|
||||||
\OC_Util::setupFS();
|
|
||||||
$path = self::formatPath($path);
|
|
||||||
if (isset(self::$mounts[$path])) {
|
|
||||||
return self::$mounts[$path];
|
|
||||||
}
|
|
||||||
|
|
||||||
\OC_Hook::emit('OC_Filesystem', 'get_mountpoint', array('path' => $path));
|
|
||||||
$foundMountPoint = '';
|
|
||||||
$mountPoints = array_keys(self::$mounts);
|
|
||||||
foreach ($mountPoints as $mountpoint) {
|
|
||||||
if (strpos($path, $mountpoint) === 0 and strlen($mountpoint) > strlen($foundMountPoint)) {
|
|
||||||
$foundMountPoint = $mountpoint;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if (isset(self::$mounts[$foundMountPoint])) {
|
|
||||||
return self::$mounts[$foundMountPoint];
|
|
||||||
} else {
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Find all mounts in $path
|
|
||||||
*
|
|
||||||
* @param $path
|
|
||||||
* @return Mount[]
|
|
||||||
*/
|
|
||||||
public static function findIn($path) {
|
|
||||||
\OC_Util::setupFS();
|
|
||||||
$path = self::formatPath($path);
|
|
||||||
$result = array();
|
|
||||||
$pathLength = strlen($path);
|
|
||||||
$mountPoints = array_keys(self::$mounts);
|
|
||||||
foreach ($mountPoints as $mountPoint) {
|
|
||||||
if (substr($mountPoint, 0, $pathLength) === $path and strlen($mountPoint) > $pathLength) {
|
|
||||||
$result[] = self::$mounts[$mountPoint];
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return $result;
|
|
||||||
}
|
|
||||||
|
|
||||||
public static function clear() {
|
|
||||||
self::$mounts = array();
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Find mounts by storage id
|
|
||||||
*
|
|
||||||
* @param string $id
|
|
||||||
* @return Mount[]
|
|
||||||
*/
|
|
||||||
public static function findByStorageId($id) {
|
|
||||||
\OC_Util::setupFS();
|
|
||||||
if (strlen($id) > 64) {
|
|
||||||
$id = md5($id);
|
|
||||||
}
|
|
||||||
$result = array();
|
|
||||||
foreach (self::$mounts as $mount) {
|
|
||||||
if ($mount->getStorageId() === $id) {
|
|
||||||
$result[] = $mount;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return $result;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Find mounts by numeric storage id
|
|
||||||
*
|
|
||||||
* @param string $id
|
|
||||||
* @return Mount
|
|
||||||
*/
|
|
||||||
public static function findByNumericId($id) {
|
|
||||||
$query = \OC_DB::prepare('SELECT `id` FROM `*PREFIX*storages` WHERE `numeric_id` = ?');
|
|
||||||
$result = $query->execute(array($id))->fetchOne();
|
|
||||||
if ($result) {
|
|
||||||
$id = $result;
|
|
||||||
foreach (self::$mounts as $mount) {
|
|
||||||
if ($mount->getStorageId() === $id) {
|
|
||||||
return $mount;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
}
|
}
|
|
@ -977,7 +977,7 @@ class View {
|
||||||
*/
|
*/
|
||||||
public function getPath($id) {
|
public function getPath($id) {
|
||||||
list($storage, $internalPath) = Cache\Cache::getById($id);
|
list($storage, $internalPath) = Cache\Cache::getById($id);
|
||||||
$mounts = Mount::findByStorageId($storage);
|
$mounts = Filesystem::getMountByStorageId($storage);
|
||||||
foreach ($mounts as $mount) {
|
foreach ($mounts as $mount) {
|
||||||
/**
|
/**
|
||||||
* @var \OC\Files\Mount $mount
|
* @var \OC\Files\Mount $mount
|
||||||
|
|
|
@ -875,7 +875,7 @@ class Share {
|
||||||
$row['path'] = '/Shared/'.basename($row['path']);
|
$row['path'] = '/Shared/'.basename($row['path']);
|
||||||
} else {
|
} else {
|
||||||
if (!isset($mounts[$row['storage']])) {
|
if (!isset($mounts[$row['storage']])) {
|
||||||
$mounts[$row['storage']] = \OC\Files\Mount::findByNumericId($row['storage']);
|
$mounts[$row['storage']] = \OC\Files\Filesystem::getMountByNumericId($row['storage']);
|
||||||
}
|
}
|
||||||
if ($mounts[$row['storage']]) {
|
if ($mounts[$row['storage']]) {
|
||||||
$path = $mounts[$row['storage']]->getMountPoint().$row['path'];
|
$path = $mounts[$row['storage']]->getMountPoint().$row['path'];
|
||||||
|
|
|
@ -38,6 +38,7 @@ class OC_Util {
|
||||||
|
|
||||||
$CONFIG_DATADIRECTORY = OC_Config::getValue( "datadirectory", OC::$SERVERROOT."/data" );
|
$CONFIG_DATADIRECTORY = OC_Config::getValue( "datadirectory", OC::$SERVERROOT."/data" );
|
||||||
//first set up the local "root" storage
|
//first set up the local "root" storage
|
||||||
|
\OC\Files\Filesystem::initMounts();
|
||||||
if(!self::$rootMounted) {
|
if(!self::$rootMounted) {
|
||||||
\OC\Files\Filesystem::mount('\OC\Files\Storage\Local', array('datadir'=>$CONFIG_DATADIRECTORY), '/');
|
\OC\Files\Filesystem::mount('\OC\Files\Storage\Local', array('datadir'=>$CONFIG_DATADIRECTORY), '/');
|
||||||
self::$rootMounted=true;
|
self::$rootMounted=true;
|
||||||
|
|
|
@ -1,58 +0,0 @@
|
||||||
<?php
|
|
||||||
/**
|
|
||||||
* Copyright (c) 2013 Robin Appelman <icewind@owncloud.com>
|
|
||||||
* This file is licensed under the Affero General Public License version 3 or
|
|
||||||
* later.
|
|
||||||
* See the COPYING-README file.
|
|
||||||
*/
|
|
||||||
|
|
||||||
namespace Test\Files;
|
|
||||||
|
|
||||||
use \OC\Files\Storage\Temporary;
|
|
||||||
|
|
||||||
class LongId extends Temporary {
|
|
||||||
public function getId() {
|
|
||||||
return 'long:' . str_repeat('foo', 50) . parent::getId();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
class Mount extends \PHPUnit_Framework_TestCase {
|
|
||||||
public function setup() {
|
|
||||||
\OC_Util::setupFS();
|
|
||||||
\OC\Files\Mount::clear();
|
|
||||||
}
|
|
||||||
|
|
||||||
public function testFind() {
|
|
||||||
$this->assertNull(\OC\Files\Mount::find('/'));
|
|
||||||
|
|
||||||
$rootMount = new \OC\Files\Mount(new Temporary(array()), '/');
|
|
||||||
$this->assertEquals($rootMount, \OC\Files\Mount::find('/'));
|
|
||||||
$this->assertEquals($rootMount, \OC\Files\Mount::find('/foo/bar'));
|
|
||||||
|
|
||||||
$storage = new Temporary(array());
|
|
||||||
$mount = new \OC\Files\Mount($storage, '/foo');
|
|
||||||
$this->assertEquals($rootMount, \OC\Files\Mount::find('/'));
|
|
||||||
$this->assertEquals($mount, \OC\Files\Mount::find('/foo/bar'));
|
|
||||||
|
|
||||||
$this->assertEquals(1, count(\OC\Files\Mount::findIn('/')));
|
|
||||||
new \OC\Files\Mount(new Temporary(array()), '/bar');
|
|
||||||
$this->assertEquals(2, count(\OC\Files\Mount::findIn('/')));
|
|
||||||
|
|
||||||
$id = $mount->getStorageId();
|
|
||||||
$this->assertEquals(array($mount), \OC\Files\Mount::findByStorageId($id));
|
|
||||||
|
|
||||||
$mount2 = new \OC\Files\Mount($storage, '/foo/bar');
|
|
||||||
$this->assertEquals(array($mount, $mount2), \OC\Files\Mount::findByStorageId($id));
|
|
||||||
}
|
|
||||||
|
|
||||||
public function testLong() {
|
|
||||||
$storage = new LongId(array());
|
|
||||||
$mount = new \OC\Files\Mount($storage, '/foo');
|
|
||||||
|
|
||||||
$id = $mount->getStorageId();
|
|
||||||
$storageId = $storage->getId();
|
|
||||||
$this->assertEquals(array($mount), \OC\Files\Mount::findByStorageId($id));
|
|
||||||
$this->assertEquals(array($mount), \OC\Files\Mount::findByStorageId($storageId));
|
|
||||||
$this->assertEquals(array($mount), \OC\Files\Mount::findByStorageId(md5($storageId)));
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -0,0 +1,67 @@
|
||||||
|
<?php
|
||||||
|
/**
|
||||||
|
* Copyright (c) 2013 Robin Appelman <icewind@owncloud.com>
|
||||||
|
* This file is licensed under the Affero General Public License version 3 or
|
||||||
|
* later.
|
||||||
|
* See the COPYING-README file.
|
||||||
|
*/
|
||||||
|
|
||||||
|
namespace Test\Files\Mount;
|
||||||
|
|
||||||
|
use \OC\Files\Storage\Temporary;
|
||||||
|
|
||||||
|
class LongId extends Temporary {
|
||||||
|
public function getId() {
|
||||||
|
return 'long:' . str_repeat('foo', 50) . parent::getId();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
class Manager extends \PHPUnit_Framework_TestCase {
|
||||||
|
/**
|
||||||
|
* @var \OC\Files\Mount\Manager
|
||||||
|
*/
|
||||||
|
private $manager;
|
||||||
|
|
||||||
|
public function setup() {
|
||||||
|
$this->manager = new \OC\Files\Mount\Manager();
|
||||||
|
}
|
||||||
|
|
||||||
|
public function testFind() {
|
||||||
|
$this->assertNull($this->manager->find('/'));
|
||||||
|
|
||||||
|
$rootMount = new \OC\Files\Mount\Mount(new Temporary(array()), '/');
|
||||||
|
$this->manager->addMount($rootMount);
|
||||||
|
$this->assertEquals($rootMount, $this->manager->find('/'));
|
||||||
|
$this->assertEquals($rootMount, $this->manager->find('/foo/bar'));
|
||||||
|
|
||||||
|
$storage = new Temporary(array());
|
||||||
|
$mount1 = new \OC\Files\Mount\Mount($storage, '/foo');
|
||||||
|
$this->manager->addMount($mount1);
|
||||||
|
$this->assertEquals($rootMount, $this->manager->find('/'));
|
||||||
|
$this->assertEquals($mount1, $this->manager->find('/foo/bar'));
|
||||||
|
|
||||||
|
$this->assertEquals(1, count($this->manager->findIn('/')));
|
||||||
|
$mount2 = new \OC\Files\Mount\Mount(new Temporary(array()), '/bar');
|
||||||
|
$this->manager->addMount($mount2);
|
||||||
|
$this->assertEquals(2, count($this->manager->findIn('/')));
|
||||||
|
|
||||||
|
$id = $mount1->getStorageId();
|
||||||
|
$this->assertEquals(array($mount1), $this->manager->findByStorageId($id));
|
||||||
|
|
||||||
|
$mount3 = new \OC\Files\Mount\Mount($storage, '/foo/bar');
|
||||||
|
$this->manager->addMount($mount3);
|
||||||
|
$this->assertEquals(array($mount1, $mount3), $this->manager->findByStorageId($id));
|
||||||
|
}
|
||||||
|
|
||||||
|
public function testLong() {
|
||||||
|
$storage = new LongId(array());
|
||||||
|
$mount = new \OC\Files\Mount\Mount($storage, '/foo');
|
||||||
|
$this->manager->addMount($mount);
|
||||||
|
|
||||||
|
$id = $mount->getStorageId();
|
||||||
|
$storageId = $storage->getId();
|
||||||
|
$this->assertEquals(array($mount), $this->manager->findByStorageId($id));
|
||||||
|
$this->assertEquals(array($mount), $this->manager->findByStorageId($storageId));
|
||||||
|
$this->assertEquals(array($mount), $this->manager->findByStorageId(md5($storageId)));
|
||||||
|
}
|
||||||
|
}
|
|
@ -77,10 +77,10 @@ class Test_StreamWrappers extends PHPUnit_Framework_TestCase {
|
||||||
}
|
}
|
||||||
|
|
||||||
public function testOC() {
|
public function testOC() {
|
||||||
\OC\Files\Mount::clear();
|
\OC\Files\Filesystem::clearMounts();
|
||||||
$storage = new \OC\Files\Storage\Temporary(array());
|
$storage = new \OC\Files\Storage\Temporary(array());
|
||||||
$storage->file_put_contents('foo.txt', 'asd');
|
$storage->file_put_contents('foo.txt', 'asd');
|
||||||
new \OC\Files\Mount($storage, '/');
|
\OC\Files\Filesystem::mount($storage, array(), '/');
|
||||||
|
|
||||||
$this->assertTrue(file_exists('oc:///foo.txt'));
|
$this->assertTrue(file_exists('oc:///foo.txt'));
|
||||||
$this->assertEquals('asd', file_get_contents('oc:///foo.txt'));
|
$this->assertEquals('asd', file_get_contents('oc:///foo.txt'));
|
||||||
|
|
Loading…
Reference in New Issue