up: update some logic for download progress handle

Author: inhere

src/Traits/WriteMessageTrait.php

@@ -125,7 +125,7 @@ public static function print($message, $quit = false, array $opts = []): int
      * Write a message to standard output stream.
      *
      * @param string|array $messages Output message
-     * @param boolean      $nl       True Will add line breaks, False Raw output.
+     * @param bool|mixed   $nl       True Will add line breaks, False Raw output.
      * @param int|boolean  $quit     If is Int, setting it is exit code.
      *                               'True' translate as code 0 and exit
      *                               'False' will not exit.
@@ -138,7 +138,7 @@ public static function print($message, $quit = false, array $opts = []): int
      *
      * @return int
      */
-    public static function write($messages, bool $nl = true, $quit = false, array $opts = []): int
+    public static function write($messages, $nl = true, $quit = false, array $opts = []): int
     {
         if (is_array($messages)) {
             $messages = implode($nl ? PHP_EOL : '', $messages);

src/Util/Download.php

@@ -21,6 +21,9 @@
 use function getenv;
 use function is_resource;
 use function preg_replace;
+use function printf;
+use function round;
+use function str_repeat;
 use function stream_context_create;
 use function stream_context_set_params;
 use function strpos;
@@ -112,8 +115,7 @@ public function __construct(string $url, string $saveAs = '', string $type = sel
     {
         $this->setUrl($url);
         $this->setSaveAs($saveAs);
-
-        $this->showType = $type === self::PROGRESS_BAR ? self::PROGRESS_BAR : self::PROGRESS_TEXT;
+        $this->setShowType($type);
     }
 
     /**
@@ -271,32 +273,42 @@ public function progressShow(
 
     /**
      * @param $transferredBytes
-     *
-     * @return string
      */
-    public function showProgressByType($transferredBytes): string
+    public function showProgressByType($transferredBytes): void
     {
         if ($transferredBytes <= 0) {
-            return '';
+            return;
         }
 
-        $tfKb = $transferredBytes / 1024;
+        $tfKbSize = $transferredBytes / 1024;
+        if ($this->fileSize === null) {
+            printf("\r\rUnknown file size... %2d kb done..", $tfKbSize);
+            return;
+        }
 
-        if ($this->showType === self::PROGRESS_BAR) {
-            $size = $this->fileSize;
+        $totalSize = $this->fileSize / 1024;
 
-            if ($size === null) {
-                printf("\rUnknown file size... %2d kb done..", $tfKb);
+        $percent = $transferredBytes / $this->fileSize;
+        if ($this->showType === self::PROGRESS_BAR) {
+            $barWidth  = 60;
+            $boxNumber = (int)round($percent * $barWidth); // ■ =
+            if ($barWidth === $boxNumber) {
+                $completed = 100;
+                $tfKbSize  = $totalSize;
             } else {
-                $length = (int)ceil(($transferredBytes / $size) * 100); // ■ =
-                printf("\r[%-100s] %d%% (%2d/%2d kb)", str_repeat('=', $length) . '>', $length, $tfKb, $size / 1024);
+                $completed = (int)round($percent * 100);
             }
+
+            $paddingBar = str_repeat('=', $boxNumber) . '>';
+            printf("\r\r[%-60s] %d%% (%2d/%2d kb)", $paddingBar, $completed, $tfKbSize, $totalSize);
         } else {
-            printf("\r\rMade some progress, downloaded %2d kb so far", $tfKb);
+            if ((int)round($percent * 100) === 100) {
+                $tfKbSize = $totalSize;
+            }
+
             //$msg = "Made some progress, downloaded <info>$transferredBytes</info> so far";
+            printf("\r\rMade some progress, downloaded %2d kb so far", $tfKbSize);
         }
-
-        return '';
     }
 
     /**
@@ -323,7 +335,7 @@ public function getShowType(): string
      */
     public function setShowType(string $showType): void
     {
-        $this->showType = $showType;
+        $this->showType = $showType === self::PROGRESS_BAR ? self::PROGRESS_BAR : self::PROGRESS_TEXT;
     }
 
     /**
@@ -355,7 +367,9 @@ public function getSaveAs(): string
      */
     public function setSaveAs(string $saveAs): void
     {
-        $this->saveAs = trim($saveAs);
+        if ($saveAs) {
+            $this->saveAs = trim($saveAs);
+        }
     }
 
     /**