From 29fd9ac6daf8054caacd1b2a69a75bfd483a88ff Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Fri, 28 Apr 2023 17:34:39 +0200 Subject: [PATCH] add command to write a file Signed-off-by: Robin Appelman --- apps/files/appinfo/info.xml | 1 + .../composer/composer/autoload_classmap.php | 1 + .../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 diff --git a/apps/files/appinfo/info.xml b/apps/files/appinfo/info.xml index 9c3e4351f42..340ad851d5c 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 a8621050615..86236b53cd0 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 8c99d674bce..1751499cb25 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; + } + +} -- 2.39.5