update

Author: inhere

src/utils/Interact.php

@@ -255,25 +255,39 @@ public static function loopAsk($question, $default = null, \Closure $validator =
         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})',
+    ];
 
-    public static function progressBarSetting()
+    /**
+     * @param array $options
+     */
+    public static function progressBarOptions(array $options)
     {
-
+        self::$options = array_merge(self::$options, $options);
     }
 
-    public static function progressBarStart()
+    public static function progressBarStart($max)
     {
-
+        self::$startTime = time();
+        self::$max = time();
     }
 
-    public static function progressBarUp()
+    public static function progressBarUp($step = 1)
     {
 
     }
 
     public static function progressBarEnd()
     {
+        self::$endTime = time();
 
+        self::$max = 0;
     }
 
     /**

src/utils/ProgressBar.php

@@ -92,18 +92,17 @@ class ProgressBar
 
     /**
      * @param OutputInterface $output
-     * @param array $config
+     * @param int $maxSteps
      * @return ProgressBar
      */
     public static function create(OutputInterface $output = null, int $maxSteps = 0)
     {
-        return new self($output, $config);
+        return new self($output, $maxSteps);
     }
 
     /**
      * @param OutputInterface $output
-     * @param array $config
-     * @return ProgressBar
+     * @param int $maxSteps
      */
     public function __construct(OutputInterface $output = null, int $maxSteps = 0)
     {
@@ -121,7 +120,7 @@ public function __construct(OutputInterface $output = null, int $maxSteps = 0)
     public function start($maxSteps = null)
     {
         if ($this->started) {
-            throw new LogicException('Progress bar already started.');
+            throw new \LogicException('Progress bar already started.');
         }
 
         $this->startTime = time();
@@ -143,7 +142,7 @@ public function start($maxSteps = null)
     public function advance(int $step = 1)
     {
         if (!$this->started) {
-            throw new LogicException('Progress indicator has not yet been started.');
+            throw new \LogicException('Progress indicator has not yet been started.');
         }
 
         $this->advanceTo($this->step + $step);
@@ -243,8 +242,12 @@ public function render(string $text)
         $this->output->write($text, false);
     }
 
+    /**
+     * @return mixed
+     */
     protected function buildLine()
     {
+//        $regex = "{%([a-z\-_]+)(?:\:([^%]+))?%}i";
         return preg_replace_callback('/({[\w_]+})/i', function ($matches) {
             if ($formatter = $this->getFormatter($matches[1])) {
                 $text = call_user_func($formatter, $this, $this->output);
@@ -295,6 +298,22 @@ public function getFormatter(string $section, bool $throwException = false)
         return null;
     }
 
+    /**
+     * @return array
+     */
+    public function getMessages(): array
+    {
+        return $this->messages;
+    }
+
+    /**
+     * @param array $messages
+     */
+    public function setMessages(array $messages)
+    {
+        $this->messages = $messages;
+    }
+
     /**
      * set a named Message
      * @param string $message The text to associate with the placeholder
@@ -305,6 +324,10 @@ public function setMessage($message, string $name = 'message')
         $this->messages[$name] = $message;
     }
 
+    /**
+     * @param string $name
+     * @return string
+     */
     public function getMessage(string $name = 'message')
     {
         return $this->messages[$name];
@@ -349,6 +372,30 @@ private function setMaxSteps(int $maxSteps)
         $this->stepWidth = $this->maxSteps ? Helper::strLen($this->maxSteps) : 2;
     }
 
+    /**
+     * @return int
+     */
+    public function getMaxSteps(): int
+    {
+        return $this->maxSteps;
+    }
+
+    /**
+     * @return int
+     */
+    public function getStepWidth(): int
+    {
+        return $this->stepWidth;
+    }
+
+    /**
+     * @param int $stepWidth
+     */
+    public function setStepWidth(int $stepWidth)
+    {
+        $this->stepWidth = $stepWidth;
+    }
+
     /**
      * @return int
      */
@@ -380,7 +427,7 @@ public function setCompleteChar(string $completeChar)
     public function getCompleteChar(): string
     {
         if (null === $this->completeChar) {
-            return $this->max ? '=' : $this->completeChar;
+            return $this->maxSteps ? '=' : $this->completeChar;
         }
 
         return $this->completeChar;
@@ -418,16 +465,25 @@ public function setRemainingChar(string $remainingChar)
         $this->remainingChar = $remainingChar;
     }
 
+    /**
+     * @return float
+     */
     public function getPercent()
     {
         return $this->percent;
     }
 
+    /**
+     * @return mixed
+     */
     public function getStartTime()
     {
         return $this->startTime;
     }
 
+    /**
+     * @return mixed
+     */
     public function getFinishTime()
     {
         return $this->finishTime;
@@ -449,12 +505,15 @@ public function setFormat(string $format)
         $this->format = $format;
     }
 
+    /**
+     * @return array
+     */
     private static function loadDefaultFormatters()
     {
         return [
-            'bar' => function (ProgressBar $bar, OutputInterface $output) {
+            'bar' => function (ProgressBar $bar) {
                 $completeBars = floor($bar->getMaxSteps() > 0 ? $bar->getPercent() * $bar->getBarWidth() : $bar->getProgress() % $bar->getBarWidth());
-                $display = str_repeat($bar->getBarCharacter(), $completeBars);
+                $display = str_repeat($bar->getCompleteChar(), $completeBars);
 
                 if ($completeBars < $bar->getBarWidth()) {
                     $emptyBars = $bar->getBarWidth() - $completeBars;
@@ -468,7 +527,7 @@ private static function loadDefaultFormatters()
             },
             'remaining' => function (ProgressBar $bar) {
                 if (!$bar->getMaxSteps()) {
-                    throw new LogicException('Unable to display the remaining time if the maximum number of steps is not set.');
+                    throw new \LogicException('Unable to display the remaining time if the maximum number of steps is not set.');
                 }
 
                 if (!$bar->getProgress()) {
@@ -481,7 +540,7 @@ private static function loadDefaultFormatters()
             },
             'estimated' => function (ProgressBar $bar) {
                 if (!$bar->getMaxSteps()) {
-                    throw new LogicException('Unable to display the estimated time if the maximum number of steps is not set.');
+                    throw new \LogicException('Unable to display the estimated time if the maximum number of steps is not set.');
                 }
 
                 if (!$bar->getProgress()) {
@@ -492,7 +551,7 @@ private static function loadDefaultFormatters()
 
                 return Helper::formatTime($estimated);
             },
-            'memory' => function (ProgressBar $bar) {
+            'memory' => function () {
                 return Helper::formatMemory(memory_get_usage(true));
             },
             'current' => function (ProgressBar $bar) {
@@ -507,6 +566,9 @@ private static function loadDefaultFormatters()
         ];
     }
 
+    /**
+     * @return array
+     */
     private static function defaultFormats()
     {
         return [