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

Use moveFromStorage instead of streamCopy when restoring version

This commit is contained in:
Vincent Petry 2015-04-30 16:14:29 +02:00
parent 2228faaa39
commit 972e189605
1 changed files with 1 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
apps/files_versions/lib/storage.php
View File

@ -312,20 +312,7 @@ class Storage {
list($storage1, $internalPath1) = $view->resolvePath($path1); list($storage1, $internalPath1) = $view->resolvePath($path1);
list($storage2, $internalPath2) = $view->resolvePath($path2); list($storage2, $internalPath2) = $view->resolvePath($path2);
if ($storage1 === $storage2) { $result = $storage2->moveFromStorage($storage1, $internalPath1, $internalPath2);
return $storage1->rename($internalPath1, $internalPath2);
}
$source = $storage1->fopen($internalPath1, 'r');
$target = $storage2->fopen($internalPath2, 'w');
// FIXME: might need to use part file to avoid concurrent writes
// (this would be an issue anyway when renaming/restoring cross-storage)
list(, $result) = \OC_Helper::streamCopy($source, $target);
fclose($source);
fclose($target);
if ($result !== false) {
$storage1->unlink($internalPath1);
}
return ($result !== false); return ($result !== false);
} }