added ability to display progressBar for MultipartUpload and Multipar…

…tCopy

src/Multipart/AbstractUploader.php

@@ -87,8 +87,6 @@ protected function getUploadCommands(callable $resultHandler)
                 $this->source->read($this->state->getPartSize());
             }
         }
-//prints near the end of the handleResult print statements? Maybe the thing about "Or do we just create parts til we reach the end of the file?"-------------------------------------------------------------------------------------------------------------
-//        print "AbstractUploader Number of parts: " . $numberOfParts . "\n";
     }
 
     /**

src/Multipart/UploadState.php

@@ -13,6 +13,18 @@ class UploadState
     const INITIATED = 1;
     const COMPLETED = 2;
 
+    protected $progressBar = [
+        "Transfer initiated...\n|                    | 0.0%\n",
+        "|==                  | 12.5%\n",
+        "|=====               | 25.0%\n",
+        "|=======             | 37.5%\n",
+        "|==========          | 50.0%\n",
+        "|============        | 62.5%\n",
+        "|===============     | 75.0%\n",
+        "|=================   | 87.5%\n",
+        "|====================| 100.0%\nTransfer complete!\n"
+    ];
+
     /** @var array Params used to identity the upload. */
     private $id;
 
@@ -31,6 +43,7 @@ class UploadState
     public function __construct(array $id)
     {
         $this->id = $id;
+        echo array_shift($this->progressBar);
     }
 
     /**
@@ -76,6 +89,22 @@ public function setPartSize($partSize)
         $this->partSize = $partSize;
     }
 
+    public function setProgressThresholds($thresholds)
+    {
+        $this->progressThresholds = $thresholds;
+    }
+
+    public function displayProgress($totalUploaded)
+    {
+        while (!empty($this->progressThresholds)
+                && !empty($this->progressBar)
+                && $totalUploaded >= $this->progressThresholds[0])
+        {
+            array_shift($this->progressThresholds);
+            echo array_shift($this->progressBar);
+        }
+    }
+
     /**
      * Marks a part as being uploaded.
      *

src/S3/MultipartCopy.php

@@ -75,6 +75,8 @@ public function __construct(
             $client,
             array_change_key_case($config) + ['source_metadata' => null]
         );
+
+        $this->createProgressThresholds($this->sourceMetadata["ContentLength"]);
     }
 
     /**

src/S3/MultipartUploader.php

@@ -19,18 +19,6 @@ class MultipartUploader extends AbstractUploader
     const PART_MIN_SIZE = 5242880;
     const PART_MAX_SIZE = 5368709120;
     const PART_MAX_NUM = 10000;
-    private $uploadedBytes = 0;
-    private $progressBar = [
-        "Transfer initiated...\n|                    | 0.0%\n",
-        "|==                  | 12.5%\n",
-        "|=====               | 25.0%\n",
-        "|=======             | 37.5%\n",
-        "|==========          | 50.0%\n",
-        "|============        | 62.5%\n",
-        "|===============     | 75.0%\n",
-        "|=================   | 87.5%\n",
-        "|====================| 100.0%\nTransfer complete!\n"
-    ];
 
     /**
      * Creates a multipart upload for an S3 object.
@@ -82,12 +70,8 @@ public function __construct(
             'key'    => null,
             'exception_class' => S3MultipartUploadException::class,
         ]);
-        $totalSize = $this->source->getSize();
-        $this->progressThresholds = [];
-        for ($i=1;$i<=8;$i++) {
-            $this->progressThresholds []= round($totalSize*($i/8));
-        }
-        echo array_shift($this->progressBar);
+
+        $this->createProgressThresholds($this->source->getSize());
     }
 
     protected function loadUploadWorkflowInfo()
@@ -152,22 +136,10 @@ protected function createPart($seekable, $number)
         }
 
         $data['ContentLength'] = $contentLength;
-        $this->uploadedBytes += $contentLength;
-        $this->displayProgress();
 
         return $data;
     }
 
-    protected function displayProgress()
-    {
-        $threshold = $this->progressThresholds;
-
-        if (!empty($threshold) and !empty($this->progressBar) and $this->uploadedBytes >= $threshold[0]) {
-            array_shift($this->progressThresholds);
-            echo array_shift($this->progressBar);
-        }
-    }
-
     protected function extractETag(ResultInterface $result)
     {
         return $result['ETag'];

src/S3/MultipartUploadingTrait.php

@@ -7,6 +7,8 @@
 
 trait MultipartUploadingTrait
 {
+    private $uploadedBytes = 0;
+
     /**
      * Creates an UploadState object for a multipart upload by querying the
      * service for the specified upload's information.
@@ -49,12 +51,24 @@ public static function getStateFromService(
         return $state;
     }
 
+    protected function createProgressThresholds($totalSize)
+    {
+        $this->progressThresholds = [];
+        for ($i=1;$i<=8;$i++) {
+            $this->progressThresholds []= round($totalSize*($i/8));
+        }
+        $this->getState()->setProgressThresholds($this->progressThresholds);
+    }
+
     protected function handleResult(CommandInterface $command, ResultInterface $result)
     {
         $this->getState()->markPartAsUploaded($command['PartNumber'], [
             'PartNumber' => $command['PartNumber'],
             'ETag'       => $this->extractETag($result),
         ]);
+
+        $this->uploadedBytes += $command["ContentLength"];
+        $this->getState()->displayProgress($this->uploadedBytes);
     }
 
     abstract protected function extractETag(ResultInterface $result);

src/S3/ObjectUploader.php

@@ -92,16 +92,12 @@ public function promise()
         if (is_callable($this->options['before_upload'])) {
             $this->options['before_upload']($command);
         }
-//        return $this->client->executeAsync($command);
-        $test = $this->client->executeAsync($command);
-        return $test;
-
+        return $this->client->executeAsync($command);
     }
 
     public function upload()
     {
-        $result = $this->promise()->wait();
-        return $result;
+        return $this->promise()->wait();
     }
 
     /**