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

fix recursive copy and rename for common storage backend

This commit is contained in:
Robin Appelman 2013-07-01 18:11:05 +02:00
parent c3c9612c99
commit ea44f0e20f
1 changed files with 38 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
lib/private/files/storage/common.php
View File

@ -137,20 +137,49 @@ abstract class Common implements \OC\Files\Storage\Storage {
}
public function rename($path1, $path2) {
if ($this->copy($path1, $path2)) {
$this->removeCachedFile($path1);
return $this->unlink($path1);
if ($this->file_exists($path2)) {
if ($this->is_dir($path2)) {
$this->rmdir($path2);
} else if ($this->is_file($path2)) {
$this->unlink($path2);
}
}
$this->removeCachedFile($path1);
if ($this->is_dir($path1)) {
return $this->copy($path1, $path2) and $this->rmdir($path1);
} else {
return false;
return $this->copy($path1, $path2) and $this->unlink($path1);
}
}
public function copy($path1, $path2) {
$source = $this->fopen($path1, 'r');
$target = $this->fopen($path2, 'w');
list($count, $result) = \OC_Helper::streamCopy($source, $target);
$this->removeCachedFile($path2);
return $result;
if ($this->is_dir($path1)) {
if ($this->file_exists($path2)) {
if ($this->is_dir($path2)) {
$this->rmdir($path2);
} else if ($this->is_file($path2)) {
$this->unlink($path2);
}
}
$dir = $this->opendir($path1);
$this->mkdir($path2);
while ($file = readdir($dir)) {
if (($file != '.') && ($file != '..')) {
if (!$this->copy($path1 . '/' . $file, $path2 . '/' . $file)) {
return false;
}
}
}
closedir($dir);
return true;
} else {
$source = $this->fopen($path1, 'r');
$target = $this->fopen($path2, 'w');
list(, $result) = \OC_Helper::streamCopy($source, $target);
$this->removeCachedFile($path2);
return $result;
}
}
public function getMimeType($path) {