update

Author: inhere

src/Utils/Interact.php

@@ -263,41 +263,6 @@ public static function limitedAsk($question, $default = null, \Closure $validato
         return $answer;
     }
 
-    public static $startTime = 0;
-    public static $endTime = 0;
-    public static $stepWidth = 2;
-    public static $step = 0;
-    public static $max = 0;
-    private static $options = [
-        'format' => '[{bar}] {percent:3s}%({current}/{max})',
-    ];
-
-    /**
-     * @param array $options
-     */
-    public static function progressBarOptions(array $options)
-    {
-        self::$options = array_merge(self::$options, $options);
-    }
-
-    public static function progressBarStart($max)
-    {
-        self::$startTime = time();
-        self::$max = time();
-    }
-
-    public static function progressBarUp($step = 1)
-    {
-
-    }
-
-    public static function progressBarEnd()
-    {
-        self::$endTime = time();
-
-        self::$max = 0;
-    }
-
     /**
      * 读取输入信息
      * @param  mixed $message 若不为空，则先输出文本

src/Utils/ProgressBar.php

@@ -509,7 +509,7 @@ public function setFormat(string $format)
     private static function loadDefaultParsers()
     {
         return [
-            'bar' => function (ProgressBar $bar) {
+            'bar' => function (self $bar) {
                 $completeBars = floor($bar->getMaxSteps() > 0 ? $bar->getPercent() * $bar->getBarWidth() : $bar->getProgress() % $bar->getBarWidth());
                 $display = str_repeat($bar->getCompleteChar(), $completeBars);
 
@@ -520,10 +520,10 @@ private static function loadDefaultParsers()
 
                 return $display;
             },
-            'elapsed' => function (ProgressBar $bar) {
+            'elapsed' => function (self $bar) {
                 return Helper::formatTime(time() - $bar->getStartTime());
             },
-            'remaining' => function (ProgressBar $bar) {
+            'remaining' => function (self $bar) {
                 if (!$bar->getMaxSteps()) {
                     throw new \LogicException('Unable to display the remaining time if the maximum number of steps is not set.');
                 }
@@ -536,7 +536,7 @@ private static function loadDefaultParsers()
 
                 return Helper::formatTime($remaining);
             },
-            'estimated' => function (ProgressBar $bar) {
+            'estimated' => function (self $bar) {
                 if (!$bar->getMaxSteps()) {
                     throw new \LogicException('Unable to display the estimated time if the maximum number of steps is not set.');
                 }
@@ -552,13 +552,13 @@ private static function loadDefaultParsers()
             'memory' => function () {
                 return Helper::formatMemory(memory_get_usage(true));
             },
-            'current' => function (ProgressBar $bar) {
+            'current' => function (self $bar) {
                 return str_pad($bar->getProgress(), $bar->getStepWidth(), ' ', STR_PAD_LEFT);
             },
-            'max' => function (ProgressBar $bar) {
+            'max' => function (self $bar) {
                 return $bar->getMaxSteps();
             },
-            'percent' => function (ProgressBar $bar) {
+            'percent' => function (self $bar) {
                 return floor($bar->getPercent() * 100);
             },
         ];

src/Utils/Show.php

@@ -13,9 +13,7 @@
 /**
  * Class Show
  *  show formatted message text
- *
  * @package Inhere\Console\Utils
- *
  * @method static int info($messages, $quit = false)
  * @method static int note($messages, $quit = false)
  * @method static int notice($messages, $quit = false)
@@ -24,7 +22,6 @@
  * @method static int warning($messages, $quit = false)
  * @method static int danger($messages, $quit = false)
  * @method static int error($messages, $quit = false)
- *
  * @method static int liteInfo($messages, $quit = false)
  * @method static int liteNote($messages, $quit = false)
  * @method static int liteNotice($messages, $quit = false)
@@ -277,7 +274,6 @@ public static function section($title, $body, array $opts = [])
 
     /**
      * Show a list
-     *
      * ```
      * $title = 'list title';
      * $data = [
@@ -316,7 +312,6 @@ public static function aList($data, $title = null, array $opts = [])
 
     /**
      * Show multi list
-     *
      * ```
      * [
      *   'list1 title' => [
@@ -330,7 +325,6 @@ public static function aList($data, $title = null, array $opts = [])
      *   ... ...
      * ]
      * ```
-     *
      * @param array $data
      * @param array $opts
      */
@@ -353,15 +347,11 @@ public static function mList(array $data, array $opts = [])
 
     /**
      * Show console help message
-     *
      * @param  array $config The config data
-     *
      * There are config structure. you can setting some or ignore some. will only render it when value is not empty.
-     *
      * [
      *  description string         The description text. e.g 'Composer version 1.3.2'
      *  usage       string         The usage message text. e.g 'command [options] [arguments]'
-     *
      *  commands    array|string   The command list. e.g:
      *      [
      *          // command => description
@@ -382,7 +372,6 @@ public static function mList(array $data, array $opts = [])
      *          '-h, --help' => 'Display this help message'
      *          ... ...
      *      ]
-     *
      *  examples    array|string  The command usage example. e.g 'php server.php {start|reload|restart|stop} [-d]'
      * ]
      * @param  bool $showAfterQuit Show help after quit
@@ -548,6 +537,7 @@ public static function panel($data, $title = 'Information Panel', array $opts =
         }
 
         unset($panelData);
+
         return 0;
     }
 
@@ -557,7 +547,6 @@ public static function panel($data, $title = 'Information Panel', array $opts =
      * @param  string $title
      * @param  array $opts
      * @example
-     *
      * ```
      * // like from database query's data.
      * $data = [
@@ -566,14 +555,12 @@ public static function panel($data, $title = 'Information Panel', array $opts =
      *  ... ...
      * ];
      * Show::table($data, 'a table');
-     *
      * // use custom head
      * $data = [
      *  [ value1, value2, value3, ... ], // first row
      *  [ value4, value5, value6, ... ], // second row
      *  ... ...
      * ];
-     *
      * $opts = [
      *   'showBorder' => true,
      *   'tHead' => [col1, col2, col3, ...]
@@ -751,7 +738,6 @@ public static function progressTxt($total, $msg, $doneMsg = '')
 
     /**
      * a simple progress bar by 'yield'
-     *
      * ```php
      * $i = 0;
      * $total = 120;
@@ -760,14 +746,12 @@ public static function progressTxt($total, $msg, $doneMsg = '')
      *     'doneChar' => '#'
      * ]);
      * echo "progress:\n";
-     *
      * while ($i <= $total) {
      *      $bar->send($i);
      *      usleep(50000);
      *      $i++;
      * }
      * ```
-     *
      * @param int $total
      * @param array $opts
      * @internal int $current
@@ -814,6 +798,35 @@ public static function progressBar($total, array $opts = [])
         yield false;
     }
 
+    /**
+     * create ProgressBar
+     *
+     * ```php
+     * $max = 200;
+     * $bar = Show::createProgressBar($max);
+     * while ($i <= $total) {
+     *   $bar->advance();
+     *   usleep(50000);
+     *   $i++;
+     * }
+     * $bar->finish();
+     * ```
+     *
+     * @param int $max
+     * @param bool $start
+     * @return ProgressBar
+     */
+    public static function createProgressBar($max = 0, $start = true)
+    {
+        $bar = new ProgressBar(null, $max);
+
+        if ($start) {
+            $bar->start();
+        }
+
+        return $bar;
+    }
+
 /////////////////////////////////////////////////////////////////
 /// Helper Method
 /////////////////////////////////////////////////////////////////