From 3d139a86f53f8c2bd354c5474dbe5a0eec3a830b Mon Sep 17 00:00:00 2001
From: dantleech <dan.t.leech@gmail.com>
Date: Fri, 17 Jan 2014 23:21:34 +0000
Subject: [PATCH] Replacing node dump command

---
 .../Application/.SessionApplication.php.swn   | Bin 0 -> 12288 bytes
 .../Application/.ShellApplication.php.swn     | Bin 0 -> 20480 bytes
 .../Console/Application/ShellApplication.php  |   7 +-
 .../Console/Command/Shell/ListTreeCommand.php |  96 ++++++++++++++++++
 .../Console/Helper/ResultFormatterHelper.php  |  12 ++-
 5 files changed, 112 insertions(+), 3 deletions(-)
 create mode 100644 src/PHPCR/Shell/Console/Application/.SessionApplication.php.swn
 create mode 100644 src/PHPCR/Shell/Console/Application/.ShellApplication.php.swn
 create mode 100644 src/PHPCR/Shell/Console/Command/Shell/ListTreeCommand.php

diff --git a/src/PHPCR/Shell/Console/Application/.SessionApplication.php.swn b/src/PHPCR/Shell/Console/Application/.SessionApplication.php.swn
new file mode 100644
index 0000000000000000000000000000000000000000..de637d24587ac35ed901f431dff8ccda071573fe
GIT binary patch
literal 12288
zcmeI2O=}ZD7{{kxwJI%wf`?J7dBJ4UDhO?@)fQ>Qm(r>SDU|7E(kyIdmz`PDP^+In
zym`@!S3iQFC$H)^(34&~i3eX!{%4Z5TT@y*7N3RRPIh*ldHK!c5b`Wl?pAN`3+3|+
z*I~vUzx*)w<#>@jKgL*1s6dAH#m*Pnl~zV7m7QBL_OR2T*J`!AxDoqF=U&nc8HS!t
zd~bGUc52R>ch6Ii(orbA%W)hAzA!<gym_fL%1l)m9ql$Qy(a@?z#8ah=SGIz_w>}s
z6MS&s4rw6+WPl8i0Wv@a$N(8217zSoGGO99_6Y0U*Io1JZrS%&*?pvf43GgbKnBPF
z86X2>fDDiUGC&5%02$bW21JdqxBD402QYd3|G)nG|Mwxreu4Mk9e4unfivLeLB@W7
z@8A`90NUUhxC)MdLGZ1gv9I6_cnzL{Cb$KvU<Moo1K=~p{{%jQ7vLFK11*pOJ3kHR
zA_HWA43GgbKnBPF86X2>V2>GCV;ooKZa*c`q>17=mlV9{(t&eh%)VK5_c)1+^o^|X
zda8Vz3Cx$JnTncCp=vipQ|7BGPEA!Anbd_Z`A}e=3(Q6LjH6_WyMSp~4^&|L%Znrt
z?R=rIW!Q8Hna5kkM1)8~jD+qp(LEy#nMR;X6QWkj5BZ&WcDuH#TCXZiXlXLZ%y}2K
zO+$W>+ey2`=<c%fXy%q@JB&pll^GpfT=bDOZIaYC`J79p&Yk7C;c_Ln<HE9G1-8ok
zP-xA2ldZX2F;dkuzaq5E%$xC|2l%8&O(RP9v`ZZ4*QN9ue7uwOJ&D4Ewx$dr6KHND
zOha-^Sz&kWu3{b7P3)rP*jcWPNR0i+1G}{XjqXeC&PUls--cu^HuJ-ID-khjxDM2E
zXnS@igtr<2CL(-a#zr%*Sj2BiEx8l4;G`~ev&~VukWOv)Va&CjZ#V0aYTFiZq@a5v
s#+`-*ci%XI{}8izj&=*mDCeSQ7jPaF?CIEk1GZaRCLC?YFWJ=jKa3i9BLDyZ

literal 0
HcmV?d00001

diff --git a/src/PHPCR/Shell/Console/Application/.ShellApplication.php.swn b/src/PHPCR/Shell/Console/Application/.ShellApplication.php.swn
new file mode 100644
index 0000000000000000000000000000000000000000..ea19fcc55d4c437d04ddcb9b4a8a0b9a7b48a1dd
GIT binary patch
literal 20480
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

literal 0
HcmV?d00001

diff --git a/src/PHPCR/Shell/Console/Application/ShellApplication.php b/src/PHPCR/Shell/Console/Application/ShellApplication.php
index a5e98894..587e1d2c 100644
--- a/src/PHPCR/Shell/Console/Application/ShellApplication.php
+++ b/src/PHPCR/Shell/Console/Application/ShellApplication.php
@@ -34,6 +34,7 @@
 use PHPCR\Shell\Console\Command\Shell\ExitCommand;
 use PHPCR\Shell\Console\TransportInterface;
 use PHPCR\Shell\Console\Command\Shell\WorkspaceChangeCommand;
+use PHPCR\Shell\Console\Command\Shell\ListTreeCommand;
 
 class ShellApplication extends Application
 {
@@ -60,12 +61,14 @@ public function __construct($appName, $version, InputInterface $input, $transpor
 
         // wrap phpcr-util commands
         $this->add($this->wrap(new NodeDumpCommand())
-            ->setName('ls')
+            ->setName('dump')
             ->setDescription('Alias for dump')
         );
-        $ls = $this->get('ls');
+        $ls = $this->get('dump');
         $ls->getDefinition()->getArgument('identifier')->setDefault(null);
 
+        $this->add(new ListTreeCommand());
+
         $this->add($this->wrap(new NodeMoveCommand())
             ->setName('mv')
         );
diff --git a/src/PHPCR/Shell/Console/Command/Shell/ListTreeCommand.php b/src/PHPCR/Shell/Console/Command/Shell/ListTreeCommand.php
new file mode 100644
index 00000000..c9fb87ba
--- /dev/null
+++ b/src/PHPCR/Shell/Console/Command/Shell/ListTreeCommand.php
@@ -0,0 +1,96 @@
+<?php
+
+namespace PHPCR\Shell\Console\Command\Shell;
+
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
+use Symfony\Component\Console\Input\InputOption;
+use PHPCR\NodeInterface;
+use PHPCR\Util\NodeHelper;
+
+class ListTreeCommand extends Command
+{
+    protected $maxDepth;
+    protected $maxResults;
+    protected $showSystem;
+
+    protected $nodeCount = 0;
+
+    public function configure()
+    {
+        $this->setName('ls');
+        $this->setDescription('List tree');
+        $this->addOption('max-depth', 'd', InputOption::VALUE_REQUIRED, 'Depth', 1);
+        $this->addOption('limit', 'l', InputOption::VALUE_REQUIRED, 'Limit results', null);
+        $this->addOption('show-system', null, InputOption::VALUE_NONE, 'Show system nodes');
+    }
+
+    public function execute(InputInterface $input, OutputInterface $output)
+    {
+        $this->nodeCount = 0;
+
+        $session = $this->getHelper('phpcr')->getSession();
+        $node = $session->getNode($session->getCwd());
+        $this->maxDepth = $input->getOption('max-depth');
+        $this->maxResults = $input->getOption('limit');
+        $this->showSystem = $input->getOption('show-system');
+
+        $rows = new \ArrayObject();
+        $this->iterateTree($node, $rows);
+
+        $table = clone $this->getHelper('table');
+        $table->setHeaders(array('Node / Prop', 'Type', 'Value'));
+
+        foreach ($rows as $row) {
+            $table->addRow($row);
+        }
+
+        $table->render($output);
+
+        $output->writeln('');
+        $output->writeln($this->nodeCount . ' node(s)');
+    }
+
+    public function iterateTree(NodeInterface $node, $rows, $depth = -1)
+    {
+        if (null !== $this->maxResults && $this->nodeCount >= $this->maxResults) {
+            return;
+        }
+
+        if (true === NodeHelper::isSystemItem($node) && false === $this->showSystem) {
+            return;
+        }
+
+        $this->nodeCount++;
+
+        $formatter = $this->getHelper('result_formatter');
+        $properties = $node->getProperties();
+
+        $rows[] = array(
+            str_repeat(' ', $depth + 1) . '<info>' . $node->getName() . '/</info>', 
+            '<info>' . $node->getPrimaryNodeType()->getName() . '</info>',
+            '',
+        );
+
+        $depth++;
+        if ($depth >= $this->maxDepth) {
+            return;
+        }
+
+        foreach ($properties as $key => $property) {
+            $rows[] = array(
+                sprintf('%s -<comment>%s</comment>', str_repeat(' ', $depth), $key),
+                $formatter->getPropertyTypeName($property->getType()) . ($property->isMultiple() ? '[]' : ''),
+                substr($formatter->formatValue($property), 0, 55),
+            );
+        }
+
+        foreach ($node->getNodes() as $child) {
+            if ($depth < $this->maxDepth) {
+                $this->iterateTree($child, $rows, $depth);
+            }
+        }
+    }
+}
+
diff --git a/src/PHPCR/Shell/Console/Helper/ResultFormatterHelper.php b/src/PHPCR/Shell/Console/Helper/ResultFormatterHelper.php
index 7cdae8b5..6018c030 100644
--- a/src/PHPCR/Shell/Console/Helper/ResultFormatterHelper.php
+++ b/src/PHPCR/Shell/Console/Helper/ResultFormatterHelper.php
@@ -16,6 +16,16 @@ public function getName()
         return 'result_formatter';
     }
 
+    public function getPropertyTypeName($typeInteger)
+    {
+        $refl = new \ReflectionClass('PHPCR\PropertyType');
+        foreach ($refl->getConstants() as $key => $value) {
+            if ($typeInteger == $value) {
+                return $key;
+            }
+        }
+    }
+
     public function format(QueryResultInterface $result, OutputInterface $output, $elapsed)
     {
         $selectorNames = $result->getSelectorNames();
@@ -50,7 +60,7 @@ public function format(QueryResultInterface $result, OutputInterface $output, $e
         $output->writeln(sprintf('%s rows in set (%s sec)', count($result->getRows()), number_format($elapsed, 2)));
     }
 
-    protected function formatValue($value)
+    public function formatValue($value)
     {
         $v = $value->getValue();
         if (is_array($v)) {