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

use streams instead of temporary files for cross-storage copy and rename

This commit is contained in:
Robin Appelman 2012-02-05 20:49:32 +01:00
parent e2b4954176
commit e9af218562
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
lib/filesystemview.php
View File

@ -179,9 +179,13 @@ class OC_FilesystemView {
if($storage=$this->getStorage($path1)){ if($storage=$this->getStorage($path1)){
$result=$storage->rename($this->getInternalPath($path1),$this->getInternalPath($path2)); $result=$storage->rename($this->getInternalPath($path1),$this->getInternalPath($path2));
} }
}elseif($storage1=$this->getStorage($path1) and $storage2=$this->getStorage($path2)){ }else{
$tmpFile=$storage1->toTmpFile($this->getInternalPath($path1)); $source=$this->fopen($path1,'r');
$result=$storage2->fromTmpFile($tmpFile,$this->getInternalPath($path2)); $target=$this->fopen($path2,'w');
while (!feof($source)){
fwrite($target,fread($source,8192));
}
$storage1=$this->getStorage($path1);
$storage1->unlink($this->getInternalPath($path1)); $storage1->unlink($this->getInternalPath($path1));
} }
OC_Hook::emit( OC_Filesystem::CLASSNAME, OC_Filesystem::signal_post_rename, array( OC_Filesystem::signal_param_oldpath => $path1, OC_Filesystem::signal_param_newpath=>$path2)); OC_Hook::emit( OC_Filesystem::CLASSNAME, OC_Filesystem::signal_post_rename, array( OC_Filesystem::signal_param_oldpath => $path1, OC_Filesystem::signal_param_newpath=>$path2));
@ -207,9 +211,14 @@ class OC_FilesystemView {
if($storage=$this->getStorage($path1)){ if($storage=$this->getStorage($path1)){
$result=$storage->copy($this->getInternalPath($path1),$this->getInternalPath($path2)); $result=$storage->copy($this->getInternalPath($path1),$this->getInternalPath($path2));
} }
}elseif($storage1=$this->getStorage($path1) and $storage2=$this->getStorage($path2)){ }else{
$tmpFile=$storage1->toTmpFile($this->getInternalPath($path1)); $source=$this->fopen($path1,'r');
$result=$storage2->fromTmpFile($tmpFile,$this->getInternalPath($path2)); $target=$this->fopen($path2,'w');
if($target and $source){
while (!feof($source)){
fwrite($target,fread($source,8192));
}
}
} }
OC_Hook::emit( OC_Filesystem::CLASSNAME, OC_Filesystem::signal_post_copy, array( OC_Filesystem::signal_param_oldpath => $path1 , OC_Filesystem::signal_param_newpath=>$path2)); OC_Hook::emit( OC_Filesystem::CLASSNAME, OC_Filesystem::signal_post_copy, array( OC_Filesystem::signal_param_oldpath => $path1 , OC_Filesystem::signal_param_newpath=>$path2));
if(!$exists){ if(!$exists){