-
-
Notifications
You must be signed in to change notification settings - Fork 9.6k
[Console] Add progress indicator helper #12119
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Changes from 6 commits
abacef0
2480070
f1144a3
e9c18ab
faab1d4
01b8e1a
7bcabb4
12bf736
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,320 @@ | ||
<?php | ||
|
||
/* | ||
* This file is part of the Symfony package. | ||
* | ||
* (c) Fabien Potencier <fabien@symfony.com> | ||
* | ||
* For the full copyright and license information, please view the LICENSE | ||
* file that was distributed with this source code. | ||
*/ | ||
|
||
namespace Symfony\Component\Console\Helper; | ||
|
||
use Symfony\Component\Console\Output\OutputInterface; | ||
|
||
/** | ||
* @author Kevin Bond <kevinbond@gmail.com> | ||
*/ | ||
class ProgressIndicator | ||
{ | ||
private $output; | ||
private $startTime; | ||
private $format; | ||
private $message; | ||
private $indicatorValues; | ||
private $indicatorCurrent; | ||
private $indicatorChangeInterval; | ||
private $indicatorUpdateTime; | ||
private $lastMessagesLength; | ||
private $started = false; | ||
|
||
private static $formatters; | ||
private static $formats; | ||
|
||
/** | ||
* @param OutputInterface $output | ||
* @param string|null $format Indicator format | ||
* @param int $indicatorChangeInterval Change interval in milliseconds | ||
* @param array|null $indicatorValues Animated indicator characters | ||
*/ | ||
public function __construct(OutputInterface $output, $format = null, $indicatorChangeInterval = 100, $indicatorValues = null) | ||
{ | ||
$this->output = $output; | ||
|
||
if (null === $format) { | ||
$format = $this->determineBestFormat(); | ||
} | ||
|
||
if (null === $indicatorValues) { | ||
$indicatorValues = array('-', '\\', '|', '/'); | ||
} | ||
|
||
$indicatorValues = array_values($indicatorValues); | ||
|
||
if (2 > count($indicatorValues)) { | ||
throw new \InvalidArgumentException('Must have at least 2 indicator value characters.'); | ||
} | ||
|
||
$this->format = self::getFormatDefinition($format); | ||
$this->indicatorChangeInterval = $indicatorChangeInterval; | ||
$this->indicatorValues = $indicatorValues; | ||
$this->startTime = time(); | ||
} | ||
|
||
/** | ||
* Sets the current indicator message. | ||
* | ||
* @param string|null $message | ||
*/ | ||
public function setMessage($message) | ||
{ | ||
$this->message = $message; | ||
|
||
$this->display(); | ||
} | ||
|
||
/** | ||
* Gets the current indicator message. | ||
* | ||
* @return string|null | ||
*/ | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This one is also internal, right? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Just |
||
public function getMessage() | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I would remove this accessor There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Will this cause issues in 5.3 (https://github.com/symfony/symfony/pull/12119/files#diff-c69956b5e0c001490b2ebfa0b9e2db1aR290) or will this only be in 3.0? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. If we don't need 5.3 support, I should remove the other public getters as well. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. If we were to merge this in 2.8 (we should act fast now), PHP 5.3.9 is still supported. If not, it's going to be merged in 3.1. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I will leave the getters for now to try and get this into 2.8. If it doesn't make it, I will remove for 3.1. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. if it is public only for PHP 5.3 compat, it should be marked as internal though (explaining that it is there only for compat reasons), as we do elsewhere |
||
{ | ||
return $this->message; | ||
} | ||
|
||
/** | ||
* Gets the progress bar start time. | ||
* | ||
* @return int The progress bar start time | ||
* | ||
* @internal for PHP 5.3 compatibility | ||
*/ | ||
public function getStartTime() | ||
{ | ||
return $this->startTime; | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Start time can probably be removed altogether as it's not used anywhere. It's useful in the progress bar as we display time information, but as this is not the case here, I don't see how it can be useful. Or would it be useful to add the possibility to add the elapsed time in the format? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Nevermind. |
||
} | ||
|
||
/** | ||
* Gets the current animated indicator character. | ||
* | ||
* @return string | ||
* | ||
* @internal for PHP 5.3 compatibility | ||
*/ | ||
public function getCurrentValue() | ||
{ | ||
return $this->indicatorValues[$this->indicatorCurrent % count($this->indicatorValues)]; | ||
} | ||
|
||
/** | ||
* Starts the indicator output. | ||
* | ||
* @param $message | ||
*/ | ||
public function start($message) | ||
{ | ||
if ($this->started) { | ||
throw new \LogicException('Progress indicator already started.'); | ||
} | ||
|
||
$this->message = $message; | ||
$this->started = true; | ||
$this->lastMessagesLength = 0; | ||
$this->startTime = time(); | ||
$this->indicatorUpdateTime = $this->getCurrentTimeInMilliseconds() + $this->indicatorChangeInterval; | ||
$this->indicatorCurrent = 0; | ||
|
||
$this->display(); | ||
} | ||
|
||
/** | ||
* Advances the indicator. | ||
*/ | ||
public function advance() | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Would it make sense to add the possibility to pass a message here? Like for finish? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. IMO you would set the message in a different place than you advance the indicator (see my example in the description) but I can add this ability if you'd like. |
||
{ | ||
if (!$this->started) { | ||
throw new \LogicException('Progress indicator has not yet been started.'); | ||
} | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I would just do a simple incrementation here ( There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Good call! |
||
|
||
if (!$this->output->isDecorated()) { | ||
return; | ||
} | ||
|
||
$currentTime = $this->getCurrentTimeInMilliseconds(); | ||
|
||
if ($currentTime < $this->indicatorUpdateTime) { | ||
return; | ||
} | ||
|
||
$this->indicatorUpdateTime = $currentTime + $this->indicatorChangeInterval; | ||
++$this->indicatorCurrent; | ||
|
||
$this->display(); | ||
} | ||
|
||
/** | ||
* Finish the indicator with message. | ||
* | ||
* @param $message | ||
*/ | ||
public function finish($message) | ||
{ | ||
if (!$this->started) { | ||
throw new \LogicException('Progress indicator has not yet been started.'); | ||
} | ||
|
||
$this->message = $message; | ||
$this->display(); | ||
$this->output->writeln(''); | ||
$this->started = false; | ||
} | ||
|
||
/** | ||
* Gets the format for a given name. | ||
* | ||
* @param string $name The format name | ||
* | ||
* @return string|null A format string | ||
*/ | ||
public static function getFormatDefinition($name) | ||
{ | ||
if (!self::$formats) { | ||
self::$formats = self::initFormats(); | ||
} | ||
|
||
return isset(self::$formats[$name]) ? self::$formats[$name] : null; | ||
} | ||
|
||
/** | ||
* Sets a placeholder formatter for a given name. | ||
* | ||
* This method also allow you to override an existing placeholder. | ||
* | ||
* @param string $name The placeholder name (including the delimiter char like %) | ||
* @param callable $callable A PHP callable | ||
*/ | ||
public static function setPlaceholderFormatterDefinition($name, $callable) | ||
{ | ||
if (!self::$formatters) { | ||
self::$formatters = self::initPlaceholderFormatters(); | ||
} | ||
|
||
self::$formatters[$name] = $callable; | ||
} | ||
|
||
/** | ||
* Gets the placeholder formatter for a given name. | ||
* | ||
* @param string $name The placeholder name (including the delimiter char like %) | ||
* | ||
* @return callable|null A PHP callable | ||
*/ | ||
public static function getPlaceholderFormatterDefinition($name) | ||
{ | ||
if (!self::$formatters) { | ||
self::$formatters = self::initPlaceholderFormatters(); | ||
} | ||
|
||
return isset(self::$formatters[$name]) ? self::$formatters[$name] : null; | ||
} | ||
|
||
private function display() | ||
{ | ||
if (OutputInterface::VERBOSITY_QUIET === $this->output->getVerbosity()) { | ||
return; | ||
} | ||
|
||
$self = $this; | ||
|
||
$this->overwrite(preg_replace_callback("{%([a-z\-_]+)(?:\:([^%]+))?%}i", function ($matches) use ($self) { | ||
if ($formatter = $self::getPlaceholderFormatterDefinition($matches[1])) { | ||
return call_user_func($formatter, $self); | ||
} | ||
|
||
return $matches[0]; | ||
}, $this->format)); | ||
} | ||
|
||
private function determineBestFormat() | ||
{ | ||
switch ($this->output->getVerbosity()) { | ||
// OutputInterface::VERBOSITY_QUIET: display is disabled anyway | ||
case OutputInterface::VERBOSITY_VERBOSE: | ||
return $this->output->isDecorated() ? 'verbose' : 'verbose_no_ansi'; | ||
case OutputInterface::VERBOSITY_VERY_VERBOSE: | ||
case OutputInterface::VERBOSITY_DEBUG: | ||
return $this->output->isDecorated() ? 'very_verbose' : 'very_verbose_no_ansi'; | ||
default: | ||
return $this->output->isDecorated() ? 'normal' : 'normal_no_ansi'; | ||
} | ||
} | ||
|
||
/** | ||
* Overwrites a previous message to the output. | ||
* | ||
* @param string $message The message | ||
*/ | ||
private function overwrite($message) | ||
{ | ||
// append whitespace to match the line's length | ||
if (null !== $this->lastMessagesLength) { | ||
if ($this->lastMessagesLength > Helper::strlenWithoutDecoration($this->output->getFormatter(), $message)) { | ||
$message = str_pad($message, $this->lastMessagesLength, "\x20", STR_PAD_RIGHT); | ||
} | ||
} | ||
|
||
if ($this->output->isDecorated()) { | ||
$this->output->write("\x0D"); | ||
$this->output->write($message); | ||
} else { | ||
$this->output->writeln($message); | ||
} | ||
|
||
$this->lastMessagesLength = 0; | ||
|
||
$len = Helper::strlenWithoutDecoration($this->output->getFormatter(), $message); | ||
|
||
if ($len > $this->lastMessagesLength) { | ||
$this->lastMessagesLength = $len; | ||
} | ||
} | ||
|
||
private function getCurrentTimeInMilliseconds() | ||
{ | ||
return round(microtime(true) * 1000); | ||
} | ||
|
||
private static function initPlaceholderFormatters() | ||
{ | ||
return array( | ||
'indicator' => function (ProgressIndicator $indicator) { | ||
return $indicator->getCurrentValue(); | ||
}, | ||
'message' => function (ProgressIndicator $indicator) { | ||
return $indicator->getMessage(); | ||
}, | ||
'elapsed' => function (ProgressIndicator $indicator) { | ||
return Helper::formatTime(time() - $indicator->getStartTime()); | ||
}, | ||
'memory' => function () { | ||
return Helper::formatMemory(memory_get_usage(true)); | ||
}, | ||
); | ||
} | ||
|
||
private static function initFormats() | ||
{ | ||
return array( | ||
'normal' => ' %indicator% %message%', | ||
'normal_no_ansi' => ' %message%', | ||
|
||
'verbose' => ' %indicator% %message% (%elapsed:6s%)', | ||
'verbose_no_ansi' => ' %message% (%elapsed:6s%)', | ||
|
||
'very_verbose' => ' %indicator% %message% (%elapsed:6s%, %memory:6s%)', | ||
'very_verbose_no_ansi' => ' %message% (%elapsed:6s%, %memory:6s%)', | ||
); | ||
} | ||
} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The whole comment can be removed as it does not add anything that is not already part of the PHP code.