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

use normalize path to convert '.' to '' in objectstorestorage

Browse source
This commit is contained in:
Jörn Friedrich Dreyer 2014-06-27 15:00:29 +02:00
parent ab93f1949d
commit 25dbbbadd3
1 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
lib/private/files/objectstore/objectstorestorage.php
View file

@ -62,7 +62,7 @@ class ObjectStoreStorage extends \OC\Files\Storage\Common {
return false;
}
$dirName = dirname($path);
$dirName = $this->normalizePath(dirname($path));
$parentExists = $this->is_dir($dirName);
$mTime = time();
@ -75,11 +75,16 @@ class ObjectStoreStorage extends \OC\Files\Storage\Common {
'permissions' => \OCP\PERMISSION_ALL,
);
if ($dirName === '.' && !$parentExists) {
if ($dirName === '' && !$parentExists) {
//create root on the fly
$data['etag'] = $this->getETag($dirName);
$data['etag'] = $this->getETag('');
$this->getCache()->put('', $data);
$parentExists = true;
// we are done when the root folder was meant to be created
if ($dirName === $path) {
return true;
}
}
if ($parentExists) {
@ -99,8 +104,9 @@ class ObjectStoreStorage extends \OC\Files\Storage\Common {
//FIXME why do we sometimes get a path like 'files//username'?
$path = str_replace('//', '/', $path);
if (!$path) {
$path = '.';
// dirname('/folder') returns '.' but internally (in the cache) we store the root as ''
if (!$path || $path === '.') {
$path = '';
}
return $path;
@ -200,10 +206,6 @@ class ObjectStoreStorage extends \OC\Files\Storage\Common {
public function opendir($path) {
$path = $this->normalizePath($path);
if ($path === '.') {
$path = '';
}
try {
$files = array();
$folderContents = $this->getCache()->getFolderContents($path);