Use symfony console table to render the job list properly

Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>

diff --git a/core/Command/Background/ListCommand.php b/core/Command/Background/ListCommand.php
index 0bbf01d76db06507374e2bb4478c417232706e0a..d29ac38a7bf0dc830fd578ec31e149173c236db1 100644 (file)
--- a/core/Command/Background/ListCommand.php
+++ b/core/Command/Background/ListCommand.php
@@ -68,7 +68,7 @@ class ListCommand extends Base {
 
        protected function execute(InputInterface $input, OutputInterface $output): int {
                $jobs = $this->jobList->getJobs($input->getOption('class'), (int)$input->getOption('limit'), (int)$input->getOption('offset'));
-               $this->writeArrayInOutputFormat($input, $output, $this->formatJobs($jobs));
+               $this->writeTableInOutputFormat($input, $output, $this->formatJobs($jobs));
                return 0;
        }
 

diff --git a/core/Command/Base.php b/core/Command/Base.php
index d228e362447235050b5e35d2011472c7147950f4..abf9f95773a59d5555570f5faf22fd1b6bec50bc 100644 (file)
--- a/core/Command/Base.php
+++ b/core/Command/Base.php
@@ -26,9 +26,10 @@
 namespace OC\Core\Command;
 
 use OC\Core\Command\User\ListCommand;
-use Stecman\Component\Symfony\Console\BashCompletion\Completion\CompletionAwareInterface;
 use Stecman\Component\Symfony\Console\BashCompletion\CompletionContext;
+use Stecman\Component\Symfony\Console\BashCompletion\Completion\CompletionAwareInterface;
 use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Helper\Table;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
@@ -54,7 +55,7 @@ class Base extends Command implements CompletionAwareInterface {
                ;
        }
 
-       protected function writeArrayInOutputFormat(InputInterface $input, OutputInterface $output, array $items, string $prefix = '  - ') {
+       protected function writeArrayInOutputFormat(InputInterface $input, OutputInterface $output, array $items, string $prefix = '  - '): void {
                switch ($input->getOption('output')) {
                        case self::OUTPUT_FORMAT_JSON:
                                $output->writeln(json_encode($items));
@@ -84,6 +85,26 @@ class Base extends Command implements CompletionAwareInterface {
                }
        }
 
+       protected function writeTableInOutputFormat(InputInterface $input, OutputInterface $output, array $items): void {
+               switch ($input->getOption('output')) {
+                       case self::OUTPUT_FORMAT_JSON:
+                               $output->writeln(json_encode($items));
+                               break;
+                       case self::OUTPUT_FORMAT_JSON_PRETTY:
+                               $output->writeln(json_encode($items, JSON_PRETTY_PRINT));
+                               break;
+                       default:
+                               $table = new Table($output);
+                               $table->setRows($items);
+                               if (!empty($items) && is_string(array_key_first(reset($items)))) {
+                                       $table->setHeaders(array_keys(reset($items)));
+                               }
+                               $table->render();
+                               break;
+               }
+       }
+
+
        /**
         * @param mixed $item
         */