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

Merge pull request #3908 from owncloud/storage-folder-copy-rename 

Recursive copy and remove for local storage backends
This commit is contained in:
icewind1991 2014-05-29 13:29:24 +02:00
parent 368006c7af 467e9c2bb0
commit c0f02be50a
6 changed files with 290 additions and 116 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -7,6 +7,7 @@
*/
namespace OC\Files\Storage;
use OC\Files\Filesystem;
use OC\Files\Cache\Watcher;
/**
@ -36,6 +37,22 @@ abstract class Common implements \OC\Files\Storage\Storage {
public function __construct($parameters) {
}
/**
* Remove a file of folder
*
* @param string $path
* @return bool
*/
protected function remove($path) {
if ($this->is_dir($path)) {
return $this->rmdir($path);
} else if($this->is_file($path)) {
return $this->unlink($path);
} else {
return false;
}
}
public function is_dir($path) {
return $this->filetype($path) == 'dir';
}
@ -137,21 +154,34 @@ abstract class Common implements \OC\Files\Storage\Storage {
}
public function rename($path1, $path2) {
if ($this->copy($path1, $path2)) {
$this->remove($path2);
$this->removeCachedFile($path1);
return $this->unlink($path1);
} else {
return false;
}
return $this->copy($path1, $path2) and $this->remove($path1);
}
public function copy($path1, $path2) {
if ($this->is_dir($path1)) {
$this->remove($path2);
$dir = $this->opendir($path1);
$this->mkdir($path2);
while ($file = readdir($dir)) {
if (!Filesystem::isIgnoredDir($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($count, $result) = \OC_Helper::streamCopy($source, $target);
list(, $result) = \OC_Helper::streamCopy($source, $target);
$this->removeCachedFile($path2);
return $result;
}
}
public function getMimeType($path) {
if ($this->is_dir($path)) {

52
lib/private/files/storage/local.php
View File

@ -164,7 +164,14 @@ if (\OC_Util::runningOnWindows()) {
}
public function unlink($path) {
return $this->delTree($path);
if ($this->is_dir($path)) {
return $this->rmdir($path);
} else if ($this->is_file($path)) {
return unlink($this->datadir . $path);
} else {
return false;
}
}
public function rename($path1, $path2) {
@ -177,21 +184,22 @@ if (\OC_Util::runningOnWindows()) {
return false;
}
if ($return = rename($this->datadir . $path1, $this->datadir . $path2)) {
if ($this->is_dir($path2)) {
$this->rmdir($path2);
} else if ($this->is_file($path2)) {
$this->unlink($path2);
}
return $return;
return rename($this->datadir . $path1, $this->datadir . $path2);
}
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 ($this->is_dir($path1)) {
return parent::copy($path1, $path2);
} else {
return copy($this->datadir . $path1, $this->datadir . $path2);
}
}
public function fopen($path, $mode) {
if ($return = fopen($this->datadir . $path, $mode)) {
@ -212,30 +220,6 @@ if (\OC_Util::runningOnWindows()) {
return $return;
}
/**
* @param string $dir
*/
private function delTree($dir) {
$dirRelative = $dir;
$dir = $this->datadir . $dir;
if (!file_exists($dir)) return true;
if (!is_dir($dir) || is_link($dir)) return unlink($dir);
foreach (scandir($dir) as $item) {
if ($item == '.' || $item == '..') continue;
if (is_file($dir . '/' . $item)) {
if (unlink($dir . '/' . $item)) {
}
} elseif (is_dir($dir . '/' . $item)) {
if (!$this->delTree($dirRelative . "/" . $item)) {
return false;
};
}
}
if ($return = rmdir($dir)) {
}
return $return;
}
/**
* @param string $fullPath
*/

49
lib/private/files/storage/mappedlocal.php
View File

@ -22,17 +22,21 @@ class MappedLocal extends \OC\Files\Storage\Common{
$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), 0777, true);
}
public function rmdir($path) {
try {
$it = new \RecursiveIteratorIterator(
@ -68,6 +72,7 @@ class MappedLocal extends \OC\Files\Storage\Common{
return false;
}
}
public function opendir($path) {
$files = array('.', '..');
$physicalPath = $this->buildPath($path);
@ -91,15 +96,18 @@ class MappedLocal extends \OC\Files\Storage\Common{
\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);
@ -111,6 +119,7 @@ class MappedLocal extends \OC\Files\Storage\Common{
}
return $statResult;
}
public function filetype($path) {
$filetype = filetype($this->buildPath($path));
if ($filetype == 'link') {
@ -118,6 +127,7 @@ class MappedLocal extends \OC\Files\Storage\Common{
}
return $filetype;
}
public function filesize($path) {
if ($this->is_dir($path)) {
return 0;
@ -131,18 +141,23 @@ class MappedLocal extends \OC\Files\Storage\Common{
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.
@ -158,15 +173,19 @@ class MappedLocal extends \OC\Files\Storage\Common{
return $result;
}
public function file_get_contents($path) {
return file_get_contents($this->buildPath($path));
}
public function file_put_contents($path, $data) {
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);
@ -177,6 +196,12 @@ class MappedLocal extends \OC\Files\Storage\Common{
return false;
}
if ($this->is_dir($path2)) {
$this->rmdir($path2);
} else if ($this->is_file($path2)) {
$this->unlink($path2);
}
$physicPath1 = $this->buildPath($path1);
$physicPath2 = $this->buildPath($path2);
if ($return = rename($physicPath1, $physicPath2)) {
@ -186,20 +211,33 @@ class MappedLocal extends \OC\Files\Storage\Common{
}
return $return;
}
public function copy($path1, $path2) {
if ($this->is_dir($path1)) {
if ($this->is_dir($path2)) {
if(!$this->file_exists($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 (!\OC\Files\Filesystem::isIgnoredDir($file)) {
if (!$this->copy($path1 . '/' . $file, $path2 . '/' . $file)) {
return false;
}
$source=substr($path1, strrpos($path1, '/')+1);
$path2.=$source;
}
}
closedir($dir);
return true;
} else {
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) {
@ -296,9 +334,11 @@ class MappedLocal extends \OC\Files\Storage\Common{
public function search($query) {
return $this->searchInDir($query);
}
public function getLocalFile($path) {
return $this->buildPath($path);
}
public function getLocalFolder($path) {
return $this->buildPath($path);
}
@ -327,6 +367,7 @@ class MappedLocal extends \OC\Files\Storage\Common{
/**
* check if a file or folder has been updated since $time
*
* @param string $path
* @param int $time
* @return bool

2
lib/private/files/view.php
View File

@ -433,7 +433,7 @@ class View {
if ($this->is_dir($path1)) {
$result = $this->copy($path1, $path2);
if ($result === true) {
$result = $storage1->unlink($internalPath1);
$result = $storage1->rmdir($internalPath1);
}
} else {
$source = $this->fopen($path1 . $postFix1, 'r');

2
tests/lib/files/cache/scanner.php vendored
View File

@ -195,7 +195,7 @@ class Scanner extends \PHPUnit_Framework_TestCase {
$this->scanner->scan('');
$this->assertTrue($this->cache->inCache('folder/bar.txt'));
$this->storage->unlink('/folder');
$this->storage->rmdir('/folder');
$this->scanner->scan('', \OC\Files\Cache\Scanner::SCAN_SHALLOW);
$this->assertFalse($this->cache->inCache('folder'));
$this->assertFalse($this->cache->inCache('folder/bar.txt'));

119
tests/lib/files/storage/storage.php
View File

@ -345,4 +345,123 @@ abstract class Storage extends \PHPUnit_Framework_TestCase {
$this->assertEquals(array('test.txt'), $content);
}
public function testCopyOverWriteFile() {
$this->instance->file_put_contents('target.txt', 'foo');
$this->instance->file_put_contents('source.txt', 'bar');
$this->instance->copy('source.txt', 'target.txt');
$this->assertEquals('bar', $this->instance->file_get_contents('target.txt'));
}
public function testRenameOverWriteFile() {
$this->instance->file_put_contents('target.txt', 'foo');
$this->instance->file_put_contents('source.txt', 'bar');
$this->instance->rename('source.txt', 'target.txt');
$this->assertEquals('bar', $this->instance->file_get_contents('target.txt'));
$this->assertFalse($this->instance->file_exists('source.txt'));
}
public function testRenameDirectory() {
$this->instance->mkdir('source');
$this->instance->file_put_contents('source/test1.txt', 'foo');
$this->instance->file_put_contents('source/test2.txt', 'qwerty');
$this->instance->mkdir('source/subfolder');
$this->instance->file_put_contents('source/subfolder/test.txt', 'bar');
$this->instance->rename('source', 'target');
$this->assertFalse($this->instance->file_exists('source'));
$this->assertFalse($this->instance->file_exists('source/test1.txt'));
$this->assertFalse($this->instance->file_exists('source/test2.txt'));
$this->assertFalse($this->instance->file_exists('source/subfolder'));
$this->assertFalse($this->instance->file_exists('source/subfolder/test.txt'));
$this->assertTrue($this->instance->file_exists('target'));
$this->assertTrue($this->instance->file_exists('target/test1.txt'));
$this->assertTrue($this->instance->file_exists('target/test2.txt'));
$this->assertTrue($this->instance->file_exists('target/subfolder'));
$this->assertTrue($this->instance->file_exists('target/subfolder/test.txt'));
$this->assertEquals('foo', $this->instance->file_get_contents('target/test1.txt'));
$this->assertEquals('qwerty', $this->instance->file_get_contents('target/test2.txt'));
$this->assertEquals('bar', $this->instance->file_get_contents('target/subfolder/test.txt'));
}
public function testRenameOverWriteDirectory() {
$this->instance->mkdir('source');
$this->instance->file_put_contents('source/test1.txt', 'foo');
$this->instance->mkdir('target');
$this->instance->file_put_contents('target/test1.txt', 'bar');
$this->instance->file_put_contents('target/test2.txt', 'bar');
$this->instance->rename('source', 'target');
$this->assertFalse($this->instance->file_exists('source'));
$this->assertFalse($this->instance->file_exists('source/test1.txt'));
$this->assertFalse($this->instance->file_exists('target/test2.txt'));
$this->assertEquals('foo', $this->instance->file_get_contents('target/test1.txt'));
}
public function testRenameOverWriteDirectoryOverFile() {
$this->instance->mkdir('source');
$this->instance->file_put_contents('source/test1.txt', 'foo');
$this->instance->file_put_contents('target', 'bar');
$this->instance->rename('source', 'target');
$this->assertFalse($this->instance->file_exists('source'));
$this->assertFalse($this->instance->file_exists('source/test1.txt'));
$this->assertEquals('foo', $this->instance->file_get_contents('target/test1.txt'));
}
public function testCopyDirectory() {
$this->instance->mkdir('source');
$this->instance->file_put_contents('source/test1.txt', 'foo');
$this->instance->file_put_contents('source/test2.txt', 'qwerty');
$this->instance->mkdir('source/subfolder');
$this->instance->file_put_contents('source/subfolder/test.txt', 'bar');
$this->instance->copy('source', 'target');
$this->assertTrue($this->instance->file_exists('source'));
$this->assertTrue($this->instance->file_exists('source/test1.txt'));
$this->assertTrue($this->instance->file_exists('source/test2.txt'));
$this->assertTrue($this->instance->file_exists('source/subfolder'));
$this->assertTrue($this->instance->file_exists('source/subfolder/test.txt'));
$this->assertTrue($this->instance->file_exists('target'));
$this->assertTrue($this->instance->file_exists('target/test1.txt'));
$this->assertTrue($this->instance->file_exists('target/test2.txt'));
$this->assertTrue($this->instance->file_exists('target/subfolder'));
$this->assertTrue($this->instance->file_exists('target/subfolder/test.txt'));
$this->assertEquals('foo', $this->instance->file_get_contents('target/test1.txt'));
$this->assertEquals('qwerty', $this->instance->file_get_contents('target/test2.txt'));
$this->assertEquals('bar', $this->instance->file_get_contents('target/subfolder/test.txt'));
}
public function testCopyOverWriteDirectory() {
$this->instance->mkdir('source');
$this->instance->file_put_contents('source/test1.txt', 'foo');
$this->instance->mkdir('target');
$this->instance->file_put_contents('target/test1.txt', 'bar');
$this->instance->file_put_contents('target/test2.txt', 'bar');
$this->instance->copy('source', 'target');
$this->assertFalse($this->instance->file_exists('target/test2.txt'));
$this->assertEquals('foo', $this->instance->file_get_contents('target/test1.txt'));
}
public function testCopyOverWriteDirectoryOverFile() {
$this->instance->mkdir('source');
$this->instance->file_put_contents('source/test1.txt', 'foo');
$this->instance->file_put_contents('target', 'bar');
$this->instance->copy('source', 'target');
$this->assertEquals('foo', $this->instance->file_get_contents('target/test1.txt'));
}
}