Merge branch '16-ls-name-optional' into develop

meanbee · Dec 18, 2015 · 28fa9ba · 28fa9ba
2 parents d431d7e + 7985b9a
commit 28fa9ba
Showing 1 changed file with 16 additions and 3 deletions.
diff --git a/src/Meanbee/Magedbm/Command/ListCommand.php b/src/Meanbee/Magedbm/Command/ListCommand.php
@@ -22,7 +22,7 @@ protected function configure()
             ->setDescription('List available backups')
             ->addArgument(
                 'name',
-                InputArgument::REQUIRED,
+                InputArgument::OPTIONAL,
                 'Project identifier'
             )
             ->addOption(
@@ -53,15 +53,28 @@ protected function execute(InputInterface $input, OutputInterface $output)
         $s3 = $this->getS3Client($input->getOption('region'));
         $config = $this->getConfig($input);
 
+        $name = $input->getArgument('name') ?: '';
+
         try {
             $results = $s3->getIterator(
                 'ListObjects',
-                array('Bucket' => $config['bucket'], 'Prefix' => $input->getArgument('name'))
+                array('Bucket' => $config['bucket'], 'Prefix' => $name)
             );
 
+            $names = array();
             foreach ($results as $item) {
                 $itemKeyChunks = explode('/', $item['Key']);
-                $this->getOutput()->writeln(sprintf('%s %dMB', array_pop($itemKeyChunks), $item['Size'] / 1024 / 1024));
+
+                if ($name) {
+                    // If name presented, show downloads for that name
+                    $this->getOutput()->writeln(sprintf('%s %dMB', array_pop($itemKeyChunks), $item['Size'] / 1024 / 1024));
+                } else {
+                    // Otherwise show uniqued list of available names
+                    if (!in_array($itemKeyChunks[0], $names)) {
+                        $names[] = $itemKeyChunks[0];
+                        $this->getOutput()->writeln($itemKeyChunks[0]);
+                    }
+                }
             }
 
             if (!$results->count()) {