diff options
author | Lukas Reschke <lukas@statuscode.ch> | 2013-02-12 22:58:37 -0800 |
---|---|---|
committer | Lukas Reschke <lukas@statuscode.ch> | 2013-02-12 22:58:37 -0800 |
commit | 06bba59249188e58036627a75268d9db69346f9b (patch) | |
tree | 41e0d144d47e20aaa2e4b79b2664638b09b7e0d3 /lib/files | |
parent | 68fa0b7dcc4a45e4f44b754626440091608ccc85 (diff) | |
parent | 92e6409f4008d21c8507310d7b6ce0f64fc29b71 (diff) | |
download | nextcloud-server-06bba59249188e58036627a75268d9db69346f9b.tar.gz nextcloud-server-06bba59249188e58036627a75268d9db69346f9b.zip |
Merge pull request #1618 from owncloud/mapped-storage-unit-testing-linux-masterv5.0.0alpha1
Mapped storage unit testing linux master
Diffstat (limited to 'lib/files')
-rw-r--r-- | lib/files/mapper.php | 16 | ||||
-rw-r--r-- | lib/files/storage/local.php | 4 | ||||
-rw-r--r-- | lib/files/storage/mappedlocal.php | 5 |
3 files changed, 22 insertions, 3 deletions
diff --git a/lib/files/mapper.php b/lib/files/mapper.php index 71b665e49bb..2d29a8532b6 100644 --- a/lib/files/mapper.php +++ b/lib/files/mapper.php @@ -117,6 +117,9 @@ class Mapper $query = \OC_DB::prepare('SELECT * FROM `*PREFIX*file_map` WHERE `logic_path_hash` = ?'); $result = $query->execute(array(md5($logicPath))); $result = $result->fetchRow(); + if ($result === false) { + return null; + } return $result['physic_path']; } @@ -160,11 +163,16 @@ class Mapper $sluggedElements = array(); // skip slugging the drive letter on windows - TODO: test if local path - if (strpos(strtolower(php_uname('s')), 'win') !== false) { + if (\OC_Util::runningOnWindows()) { $sluggedElements[]= $pathElements[0]; array_shift($pathElements); } foreach ($pathElements as $pathElement) { + // remove empty elements + if (empty($pathElement)) { + continue; + } + // TODO: remove file ext before slugify on last element $sluggedElements[] = self::slugify($pathElement); } @@ -177,6 +185,12 @@ class Mapper array_pop($sluggedElements); array_push($sluggedElements, $last.'-'.$index); } + + // on non-windows systems add the leading / if necessary + if (!\OC_Util::runningOnWindows() and $path[0] === '/') { + return DIRECTORY_SEPARATOR.implode(DIRECTORY_SEPARATOR, $sluggedElements); + } + return implode(DIRECTORY_SEPARATOR, $sluggedElements); } diff --git a/lib/files/storage/local.php b/lib/files/storage/local.php index 9fe01135866..aaa3c0fab49 100644 --- a/lib/files/storage/local.php +++ b/lib/files/storage/local.php @@ -9,7 +9,9 @@ namespace OC\Files\Storage; if (\OC_Util::runningOnWindows()) { - require_once 'mappedlocal.php'; + class Local extends MappedLocal { + + } } else { /** diff --git a/lib/files/storage/mappedlocal.php b/lib/files/storage/mappedlocal.php index 80dd79bc41f..218465d8eef 100644 --- a/lib/files/storage/mappedlocal.php +++ b/lib/files/storage/mappedlocal.php @@ -10,7 +10,7 @@ namespace OC\Files\Storage; /** * for local filestore, we only have to map the paths */ -class Local extends \OC\Files\Storage\Common{ +class MappedLocal extends \OC\Files\Storage\Common{ protected $datadir; private $mapper; @@ -329,6 +329,9 @@ class Local extends \OC\Files\Storage\Common{ if(strpos($path, '/') === 0) { $path = substr($path, 1); } + if ($path === false) { + return ''; + } return $path; } |