mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #1719 from owncloud/fixing-1659-master 

Fixing 1659 master
This commit is contained in:
Thomas Müller 2013-02-17 11:47:35 -08:00
parent 90939c8f12 40739350c9
commit 55d6b96348
4 changed files with 73 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
lib/files/mapper.php
View File

@ -7,6 +7,12 @@ namespace OC\Files;
*/
class Mapper
{
private $unchangedPhysicalRoot;
public function __construct($rootDir) {
$this->unchangedPhysicalRoot = $rootDir;
}
/**
* @param string $logicPath
* @param bool $create indicates if the generated physical name shall be stored in the database or not
@ -23,7 +29,7 @@ class Mapper
/**
* @param string $physicalPath
* @return string|null
* @return string
*/
public function physicalToLogic($physicalPath) {
$logicPath = $this->resolvePhysicalPath($physicalPath);
@ -39,6 +45,7 @@ class Mapper
* @param string $path
* @param bool $isLogicPath indicates if $path is logical or physical
* @param $recursive
* @return void
*/
public function removePath($path, $isLogicPath, $recursive) {
if ($recursive) {
@ -159,14 +166,11 @@ class Mapper
}
private function slugifyPath($path, $index=null) {
$path = $this->stripRootFolder($path, $this->unchangedPhysicalRoot);
$pathElements = explode('/', $path);
$sluggedElements = array();
// skip slugging the drive letter on windows - TODO: test if local path
if (\OC_Util::runningOnWindows()) {
$sluggedElements[]= $pathElements[0];
array_shift($pathElements);
}
foreach ($pathElements as $pathElement) {
// remove empty elements
if (empty($pathElement)) {
@ -186,12 +190,8 @@ class Mapper
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);
$sluggedPath = $this->unchangedPhysicalRoot.implode(DIRECTORY_SEPARATOR, $sluggedElements);
return $this->stripLast($sluggedPath);
}
/**

6
lib/files/storage/mappedlocal.php
View File

@ -20,7 +20,7 @@ class MappedLocal extends \OC\Files\Storage\Common{
$this->datadir.='/';
}
$this->mapper= new \OC\Files\Mapper();
$this->mapper= new \OC\Files\Mapper($this->datadir);
}
public function __destruct() {
if (defined('PHPUNIT_RUN')) {
@ -274,7 +274,7 @@ class MappedLocal extends \OC\Files\Storage\Common{
return $this->buildPath($path);
}
protected function searchInDir($query, $dir='', $isLogicPath=true) {
protected function searchInDir($query, $dir='') {
$files=array();
$physicalDir = $this->buildPath($dir);
foreach (scandir($physicalDir) as $item) {
@ -287,7 +287,7 @@ class MappedLocal extends \OC\Files\Storage\Common{
$files[]=$dir.'/'.$item;
}
if(is_dir($physicalItem)) {
$files=array_merge($files, $this->searchInDir($query, $physicalItem, false));
$files=array_merge($files, $this->searchInDir($query, $dir.'/'.$item));
}
}
return $files;

42
tests/lib/files/storage/mappedlocalwithdotteddatadir.php Normal file
View File

@ -0,0 +1,42 @@
<?php
/**
* ownCloud
*
* @author Robin Appelman
* @copyright 2012 Robin Appelman icewind@owncloud.com
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
* License as published by the Free Software Foundation; either
* version 3 of the License, or any later version.
*
* This library 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 along with this library. If not, see <http://www.gnu.org/licenses/>.
*
*/
namespace Test\Files\Storage;
class MappedLocalWithDottedDataDir extends Storage {
/**
* @var string tmpDir
*/
private $tmpDir;
public function setUp() {
$this->tmpDir = \OC_Helper::tmpFolder().'dir.123'.DIRECTORY_SEPARATOR;
mkdir($this->tmpDir);
$this->instance=new \OC\Files\Storage\MappedLocal(array('datadir'=>$this->tmpDir));
}
public function tearDown() {
\OC_Helper::rmdirr($this->tmpDir);
unset($this->instance);
}
}

16
tests/lib/files/storage/storage.php
View File

@ -223,6 +223,22 @@ abstract class Storage extends \PHPUnit_Framework_TestCase {
$this->assertContains('/logo-wide.png', $result);
}
public function testSearchInSubFolder() {
$this->instance->mkdir('sub')
;
$textFile = \OC::$SERVERROOT . '/tests/data/lorem.txt';
$this->instance->file_put_contents('/sub/lorem.txt', file_get_contents($textFile, 'r'));
$pngFile = \OC::$SERVERROOT . '/tests/data/logo-wide.png';
$this->instance->file_put_contents('/sub/logo-wide.png', file_get_contents($pngFile, 'r'));
$svgFile = \OC::$SERVERROOT . '/tests/data/logo-wide.svg';
$this->instance->file_put_contents('/sub/logo-wide.svg', file_get_contents($svgFile, 'r'));
$result = $this->instance->search('logo');
$this->assertEquals(2, count($result));
$this->assertContains('/sub/logo-wide.svg', $result);
$this->assertContains('/sub/logo-wide.png', $result);
}
public function testFOpen() {
$textFile = \OC::$SERVERROOT . '/tests/data/lorem.txt';