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

add search implementation to filestorage common

This commit is contained in:
Robin Appelman 2012-03-02 18:42:04 +01:00
parent 4daedda35a
commit e8afe4f158
3 changed files with 37 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
lib/filestorage/common.php
View File

@ -106,7 +106,9 @@ abstract class OC_Filestorage_Common extends OC_Filestorage {
return $hash;
}
// abstract public function free_space($path);
// abstract public function search($query);
public function search($query){
return $this->searchInDir($query);
}
public function getLocalFile($path){
return $this->toTmpFile($path);
}
@ -122,4 +124,21 @@ abstract class OC_Filestorage_Common extends OC_Filestorage {
return $tmpFile;
}
// abstract public function touch($path, $mtime=null);
protected function searchInDir($query,$dir=''){
$files=array();
$dh=$this->opendir($dir);
if($dh){
while($item=readdir($dh)){
if ($item == '.' || $item == '..') continue;
if(strstr(strtolower($item),strtolower($query))!==false){
$files[]=$dir.'/'.$item;
}
if($this->is_dir($dir.'/'.$item)){
$files=array_merge($files,$this->searchInDir($query,$dir.'/'.$item));
}
}
}
return $files;
}
}

3
lib/filestorage/commontest.php
View File

@ -69,9 +69,6 @@ class OC_Filestorage_CommonTest extends OC_Filestorage_Common{
public function free_space($path){
return $this->storage->free_space($path);
}
public function search($query){
return $this->storage->search($query);
}
public function touch($path, $mtime=null){
return $this->storage->touch($path,$mtime);
}

16
tests/lib/filestorage.php
View File

@ -156,9 +156,10 @@ abstract class Test_FileStorage extends UnitTestCase {
$this->assertTrue($mTime<=$mtimeEnd);
$this->assertEqual($cTime,$originalCTime);
$this->instance->touch('/lorem.txt',100);
if($this->instance->touch('/lorem.txt',100)!==false){
$mTime=$this->instance->filemtime('/lorem.txt');
$this->assertEqual($mTime,100);
}
$mtimeStart=time();
$fh=$this->instance->fopen('/lorem.txt','a');
@ -171,4 +172,17 @@ abstract class Test_FileStorage extends UnitTestCase {
$this->assertTrue($mtimeStart<=$mTime);
$this->assertTrue($mTime<=$mtimeEnd);
}
public function testSearch(){
$textFile=OC::$SERVERROOT.'/tests/data/lorem.txt';
$this->instance->file_put_contents('/lorem.txt',file_get_contents($textFile,'r'));
$pngFile=OC::$SERVERROOT.'/tests/data/logo-wide.png';
$this->instance->file_put_contents('/logo-wide.png',file_get_contents($pngFile,'r'));
$svgFile=OC::$SERVERROOT.'/tests/data/logo-wide.svg';
$this->instance->file_put_contents('/logo-wide.svg',file_get_contents($svgFile,'r'));
$result=$this->instance->search('logo');
$this->assertEqual(2,count($result));
$this->assertNotIdentical(false,array_search('/logo-wide.svg',$result));
$this->assertNotIdentical(false,array_search('/logo-wide.png',$result));
}
}