Rendering progress bar

Author: piotrooo

lib/Psf/Helpers/ProgressBar.php

@@ -18,6 +18,8 @@ class ProgressBar
     private $_current = 0;
     private $_percent = 0;
     private $_counterMask = '{current}/{all} ({percent}%)';
+    private $_barWidth = 50;
+    private $_currentBarWidth = 0;
 
     public function initialize(Writer $output, $size)
     {
@@ -29,10 +31,12 @@ public function increment()
     {
         $this->_current++;
         $this->_calculatePercent();
+        $this->_calculateBarWidth();
+        $fill = $this->_fillMask() . ' ' . $this->_generateBar();
         if ($this->_current == $this->_size) {
-            $this->_output->writeMessage($this->_fillMask());
+            $this->_output->writeMessage($fill);
         } else {
-            $this->_output->writeMessage($this->_fillMask(), 1, Writer::CR);
+            $this->_output->writeMessage($fill, 1, Writer::CR);
         }
     }
 
@@ -41,6 +45,11 @@ private function _calculatePercent()
         $this->_percent = round($this->_current * 100 / $this->_size);
     }
 
+    private function _calculateBarWidth()
+    {
+        $this->_currentBarWidth = round($this->_barWidth * $this->_percent / 100);
+    }
+
     private function _fillMask()
     {
         $matches = array(
@@ -50,4 +59,9 @@ private function _fillMask()
         );
         return str_replace(array_keys($matches), array_values($matches), $this->_counterMask);
     }
+
+    private function _generateBar()
+    {
+        return "[" . str_pad(str_repeat('=', $this->_currentBarWidth), $this->_barWidth, '.') . "]";
+    }
 }

lib/Psf/Output/Writer.php

@@ -60,7 +60,6 @@ private function _parseMessage($message)
         foreach ($parsedTags as $xmlTag) {
             if (!empty($this->_formatters[$xmlTag])) {
                 $formatter = $this->_formatters[$xmlTag];
-
                 $formatMessage = $formatter->render($xmlTag, $formatMessage);
             }
         }