aboutsummaryrefslogtreecommitdiffstats
path: root/lib/files/storage
diff options
context:
space:
mode:
Diffstat (limited to 'lib/files/storage')
-rw-r--r--lib/files/storage/common.php261
-rw-r--r--lib/files/storage/local.php19
-rw-r--r--lib/files/storage/mappedlocal.php340
-rw-r--r--lib/files/storage/temporary.php1
4 files changed, 523 insertions, 98 deletions
diff --git a/lib/files/storage/common.php b/lib/files/storage/common.php
index 591803f0440..8aa227ec0b7 100644
--- a/lib/files/storage/common.php
+++ b/lib/files/storage/common.php
@@ -22,83 +22,104 @@ namespace OC\Files\Storage;
abstract class Common implements \OC\Files\Storage\Storage {
- public function __construct($parameters) {}
+ public function __construct($parameters) {
+ }
+
public function is_dir($path) {
- return $this->filetype($path)=='dir';
+ return $this->filetype($path) == 'dir';
}
+
public function is_file($path) {
- return $this->filetype($path)=='file';
+ return $this->filetype($path) == 'file';
}
+
public function filesize($path) {
- if($this->is_dir($path)) {
- return 0;//by definition
- }else{
+ if ($this->is_dir($path)) {
+ return 0; //by definition
+ } else {
$stat = $this->stat($path);
- return $stat['size'];
+ if (isset($stat['size'])) {
+ return $stat['size'];
+ } else {
+ return 0;
+ }
}
}
+
public function isCreatable($path) {
if ($this->is_dir($path) && $this->isUpdatable($path)) {
return true;
}
return false;
}
+
public function isDeletable($path) {
return $this->isUpdatable($path);
}
+
public function isSharable($path) {
return $this->isReadable($path);
}
- public function getPermissions($path){
+
+ public function getPermissions($path) {
$permissions = 0;
- if($this->isCreatable($path)){
+ if ($this->isCreatable($path)) {
$permissions |= \OCP\PERMISSION_CREATE;
}
- if($this->isReadable($path)){
+ if ($this->isReadable($path)) {
$permissions |= \OCP\PERMISSION_READ;
}
- if($this->isUpdatable($path)){
+ if ($this->isUpdatable($path)) {
$permissions |= \OCP\PERMISSION_UPDATE;
}
- if($this->isDeletable($path)){
+ if ($this->isDeletable($path)) {
$permissions |= \OCP\PERMISSION_DELETE;
}
- if($this->isSharable($path)){
+ if ($this->isSharable($path)) {
$permissions |= \OCP\PERMISSION_SHARE;
}
return $permissions;
}
+
public function filemtime($path) {
$stat = $this->stat($path);
- return $stat['mtime'];
+ if (isset($stat['mtime'])) {
+ return $stat['mtime'];
+ } else {
+ return 0;
+ }
}
+
public function file_get_contents($path) {
$handle = $this->fopen($path, "r");
- if(!$handle) {
+ if (!$handle) {
return false;
}
- $size=$this->filesize($path);
- if($size==0) {
+ $size = $this->filesize($path);
+ if ($size == 0) {
return '';
}
return fread($handle, $size);
}
- public function file_put_contents($path,$data) {
+
+ public function file_put_contents($path, $data) {
$handle = $this->fopen($path, "w");
return fwrite($handle, $data);
}
- public function rename($path1,$path2) {
- if($this->copy($path1,$path2)) {
+
+ public function rename($path1, $path2) {
+ if ($this->copy($path1, $path2)) {
return $this->unlink($path1);
- }else{
+ } else {
return false;
}
}
- public function copy($path1,$path2) {
- $source=$this->fopen($path1,'r');
- $target=$this->fopen($path2,'w');
- $count=\OC_Helper::streamCopy($source,$target);
- return $count>0;
+
+ public function copy($path1, $path2) {
+ $source = $this->fopen($path1, 'r');
+ $target = $this->fopen($path2, 'w');
+ list($count, $result) = \OC_Helper::streamCopy($source, $target);
+ return $result;
}
/**
@@ -110,117 +131,126 @@ abstract class Common implements \OC\Files\Storage\Storage {
* @note By default the directory specified by $directory will be
* deleted together with its contents. To avoid this set $empty to true
*/
- public function deleteAll( $directory, $empty = false ) {
- $directory = trim($directory,'/');
+ public function deleteAll($directory, $empty = false) {
+ $directory = trim($directory, '/');
- if ( !$this->file_exists( \OCP\USER::getUser() . '/' . $directory ) || !$this->is_dir( \OCP\USER::getUser() . '/' . $directory ) ) {
+ if (!$this->file_exists(\OCP\USER::getUser() . '/' . $directory)
+ || !$this->is_dir(\OCP\USER::getUser() . '/' . $directory)
+ ) {
return false;
- } elseif( !$this->isReadable( \OCP\USER::getUser() . '/' . $directory ) ) {
+ } elseif (!$this->isReadable(\OCP\USER::getUser() . '/' . $directory)) {
return false;
} else {
- $directoryHandle = $this->opendir( \OCP\USER::getUser() . '/' . $directory );
- while ( $contents = readdir( $directoryHandle ) ) {
- if ( $contents != '.' && $contents != '..') {
+ $directoryHandle = $this->opendir(\OCP\USER::getUser() . '/' . $directory);
+ while ($contents = readdir($directoryHandle)) {
+ if ($contents != '.' && $contents != '..') {
$path = $directory . "/" . $contents;
- if ( $this->is_dir( $path ) ) {
- $this->deleteAll( $path );
+ if ($this->is_dir($path)) {
+ $this->deleteAll($path);
} else {
- $this->unlink( \OCP\USER::getUser() .'/' . $path ); // TODO: make unlink use same system path as is_dir
+ $this->unlink(\OCP\USER::getUser() . '/' . $path); // TODO: make unlink use same system path as is_dir
}
}
}
//$this->closedir( $directoryHandle ); // TODO: implement closedir in OC_FSV
- if ( $empty == false ) {
- if ( !$this->rmdir( $directory ) ) {
- return false;
+ if ($empty == false) {
+ if (!$this->rmdir($directory)) {
+ return false;
}
}
return true;
}
}
+
public function getMimeType($path) {
- if(!$this->file_exists($path)) {
+ if (!$this->file_exists($path)) {
return false;
}
- if($this->is_dir($path)) {
+ if ($this->is_dir($path)) {
return 'httpd/unix-directory';
}
- $source=$this->fopen($path,'r');
- if(!$source) {
+ $source = $this->fopen($path, 'r');
+ if (!$source) {
return false;
}
- $head=fread($source,8192);//8kb should suffice to determine a mimetype
- if($pos=strrpos($path,'.')) {
- $extension=substr($path,$pos);
- }else{
- $extension='';
+ $head = fread($source, 8192); //8kb should suffice to determine a mimetype
+ if ($pos = strrpos($path, '.')) {
+ $extension = substr($path, $pos);
+ } else {
+ $extension = '';
}
- $tmpFile=\OC_Helper::tmpFile($extension);
- file_put_contents($tmpFile,$head);
- $mime=\OC_Helper::getMimeType($tmpFile);
+ $tmpFile = \OC_Helper::tmpFile($extension);
+ file_put_contents($tmpFile, $head);
+ $mime = \OC_Helper::getMimeType($tmpFile);
unlink($tmpFile);
return $mime;
}
- public function hash($type,$path,$raw = false) {
- $tmpFile=$this->getLocalFile($path);
- $hash=hash($type,$tmpFile,$raw);
+
+ public function hash($type, $path, $raw = false) {
+ $tmpFile = $this->getLocalFile($path);
+ $hash = hash($type, $tmpFile, $raw);
unlink($tmpFile);
return $hash;
}
+
public function search($query) {
return $this->searchInDir($query);
}
+
public function getLocalFile($path) {
return $this->toTmpFile($path);
}
- private function toTmpFile($path) {//no longer in the storage api, still useful here
- $source=$this->fopen($path,'r');
- if(!$source) {
+
+ private function toTmpFile($path) { //no longer in the storage api, still useful here
+ $source = $this->fopen($path, 'r');
+ if (!$source) {
return false;
}
- if($pos=strrpos($path,'.')) {
- $extension=substr($path,$pos);
- }else{
- $extension='';
+ if ($pos = strrpos($path, '.')) {
+ $extension = substr($path, $pos);
+ } else {
+ $extension = '';
}
- $tmpFile=\OC_Helper::tmpFile($extension);
- $target=fopen($tmpFile,'w');
- \OC_Helper::streamCopy($source,$target);
+ $tmpFile = \OC_Helper::tmpFile($extension);
+ $target = fopen($tmpFile, 'w');
+ \OC_Helper::streamCopy($source, $target);
return $tmpFile;
}
+
public function getLocalFolder($path) {
- $baseDir=\OC_Helper::tmpFolder();
- $this->addLocalFolder($path,$baseDir);
+ $baseDir = \OC_Helper::tmpFolder();
+ $this->addLocalFolder($path, $baseDir);
return $baseDir;
}
- private function addLocalFolder($path,$target) {
- if($dh=$this->opendir($path)) {
- while($file=readdir($dh)) {
- if($file!=='.' and $file!=='..') {
- if($this->is_dir($path.'/'.$file)) {
- mkdir($target.'/'.$file);
- $this->addLocalFolder($path.'/'.$file,$target.'/'.$file);
- }else{
- $tmp=$this->toTmpFile($path.'/'.$file);
- rename($tmp,$target.'/'.$file);
+
+ private function addLocalFolder($path, $target) {
+ if ($dh = $this->opendir($path)) {
+ while ($file = readdir($dh)) {
+ if ($file !== '.' and $file !== '..') {
+ if ($this->is_dir($path . '/' . $file)) {
+ mkdir($target . '/' . $file);
+ $this->addLocalFolder($path . '/' . $file, $target . '/' . $file);
+ } else {
+ $tmp = $this->toTmpFile($path . '/' . $file);
+ rename($tmp, $target . '/' . $file);
}
}
}
}
}
- protected function searchInDir($query,$dir='') {
- $files=array();
- $dh=$this->opendir($dir);
- if($dh) {
- while($item=readdir($dh)) {
+ 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 (strstr(strtolower($item), strtolower($query)) !== false) {
+ $files[] = $dir . '/' . $item;
}
- if($this->is_dir($dir.'/'.$item)) {
- $files=array_merge($files,$this->searchInDir($query,$dir.'/'.$item));
+ if ($this->is_dir($dir . '/' . $item)) {
+ $files = array_merge($files, $this->searchInDir($query, $dir . '/' . $item));
}
}
}
@@ -229,32 +259,34 @@ abstract class Common implements \OC\Files\Storage\Storage {
/**
* check if a file or folder has been updated since $time
+ *
* @param string $path
* @param int $time
* @return bool
*/
- public function hasUpdated($path,$time) {
- return $this->filemtime($path)>$time;
+ public function hasUpdated($path, $time) {
+ return $this->filemtime($path) > $time;
}
- public function getCache($path=''){
+ public function getCache($path = '') {
return new \OC\Files\Cache\Cache($this);
}
- public function getScanner($path=''){
+ public function getScanner($path = '') {
return new \OC\Files\Cache\Scanner($this);
}
- public function getPermissionsCache($path=''){
+ public function getPermissionsCache($path = '') {
return new \OC\Files\Cache\Permissions($this);
}
- public function getWatcher($path=''){
+ public function getWatcher($path = '') {
return new \OC\Files\Cache\Watcher($this);
}
/**
* get the owner of a path
+ *
* @param string $path The path to get the owner
* @return string uid or false
*/
@@ -268,13 +300,54 @@ abstract class Common implements \OC\Files\Storage\Storage {
* @param string $path
* @return string
*/
- public function getETag($path){
+ public function getETag($path) {
$ETagFunction = \OC_Connector_Sabre_Node::$ETagFunction;
- if($ETagFunction) {
+ if ($ETagFunction) {
$hash = call_user_func($ETagFunction, $path);
return $hash;
- }else{
+ } else {
return uniqid();
}
}
+
+ /**
+ * clean a path, i.e. remove all redundant '.' and '..'
+ * making sure that it can't point to higher than '/'
+ *
+ * @param $path The path to clean
+ * @return string cleaned path
+ */
+ public function cleanPath($path) {
+ if (strlen($path) == 0 or $path[0] != '/') {
+ $path = '/' . $path;
+ }
+
+ $output = array();
+ foreach (explode('/', $path) as $chunk) {
+ if ($chunk == '..') {
+ array_pop($output);
+ } else if ($chunk == '.') {
+ } else {
+ $output[] = $chunk;
+ }
+ }
+ return implode('/', $output);
+ }
+
+ public function test() {
+ if ($this->stat('')) {
+ return true;
+ }
+ return false;
+ }
+
+ /**
+ * get the free space in the storage
+ *
+ * @param $path
+ * return int
+ */
+ public function free_space($path) {
+ return \OC\Files\FREE_SPACE_UNKNOWN;
+ }
}
diff --git a/lib/files/storage/local.php b/lib/files/storage/local.php
index a5db4ba9194..da6597c8057 100644
--- a/lib/files/storage/local.php
+++ b/lib/files/storage/local.php
@@ -8,6 +8,12 @@
namespace OC\Files\Storage;
+if (\OC_Util::runningOnWindows()) {
+ class Local extends MappedLocal {
+
+ }
+} else {
+
/**
* for local filestore, we only have to map the paths
*/
@@ -19,6 +25,8 @@ class Local extends \OC\Files\Storage\Common{
$this->datadir.='/';
}
}
+ public function __destruct() {
+ }
public function getId(){
return 'local::'.$this->datadir;
}
@@ -32,7 +40,7 @@ class Local extends \OC\Files\Storage\Common{
return opendir($this->datadir.$path);
}
public function is_dir($path) {
- if(substr($path,-1)=='/') {
+ if(substr($path, -1)=='/') {
$path=substr($path, 0, -1);
}
return is_dir($this->datadir.$path);
@@ -109,11 +117,11 @@ class Local extends \OC\Files\Storage\Common{
}
public function rename($path1, $path2) {
if (!$this->isUpdatable($path1)) {
- \OC_Log::write('core','unable to rename, file is not writable : '.$path1,\OC_Log::ERROR);
+ \OC_Log::write('core', 'unable to rename, file is not writable : '.$path1, \OC_Log::ERROR);
return false;
}
if(! $this->file_exists($path1)) {
- \OC_Log::write('core','unable to rename, file does not exists : '.$path1,\OC_Log::ERROR);
+ \OC_Log::write('core', 'unable to rename, file does not exists : '.$path1, \OC_Log::ERROR);
return false;
}
@@ -197,7 +205,9 @@ class Local extends \OC\Files\Storage\Common{
return (float)exec('stat -c %s ' . escapeshellarg($fullPath));
}
} else {
- \OC_Log::write('core', 'Unable to determine file size of "'.$fullPath.'". Unknown OS: '.$name, \OC_Log::ERROR);
+ \OC_Log::write('core',
+ 'Unable to determine file size of "'.$fullPath.'". Unknown OS: '.$name,
+ \OC_Log::ERROR);
}
return 0;
@@ -245,3 +255,4 @@ class Local extends \OC\Files\Storage\Common{
return $this->filemtime($path)>$time;
}
}
+}
diff --git a/lib/files/storage/mappedlocal.php b/lib/files/storage/mappedlocal.php
new file mode 100644
index 00000000000..434c10bcbf7
--- /dev/null
+++ b/lib/files/storage/mappedlocal.php
@@ -0,0 +1,340 @@
+<?php
+/**
+ * Copyright (c) 2012 Robin Appelman <icewind@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+namespace OC\Files\Storage;
+
+/**
+ * for local filestore, we only have to map the paths
+ */
+class MappedLocal extends \OC\Files\Storage\Common{
+ protected $datadir;
+ private $mapper;
+
+ public function __construct($arguments) {
+ $this->datadir=$arguments['datadir'];
+ if(substr($this->datadir, -1)!=='/') {
+ $this->datadir.='/';
+ }
+
+ $this->mapper= new \OC\Files\Mapper($this->datadir);
+ }
+ public function __destruct() {
+ if (defined('PHPUNIT_RUN')) {
+ $this->mapper->removePath($this->datadir, true, true);
+ }
+ }
+ public function getId(){
+ return 'local::'.$this->datadir;
+ }
+ public function mkdir($path) {
+ return @mkdir($this->buildPath($path));
+ }
+ public function rmdir($path) {
+ if ($result = @rmdir($this->buildPath($path))) {
+ $this->cleanMapper($path);
+ }
+ return $result;
+ }
+ public function opendir($path) {
+ $files = array('.', '..');
+ $physicalPath= $this->buildPath($path);
+
+ $logicalPath = $this->mapper->physicalToLogic($physicalPath);
+ $dh = opendir($physicalPath);
+ while ($file = readdir($dh)) {
+ if ($file === '.' or $file === '..') {
+ continue;
+ }
+
+ $logicalFilePath = $this->mapper->physicalToLogic($physicalPath.DIRECTORY_SEPARATOR.$file);
+
+ $file= $this->mapper->stripRootFolder($logicalFilePath, $logicalPath);
+ $file = $this->stripLeading($file);
+ $files[]= $file;
+ }
+
+ \OC\Files\Stream\Dir::register('local-win32'.$path, $files);
+ return opendir('fakedir://local-win32'.$path);
+ }
+ public function is_dir($path) {
+ if(substr($path, -1)=='/') {
+ $path=substr($path, 0, -1);
+ }
+ return is_dir($this->buildPath($path));
+ }
+ public function is_file($path) {
+ return is_file($this->buildPath($path));
+ }
+ public function stat($path) {
+ $fullPath = $this->buildPath($path);
+ $statResult = stat($fullPath);
+
+ if ($statResult['size'] < 0) {
+ $size = self::getFileSizeFromOS($fullPath);
+ $statResult['size'] = $size;
+ $statResult[7] = $size;
+ }
+ return $statResult;
+ }
+ public function filetype($path) {
+ $filetype=filetype($this->buildPath($path));
+ if($filetype=='link') {
+ $filetype=filetype(realpath($this->buildPath($path)));
+ }
+ return $filetype;
+ }
+ public function filesize($path) {
+ if($this->is_dir($path)) {
+ return 0;
+ }else{
+ $fullPath = $this->buildPath($path);
+ $fileSize = filesize($fullPath);
+ if ($fileSize < 0) {
+ return self::getFileSizeFromOS($fullPath);
+ }
+
+ return $fileSize;
+ }
+ }
+ public function isReadable($path) {
+ return is_readable($this->buildPath($path));
+ }
+ public function isUpdatable($path) {
+ return is_writable($this->buildPath($path));
+ }
+ public function file_exists($path) {
+ return file_exists($this->buildPath($path));
+ }
+ public function filemtime($path) {
+ return filemtime($this->buildPath($path));
+ }
+ public function touch($path, $mtime=null) {
+ // sets the modification time of the file to the given value.
+ // If mtime is nil the current time is set.
+ // note that the access time of the file always changes to the current time.
+ if(!is_null($mtime)) {
+ $result=touch( $this->buildPath($path), $mtime );
+ }else{
+ $result=touch( $this->buildPath($path));
+ }
+ if( $result ) {
+ clearstatcache( true, $this->buildPath($path) );
+ }
+
+ return $result;
+ }
+ public function file_get_contents($path) {
+ return file_get_contents($this->buildPath($path));
+ }
+ public function file_put_contents($path, $data) {//trigger_error("$path = ".var_export($path, 1));
+ return file_put_contents($this->buildPath($path), $data);
+ }
+ public function unlink($path) {
+ return $this->delTree($path);
+ }
+ public function rename($path1, $path2) {
+ if (!$this->isUpdatable($path1)) {
+ \OC_Log::write('core', 'unable to rename, file is not writable : '.$path1, \OC_Log::ERROR);
+ return false;
+ }
+ if(! $this->file_exists($path1)) {
+ \OC_Log::write('core', 'unable to rename, file does not exists : '.$path1, \OC_Log::ERROR);
+ return false;
+ }
+
+ $physicPath1 = $this->buildPath($path1);
+ $physicPath2 = $this->buildPath($path2);
+ if($return=rename($physicPath1, $physicPath2)) {
+ // mapper needs to create copies or all children
+ $this->copyMapping($path1, $path2);
+ $this->cleanMapper($physicPath1, false, true);
+ }
+ return $return;
+ }
+ public function copy($path1, $path2) {
+ if($this->is_dir($path2)) {
+ if(!$this->file_exists($path2)) {
+ $this->mkdir($path2);
+ }
+ $source=substr($path1, strrpos($path1, '/')+1);
+ $path2.=$source;
+ }
+ if($return=copy($this->buildPath($path1), $this->buildPath($path2))) {
+ // mapper needs to create copies or all children
+ $this->copyMapping($path1, $path2);
+ }
+ return $return;
+ }
+ public function fopen($path, $mode) {
+ if($return=fopen($this->buildPath($path), $mode)) {
+ switch($mode) {
+ case 'r':
+ break;
+ case 'r+':
+ case 'w+':
+ case 'x+':
+ case 'a+':
+ break;
+ case 'w':
+ case 'x':
+ case 'a':
+ break;
+ }
+ }
+ return $return;
+ }
+
+ public function getMimeType($path) {
+ if($this->isReadable($path)) {
+ return \OC_Helper::getMimeType($this->buildPath($path));
+ }else{
+ return false;
+ }
+ }
+
+ private function delTree($dir, $isLogicPath=true) {
+ $dirRelative=$dir;
+ if ($isLogicPath) {
+ $dir=$this->buildPath($dir);
+ }
+ if (!file_exists($dir)) {
+ return true;
+ }
+ if (!is_dir($dir) || is_link($dir)) {
+ if($return=unlink($dir)) {
+ $this->cleanMapper($dir, false);
+ return $return;
+ }
+ }
+ foreach (scandir($dir) as $item) {
+ if ($item == '.' || $item == '..') {
+ continue;
+ }
+ if(is_file($dir.'/'.$item)) {
+ if(unlink($dir.'/'.$item)) {
+ $this->cleanMapper($dir.'/'.$item, false);
+ }
+ }elseif(is_dir($dir.'/'.$item)) {
+ if (!$this->delTree($dir. "/" . $item, false)) {
+ return false;
+ };
+ }
+ }
+ if($return=rmdir($dir)) {
+ $this->cleanMapper($dir, false);
+ }
+ return $return;
+ }
+
+ private static function getFileSizeFromOS($fullPath) {
+ $name = strtolower(php_uname('s'));
+ // Windows OS: we use COM to access the filesystem
+ if (strpos($name, 'win') !== false) {
+ if (class_exists('COM')) {
+ $fsobj = new \COM("Scripting.FileSystemObject");
+ $f = $fsobj->GetFile($fullPath);
+ return $f->Size;
+ }
+ } else if (strpos($name, 'bsd') !== false) {
+ if (\OC_Helper::is_function_enabled('exec')) {
+ return (float)exec('stat -f %z ' . escapeshellarg($fullPath));
+ }
+ } else if (strpos($name, 'linux') !== false) {
+ if (\OC_Helper::is_function_enabled('exec')) {
+ return (float)exec('stat -c %s ' . escapeshellarg($fullPath));
+ }
+ } else {
+ \OC_Log::write('core',
+ 'Unable to determine file size of "'.$fullPath.'". Unknown OS: '.$name,
+ \OC_Log::ERROR);
+ }
+
+ return 0;
+ }
+
+ public function hash($path, $type, $raw=false) {
+ return hash_file($type, $this->buildPath($path), $raw);
+ }
+
+ public function free_space($path) {
+ return @disk_free_space($this->buildPath($path));
+ }
+
+ public function search($query) {
+ return $this->searchInDir($query);
+ }
+ public function getLocalFile($path) {
+ return $this->buildPath($path);
+ }
+ public function getLocalFolder($path) {
+ return $this->buildPath($path);
+ }
+
+ protected function searchInDir($query, $dir='') {
+ $files=array();
+ $physicalDir = $this->buildPath($dir);
+ foreach (scandir($physicalDir) as $item) {
+ if ($item == '.' || $item == '..')
+ continue;
+ $physicalItem = $this->mapper->physicalToLogic($physicalDir.DIRECTORY_SEPARATOR.$item);
+ $item = substr($physicalItem, strlen($physicalDir)+1);
+
+ if(strstr(strtolower($item), strtolower($query)) !== false) {
+ $files[]=$dir.'/'.$item;
+ }
+ if(is_dir($physicalItem)) {
+ $files=array_merge($files, $this->searchInDir($query, $dir.'/'.$item));
+ }
+ }
+ return $files;
+ }
+
+ /**
+ * check if a file or folder has been updated since $time
+ * @param string $path
+ * @param int $time
+ * @return bool
+ */
+ public function hasUpdated($path, $time) {
+ return $this->filemtime($path)>$time;
+ }
+
+ private function buildPath($path, $create=true) {
+ $path = $this->stripLeading($path);
+ $fullPath = $this->datadir.$path;
+ return $this->mapper->logicToPhysical($fullPath, $create);
+ }
+
+ private function cleanMapper($path, $isLogicPath=true, $recursive=true) {
+ $fullPath = $path;
+ if ($isLogicPath) {
+ $fullPath = $this->datadir.$path;
+ }
+ $this->mapper->removePath($fullPath, $isLogicPath, $recursive);
+ }
+
+ private function copyMapping($path1, $path2) {
+ $path1 = $this->stripLeading($path1);
+ $path2 = $this->stripLeading($path2);
+
+ $fullPath1 = $this->datadir.$path1;
+ $fullPath2 = $this->datadir.$path2;
+
+ $this->mapper->copy($fullPath1, $fullPath2);
+ }
+
+ private function stripLeading($path) {
+ if(strpos($path, '/') === 0) {
+ $path = substr($path, 1);
+ }
+ if ($path === false) {
+ return '';
+ }
+
+ return $path;
+ }
+}
diff --git a/lib/files/storage/temporary.php b/lib/files/storage/temporary.php
index 542d2cd9f48..d84dbda2e39 100644
--- a/lib/files/storage/temporary.php
+++ b/lib/files/storage/temporary.php
@@ -21,6 +21,7 @@ class Temporary extends Local{
}
public function __destruct() {
+ parent::__destruct();
$this->cleanUp();
}
}
generated by cgit v1.2.3 (git 2.39.1) at 2025-06-07 13:48:12 +0000