open-dsi
/
nextcloud-server
mirror of https://github.com/nextcloud/server
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

add commands to copy/move files

Browse Source 
Signed-off-by: Robin Appelman <robin@icewind.nl>
pull/38366/head
Robin Appelman 2 years ago committed by Ferdinand Thiessen
parent 706c141fff
commit 38640bf816
5 changed files with 261 additions and 0 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 2
      apps/files/appinfo/info.xml
  2. 2
      apps/files/composer/composer/autoload_classmap.php
  3. 2
      apps/files/composer/composer/autoload_static.php
  4. 133
      apps/files/lib/Command/Copy.php
  5. 122
      apps/files/lib/Command/Move.php

2
apps/files/appinfo/info.xml
Unescape View File

@ -38,6 +38,8 @@
<command>OCA\Files\Command\Get</command>
<command>OCA\Files\Command\Put</command>
<command>OCA\Files\Command\Delete</command>
<command>OCA\Files\Command\Copy</command>
<command>OCA\Files\Command\Move</command>
<command>OCA\Files\Command\Object\Delete</command>
<command>OCA\Files\Command\Object\Get</command>
<command>OCA\Files\Command\Object\Put</command>

2
apps/files/composer/composer/autoload_classmap.php
Unescape View File

@ -27,9 +27,11 @@ return array(
'OCA\\Files\\Capabilities' => $baseDir . '/../lib/Capabilities.php',
'OCA\\Files\\Collaboration\\Resources\\Listener' => $baseDir . '/../lib/Collaboration/Resources/Listener.php',
'OCA\\Files\\Collaboration\\Resources\\ResourceProvider' => $baseDir . '/../lib/Collaboration/Resources/ResourceProvider.php',
'OCA\\Files\\Command\\Copy' => $baseDir . '/../lib/Command/Copy.php',
'OCA\\Files\\Command\\Delete' => $baseDir . '/../lib/Command/Delete.php',
'OCA\\Files\\Command\\DeleteOrphanedFiles' => $baseDir . '/../lib/Command/DeleteOrphanedFiles.php',
'OCA\\Files\\Command\\Get' => $baseDir . '/../lib/Command/Get.php',
'OCA\\Files\\Command\\Move' => $baseDir . '/../lib/Command/Move.php',
'OCA\\Files\\Command\\Object\\Delete' => $baseDir . '/../lib/Command/Object/Delete.php',
'OCA\\Files\\Command\\Object\\Get' => $baseDir . '/../lib/Command/Object/Get.php',
'OCA\\Files\\Command\\Object\\ObjectUtil' => $baseDir . '/../lib/Command/Object/ObjectUtil.php',

2
apps/files/composer/composer/autoload_static.php
Unescape View File

@ -42,9 +42,11 @@ class ComposerStaticInitFiles
'OCA\\Files\\Capabilities' => __DIR__ . '/..' . '/../lib/Capabilities.php',
'OCA\\Files\\Collaboration\\Resources\\Listener' => __DIR__ . '/..' . '/../lib/Collaboration/Resources/Listener.php',
'OCA\\Files\\Collaboration\\Resources\\ResourceProvider' => __DIR__ . '/..' . '/../lib/Collaboration/Resources/ResourceProvider.php',
'OCA\\Files\\Command\\Copy' => __DIR__ . '/..' . '/../lib/Command/Copy.php',
'OCA\\Files\\Command\\Delete' => __DIR__ . '/..' . '/../lib/Command/Delete.php',
'OCA\\Files\\Command\\DeleteOrphanedFiles' => __DIR__ . '/..' . '/../lib/Command/DeleteOrphanedFiles.php',
'OCA\\Files\\Command\\Get' => __DIR__ . '/..' . '/../lib/Command/Get.php',
'OCA\\Files\\Command\\Move' => __DIR__ . '/..' . '/../lib/Command/Move.php',
'OCA\\Files\\Command\\Object\\Delete' => __DIR__ . '/..' . '/../lib/Command/Object/Delete.php',
'OCA\\Files\\Command\\Object\\Get' => __DIR__ . '/..' . '/../lib/Command/Object/Get.php',
'OCA\\Files\\Command\\Object\\ObjectUtil' => __DIR__ . '/..' . '/../lib/Command/Object/ObjectUtil.php',

133
apps/files/lib/Command/Copy.php
Unescape View File

@ -0,0 +1,133 @@
<?php
declare(strict_types=1);
/**
* @copyright Copyright (c) 2023 Robin Appelman <robin@icewind.nl>
*
* @license GNU AGPL version 3 or any later version
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as
* published by the Free Software Foundation, either version 3 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/
namespace OCA\Files\Command;
use OC\Core\Command\Info\FileUtils;
use OCP\Files\Folder;
use OCP\Files\File;
use Symfony\Component\Console\Command\Command;
use Symfony\Component\Console\Helper\QuestionHelper;
use Symfony\Component\Console\Input\InputArgument;
use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Input\InputOption;
use Symfony\Component\Console\Output\OutputInterface;
use Symfony\Component\Console\Question\ConfirmationQuestion;
class Copy extends Command {
private FileUtils $fileUtils;
public function __construct(FileUtils $fileUtils) {
$this->fileUtils = $fileUtils;
parent::__construct();
}
protected function configure(): void {
$this
->setName('files:copy')
->setDescription('Copy a file or folder')
->addArgument('source', InputArgument::REQUIRED, "Source file id or path")
->addArgument('target', InputArgument::REQUIRED, "Target path")
->addOption('force', 'f', InputOption::VALUE_NONE, "Don't ask for confirmation and don't output any warnings")
->addOption('no-target-directory', 'T', InputOption::VALUE_NONE, "When target path is folder, overwrite the folder instead of copying into the folder");
}
public function execute(InputInterface $input, OutputInterface $output): int {
$sourceInput = $input->getArgument('source');
$targetInput = $input->getArgument('target');
$force = $input->getOption('force');
$noTargetDir = $input->getOption('no-target-directory');
$node = $this->fileUtils->getNode($sourceInput);
$targetNode = $this->fileUtils->getNode($targetInput);
if (!$node) {
$output->writeln("<error>file $sourceInput not found</error>");
return 1;
}
$targetParentPath = dirname(rtrim($targetInput, '/'));
$targetParent = $this->fileUtils->getNode($targetParentPath);
if (!$targetParent) {
$output->writeln("<error>Target parent path $targetParentPath doesn't exist</error>");
return 1;
}
$wouldRequireDelete = false;
if ($targetNode) {
if (!$targetNode->isUpdateable()) {
$output->writeln("<error>$targetInput isn't writable</error>");
return 1;
}
if ($targetNode instanceof Folder) {
if ($noTargetDir) {
if (!$force) {
$output->writeln("Warning: <info>$sourceInput</info> is a file, but <info>$targetInput</info> is a folder");
}
$wouldRequireDelete = true;
} else {
$targetInput = $targetNode->getFullPath($node->getName());
$targetNode = $this->fileUtils->getNode($targetInput);
}
} else {
if ($node instanceof Folder) {
if (!$force) {
$output->writeln("Warning: <info>$sourceInput</info> is a folder, but <info>$targetInput</info> is a file");
}
$wouldRequireDelete = true;
}
}
if ($wouldRequireDelete && $targetNode->getInternalPath() === '') {
$output->writeln("<error>Mount root can't be overwritten with a different type</error>");
return 1;
}
if ($wouldRequireDelete && !$targetNode->isDeletable()) {
$output->writeln("<error>$targetInput can't be deleted to be replaced with $sourceInput</error>");
return 1;
}
if (!$force && $targetNode) {
/** @var QuestionHelper $helper */
$helper = $this->getHelper('question');
$question = new ConfirmationQuestion("<info>" . $targetInput . "</info> already exists, overwrite? [y/N] ", false);
if (!$helper->ask($input, $output, $question)) {
return 1;
}
}
}
if ($wouldRequireDelete && $targetNode) {
$targetNode->delete();
}
$node->copy($targetInput);
return 0;
}
}

122
apps/files/lib/Command/Move.php
Unescape View File

@ -0,0 +1,122 @@
<?php
declare(strict_types=1);
/**
* @copyright Copyright (c) 2023 Robin Appelman <robin@icewind.nl>
*
* @license GNU AGPL version 3 or any later version
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as
* published by the Free Software Foundation, either version 3 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/
namespace OCA\Files\Command;
use OC\Core\Command\Info\FileUtils;
use OCP\Files\Folder;
use OCP\Files\File;
use Symfony\Component\Console\Command\Command;
use Symfony\Component\Console\Helper\QuestionHelper;
use Symfony\Component\Console\Input\InputArgument;
use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Input\InputOption;
use Symfony\Component\Console\Output\OutputInterface;
use Symfony\Component\Console\Question\ConfirmationQuestion;
class Move extends Command {
private FileUtils $fileUtils;
public function __construct(FileUtils $fileUtils) {
$this->fileUtils = $fileUtils;
parent::__construct();
}
protected function configure(): void {
$this
->setName('files:move')
->setDescription('Move a file or folder')
->addArgument('source', InputArgument::REQUIRED, "Source file id or path")
->addArgument('target', InputArgument::REQUIRED, "Target path")
->addOption('force', 'f', InputOption::VALUE_NONE, "Don't ask for configuration and don't output any warnings");
}
public function execute(InputInterface $input, OutputInterface $output): int {
$sourceInput = $input->getArgument('source');
$targetInput = $input->getArgument('target');
$force = $input->getOption('force');
$node = $this->fileUtils->getNode($sourceInput);
$targetNode = $this->fileUtils->getNode($targetInput);
if (!$node) {
$output->writeln("<error>file $sourceInput not found</error>");
return 1;
}
$targetParentPath = dirname(rtrim($targetInput, '/'));
$targetParent = $this->fileUtils->getNode($targetParentPath);
if (!$targetParent) {
$output->writeln("<error>Target parent path $targetParentPath doesn't exist</error>");
return 1;
}
$wouldRequireDelete = false;
if ($targetNode) {
if (!$targetNode->isUpdateable()) {
$output->writeln("<error>$targetInput already exists and isn't writable</error>");
return 1;
}
if ($node instanceof Folder && $targetNode instanceof File) {
$output->writeln("Warning: <info>$sourceInput</info> is a folder, but <info>$targetInput</info> is a file");
$wouldRequireDelete = true;
}
if ($node instanceof File && $targetNode instanceof Folder) {
$output->writeln("Warning: <info>$sourceInput</info> is a file, but <info>$targetInput</info> is a folder");
$wouldRequireDelete = true;
}
if ($wouldRequireDelete && $targetNode->getInternalPath() === '') {
$output->writeln("<error>Mount root can't be overwritten with a different type</error>");
return 1;
}
if ($wouldRequireDelete && !$targetNode->isDeletable()) {
$output->writeln("<error>$targetInput can't be deleted to be replaced with $sourceInput</error>");
return 1;
}
if (!$force) {
/** @var QuestionHelper $helper */
$helper = $this->getHelper('question');
$question = new ConfirmationQuestion("<info>" . $targetInput . "</info> already exists, overwrite? [y/N] ", false);
if (!$helper->ask($input, $output, $question)) {
return 1;
}
}
}
if ($wouldRequireDelete && $targetNode) {
$targetNode->delete();
}
$node->move($targetInput);
return 0;
}
}
Write Preview
Loading…
Cancel
Save