diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Console] added support for multiline formats in ProgressBar

Browse Source
This commit is contained in:
Fabien Potencier 2014-03-01 08:54:45 +01:00
parent 1aa7b8c8b9
commit 7a30e50eee
2 changed files with 33 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/Symfony/Component/Console/Helper/ProgressBar.php
View File

@ -48,6 +48,7 @@ class ProgressBar
private $percent;
private $lastMessagesLength;
private $barCharOriginal;
private $formatLineCount;
static private $formatters;
@ -224,6 +225,7 @@ class ProgressBar
public function setFormat($format)
{
$this->format = $format;
$this->formatLineCount = substr_count($format, "\n");
}
/**
@ -248,7 +250,7 @@ class ProgressBar
$this->barCharOriginal = '';
if (null === $this->format) {
$this->format = $this->determineBestFormat();
$this->setFormat($this->determineBestFormat());
}
if (!$this->max) {
@ -351,7 +353,7 @@ class ProgressBar
*/
public function clear()
{
$this->overwrite('');
$this->overwrite(str_repeat("\n", $this->formatLineCount));
}
/**
@ -364,12 +366,17 @@ class ProgressBar
$length = Helper::strlen($message);
// append whitespace to match the last line's length
// FIXME: on each line!!!!!
// FIXME: max of each line for lastMessagesLength or an array?
if (null !== $this->lastMessagesLength && $this->lastMessagesLength > $length) {
$message = str_pad($message, $this->lastMessagesLength, "\x20", STR_PAD_RIGHT);
}
// carriage return
// move back to the beginning of the progress bar before redrawing it
$this->output->write("\x0D");
if ($this->formatLineCount) {
$this->output->write(sprintf("\033[%dA", $this->formatLineCount));
}
$this->output->write($message);
$this->lastMessagesLength = Helper::strlen($message);

24
src/Symfony/Component/Console/Tests/Helper/ProgressBarTest.php
View File

@ -319,6 +319,26 @@ class ProgressBarTest extends \PHPUnit_Framework_TestCase
);
}
public function testMultilineFormat()
{
$bar = new ProgressBar($output = $this->getOutputStream(), 3);
$bar->setFormat("%bar%\nfoobar");
$bar->start();
$bar->advance();
$bar->clear();
$bar->finish();
rewind($output->getStream());
$this->assertEquals(
$this->generateOutput(">---------------------------\nfoobar").
$this->generateOutput("=========>------------------\nfoobar").
$this->generateOutput("\n").
$this->generateOutput("============================\nfoobar"),
stream_get_contents($output->getStream())
);
}
protected function getOutputStream($decorated = true)
{
return new StreamOutput(fopen('php://memory', 'r+', false), StreamOutput::VERBOSITY_NORMAL, $decorated);
@ -334,6 +354,8 @@ class ProgressBarTest extends \PHPUnit_Framework_TestCase
$this->lastMessagesLength = strlen($expectedout);
return "\x0D".$expectedout;
$count = substr_count($expected, "\n");
return "\x0D".($count ? sprintf("\033[%dA", $count) : '').$expectedout;
}
}