From f9fb102f0b21ba4c7014b2594b986b71a6a9495e Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Fri, 28 Apr 2023 17:13:20 +0200 Subject: move get/delete commands to files namespace, make get take the output as argument instead of option Signed-off-by: Robin Appelman --- apps/files/appinfo/info.xml | 2 + apps/files/composer/composer/autoload_classmap.php | 2 + apps/files/composer/composer/autoload_static.php | 2 + apps/files/lib/Command/Delete.php | 116 +++++++++++++++++++++ apps/files/lib/Command/Get.php | 80 ++++++++++++++ 5 files changed, 202 insertions(+) create mode 100644 apps/files/lib/Command/Delete.php create mode 100644 apps/files/lib/Command/Get.php (limited to 'apps') diff --git a/apps/files/appinfo/info.xml b/apps/files/appinfo/info.xml index 985a26f6611..77e90a9cbb4 100644 --- a/apps/files/appinfo/info.xml +++ b/apps/files/appinfo/info.xml @@ -35,6 +35,8 @@ OCA\Files\Command\TransferOwnership OCA\Files\Command\ScanAppData OCA\Files\Command\RepairTree + OCA\Files\Command\Get + OCA\Files\Command\Delete diff --git a/apps/files/composer/composer/autoload_classmap.php b/apps/files/composer/composer/autoload_classmap.php index 868014ecfe7..686f1b6cd5e 100644 --- a/apps/files/composer/composer/autoload_classmap.php +++ b/apps/files/composer/composer/autoload_classmap.php @@ -27,7 +27,9 @@ 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\\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\\RepairTree' => $baseDir . '/../lib/Command/RepairTree.php', 'OCA\\Files\\Command\\Scan' => $baseDir . '/../lib/Command/Scan.php', 'OCA\\Files\\Command\\ScanAppData' => $baseDir . '/../lib/Command/ScanAppData.php', diff --git a/apps/files/composer/composer/autoload_static.php b/apps/files/composer/composer/autoload_static.php index 0946a5c39c2..5ce8d048b38 100644 --- a/apps/files/composer/composer/autoload_static.php +++ b/apps/files/composer/composer/autoload_static.php @@ -42,7 +42,9 @@ 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\\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\\RepairTree' => __DIR__ . '/..' . '/../lib/Command/RepairTree.php', 'OCA\\Files\\Command\\Scan' => __DIR__ . '/..' . '/../lib/Command/Scan.php', 'OCA\\Files\\Command\\ScanAppData' => __DIR__ . '/..' . '/../lib/Command/ScanAppData.php', diff --git a/apps/files/lib/Command/Delete.php b/apps/files/lib/Command/Delete.php new file mode 100644 index 00000000000..c05fa573ab3 --- /dev/null +++ b/apps/files/lib/Command/Delete.php @@ -0,0 +1,116 @@ + + * + * @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 . + * + */ + +namespace OCA\Files\Command; + +use OC\Core\Command\Info\FileUtils; +use OCA\Files_Sharing\SharedStorage; +use OCP\Files\Folder; +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 Delete extends Command { + private FileUtils $fileUtils; + + public function __construct(FileUtils $fileUtils) { + $this->fileUtils = $fileUtils; + parent::__construct(); + } + + protected function configure(): void { + $this + ->setName('files:delete') + ->setDescription('Delete a file or folder') + ->addArgument('file', InputArgument::REQUIRED, "File id or 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 { + $fileInput = $input->getArgument('file'); + $inputIsId = is_numeric($fileInput); + $force = $input->getOption('force'); + $node = $this->fileUtils->getNode($fileInput); + + if (!$node) { + $output->writeln("file $fileInput not found"); + return 1; + } + + $deleteConfirmed = $force; + if (!$deleteConfirmed) { + /** @var QuestionHelper $helper */ + $helper = $this->getHelper('question'); + $storage = $node->getStorage(); + if (!$inputIsId && $storage->instanceOfStorage(SharedStorage::class) && $node->getInternalPath() === '') { + /** @var SharedStorage $storage */ + [,$user] = explode('/', $fileInput, 3); + $question = new ConfirmationQuestion("$fileInput in a shared file, do you want to unshare the file $user instead of deleting the source file? [Y/n] ", true); + if ($helper->ask($input, $output, $question)) { + $storage->unshareStorage(); + return 0; + } else { + $node = $storage->getShare()->getNode(); + $output->writeln(""); + } + } + + $filesByUsers = $this->fileUtils->getFilesByUser($node); + if (count($filesByUsers) > 1) { + $output->writeln("Warning: the provided file is accessible by more than one user"); + $output->writeln(" all of the following users will lose access to the file when deleted:"); + $output->writeln(""); + foreach ($filesByUsers as $user => $filesByUser) { + $output->writeln($user . ":"); + foreach($filesByUser as $file) { + $output->writeln(" - " . $file->getPath()); + } + } + $output->writeln(""); + } + + if ($node instanceof Folder) { + $maybeContents = " and all it's contents"; + } else { + $maybeContents = ""; + } + $question = new ConfirmationQuestion("Delete " . $node->getPath() . $maybeContents . "? [y/N] ", false); + $deleteConfirmed = $helper->ask($input, $output, $question); + } + + if ($deleteConfirmed) { + if ($node->isDeletable()) { + $node->delete(); + } else { + $output->writeln("File cannot be deleted, insufficient permissions."); + } + } + + return 0; + } + +} diff --git a/apps/files/lib/Command/Get.php b/apps/files/lib/Command/Get.php new file mode 100644 index 00000000000..2b6c43d792f --- /dev/null +++ b/apps/files/lib/Command/Get.php @@ -0,0 +1,80 @@ + + * + * @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 . + * + */ + +namespace OCA\Files\Command; + + +use OC\Core\Command\Info\FileUtils; +use OCP\Files\File; +use Symfony\Component\Console\Command\Command; +use Symfony\Component\Console\Input\InputArgument; +use Symfony\Component\Console\Input\InputInterface; +use Symfony\Component\Console\Output\OutputInterface; + +class Get extends Command { + private FileUtils $fileUtils; + + public function __construct(FileUtils $fileUtils) { + $this->fileUtils = $fileUtils; + parent::__construct(); + } + + protected function configure(): void { + $this + ->setName('files:get') + ->setDescription('Get the contents of a file') + ->addArgument('file', InputArgument::REQUIRED, "File id or path") + ->addArgument('output', InputArgument::OPTIONAL, "Target file to output to, defaults to STDOUT"); + } + + public function execute(InputInterface $input, OutputInterface $output): int { + $fileInput = $input->getArgument('file'); + $outputName = $input->getArgument('output'); + $node = $this->fileUtils->getNode($fileInput); + + if (!$node) { + $output->writeln("file $fileInput not found"); + return 1; + } + + if ($node instanceof File) { + $isTTY = stream_isatty(STDOUT); + if ($outputName === null && $isTTY && $node->getMimePart() !== 'text') { + $output->writeln([ + "Warning: Binary output can mess up your terminal", + " Use occ files:get $fileInput - to output it to the terminal anyway", + " Or occ files:get $fileInput to save to a file instead" + ]); + return 1; + } + $source = $node->fopen('r'); + $target = (!$outputName || strtolower($outputName) === '-') ? STDOUT : fopen($outputName, 'w'); + stream_copy_to_stream($source, $target); + return 0; + } else { + $output->writeln("$fileInput is a directory"); + return 1; + } + } + +} -- cgit v1.2.3 From 36221a88650d5a09ffd7e1a81e9e9f62bd2a96ff Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Fri, 28 Apr 2023 17:34:39 +0200 Subject: add command to write a file Signed-off-by: Robin Appelman --- apps/files/appinfo/info.xml | 1 + apps/files/composer/composer/autoload_classmap.php | 1 + apps/files/composer/composer/autoload_static.php | 1 + apps/files/lib/Command/Delete.php | 2 +- apps/files/lib/Command/Get.php | 2 +- apps/files/lib/Command/Put.php | 82 ++++++++++++++++++++++ 6 files changed, 87 insertions(+), 2 deletions(-) create mode 100644 apps/files/lib/Command/Put.php (limited to 'apps') diff --git a/apps/files/appinfo/info.xml b/apps/files/appinfo/info.xml index 77e90a9cbb4..5d9e630704d 100644 --- a/apps/files/appinfo/info.xml +++ b/apps/files/appinfo/info.xml @@ -36,6 +36,7 @@ OCA\Files\Command\ScanAppData OCA\Files\Command\RepairTree OCA\Files\Command\Get + OCA\Files\Command\Put OCA\Files\Command\Delete diff --git a/apps/files/composer/composer/autoload_classmap.php b/apps/files/composer/composer/autoload_classmap.php index 686f1b6cd5e..2f99d4a88de 100644 --- a/apps/files/composer/composer/autoload_classmap.php +++ b/apps/files/composer/composer/autoload_classmap.php @@ -30,6 +30,7 @@ return array( '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\\Put' => $baseDir . '/../lib/Command/Put.php', 'OCA\\Files\\Command\\RepairTree' => $baseDir . '/../lib/Command/RepairTree.php', 'OCA\\Files\\Command\\Scan' => $baseDir . '/../lib/Command/Scan.php', 'OCA\\Files\\Command\\ScanAppData' => $baseDir . '/../lib/Command/ScanAppData.php', diff --git a/apps/files/composer/composer/autoload_static.php b/apps/files/composer/composer/autoload_static.php index 5ce8d048b38..e7b822e386d 100644 --- a/apps/files/composer/composer/autoload_static.php +++ b/apps/files/composer/composer/autoload_static.php @@ -45,6 +45,7 @@ class ComposerStaticInitFiles '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\\Put' => __DIR__ . '/..' . '/../lib/Command/Put.php', 'OCA\\Files\\Command\\RepairTree' => __DIR__ . '/..' . '/../lib/Command/RepairTree.php', 'OCA\\Files\\Command\\Scan' => __DIR__ . '/..' . '/../lib/Command/Scan.php', 'OCA\\Files\\Command\\ScanAppData' => __DIR__ . '/..' . '/../lib/Command/ScanAppData.php', diff --git a/apps/files/lib/Command/Delete.php b/apps/files/lib/Command/Delete.php index c05fa573ab3..da535568702 100644 --- a/apps/files/lib/Command/Delete.php +++ b/apps/files/lib/Command/Delete.php @@ -69,7 +69,7 @@ class Delete extends Command { if (!$inputIsId && $storage->instanceOfStorage(SharedStorage::class) && $node->getInternalPath() === '') { /** @var SharedStorage $storage */ [,$user] = explode('/', $fileInput, 3); - $question = new ConfirmationQuestion("$fileInput in a shared file, do you want to unshare the file $user instead of deleting the source file? [Y/n] ", true); + $question = new ConfirmationQuestion("$fileInput in a shared file, do you want to unshare the file from $user instead of deleting the source file? [Y/n] ", true); if ($helper->ask($input, $output, $question)) { $storage->unshareStorage(); return 0; diff --git a/apps/files/lib/Command/Get.php b/apps/files/lib/Command/Get.php index 2b6c43d792f..29edefa1cfb 100644 --- a/apps/files/lib/Command/Get.php +++ b/apps/files/lib/Command/Get.php @@ -68,7 +68,7 @@ class Get extends Command { return 1; } $source = $node->fopen('r'); - $target = (!$outputName || strtolower($outputName) === '-') ? STDOUT : fopen($outputName, 'w'); + $target = (!$outputName || $outputName === '-') ? STDOUT : fopen($outputName, 'w'); stream_copy_to_stream($source, $target); return 0; } else { diff --git a/apps/files/lib/Command/Put.php b/apps/files/lib/Command/Put.php new file mode 100644 index 00000000000..da24bbcbd00 --- /dev/null +++ b/apps/files/lib/Command/Put.php @@ -0,0 +1,82 @@ + + * + * @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 . + * + */ + +namespace OCA\Files\Command; + + +use OC\Core\Command\Info\FileUtils; +use OCP\Files\File; +use OCP\Files\Folder; +use OCP\Files\IRootFolder; +use Symfony\Component\Console\Command\Command; +use Symfony\Component\Console\Input\InputArgument; +use Symfony\Component\Console\Input\InputInterface; +use Symfony\Component\Console\Output\OutputInterface; + +class Put extends Command { + private FileUtils $fileUtils; + private IRootFolder $rootFolder; + + public function __construct(FileUtils $fileUtils, IRootFolder $rootFolder) { + $this->fileUtils = $fileUtils; + $this->rootFolder = $rootFolder; + parent::__construct(); + } + + protected function configure(): void { + $this + ->setName('files:put') + ->setDescription('Write contents of a file') + ->addArgument('input', InputArgument::REQUIRED, "Source file to write, use - to read from STDIN") + ->addArgument('file', InputArgument::REQUIRED, "File path to write to or fileid of existing file"); + } + + public function execute(InputInterface $input, OutputInterface $output): int { + $fileOutput = $input->getArgument('file'); + $inputName = $input->getArgument('input'); + $node = $this->fileUtils->getNode($fileOutput); + + if ($node instanceof Folder) { + $output->writeln("$fileOutput is a folder"); + return 1; + } + if (!$node and is_numeric($fileOutput)) { + $output->writeln("$fileOutput not found"); + return 1; + } + + $source = (!$inputName || $inputName === '-') ? STDIN : fopen($inputName, 'r'); + if (!$source) { + $output->writeln("Failed to open $inputName"); + return 1; + } + if ($node instanceof File) { + $target = $node->fopen('w'); + stream_copy_to_stream($source, $target); + } else { + $this->rootFolder->newFile($fileOutput, $source); + } + return 0; + } + +} -- cgit v1.2.3 From ddc53a9046909b16d551be0bf582dbde6c32745e Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Thu, 4 May 2023 18:27:00 +0200 Subject: minor fixes for get/put Signed-off-by: Robin Appelman --- apps/files/lib/Command/Get.php | 15 ++++++++++++--- apps/files/lib/Command/Put.php | 10 +++++++--- 2 files changed, 19 insertions(+), 6 deletions(-) (limited to 'apps') diff --git a/apps/files/lib/Command/Get.php b/apps/files/lib/Command/Get.php index 29edefa1cfb..7bdb4cb59ee 100644 --- a/apps/files/lib/Command/Get.php +++ b/apps/files/lib/Command/Get.php @@ -43,8 +43,8 @@ class Get extends Command { $this ->setName('files:get') ->setDescription('Get the contents of a file') - ->addArgument('file', InputArgument::REQUIRED, "File id or path") - ->addArgument('output', InputArgument::OPTIONAL, "Target file to output to, defaults to STDOUT"); + ->addArgument('file', InputArgument::REQUIRED, "Source file id or Nextcloud path") + ->addArgument('output', InputArgument::OPTIONAL, "Target local file to output to, defaults to STDOUT"); } public function execute(InputInterface $input, OutputInterface $output): int { @@ -68,7 +68,16 @@ class Get extends Command { return 1; } $source = $node->fopen('r'); - $target = (!$outputName || $outputName === '-') ? STDOUT : fopen($outputName, 'w'); + if (!$source) { + $output->writeln("Failed to open $fileInput for reading"); + return 1; + } + $target = ($outputName === null || $outputName === '-') ? STDOUT : fopen($outputName, 'w'); + if (!$target) { + $output->writeln("Failed to open $outputName for reading"); + return 1; + } + stream_copy_to_stream($source, $target); return 0; } else { diff --git a/apps/files/lib/Command/Put.php b/apps/files/lib/Command/Put.php index da24bbcbd00..f89ab8fb436 100644 --- a/apps/files/lib/Command/Put.php +++ b/apps/files/lib/Command/Put.php @@ -47,8 +47,8 @@ class Put extends Command { $this ->setName('files:put') ->setDescription('Write contents of a file') - ->addArgument('input', InputArgument::REQUIRED, "Source file to write, use - to read from STDIN") - ->addArgument('file', InputArgument::REQUIRED, "File path to write to or fileid of existing file"); + ->addArgument('input', InputArgument::REQUIRED, "Source local path, use - to read from STDIN") + ->addArgument('file', InputArgument::REQUIRED, "Target Nextcloud file path to write to or fileid of existing file"); } public function execute(InputInterface $input, OutputInterface $output): int { @@ -65,13 +65,17 @@ class Put extends Command { return 1; } - $source = (!$inputName || $inputName === '-') ? STDIN : fopen($inputName, 'r'); + $source = ($inputName === null || $inputName === '-') ? STDIN : fopen($inputName, 'r'); if (!$source) { $output->writeln("Failed to open $inputName"); return 1; } if ($node instanceof File) { $target = $node->fopen('w'); + if (!$target) { + $output->writeln("Failed to open $fileOutput"); + return 1; + } stream_copy_to_stream($source, $target); } else { $this->rootFolder->newFile($fileOutput, $source); -- cgit v1.2.3