wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

change behaviour of Filesystem::getMountPoint when a mountpoint is passed as path without trailing slash

Browse source
This commit is contained in:
Robin Appelman 2012-11-24 23:41:39 +01:00
parent d3e37fa157
commit 709aacfa0f
3 changed files with 14 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
lib/files/filesystem.php
View file

@ -144,13 +144,7 @@ class Filesystem {
*/ */
static public function getMountPoint($path) { static public function getMountPoint($path) {
\OC_Hook::emit(self::CLASSNAME, 'get_mountpoint', array('path' => $path)); \OC_Hook::emit(self::CLASSNAME, 'get_mountpoint', array('path' => $path));
if (!$path) { $path = self::normalizePath($path) . '/';
$path = '/';
}
if ($path[0] !== '/') {
$path = '/' . $path;
}
$path = str_replace('//', '/', $path);
$foundMountPoint = ''; $foundMountPoint = '';
$mountPoints = array_keys(self::$mounts); $mountPoints = array_keys(self::$mounts);
foreach ($mountPoints as $mountpoint) { foreach ($mountPoints as $mountpoint) {

2
tests/lib/files/filesystem.php
View file

@ -60,7 +60,7 @@ class Filesystem extends \PHPUnit_Framework_TestCase {
$this->assertEquals('/',\OC\Files\Filesystem::getMountPoint('/')); $this->assertEquals('/',\OC\Files\Filesystem::getMountPoint('/'));
$this->assertEquals('/some/',\OC\Files\Filesystem::getMountPoint('/some/folder')); $this->assertEquals('/some/',\OC\Files\Filesystem::getMountPoint('/some/folder'));
$this->assertEquals('/some/',\OC\Files\Filesystem::getMountPoint('/some/')); $this->assertEquals('/some/',\OC\Files\Filesystem::getMountPoint('/some/'));
$this->assertEquals('/',\OC\Files\Filesystem::getMountPoint('/some')); $this->assertEquals('/some/',\OC\Files\Filesystem::getMountPoint('/some'));
list( , $internalPath)=\OC\Files\Filesystem::resolvePath('/some/folder'); list( , $internalPath)=\OC\Files\Filesystem::resolvePath('/some/folder');
$this->assertEquals('folder',$internalPath); $this->assertEquals('folder',$internalPath);
} }

12
tests/lib/files/view.php
View file

@ -71,6 +71,18 @@ class View extends \PHPUnit_Framework_TestCase {
$this->assertEquals($storageSize + $textSize, $folderData[2]['size']); $this->assertEquals($storageSize + $textSize, $folderData[2]['size']);
$this->assertEquals($storageSize, $folderData[3]['size']); $this->assertEquals($storageSize, $folderData[3]['size']);
$folderData = $rootView->getDirectoryContent('/substorage');
/**
* expected entries:
* foo.png
* foo.txt
* folder
*/
$this->assertEquals(3, count($folderData));
$this->assertEquals('foo.png', $folderData[0]['name']);
$this->assertEquals('foo.txt', $folderData[1]['name']);
$this->assertEquals('folder', $folderData[2]['name']);
$folderView = new \OC\Files\View('/folder'); $folderView = new \OC\Files\View('/folder');
$this->assertEquals($rootView->getFileInfo('/folder'), $folderView->getFileInfo('/')); $this->assertEquals($rootView->getFileInfo('/folder'), $folderView->getFileInfo('/'));