Merge pull request #66 from tm1000/feature/add-progress-bar

Add Progress Bar to upload output

composer.json

@@ -30,6 +30,11 @@
         "phpunit/phpunit": "^8 || ^9 || ^10",
         "composer/composer": "^1.8 ||  ^2.0"
     },
+    "scripts": {
+        "test": "phpunit tests",
+        "cs-fixer": "php-cs-fixer fix src"
+
+    },
     "replace": {
         "elendev/nexus-composer-push":  "*"
     },

src/PushCommand.php

@@ -139,7 +139,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
 
             $this->getIO()
                 ->write(
-                    'Execute the push for the URL ' . $provider->getUrl() . '...',
+                    'Pushing archive to URL: ' . $provider->getUrl() . '...',
                     true
                 );
 

src/RepositoryProvider/AbstractProvider.php

@@ -25,11 +25,19 @@ abstract class AbstractProvider
      */
     private $io;
 
+    /**
+     * @var \Symfony\Component\Console\Helper\ProgressBar|null
+     */
+    private $progress = null;
+
     public function __construct(Configuration $configuration, IOInterface $io, Client $client = null)
     {
         $this->configuration = $configuration;
         $this->io = $io;
         $this->client = $client;
+        if (method_exists($io, 'getProgressBar')) {
+            $this->progress = $io->getProgressBar();
+        }
     }
 
     /**
@@ -228,4 +236,48 @@ protected function getClient()
         }
         return $this->client;
     }
+
+    /**
+     * Return the Progress Callback for Guzzle
+     *
+     * @return callback
+     */
+    protected function getProgressCallback()
+    {
+        if ($this->progress === null) {
+            return function (
+                $downloadTotal,
+                $downloadedBytes,
+                $uploadTotal,
+                $uploadedBytes
+            ) {
+                //Do nothing
+            };
+        }
+        return function (
+            $downloadTotal,
+            $downloadedBytes,
+            $uploadTotal,
+            $uploadedBytes
+        ) {
+            if ($uploadTotal === 0) {
+                return;
+            }
+            if ($uploadedBytes === 0) {
+                $this->progress->start(100);
+                return;
+            }
+
+            if ($uploadedBytes === $uploadTotal) {
+                if ($this->progress->getProgress() != 100) {
+                    $this->progress->setProgress(100);
+                    $this->progress->finish();
+                    $this->getIO()->write('');
+                }
+                return;
+            }
+
+            $this->progress->setProgress(($uploadedBytes / $uploadTotal) * 100);
+        };
+    }
 }

src/RepositoryProvider/ArtifactoryProvider.php

@@ -39,6 +39,7 @@ protected function apiCall($file, $options)
     {
         $options['debug'] = $this->getIO()->isVeryVerbose();
         $options['body'] = fopen($file, 'r');
+        $options['progress'] = $this->getProgressCallback();
         $url = $this->getUrl() . '.' . pathinfo($file, PATHINFO_EXTENSION) . '?properties=composer.version=' . $this->getConfiguration()->getVersion();
         $this->getClient()->request('PUT', $url, $options);
     }

src/RepositoryProvider/NexusProvider.php

@@ -66,6 +66,8 @@ protected function apiCall($file, $options)
             $options['body'] = fopen($file, 'r');
         }
 
+        $options['progress'] = $this->getProgressCallback();
+
         $this->getClient()->request('PUT', $url, $options);
     }
 }