wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

improve file transfer code

Browse source 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
This commit is contained in:
Morris Jobke 2017-03-22 17:39:08 -06:00
parent f654f29532
commit fbf3bfa3ea
No known key found for this signature in database
GPG key ID: 9CE5ED29E7FCD38A
1 changed files with 15 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
apps/files/lib/Command/TransferOwnership.php
View file

@ -67,7 +67,7 @@ class TransferOwnership extends Command {
private $destinationUser;
/** @var string */
private $inputPath;
private $sourcePath;
/** @var string */
private $finalTarget;
@ -97,7 +97,8 @@ class TransferOwnership extends Command {
'path',
null,
InputOption::VALUE_REQUIRED,
'selectively provide the path to transfer. For example --path="folder_name"'
'selectively provide the path to transfer. For example --path="folder_name"',
''
);
}
@ -117,8 +118,8 @@ class TransferOwnership extends Command {
$this->sourceUser = $sourceUserObject->getUID();
$this->destinationUser = $destinationUserObject->getUID();
$this->inputPath = $input->getOption('path');
$this->inputPath = ltrim($this->inputPath, '/');
$sourcePathOption = ltrim($input->getOption('path'), '/');
$this->sourcePath = rtrim($this->sourceUser . '/files/' . $sourcePathOption, '/');
// target user has to be ready
if (!\OC::$server->getEncryptionManager()->isReadyForUser($this->destinationUser)) {
@ -133,15 +134,11 @@ class TransferOwnership extends Command {
Filesystem::initMountPoints($this->sourceUser);
Filesystem::initMountPoints($this->destinationUser);
if (strlen($this->inputPath) >= 1) {
$view = new View();
$unknownDir = $this->inputPath;
$this->inputPath = $this->sourceUser . "/files/" . $this->inputPath;
if (!$view->is_dir($this->inputPath)) {
$output->writeln("<error>Unknown path provided: $unknownDir</error>");
if (!$view->is_dir($this->sourcePath)) {
$output->writeln("<error>Unknown path provided: $sourcePathOption</error>");
return 1;
}
}
// analyse source folder
$this->analyse($output);
@ -177,14 +174,8 @@ class TransferOwnership extends Command {
$progress = new ProgressBar($output);
$progress->start();
$self = $this;
$walkPath = "$this->sourceUser/files";
if ( strlen($this->inputPath) > 0) {
if ($this->inputPath !== "$this->sourceUser/files") {
$walkPath = $this->inputPath;
}
}
$this->walkFiles($view, $walkPath,
$this->walkFiles($view, $this->sourcePath,
function (FileInfo $fileInfo) use ($progress, $self) {
if ($fileInfo->getType() === FileInfo::TYPE_FOLDER) {
// only analyze into folders from main storage,
@ -245,16 +236,14 @@ class TransferOwnership extends Command {
protected function transfer(OutputInterface $output) {
$view = new View();
$output->writeln("Transferring files to $this->finalTarget ...");
$sourcePath = (strlen($this->inputPath) > 0) ? $this->inputPath : "$this->sourceUser/files";
// This change will help user to transfer the folder specified using --path option.
// Else only the content inside folder is transferred which is not correct.
if (strlen($this->inputPath) > 0) {
if($this->inputPath !== ltrim("$this->sourceUser/files", '/')) {
if($this->sourcePath !== "$this->sourceUser/files") {
$view->mkdir($this->finalTarget);
$this->finalTarget = $this->finalTarget . '/' . basename($sourcePath);
$this->finalTarget = $this->finalTarget . '/' . basename($this->sourcePath);
}
}
$view->rename($sourcePath, $this->finalTarget);
$view->rename($this->sourcePath, $this->finalTarget);
if (!is_dir("$this->sourceUser/files")) {
// because the files folder is moved away we need to recreate it
$view->mkdir("$this->sourceUser/files");