upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-11 09:42:09 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 40

minor fixes for get/put

Browse source 
Signed-off-by: Robin Appelman <robin@icewind.nl>
This commit is contained in:
Robin Appelman 2023-05-04 18:27:00 +02:00
parent 29fd9ac6da
commit 2f662bf561
No known key found for this signature in database
GPG key ID: 42B69D8A64526EFB
2 changed files with 19 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
apps/files/lib/Command/Get.php
View file

@ -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("<error>Failed to open $fileInput for reading</error>");
return 1;
}
$target = ($outputName === null || $outputName === '-') ? STDOUT : fopen($outputName, 'w');
if (!$target) {
$output->writeln("<error>Failed to open $outputName for reading</error>");
return 1;
}
stream_copy_to_stream($source, $target);
return 0;
} else {

10
apps/files/lib/Command/Put.php
View file

@ -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("<error>Failed to open $inputName</error>");
return 1;
}
if ($node instanceof File) {
$target = $node->fopen('w');
if (!$target) {
$output->writeln("<error>Failed to open $fileOutput</error>");
return 1;
}
stream_copy_to_stream($source, $target);
} else {
$this->rootFolder->newFile($fileOutput, $source);